Clean up patch.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux i686

3 files changed, 19 insertions, 5 deletions

diff --git a/net-analyzer/argus/ChangeLog b/net-analyzer/argus/ChangeLog
index 5d5b076fd6c3..e3b34fa83d83 100644
--- a/net-analyzer/argus/ChangeLog
+++ b/net-analyzer/argus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/argus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.28 2011/04/19 22:01:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.29 2011/04/19 22:08:47 jer Exp $
+
+  19 Apr 2011; Jeroen Roovers <jer@gentoo.org>
+  files/argus-3.0.4-disable-tcp-wrappers-automagic.patch:
+  Clean up patch.
 
 *argus-3.0.5.2 (19 Apr 2011)
 *argus-3.0.4 (19 Apr 2011)
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index fbc39da484f6..940224a56d65 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -1,10 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX argus-2.0.5-gentoo.diff 317 RMD160 ad92b1d58f429a92053322a7ee1a716cb36dc89a SHA1 74402084425a1527e9bb10930d9e0dfa90d8a861 SHA256 dbce18208d928df5069c6991ac2ebbd8c23a4e7959d0112ef49749eeec5f2ccb
 AUX argus-2.0.5-libpcap-include.patch 669 RMD160 77667addf0331c1f5e15b4e2304c466eb96f770f SHA1 ae9aa5bb6b71ab0357670ea34c637589c930c95f SHA256 d2f0e0de3ad41c9505c23e391d91b9a369b4e00c7929145c0a787efe31aeaff2
 AUX argus-2.0.6-libpcap-include.patch 388 RMD160 7b4b0569527352fa6c9c0a25b6dee23db9aabb5b SHA1 4a902ce6a4057d8ee771312d190bd3b1ecf32136 SHA256 71c2356fcfc76543bc1e3b93561cbc5186751369284dccc9c00b3ba946f7eef9
 AUX argus-3.0.2-ac_require_and_cflags.patch 877 RMD160 92ef9d7065cd18070f44016fff5d510fe5b42760 SHA1 3f00a2b888220ff59e695e13104f4c04800315b1 SHA256 76919f8012931ca8b546e241d26a67ca1ff46f317838a474c34f9ddd3505db87
 AUX argus-3.0.2-disable-tcp-wrappers-automagic.patch 587 RMD160 1584b25fbe796b63d1771a0befb66cf1575d44a2 SHA1 208b94ff33f7daafac4d96c6d65f33856f08a755 SHA256 7ad5c6c443f9153d7e540b453b0fc34098681c6ac69f9498926f8b5309d9658c
 AUX argus-3.0.3.8-autoconf-2.65.patch 364 RMD160 8eb078c5e3a5a6b96d9dc549f4604766f8183fef SHA1 74b1da23e514739b3d03af92d4231bd1880d67f8 SHA256 fcb51e96c18750e119280451e1955a200ac0e7d5a9d6554fcedac455cc43000f
-AUX argus-3.0.4-disable-tcp-wrappers-automagic.patch 650 RMD160 b215c7cf906f63b588b4667e4a86fba5c3b82e5a SHA1 4e9c15953b533cac508d531f5a2978aaf3b59254 SHA256 6a97db3663ea7c919200a5e506b5605a993d4d24876d3dfc9e88fa47f5cbd1de
+AUX argus-3.0.4-disable-tcp-wrappers-automagic.patch 578 RMD160 d8ddda090b6002b7fdc7523e9b81e134899d1b61 SHA1 6bfca8bcb69e01b2744f17e8b16b58a5f3d9bedb SHA256 07cc49603b918cffcea733f834b8c16acf292fa66c123d00f49d347224b7d9ff
 AUX argus.initd 479 RMD160 7a52b754edf5219dec6049c216c89d24d3058eb2 SHA1 7ec0457ba22e94adf04b4b75283deac73c5a984c SHA256 df066d772f87e4df2ee1250de6ce4e370a5191fead8d22a2dc84593f4368ce88
 DIST argus-2.0.5.tar.gz 495234 RMD160 4bfb17c791adbc38255a3211c05477a5127c5b8d SHA1 e41abd49da2f5b0783621f35f94cb16f9c3fc4fc SHA256 6db37b526a206ea0b627bd4a5b09cfdf080d75bf367d899472093bdfbb4faa9e
 DIST argus-2.0.6.tar.gz 349299 RMD160 b58888da55153c02c90bfa6e473534c4b081738d SHA1 5316fe07c1bfdee455f4f6bcf53eff7e514403ba SHA256 3e626613ba3348fc60af234777b53fc0a0beb88fe43896aac2b1eda9b22a2c88
@@ -20,5 +23,12 @@ EBUILD argus-3.0.3.7.ebuild 1833 RMD160 99b8f264a1ae4d885d58cb548f696883b39a1da1
 EBUILD argus-3.0.3.8.ebuild 1758 RMD160 ca99ccd2c8b6eb796fd4cd13838584e887f92723 SHA1 8149e39ac9d1f0f2b0cb8fdb4c43b8883c9cfd91 SHA256 31bd925be8274026f7629862a44b5cbb56351116f0caf91eafe8f2369ed243e5
 EBUILD argus-3.0.4.ebuild 1749 RMD160 880147dbd9f2d33737af404daa120fd846654721 SHA1 d49dff06bfa511690b90c2a94d7c328c4b0e2c17 SHA256 8a09bd56f83cdfe5ed1cc16e0caf1e254175341fab427b0f7a73dde02b1c64a1
 EBUILD argus-3.0.5.2.ebuild 1744 RMD160 874da5a9b4abf7d54f623d311a7fb469a132b6c1 SHA1 5071afb7d7956cfaf044cf1816749bb25ddad194 SHA256 212a06accc6a64c73f0b6c5415903359dd28c3ac4dbcff9af98b1283f6458ad3
-MISC ChangeLog 3895 RMD160 38b38ed0dd5f6e1496471bacdbdbe743626fbb54 SHA1 b8cc4669ebf2b1a2ee72d32ef79225be0cf7e9b7 SHA256 470f7f2198f8352257991c07c0530343dfa30c1ab2e666a61404c0f0911e5f15
+MISC ChangeLog 4019 RMD160 dcf40b973b6264e9c95760549e26f9571da3d0c6 SHA1 a057bf4338e203bb58595678f0a5ca47746b8e44 SHA256 94ea669ec8853efcc4cc15c6b76ddce1dd9e204c841914f56274488d225ceb9a
 MISC metadata.xml 249 RMD160 2d5bfee9070b799f81a90c8976fd4890bed297b2 SHA1 642f6a9d8398574e2ff8a4b564a94167624eac32 SHA256 0ee6ce106355df17fe546546ea6658fc7dd7e6d0fab58aef1b745dac3b4c20da
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2uB/UACgkQVWmRsqeSphMJ2ACfczsKMhSEvFduVboVoZ6SbyZN
+0eoAn1+gCI7/UQnaPbaEFgigiuK/FbuG
+=Mdag
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch b/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch
index 17ed31bd7d42..77bde434282c 100644
--- a/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch
+++ b/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch
@@ -1,5 +1,5 @@
---- configure.ac.org	2011-03-01 00:14:18.000000000 +0100
-+++ configure.ac	2011-04-19 23:46:12.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -270,6 +270,11 @@
     LIBS="$LIBS $V_PCAPDEP"
  fi