commit: 0bc1abf1b13c6026b0200a253e4c07c52eeaf65b
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 13 17:50:36 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 18:51:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc1abf1
sys-freebsd/freebsd-pf: remove unused patches
.../freebsd-pf/files/freebsd-pf-9.0-getline.patch | 38 ----------------------
.../freebsd-pf/files/freebsd-pf-9.0-libevent.patch | 15 ---------
.../freebsd-pf/files/freebsd-pf-9.0-pflogd.patch | 13 --------
3 files changed, 66 deletions(-)
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 6679d32e806..00000000000
--- 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 e488423fc09..00000000000
--- 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 d5a65eab928..00000000000
--- 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
-
