From 9a84062be5140d2d4531a8f8164b3f64e8c23580 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Sat, 30 Dec 2006 13:43:29 +0000 Subject: [PATCH] Fix patch again, CVS-replacement played tricks on me. Package-Manager: portage-2.1.2_rc2-r2 --- net-firewall/firehol/ChangeLog | 6 ++- net-firewall/firehol/Manifest | 22 ++++---- .../firehol/files/firehol-1.226-to-250.patch | 54 ------------------- 3 files changed, 16 insertions(+), 66 deletions(-) diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog index 34006cf2c0d9..42591663f4ee 100644 --- a/net-firewall/firehol/ChangeLog +++ b/net-firewall/firehol/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/firehol # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.23 2006/12/29 20:50:54 centic Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.24 2006/12/30 13:43:29 centic Exp $ + + 30 Dec 2006; Dominik Stadler + files/firehol-1.226-to-250.patch: + Fix patch again, CVS-replacement played tricks on me. 29 Dec 2006; Dominik Stadler files/firehol-1.226-to-250.patch: diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest index 57bae06408cd..7d5954f39ae0 100644 --- a/net-firewall/firehol/Manifest +++ b/net-firewall/firehol/Manifest @@ -5,10 +5,10 @@ AUX firehol-1.226-to-228.patch 2311 RMD160 9adefc751d465dd193134b3243e6d34300216 MD5 0d4eceaa49f1a12171145a685e42c015 files/firehol-1.226-to-228.patch 2311 RMD160 9adefc751d465dd193134b3243e6d34300216f7c files/firehol-1.226-to-228.patch 2311 SHA256 8a682147e82665124b256d9fadf16d989bf310f2480168e888d4b048e60b910c files/firehol-1.226-to-228.patch 2311 -AUX firehol-1.226-to-250.patch 25621 RMD160 8e0898e86a43a1a4264df8d05a5ebc1227a3e318 SHA1 93fd2d4fe3f8f27a5150610cfdec2aa8841ba09a SHA256 47de5bcfe8f541216fa431b1c5a68421499b3e19c7621431d4ec7ede8188c578 -MD5 51b9dc20ecc9896dfca7c5d637bae049 files/firehol-1.226-to-250.patch 25621 -RMD160 8e0898e86a43a1a4264df8d05a5ebc1227a3e318 files/firehol-1.226-to-250.patch 25621 -SHA256 47de5bcfe8f541216fa431b1c5a68421499b3e19c7621431d4ec7ede8188c578 files/firehol-1.226-to-250.patch 25621 +AUX firehol-1.226-to-250.patch 23787 RMD160 7bce13d4a5b723b3a2cc84d9e9a98b27b5e6b7b7 SHA1 ce91fe0588a9972be0914554726fbdbc8ff5063f SHA256 9f6f7062f46e64b1a49f4e1a3d226af6c493aa433ec20552f1a67cec33671296 +MD5 8ed853939b98c15d4852155c6e8f39ab files/firehol-1.226-to-250.patch 23787 +RMD160 7bce13d4a5b723b3a2cc84d9e9a98b27b5e6b7b7 files/firehol-1.226-to-250.patch 23787 +SHA256 9f6f7062f46e64b1a49f4e1a3d226af6c493aa433ec20552f1a67cec33671296 files/firehol-1.226-to-250.patch 23787 AUX firehol-1.250-printf.patch 1496 RMD160 df025b1bf110ba50b2d8060a145aa79af39a8b26 SHA1 a3450b2b3c94c94be4f64aebdbdbf6a0fc5e3b19 SHA256 35ab81db53612f938ca37f592d85e68260573084c34b598a7c4254b3d3fab071 MD5 bfaa62f4b3eb2956611c1085e61ca673 files/firehol-1.250-printf.patch 1496 RMD160 df025b1bf110ba50b2d8060a145aa79af39a8b26 files/firehol-1.250-printf.patch 1496 @@ -30,10 +30,10 @@ EBUILD firehol-1.250.ebuild 2190 RMD160 578b124cd98abbbac437c7fe2dc98c75313e1715 MD5 06efe9ef2731658fe21789bcb14e3d45 firehol-1.250.ebuild 2190 RMD160 578b124cd98abbbac437c7fe2dc98c75313e1715 firehol-1.250.ebuild 2190 SHA256 19e7224cd23c49b8a6e338c08f00935b70edb8e2ca9467481ea74b85d1ffb3ac firehol-1.250.ebuild 2190 -MISC ChangeLog 4527 RMD160 8f4079c2ad2d24fafa65714ad5529f4aa703ddb1 SHA1 fc72ac55ad3bcefbbbdf7deacf6d9c044ea937cf SHA256 d53f0a3476d7bc93255a0742b57682b9d3f74a72f0518a34372fa8527b8b1c16 -MD5 b1bea8e201a9a3ed4ecfc600066fee5c ChangeLog 4527 -RMD160 8f4079c2ad2d24fafa65714ad5529f4aa703ddb1 ChangeLog 4527 -SHA256 d53f0a3476d7bc93255a0742b57682b9d3f74a72f0518a34372fa8527b8b1c16 ChangeLog 4527 +MISC ChangeLog 4671 RMD160 9d8d99d6c3895aafb98a55f5c13b403b5bd534f1 SHA1 361f5251e58c55e1cfaddc098db4ee9649235e49 SHA256 8fd50757eec9bd6f97c60115ed0fd1588852c7aca1b5d663793c259780aa8742 +MD5 25dcef78ddf5e37638188f8baa2e2e6e ChangeLog 4671 +RMD160 9d8d99d6c3895aafb98a55f5c13b403b5bd534f1 ChangeLog 4671 +SHA256 8fd50757eec9bd6f97c60115ed0fd1588852c7aca1b5d663793c259780aa8742 ChangeLog 4671 MISC metadata.xml 232 RMD160 d8974ec04155ee7c05c49808735fe6d6cca0a541 SHA1 b417ff2a1791163c7ef78c244c84f4ac0dd28396 SHA256 1ee782bb36d2551c41eb7f4dafc946ea2699771f4ea724cca4363b69eb4e84d4 MD5 4086491e8b7c76b8138dc140f7742978 metadata.xml 232 RMD160 d8974ec04155ee7c05c49808735fe6d6cca0a541 metadata.xml 232 @@ -47,7 +47,7 @@ SHA256 33e71811998e454a012d49facc452e1abb8b05c90cf563ce8faf583426f04410 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFlaI17IRIh26aCTkRAhH6AJ9S128bxzQsn/U5zzZkSm9e0fxIqQCeOePE -8pJXIgKDpPPKIMpTUxenXdg= -=6VM2 +iD8DBQFFlo+Q7IRIh26aCTkRAiZHAJ0cmCR3BbprHCVnnMbGCKbH/hkrhwCgurL6 +mARfjVczlyUVGrMzw3A2pwg= +=jr2P -----END PGP SIGNATURE----- diff --git a/net-firewall/firehol/files/firehol-1.226-to-250.patch b/net-firewall/firehol/files/firehol-1.226-to-250.patch index a27116da8635..e8d42846bd20 100644 --- a/net-firewall/firehol/files/firehol-1.226-to-250.patch +++ b/net-firewall/firehol/files/firehol-1.226-to-250.patch @@ -1,15 +1,6 @@ diff -Nur firehol-1.226/firehol.sh firehol-1.226.new/firehol.sh --- firehol-1.226/firehol.sh 2006-12-29 23:48:19.000000000 +0100 +++ firehol-1.226.new/firehol.sh 2006-12-29 23:49:40.000000000 +0100 -@@ -10,7 +10,7 @@ - # - # config: /etc/firehol/firehol.conf - # --# $Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $ -+# $Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $ - # - - # Make sure only root can run us. @@ -74,13 +74,16 @@ return 0 } @@ -102,15 +93,6 @@ diff -Nur firehol-1.226/firehol.sh firehol-1.226.new/firehol.sh which_cmd RENICE_CMD renice which_cmd RM_CMD rm which_cmd SED_CMD sed -@@ -134,7 +171,7 @@ - # Find our minor version - firehol_minor_version() { - ${CAT_CMD} <<"EOF" | ${CUT_CMD} -d ' ' -f 3 | ${CUT_CMD} -d '.' -f 2 --$Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $ -+$Id: firehol-1.226-to-250.patch,v 1.2 2006/12/29 20:50:54 centic Exp $ - EOF - } - @@ -170,6 +207,9 @@ FIREHOL_SAVED="${FIREHOL_DIR}/firehol-save.sh" FIREHOL_TMP="${FIREHOL_DIR}/firehol-tmp.sh" @@ -667,24 +649,6 @@ diff -Nur firehol-1.226/firehol.sh firehol-1.226.new/firehol.sh then exit 0 fi -@@ -5154,7 +5415,7 @@ - else - - ${CAT_CMD} < - FireHOL is distributed under GPL. - -@@ -5340,7 +5601,7 @@ - - ${CAT_CMD} < - FireHOL is distributed under GPL. - Home Page: http://firehol.sourceforge.net @@ -5459,6 +5720,13 @@ if [ ${FIREHOL_WIZARD} -eq 1 ] @@ -713,24 +677,6 @@ diff -Nur firehol-1.226/firehol.sh firehol-1.226.new/firehol.sh } ips2net() { -@@ -5634,7 +5907,7 @@ - - "${CAT_CMD}" >&2 < - FireHOL is distributed under GPL. - Home Page: http://firehol.sourceforge.net -@@ -5717,7 +5990,7 @@ - echo "# " - - ${CAT_CMD} < - # FireHOL is distributed under GPL. - # Home Page: http://firehol.sourceforge.net @@ -6354,11 +6627,11 @@ # Remove the saved firewall, so that the trap will not restore it. ${RM_CMD} -f "${FIREHOL_SAVED}" -- 2.26.2