Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Anthony G. Basile (blueness)" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-firewall/xtables-addons: xtables-addons-2.7.ebuild xtables-addons-2.6.ebuild ChangeLog
Date: Mon, 06 Jul 2015 13:13:58
Message-Id: 20150706131345.9C4A6753@oystercatcher.gentoo.org
1 blueness 15/07/06 13:13:45
2
3 Modified: xtables-addons-2.7.ebuild xtables-addons-2.6.ebuild
4 ChangeLog
5 Log:
6 Generalize module + kernel version checking since XTABLES_ADDONS=tarpit doesn't build on linux-4.1 and above. Bug #553630.
7
8 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
9
10 Revision Changes Path
11 1.3 net-firewall/xtables-addons/xtables-addons-2.7.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild?r1=1.2&r2=1.3
16
17 Index: xtables-addons-2.7.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- xtables-addons-2.7.ebuild 6 Jul 2015 12:38:13 -0000 1.2
24 +++ xtables-addons-2.7.ebuild 6 Jul 2015 13:13:45 -0000 1.3
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2015 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild,v 1.2 2015/07/06 12:38:13 blueness Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.7.ebuild,v 1.3 2015/07/06 13:13:45 blueness Exp $
30
31 EAPI="5"
32
33 @@ -119,10 +119,29 @@
34 done
35 }
36
37 +# Die on modules known to fial on certain kernel version.
38 +XA_known_failure() {
39 + local module_name=$1
40 + local KV_max=$2
41 +
42 + if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
43 + eerror
44 + eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
45 + eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
46 + eerror
47 + die
48 + fi
49 +}
50 +
51 src_prepare() {
52 XA_qa_check
53 XA_has_something_to_build
54
55 + # Bug #553630#c0. tarpit fails on linux-4.1 and above.
56 + # Bug #553630#c2. echo fails on linux-4 and above.
57 + XA_known_failure "tarpit" 4.1
58 + XA_known_failure "echo" 4
59 +
60 local mod module_name
61 if use modules; then
62 MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
63 @@ -139,17 +158,6 @@
64 sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
65 fi
66 done
67 -
68 - # Bug #553630. echo fails to build on linux-4 kernels.
69 - KV_max=4.0.0
70 - if use xtables_addons_echo && kernel_is ge ${KV_max//./ }; then
71 - eerror
72 - eerror "XTABLES_ADDONS=echo fails to build on linux ${KV_max} or above."
73 - eerror "Either XTABLES_ADDONS=echo or use an earlier version of the kernel."
74 - eerror
75 - die
76 - fi
77 -
78 einfo "${MODULE_NAMES}" # for debugging
79
80 sed -e 's/depmod -a/true/' -i Makefile.in || die
81
82
83
84 1.3 net-firewall/xtables-addons/xtables-addons-2.6.ebuild
85
86 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild?rev=1.3&view=markup
87 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild?rev=1.3&content-type=text/plain
88 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild?r1=1.2&r2=1.3
89
90 Index: xtables-addons-2.6.ebuild
91 ===================================================================
92 RCS file: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild,v
93 retrieving revision 1.2
94 retrieving revision 1.3
95 diff -u -r1.2 -r1.3
96 --- xtables-addons-2.6.ebuild 6 Jul 2015 12:38:13 -0000 1.2
97 +++ xtables-addons-2.6.ebuild 6 Jul 2015 13:13:45 -0000 1.3
98 @@ -1,6 +1,6 @@
99 # Copyright 1999-2015 Gentoo Foundation
100 # Distributed under the terms of the GNU General Public License v2
101 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild,v 1.2 2015/07/06 12:38:13 blueness Exp $
102 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-2.6.ebuild,v 1.3 2015/07/06 13:13:45 blueness Exp $
103
104 EAPI="5"
105
106 @@ -119,10 +119,29 @@
107 done
108 }
109
110 +# Die on modules known to fial on certain kernel version.
111 +XA_known_failure() {
112 + local module_name=$1
113 + local KV_max=$2
114 +
115 + if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
116 + eerror
117 + eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
118 + eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
119 + eerror
120 + die
121 + fi
122 +}
123 +
124 src_prepare() {
125 XA_qa_check
126 XA_has_something_to_build
127
128 + # Bug #553630#c0. tarpit fails on linux-4.1 and above.
129 + # Bug #553630#c2. echo fails on linux-4 and above.
130 + XA_known_failure "tarpit" 4.1
131 + XA_known_failure "echo" 4
132 +
133 local mod module_name
134 if use modules; then
135 MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
136 @@ -139,17 +158,6 @@
137 sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
138 fi
139 done
140 -
141 - # Bug #553630. echo fails to build on linux-4 kernels.
142 - KV_max=4.0.0
143 - if use xtables_addons_echo && kernel_is ge ${KV_max//./ }; then
144 - eerror
145 - eerror "XTABLES_ADDONS=echo fails to build on linux ${KV_max} or above."
146 - eerror "Either XTABLES_ADDONS=echo or use an earlier version of the kernel."
147 - eerror
148 - die
149 - fi
150 -
151 einfo "${MODULE_NAMES}" # for debugging
152
153 sed -e 's/depmod -a/true/' -i Makefile.in || die
154
155
156
157 1.51 net-firewall/xtables-addons/ChangeLog
158
159 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/ChangeLog?rev=1.51&view=markup
160 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/ChangeLog?rev=1.51&content-type=text/plain
161 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/xtables-addons/ChangeLog?r1=1.50&r2=1.51
162
163 Index: ChangeLog
164 ===================================================================
165 RCS file: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v
166 retrieving revision 1.50
167 retrieving revision 1.51
168 diff -u -r1.50 -r1.51
169 --- ChangeLog 6 Jul 2015 12:38:13 -0000 1.50
170 +++ ChangeLog 6 Jul 2015 13:13:45 -0000 1.51
171 @@ -1,6 +1,11 @@
172 # ChangeLog for net-firewall/xtables-addons
173 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
174 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.50 2015/07/06 12:38:13 blueness Exp $
175 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.51 2015/07/06 13:13:45 blueness Exp $
176 +
177 + 06 Jul 2015; Anthony G. Basile <blueness@g.o>
178 + xtables-addons-2.6.ebuild, xtables-addons-2.7.ebuild:
179 + Generalize module + kernel version checking since XTABLES_ADDONS=tarpit
180 + doesn't build on linux-4.1 and above. Bug #553630.
181
182 06 Jul 2015; Anthony G. Basile <blueness@g.o>
183 -xtables-addons-2.4.ebuild, -xtables-addons-2.5.ebuild,
Report Message
Find on MARC Find on Google Groups