Gentoo Archives: gentoo-commits

From: Yuta SATOH <nigoro.gentoo@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-pf/, sys-freebsd/freebsd-pf/files/
Date: Fri, 30 Aug 2013 18:30:48
Message-Id: 1377886487.53df1bfad96e6ba3ecfec046a6638b7298fcac57.yuta_satoh@gentoo
1 commit: 53df1bfad96e6ba3ecfec046a6638b7298fcac57
2 Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
3 AuthorDate: Fri Aug 30 18:14:47 2013 +0000
4 Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
5 CommitDate: Fri Aug 30 18:14:47 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=53df1bfa
7
8 freebsd-pf-9999_p255023: update patch
9
10 ---
11 sys-freebsd/freebsd-pf/Manifest | 4 +++-
12 .../freebsd-pf/files/freebsd-pf-9999-libevent.patch | 16 ++++++++++++++++
13 .../freebsd-pf/files/freebsd-pf-9999-pflogd.patch | 15 +++++++++++++++
14 sys-freebsd/freebsd-pf/freebsd-pf-9999_p255023.ebuild | 4 ++--
15 4 files changed, 36 insertions(+), 3 deletions(-)
16
17 diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
18 index b795061..6f274a2 100644
19 --- a/sys-freebsd/freebsd-pf/Manifest
20 +++ b/sys-freebsd/freebsd-pf/Manifest
21 @@ -3,7 +3,9 @@ AUX freebsd-pf-9.0-getline.patch 1159 SHA256 c56fa01870e2ea7ea187b14ef0d13801782
22 AUX freebsd-pf-9.0-libevent.patch 384 SHA256 e1331cdc64d5d135f3cf33bea70031cba7813abc39778f860f06a161c395f799 SHA512 763c352e5a1e789e5d634066cfa7de84199db14a1f0d61b699f84f04ef1a2acb82dd63d59cffa339ff673bf92a3a9aab25f4b60fb5928e040e47b8c43b6a93f8 WHIRLPOOL ac352886754590178c550aa755a2380e493cccb66815f2875e03427d5d644394de5f711b6d01625a49fafabb4df1e63bff89ea19f47f99b1f6252ff7ca248ab2
23 AUX freebsd-pf-9.0-pcap_pollution.patch 450 SHA256 d6ec6b1952e22f621b33d85956837bae26fd06a79cd3daf5e073b889d4650276 SHA512 262d23f74449f75d628dcda09a7c7e0d501b61899c0a2a1ca71179989803f5c5f70fd4f8908f06ce998aca994d54b43efe03578892ff121c0a27e7fa36e4f1dd WHIRLPOOL 9dd4be7cf9741a8cbb0395346a79656233532b10762551d04c85a36637bd95e5d1aed0024ba1ee4259d41d1b5d26777524353787d3c13ad12e4dfb21f12955cf
24 AUX freebsd-pf-9.0-pflogd.patch 332 SHA256 fc832fdfa406603a2cb185b8f0f746b13f7673742578913ba635849e1fd778f6 SHA512 7bc7ea7695504a236b7f0aef2598ce577314843e0937258a68b21a7a246db733b9952e6822c938aac9f31409ddaef6753abe7f5143a514d4875abab4aec3f073 WHIRLPOOL b90b5e454e96cc6f243e99358b78d45b6a13a46810a3683d837f03721052e7b4fc3f8733ac2c96cabed204435a9be93a0652da5311f6552ece294031b0b663df
25 +AUX freebsd-pf-9999-libevent.patch 403 SHA256 b3de99dbc75a116ae46fec1aeaab0bfcc7448a87b963e9defbb94238bb79bee0 SHA512 1ec0d97afd9392c852071d6df704b05a0ca3146a20a3daa4ac541291a2a30c7c8752330381e1f3ae3d874640dd2f04d4b94c5b4adf985a3fbf8890da6a7f9b0b WHIRLPOOL 9cfa4b4b751737b224c43eb75a6eb27ba2e02f2c99829ce8327956d5b0aa381afce7cb86455bc97792ffbe66d8919959865f0c4a5ba44302391c8ea91c7bc065
26 +AUX freebsd-pf-9999-pflogd.patch 349 SHA256 630346adc5d39d32112ebb299391b728a0e22b517376fa5f1d872593186f3800 SHA512 d4a605bb1a31837bfb0fa5d20fbac5ed449e4d579c5ab6025da2988ff101c31df7c67e23f9863f2f0b98a76788123e06402d8790d1c9baafd5b732dff0678644 WHIRLPOOL 388b3e724a6971e17867fc4749ea8769d56327a07fbba318f6e4d052ac049f78cc673911cca28dc37dbc3ca93f47eee061c07c0854101cefe6919b373746ebe1
27 AUX pf.confd 274 SHA256 dba0e34d34ef583b3a06499eae5f5dd9a73cacdb238915060735e24bd6c2c8eb SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5 WHIRLPOOL fa87094a2339af4fc117840741e6460331c8de1d7ff656394701d58d0f362243788b1d6e650ee2cea34e9e4ad9c19f97996de8d01927808875384af2925a8adc
28 AUX pf.initd 916 SHA256 b0cf7dadb825a1133fb52069e63eda10042aa62e3fa702bfbee53cd455837ac9 SHA512 cd55eccc9735f5a9e41297049a12c23b3fb4ef0987236b25bbfeeb01e7e0be697ff60fe8c9827dbb6a3da93211d6534e018a9693a6d1d48d60723738a21e7485 WHIRLPOOL babaa4fdcb885262ec9e89b9bd076aa4fec0c82764025d3192dda6986366b2f0169235c4c771510ea742444deb0c7bccf56f4ab23fb592351decae445b9cc158
29 EBUILD freebsd-pf-9.9999.ebuild 1685 SHA256 b739670e6fadd541f2958a5fb079b93dc3149d6404d1d7052074d11b8cf0c947 SHA512 1b13bf3d371bcd585293ab2989f53b84a63982026a5cae0a013fd23a4ca0b48abb3a15f93fb66bd5b84334026530dc7b7fef2e0d47b04ec48d0d8fc02fc51f4e WHIRLPOOL 963dd480b5250bb76645881e6b6aad404bd6d72c9a408485c3506652345d2f637ce07067dfd14016d0439df246c48107c991631b48dd6525a56eb5d4aa00f550
30 -EBUILD freebsd-pf-9999_p255023.ebuild 1685 SHA256 b739670e6fadd541f2958a5fb079b93dc3149d6404d1d7052074d11b8cf0c947 SHA512 1b13bf3d371bcd585293ab2989f53b84a63982026a5cae0a013fd23a4ca0b48abb3a15f93fb66bd5b84334026530dc7b7fef2e0d47b04ec48d0d8fc02fc51f4e WHIRLPOOL 963dd480b5250bb76645881e6b6aad404bd6d72c9a408485c3506652345d2f637ce07067dfd14016d0439df246c48107c991631b48dd6525a56eb5d4aa00f550
31 +EBUILD freebsd-pf-9999_p255023.ebuild 1687 SHA256 539cff0b73c760c1ddb610cc89c9f9cc5b6c24b5a8da6ea39289adb7f441b35f SHA512 8c8290b1167842e1eebf3d49df0483ba73d1b7f58e1e67155f172586bb677222ad8a2d3c1ecb82308326f3c7435dc569b29663cb947d6319c218993c9748fe1d WHIRLPOOL ad7ccd93555d4712619ab4a4fd55b0d6ce3fc004b17ddbf5c9f61a21124d4a4d5f7c0aa1d920c49f87d67f76b1965708cfd7945ffd00b84b3ef6b03f1580f2ea
32
33 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9999-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9999-libevent.patch
34 new file mode 100644
35 index 0000000..57474ea
36 --- /dev/null
37 +++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9999-libevent.patch
38 @@ -0,0 +1,16 @@
39 +diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
40 +index de49888..2ab32fb 100644
41 +--- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile
42 ++++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
43 +@@ -7,10 +7,7 @@ MAN= ftp-proxy.8
44 +
45 + SRCS= ftp-proxy.c filter.c
46 +
47 +-CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent
48 +-
49 +-LDADD+= ${LIBEVENT}
50 +-DPADD+= ${LIBEVENT}
51 ++LDADD+= -levent
52 +
53 + WARNS?= 3
54 +
55
56 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9999-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9999-pflogd.patch
57 new file mode 100644
58 index 0000000..1316d3b
59 --- /dev/null
60 +++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9999-pflogd.patch
61 @@ -0,0 +1,15 @@
62 +diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile
63 +index fcff8eb..0da383d 100644
64 +--- a/sbin/pflogd/Makefile
65 ++++ b/sbin/pflogd/Makefile
66 +@@ -6,10 +6,7 @@ PROG= pflogd
67 + SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c
68 + MAN= pflogd.8
69 +
70 +-CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h
71 +-
72 + LDADD= -lpcap
73 +-DPADD= ${LIBPCAP}
74 +
75 + WARNS?= 2
76 +
77
78 diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9999_p255023.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9999_p255023.ebuild
79 index d0a8563..9c486d9 100644
80 --- a/sys-freebsd/freebsd-pf/freebsd-pf-9999_p255023.ebuild
81 +++ b/sys-freebsd/freebsd-pf/freebsd-pf-9999_p255023.ebuild
82 @@ -38,8 +38,8 @@ src_unpack() {
83 # pcap-int.h redefines snprintf as pcap_snprintf
84 epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch"
85 # Use system's libevent
86 - epatch "${FILESDIR}/${PN}-9.0-libevent.patch"
87 - epatch "${FILESDIR}/${PN}-9.0-pflogd.patch"
88 + epatch "${FILESDIR}/${PN}-9999-libevent.patch"
89 + epatch "${FILESDIR}/${PN}-9999-pflogd.patch"
90 epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
91 epatch "${FILESDIR}/${PN}-9.0-getline.patch"
92 # Link in kernel sources