Move all the patches to the mirrors, this removes a bzip2-compressed file from CVS.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

8 files changed, 24 insertions, 182 deletions

diff --git a/net-firewall/pftop/ChangeLog b/net-firewall/pftop/ChangeLog
index a7f25c717198..bfd9b816da0d 100644
--- a/net-firewall/pftop/ChangeLog
+++ b/net-firewall/pftop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/pftop
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/pftop/ChangeLog,v 1.4 2009/01/27 12:50:32 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/pftop/ChangeLog,v 1.5 2009/06/20 22:37:02 flameeyes Exp $
+
+  20 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> pftop-0.7.ebuild,
+  -files/pftop-0.7-dead.patch, -files/pftop-0.7-pcap.patch,
+  -files/pftop-0.7-pr123670.patch, -files/pftop-0.7-queue.patch.bz2,
+  -files/pftop-0.7-strnvis_fix.patch:
+  Move all the patches to the mirrors, this removes a bzip2-compressed file
+  from CVS.
 
 *pftop-0.7 (27 Jan 2009)
 
diff --git a/net-firewall/pftop/Manifest b/net-firewall/pftop/Manifest
index 49d6aec5c867..e53ee4d589d4 100644
--- a/net-firewall/pftop/Manifest
+++ b/net-firewall/pftop/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pftop-0.7-dead.patch 1073 RMD160 ddb0a6316e301fda384859be0d7465a22a3e4e5f SHA1 2392f74bf57d4b3af57dc074f5101311266a6779 SHA256 872d32059c0ba78d16d4c06efa18e24866b03d7a2c2dc8130ea2047404a5ccf5
-AUX pftop-0.7-pcap.patch 1292 RMD160 44ffd623f49c28de70b08dddc017279570aa2892 SHA1 a3604a0cfb20684389e94df03fe0178ac00c301b SHA256 c2b3b779bb3f1ace70d2575a3528062dec657d6cbc33513f7401746deb0a5c01
-AUX pftop-0.7-pr123670.patch 1167 RMD160 d481a463779ae51192c0730b50409ef9f0383f26 SHA1 4d8a94fff7aa0edd22d4da0ebe049dbaf32366b4 SHA256 2bc87ec2fb4f9a7dd1ddec613b66875362fe5b174ecd31766550eb2cbb2b0eec
-AUX pftop-0.7-queue.patch.bz2 3734 RMD160 3a3217ad6dff859eb977c6687284bb05dddb9651 SHA1 088c21fc9b7907e275ef30b6e717857226b177d3 SHA256 a8babb1877821b8a0d4dfaf4a72dde29ca7d707aad974836a49c11539cc8eff7
-AUX pftop-0.7-strnvis_fix.patch 288 RMD160 66e5da56336a46897092ee7c688888c76553aab7 SHA1 4de93541c464d087bdf5d6cf925e6c3ed2f4fa08 SHA256 0b39f8bdb00157e7f754ac81c66478829c2f858f6d9f8d6d1804869334e2e91f
 DIST pftop-0.5.tar.gz 24855 RMD160 f52b482534d210770a616a5dee2eb8910751e0ed SHA1 a735c05414d78a7155e99233529f6deb7e3035c4 SHA256 e5d0fd0d84285a52fd0d1944908d4c3e4f545ec0f0e11e9f9c29ce1536a9d0b7
+DIST pftop-0.7-patches-1.tar.bz2 5403 RMD160 4854735922fd93be5dd5f1b61fcea173d095e462 SHA1 9ba9b116997e6daf2d9f769c83717bf5477c6246 SHA256 35564dbfc45859fee9d59b90cda510ca642e4a17ef2fdd5a771937a5fcbb96dc
 DIST pftop-0.7.tar.gz 59765 RMD160 0e0c09e5feeb07deba8b540233dcb946ba0b4508 SHA1 651afa532cfc8cf59c3598704deb9bf3788ac9e9 SHA256 afde859fab77597e4aae1ef6b87f1bb26a5ad8cb2b1d7316a12e5098153492af
 EBUILD pftop-0.5.ebuild 1122 RMD160 e65df345e3b366134c701eb38548a671dab59999 SHA1 2ea1b5e623e151db98c84b90397a525619f35250 SHA256 f24a702bda201eaca9e908d189d19555389e4c1fc8e2c9c17a5255cae9136d6a
