robbat2 14/06/20 20:57:10 Modified: ChangeLog Added: ipset-6.21.1.ebuild Log: Bump per bug #509804. (Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.75 net-firewall/ipset/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.75&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.75&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ChangeLog?r1=1.74&r2=1.75 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v retrieving revision 1.74 retrieving revision 1.75 diff -p -w -b -B -u -u -r1.74 -r1.75 --- ChangeLog 1 Dec 2013 19:16:16 -0000 1.74 +++ ChangeLog 20 Jun 2014 20:57:10 -0000 1.75 @@ -1,6 +1,11 @@ # ChangeLog for net-firewall/ipset -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.74 2013/12/01 19:16:16 robbat2 Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.75 2014/06/20 20:57:10 robbat2 Exp $ + +*ipset-6.21.1 (20 Jun 2014) + + 20 Jun 2014; Robin H. Johnson <robb...@gentoo.org> +ipset-6.21.1.ebuild: + Bump per bug #509804. *ipset-6.20.1 (01 Dec 2013) 1.1 net-firewall/ipset/ipset-6.21.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ipset-6.21.1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/ipset-6.21.1.ebuild?rev=1.1&content-type=text/plain Index: ipset-6.21.1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-6.21.1.ebuild,v 1.1 2014/06/20 20:57:10 robbat2 Exp $ EAPI="5" MODULES_OPTIONAL_USE=modules inherit autotools linux-info linux-mod DESCRIPTION="IPset tool for iptables, successor to ippool." HOMEPAGE="http://ipset.netfilter.org/"; SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" RDEPEND=">=net-firewall/iptables-1.4.7 net-libs/libmnl" DEPEND="${RDEPEND}" DOCS=( ChangeLog INSTALL README UPGRADE ) # configurable from outside, e.g. /etc/make.conf IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} BUILD_TARGETS="modules" MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset" MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)" for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,port{,ip,net}},net{,port{,net},iface,net}},_list_set}; do MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})" done check_header_patch() { if ! $(grep -q NFNL_SUBSYS_IPSET "${KV_DIR}/include/linux/netfilter/nfnetlink.h"); then eerror "Sorry, but you have to patch kernel sources with the following patch:" eerror " # cd ${KV_DIR}" eerror " # patch -i ${S}/netlink.patch -p1" eerror "You should recompile and run new kernel to avoid runtime errors." die "Unpatched kernel" fi } pkg_setup() { get_version CONFIG_CHECK="NETFILTER" ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." # It does still build without NET_NS, but it may be needed in future. #CONFIG_CHECK="${CONFIG_CHECK} NET_NS" #ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel." build_modules=0 if use modules; then kernel_is -lt 2 6 35 && die "${PN} requires kernel greater then 2.6.35." if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then if linux_chkconfig_present "IP_NF_SET" || \ linux_chkconfig_present "IP_SET"; then #274577 eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel." eerror "Please either build ipset with modules USE flag disabled" eerror "or rebuild kernel without IP_SET support and make sure" eerror "there is NO kernel ip_set* modules in /lib/modules/<your_kernel>/... ." die "USE=modules and in-kernel ipset support detected." else einfo "Modular kernel detected. Gonna build kernel modules..." build_modules=1 fi else eerror "Nonmodular kernel detected, but USE=modules. Either build" eerror "modular kernel (without IP_SET) or disable USE=modules" die "Nonmodular kernel detected, will not build kernel modules" fi fi [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup } src_prepare() { [[ ${build_modules} -eq 1 ]] && check_header_patch eautoreconf } src_configure() { econf \ $(use_with modules kmod) \ --disable-static \ --with-maxsets=${IP_NF_SET_MAX} \ --libdir="${EPREFIX}/$(get_libdir)" \ --with-ksource="${KV_DIR}" \ --with-kbuild="${KV_OUT_DIR}" } src_compile() { einfo "Building userspace" emake if [[ ${build_modules} -eq 1 ]]; then einfo "Building kernel modules" set_arch_to_kernel emake modules fi } src_install() { einfo "Installing userspace" default prune_libtool_files newinitd "${FILESDIR}"/ipset.initd-r3 ${PN} newconfd "${FILESDIR}"/ipset.confd ${PN} keepdir /var/lib/ipset if [[ ${build_modules} -eq 1 ]]; then einfo "Installing kernel modules" linux-mod_src_install fi }
