Drop useless sysctl.h includes #425770 by devsk.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 46 insertions, 9 deletions

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index 742dc7ffac2f..dfa2a4d7ceaf 100644
--- a/net-firewall/ipsec-tools/ChangeLog
+++ b/net-firewall/ipsec-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/ipsec-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.102 2012/09/16 17:57:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.103 2012/09/25 01:12:33 vapier Exp $
+
+  25 Sep 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/ipsec-tools-0.8.0-sysctl.patch, ipsec-tools-0.8.0-r4.ebuild:
+  Drop useless sysctl.h includes #425770 by devsk.
 
   16 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
   ipsec-tools-0.8.0-r3.ebuild:
@@ -456,4 +460,3 @@
   This is the initial commit of ipsec-tools. Thanks for this ebuild go to all
   those involved in testing and developing it, please see Gentoo bug #26796 for
   details.
-
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 747f592a2475..ea06ca66f481 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ipsec-tools-0.8.0-sysctl.patch 485 SHA256 eb94a1f77ac9c194e51c2f64b65d9c8f70ff109fdfe77f72801449277b7312f4 SHA512 a2a96cea5c2b451665d54572e471a6c2b4fb72382dcd90bda536aaabf78cdd36d630d5c1fa56372b95066dc7dffd56480d3402fdbe2d56825a017b2cc075ac66 WHIRLPOOL 54c8f99ef2881e0fdf1e1aaf7c7908e9fac31326da9a15df160f81f4b9a8bb7a4db738ebd8c888c9a0bfae7e558c48231cb6413e1e953309a658ad12bfb9e106
 AUX ipsec-tools-def-psk.patch 907 SHA256 15da775a7da892b7e99f0a6e531bdb9f37cc9d81c004f8a439152445f960f656 SHA512 683f168fac390df602ece1608db7f65370749c291e837497fa68fe4f39ddab907d10d67d4c80d583d7f12a1ea0bf02ba98d228e7c6e9267b49a1a8a7e57e99c4 WHIRLPOOL cfe93bc7e71aa627b973b416acfcdf9f9346ef5237726a079a0da3a383f949bb780624482f1f17b93cc43fc786711c4d8d3abc173f600f05d8790639cbed911a
 AUX ipsec-tools-duplicate-header.patch 440 SHA256 47d31a605a48fc7168cd579f62217316a12b153177bc6b16618d46c38e6936d1 SHA512 b8e91140712c969bda9964b4d6b7cc6c2b4e412dccfb8926574ae075cddf586b019af839a9e43bf382a2774297d6e798d170bb12ca0b2d0058b72dcf32ffa6cb WHIRLPOOL 180eed42a098dfd8a5e9e609ccb27630e344801000b1917e3b078737a8b00d1f9726e7f3be9d78a63f81221d8a4e6a775248b6a0cc7f092056449105ce697898
 AUX ipsec-tools-include-vendoridh.patch 434 SHA256 be0fd6ec217405a6f1ab97231568297e705d995d0f5fa8a6ebae896e1b2e910c SHA512 fc39e09dd7b1a2d3b6cdfbfad9f4978ab5d070ae2435cf77fe2283b566bea1d58cd26dbf6cafb563587200724c9602a32ce737fd163b757872e8a6d2c8007d5c WHIRLPOOL 1507b428ab919b0e45125ec4901af6b3a764a33c98cae6e2df0c061432414cb61e980606d24f55054d4433203f5eca3a123d4dd6dfd74645d7bc222f66cab1bd
@@ -11,18 +12,28 @@ AUX racoon.conf.d 606 SHA256 a5bac8d1d84d11651027f4264a9adac85d18ea8f126abb50439
 AUX racoon.init.d 1314 SHA256 7c9447197032b30a2cb76a62179a3b0ef3768870c340adf4743976e7d65eba75 SHA512 ef882fde450ac1bd4ce4acfefa498699c1959d6a1fa9eb2ea210446007f8107c2203e5fb6c0ef5f21e7687479569bffe84a3815f32748fb103140fa2e8f3737a WHIRLPOOL d31da300e79211dff92568d9d6901b3cefaabbae57806b45f2e61031e11b4ba8afd53b3a2742e9174110291716a53910deb1a188da3ec279f5af2edcfa9281dc
 AUX racoon.init.d-r1 1232 SHA256 d31ca0615464fbc8a3a2a6c6b308ab937e795ca6a1ca7d1a54eadff20caf9825 SHA512 1fa08aff6fe116e8c440600a23bb78385716ad6ab0e6b28d28d63516b9d67c6c592bcd876b198bf6bffa11efe97772399db66c1d2b57e9eaa494983495313f5e WHIRLPOOL d0b691de48313962b04e7a86aeeee1933b03fbbfe322e5e7662229a84d5d5d794bcbb51d0ef45160c25856ec4e1f4e15b435134ddea3378633f5116547c375d7
 AUX racoon.pam.d 156 SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c WHIRLPOOL ba7a0a8c3bb39c5fda69de34b822a19696398e0a8789211ac1faae787ee34f9639eb35efe29c67f874b5f9fe674742503e570f441c005974f4a0c93468b8970b