-EBUILD pftop-0.7.ebuild 1487 RMD160 1197a041dec2e89f4bfd67de4d08b7e2e9b555ff SHA1 22169596872c25555fcf2b0a661e0effc6979ce0 SHA256 08b125734d8c672429b36974f36eaf0787d1da46c39942097b3ecbb852227561
-MISC ChangeLog 914 RMD160 dd0f44c436e7ef0470b40abf22e6010a450395e1 SHA1 b3b455ed6ab72c2a30e3c2f4b0bcda8a3f75e8c2 SHA256 528ffd043e660d9e52e31e7004edb45f4e209f0df8ecb7fd3fcab29791fb115f
+EBUILD pftop-0.7.ebuild 1356 RMD160 5d7cfce42f1c305aa17260d2254ba4e81f51ffc8 SHA1 34234176415385f213a438aaa295d9327b83eb6d SHA256 17ac256bb0510c305d7c354295bdf8815df34efd44550bd8a01f8ef4ea43efc3
+MISC ChangeLog 1245 RMD160 22f4b1d7a241756521fc787394972ac73297ea3a SHA1 b134dfae0c9d9b78624ac8db57ea3200aa43cb23 SHA256 4d807ee7db90b276421e7a3e81ac0f1ae7ec07fbfde96970818457a2dc1db669
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (FreeBSD)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkl/AwoACgkQoAP6MIsfg8JukQCeKNnp9eadiNaUaHb5nvGXcylZ
-0poAn1zBWc7/UAlue+K7znN1mKwiyp62
-=KnqL
+iEYEARECAAYFAko9ZJQACgkQAiZjviIA2Xh1/QCfUo6bYvu830j/7UZyAZEunoE/
+KFIAn1sMPv802vJO7jas1W1BD5C4fvLP
+=x8Mq
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/pftop/files/pftop-0.7-dead.patch b/net-firewall/pftop/files/pftop-0.7-dead.patch
deleted file mode 100644
index 70aa19a420dd..000000000000
--- a/net-firewall/pftop/files/pftop-0.7-dead.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch from FreeBSD ports.
-
---- pftop-0.7.orig/sf-gencode.c
-+++ pftop-0.7/sf-gencode.c
-@@ -32,7 +32,7 @@
- #include <netinet/in.h>
- #include <netinet/if_ether.h>
- 
--#include <net/if_pflog.h>
-+/* #include <net/if_pflog.h> */
- #include <net/pfvar.h>
- 
- #include <netdb.h>
-@@ -60,7 +60,7 @@
- static char sf_errbuf[PFTOP_ERRBUF_SIZE];
- 
- /* VARARGS */
--__dead void
-+__dead2 void
- sf_error(const char *fmt, ...)
- {
- 	va_list ap;
---- pftop-0.7.orig/sf-gencode.h
-+++ pftop-0.7/sf-gencode.h
-@@ -169,7 +169,7 @@
- struct arth  *gen_loadexpire(void);
- 
- void bpf_optimize(struct block **);
--__dead void bpf_error(const char *, ...)
-+__dead2 void bpf_error(const char *, ...)
-     __attribute__((volatile, __format__ (printf, 1, 2)));
- 
- void finish_parse(struct block *);
-@@ -184,7 +184,7 @@
- #define JT(b)  ((b)->et.succ)
- #define JF(b)  ((b)->ef.succ)
- 
--__dead void sf_error(const char *fmt, ...);
-+__dead2 void sf_error(const char *fmt, ...);
- const char *sf_get_error(void);
- int sf_compile(struct bpf_program *, char *, int, bpf_u_int32);
- void sf_freecode(struct bpf_program *);
diff --git a/net-firewall/pftop/files/pftop-0.7-pcap.patch b/net-firewall/pftop/files/pftop-0.7-pcap.patch
deleted file mode 100644
index 5c012ffbc12e..000000000000
--- a/net-firewall/pftop/files/pftop-0.7-pcap.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Fix compilation against libpcap-1.0.0.
-
---- pftop-0.7.orig/bpf_dump.c
-+++ pftop-0.7/bpf_dump.c
-@@ -33,10 +33,10 @@
- #include <stdio.h>
- 
- 
--extern void bpf_dump(struct bpf_program *, int);
-+extern void bpf_dump(const struct bpf_program *, int);
- 
- void
--bpf_dump(struct bpf_program *p, int option)
-+bpf_dump(const struct bpf_program *p, int option)
- {
- 	struct bpf_insn *insn;
- 	int i;
---- pftop-0.7.orig/bpf_filter.c
-+++ pftop-0.7/bpf_filter.c
-@@ -134,7 +134,7 @@
- }
- #endif
- 
--#include <net/bpf.h>
-+//#include <net/bpf.h>
- 
- /*
-  * Execute the filter program starting at pc on the packet p
-@@ -143,8 +143,8 @@
-  */
- u_int
- bpf_filter(pc, p, wirelen, buflen)
--	struct bpf_insn *pc;
--	u_char *p;
-+	const struct bpf_insn *pc;
-+	const u_char *p;
- 	u_int wirelen;
- 	u_int buflen;
- {
---- pftop-0.7.orig/bpf_image.c
-+++ pftop-0.7/bpf_image.c
-@@ -36,7 +36,7 @@
- 
- char *
- bpf_image(p, n)
--	struct bpf_insn *p;
-+	const struct bpf_insn *p;
- 	int n;
- {
- 	int v;
---- pftop-0.7.orig/sf-gencode.h
-+++ pftop-0.7/sf-gencode.h
-@@ -188,7 +188,7 @@
- const char *sf_get_error(void);
- int sf_compile(struct bpf_program *, char *, int, bpf_u_int32);
- void sf_freecode(struct bpf_program *);
--void bpf_dump(struct bpf_program *, int);
-+void bpf_dump(const struct bpf_program *, int);
- 
- extern int no_optimize;
- 
diff --git a/net-firewall/pftop/files/pftop-0.7-pr123670.patch b/net-firewall/pftop/files/pftop-0.7-pr123670.patch
deleted file mode 100644
index 537c1daa3d06..000000000000
--- a/net-firewall/pftop/files/pftop-0.7-pr123670.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- pftop.c.orig	2007-11-07 01:36:46.000000000 -0500
-+++ pftop.c	2008-05-16 15:57:12.000000000 -0400
-@@ -1486,7 +1486,13 @@
- 	print_fld_size(FLD_BYTES, pr->bytes);
- #endif
- 	print_fld_uint(FLD_RULE, pr->nr);
--	print_fld_str(FLD_DIR, pr->direction == PF_OUT ? "Out" : "In");
-+	if (pr->direction == PF_IN)
-+		print_fld_str(FLD_DIR, "In");
-+	else if (pr->direction == PF_OUT)
-+		print_fld_str(FLD_DIR, "Out");
-+	else
-+		print_fld_str(FLD_DIR, "Any");
-+
- 	if (pr->quick)
- 		print_fld_str(FLD_QUICK, "Quick");
- 
-@@ -1570,10 +1576,10 @@
- #ifdef HAVE_RULE_UGID
- 	if (pr->uid.op)
- 		tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
--		        "user", UID_MAX);
-+		        "user", UINT_MAX);
- 	if (pr->gid.op)
- 		tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
--		        "group", GID_MAX);
-+		        "group", UINT_MAX);
- #endif
- 
- 	if (pr->flags || pr->flagset) {
-@@ -1765,7 +1771,12 @@
- 				  strerror(errno));
- 			return (-1);
- 		}
-+#ifdef PFALTQ_FLAG_IF_REMOVED
-+		if (pa.altq.qid > 0 &&
-+		    !(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) {
-+#else
- 		if (pa.altq.qid > 0) {
-+#endif
- 			pq.nr = nr;
- 			pq.ticket = pa.ticket;
- 			pq.buf = &qstats;
diff --git a/net-firewall/pftop/files/pftop-0.7-queue.patch.bz2 b/net-firewall/pftop/files/pftop-0.7-queue.patch.bz2
deleted file mode 100644
index 84e0c0d06265..000000000000
--- a/net-firewall/pftop/files/pftop-0.7-queue.patch.bz2
+++ /dev/null
diff --git a/net-firewall/pftop/files/pftop-0.7-strnvis_fix.patch b/net-firewall/pftop/files/pftop-0.7-strnvis_fix.patch
deleted file mode 100644
index 73b4be6146cf..000000000000
--- a/net-firewall/pftop/files/pftop-0.7-strnvis_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix from FreeBSD ports.
-
---- sf-scanner.l.orig
-+++ sf-scanner.l
-@@ -233,7 +233,7 @@
- 			size_t len = strlen(yytext) * 4 + 1;
- 			char *v = malloc(len);
- 			if (v != NULL)
--				strnvis(v, yytext, len, 0);
-+				strvis(v, yytext, 0);
- 			sf_error("illegal token: %s", v);
- 			free(v);
- 			}
diff --git a/net-firewall/pftop/pftop-0.7.ebuild b/net-firewall/pftop/pftop-0.7.ebuild
index 782a44ed0eda..c03516301f44 100644
--- a/net-firewall/pftop/pftop-0.7.ebuild
+++ b/net-firewall/pftop/pftop-0.7.ebuild
@@ -1,13 +1,15 @@
-# Copyright 2006-2009 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/pftop/pftop-0.7.ebuild,v 1.1 2009/01/27 12:50:32 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/pftop/pftop-0.7.ebuild,v 1.2 2009/06/20 22:37:02 flameeyes Exp $
 
-inherit bsdmk flag-o-matic
-DESCRIPTION="Pftop: curses-based utility for real-time display of active states and rule statistics for pf"
+PATCH_PV=1
 
-HOMEPAGE="http://www.eee.metu.edu.tr/~canacar/pftop/"
+inherit bsdmk flag-o-matic eutils
 
-SRC_URI="http://www.eee.metu.edu.tr/~canacar/${P}.tar.gz"
+DESCRIPTION="Pftop: curses-based utility for real-time display of active states and rule statistics for pf"
+HOMEPAGE="http://www.eee.metu.edu.tr/~canacar/pftop/"
+SRC_URI="http://www.eee.metu.edu.tr/~canacar/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCH_PV}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -19,11 +21,7 @@ RDEPEND="sys-libs/ncurses"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.7-pcap.patch"
-	epatch "${FILESDIR}/${PN}-0.7-dead.patch"
-	epatch "${FILESDIR}/${PN}-0.7-pr123670.patch"
-	epatch "${FILESDIR}/${PN}-0.7-queue.patch.bz2"
-	epatch "${FILESDIR}/${PN}-0.7-strnvis_fix.patch"
+	epatch "${WORKDIR}"/patches/*
 }
 
 src_compile() {