diff options
Diffstat (limited to 'sys-freebsd/freebsd-pf/files')
5 files changed, 93 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch new file mode 100644 index 000000000000..fb3c7012eccf --- /dev/null +++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch @@ -0,0 +1,10 @@ +--- contrib/pf/pflogd/pflogd.c.old 2011-11-02 21:12:57.000000000 +0000 ++++ contrib/pf/pflogd/pflogd.c 2011-11-02 21:13:11.000000000 +0000 +@@ -39,6 +39,7 @@ + #include <sys/stat.h> + #include <sys/socket.h> + #include <net/if.h> ++#include <net/bpf.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> 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 new file mode 100644 index 000000000000..6679d32e8060 --- /dev/null +++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch @@ -0,0 +1,38 @@ +--- 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 new file mode 100644 index 000000000000..e488423fc09a --- /dev/null +++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch @@ -0,0 +1,15 @@ +--- 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-pcap_pollution.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch new file mode 100644 index 000000000000..184ab6f31bc4 --- /dev/null +++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch @@ -0,0 +1,17 @@ +--- contrib/pf/pflogd/privsep.c.old 2011-11-02 21:04:01.000000000 +0000 ++++ contrib/pf/pflogd/privsep.c 2011-11-02 21:04:27.000000000 +0000 +@@ -32,11 +32,13 @@ + #include <errno.h> + #include <fcntl.h> + #include <limits.h> ++#include <stdio.h> ++#define HAVE_SNPRINTF ++#define HAVE_STRLCPY + #include <pcap.h> + #include <pcap-int.h> + #include <pwd.h> + #include <signal.h> +-#include <stdio.h> + #include <stdlib.h> + #include <string.h> + #include <syslog.h> 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 new file mode 100644 index 000000000000..d5a65eab928c --- /dev/null +++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch @@ -0,0 +1,13 @@ +--- 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 + |