1 |
commit: 36ff33603222f02db016a4a184e676f1e5b5c745 |
2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 2 07:17:57 2020 +0000 |
4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 2 07:19:44 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ff3360 |
7 |
|
8 |
net-firewall/ipt_netflow: drop old version |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
11 |
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> |
12 |
|
13 |
net-firewall/ipt_netflow/Manifest | 1 - |
14 |
.../ipt_netflow/files/ipt_netflow-2.3-flags.patch | 55 ----------- |
15 |
.../files/ipt_netflow-2.4-bridge_netfilter.patch | 61 ------------ |
16 |
net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild | 105 --------------------- |
17 |
4 files changed, 222 deletions(-) |
18 |
|
19 |
diff --git a/net-firewall/ipt_netflow/Manifest b/net-firewall/ipt_netflow/Manifest |
20 |
index 592cc2926c3..595c50a16e3 100644 |
21 |
--- a/net-firewall/ipt_netflow/Manifest |
22 |
+++ b/net-firewall/ipt_netflow/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST ipt_netflow-2.4.tar.gz 92580 BLAKE2B 0197e7e5cdd9c94c7b80b38cb4e2879343139592421922bf73aeaac70ac3af54ea25934bb1474ff455a9f58eab2368995591542f46be48b5c8491a3b6a192f56 SHA512 3c80d02cfda996fbde8d258875df8795000fd8390b5a6f8296771a992067e153eca48f7f4602421529948beaf3030e164adfc2ffe5b528042fbdc15ffb56aa74 |
25 |
DIST ipt_netflow-2.5.1.tar.gz 94627 BLAKE2B 440daed1f0c02e4700c6d4a97da08abc7bf51c73cd824a67fd2b7b9394b47d493ca7acfea34467d93cdce6dded2c5b24b4a2600b9f717aa54561d1f88a123dbc SHA512 dd0bde358f788f2d62ace6a0b1529128f0a686f9b776deeae3502d45d06d13971e8ea249d2647d00b00e73625c515bc12a4b7bd8d34fafd5f3b32f290d48cdce |
26 |
|
27 |
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch |
28 |
deleted file mode 100644 |
29 |
index 0d89e5ba90a..00000000000 |
30 |
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.3-flags.patch |
31 |
+++ /dev/null |
32 |
@@ -1,55 +0,0 @@ |
33 |
---- a/Makefile.in |
34 |
-+++ b/Makefile.in |
35 |
-@@ -11,7 +11,7 @@ |
36 |
- SNMPTGSO = /usr/lib/snmp/dlmod/snmp_NETFLOW.so |
37 |
- SNMPCONF = /etc/snmp/snmpd.conf |
38 |
- SNMPLINE = dlmod netflow $(SNMPTGSO) |
39 |
--CC = gcc |
40 |
-+$(CC) ?= gcc |
41 |
- |
42 |
- # https://www.kernel.org/doc/Documentation/kbuild/modules.txt |
43 |
- # https://www.kernel.org/doc/Documentation/kbuild/makefiles.txt |
44 |
-@@ -22,29 +22,29 @@ |
45 |
- |
46 |
- ipt_NETFLOW.ko: version.h ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile |
47 |
- @echo Compiling for kernel $(KVERSION) |
48 |
-- make -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y |
49 |
-+ $(MAKE) -C $(KDIR) M=$(CURDIR) modules CONFIG_DEBUG_INFO=y |
50 |
- @touch $@ |
51 |
- sparse: | version.h ipt_NETFLOW.c ipt_NETFLOW.h compat.h Makefile |
52 |
- @rm -f ipt_NETFLOW.ko ipt_NETFLOW.o |
53 |
- @echo Compiling for kernel $(KVERSION) |
54 |
-- make -C $(KDIR) M=$(CURDIR) modules C=1 |
55 |
-+ $(MAKE) -C $(KDIR) M=$(CURDIR) modules C=1 |
56 |
- @touch ipt_NETFLOW.ko |
57 |
- coverity: |
58 |
- coverity-submit -v |
59 |
- |
60 |
- minstall: | ipt_NETFLOW.ko |
61 |
- @echo " *" |
62 |
-- make -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR) |
63 |
-+ $(MAKE) -C $(KDIR) M=$(CURDIR) modules_install INSTALL_MOD_PATH=$(DESTDIR) |
64 |
- $(DEPMOD) |
65 |
- mclean: |
66 |
-- make -C $(KDIR) M=$(CURDIR) clean |
67 |
-+ $(MAKE) -C $(KDIR) M=$(CURDIR) clean |
68 |
- lclean: |
69 |
- -rm -f *.so *_sh.o |
70 |
- clean: mclean lclean |
71 |
- -rm -f *.so *.o modules.order version.h |
72 |
- |
73 |
- snmp_NETFLOW.so: snmp_NETFLOW.c |
74 |
-- $(CC) -fPIC -shared -o $@ $< -lnetsnmp |
75 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC -shared -o $@ $< -lnetsnmp |
76 |
- |
77 |
- sinstall: | snmp_NETFLOW.so IPT-NETFLOW-MIB.my |
78 |
- @echo " *" |
79 |
-@@ -64,7 +64,7 @@ |
80 |
- fi |
81 |
- |
82 |
- %_sh.o: libipt_NETFLOW.c |
83 |
-- $(CC) $(CFLAGS) -O2 -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c |
84 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wall -Wunused $(IPTABLES_CFLAGS) -fPIC -o $@ -c libipt_NETFLOW.c |
85 |
- |
86 |
- %.so: %_sh.o |
87 |
- $(CC) -shared -o $@ $< |
88 |
|
89 |
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch |
90 |
deleted file mode 100644 |
91 |
index cde23bc9fe7..00000000000 |
92 |
--- a/net-firewall/ipt_netflow/files/ipt_netflow-2.4-bridge_netfilter.patch |
93 |
+++ /dev/null |
94 |
@@ -1,61 +0,0 @@ |
95 |
-From 9288e30f493d252ee85b492a894f78073e4f6d41 Mon Sep 17 00:00:00 2001 |
96 |
-From: ABC <abc@××××××××.com> |
97 |
-Date: Sat, 28 Sep 2019 23:29:40 +0300 |
98 |
-Subject: [PATCH] Don't compile physdev-override if BRIDGE_NETFILTER is |
99 |
- disabled. |
100 |
- |
101 |
-Fixes #120 "Compile error nf_bridge / nf_trace" reported by DocMAX. |
102 |
- |
103 |
-Fixes: 51bdc2b ("Use nf_bridge_info_get() instead of skb->nf_bridge"). |
104 |
---- |
105 |
- compat.h | 2 ++ |
106 |
- configure | 1 + |
107 |
- ipt_NETFLOW.c | 5 +++++ |
108 |
- 3 files changed, 8 insertions(+) |
109 |
- |
110 |
-diff --git a/compat.h b/compat.h |
111 |
-index 0f9896b..66e224b 100644 |
112 |
---- a/compat.h |
113 |
-+++ b/compat.h |
114 |
-@@ -680,11 +680,13 @@ static inline int is_vlan_dev(struct net_device *dev) |
115 |
- #endif |
116 |
- |
117 |
- #if LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0) |
118 |
-+# ifdef CONFIG_BRIDGE_NETFILTER |
119 |
- static inline struct nf_bridge_info * |
120 |
- nf_bridge_info_get(const struct sk_buff *skb) |
121 |
- { |
122 |
- return skb->nf_bridge; |
123 |
- } |
124 |
-+# endif |
125 |
- #endif |
126 |
- |
127 |
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) |
128 |
-diff --git a/configure b/configure |
129 |
-index 74eece5..8aae8bf 100755 |
130 |
---- a/configure |
131 |
-+++ b/configure |
132 |
-@@ -470,6 +470,7 @@ kernel_check_config() { |
133 |
- kconfig CONFIG_NF_CONNTRACK_EVENTS "natevents" |
134 |
- kconfig CONFIG_IPV6 "IPv6" |
135 |
- kconfig CONFIG_IP6_NF_IPTABLES "ip6tables target" |
136 |
-+ kconfig CONFIG_BRIDGE_NETFILTER "physdev override" |
137 |
- } |
138 |
- |
139 |
- kernel_check_include() { |
140 |
-diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c |
141 |
-index fe25655..064de6c 100644 |
142 |
---- a/ipt_NETFLOW.c |
143 |
-+++ b/ipt_NETFLOW.c |
144 |
-@@ -83,6 +83,11 @@ |
145 |
- #if defined(CONFIG_NF_NAT_NEEDED) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) |
146 |
- # include <net/netfilter/nf_conntrack_timestamp.h> |
147 |
- #endif |
148 |
-+#ifdef ENABLE_PHYSDEV_OVER |
149 |
-+# ifndef CONFIG_BRIDGE_NETFILTER |
150 |
-+# undef ENABLE_PHYSDEV_OVER |
151 |
-+# endif |
152 |
-+#endif |
153 |
- |
154 |
- #define IPT_NETFLOW_VERSION "2.4" /* Note that if you are using git, you |
155 |
- will see version in other format. */ |
156 |
|
157 |
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild |
158 |
deleted file mode 100644 |
159 |
index e36de51a30c..00000000000 |
160 |
--- a/net-firewall/ipt_netflow/ipt_netflow-2.4-r1.ebuild |
161 |
+++ /dev/null |
162 |
@@ -1,105 +0,0 @@ |
163 |
-# Copyright 1999-2020 Gentoo Authors |
164 |
-# Distributed under the terms of the GNU General Public License v2 |
165 |
- |
166 |
-EAPI=7 |
167 |
-inherit linux-info linux-mod toolchain-funcs |
168 |
- |
169 |
-DESCRIPTION="Netflow iptables module" |
170 |
-HOMEPAGE=" |
171 |
- https://sourceforge.net/projects/ipt-netflow |
172 |
- https://github.com/aabc/ipt-netflow |
173 |
-" |
174 |
-SRC_URI="https://github.com/aabc/ipt-netflow/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
175 |
- |
176 |
-LICENSE="GPL-2" |
177 |
-SLOT="0" |
178 |
-KEYWORDS="amd64 x86" |
179 |
- |
180 |
-IUSE="debug natevents snmp" |
181 |
- |
182 |
-RDEPEND=" |
183 |
- net-firewall/iptables:0= |
184 |
- snmp? ( net-analyzer/net-snmp ) |
185 |
-" |
186 |
-DEPEND="${RDEPEND} |
187 |
- virtual/linux-sources |
188 |
- virtual/pkgconfig |
189 |
-" |
190 |
-PATCHES=( |
191 |
- "${FILESDIR}/${PN}-2.0-configure.patch" # bug #455984 |
192 |
- "${FILESDIR}/${PN}-2.3-flags.patch" |
193 |
- "${FILESDIR}/${P}-bridge_netfilter.patch" |
194 |
-) |
195 |
- |
196 |
-pkg_setup() { |
197 |
- linux-info_pkg_setup |
198 |
- |
199 |
- local CONFIG_CHECK="~IP_NF_IPTABLES VLAN_8021Q" |
200 |
- use debug && CONFIG_CHECK+=" ~DEBUG_FS" |
201 |
- if use natevents; then |
202 |
- CONFIG_CHECK+=" NF_CONNTRACK_EVENTS" |
203 |
- if kernel_is lt 5 2; then |
204 |
- CONFIG_CHECK+=" NF_NAT_NEEDED" |
205 |
- else |
206 |
- CONFIG_CHECK+=" NF_NAT" |
207 |
- fi |
208 |
- fi |
209 |
- |
210 |
- BUILD_TARGETS="all" |
211 |
- MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})" |
212 |
- IPT_LIB="/usr/$(get_libdir)/xtables" |
213 |
- |
214 |
- linux-mod_pkg_setup |
215 |
-} |
216 |
- |
217 |
-src_unpack() { |
218 |
- default |
219 |
- |
220 |
- mv "${WORKDIR}"/${PN/_/-}-* "${WORKDIR}"/${P} || die |
221 |
-} |
222 |
- |
223 |
-src_prepare() { |
224 |
- default |
225 |
- |
226 |
- # Checking for directory is enough |
227 |
- sed -i -e 's:-s /etc/snmp/snmpd.conf:-d /etc/snmp:' configure || die |
228 |
-} |
229 |
- |
230 |
-do_conf() { |
231 |
- tc-export CC |
232 |
- echo ./configure $* |
233 |
- ./configure $* ${EXTRA_ECONF} || die 'configure failed' |
234 |
-} |
235 |
- |
236 |
-src_configure() { |
237 |
- local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)" |
238 |
- # this configure script is not based on autotools |
239 |
- # ipt-src need to be defined, see bug #455984 |
240 |
- do_conf \ |
241 |
- --disable-dkms \ |
242 |
- --enable-aggregation \ |
243 |
- --enable-direction \ |
244 |
- --enable-macaddress \ |
245 |
- --enable-vlan \ |
246 |
- --ipt-lib="${IPT_LIB}" \ |
247 |
- --ipt-src="/usr/" \ |
248 |
- --ipt-ver="${IPT_VERSION}" \ |
249 |
- --kdir="${KV_DIR}" \ |
250 |
- --kver="${KV_FULL}" \ |
251 |
- $(use debug && echo '--enable-debugfs') \ |
252 |
- $(use natevents && echo '--enable-natevents') \ |
253 |
- $(use snmp && echo '--enable-snmp-rules' || echo '--disable-snmp-agent') |
254 |
-} |
255 |
- |
256 |
-src_compile() { |
257 |
- emake ARCH="$(tc-arch-kernel)" CC="$(tc-getCC)" LD="$(tc-getLD)" OBJDUMP="$(tc-getOBJDUMP)" all |
258 |
-} |
259 |
- |
260 |
-src_install() { |
261 |
- linux-mod_src_install |
262 |
- exeinto "${IPT_LIB}" |
263 |
- doexe libipt_NETFLOW.so |
264 |
- use snmp && emake DESTDIR="${D}" SNMPTGSO="/usr/$(get_libdir)/snmp/dlmod/snmp_NETFLOW.so" sinstall |
265 |
- doheader ipt_NETFLOW.h |
266 |
- dodoc README* |
267 |
-} |