-DIST ipsec-tools-0.7.3.tar.bz2 776096 SHA256 e6131d010b71d984194eb28267e6c01b49784a17a077bbafae58063f10b33b67
+DIST ipsec-tools-0.7.3.tar.bz2 776096 SHA256 e6131d010b71d984194eb28267e6c01b49784a17a077bbafae58063f10b33b67 SHA512 8612438f95e0ee72b24cca88190027f4dfe611513fd0a5dffe7b0398d2b1dcafee8b30081d0ea2497a173051b8572ed2d62c11a5f6b8c7fcb3e4d45bcfb67a61 WHIRLPOOL 5608cf56032973584253ac6f03e9c8a129d079d93271b08cf6d54b37db55d4dbf1900fa952926b848ba0e33aba8f7febe34bafeaa6ec3f9521180ea418216e36
 DIST ipsec-tools-0.8.0.tar.bz2 809297 SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717 SHA512 3bec6bab4fe555612f1d48966e797202830f5254a8d2146a14d268ff0c68445af790285214db41ab08ee4888625e8e680c3b848c30789d836169d1612a25fe2c WHIRLPOOL 862d2bbf78aca8c9e01e00c995aeb3b662e1ea4a769081b9880a3fee7821ef5968e10fe75d9671268979188c7ca3b91d507a1fc9a097729d0648bc4c965e675d
 EBUILD ipsec-tools-0.7.3-r1.ebuild 5494 SHA256 effba566f785bdd8ae09daf9cdbe8b3457a42dd134666c729f0ffb6822f146be SHA512 22a0ff2fe5b9f072ed3df5cc8ae420ebd28e91a02247bfe69d325aab76f2335b3921bc1e83c29a1dedda2ebddc747e7e0b1f24ad4d269a6d6e30743823b1e276 WHIRLPOOL 53d9d1d74ea96020fd9cbe5dc7a38ed6879dcf62333cf5ee08e21b14ad1ce358297e968c3ca870499091452483f51ff7edccaf94a7113aa5ef44b6d383ada231
 EBUILD ipsec-tools-0.7.3.ebuild 8368 SHA256 f23d7469cbdc95fd0a1a4be9f4662be470aa2485130f169fd533576a498e9e94 SHA512 c8b5b1f9d647c75f6e8e167932dd02ebae767668772216d212ffa99b29b11bd0f79ae1c276c2367d4dfa8b6b5b614be62a16d67ab20942b542966a8ce68c58c2 WHIRLPOOL 8f17703b769c2cb4438279816c9e6aa3dd9c46b8e4a8e3a19a5d2f3c3bd297114a76db92bb5b9eae8716588eff6cca3af14655ef460cf8c7a5a24f95cf9d448f
 EBUILD ipsec-tools-0.8.0-r3.ebuild 6005 SHA256 2902daa99324e62e987b53ba7b3569d41d0a285da9d6c0fdf33a7962deb38452 SHA512 3b50e876a2067c514046e05b9414c5175f0b746e9bf2c0bacb2fa935e85246131d3a2ed289f0eff71f3f0aa1bf642c01929c348feb27b7e21458391440162d4d WHIRLPOOL 8b8ccd178359d6e7dd22618bf6b6b4d812213eacc3b4064abcf76eb83a91256f24bb7d55cd716062b17b790f29352392f3fd34279c8296d63a6c52a30787f8b3
