gentoo resync : 16.06.2018

4 files changed, 0 insertions, 69 deletions

diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index f9bd74647657..b3be110be706 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -1,10 +1,7 @@
 AUX freebsd-pf-11.1-libevent.patch 305 BLAKE2B cce2abce33431885196c5bc44c7e38582b2c7db273ddd3b7d4c8b58dbd9902cbc6e2a5031f5cddd28db9361eafd75c98fc0ca8d14e822305ead12aa035990c5f SHA512 a75ff98e8d87ec5182bb1a7226b34d6223500c0a5659727392d97d69d1a66af6d439d4c23a6817740c25306654468e82e52ddfa591d4509001e407e099c83b44
 AUX freebsd-pf-11.1-pflogd.patch 363 BLAKE2B fac873813332149adc13e5b1a77cd8532c12bae7ee1c93644af31e517e7697cdd8e7c59412e7dbb616c97baabb6308049bd7c995b5e803627f6cc3049056380e SHA512 bceaf0f234948acf30aab4391d73c7545bd860dc5b2bba8eb8da1a9791de905654450592674c75419a8dc0646215ba5bcdd885d61cac336d34c017a7c57039fd
 AUX freebsd-pf-9.0-bpf.patch 309 BLAKE2B 38d4382e437301da49388333b18541699299f033df83e88decd9ba41a62a2b349facd00af806f2c414cfc5e2d356ff6025dadce40abe5767257391b741d1e62f SHA512 e3364e372b5c2d2c4a1960ee1f6d5fa411810ba3597356ec17b275afd8bb6813cce62d781fc683663037b008d81804d28a2617f308c942a741657cf8dcf0e039
-AUX freebsd-pf-9.0-getline.patch 1159 BLAKE2B a9920741120762771581510c8d97e2ddf33c6c9757891cb697a7452bd56ea410dca573cb0b312994f675c89430c882f0a51f1070b4086133e8101f5227377f82 SHA512 2b7ab780e8a66a63e17302f9de19a9a72c7246b349f16745fbe7a2a69d8c83c9d8c5c7e18311bf0273620ce18cd9add6dcf051364013f941d477dbbf165b3ddb
-AUX freebsd-pf-9.0-libevent.patch 384 BLAKE2B 381a15deccbe2ecaf7baa9310866b784f4a734707e5460c8cbdf4b473d65d59de22013e3da540c506a7a483a7ff56517b25791bd28bde5b7bae6d079b17b85c6 SHA512 763c352e5a1e789e5d634066cfa7de84199db14a1f0d61b699f84f04ef1a2acb82dd63d59cffa339ff673bf92a3a9aab25f4b60fb5928e040e47b8c43b6a93f8
 AUX freebsd-pf-9.0-pcap_pollution.patch 450 BLAKE2B daf9a836b6c8243e8b452c0e68bc740b4d5266460dc12615f2cc8361dbb000fe7c844f42bfb7b6c496f6856f8f1557261b2847ba92c9f57ef9e8885c93ffcf5c SHA512 262d23f74449f75d628dcda09a7c7e0d501b61899c0a2a1ca71179989803f5c5f70fd4f8908f06ce998aca994d54b43efe03578892ff121c0a27e7fa36e4f1dd
-AUX freebsd-pf-9.0-pflogd.patch 332 BLAKE2B 99686ab51741c4b7fd0d72b56743c0306319402cc01b038f9dce8165853fce80b0e7d9c9c34e9e25656b17974a63c8a039b8aa1c98ec7cd429b2e5991e0a0f7a SHA512 7bc7ea7695504a236b7f0aef2598ce577314843e0937258a68b21a7a246db733b9952e6822c938aac9f31409ddaef6753abe7f5143a514d4875abab4aec3f073
 AUX pf.confd 274 BLAKE2B ed3466c836e7c4958d371d7858cf15e532140c1d3afe7e3b2155275f24ec245628d2936d8ac26eba13bbb88b9d86ad13e5f662f0f37ae813a98e92428e160fae SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5
 AUX pf.initd 803 BLAKE2B 8f3d10adae448a429b2e08954b5a3d3025d9cdde90073fed0b50f900de47c8e4611fd406409047fe8ad1f25c69465fe7954e8b3c937ad507b45fdd8096a9a4de SHA512 b447683fb3abd11a6c5158b452ac9a72858c0a57bb424a1ec3a4cc8dce09336228d6e43ce0c58a63d63ee3917211227a6c5f1d4ac4bde42ce7fc5aa6d188f28d
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch
deleted file mode 100644
index 6679d32e8060..000000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- contrib/pf/ftp-proxy/ftp-proxy.c.old	2011-11-02 21:18:19.000000000 +0000
-+++ contrib/pf/ftp-proxy/ftp-proxy.c	2011-11-02 21:18:36.000000000 +0000
-@@ -103,7 +103,7 @@
- int	drop_privs(void);
- void	end_session(struct session *);
- void	exit_daemon(void);
--int	getline(char *, size_t *);
-+int	ftpgetline(char *, size_t *);
- void	handle_connection(const int, short, void *);
- void	handle_signal(int, short, void *);
- struct session * init_session(void);
-@@ -249,7 +249,7 @@
- 		    buf_avail);
- 		s->cbuf_valid += clientread;
- 
--		while ((n = getline(s->cbuf, &s->cbuf_valid)) > 0) {
-+		while ((n = ftpgetline(s->cbuf, &s->cbuf_valid)) > 0) {
- 			logmsg(LOG_DEBUG, "#%d client: %s", s->id, linebuf);
- 			if (!client_parse(s)) {
- 				end_session(s);
-@@ -343,7 +343,7 @@
- }
- 
- int
--getline(char *buf, size_t *valid)
-+ftpgetline(char *buf, size_t *valid)
- {
- 	size_t i;
- 
-@@ -1087,7 +1087,7 @@
- 		    buf_avail);
- 		s->sbuf_valid += srvread;
- 
--		while ((n = getline(s->sbuf, &s->sbuf_valid)) > 0) {
-+		while ((n = ftpgetline(s->sbuf, &s->sbuf_valid)) > 0) {
- 			logmsg(LOG_DEBUG, "#%d server: %s", s->id, linebuf);
- 			if (!server_parse(s)) {
- 				end_session(s);
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch
deleted file mode 100644
index e488423fc09a..000000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- usr.sbin/ftp-proxy/ftp-proxy/Makefile.old	2011-11-02 20:57:03.000000000 +0000
-+++ usr.sbin/ftp-proxy/ftp-proxy/Makefile	2011-11-02 20:57:21.000000000 +0000
-@@ -7,11 +7,9 @@
- 
- SRCS=	ftp-proxy.c filter.c
- 
--CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent
- CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf
- 
--LDADD+= ${LIBEVENT}
--DPADD+= ${LIBEVENT}
-+LDADD+= -levent
- 
- WARNS?=	3
- 
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch
deleted file mode 100644
index d5a65eab928c..000000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- sbin/pflogd/Makefile.old	2011-11-02 21:08:46.000000000 +0000
-+++ sbin/pflogd/Makefile	2011-11-02 21:08:53.000000000 +0000
-@@ -6,10 +6,7 @@
- SRCS= 	pflogd.c pidfile.c privsep.c privsep_fdpass.c
- MAN=	pflogd.8
- 
--CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h
--
- LDADD=	-lpcap
--DPADD=	${LIBPCAP} ${LIBUTIL}
- 
- WARNS?=	2
-