From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- net-firewall/iptables/Manifest | 7 ++++--- .../iptables/files/iptables-1.8.2-link.patch | 24 ++++++++++++++++++++++ net-firewall/iptables/iptables-1.8.2-r2.ebuild | 5 +++-- net-firewall/iptables/iptables-1.8.3-r1.ebuild | 5 +++-- net-firewall/iptables/iptables-1.8.4.ebuild | 5 +++-- 5 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 net-firewall/iptables/files/iptables-1.8.2-link.patch (limited to 'net-firewall/iptables') diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest index ea13edd1edeb..97db563591b3 100644 --- a/net-firewall/iptables/Manifest +++ b/net-firewall/iptables/Manifest @@ -1,6 +1,7 @@ AUX ip6tables-1.4.13.confd 690 BLAKE2B 457beb9caaef166b8d98bddfd3e9f2799439bdfef4dd4acf4e5b7d619ac23b0d2c9f7ad62ab8fe70cb0970b378fbc4b179336c399a078babb2647cb127631b2e SHA512 8de9a5de4061bef217fbc07577688a8110f1116af7f3b936dfd18100a6a7a47ec6e70c456b24cf3432fb4f2034b741a487fe6af8d9740f174d51c6eb16945c6e AUX ip6tables-r1.confd 899 BLAKE2B d8c72df359a35798d7a92958ba9a620ab580427a06765850928181d7b4cc25455c586daaad88bd20e61a9c9218dbc0895de38b006526bb04f4f2e998d8062fbe SHA512 553ddf83558edaccf891a366175e47aad950853be0de556581cfa08f614afa1f4139c94b8d8d2884ed69018513edeb966331d4d6a615829ada65fac2066840e5 AUX iptables-1.4.13.confd 687 BLAKE2B 78b2242454b5f3228661f1e41b790aaa458c1225162a222da5a309a15eca56a531c756a5ceb49e506095461998305189efe136fde0bfe5916cc2d00661de1789 SHA512 bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70 +AUX iptables-1.8.2-link.patch 785 BLAKE2B 2ef5ac495260eef324f341d5d807e8c59afee8ac4853b46ef8c88765ed786396888d0bcd15822765da5584c25c6cdbbbc6b8b85eb0b8dbdd9b300662b1d59479 SHA512 10f6fdc4e4a37a0becb87f99c49888df366248f02b17037faf83068ef00824ecb61022a40b5551f9c8d2db22262ad738d554296bd6b78765dd5f8baf524b2388 AUX iptables-r1.confd 890 BLAKE2B 0aaca870e3c03f19a71cf1b210377dfda320faf118359e298bef419eaf280fd11c9726d200ae89602e863c9b48de0bb51ac05424b50c064afe948a980e300153 SHA512 10002da01ded6be0e9bca6041798ad0859fa2212fde077a048443e4f3012c95d86e4580ae426e87af5891368062af9af6f9fd35ed617d24cdd3c51702b816b13 AUX iptables-r2.init 4384 BLAKE2B d11be1725e25d234e01af86c82d3745fd630b15b3ae2228845c5555db5c2ffdcd920fd565480f76ab91ef2d5b26f9ae96432efc288a1b9aa2abfb5b9bb01d7bf SHA512 8897ab985424c895e261e0fe521921f0da8e09e38394655b0f91c65c0e8f603731faf70489f7a6610c83d6c2fde75f92f309405d72277643165a847e62238df7 AUX iptables.init 2787 BLAKE2B 79c17ba2970d63791dd4d137536b3ccf0f9b6a637d0445049a6fac338ca4e2d1fad927038dfa7ad42a1eb321feac1dc834af09ce0baec554fc9767f199e10b6b SHA512 317c71bee98f5b1bbfd17ea961e5e268532c2320fc865b7876f7cc4e02a66b6a012fc336f8880045a83e101f161197c0a1d106220af6240407cebafbf38022db @@ -17,7 +18,7 @@ DIST iptables-1.8.3.tar.bz2 716257 BLAKE2B 58c606a5753ae2cb8ada9039e4653d2abe03c DIST iptables-1.8.4.tar.bz2 704312 BLAKE2B f677bb9ed2c86e6a39953c0565766991e9647224effdc7db2b563f3f491f6ace2f9073ecc8e865d489101a9f80cf964d9775ab81536412dbd4ca85937432de94 SHA512 a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb EBUILD iptables-1.6.1-r3.ebuild 3264 BLAKE2B f63b279cc34c5bae77bf29173e20e959d769e9caa7487d7a5d9d2777d70a944a2af4d6a6ee0c4360ad018b625b3b9d2e849b8e6021b97eb1dd505646a6962253 SHA512 4d78e90b73f46fcbfa87bef6d6c5fc1ebed6d19a01b6aadaf55549d897c45e6763470cf1d5e02c381844072a6c7380d4f35ff9b8c33efda0711c7afdfe1c228e EBUILD iptables-1.6.2-r2.ebuild 3340 BLAKE2B aad99bac62ba2ec4754e93a211ef82672ad2639011009ade87ead6062221900ec32dcc5bd732fecf3017fd53e22e45d51343e8e6b656768d5d97403ee11daa59 SHA512 744bff7edd5b33d18d8cc28b7f8fba70f692975f2f8f36143524abcd7edec827bf5d7b21b2127ffcb155f542b9520787776968e158af71b1611b1cfad11d463a -EBUILD iptables-1.8.2-r2.ebuild 3473 BLAKE2B c2132e008bfef0937fe15dc509cc2cc5fcd071229a78ad56b77739ed1350326e19e21057d3f12a2f21076633ae64335b772efd9ac6d29bb38be26caeb93a47b4 SHA512 8e8cc152121f0727cbccfc93abe8738c7ef58a3cb08326322680afe7554d0f4330a32ba03041ddafd08a0a096ea21a94cea2fb76b2efa4a4ebb3bc53e459a43b -EBUILD iptables-1.8.3-r1.ebuild 3422 BLAKE2B f502fa3cae58d61d1adf102ad65e68c0debb7761070b2bf5a6d51a2dfd34f68736de74e48637e2ee142bd18b7835be4547fef3136bbdcbb949941a645971060f SHA512 95c4b0bafd83fabc8952d80e093a5e90ef65d9ed756f10a88a4b664f43875abc133ec66a95444e92c5cc8e1d9a86a8decefda29227498ef9d7b8b09d1870be39 -EBUILD iptables-1.8.4.ebuild 3322 BLAKE2B 9bd03747b5375f6c234b6ed22833060434fffcd604efc6eac72961a6b280f07d440edbdbb069361dc7de52da789353f874f359ff37503be1dd9a2c6bf5494af1 SHA512 423b929f018d686843851880464e90057a80cdb6b428a7644ef40d5011b776cf1cdaba337c31502ee68aa52438a57646d6cb9533aa65790cd46ae99df651e5f0 +EBUILD iptables-1.8.2-r2.ebuild 3446 BLAKE2B 9cbf96d3253ddf4bdbbdcdd7bd93b384503528c9ca021523236ebda045a0046c1287236ea473967782cc6eff43653ac573b8ca1425b70f85275697282d330fa9 SHA512 068bec8142df4c2cbe1c0019afb8011be2d22bb72820659e0c8a6079b6bdfb67c1671cb2a9a323cad67a6acff677988838fa387c80ac9e1d54b6891add893674 +EBUILD iptables-1.8.3-r1.ebuild 3402 BLAKE2B ff4b46d0c95ec9ae02b269b32234834553e48ca7884c9dd0b8bf719d84a176b79898d7f3aef6fefc8764774f95b2d3f380cb3a1d4dbde78de612181e685de0ec SHA512 a639d8de9b7884ed51e77fadb40885e2dd83011c609d78dc8c55b362ee1f81b066a854b495ca0adba09fbe5cedf572901e23256340a777b8384e6a0333390330 +EBUILD iptables-1.8.4.ebuild 3302 BLAKE2B 81aa119eca2308416f59b6a1ef8250ea623be4b55f95ccc35f23ec7f52769b57c35b34d2142f1259e644ea6a294a036c97aa2a1a1d50b896b44f707973fd35ff SHA512 e74682d90e770cafcdfc475d4951a26f0f6ebe03d950d3729dd86d00d8c9a4fe599741079023670c4db564f984a4c47d393116c3407680b5ef82706576b91077 MISC metadata.xml 1465 BLAKE2B c60f98672fb6153499b700a436b26b63c0f271c8f8519a3391e486b761ba673c362a7dc5e23b86e3af887270596a1682ea993e643a08215f670f7e3804f095bd SHA512 26bf7e3008dfd705995b15eccaaaa8c79fd488be191570a874b76571a2f9d4648a7c19eb576399ca7bbe849336d7d193f5b6b58a3ff83f87f3c157c53333e987 diff --git a/net-firewall/iptables/files/iptables-1.8.2-link.patch b/net-firewall/iptables/files/iptables-1.8.2-link.patch new file mode 100644 index 000000000000..c20f2e54b804 --- /dev/null +++ b/net-firewall/iptables/files/iptables-1.8.2-link.patch @@ -0,0 +1,24 @@ +From ee4fc7c558d9eb9c37035250046d4eac9af3fa28 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Thu, 27 Dec 2018 23:47:33 +0100 +Subject: [PATCH] Fix link errors for USE="conntrack static-libs" (bug #586106) + +--- + iptables/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/iptables/Makefile.am b/iptables/Makefile.am +index 581dc32..2c3db86 100644 +--- a/iptables/Makefile.am ++++ b/iptables/Makefile.am +@@ -26,6 +26,7 @@ xtables_legacy_multi_LDADD += ../libiptc/libip6tc.la ../extensions/libext6.a + endif + xtables_legacy_multi_SOURCES += xshared.c + xtables_legacy_multi_LDADD += ../libxtables/libxtables.la -lm ++xtables_legacy_multi_LDADD += ${libnetfilter_conntrack_LIBS} + + # iptables using nf_tables api + if ENABLE_NFTABLES +-- +2.19.1 + diff --git a/net-firewall/iptables/iptables-1.8.2-r2.ebuild b/net-firewall/iptables/iptables-1.8.2-r2.ebuild index 65bb18d8aad2..6fdac74e6d4b 100644 --- a/net-firewall/iptables/iptables-1.8.2-r2.ebuild +++ b/net-firewall/iptables/iptables-1.8.2-r2.ebuild @@ -45,8 +45,9 @@ src_prepare() { # use the saner headers from the kernel rm -f include/linux/{kernel,types}.h - # Only run autotools if user patched something - eapply_user && eautoreconf || elibtoolize + eapply "${FILESDIR}"/${P}-link.patch + eapply_user + eautoreconf } src_configure() { diff --git a/net-firewall/iptables/iptables-1.8.3-r1.ebuild b/net-firewall/iptables/iptables-1.8.3-r1.ebuild index 108426718102..52246a8ac413 100644 --- a/net-firewall/iptables/iptables-1.8.3-r1.ebuild +++ b/net-firewall/iptables/iptables-1.8.3-r1.ebuild @@ -47,8 +47,9 @@ src_prepare() { # use the saner headers from the kernel rm include/linux/{kernel,types}.h || die - # Only run autotools if user patched something - eapply_user && eautoreconf || elibtoolize + eapply "${FILESDIR}"/${PN}-1.8.2-link.patch + eapply_user + eautoreconf } src_configure() { diff --git a/net-firewall/iptables/iptables-1.8.4.ebuild b/net-firewall/iptables/iptables-1.8.4.ebuild index 890475e4e57d..8cb78dfb30be 100644 --- a/net-firewall/iptables/iptables-1.8.4.ebuild +++ b/net-firewall/iptables/iptables-1.8.4.ebuild @@ -47,8 +47,9 @@ src_prepare() { # use the saner headers from the kernel rm include/linux/{kernel,types}.h || die - # Only run autotools if user patched something - eapply_user && eautoreconf || elibtoolize + eapply "${FILESDIR}"/${PN}-1.8.2-link.patch + eapply_user + eautoreconf } src_configure() { -- cgit v1.2.3