-EBUILD ipsec-tools-0.8.0-r4.ebuild 6012 SHA256 234627faae33facc252c4676d8ee5d8658cd60866bff5a0132bba39bb0c0329a SHA512 e71660109a91c1d0768f13ebd2d50c4733fa083fe0027b3e7fb9974eb1e3848bd1268429a45069b662534db0de7e98696563ebca011461ed7f12353a9f957d5d WHIRLPOOL 04880638e4a9fda5d0f9d4381bb6fff4ce345a3bdf74db8e0f7a3e010ecb4b58ce9d04b97cab0d4325bbe1298ab0259bc0fd4d6fdc39b808b1d3e6094887d104
-MISC ChangeLog 16423 SHA256 f51b9269545045edd900e84f5bb51b11250c0e74b34c4ddba5a8d7310cf23ceb SHA512 3694b423b74cc97feb7689900cd0aca8eb7923eb0a2d4460a4eaa870cb3e3728be15d10bee3ac6466d707d23367f31c36b64642b91930a5b66ebe20df5e0a83c WHIRLPOOL 9df899768944da5b966cdb427478c309a2e7029ae13825812593ca66d312860937036143bb10932385561dcbdb475715fd230dba9a6e90704ea83cb857dcb84b
+EBUILD ipsec-tools-0.8.0-r4.ebuild 6058 SHA256 8d2a487e694546399215337927bb280203bbf55f669b8d5d2fed8a29556f9544 SHA512 60a6185526afab73d90d964063f27de71e0d047811cdfa25d5bb29c10588f3dec1a5ada5e4fbff35d20d73f8206bf7dd39a589f47a015db395013e3151ca2ce0 WHIRLPOOL 38c78828d2c8ca20e761bfb2bfa8378c0457bef2ab5a5ef400a8bf842a6ea56576f3c6a85a8c14953fcc610383651f7469bc09c869e5597e66025c3d8189382f
+MISC ChangeLog 16592 SHA256 42f074325b35b94a0c3948a7f1f76a9958e93a59247a34d96a8f759ae65bd962 SHA512 fb1722b29116f555be784d63792e6151700294bd71dab422a14b6db0dd604290503d4c9afc1c724fbced79818e78eec5ba9fd8ea50292aa7c4200a4f105c100d WHIRLPOOL d1d3297148d4eb12bcbdaea7db2d9f4d84483596235229825cd17b625907be61d50fe365ec7f5ed70a54f16bc64d21f1795b10de1ad3cd24d7896c8d14f95527
 MISC metadata.xml 537 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40 SHA512 9b26b2cd54e00527201339c3936ac717c57fe596e470d84e0dc0715f778b5797488b6cac61dea83bab61714a23a88e44dbd537bfeeb2b37d285653dcb838fab5 WHIRLPOOL a0dd0b61f957875ca3c50db5aa66470ed493be9c4f002bd165d75b41a8ca51cbcfd2567b4702bf1845b8e0a1ca54239e6ed163098d8b613d1f9f459192acc14e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBWEy4ACgkQl5yvQNBFVTU1ugCgoG2jtK5GSQgP9v1RGGnvcD01
-AcoAoJmM+Le/DSrU8/qerFhH4TsbZEEb
-=C7Wm
+iQIcBAEBCAAGBQJQYQUMAAoJELEHsLL7fEFWtTQP/3gqSqdhImWzFKH7ujXhpaFc
+dpnd3C1TS3NMmEIHp4pNvF0mQpYMvDnzV0hKepZTpC8oGglYf7ELHWt3ZBK5DiBF
+Bhr+ZVEgnEpAAKiBsJrc/HjVktx8tfxPHnJq4WDcNNkdyDVuc54xxTiEcWnXUXpu
+3nObelLgFpXkHqOz0NifX6l+7mlJpmSriqUFtPHCPAM5PbV/XEaRqN1UNg/E8e1G
+65fSRfsO9F2KkjwGh8Qv+36A213yBdochQLkNRv9mJ3IQb5PWgfXzEzDEp4mQzTc
+PZxNlfmqbJQHQ0kC+SuKxSM8i72JLznIxUlX+vKhfnnaOYWnGrIzwEwWQWdO5W0t
+ALvt3S9xfGazarJu+0pI3UE1L2fpJHyH0rZcIdze0JNsLtxfSEH58o7a3Uq5Cv2O
+/nVt+COjEp6H9y/SVb16Zk1qJeofrQx9lCV+Yrquixc0eP5E8uy7pG/pbJRMLVd7
+TtReNsropARrMVF6KUjwq1N8crj9hsEVjMQth2hIwxlqBM7tVLlSaDdqmzALlq1E
+tj+yp4wKVmyqZSGgXJuANhLKa9ZdXwubqc1e4dne0HczKhDZ3iFssRu5sYYd5HT/
+Mj78+FBou21P11bojKCLkISn3MJuaDqZcw5a86PxdqeaNcXpwzIl6IUkYm1Q7iDp
+imwq4opXRMrc4BL4jKtJ
+=wKnM
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch b/net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch
new file mode 100644
index 000000000000..5c69bbb2fa61
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/425770
+
+--- a/src/racoon/pfkey.c
++++ b/src/racoon/pfkey.c
+@@ -59,7 +59,6 @@
+ #include <sys/param.h>
+ #include <sys/socket.h>
+ #include <sys/queue.h>
+-#include <sys/sysctl.h>
+ 
+ #include <net/route.h>
+ #include <net/pfkeyv2.h>
+--- a/src/setkey/setkey.c
++++ b/src/setkey/setkey.c
+@@ -40,7 +40,6 @@
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+-#include <sys/sysctl.h>
+ #include <err.h>
+ #include <netinet/in.h>
+ #include <net/pfkeyv2.h>
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild
index 6b3143d25013..2633e35c8e41 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild,v 1.1 2012/09/16 17:54:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild,v 1.2 2012/09/25 01:12:33 vapier Exp $
 
 EAPI="4"
 
@@ -145,6 +145,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-def-psk.patch"
 	epatch "${FILESDIR}/${PN}-include-vendoridh.patch"
+	epatch "${FILESDIR}"/${P}-sysctl.patch #425770
 
 	AT_M4DIR="${S}" eautoreconf
 	epunt_cxx