1 |
robbat2 14/06/20 20:57:10 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ipset-6.21.1.ebuild |
5 |
Log: |
6 |
Bump per bug #509804. |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit) |
9 |
|
10 |
Revision Changes Path |
11 |
1.75 net-firewall/ipset/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.75&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.75&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?r1=1.74&r2=1.75 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v |
20 |
retrieving revision 1.74 |
21 |
retrieving revision 1.75 |
22 |
diff -p -w -b -B -u -u -r1.74 -r1.75 |
23 |
--- ChangeLog 1 Dec 2013 19:16:16 -0000 1.74 |
24 |
+++ ChangeLog 20 Jun 2014 20:57:10 -0000 1.75 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for net-firewall/ipset |
27 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.74 2013/12/01 19:16:16 robbat2 Exp $ |
29 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.75 2014/06/20 20:57:10 robbat2 Exp $ |
31 |
+ |
32 |
+*ipset-6.21.1 (20 Jun 2014) |
33 |
+ |
34 |
+ 20 Jun 2014; Robin H. Johnson <robbat2@g.o> +ipset-6.21.1.ebuild: |
35 |
+ Bump per bug #509804. |
36 |
|
37 |
*ipset-6.20.1 (01 Dec 2013) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 net-firewall/ipset/ipset-6.21.1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ipset-6.21.1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ipset-6.21.1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: ipset-6.21.1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2014 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.21.1.ebuild,v 1.1 2014/06/20 20:57:10 robbat2 Exp $ |
52 |
|
53 |
EAPI="5" |
54 |
MODULES_OPTIONAL_USE=modules |
55 |
inherit autotools linux-info linux-mod |
56 |
|
57 |
DESCRIPTION="IPset tool for iptables, successor to ippool." |
58 |
HOMEPAGE="http://ipset.netfilter.org/" |
59 |
SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" |
60 |
|
61 |
LICENSE="GPL-2" |
62 |
SLOT="0" |
63 |
KEYWORDS="~amd64 ~ppc ~x86" |
64 |
|
65 |
RDEPEND=">=net-firewall/iptables-1.4.7 |
66 |
net-libs/libmnl" |
67 |
DEPEND="${RDEPEND}" |
68 |
|
69 |
DOCS=( ChangeLog INSTALL README UPGRADE ) |
70 |
|
71 |
# configurable from outside, e.g. /etc/make.conf |
72 |
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} |
73 |
|
74 |
BUILD_TARGETS="modules" |
75 |
MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset" |
76 |
MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)" |
77 |
for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do |
78 |
MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})" |
79 |
done |
80 |
|
81 |
check_header_patch() { |
82 |
if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then |
83 |
eerror "Sorry, but you have to patch kernel sources with the following patch:" |
84 |
eerror " # cd ${KV_DIR}" |
85 |
eerror " # patch -i ${S}/netlink.patch -p1" |
86 |
eerror "You should recompile and run new kernel to avoid runtime errors." |
87 |
die "Unpatched kernel" |
88 |
fi |
89 |
} |
90 |
|
91 |
pkg_setup() { |
92 |
get_version |
93 |
CONFIG_CHECK="NETFILTER" |
94 |
ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." |
95 |
# It does still build without NET_NS, but it may be needed in future. |
96 |
#CONFIG_CHECK="${CONFIG_CHECK} NET_NS" |
97 |
#ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel." |
98 |
|
99 |
build_modules=0 |
100 |
if use modules; then |
101 |
kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35." |
102 |
if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then |
103 |
if linux_chkconfig_present "IP_NF_SET" || \ |
104 |
linux_chkconfig_present "IP_SET"; then #274577 |
105 |
eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel." |
106 |
eerror "Please either build ipset with modules USE flag disabled" |
107 |
eerror "or rebuild kernel without IP_SET support and make sure" |
108 |
eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ." |
109 |
die "USE=modules and in-kernel ipset support detected." |
110 |
else |
111 |
einfo "Modular kernel detected. Gonna build kernel modules..." |
112 |
build_modules=1 |
113 |
fi |
114 |
else |
115 |
eerror "Nonmodular kernel detected, but USE=modules. Either build" |
116 |
eerror "modular kernel (without IP_SET) or disable USE=modules" |
117 |
die "Nonmodular kernel detected, will not build kernel modules" |
118 |
fi |
119 |
fi |
120 |
[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup |
121 |
} |
122 |
|
123 |
src_prepare() { |
124 |
[[ ${build_modules} -eq 1 ]] && check_header_patch |
125 |
eautoreconf |
126 |
} |
127 |
|
128 |
src_configure() { |
129 |
econf \ |
130 |
$(use_with modules kmod) \ |
131 |
--disable-static \ |
132 |
--with-maxsets=${IP_NF_SET_MAX} \ |
133 |
--libdir="${EPREFIX}/$(get_libdir)" \ |
134 |
--with-ksource="${KV_DIR}" \ |
135 |
--with-kbuild="${KV_OUT_DIR}" |
136 |
} |
137 |
|
138 |
src_compile() { |
139 |
einfo "Building userspace" |
140 |
emake |
141 |
|
142 |
if [[ ${build_modules} -eq 1 ]]; then |
143 |
einfo "Building kernel modules" |
144 |
set_arch_to_kernel |
145 |
emake modules |
146 |
fi |
147 |
} |
148 |
|
149 |
src_install() { |
150 |
einfo "Installing userspace" |
151 |
default |
152 |
prune_libtool_files |
153 |
|
154 |
newinitd "${FILESDIR}"/ipset.initd-r3 ${PN} |
155 |
newconfd "${FILESDIR}"/ipset.confd ${PN} |
156 |
keepdir /var/lib/ipset |
157 |
|
158 |
if [[ ${build_modules} -eq 1 ]]; then |
159 |
einfo "Installing kernel modules" |
160 |
linux-mod_src_install |
161 |
fi |
162 |
} |