[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/, net-firewall/ipset/files/

[Sam James]

commit: efef1aaf36c98fa6ce64e492a52124d404ec2888
Author: Hank Leininger  korelogic  com>
AuthorDate: Tue Mar 26 22:02:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 06:37:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efef1aaf

net-firewall/ipset: enforce safe chars in set names & suffix

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/927918
Closes: https://github.com/gentoo/gentoo/pull/35939
Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/files/ipset.initd-r7 | 127 
 net-firewall/ipset/ipset-7.21-r1.ebuild | 116 +
 2 files changed, 243 insertions(+)

diff --git a/net-firewall/ipset/files/ipset.initd-r7 
b/net-firewall/ipset/files/ipset.initd-r7
new file mode 100644
index ..a96e69617e8a
--- /dev/null
+++ b/net-firewall/ipset/files/ipset.initd-r7
@@ -0,0 +1,127 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="save"
+extra_started_commands="reload"
+
+IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/rules-save}
+ipset_name_regex='^[-_.a-zA-Z0-9]+$'
+
+depend() {
+before iptables ip6tables
+}
+
+checkconfig() {
+if [ ! -f "${IPSET_SAVE}" ] ; then
+eerror "Not starting ${SVCNAME}. First create some rules then run:"
+eerror "/etc/init.d/${SVCNAME} save"
+return 1
+fi
+return 0
+}
+
+start() {
+checkconfig || return 1
+ebegin "Loading ipset session"
+ipset restore < "${IPSET_SAVE}"
+eend $?
+}
+
+stop() {
+# check if there are any references to current sets
+
+if ! ipset list | gawk '
+($1 == "References:") { refcnt += $2 }
+($1 == "Type:" && $2 == "list:set") { set = 1 }
+(scan) { if ($0 != "") setcnt++; else { scan = 0; set = 0 } }
+(set && $1 == "Members:") {scan = 1}
+END { if ((refcnt - setcnt) > 0) exit 1 }
+'; then
+eerror "ipset is in use, can't stop"
+return 1
+fi
+
+if [ "${SAVE_ON_STOP}" = "yes" ] ; then
+save || return 1
+fi
+
+ebegin "Removing kernel IP sets"
+ipset flush
+ipset destroy
+eend $?
+}
+
+reload() {
+ebegin "Reloading ipsets"
+
+# Loading sets from a save file is only additive (there is no
+# automatic flushing or replacing). And, we can not remove sets
+# that are currently used in existing iptables rules.
+#
+# Instead, we create new temp sets for any set that is already
+# in use, and then atomically swap them into place.
+#
+# XXX: This does not clean out previously used ipsets that are
+# not in the new saved policy--it can't, because they may still
+# be referenced in the current iptables rules.
+
+# Build a list of all currently used sets (if any);
+# also make sure all sets' names are fully supported.
+IFS_O=$IFS
+NEWLINE='
+'
+local IFS=$NEWLINE
+for running_ipset in $(ipset -n list) ; do
+  if ! echo "${running_ipset}" | grep -q -E "${ipset_name_regex}" ; then
+eend 1 "Running set name ('$running_ipset') does not match regex 
'${ipset_name_regex}'"
+   return 1
+  fi
+  running_ipset_list="$running_ipset_list $running_ipset"
+done
+IFS=$IFS_O
+running_ipset_list="${running_ipset_list# }"
+
+# Check the configured suffix, and make sure there are no collisions
+if test -z "${TEMP_SUFFIX}" ; then
+  eend 1 "TEMP_SUFFIX cannot be empty"
+  return 1
+fi
+
+# Make sure TEMP_SUFFIX uses only known-safe characters.
+if ! echo "${TEMP_SUFFIX}" | grep -q -E "${ipset_name_regex}" ; then
+  eend 1 "TEMP_SUFFIX pattern ('$TEMP_SUFFIX') does not match regex 
'${ipset_name_regex}'"
+  return 1
+fi
+# We don't block ., but it must be escaped.
+temp_suffix_regex=$(echo "${TEMP_SUFFIX}" | sed 's/\./\\./g')
+
+if echo "$running_ipset_list" | grep -q -E "${temp_suffix_regex}( |$)" ; 
then
+  eend 1 "Existing set(s) match TEMP_SUFFIX pattern ('${TEMP_SUFFIX}'), 
cannot continue"
+  return 1
+fi
+
+# Build a regular expression that matches those set names.
+running_ipset_list_regex="$(echo "$running_ipset_list" | tr -s ' ' '|' )"
+
+# Load up sets from the save file, but rename any set that already
+# exists to a temporary name that we will swap later.
+if ! cat ${IPSET_SAVE} | sed -r "s/^(create|add) 
(${running_ipset_list_regex}) /\1 \2${temp_suffix_regex} /" | ipset restore ; 
then
+eend $? "Failed to load new ipsets"
+fi
+
+# Now for every set name that currently exists, atomically swap it
+# with the temporary new one we created, and then destroy the old set.
+for ipset_name in ${running_ipset_list} ; do
+ipset swap "${ipset_name}" "${ipset_name}${TEMP_SUFFIX}" || eend $? 
"Failed to swap in new ipset $ipset_name"
+ipset destroy 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/

[Conrad Kostecki]

commit: 89c5a3663083eee3240424c13040cbd327ddc2c0
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Apr 18 18:11:25 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Apr 18 19:31:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c5a366

net-firewall/ipset: remove unused file

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-firewall/ipset/files/ipset.initd-r5 | 105 
 1 file changed, 105 deletions(-)

diff --git a/net-firewall/ipset/files/ipset.initd-r5 
b/net-firewall/ipset/files/ipset.initd-r5
deleted file mode 100644
index 0c73cec68c7d..
--- a/net-firewall/ipset/files/ipset.initd-r5
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="save"
-extra_started_commands="reload"
-
-IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/rules-save}
-
-depend() {
-before iptables ip6tables
-}
-
-checkconfig() {
-if [ ! -f "${IPSET_SAVE}" ] ; then
-eerror "Not starting ${SVCNAME}. First create some rules then run:"
-eerror "/etc/init.d/${SVCNAME} save"
-return 1
-fi
-return 0
-}
-
-start() {
-checkconfig || return 1
-ebegin "Loading ipset session"
-ipset restore < "${IPSET_SAVE}"
-eend $?
-}
-
-stop() {
-# check if there are any references to current sets
-
-if ! ipset list | gawk '
-($1 == "References:") { refcnt += $2 }
-($1 == "Type:" && $2 == "list:set") { set = 1 }
-(scan) { if ($0 != "") setcnt++; else { scan = 0; set = 0 } }
-(set && $1 == "Members:") {scan = 1}
-END { if ((refcnt - setcnt) > 0) exit 1 }
-'; then
-eerror "ipset is in use, can't stop"
-return 1
-fi
-
-if [ "${SAVE_ON_STOP}" = "yes" ] ; then
-save || return 1
-fi
-
-ebegin "Removing kernel IP sets"
-ipset flush
-ipset destroy
-eend $?
-}
-
-reload() {
-ebegin "Reloading ipsets"
-
-# Loading sets from a save file is only additive (there is no
-# automatic flushing or replacing). And, we can not remove sets
-# that are currently used in existing iptables rules.
-#
-# Instead, we create new temp sets for any set that is already
-# in use, and then atomically swap them into place.
-#
-# XXX: This does not clean out previously used ipsets that are
-# not in the new saved policy--it can't, because they may still
-# be referenced in the current iptables rules.
-
-
-# Build a list of all currently used sets (if any).
-running_ipset_list=$(ipset save | gawk '/^create/{printf "%s ",$2}')
-   running_ipset_list="${running_ipset_list% }"
-
-# Check the configured suffix, and make sure there are no collisions
-if test -z "${TEMP_SUFFIX}" ; then
-  eend 1 "TEMP_SUFFIX cannot be empty"
-  return 1
-elif echo "$running_ipset_list" | grep -q -E "${TEMP_SUFFIX}( |$)" ; then
-  eend 1 "Existing set(s) match TEMP_SUFFIX pattern ('${TEMP_SUFFIX}'), 
cannot continue"
-  return 1
-fi
-
-# Build a regular expression that matches those set names.
-running_ipset_list_regex="$(echo "$running_ipset_list" | tr -s ' ' '|' )"
-
-# Load up sets from the save file, but rename any set that already
-# exists to a temporary name that we will swap later.
-if ! cat ${IPSET_SAVE} | sed -r "s/^(create|add) 
(${running_ipset_list_regex}) /\1 \2${TEMP_SUFFIX} /" | ipset restore ; then
-eend $? "Failed to load new ipsets"
-fi
-
-# Now for every set name that currently exists, atomically swap it
-# with the temporary new one we created, and then destroy the old set.
-for ipset_name in ${running_ipset_list} ; do
-ipset swap ${ipset_name} ${ipset_name}${TEMP_SUFFIX} || eend $? 
"Failed to swap in new ipset $ipset_name"
-ipset destroy ${ipset_name}${TEMP_SUFFIX} || eend $? "Failed to delete 
obsolete ipset ${ipset_name}${TEMP_SUFFIX}"
-done
-eend 0
-}
-
-save() {
-ebegin "Saving ipset session"
-checkpath --file --mode 0600 "${IPSET_SAVE}"
-ipset save > "${IPSET_SAVE}"
-eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Mike Pagano]

commit: 3dc50f654127a1a2af9859dbf831b803d62ad9e8
Author: Mike Pagano  gentoo  org>
AuthorDate: Sun Mar 31 16:23:03 2024 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Sun Mar 31 16:23:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc50f65

net-firewall/ipset: drop 7.19-r1

Signed-off-by: Mike Pagano  gentoo.org>

 net-firewall/ipset/Manifest |   1 -
 net-firewall/ipset/ipset-7.19-r1.ebuild | 114 
 2 files changed, 115 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index b074e8c08ce8..7df26fea4976 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,3 +1,2 @@
-DIST ipset-7.19.tar.bz2 686712 BLAKE2B 
04290b94be471aedd732601e1dc147a066933606152beb76ba1a21283aa2e3f8b891fd9575db73f2af67b446fb77a0ca6b2432ae606440ac9e9bf80e41d1f640
 SHA512 
0f4252e6d967b0f130a2c7a0307b17c6b7d48336e86b2f838ea176f5faaa0c9bbbf273060906b43d91e9b38a9f33c18918e33d02292839a6bc321181d5d7f84e
 DIST ipset-7.20.tar.bz2 687123 BLAKE2B 
24f44c887ba90379015d15d58351aedb80cc1d53638d0f4a868b1b6debec18e4c5336b626946bc7b3eb56c1b80d83ab236f287598f71e27bf44b9873dbb7eddf
 SHA512 
d0b87ab889987a3febeaf3d73099a262aca86160878258b3bd1be064e52b55baa90601804b30ad3bbb363066c9fc1bbdfe8bc100414f801729215a892e186fc6
 DIST ipset-7.21.tar.bz2 687746 BLAKE2B 
bb887a6e74f11df8e24e13c767d21761fe547e90dbfe9fbd5b9adf3a6280a6e0eceeabd0d238178a2f76dd6492b04f4ccde222b5b41807b21bb441f2fb94cc48
 SHA512 
175c6516c2091c57738a0324678d8d016e4d7f18fa03cb0dcc502391cac4caf4db1e757f61ad2fe312c1dbe431ec9cfabbc8e15a64a94ebd2fa903155b27c88f

diff --git a/net-firewall/ipset/ipset-7.19-r1.ebuild 
b/net-firewall/ipset/ipset-7.19-r1.ebuild
deleted file mode 100644
index 234ec51e7a34..
--- a/net-firewall/ipset/ipset-7.19-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_IUSE=modules
-inherit autotools bash-completion-r1 linux-mod-r1 systemd
-
-DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/;
-SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-
-RDEPEND="
-   net-firewall/iptables
-   net-libs/libmnl:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-# configurable from outside, e.g. /etc/portage/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-pkg_setup() {
-   get_version
-   CONFIG_CHECK="NETFILTER"
-   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-   CONFIG_CHECK+=" NETFILTER_NETLINK"
-   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
-   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
-
-   build_modules=0
-   if use modules; then
-   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//... ."
-   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-r1_pkg_setup
-}
-
-src_configure() {
-   export bashcompdir="$(get_bashcompdir)"
-
-   econf \
-   --enable-bashcompl \
-   $(use_with modules kmod) \
-   --with-maxsets=${IP_NF_SET_MAX} \
-   --with-ksource="${KV_DIR}" \
-   --with-kbuild="${KV_OUT_DIR}"
-}
-

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 3f9eedce21532ab9a4d3d30e98b4ab134a17b74b
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 24 11:34:21 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 24 11:34:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f9eedce

net-firewall/ipset: Stabilize 7.21 ppc, #927701

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.21.ebuild 
b/net-firewall/ipset/ipset-7.21.ebuild
index fec7e1b55a14..a8860c63f003 100644
--- a/net-firewall/ipset/ipset-7.21.ebuild
+++ b/net-firewall/ipset/ipset-7.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
net-firewall/iptables

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 0f924b5fd2e5980d8516748804a65fb996bcd25c
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 24 11:34:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 24 11:34:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f924b5f

net-firewall/ipset: Stabilize 7.21 arm64, #927701

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.21.ebuild 
b/net-firewall/ipset/ipset-7.21.ebuild
index 03d53eeda842..fec7e1b55a14 100644
--- a/net-firewall/ipset/ipset-7.21.ebuild
+++ b/net-firewall/ipset/ipset-7.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
net-firewall/iptables

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 4c158bba64a70e1764aa1d3610dc15724e66f330
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 24 11:28:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 24 11:28:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c158bba

net-firewall/ipset: Stabilize 7.21 ppc64, #927701

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.21.ebuild 
b/net-firewall/ipset/ipset-7.21.ebuild
index 6f112b1ac2d2..cb67566af826 100644
--- a/net-firewall/ipset/ipset-7.21.ebuild
+++ b/net-firewall/ipset/ipset-7.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86"
 
 RDEPEND="
net-firewall/iptables

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 308ca2a840980b2f1676b99ba1a21742636ca6b1
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 24 11:28:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 24 11:28:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308ca2a8

net-firewall/ipset: Stabilize 7.21 amd64, #927701

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.21.ebuild 
b/net-firewall/ipset/ipset-7.21.ebuild
index cb67566af826..d55dd0bb683c 100644
--- a/net-firewall/ipset/ipset-7.21.ebuild
+++ b/net-firewall/ipset/ipset-7.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86"
 
 RDEPEND="
net-firewall/iptables

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 23f182c0d73f2a404223c378fbd86eee6c88cbc1
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 24 11:28:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 24 11:28:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23f182c0

net-firewall/ipset: Stabilize 7.21 x86, #927701

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.21.ebuild 
b/net-firewall/ipset/ipset-7.21.ebuild
index 2bb3572d4ba6..03d53eeda842 100644
--- a/net-firewall/ipset/ipset-7.21.ebuild
+++ b/net-firewall/ipset/ipset-7.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
net-firewall/iptables

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 5e61aef7615edd8ac47aeac9c86a5a09b025c8f7
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 24 11:28:15 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 24 11:28:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e61aef7

net-firewall/ipset: Stabilize 7.21 arm, #927701

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.21.ebuild 
b/net-firewall/ipset/ipset-7.21.ebuild
index d55dd0bb683c..2bb3572d4ba6 100644
--- a/net-firewall/ipset/ipset-7.21.ebuild
+++ b/net-firewall/ipset/ipset-7.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86"
 
 RDEPEND="
net-firewall/iptables

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/, net-firewall/ipset/

[Mike Pagano]

commit: f88dc1707b301affc840120fba5fdc59b665e00a
Author: Mike Pagano  gentoo  org>
AuthorDate: Sat Mar  9 18:02:43 2024 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Sat Mar  9 18:02:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f88dc170

net-firewall/ipset: Fix bash-completion script

Signed-off-by: Mike Pagano  gentoo.org>

 net-firewall/ipset/files/ipset-bash-completion.patch | 11 +++
 net-firewall/ipset/ipset-7.21.ebuild |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/net-firewall/ipset/files/ipset-bash-completion.patch 
b/net-firewall/ipset/files/ipset-bash-completion.patch
new file mode 100644
index ..1c2b6e62b822
--- /dev/null
+++ b/net-firewall/ipset/files/ipset-bash-completion.patch
@@ -0,0 +1,11 @@
+--- a/utils/ipset_bash_completion/ipset2024-03-09 12:53:38.756882196 
-0500
 b/utils/ipset_bash_completion/ipset2024-03-09 12:54:32.838917743 
-0500
+@@ -1005,7 +1005,7 @@ if ((got_bashcompl)); then
+   if ! declare -F _ipset_known_hosts &>/dev/null; then
+   eval '_ipset_known_hosts() { '$(declare -f _known_hosts_real | \
+   grep -v __ltrim_colon_completions | \
+-  grep -Ev "^_known_hosts_real.*$" | grep -Ev "^(\{|\})")'; }'
++  grep -Ev "^_known_hosts_real.*$" | grep -Ev "^(\{|\})")' }'
+   fi
+ fi
+ 

diff --git a/net-firewall/ipset/ipset-7.21.ebuild 
b/net-firewall/ipset/ipset-7.21.ebuild
index 433d477210f0..6f112b1ac2d2 100644
--- a/net-firewall/ipset/ipset-7.21.ebuild
+++ b/net-firewall/ipset/ipset-7.21.ebuild
@@ -21,6 +21,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${PN}-bash-completion.patch" )
+
 DOCS=( ChangeLog INSTALL README UPGRADE )
 
 # configurable from outside, e.g. /etc/portage/make.conf

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Mike Pagano]

commit: af5a3510f965a723966fa7c643b3f1676f3b6f68
Author: Mike Pagano  gentoo  org>
AuthorDate: Thu Feb 15 12:58:11 2024 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Thu Feb 15 12:58:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5a3510

net-firewall/ipset: add 7.21

Signed-off-by: Mike Pagano  gentoo.org>

 net-firewall/ipset/Manifest  |   1 +
 net-firewall/ipset/ipset-7.21.ebuild | 114 +++
 2 files changed, 115 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 8b7ad557cb38..b074e8c08ce8 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,2 +1,3 @@
 DIST ipset-7.19.tar.bz2 686712 BLAKE2B 
04290b94be471aedd732601e1dc147a066933606152beb76ba1a21283aa2e3f8b891fd9575db73f2af67b446fb77a0ca6b2432ae606440ac9e9bf80e41d1f640
 SHA512 
0f4252e6d967b0f130a2c7a0307b17c6b7d48336e86b2f838ea176f5faaa0c9bbbf273060906b43d91e9b38a9f33c18918e33d02292839a6bc321181d5d7f84e
 DIST ipset-7.20.tar.bz2 687123 BLAKE2B 
24f44c887ba90379015d15d58351aedb80cc1d53638d0f4a868b1b6debec18e4c5336b626946bc7b3eb56c1b80d83ab236f287598f71e27bf44b9873dbb7eddf
 SHA512 
d0b87ab889987a3febeaf3d73099a262aca86160878258b3bd1be064e52b55baa90601804b30ad3bbb363066c9fc1bbdfe8bc100414f801729215a892e186fc6
+DIST ipset-7.21.tar.bz2 687746 BLAKE2B 
bb887a6e74f11df8e24e13c767d21761fe547e90dbfe9fbd5b9adf3a6280a6e0eceeabd0d238178a2f76dd6492b04f4ccde222b5b41807b21bb441f2fb94cc48
 SHA512 
175c6516c2091c57738a0324678d8d016e4d7f18fa03cb0dcc502391cac4caf4db1e757f61ad2fe312c1dbe431ec9cfabbc8e15a64a94ebd2fa903155b27c88f

diff --git a/net-firewall/ipset/ipset-7.21.ebuild 
b/net-firewall/ipset/ipset-7.21.ebuild
new file mode 100644
index ..433d477210f0
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.21.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE=modules
+inherit autotools bash-completion-r1 linux-mod-r1 systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/;
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+   net-firewall/iptables
+   net-libs/libmnl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+# configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+pkg_setup() {
+   get_version
+   CONFIG_CHECK="NETFILTER"
+   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+   CONFIG_CHECK+=" NETFILTER_NETLINK"
+   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   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//... ."
+   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-r1_pkg_setup
+}
+
+src_configure() {
+   export bashcompdir="$(get_bashcompdir)"
+
+   econf \
+   --enable-bashcompl \
+   $(use_with modules kmod) \
+   --with-maxsets=${IP_NF_SET_MAX} \
+   --with-ksource="${KV_DIR}" \
+   --with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/, net-firewall/ipset/files/

[Mike Pagano]

commit: 0baf77a9399a23c01de5dccbdbd9b5a39994b9b6
Author: Mike Pagano  gentoo  org>
AuthorDate: Tue Feb 13 23:17:29 2024 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Tue Feb 13 23:17:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0baf77a9

net-firewall/ipset: Fix saving rules, thanks to Attila Tóth

Closes: https://bugs.gentoo.org/924417

Signed-off-by: Mike Pagano  gentoo.org>

 net-firewall/ipset/files/ipset.initd-r6 | 105 
 net-firewall/ipset/ipset-7.20.ebuild|   2 +-
 2 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/net-firewall/ipset/files/ipset.initd-r6 
b/net-firewall/ipset/files/ipset.initd-r6
new file mode 100644
index ..949bdad76044
--- /dev/null
+++ b/net-firewall/ipset/files/ipset.initd-r6
@@ -0,0 +1,105 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="save"
+extra_started_commands="reload"
+
+IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/rules-save}
+
+depend() {
+before iptables ip6tables
+}
+
+checkconfig() {
+if [ ! -f "${IPSET_SAVE}" ] ; then
+eerror "Not starting ${SVCNAME}. First create some rules then run:"
+eerror "/etc/init.d/${SVCNAME} save"
+return 1
+fi
+return 0
+}
+
+start() {
+checkconfig || return 1
+ebegin "Loading ipset session"
+ipset restore < "${IPSET_SAVE}"
+eend $?
+}
+
+stop() {
+# check if there are any references to current sets
+
+if ! ipset list | gawk '
+($1 == "References:") { refcnt += $2 }
+($1 == "Type:" && $2 == "list:set") { set = 1 }
+(scan) { if ($0 != "") setcnt++; else { scan = 0; set = 0 } }
+(set && $1 == "Members:") {scan = 1}
+END { if ((refcnt - setcnt) > 0) exit 1 }
+'; then
+eerror "ipset is in use, can't stop"
+return 1
+fi
+
+if [ "${SAVE_ON_STOP}" = "yes" ] ; then
+save || return 1
+fi
+
+ebegin "Removing kernel IP sets"
+ipset flush
+ipset destroy
+eend $?
+}
+
+reload() {
+ebegin "Reloading ipsets"
+
+# Loading sets from a save file is only additive (there is no
+# automatic flushing or replacing). And, we can not remove sets
+# that are currently used in existing iptables rules.
+#
+# Instead, we create new temp sets for any set that is already
+# in use, and then atomically swap them into place.
+#
+# XXX: This does not clean out previously used ipsets that are
+# not in the new saved policy--it can't, because they may still
+# be referenced in the current iptables rules.
+
+
+# Build a list of all currently used sets (if any).
+running_ipset_list=$(ipset save | gawk '/^create/{printf "%s ",$2}')
+   running_ipset_list="${running_ipset_list% }"
+
+# Check the configured suffix, and make sure there are no collisions
+if test -z "${TEMP_SUFFIX}" ; then
+  eend 1 "TEMP_SUFFIX cannot be empty"
+  return 1
+elif echo "$running_ipset_list" | grep -q -E "${TEMP_SUFFIX}( |$)" ; then
+  eend 1 "Existing set(s) match TEMP_SUFFIX pattern ('${TEMP_SUFFIX}'), 
cannot continue"
+  return 1
+fi
+
+# Build a regular expression that matches those set names.
+running_ipset_list_regex="$(echo "$running_ipset_list" | tr -s ' ' '|' )"
+
+# Load up sets from the save file, but rename any set that already
+# exists to a temporary name that we will swap later.
+if ! cat ${IPSET_SAVE} | sed -r "s/^(create|add) 
(${running_ipset_list_regex}) /\1 \2${TEMP_SUFFIX} /" | ipset restore ; then
+eend $? "Failed to load new ipsets"
+fi
+
+# Now for every set name that currently exists, atomically swap it
+# with the temporary new one we created, and then destroy the old set.
+for ipset_name in ${running_ipset_list} ; do
+ipset swap ${ipset_name} ${ipset_name}${TEMP_SUFFIX} || eend $? 
"Failed to swap in new ipset $ipset_name"
+ipset destroy ${ipset_name}${TEMP_SUFFIX} || eend $? "Failed to delete 
obsolete ipset ${ipset_name}${TEMP_SUFFIX}"
+done
+eend 0
+}
+
+save() {
+ebegin "Saving ipset session"
+checkpath --file --mode 0600 "${IPSET_SAVE}"
+   ipset -output save list > "${IPSET_SAVE}"
+eend $?
+}

diff --git a/net-firewall/ipset/ipset-7.20.ebuild 
b/net-firewall/ipset/ipset-7.20.ebuild
index f1a25f936d47..433d477210f0 100644
--- a/net-firewall/ipset/ipset-7.20.ebuild
+++ b/net-firewall/ipset/ipset-7.20.ebuild
@@ -102,7 +102,7 @@ src_install() {
 
find "${ED}" -name '*.la' -delete || die
 
-   newinitd "${FILESDIR}"/ipset.initd-r5 ${PN}
+   newinitd "${FILESDIR}"/ipset.initd-r6 ${PN}
newconfd "${FILESDIR}"/ipset.confd-r1 ${PN}
systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service
keepdir /var/lib/ipset

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Mike Pagano]

commit: f8894dbe125f8d61c7666b583e4e7bf0133e8fff
Author: Mike Pagano  gentoo  org>
AuthorDate: Fri Feb  2 13:21:10 2024 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Fri Feb  2 13:21:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8894dbe

net-firewall/ipset: add 7.20

Signed-off-by: Mike Pagano  gentoo.org>

 net-firewall/ipset/Manifest  |   1 +
 net-firewall/ipset/ipset-7.20.ebuild | 114 +++
 2 files changed, 115 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index e1a520ca5e40..8b7ad557cb38 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1 +1,2 @@
 DIST ipset-7.19.tar.bz2 686712 BLAKE2B 
04290b94be471aedd732601e1dc147a066933606152beb76ba1a21283aa2e3f8b891fd9575db73f2af67b446fb77a0ca6b2432ae606440ac9e9bf80e41d1f640
 SHA512 
0f4252e6d967b0f130a2c7a0307b17c6b7d48336e86b2f838ea176f5faaa0c9bbbf273060906b43d91e9b38a9f33c18918e33d02292839a6bc321181d5d7f84e
+DIST ipset-7.20.tar.bz2 687123 BLAKE2B 
24f44c887ba90379015d15d58351aedb80cc1d53638d0f4a868b1b6debec18e4c5336b626946bc7b3eb56c1b80d83ab236f287598f71e27bf44b9873dbb7eddf
 SHA512 
d0b87ab889987a3febeaf3d73099a262aca86160878258b3bd1be064e52b55baa90601804b30ad3bbb363066c9fc1bbdfe8bc100414f801729215a892e186fc6

diff --git a/net-firewall/ipset/ipset-7.20.ebuild 
b/net-firewall/ipset/ipset-7.20.ebuild
new file mode 100644
index ..f1a25f936d47
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.20.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE=modules
+inherit autotools bash-completion-r1 linux-mod-r1 systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/;
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+   net-firewall/iptables
+   net-libs/libmnl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+# configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+pkg_setup() {
+   get_version
+   CONFIG_CHECK="NETFILTER"
+   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+   CONFIG_CHECK+=" NETFILTER_NETLINK"
+   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   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//... ."
+   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-r1_pkg_setup
+}
+
+src_configure() {
+   export bashcompdir="$(get_bashcompdir)"
+
+   econf \
+   --enable-bashcompl \
+   $(use_with modules kmod) \
+   --with-maxsets=${IP_NF_SET_MAX} \
+   --with-ksource="${KV_DIR}" \
+   --with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {
+   einfo "Building userspace"
+
+   local modlist=( 
xt_set=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/:
+   
em_ipset=kernel/net/sched:"${S}":kernel/net/sched/:modules )
+
+   for i in 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/

[Conrad Kostecki]

commit: 4cefa7bbe4060e6f75a05acc5aaf045c87e129b7
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Jan 20 08:18:44 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jan 20 21:21:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cefa7bb

net-firewall/ipset: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-firewall/ipset/files/ipset-7.16-bashism.patch | 46 ---
 1 file changed, 46 deletions(-)

diff --git a/net-firewall/ipset/files/ipset-7.16-bashism.patch 
b/net-firewall/ipset/files/ipset-7.16-bashism.patch
deleted file mode 100644
index ff4d6b095528..
--- a/net-firewall/ipset/files/ipset-7.16-bashism.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6004475ff78ddb3afd8beadcb5330664d50081f5 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Thu, 24 Nov 2022 04:38:28 +
-Subject: [PATCH] configure.ac: fix bashisms
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-configure scripts need to be runnable with a POSIX-compliant /bin/sh.
-
-On many (but not all!) systems, /bin/sh is provided by Bash, so errors
-like this aren't spotted. Notably Debian defaults to /bin/sh provided
-by dash which doesn't tolerate such bashisms as '=='.
-
-This retains compatibility with bash.
-
-Signed-off-by: Sam James 
 a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_ARG_WITH([kmod],
-[Build the kernel module (default: yes)]),
- [BUILDKMOD="$withval";],
- [BUILDKMOD="yes";])
--AM_CONDITIONAL(WITH_KMOD, test "$BUILDKMOD" == "yes")
-+AM_CONDITIONAL(WITH_KMOD, test "$BUILDKMOD" = "yes")
- 
- dnl Additional arguments
- dnl Kernel build directory or source tree
-@@ -76,7 +76,7 @@ if test "x$enable_bashcompl" = "xyes"; then
-   AC_SUBST(bashcompdir)
- fi
- 
--if test "$BUILDKMOD" == "yes"
-+if test "$BUILDKMOD" = "yes"
- then
- dnl Sigh: check kernel version dependencies
- if test "$KBUILDDIR" != ""
-@@ -204,7 +204,7 @@ AC_CHECK_TYPES([union nf_inet_addr],,,[#include 

- dnl Checks for functions
- AC_CHECK_FUNCS(gethostbyname2)
- 
--if test "$BUILDKMOD" == "yes"
-+if test "$BUILDKMOD" = "yes"
- then
- dnl Check kernel incompatibilities... Ugly like hell
- 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Mike Pagano]

commit: 4509765f27af761c44d70a0d7cca408f0772cb49
Author: Mike Pagano  gentoo  org>
AuthorDate: Wed Jan 17 13:30:16 2024 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Wed Jan 17 13:30:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4509765f

net-firewall/ipset: drop 7.19

Signed-off-by: Mike Pagano  gentoo.org>

 net-firewall/ipset/ipset-7.19.ebuild | 65 
 1 file changed, 65 deletions(-)

diff --git a/net-firewall/ipset/ipset-7.19.ebuild 
b/net-firewall/ipset/ipset-7.19.ebuild
deleted file mode 100644
index b2ba675086ea..
--- a/net-firewall/ipset/ipset-7.19.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 linux-info systemd
-
-DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/;
-SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-   >=net-firewall/iptables-1.8.9
-   net-libs/libmnl:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-# configurable from outside, e.g. /etc/portage/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-pkg_setup() {
-   get_version
-   CONFIG_CHECK="NETFILTER"
-   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-   CONFIG_CHECK+=" NETFILTER_NETLINK"
-   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
-   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
-}
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   export bashcompdir="$(get_bashcompdir)"
-
-   econf \
-   --enable-bashcompl \
-   --with-kmod=no \
-   --with-maxsets=${IP_NF_SET_MAX}
-}
-
-src_install() {
-   einfo "Installing userspace"
-   default
-
-   find "${ED}" -name '*.la' -delete || die
-
-   newinitd "${FILESDIR}"/ipset.initd-r5 ${PN}
-   newconfd "${FILESDIR}"/ipset.confd-r1 ${PN}
-   systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service
-   keepdir /var/lib/ipset
-}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Mike Pagano]

commit: fafbf8a5e8401b198386ddebb3d566fecc29c999
Author: Mike Pagano  gentoo  org>
AuthorDate: Wed Jan 17 13:30:01 2024 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Wed Jan 17 13:30:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fafbf8a5

net-firewall/ipset: drop 7.17-r1

Signed-off-by: Mike Pagano  gentoo.org>

 net-firewall/ipset/Manifest |   1 -
 net-firewall/ipset/ipset-7.17-r1.ebuild | 119 
 2 files changed, 120 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 31344ef84f87..e1a520ca5e40 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,2 +1 @@
-DIST ipset-7.17.tar.bz2 684983 BLAKE2B 
43b74ab7caf5a963787184aa75b6c071388c8d28997681444b72118aba68b843e961b50418c3fa70b451b4cb090ec62940b770abac2156910442115edbf90d41
 SHA512 
e308a0d7707ccf7d0cb06a32cf9a822f97862e007abdbab8a91a5a0d5bfbd9f2fb9a3f5e8f36b250ec0d565438c8648a31e8e5b45d8205a76558e90f46e6e597
 DIST ipset-7.19.tar.bz2 686712 BLAKE2B 
04290b94be471aedd732601e1dc147a066933606152beb76ba1a21283aa2e3f8b891fd9575db73f2af67b446fb77a0ca6b2432ae606440ac9e9bf80e41d1f640
 SHA512 
0f4252e6d967b0f130a2c7a0307b17c6b7d48336e86b2f838ea176f5faaa0c9bbbf273060906b43d91e9b38a9f33c18918e33d02292839a6bc321181d5d7f84e

diff --git a/net-firewall/ipset/ipset-7.17-r1.ebuild 
b/net-firewall/ipset/ipset-7.17-r1.ebuild
deleted file mode 100644
index 9e4680fb9869..
--- a/net-firewall/ipset/ipset-7.17-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_USE=modules
-inherit autotools bash-completion-r1 linux-info linux-mod systemd
-
-DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/;
-SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-
-RDEPEND="
-   >=net-firewall/iptables-1.4.7
-   net-libs/libmnl:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-7.16-bashism.patch
-)
-
-# configurable from outside, e.g. /etc/portage/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/)"
-MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
-for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
-   MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-pkg_setup() {
-   get_version
-   CONFIG_CHECK="NETFILTER"
-   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-   CONFIG_CHECK+=" NETFILTER_NETLINK"
-   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
-   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
-
-   build_modules=0
-   if use modules; then
-   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//... ."
-   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() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   export bashcompdir="$(get_bashcompdir)"
-
-   econf \
-   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Ionen Wolkens]

commit: 6c67faf81bee0ff895a4b7ffb1d13042ed00a31f
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Jan 16 20:16:59 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 17 02:44:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c67faf8

net-firewall/ipset: Stabilize 7.19-r1 arm, #920113

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 net-firewall/ipset/ipset-7.19-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ipset/ipset-7.19-r1.ebuild 
b/net-firewall/ipset/ipset-7.19-r1.ebuild
index 7770192477aa..234ec51e7a34 100644
--- a/net-firewall/ipset/ipset-7.19-r1.ebuild
+++ b/net-firewall/ipset/ipset-7.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
net-firewall/iptables

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/

[Michał Górny]

commit: cc19d7a44d285d65018e7e397cb4bdef6f5d17f8
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Jan 13 14:47:36 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 13 18:50:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc19d7a4

net-firewall/ipset: remove unused files

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Michał Górny  gentoo.org>

 net-firewall/ipset/files/ipset.confd| 16 --
 net-firewall/ipset/files/ipset.initd-r4 | 94 -
 net-firewall/ipset/files/ipset.systemd  | 15 --
 3 files changed, 125 deletions(-)

diff --git a/net-firewall/ipset/files/ipset.confd 
b/net-firewall/ipset/files/ipset.confd
deleted file mode 100644
index 9fe42e9c75c5..
--- a/net-firewall/ipset/files/ipset.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-# /etc/conf.d/ipset
-
-# Location in which ipset initscript will save set rules on 
-# service shutdown
-IPSET_SAVE="/var/lib/ipset/rules-save"
-
-# Save state on stopping ipset
-SAVE_ON_STOP="yes"
-
-# If you need to log iptables messages as soon as iptables starts,
-# AND your logger does NOT depend on the network, then you may wish
-# to uncomment the next line.
-# If your logger depends on the network, and you uncomment this line
-# you will create an unresolvable circular dependency during startup.
-# After commenting or uncommenting this line, you must run 'rc-update -u'.
-#rc_use="logger"

diff --git a/net-firewall/ipset/files/ipset.initd-r4 
b/net-firewall/ipset/files/ipset.initd-r4
deleted file mode 100644
index 32ab581d8c83..
--- a/net-firewall/ipset/files/ipset.initd-r4
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="save"
-extra_started_commands="reload"
-
-IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/rules-save}
-
-depend() {
-before iptables ip6tables
-}
-
-checkconfig() {
-if [ ! -f "${IPSET_SAVE}" ] ; then
-eerror "Not starting ${SVCNAME}. First create some rules then run:"
-eerror "/etc/init.d/${SVCNAME} save"
-return 1
-fi
-return 0
-}
-
-start() {
-checkconfig || return 1
-ebegin "Loading ipset session"
-ipset restore < "${IPSET_SAVE}"
-eend $?
-}
-
-stop() {
-# check if there are any references to current sets
-
-if ! ipset list | gawk '
-($1 == "References:") { refcnt += $2 }
-($1 == "Type:" && $2 == "list:set") { set = 1 }
-(scan) { if ($0 != "") setcnt++; else { scan = 0; set = 0 } }
-(set && $1 == "Members:") {scan = 1}
-END { if ((refcnt - setcnt) > 0) exit 1 }
-'; then
-eerror "ipset is in use, can't stop"
-return 1
-fi
-
-if [ "${SAVE_ON_STOP}" = "yes" ] ; then
-save || return 1
-fi
-
-ebegin "Removing kernel IP sets"
-ipset flush
-ipset destroy
-eend $?
-}
-
-reload() {
-ebegin "Reloading ipsets"
-
-# Loading sets from a save file is only additive (there is no
-# automatic flushing or replacing). And, we can not remove sets
-# that are currently used in existing iptables rules.
-#
-# Instead, we create new temp sets for any set that is already
-# in use, and then atomically swap them into place.
-#
-# XXX: This does not clean out previously used ipsets that are
-# not in the new saved policy--it can't, because they may still
-# be referenced in the current iptables rules.
-
-# Build a list of all currently used sets (if any).
-running_ipset_list=$(ipset save | gawk '/^create/{printf "%s ",$2}')
-   running_ipset_list="${running_ipset_list% }"
-# Build a regular expression that matches those set names.
-running_ipset_list_regex="$(echo "$running_ipset_list" | tr -s ' ' '|' )"
-
-# Load up sets from the save file, but rename any set that already
-# exists to a temporary name that we will swap later.
-if ! cat ${IPSET_SAVE} | sed -r "s/^(create|add) 
(${running_ipset_list_regex}) /\1 \2_atomic_temp /" | ipset restore ; then
-eend $? "Failed to load new ipsets"
-fi
-
-# Now for every set name that currently exists, atomically swap it
-# with the temporary new one we created, and then destroy the old set.
-for ipset_name in ${running_ipset_list} ; do
-ipset swap ${ipset_name} ${ipset_name}_atomic_temp || eend $? "Failed 
to swap in new ipset $ipset_name"
-ipset destroy ${ipset_name}_atomic_temp || eend $? "Failed to delete 
obsolete ipset ${ipset_name}_atomic_temp"
-done
-eend 0
-}
-
-save() {
-ebegin "Saving ipset session"
-checkpath --file --mode 0600 "${IPSET_SAVE}"
-ipset save > "${IPSET_SAVE}"
-eend $?
-}

diff --git a/net-firewall/ipset/files/ipset.systemd 
b/net-firewall/ipset/files/ipset.systemd
deleted file mode 100644
index f7a5eb510a0a..
--- 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Mike Pagano]

commit: 94fe04b82a42ec0e4cc8cbc35566e6db9732c70e
Author: Mike Pagano  gentoo  org>
AuthorDate: Fri Jan 12 12:41:16 2024 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Fri Jan 12 12:41:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94fe04b8

net-firewall/ipset: drop 7.17

Signed-off-by: Mike Pagano  gentoo.org>

 net-firewall/ipset/ipset-7.17.ebuild | 119 ---
 1 file changed, 119 deletions(-)

diff --git a/net-firewall/ipset/ipset-7.17.ebuild 
b/net-firewall/ipset/ipset-7.17.ebuild
deleted file mode 100644
index acb679588765..
--- a/net-firewall/ipset/ipset-7.17.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_USE=modules
-inherit autotools bash-completion-r1 linux-info linux-mod systemd
-
-DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/;
-SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-
-RDEPEND="
-   >=net-firewall/iptables-1.4.7
-   net-libs/libmnl:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-7.16-bashism.patch
-)
-
-# configurable from outside, e.g. /etc/portage/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/)"
-MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
-for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
-   MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-pkg_setup() {
-   get_version
-   CONFIG_CHECK="NETFILTER"
-   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-   CONFIG_CHECK+=" NETFILTER_NETLINK"
-   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
-   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
-
-   build_modules=0
-   if use modules; then
-   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//... ."
-   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() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   export bashcompdir="$(get_bashcompdir)"
-
-   econf \
-   --enable-bashcompl \
-   $(use_with modules kmod) \
-   --with-maxsets=${IP_NF_SET_MAX} \
-   --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
-
-   find "${ED}" -name '*.la' -delete || die
-
-   newinitd "${FILESDIR}"/ipset.initd-r4 ${PN}
-   newconfd "${FILESDIR}"/ipset.confd ${PN}
-   systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service
-   keepdir /var/lib/ipset
-
-   if [[ ${build_modules} -eq 1 ]]; then
-   einfo "Installing kernel modules"
-   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 5818b9b89a5c7d778cf087030780c8d93a39d692
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 26 16:36:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 26 16:36:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5818b9b8

net-firewall/ipset: Stabilize 7.19-r1 x86, #920113

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.19-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.19-r1.ebuild 
b/net-firewall/ipset/ipset-7.19-r1.ebuild
index 848c287c52e1..7770192477aa 100644
--- a/net-firewall/ipset/ipset-7.19-r1.ebuild
+++ b/net-firewall/ipset/ipset-7.19-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
net-firewall/iptables

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: a2ed5229dd1fbda4e756b72d67ecf6023c7696fd
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 24 11:07:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 24 11:07:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ed5229

net-firewall/ipset: Stabilize 7.19-r1 ppc, #920113

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.19-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.19-r1.ebuild 
b/net-firewall/ipset/ipset-7.19-r1.ebuild
index 8ad4afaf6610..848c287c52e1 100644
--- a/net-firewall/ipset/ipset-7.19-r1.ebuild
+++ b/net-firewall/ipset/ipset-7.19-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~x86"
 
 RDEPEND="
net-firewall/iptables

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Arthur Zamarin]

commit: 051f7ff46d4f82fbeb81f975ac5a93388a59b711
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 23 14:29:11 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 23 14:29:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051f7ff4

net-firewall/ipset: Stabilize 7.19-r1 ppc64, #920113

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/ipset/ipset-7.19-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.19-r1.ebuild 
b/net-firewall/ipset/ipset-7.19-r1.ebuild
index c5eeb74d8100..8ad4afaf6610 100644
--- a/net-firewall/ipset/ipset-7.19-r1.ebuild
+++ b/net-firewall/ipset/ipset-7.19-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~x86"
 
 RDEPEND="
net-firewall/iptables

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Arthur Zamarin]

commit: dbb99734ba27b1120ac6c6fff7dbcd24259c028e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 16 11:58:04 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 16 11:58:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb99734

net-firewall/ipset: Stabilize 7.19-r1 arm64, #920113

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/ipset/ipset-7.19-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.19-r1.ebuild 
b/net-firewall/ipset/ipset-7.19-r1.ebuild
index 15cdfadce814..6d6695e2bffc 100644
--- a/net-firewall/ipset/ipset-7.19-r1.ebuild
+++ b/net-firewall/ipset/ipset-7.19-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
net-firewall/iptables

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Arthur Zamarin]

commit: 920310711079a63ca417f960fec65cf650c7666a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 29 12:02:45 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 29 12:02:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92031071

net-firewall/ipset: Stabilize 7.17-r1 ppc64, #911017

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/ipset/ipset-7.17-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.17-r1.ebuild 
b/net-firewall/ipset/ipset-7.17-r1.ebuild
index ba24f6c092aa..9e4680fb9869 100644
--- a/net-firewall/ipset/ipset-7.17-r1.ebuild
+++ b/net-firewall/ipset/ipset-7.17-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
>=net-firewall/iptables-1.4.7

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Mike Pagano]

commit: 3c4c39b32326379a7aebceb318c2f7800a6e3575
Author: Mike Pagano  gentoo  org>
AuthorDate: Sat Nov 25 15:12:55 2023 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Sat Nov 25 15:16:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4c39b3

net-firewall/ipset: Support mod buildn,mig to linux-mod-r1,add myself

A user has request we add back support for ipset module building.
The specific use case was around supporting embedded, as older
kernels are consider quite up to date.

Add myself as maintainer

Fix extraneous echo

Closes: https://bugs.gentoo.org/908698

Signed-off-by: Mike Pagano  gentoo.org>

 net-firewall/ipset/ipset-7.19-r1.ebuild | 114 
 net-firewall/ipset/metadata.xml |   4 ++
 2 files changed, 118 insertions(+)

diff --git a/net-firewall/ipset/ipset-7.19-r1.ebuild 
b/net-firewall/ipset/ipset-7.19-r1.ebuild
new file mode 100644
index ..15cdfadce814
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.19-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE=modules
+inherit autotools bash-completion-r1 linux-mod-r1 systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/;
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+   net-firewall/iptables
+   net-libs/libmnl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+# configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+pkg_setup() {
+   get_version
+   CONFIG_CHECK="NETFILTER"
+   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+   CONFIG_CHECK+=" NETFILTER_NETLINK"
+   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   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//... ."
+   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-r1_pkg_setup
+}
+
+src_configure() {
+   export bashcompdir="$(get_bashcompdir)"
+
+   econf \
+   --enable-bashcompl \
+   $(use_with modules kmod) \
+   --with-maxsets=${IP_NF_SET_MAX} \
+   --with-ksource="${KV_DIR}" \
+   --with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {
+   einfo "Building userspace"
+
+   local modlist=( 
xt_set=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/:
+   
em_ipset=kernel/net/sched:"${S}":kernel/net/sched/:modules )
+
+   for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
+   modlist+=( 
${i}=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/ipset )
+   done
+
+   emake
+
+   if [[ ${build_modules} -eq 1 ]]; then
+   einfo "Building kernel modules"
+   linux-mod-r1_src_compile
+   fi
+}
+
+src_install() {
+   einfo "Installing userspace"
+   default
+
+   find "${ED}" -name '*.la' -delete || die
+
+   newinitd 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Mike Pagano]

commit: 255821bba09149ea22088953073f77df7239b490
Author: Mike Pagano  gentoo  org>
AuthorDate: Sat Sep 23 15:13:22 2023 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Sat Sep 23 15:13:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255821bb

net-firewall/ipset: add 7.19, remove building out of tree kernel module

IP Set support has been in the kernel since 2.6.39, this now only
installs the userspace utilities.

Closes: https://bugs.gentoo.org/908698

Signed-off-by: Mike Pagano  gentoo.org>

 net-firewall/ipset/Manifest  |  1 +
 net-firewall/ipset/ipset-7.19.ebuild | 65 
 2 files changed, 66 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index a65795385364..31344ef84f87 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1 +1,2 @@
 DIST ipset-7.17.tar.bz2 684983 BLAKE2B 
43b74ab7caf5a963787184aa75b6c071388c8d28997681444b72118aba68b843e961b50418c3fa70b451b4cb090ec62940b770abac2156910442115edbf90d41
 SHA512 
e308a0d7707ccf7d0cb06a32cf9a822f97862e007abdbab8a91a5a0d5bfbd9f2fb9a3f5e8f36b250ec0d565438c8648a31e8e5b45d8205a76558e90f46e6e597
+DIST ipset-7.19.tar.bz2 686712 BLAKE2B 
04290b94be471aedd732601e1dc147a066933606152beb76ba1a21283aa2e3f8b891fd9575db73f2af67b446fb77a0ca6b2432ae606440ac9e9bf80e41d1f640
 SHA512 
0f4252e6d967b0f130a2c7a0307b17c6b7d48336e86b2f838ea176f5faaa0c9bbbf273060906b43d91e9b38a9f33c18918e33d02292839a6bc321181d5d7f84e

diff --git a/net-firewall/ipset/ipset-7.19.ebuild 
b/net-firewall/ipset/ipset-7.19.ebuild
new file mode 100644
index ..b2ba675086ea
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.19.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 linux-info systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/;
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+   >=net-firewall/iptables-1.8.9
+   net-libs/libmnl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+# configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+pkg_setup() {
+   get_version
+   CONFIG_CHECK="NETFILTER"
+   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+   CONFIG_CHECK+=" NETFILTER_NETLINK"
+   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+}
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   export bashcompdir="$(get_bashcompdir)"
+
+   econf \
+   --enable-bashcompl \
+   --with-kmod=no \
+   --with-maxsets=${IP_NF_SET_MAX}
+}
+
+src_install() {
+   einfo "Installing userspace"
+   default
+
+   find "${ED}" -name '*.la' -delete || die
+
+   newinitd "${FILESDIR}"/ipset.initd-r5 ${PN}
+   newconfd "${FILESDIR}"/ipset.confd-r1 ${PN}
+   systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service
+   keepdir /var/lib/ipset
+}

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: fd67660fe4d82d21b556adb60aceb643129f32d2
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 22 14:02:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 22 14:02:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd67660f

Revert "net-firewall/ipset: add 7.19"

This reverts commit 4866133fcd354925bb3e78cde5f1e0affa686769.

I didn't mean to push this yet (we might drop the modules).

Bug: https://bugs.gentoo.org/908698
Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/Manifest  |   1 -
 net-firewall/ipset/ipset-7.19.ebuild | 106 ---
 2 files changed, 107 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 31344ef84f87..a65795385364 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,2 +1 @@
 DIST ipset-7.17.tar.bz2 684983 BLAKE2B 
43b74ab7caf5a963787184aa75b6c071388c8d28997681444b72118aba68b843e961b50418c3fa70b451b4cb090ec62940b770abac2156910442115edbf90d41
 SHA512 
e308a0d7707ccf7d0cb06a32cf9a822f97862e007abdbab8a91a5a0d5bfbd9f2fb9a3f5e8f36b250ec0d565438c8648a31e8e5b45d8205a76558e90f46e6e597
-DIST ipset-7.19.tar.bz2 686712 BLAKE2B 
04290b94be471aedd732601e1dc147a066933606152beb76ba1a21283aa2e3f8b891fd9575db73f2af67b446fb77a0ca6b2432ae606440ac9e9bf80e41d1f640
 SHA512 
0f4252e6d967b0f130a2c7a0307b17c6b7d48336e86b2f838ea176f5faaa0c9bbbf273060906b43d91e9b38a9f33c18918e33d02292839a6bc321181d5d7f84e

diff --git a/net-firewall/ipset/ipset-7.19.ebuild 
b/net-firewall/ipset/ipset-7.19.ebuild
deleted file mode 100644
index 2c0d15090573..
--- a/net-firewall/ipset/ipset-7.19.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_IUSE=modules
-inherit bash-completion-r1 linux-mod-r1 systemd
-
-DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/;
-SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-   >=net-firewall/iptables-1.4.7
-   net-libs/libmnl:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-# Configurable from outside, e.g. /etc/portage/make.conf
-IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
-
-pkg_setup() {
-   get_version
-
-   CONFIG_CHECK="NETFILTER NETFILTER_NETLINK !PAX_CONSTIFY_PLUGIN"
-   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK support in 
your kernel."
-ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (bug 
#614896)"
-
-   # 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
-   if linux_config_src_exists && linux_chkconfig_builtin 
"MODULES"; then
-   # bug #274577
-   if linux_chkconfig_present "IP_NF_SET" || 
linux_chkconfig_present "IP_SET"; then
-   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//... ."
-   die "USE=modules and in-kernel ipset support 
detected."
-   else
-   einfo "Modular kernel detected. Will build 
kernel modules..."
-   build_modules=1
-   fi
-   else
-   eerror "Monolithic kernel detected, but USE=modules. 
Either build"
-   eerror "modular kernel (without IP_SET) or disable 
USE=modules"
-   die "Monolithic kernel detected, will not build kernel 
modules"
-   fi
-   fi
-
-   [[ ${build_modules} -eq 1 ]] && linux-mod-r1_pkg_setup
-}
-
-src_configure() {
-   export bashcompdir="$(get_bashcompdir)"
-
-   local myeconfargs=(
-   --enable-bashcompl
-   $(use_with modules kmod)
-   --with-maxsets=${IP_NF_SET_MAX}
-   --with-ksource="${KV_DIR}"
-   --with-kbuild="${KV_OUT_DIR}"
-   )
-
-   econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-   emake
-
-   if [[ ${build_modules} -eq 1 ]]; then
-   MODULES_MAKEARGS+=(
-   KBUILDDIR="${KV_OUT_DIR}"
-   INSTALL_MOD_DIR="extra" # 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 4866133fcd354925bb3e78cde5f1e0affa686769
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 21 22:35:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 22 14:02:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4866133f

net-firewall/ipset: add 7.19

Closes: https://bugs.gentoo.org/908698
Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/Manifest  |   1 +
 net-firewall/ipset/ipset-7.19.ebuild | 106 +++
 2 files changed, 107 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index a65795385364..31344ef84f87 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1 +1,2 @@
 DIST ipset-7.17.tar.bz2 684983 BLAKE2B 
43b74ab7caf5a963787184aa75b6c071388c8d28997681444b72118aba68b843e961b50418c3fa70b451b4cb090ec62940b770abac2156910442115edbf90d41
 SHA512 
e308a0d7707ccf7d0cb06a32cf9a822f97862e007abdbab8a91a5a0d5bfbd9f2fb9a3f5e8f36b250ec0d565438c8648a31e8e5b45d8205a76558e90f46e6e597
+DIST ipset-7.19.tar.bz2 686712 BLAKE2B 
04290b94be471aedd732601e1dc147a066933606152beb76ba1a21283aa2e3f8b891fd9575db73f2af67b446fb77a0ca6b2432ae606440ac9e9bf80e41d1f640
 SHA512 
0f4252e6d967b0f130a2c7a0307b17c6b7d48336e86b2f838ea176f5faaa0c9bbbf273060906b43d91e9b38a9f33c18918e33d02292839a6bc321181d5d7f84e

diff --git a/net-firewall/ipset/ipset-7.19.ebuild 
b/net-firewall/ipset/ipset-7.19.ebuild
new file mode 100644
index ..2c0d15090573
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.19.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_IUSE=modules
+inherit bash-completion-r1 linux-mod-r1 systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/;
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+   >=net-firewall/iptables-1.4.7
+   net-libs/libmnl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+# Configurable from outside, e.g. /etc/portage/make.conf
+IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
+
+pkg_setup() {
+   get_version
+
+   CONFIG_CHECK="NETFILTER NETFILTER_NETLINK !PAX_CONSTIFY_PLUGIN"
+   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK support in 
your kernel."
+ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (bug 
#614896)"
+
+   # 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
+   if linux_config_src_exists && linux_chkconfig_builtin 
"MODULES"; then
+   # bug #274577
+   if linux_chkconfig_present "IP_NF_SET" || 
linux_chkconfig_present "IP_SET"; then
+   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//... ."
+   die "USE=modules and in-kernel ipset support 
detected."
+   else
+   einfo "Modular kernel detected. Will build 
kernel modules..."
+   build_modules=1
+   fi
+   else
+   eerror "Monolithic kernel detected, but USE=modules. 
Either build"
+   eerror "modular kernel (without IP_SET) or disable 
USE=modules"
+   die "Monolithic kernel detected, will not build kernel 
modules"
+   fi
+   fi
+
+   [[ ${build_modules} -eq 1 ]] && linux-mod-r1_pkg_setup
+}
+
+src_configure() {
+   export bashcompdir="$(get_bashcompdir)"
+
+   local myeconfargs=(
+   --enable-bashcompl
+   $(use_with modules kmod)
+   --with-maxsets=${IP_NF_SET_MAX}
+   --with-ksource="${KV_DIR}"
+   --with-kbuild="${KV_OUT_DIR}"
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   emake
+
+   if [[ ${build_modules} -eq 1 ]]; then
+   MODULES_MAKEARGS+=(
+   KBUILDDIR="${KV_OUT_DIR}"
+   INSTALL_MOD_DIR="extra" # Makefile wants 'extra' for 
warning
+   )
+
+   emake "${MODULES_MAKEARGS[@]}" modules
+   fi
+}
+

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: a15a9579c837875ee585643f4b9033878fd6a868
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 17 02:55:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 17 02:55:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a15a9579

net-firewall/ipset: Stabilize 7.17-r1 arm64, #911017

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.17-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.17-r1.ebuild 
b/net-firewall/ipset/ipset-7.17-r1.ebuild
index 45535041339e..ba24f6c092aa 100644
--- a/net-firewall/ipset/ipset-7.17-r1.ebuild
+++ b/net-firewall/ipset/ipset-7.17-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
>=net-firewall/iptables-1.4.7

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 04deae49f441fa7fc6d7159a5513ea07fdee493e
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug  5 00:32:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug  5 00:32:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04deae49

net-firewall/ipset: Stabilize 7.17-r1 ppc, #911017

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.17-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.17-r1.ebuild 
b/net-firewall/ipset/ipset-7.17-r1.ebuild
index 6b07c373d38f..45535041339e 100644
--- a/net-firewall/ipset/ipset-7.17-r1.ebuild
+++ b/net-firewall/ipset/ipset-7.17-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
>=net-firewall/iptables-1.4.7

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 3c7cd89d7f539de56cf705a272e1a9b29f0a5922
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 24 21:02:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 24 21:02:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7cd89d

net-firewall/ipset: Stabilize 7.17-r1 x86, #911017

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.17-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.17-r1.ebuild 
b/net-firewall/ipset/ipset-7.17-r1.ebuild
index 49b82752910f..6b07c373d38f 100644
--- a/net-firewall/ipset/ipset-7.17-r1.ebuild
+++ b/net-firewall/ipset/ipset-7.17-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
>=net-firewall/iptables-1.4.7

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/, net-firewall/ipset/

[Sam James]

commit: 3262040cbde4a5738ee7c6b41a3038001ab383d8
Author: Hank Leininger  korelogic  com>
AuthorDate: Sat Jun 17 17:21:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 17 17:59:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3262040c

net-firewall/ipset: Make temp suffix configurable

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/908235
Closes: https://github.com/gentoo/gentoo/pull/31516
Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/files/ipset.confd-r1 |  19 +
 net-firewall/ipset/files/ipset.initd-r5 | 105 
 net-firewall/ipset/ipset-7.17-r1.ebuild | 119 
 3 files changed, 243 insertions(+)

diff --git a/net-firewall/ipset/files/ipset.confd-r1 
b/net-firewall/ipset/files/ipset.confd-r1
new file mode 100644
index ..ebedb672a676
--- /dev/null
+++ b/net-firewall/ipset/files/ipset.confd-r1
@@ -0,0 +1,19 @@
+# /etc/conf.d/ipset
+
+# Location in which ipset initscript will save set rules on 
+# service shutdown
+IPSET_SAVE="/var/lib/ipset/rules-save"
+
+# Save state on stopping ipset
+SAVE_ON_STOP="yes"
+
+# Suffix used for temporary set names used for atomic swaps
+TEMP_SUFFIX=".t"
+
+# If you need to log iptables messages as soon as iptables starts,
+# AND your logger does NOT depend on the network, then you may wish
+# to uncomment the next line.
+# If your logger depends on the network, and you uncomment this line
+# you will create an unresolvable circular dependency during startup.
+# After commenting or uncommenting this line, you must run 'rc-update -u'.
+#rc_use="logger"

diff --git a/net-firewall/ipset/files/ipset.initd-r5 
b/net-firewall/ipset/files/ipset.initd-r5
new file mode 100644
index ..0c73cec68c7d
--- /dev/null
+++ b/net-firewall/ipset/files/ipset.initd-r5
@@ -0,0 +1,105 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="save"
+extra_started_commands="reload"
+
+IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/rules-save}
+
+depend() {
+before iptables ip6tables
+}
+
+checkconfig() {
+if [ ! -f "${IPSET_SAVE}" ] ; then
+eerror "Not starting ${SVCNAME}. First create some rules then run:"
+eerror "/etc/init.d/${SVCNAME} save"
+return 1
+fi
+return 0
+}
+
+start() {
+checkconfig || return 1
+ebegin "Loading ipset session"
+ipset restore < "${IPSET_SAVE}"
+eend $?
+}
+
+stop() {
+# check if there are any references to current sets
+
+if ! ipset list | gawk '
+($1 == "References:") { refcnt += $2 }
+($1 == "Type:" && $2 == "list:set") { set = 1 }
+(scan) { if ($0 != "") setcnt++; else { scan = 0; set = 0 } }
+(set && $1 == "Members:") {scan = 1}
+END { if ((refcnt - setcnt) > 0) exit 1 }
+'; then
+eerror "ipset is in use, can't stop"
+return 1
+fi
+
+if [ "${SAVE_ON_STOP}" = "yes" ] ; then
+save || return 1
+fi
+
+ebegin "Removing kernel IP sets"
+ipset flush
+ipset destroy
+eend $?
+}
+
+reload() {
+ebegin "Reloading ipsets"
+
+# Loading sets from a save file is only additive (there is no
+# automatic flushing or replacing). And, we can not remove sets
+# that are currently used in existing iptables rules.
+#
+# Instead, we create new temp sets for any set that is already
+# in use, and then atomically swap them into place.
+#
+# XXX: This does not clean out previously used ipsets that are
+# not in the new saved policy--it can't, because they may still
+# be referenced in the current iptables rules.
+
+
+# Build a list of all currently used sets (if any).
+running_ipset_list=$(ipset save | gawk '/^create/{printf "%s ",$2}')
+   running_ipset_list="${running_ipset_list% }"
+
+# Check the configured suffix, and make sure there are no collisions
+if test -z "${TEMP_SUFFIX}" ; then
+  eend 1 "TEMP_SUFFIX cannot be empty"
+  return 1
+elif echo "$running_ipset_list" | grep -q -E "${TEMP_SUFFIX}( |$)" ; then
+  eend 1 "Existing set(s) match TEMP_SUFFIX pattern ('${TEMP_SUFFIX}'), 
cannot continue"
+  return 1
+fi
+
+# Build a regular expression that matches those set names.
+running_ipset_list_regex="$(echo "$running_ipset_list" | tr -s ' ' '|' )"
+
+# Load up sets from the save file, but rename any set that already
+# exists to a temporary name that we will swap later.
+if ! cat ${IPSET_SAVE} | sed -r "s/^(create|add) 
(${running_ipset_list_regex}) /\1 \2${TEMP_SUFFIX} /" | ipset restore ; then
+eend $? "Failed to load new ipsets"
+fi
+
+# Now for every set name that currently exists, atomically swap it
+# with the temporary new one we created, and then destroy the old set.
+for ipset_name in ${running_ipset_list} ; do
+

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/, net-firewall/ipset/

[Sam James]

commit: 741ef8be1b312d576bd62eaa00ea92ed392ae069
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 13:32:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 13:32:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741ef8be

net-firewall/ipset: drop 7.15, 7.16-r1

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/Manifest|   2 -
 .../ipset/files/ipset-7.4-fix-pkgconfig-dir.patch  |  11 --
 net-firewall/ipset/ipset-7.15.ebuild   | 114 
 net-firewall/ipset/ipset-7.16-r1.ebuild| 119 -
 4 files changed, 246 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 6320f121cb5b..a65795385364 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,3 +1 @@
-DIST ipset-7.15.tar.bz2 680383 BLAKE2B 
10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed
 SHA512 
0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a
-DIST ipset-7.16.tar.bz2 684512 BLAKE2B 
c2c58bd6250bab41c3c5cb2ed6a39b1cd5e47a60eca5ed19373dad6c611f5263c61cf12915b5d658700e8e78f4f445788900a2b89cdcdbef3407375b4131fb04
 SHA512 
e69ddee956f0922c8e08e7e5d358d6b5b24178a9f08151b20957cc3465baaba9ecd6aa938ae157f2cd286ccd7f0b7a279cfd89cec2393a00b43e4d945c275307
 DIST ipset-7.17.tar.bz2 684983 BLAKE2B 
43b74ab7caf5a963787184aa75b6c071388c8d28997681444b72118aba68b843e961b50418c3fa70b451b4cb090ec62940b770abac2156910442115edbf90d41
 SHA512 
e308a0d7707ccf7d0cb06a32cf9a822f97862e007abdbab8a91a5a0d5bfbd9f2fb9a3f5e8f36b250ec0d565438c8648a31e8e5b45d8205a76558e90f46e6e597

diff --git a/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch 
b/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch
deleted file mode 100644
index b10ddbd4fae0..
--- a/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -46,7 +46,7 @@ EXTRA_libipset_la_SOURCES = \
- 
- EXTRA_DIST = $(IPSET_SETTYPE_LIST) libipset.map
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/$(libdir)/pkgconfig
- pkgconfig_DATA = libipset.pc
- 
- dist_man_MANS = libipset.3

diff --git a/net-firewall/ipset/ipset-7.15.ebuild 
b/net-firewall/ipset/ipset-7.15.ebuild
deleted file mode 100644
index fad8d3142d3b..
--- a/net-firewall/ipset/ipset-7.15.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-MODULES_OPTIONAL_USE=modules
-inherit autotools linux-info linux-mod systemd
-
-DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="https://ipset.netfilter.org/;
-SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-   net-libs/libmnl:="
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
-
-# configurable from outside, e.g. /etc/portage/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/)"
-MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
-for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
-   MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-pkg_setup() {
-   get_version
-   CONFIG_CHECK="NETFILTER"
-   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-   CONFIG_CHECK+=" NETFILTER_NETLINK"
-   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
-   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
-
-   build_modules=0
-   if use modules; then
-   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 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Arthur Zamarin]

commit: 1694c0ce5c42b86fba1b4bb5648fbd308e52c280
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar 15 14:17:00 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar 15 14:17:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1694c0ce

net-firewall/ipset: Stabilize 7.17 ppc64, #892177

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/ipset/ipset-7.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.17.ebuild 
b/net-firewall/ipset/ipset-7.17.ebuild
index 4c06251faefc..acb679588765 100644
--- a/net-firewall/ipset/ipset-7.17.ebuild
+++ b/net-firewall/ipset/ipset-7.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
>=net-firewall/iptables-1.4.7

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Arthur Zamarin]

commit: 662b5ae8118ad469f4fce9a68db69a164ffcb0c2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan 28 16:02:29 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan 28 16:02:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662b5ae8

net-firewall/ipset: Stabilize 7.17 arm, #892177

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-firewall/ipset/ipset-7.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.17.ebuild 
b/net-firewall/ipset/ipset-7.17.ebuild
index 209eb354279a..4c06251faefc 100644
--- a/net-firewall/ipset/ipset-7.17.ebuild
+++ b/net-firewall/ipset/ipset-7.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
>=net-firewall/iptables-1.4.7

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Jakov Smolić]

commit: 8b13ed8d2e16a4a0d5966cc133e33c9c438e3e9d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jan 27 10:10:18 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jan 27 10:10:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b13ed8d

net-firewall/ipset: Stabilize 7.17 amd64, #892177

Signed-off-by: Jakov Smolić  gentoo.org>

 net-firewall/ipset/ipset-7.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.17.ebuild 
b/net-firewall/ipset/ipset-7.17.ebuild
index c9fd007b3028..209eb354279a 100644
--- a/net-firewall/ipset/ipset-7.17.ebuild
+++ b/net-firewall/ipset/ipset-7.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
>=net-firewall/iptables-1.4.7

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 84fd0d10c0a76fa8408d5a758d2e24aade95d5fa
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 27 08:04:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 27 08:04:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84fd0d10

net-firewall/ipset: Stabilize 7.17 x86, #892177

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.17.ebuild 
b/net-firewall/ipset/ipset-7.17.ebuild
index ff391fab36ee..dfccea85943e 100644
--- a/net-firewall/ipset/ipset-7.17.ebuild
+++ b/net-firewall/ipset/ipset-7.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
>=net-firewall/iptables-1.4.7

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 8904218ac78a8dc13172cd0af17ae466ced2f419
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 27 08:04:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 27 08:04:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8904218a

net-firewall/ipset: Stabilize 7.17 ppc, #892177

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.17.ebuild 
b/net-firewall/ipset/ipset-7.17.ebuild
index dfccea85943e..c9fd007b3028 100644
--- a/net-firewall/ipset/ipset-7.17.ebuild
+++ b/net-firewall/ipset/ipset-7.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
>=net-firewall/iptables-1.4.7

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: f9d7aa8dfc17b96eb1aebf2ea931ac7be9f4908f
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 27 06:32:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 27 06:32:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d7aa8d

net-firewall/ipset: Stabilize 7.17 arm64, #892177

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.17.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ipset/ipset-7.17.ebuild 
b/net-firewall/ipset/ipset-7.17.ebuild
index 450b35c613fc..ff391fab36ee 100644
--- a/net-firewall/ipset/ipset-7.17.ebuild
+++ b/net-firewall/ipset/ipset-7.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
>=net-firewall/iptables-1.4.7

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/, net-firewall/ipset/

[Sam James]

commit: abff60a972c82e5c0f155a3a37bc6cdb7613ea25
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 31 23:23:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 31 23:23:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abff60a9

net-firewall/ipset: add 7.17

Closes: https://bugs.gentoo.org/813468
Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/Manifest   |   1 +
 net-firewall/ipset/files/ipset.systemd-r1 |  15 
 net-firewall/ipset/ipset-7.17.ebuild  | 119 ++
 3 files changed, 135 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index db79ace8bb25..6320f121cb5b 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,2 +1,3 @@
 DIST ipset-7.15.tar.bz2 680383 BLAKE2B 
10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed
 SHA512 
0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a
 DIST ipset-7.16.tar.bz2 684512 BLAKE2B 
c2c58bd6250bab41c3c5cb2ed6a39b1cd5e47a60eca5ed19373dad6c611f5263c61cf12915b5d658700e8e78f4f445788900a2b89cdcdbef3407375b4131fb04
 SHA512 
e69ddee956f0922c8e08e7e5d358d6b5b24178a9f08151b20957cc3465baaba9ecd6aa938ae157f2cd286ccd7f0b7a279cfd89cec2393a00b43e4d945c275307
+DIST ipset-7.17.tar.bz2 684983 BLAKE2B 
43b74ab7caf5a963787184aa75b6c071388c8d28997681444b72118aba68b843e961b50418c3fa70b451b4cb090ec62940b770abac2156910442115edbf90d41
 SHA512 
e308a0d7707ccf7d0cb06a32cf9a822f97862e007abdbab8a91a5a0d5bfbd9f2fb9a3f5e8f36b250ec0d565438c8648a31e8e5b45d8205a76558e90f46e6e597

diff --git a/net-firewall/ipset/files/ipset.systemd-r1 
b/net-firewall/ipset/files/ipset.systemd-r1
new file mode 100644
index ..600779604fb3
--- /dev/null
+++ b/net-firewall/ipset/files/ipset.systemd-r1
@@ -0,0 +1,15 @@
+[Unit]
+Description=ipset service
+Before=network-pre.target iptables-restore.service ip6tables-restore.service 
firewalld.service
+Wants=network-pre.target
+ConditionFileNotEmpty=/var/lib/ipset/rules-save
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore
+ExecReload=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore
+ExecStop=/usr/sbin/ipset -file /var/lib/ipset/rules-save save
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipset/ipset-7.17.ebuild 
b/net-firewall/ipset/ipset-7.17.ebuild
new file mode 100644
index ..450b35c613fc
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.17.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_USE=modules
+inherit autotools bash-completion-r1 linux-info linux-mod systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/;
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+   >=net-firewall/iptables-1.4.7
+   net-libs/libmnl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-7.16-bashism.patch
+)
+
+# configurable from outside, e.g. /etc/portage/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/)"
+MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
+for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
+   MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+
+pkg_setup() {
+   get_version
+   CONFIG_CHECK="NETFILTER"
+   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+   CONFIG_CHECK+=" NETFILTER_NETLINK"
+   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   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."
+   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Mike Gilbert]

commit: cdd2e95a3c934fc930d9998df9dae5ccb2f0c761
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Nov 28 02:00:54 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 28 02:01:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd2e95a

net-firewall/ipset: move libipset to /usr/lib

I can't see any reason to install this in /lib.

Closes: https://bugs.gentoo.org/883367
Signed-off-by: Mike Gilbert  gentoo.org>

 net-firewall/ipset/{ipset-7.16.ebuild => ipset-7.16-r1.ebuild} | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-firewall/ipset/ipset-7.16.ebuild 
b/net-firewall/ipset/ipset-7.16-r1.ebuild
similarity index 97%
rename from net-firewall/ipset/ipset-7.16.ebuild
rename to net-firewall/ipset/ipset-7.16-r1.ebuild
index c19854792ec7..96010e14ff14 100644
--- a/net-firewall/ipset/ipset-7.16.ebuild
+++ b/net-firewall/ipset/ipset-7.16-r1.ebuild
@@ -24,7 +24,6 @@ BDEPEND="virtual/pkgconfig"
 DOCS=( ChangeLog INSTALL README UPGRADE )
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch
"${FILESDIR}"/${PN}-7.16-bashism.patch
 )
 
@@ -87,7 +86,6 @@ src_configure() {
--enable-bashcompl \
$(use_with modules kmod) \
--with-maxsets=${IP_NF_SET_MAX} \
-   --libdir="${EPREFIX}/$(get_libdir)" \
--with-ksource="${KV_DIR}" \
--with-kbuild="${KV_OUT_DIR}"
 }

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/, net-firewall/ipset/

[Sam James]

commit: 3299ae70d136f8841ea556cd7ad33364201eabee
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 24 04:48:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 24 04:48:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3299ae70

net-firewall/ipset: add 7.16

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/Manifest   |   1 +
 net-firewall/ipset/files/ipset-7.16-bashism.patch |  46 
 net-firewall/ipset/ipset-7.16.ebuild  | 121 ++
 3 files changed, 168 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index dabd8dda8287..db79ace8bb25 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1 +1,2 @@
 DIST ipset-7.15.tar.bz2 680383 BLAKE2B 
10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed
 SHA512 
0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a
+DIST ipset-7.16.tar.bz2 684512 BLAKE2B 
c2c58bd6250bab41c3c5cb2ed6a39b1cd5e47a60eca5ed19373dad6c611f5263c61cf12915b5d658700e8e78f4f445788900a2b89cdcdbef3407375b4131fb04
 SHA512 
e69ddee956f0922c8e08e7e5d358d6b5b24178a9f08151b20957cc3465baaba9ecd6aa938ae157f2cd286ccd7f0b7a279cfd89cec2393a00b43e4d945c275307

diff --git a/net-firewall/ipset/files/ipset-7.16-bashism.patch 
b/net-firewall/ipset/files/ipset-7.16-bashism.patch
new file mode 100644
index ..ff4d6b095528
--- /dev/null
+++ b/net-firewall/ipset/files/ipset-7.16-bashism.patch
@@ -0,0 +1,46 @@
+From 6004475ff78ddb3afd8beadcb5330664d50081f5 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Thu, 24 Nov 2022 04:38:28 +
+Subject: [PATCH] configure.ac: fix bashisms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Signed-off-by: Sam James 
+--- a/configure.ac
 b/configure.ac
+@@ -27,7 +27,7 @@ AC_ARG_WITH([kmod],
+[Build the kernel module (default: yes)]),
+ [BUILDKMOD="$withval";],
+ [BUILDKMOD="yes";])
+-AM_CONDITIONAL(WITH_KMOD, test "$BUILDKMOD" == "yes")
++AM_CONDITIONAL(WITH_KMOD, test "$BUILDKMOD" = "yes")
+ 
+ dnl Additional arguments
+ dnl Kernel build directory or source tree
+@@ -76,7 +76,7 @@ if test "x$enable_bashcompl" = "xyes"; then
+   AC_SUBST(bashcompdir)
+ fi
+ 
+-if test "$BUILDKMOD" == "yes"
++if test "$BUILDKMOD" = "yes"
+ then
+ dnl Sigh: check kernel version dependencies
+ if test "$KBUILDDIR" != ""
+@@ -204,7 +204,7 @@ AC_CHECK_TYPES([union nf_inet_addr],,,[#include 

+ dnl Checks for functions
+ AC_CHECK_FUNCS(gethostbyname2)
+ 
+-if test "$BUILDKMOD" == "yes"
++if test "$BUILDKMOD" = "yes"
+ then
+ dnl Check kernel incompatibilities... Ugly like hell
+ 

diff --git a/net-firewall/ipset/ipset-7.16.ebuild 
b/net-firewall/ipset/ipset-7.16.ebuild
new file mode 100644
index ..c19854792ec7
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.16.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_USE=modules
+inherit autotools bash-completion-r1 linux-info linux-mod systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="https://ipset.netfilter.org/;
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+   >=net-firewall/iptables-1.4.7
+   net-libs/libmnl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch
+   "${FILESDIR}"/${PN}-7.16-bashism.patch
+)
+
+# configurable from outside, e.g. /etc/portage/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/)"
+MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
+for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
+   MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+
+pkg_setup() {
+   get_version
+   CONFIG_CHECK="NETFILTER"
+   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+   CONFIG_CHECK+=" NETFILTER_NETLINK"
+   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK support in 
your kernel."
+   # It does still 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 2d0792849977c8a696e70c3d8b0df6270ee5602f
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 17:11:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 17:12:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d079284

net-firewall/ipset: drop 7.11-r1

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/Manifest |   1 -
 net-firewall/ipset/ipset-7.11-r1.ebuild | 114 
 2 files changed, 115 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 7ce421de4ea8..dabd8dda8287 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,2 +1 @@
-DIST ipset-7.11.tar.bz2 674100 BLAKE2B 
97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd
 SHA512 
20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922
 DIST ipset-7.15.tar.bz2 680383 BLAKE2B 
10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed
 SHA512 
0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a

diff --git a/net-firewall/ipset/ipset-7.11-r1.ebuild 
b/net-firewall/ipset/ipset-7.11-r1.ebuild
deleted file mode 100644
index cbee799db563..
--- a/net-firewall/ipset/ipset-7.11-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-MODULES_OPTIONAL_USE=modules
-inherit autotools linux-info linux-mod systemd
-
-DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="https://ipset.netfilter.org/;
-SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-   net-libs/libmnl:="
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
-
-# configurable from outside, e.g. /etc/portage/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/)"
-MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
-for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
-   MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-pkg_setup() {
-   get_version
-   CONFIG_CHECK="NETFILTER"
-   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-   CONFIG_CHECK+=" NETFILTER_NETLINK"
-   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
-   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
-
-   build_modules=0
-   if use modules; then
-   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//... ."
-   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() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_with modules kmod) \
-   --disable-static \
-   --with-maxsets=${IP_NF_SET_MAX} \
-   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: aa687a6a2e730401ac377a66cd19512fbc6b6d85
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  4 18:47:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  4 18:47:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa687a6a

net-firewall/ipset: Stabilize 7.15 ppc64, #831835

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.15.ebuild 
b/net-firewall/ipset/ipset-7.15.ebuild
index f4dbd52bf881..fad8d3142d3b 100644
--- a/net-firewall/ipset/ipset-7.15.ebuild
+++ b/net-firewall/ipset/ipset-7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 5830e7a9c7f8176f789ed8d2bfcbbfc4d937520d
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 16 00:37:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 00:37:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5830e7a9

net-firewall/ipset: Stabilize 7.15 arm, #831278

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.15.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ipset/ipset-7.15.ebuild 
b/net-firewall/ipset/ipset-7.15.ebuild
index cbee799db563..f4dbd52bf881 100644
--- a/net-firewall/ipset/ipset-7.15.ebuild
+++ b/net-firewall/ipset/ipset-7.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Agostino Sarubbo]

commit: 9e8d558d2d294c249f5e505b3044e7d96b87b387
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec  7 06:26:03 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec  7 06:26:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e8d558d

net-firewall/ipset: x86 stable wrt bug #828257

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-firewall/ipset/ipset-7.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.15.ebuild 
b/net-firewall/ipset/ipset-7.15.ebuild
index cd1109bc86b9..cbee799db563 100644
--- a/net-firewall/ipset/ipset-7.15.ebuild
+++ b/net-firewall/ipset/ipset-7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: bf020f89bcbca11cf5a8a518b76c4d9ab07791ff
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec  7 00:44:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  7 00:44:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf020f89

net-firewall/ipset: Stabilize 7.15 arm64, #828257

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.15.ebuild 
b/net-firewall/ipset/ipset-7.15.ebuild
index 844268fa41ad..cd1109bc86b9 100644
--- a/net-firewall/ipset/ipset-7.15.ebuild
+++ b/net-firewall/ipset/ipset-7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv ~x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Jakov Smolić]

commit: 494f7a3b249970a13045d47ef2fd5a81fab6f2ac
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Dec  5 07:48:28 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Dec  5 07:48:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494f7a3b

net-firewall/ipset: Stabilize 7.15 amd64, #828257

Signed-off-by: Jakov Smolić  gentoo.org>

 net-firewall/ipset/ipset-7.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.15.ebuild 
b/net-firewall/ipset/ipset-7.15.ebuild
index b37a716c1821..6cfc714fd193 100644
--- a/net-firewall/ipset/ipset-7.15.ebuild
+++ b/net-firewall/ipset/ipset-7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: 3ceb1c94794704204aa5ee883a26e2b297efeac9
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Aug 24 12:55:53 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Aug 24 12:55:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ceb1c94

net-firewall/ipset: bump to v7.15

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/Manifest  |   1 +
 net-firewall/ipset/ipset-7.15.ebuild | 114 +++
 2 files changed, 115 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 0ce4248892d..7ce421de4ea 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1 +1,2 @@
 DIST ipset-7.11.tar.bz2 674100 BLAKE2B 
97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd
 SHA512 
20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922
+DIST ipset-7.15.tar.bz2 680383 BLAKE2B 
10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed
 SHA512 
0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a

diff --git a/net-firewall/ipset/ipset-7.15.ebuild 
b/net-firewall/ipset/ipset-7.15.ebuild
new file mode 100644
index 000..b37a716c182
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.15.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+DESCRIPTION="IPset tool for iptables, successor to ippool"
+HOMEPAGE="https://ipset.netfilter.org/;
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+   net-libs/libmnl:="
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# configurable from outside, e.g. /etc/portage/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/)"
+MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
+for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
+   MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+
+pkg_setup() {
+   get_version
+   CONFIG_CHECK="NETFILTER"
+   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+   CONFIG_CHECK+=" NETFILTER_NETLINK"
+   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   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//... ."
+   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() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_with modules kmod) \
+   --disable-static \
+  

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Marek Szuba]

commit: 35ffe1335c7598266e1b6da2855d737b70c0df6d
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 23 11:34:03 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 23 11:34:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ffe133

net-firewall/ipset: keyword 7.11-r1 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 net-firewall/ipset/ipset-7.11-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.11-r1.ebuild 
b/net-firewall/ipset/ipset-7.11-r1.ebuild
index c7dfc5a9b0c..cbee799db56 100644
--- a/net-firewall/ipset/ipset-7.11-r1.ebuild
+++ b/net-firewall/ipset/ipset-7.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: a12c0fee4a9a9a0bee0c5b9549a886cede1b2787
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 14 03:00:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 14 03:48:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a12c0fee

net-firewall/ipset: add net-libs/libmnl:= subslot dependency

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/{ipset-7.11.ebuild => ipset-7.11-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.11.ebuild 
b/net-firewall/ipset/ipset-7.11-r1.ebuild
similarity index 99%
rename from net-firewall/ipset/ipset-7.11.ebuild
rename to net-firewall/ipset/ipset-7.11-r1.ebuild
index ef2705b37cb..c7dfc5a9b0c 100644
--- a/net-firewall/ipset/ipset-7.11.ebuild
+++ b/net-firewall/ipset/ipset-7.11-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
 BDEPEND="virtual/pkgconfig"
 
 RDEPEND=">=net-firewall/iptables-1.4.7
-   net-libs/libmnl"
+   net-libs/libmnl:="
 DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog INSTALL README UPGRADE )

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[David Seifert]

commit: c8b7f0b985e21ba917ad597b8aa8ccb7c24aa534
Author: David Seifert  gentoo  org>
AuthorDate: Sun May  9 09:33:18 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun May  9 09:33:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b7f0b9

net-firewall/ipset: Remove old 7.10

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 net-firewall/ipset/Manifest  |   1 -
 net-firewall/ipset/ipset-7.10.ebuild | 114 ---
 2 files changed, 115 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index ffb7fa2a914..0ce4248892d 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,2 +1 @@
-DIST ipset-7.10.tar.bz2 679910 BLAKE2B 
acef5370116939aedf499768265eaded9efe7673895c7db30b90ec0173a55f4880d9f40662cb9a8f5a4f3cbb39f890c5ee5459fd6c0a3e60a92afa3395aa8522
 SHA512 
7f45c46f8c158600b1e64354500f31e7fb3c8ee844d55eab9f7eec298eecc27c9cb89e24a8ec6c180665dd0cc29776a9e42ada796b3e87d034cc39cdd4665807
 DIST ipset-7.11.tar.bz2 674100 BLAKE2B 
97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd
 SHA512 
20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922

diff --git a/net-firewall/ipset/ipset-7.10.ebuild 
b/net-firewall/ipset/ipset-7.10.ebuild
deleted file mode 100644
index ef2705b37cb..000
--- a/net-firewall/ipset/ipset-7.10.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-MODULES_OPTIONAL_USE=modules
-inherit autotools linux-info linux-mod systemd
-
-DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="https://ipset.netfilter.org/;
-SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-   net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
-
-# configurable from outside, e.g. /etc/portage/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/)"
-MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
-for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
-   MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
-done
-
-pkg_setup() {
-   get_version
-   CONFIG_CHECK="NETFILTER"
-   ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
-   CONFIG_CHECK+=" NETFILTER_NETLINK"
-   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."
-   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
-
-   build_modules=0
-   if use modules; then
-   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//... ."
-   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() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_with modules kmod) \
-   --disable-static \
-   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: bddd409ff4d1809e48f7fa83f1e86a7ceb49f380
Author: Sam James  gentoo  org>
AuthorDate: Sun May  9 07:46:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  9 07:46:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bddd409f

net-firewall/ipset: Stabilize 7.11 amd64, #788934

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.11.ebuild 
b/net-firewall/ipset/ipset-7.11.ebuild
index 34abab5cafd..a7b7b635b4c 100644
--- a/net-firewall/ipset/ipset-7.11.ebuild
+++ b/net-firewall/ipset/ipset-7.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 6de33ed4be034ccde47d4ee26235f51aaa0cc359
Author: Sam James  gentoo  org>
AuthorDate: Sun May  9 07:46:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  9 07:46:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de33ed4

net-firewall/ipset: Stabilize 7.11 x86, #788934

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.11.ebuild 
b/net-firewall/ipset/ipset-7.11.ebuild
index a7b7b635b4c..ef2705b37cb 100644
--- a/net-firewall/ipset/ipset-7.11.ebuild
+++ b/net-firewall/ipset/ipset-7.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: a016e4c6429c6718683ec97762b256b316d4f00e
Author: Sam James  gentoo  org>
AuthorDate: Sun May  9 06:01:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  9 06:01:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a016e4c6

net-firewall/ipset: Stabilize 7.11 ppc, #788934

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.11.ebuild 
b/net-firewall/ipset/ipset-7.11.ebuild
index fd3fbe90750..34abab5cafd 100644
--- a/net-firewall/ipset/ipset-7.11.ebuild
+++ b/net-firewall/ipset/ipset-7.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc ~ppc64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 0ee2ae8e441f6fc854204ad83a0322cb61731158
Author: Sam James  gentoo  org>
AuthorDate: Sun May  9 01:28:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  9 01:28:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee2ae8e

net-firewall/ipset: Stabilize 7.11 arm64, #788934

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.11.ebuild 
b/net-firewall/ipset/ipset-7.11.ebuild
index e5cf531894f..fd3fbe90750 100644
--- a/net-firewall/ipset/ipset-7.11.ebuild
+++ b/net-firewall/ipset/ipset-7.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: b4cb8eb415091b66f6cb169bea568d0857c0a68a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Mar 28 00:43:35 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Mar 28 00:43:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4cb8eb4

net-firewall/ipset: drop old

Closes: https://bugs.gentoo.org/771798
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/Manifest |  1 -
 net-firewall/ipset/ipset-6.38-r1.ebuild | 99 -
 2 files changed, 100 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 90f8c3c20c4..ffb7fa2a914 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,3 +1,2 @@
-DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f
 SHA512 
ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
 DIST ipset-7.10.tar.bz2 679910 BLAKE2B 
acef5370116939aedf499768265eaded9efe7673895c7db30b90ec0173a55f4880d9f40662cb9a8f5a4f3cbb39f890c5ee5459fd6c0a3e60a92afa3395aa8522
 SHA512 
7f45c46f8c158600b1e64354500f31e7fb3c8ee844d55eab9f7eec298eecc27c9cb89e24a8ec6c180665dd0cc29776a9e42ada796b3e87d034cc39cdd4665807
 DIST ipset-7.11.tar.bz2 674100 BLAKE2B 
97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd
 SHA512 
20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922

diff --git a/net-firewall/ipset/ipset-6.38-r1.ebuild 
b/net-firewall/ipset/ipset-6.38-r1.ebuild
deleted file mode 100644
index e91b237f8fc..000
--- a/net-firewall/ipset/ipset-6.38-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MODULES_OPTIONAL_USE=modules
-inherit linux-info linux-mod ltprune
-
-DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="https://ipset.netfilter.org/;
-SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 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/portage/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
-
-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."
-   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
-
-   build_modules=0
-   if use modules; then
-   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//... ."
-   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_configure() {
-   econf \
-   $(use_with modules kmod) \
-   --disable-static \
-   --with-maxsets=${IP_NF_SET_MAX} \
-

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 1abe6875a0e4323478885fdf8624698f3c693339
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 25 01:35:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 25 01:35:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1abe6875

net-firewall/ipset: Stabilize 7.10 arm64, #771798

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.10.ebuild 
b/net-firewall/ipset/ipset-7.10.ebuild
index 79d4df73d31..ef2705b37cb 100644
--- a/net-firewall/ipset/ipset-7.10.ebuild
+++ b/net-firewall/ipset/ipset-7.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: efd352325eb5932b8052ab1d67edc95da68b256b
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 21 04:45:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 21 04:45:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd35232

net-firewall/ipset: Stabilize 7.10 ppc, #771798

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.10.ebuild 
b/net-firewall/ipset/ipset-7.10.ebuild
index 050c6abfd5d..79d4df73d31 100644
--- a/net-firewall/ipset/ipset-7.10.ebuild
+++ b/net-firewall/ipset/ipset-7.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 44bf1960c0e675a4c6df601c6826dd5bfaab436e
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 21 04:05:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 21 04:05:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44bf1960

net-firewall/ipset: Stabilize 7.10 x86, #771798

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.10.ebuild 
b/net-firewall/ipset/ipset-7.10.ebuild
index 0f79457e112..050c6abfd5d 100644
--- a/net-firewall/ipset/ipset-7.10.ebuild
+++ b/net-firewall/ipset/ipset-7.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 7db28b722f816ca60f37dca6b409d973b97f583f
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 21 04:03:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 21 04:03:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7db28b72

net-firewall/ipset: Stabilize 7.10 amd64, #771798

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-7.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.10.ebuild 
b/net-firewall/ipset/ipset-7.10.ebuild
index e5cf531894f..0f79457e112 100644
--- a/net-firewall/ipset/ipset-7.10.ebuild
+++ b/net-firewall/ipset/ipset-7.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: 87420408e35761a780fb7aea403ff90aa9913b16
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 21 01:19:01 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 21 02:17:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87420408

net-firewall/ipset: x86 stable

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/ipset-6.38-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ipset/ipset-6.38-r1.ebuild 
b/net-firewall/ipset/ipset-6.38-r1.ebuild
index 0dad3b3aca2..884745128ee 100644
--- a/net-firewall/ipset/ipset-6.38-r1.ebuild
+++ b/net-firewall/ipset/ipset-6.38-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc x86"
 
 RDEPEND=">=net-firewall/iptables-1.4.7
net-libs/libmnl"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: 8587d9a7f2fba0e2d32079c40d88aea25382975a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 21 01:21:06 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 21 02:17:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8587d9a7

net-firewall/ipset: use HTTPS for HOMEPAGE/SRC_URI

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/Manifest | 1 -
 net-firewall/ipset/ipset-6.38-r1.ebuild | 4 ++--
 net-firewall/ipset/ipset-7.10.ebuild| 6 +++---
 net-firewall/ipset/ipset-7.11.ebuild| 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 7e5b87ee985..90f8c3c20c4 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,4 +1,3 @@
 DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f
 SHA512 
ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
 DIST ipset-7.10.tar.bz2 679910 BLAKE2B 
acef5370116939aedf499768265eaded9efe7673895c7db30b90ec0173a55f4880d9f40662cb9a8f5a4f3cbb39f890c5ee5459fd6c0a3e60a92afa3395aa8522
 SHA512 
7f45c46f8c158600b1e64354500f31e7fb3c8ee844d55eab9f7eec298eecc27c9cb89e24a8ec6c180665dd0cc29776a9e42ada796b3e87d034cc39cdd4665807
 DIST ipset-7.11.tar.bz2 674100 BLAKE2B 
97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd
 SHA512 
20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922
-DIST ipset-7.9.tar.bz2 679273 BLAKE2B 
0e6d216be5c1f51598f74cce8b1166168644152924354d777fc4a0b5433d68d5e04925bf2c88d4a6abf86d7f707795c3f828bf7d00e6a034326c4c3131768f0a
 SHA512 
53d52aa9c0aba728fd620a7b9e232e5366fa45322d3d23150192b53e311877c61175577b6a0fbde95eaa1fb12deca3251a682fd74c3443558e34a1fe2247309e

diff --git a/net-firewall/ipset/ipset-6.38-r1.ebuild 
b/net-firewall/ipset/ipset-6.38-r1.ebuild
index 884745128ee..e91b237f8fc 100644
--- a/net-firewall/ipset/ipset-6.38-r1.ebuild
+++ b/net-firewall/ipset/ipset-6.38-r1.ebuild
@@ -6,8 +6,8 @@ MODULES_OPTIONAL_USE=modules
 inherit linux-info linux-mod ltprune
 
 DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="http://ipset.netfilter.org/;
-SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
+HOMEPAGE="https://ipset.netfilter.org/;
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/net-firewall/ipset/ipset-7.10.ebuild 
b/net-firewall/ipset/ipset-7.10.ebuild
index 3cdf4582eb7..fc8f87ec260 100644
--- a/net-firewall/ipset/ipset-7.10.ebuild
+++ b/net-firewall/ipset/ipset-7.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -6,8 +6,8 @@ MODULES_OPTIONAL_USE=modules
 inherit autotools linux-info linux-mod systemd
 
 DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="http://ipset.netfilter.org/;
-SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
+HOMEPAGE="https://ipset.netfilter.org/;
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/net-firewall/ipset/ipset-7.11.ebuild 
b/net-firewall/ipset/ipset-7.11.ebuild
index 848815858e7..fc8f87ec260 100644
--- a/net-firewall/ipset/ipset-7.11.ebuild
+++ b/net-firewall/ipset/ipset-7.11.ebuild
@@ -6,8 +6,8 @@ MODULES_OPTIONAL_USE=modules
 inherit autotools linux-info linux-mod systemd
 
 DESCRIPTION="IPset tool for iptables, successor to ippool"
-HOMEPAGE="http://ipset.netfilter.org/;
-SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
+HOMEPAGE="https://ipset.netfilter.org/;
+SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: dcffbb2a7a4b90edcddd3dc175f028b04363bc23
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 21 01:16:53 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 21 02:17:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcffbb2a

net-firewall/ipset: bump to v7.11

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/Manifest  |   1 +
 net-firewall/ipset/ipset-7.11.ebuild | 112 +++
 2 files changed, 113 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 02452f26952..2f898917981 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,6 +1,7 @@
 DIST ipset-6.29.tar.bz2 542735 BLAKE2B 
2229eb802597b38287f49cc2936a8be1afde2f638bd7212f86a52bc07d4121b7ff6b334ced2e1354bfdb652bcac81957b5204ac545a081dddfce07958c858fe4
 SHA512 
ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
 DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f
 SHA512 
ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
 DIST ipset-7.10.tar.bz2 679910 BLAKE2B 
acef5370116939aedf499768265eaded9efe7673895c7db30b90ec0173a55f4880d9f40662cb9a8f5a4f3cbb39f890c5ee5459fd6c0a3e60a92afa3395aa8522
 SHA512 
7f45c46f8c158600b1e64354500f31e7fb3c8ee844d55eab9f7eec298eecc27c9cb89e24a8ec6c180665dd0cc29776a9e42ada796b3e87d034cc39cdd4665807
+DIST ipset-7.11.tar.bz2 674100 BLAKE2B 
97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd
 SHA512 
20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922
 DIST ipset-7.5.tar.bz2 675179 BLAKE2B 
04d207c4eaed66bf295ebd31a66d4423e68ed7918ef4e7d0b08e7e178216a016e6d454ed4c0f915d36d6266a74ea08c33db69481bf288c6fe7a1cd00c3ed68e5
 SHA512 
97e2a42bb33dfd2d9c5d258595e4be670d961ce3f5fa537ffb32b748168324f4e572047f026096c142e3a1f5a88caa26da455cbc067121dc9140f79321f272aa
 DIST ipset-7.6.tar.bz2 676777 BLAKE2B 
98b4a0094e4e44dfc8702ad4e61ce3c62de74964afc16ae91d107599fab7f978071693b6e6f57969c35a3dd381fac5b58610fd74a107eebd8af1f8644d819061
 SHA512 
c4d9c65895335dec8f855fca6c940d2ee19e7b8d2292325778a1608e795e2e35caa787cbcdeb8e2877f3695c641ac348b23ac43f73bdc1a8242e8d04f4944084
 DIST ipset-7.7.tar.bz2 678424 BLAKE2B 
330eb82ee3cff8a2b09704e6f90a4a1376f6154753a8e386f52ee934b7e1b402d8b9293962563d50501f31540d651374d7899961739bef50ee2f3096fd1b0bfd
 SHA512 
1c8f969eb402ae56eb4c747d89eb5dcbf068004c3c0ae171eb4eddd948f7d8dd14d6e3dc8b713d2909f220359e6760fce3848a4e12f59a575b747f6c38ad80db

diff --git a/net-firewall/ipset/ipset-7.11.ebuild 
b/net-firewall/ipset/ipset-7.11.ebuild
new file mode 100644
index 000..848815858e7
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.11.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+   net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# configurable from outside, e.g. /etc/portage/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/)"
+MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
+for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
+   MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+
+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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   if linux_config_src_exists && linux_chkconfig_builtin "MODULES" 
; then
+

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: 5637c97cb04f91a7c33a50022bba6ac1669161c8
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 21 01:19:33 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 21 02:17:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5637c97c

net-firewall/ipset: drop old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/Manifest |   4 --
 net-firewall/ipset/ipset-6.29-r1.ebuild |  98 
 net-firewall/ipset/ipset-7.5-r1.ebuild  | 111 ---
 net-firewall/ipset/ipset-7.6-r1.ebuild  | 111 ---
 net-firewall/ipset/ipset-7.7.ebuild | 111 ---
 net-firewall/ipset/ipset-7.9.ebuild | 112 
 6 files changed, 547 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 2f898917981..7e5b87ee985 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,8 +1,4 @@
-DIST ipset-6.29.tar.bz2 542735 BLAKE2B 
2229eb802597b38287f49cc2936a8be1afde2f638bd7212f86a52bc07d4121b7ff6b334ced2e1354bfdb652bcac81957b5204ac545a081dddfce07958c858fe4
 SHA512 
ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
 DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f
 SHA512 
ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
 DIST ipset-7.10.tar.bz2 679910 BLAKE2B 
acef5370116939aedf499768265eaded9efe7673895c7db30b90ec0173a55f4880d9f40662cb9a8f5a4f3cbb39f890c5ee5459fd6c0a3e60a92afa3395aa8522
 SHA512 
7f45c46f8c158600b1e64354500f31e7fb3c8ee844d55eab9f7eec298eecc27c9cb89e24a8ec6c180665dd0cc29776a9e42ada796b3e87d034cc39cdd4665807
 DIST ipset-7.11.tar.bz2 674100 BLAKE2B 
97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd
 SHA512 
20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922
-DIST ipset-7.5.tar.bz2 675179 BLAKE2B 
04d207c4eaed66bf295ebd31a66d4423e68ed7918ef4e7d0b08e7e178216a016e6d454ed4c0f915d36d6266a74ea08c33db69481bf288c6fe7a1cd00c3ed68e5
 SHA512 
97e2a42bb33dfd2d9c5d258595e4be670d961ce3f5fa537ffb32b748168324f4e572047f026096c142e3a1f5a88caa26da455cbc067121dc9140f79321f272aa
-DIST ipset-7.6.tar.bz2 676777 BLAKE2B 
98b4a0094e4e44dfc8702ad4e61ce3c62de74964afc16ae91d107599fab7f978071693b6e6f57969c35a3dd381fac5b58610fd74a107eebd8af1f8644d819061
 SHA512 
c4d9c65895335dec8f855fca6c940d2ee19e7b8d2292325778a1608e795e2e35caa787cbcdeb8e2877f3695c641ac348b23ac43f73bdc1a8242e8d04f4944084
-DIST ipset-7.7.tar.bz2 678424 BLAKE2B 
330eb82ee3cff8a2b09704e6f90a4a1376f6154753a8e386f52ee934b7e1b402d8b9293962563d50501f31540d651374d7899961739bef50ee2f3096fd1b0bfd
 SHA512 
1c8f969eb402ae56eb4c747d89eb5dcbf068004c3c0ae171eb4eddd948f7d8dd14d6e3dc8b713d2909f220359e6760fce3848a4e12f59a575b747f6c38ad80db
 DIST ipset-7.9.tar.bz2 679273 BLAKE2B 
0e6d216be5c1f51598f74cce8b1166168644152924354d777fc4a0b5433d68d5e04925bf2c88d4a6abf86d7f707795c3f828bf7d00e6a034326c4c3131768f0a
 SHA512 
53d52aa9c0aba728fd620a7b9e232e5366fa45322d3d23150192b53e311877c61175577b6a0fbde95eaa1fb12deca3251a682fd74c3443558e34a1fe2247309e

diff --git a/net-firewall/ipset/ipset-6.29-r1.ebuild 
b/net-firewall/ipset/ipset-6.29-r1.ebuild
deleted file mode 100644
index 4a2d032bb94..000
--- a/net-firewall/ipset/ipset-6.29-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-MODULES_OPTIONAL_USE=modules
-inherit linux-info linux-mod ltprune
-
-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 ~arm64 ~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/portage/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
-
-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 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: 044483145e10ca245b8644d664eeebd95b2ca5d1
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 21 01:34:41 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 21 02:17:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04448314

net-firewall/ipset: check for NETFILTER_NETLINK support in kernel

Closes: https://bugs.gentoo.org/704126
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/ipset-7.10.ebuild | 2 ++
 net-firewall/ipset/ipset-7.11.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-firewall/ipset/ipset-7.10.ebuild 
b/net-firewall/ipset/ipset-7.10.ebuild
index fc8f87ec260..e5cf531894f 100644
--- a/net-firewall/ipset/ipset-7.10.ebuild
+++ b/net-firewall/ipset/ipset-7.10.ebuild
@@ -38,6 +38,8 @@ pkg_setup() {
get_version
CONFIG_CHECK="NETFILTER"
ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+   CONFIG_CHECK+=" NETFILTER_NETLINK"
+   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."

diff --git a/net-firewall/ipset/ipset-7.11.ebuild 
b/net-firewall/ipset/ipset-7.11.ebuild
index fc8f87ec260..e5cf531894f 100644
--- a/net-firewall/ipset/ipset-7.11.ebuild
+++ b/net-firewall/ipset/ipset-7.11.ebuild
@@ -38,6 +38,8 @@ pkg_setup() {
get_version
CONFIG_CHECK="NETFILTER"
ERROR_NETFILTER="ipset requires NETFILTER support in your kernel."
+   CONFIG_CHECK+=" NETFILTER_NETLINK"
+   ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK 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."

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Michał Górny]

commit: 742691723b90bd7ac0d5c14266d74c593f4a4c48
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Dec 26 08:31:51 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Dec 26 08:31:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74269172

net-firewall/ipset: Remove redundant maint 

Signed-off-by: Michał Górny  gentoo.org>

 net-firewall/ipset/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-firewall/ipset/metadata.xml b/net-firewall/ipset/metadata.xml
index 879b385bee9..fc15f61f5e0 100644
--- a/net-firewall/ipset/metadata.xml
+++ b/net-firewall/ipset/metadata.xml
@@ -4,7 +4,6 @@

base-sys...@gentoo.org
Gentoo Base System
-   Please assign bugs to this mail 
alias.


robb...@gentoo.org

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: aa62c4634473661793575ec5b50a79af4fcee889
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec 25 13:10:43 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec 25 13:28:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa62c463

net-firewall/ipset: bump to v7.10

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/Manifest  |   1 +
 net-firewall/ipset/ipset-7.10.ebuild | 112 +++
 2 files changed, 113 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 1ac9213bd43..02452f26952 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,5 +1,6 @@
 DIST ipset-6.29.tar.bz2 542735 BLAKE2B 
2229eb802597b38287f49cc2936a8be1afde2f638bd7212f86a52bc07d4121b7ff6b334ced2e1354bfdb652bcac81957b5204ac545a081dddfce07958c858fe4
 SHA512 
ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
 DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f
 SHA512 
ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
+DIST ipset-7.10.tar.bz2 679910 BLAKE2B 
acef5370116939aedf499768265eaded9efe7673895c7db30b90ec0173a55f4880d9f40662cb9a8f5a4f3cbb39f890c5ee5459fd6c0a3e60a92afa3395aa8522
 SHA512 
7f45c46f8c158600b1e64354500f31e7fb3c8ee844d55eab9f7eec298eecc27c9cb89e24a8ec6c180665dd0cc29776a9e42ada796b3e87d034cc39cdd4665807
 DIST ipset-7.5.tar.bz2 675179 BLAKE2B 
04d207c4eaed66bf295ebd31a66d4423e68ed7918ef4e7d0b08e7e178216a016e6d454ed4c0f915d36d6266a74ea08c33db69481bf288c6fe7a1cd00c3ed68e5
 SHA512 
97e2a42bb33dfd2d9c5d258595e4be670d961ce3f5fa537ffb32b748168324f4e572047f026096c142e3a1f5a88caa26da455cbc067121dc9140f79321f272aa
 DIST ipset-7.6.tar.bz2 676777 BLAKE2B 
98b4a0094e4e44dfc8702ad4e61ce3c62de74964afc16ae91d107599fab7f978071693b6e6f57969c35a3dd381fac5b58610fd74a107eebd8af1f8644d819061
 SHA512 
c4d9c65895335dec8f855fca6c940d2ee19e7b8d2292325778a1608e795e2e35caa787cbcdeb8e2877f3695c641ac348b23ac43f73bdc1a8242e8d04f4944084
 DIST ipset-7.7.tar.bz2 678424 BLAKE2B 
330eb82ee3cff8a2b09704e6f90a4a1376f6154753a8e386f52ee934b7e1b402d8b9293962563d50501f31540d651374d7899961739bef50ee2f3096fd1b0bfd
 SHA512 
1c8f969eb402ae56eb4c747d89eb5dcbf068004c3c0ae171eb4eddd948f7d8dd14d6e3dc8b713d2909f220359e6760fce3848a4e12f59a575b747f6c38ad80db

diff --git a/net-firewall/ipset/ipset-7.10.ebuild 
b/net-firewall/ipset/ipset-7.10.ebuild
new file mode 100644
index 000..3cdf4582eb7
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.10.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+   net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# configurable from outside, e.g. /etc/portage/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/)"
+MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
+for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
+   MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
+done
+
+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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   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 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: 671902081cd0a3582d57b7b3999422ec03aea435
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov 22 01:08:43 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 22 01:08:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67190208

net-firewall/ipset: bump to v7.9

Closes: https://bugs.gentoo.org/754963
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/ipset-7.9.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.9.ebuild 
b/net-firewall/ipset/ipset-7.9.ebuild
index b0de78dae51..3cdf4582eb7 100644
--- a/net-firewall/ipset/ipset-7.9.ebuild
+++ b/net-firewall/ipset/ipset-7.9.ebuild
@@ -29,7 +29,8 @@ 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+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)"
+for i in 
ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set};
 do
MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})"
 done
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: 93310947230b265b694b6f38f9e622a5e68ee16a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov 22 00:34:34 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 22 00:34:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93310947

net-firewall/ipset: bump to v7.9

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/Manifest |   1 +
 net-firewall/ipset/ipset-7.9.ebuild | 111 
 2 files changed, 112 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index c4ce8dc3615..1ac9213bd43 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -3,3 +3,4 @@ DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14
 DIST ipset-7.5.tar.bz2 675179 BLAKE2B 
04d207c4eaed66bf295ebd31a66d4423e68ed7918ef4e7d0b08e7e178216a016e6d454ed4c0f915d36d6266a74ea08c33db69481bf288c6fe7a1cd00c3ed68e5
 SHA512 
97e2a42bb33dfd2d9c5d258595e4be670d961ce3f5fa537ffb32b748168324f4e572047f026096c142e3a1f5a88caa26da455cbc067121dc9140f79321f272aa
 DIST ipset-7.6.tar.bz2 676777 BLAKE2B 
98b4a0094e4e44dfc8702ad4e61ce3c62de74964afc16ae91d107599fab7f978071693b6e6f57969c35a3dd381fac5b58610fd74a107eebd8af1f8644d819061
 SHA512 
c4d9c65895335dec8f855fca6c940d2ee19e7b8d2292325778a1608e795e2e35caa787cbcdeb8e2877f3695c641ac348b23ac43f73bdc1a8242e8d04f4944084
 DIST ipset-7.7.tar.bz2 678424 BLAKE2B 
330eb82ee3cff8a2b09704e6f90a4a1376f6154753a8e386f52ee934b7e1b402d8b9293962563d50501f31540d651374d7899961739bef50ee2f3096fd1b0bfd
 SHA512 
1c8f969eb402ae56eb4c747d89eb5dcbf068004c3c0ae171eb4eddd948f7d8dd14d6e3dc8b713d2909f220359e6760fce3848a4e12f59a575b747f6c38ad80db
+DIST ipset-7.9.tar.bz2 679273 BLAKE2B 
0e6d216be5c1f51598f74cce8b1166168644152924354d777fc4a0b5433d68d5e04925bf2c88d4a6abf86d7f707795c3f828bf7d00e6a034326c4c3131768f0a
 SHA512 
53d52aa9c0aba728fd620a7b9e232e5366fa45322d3d23150192b53e311877c61175577b6a0fbde95eaa1fb12deca3251a682fd74c3443558e34a1fe2247309e

diff --git a/net-firewall/ipset/ipset-7.9.ebuild 
b/net-firewall/ipset/ipset-7.9.ebuild
new file mode 100644
index 000..b0de78dae51
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.9.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+   net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# configurable from outside, e.g. /etc/portage/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
+
+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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   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//... ."
+   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 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: 1f790a4ae398301d562f05bee3597a14982becd3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov  1 23:11:39 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov  1 23:41:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f790a4a

net-firewall/ipset: bump to v7.7

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/Manifest |   1 +
 net-firewall/ipset/ipset-7.7.ebuild | 111 
 2 files changed, 112 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 362b82f0f88..c4ce8dc3615 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -2,3 +2,4 @@ DIST ipset-6.29.tar.bz2 542735 BLAKE2B 
2229eb802597b38287f49cc2936a8be1afde2f638
 DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f
 SHA512 
ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
 DIST ipset-7.5.tar.bz2 675179 BLAKE2B 
04d207c4eaed66bf295ebd31a66d4423e68ed7918ef4e7d0b08e7e178216a016e6d454ed4c0f915d36d6266a74ea08c33db69481bf288c6fe7a1cd00c3ed68e5
 SHA512 
97e2a42bb33dfd2d9c5d258595e4be670d961ce3f5fa537ffb32b748168324f4e572047f026096c142e3a1f5a88caa26da455cbc067121dc9140f79321f272aa
 DIST ipset-7.6.tar.bz2 676777 BLAKE2B 
98b4a0094e4e44dfc8702ad4e61ce3c62de74964afc16ae91d107599fab7f978071693b6e6f57969c35a3dd381fac5b58610fd74a107eebd8af1f8644d819061
 SHA512 
c4d9c65895335dec8f855fca6c940d2ee19e7b8d2292325778a1608e795e2e35caa787cbcdeb8e2877f3695c641ac348b23ac43f73bdc1a8242e8d04f4944084
+DIST ipset-7.7.tar.bz2 678424 BLAKE2B 
330eb82ee3cff8a2b09704e6f90a4a1376f6154753a8e386f52ee934b7e1b402d8b9293962563d50501f31540d651374d7899961739bef50ee2f3096fd1b0bfd
 SHA512 
1c8f969eb402ae56eb4c747d89eb5dcbf068004c3c0ae171eb4eddd948f7d8dd14d6e3dc8b713d2909f220359e6760fce3848a4e12f59a575b747f6c38ad80db

diff --git a/net-firewall/ipset/ipset-7.7.ebuild 
b/net-firewall/ipset/ipset-7.7.ebuild
new file mode 100644
index 000..b0de78dae51
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.7.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+   net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# configurable from outside, e.g. /etc/portage/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
+
+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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   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//... ."
+   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 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sam James]

commit: 296b27f140cfb65c37bf0d3ce13e9c5924b9f9ee
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 20 13:16:46 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 20 13:20:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=296b27f1

net-firewall/ipset: Stabilize 6.38-r1 arm64, #738076

Signed-off-by: Sam James  gentoo.org>

 net-firewall/ipset/ipset-6.38-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-6.38-r1.ebuild 
b/net-firewall/ipset/ipset-6.38-r1.ebuild
index 37f222b9c79..0dad3b3aca2 100644
--- a/net-firewall/ipset/ipset-6.38-r1.ebuild
+++ b/net-firewall/ipset/ipset-6.38-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~x86"
 
 RDEPEND=">=net-firewall/iptables-1.4.7
net-libs/libmnl"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Lars Wendler]

commit: c96d24052a72c5882d138d61e73c834b19068da8
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Feb 26 11:17:25 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Feb 26 11:18:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96d2405

net-firewall/ipset: Bump to version 7.6

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 net-firewall/ipset/Manifest |   1 +
 net-firewall/ipset/ipset-7.6.ebuild | 111 
 2 files changed, 112 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index e49ddff24af..49ac69e4074 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -2,3 +2,4 @@ DIST ipset-6.29.tar.bz2 542735 BLAKE2B 
2229eb802597b38287f49cc2936a8be1afde2f638
 DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f
 SHA512 
ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
 DIST ipset-7.4.tar.bz2 670906 BLAKE2B 
46875264a4939294f2698149c5aa5793b5a3579da679db06041b702d2eb06b6060082e1d35bb98f54ffb25e77343ab39373c87d32de416db119b506083fa7391
 SHA512 
b155ced6be88aabd38c2402604bac37ba898aeae50c2d5a7d888d1b33b536b4551387826a4f76878ebb10e97ffaca08245b5ed8a5e3c431cc224b23cbb86a196
 DIST ipset-7.5.tar.bz2 675179 BLAKE2B 
04d207c4eaed66bf295ebd31a66d4423e68ed7918ef4e7d0b08e7e178216a016e6d454ed4c0f915d36d6266a74ea08c33db69481bf288c6fe7a1cd00c3ed68e5
 SHA512 
97e2a42bb33dfd2d9c5d258595e4be670d961ce3f5fa537ffb32b748168324f4e572047f026096c142e3a1f5a88caa26da455cbc067121dc9140f79321f272aa
+DIST ipset-7.6.tar.bz2 676777 BLAKE2B 
98b4a0094e4e44dfc8702ad4e61ce3c62de74964afc16ae91d107599fab7f978071693b6e6f57969c35a3dd381fac5b58610fd74a107eebd8af1f8644d819061
 SHA512 
c4d9c65895335dec8f855fca6c940d2ee19e7b8d2292325778a1608e795e2e35caa787cbcdeb8e2877f3695c641ac348b23ac43f73bdc1a8242e8d04f4944084

diff --git a/net-firewall/ipset/ipset-7.6.ebuild 
b/net-firewall/ipset/ipset-7.6.ebuild
new file mode 100644
index 000..b0de78dae51
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.6.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+   net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# configurable from outside, e.g. /etc/portage/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
+
+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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   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//... ."
+   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"
+  

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Lars Wendler]

commit: bc9e9e47f1622a6343e6088fb185da64fb6ae572
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Feb 26 11:18:17 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Feb 26 11:18:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc9e9e47

net-firewall/ipset: Removed old

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 net-firewall/ipset/Manifest |   1 -
 net-firewall/ipset/ipset-7.4.ebuild | 111 
 2 files changed, 112 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 49ac69e4074..362b82f0f88 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,5 +1,4 @@
 DIST ipset-6.29.tar.bz2 542735 BLAKE2B 
2229eb802597b38287f49cc2936a8be1afde2f638bd7212f86a52bc07d4121b7ff6b334ced2e1354bfdb652bcac81957b5204ac545a081dddfce07958c858fe4
 SHA512 
ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
 DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f
 SHA512 
ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
-DIST ipset-7.4.tar.bz2 670906 BLAKE2B 
46875264a4939294f2698149c5aa5793b5a3579da679db06041b702d2eb06b6060082e1d35bb98f54ffb25e77343ab39373c87d32de416db119b506083fa7391
 SHA512 
b155ced6be88aabd38c2402604bac37ba898aeae50c2d5a7d888d1b33b536b4551387826a4f76878ebb10e97ffaca08245b5ed8a5e3c431cc224b23cbb86a196
 DIST ipset-7.5.tar.bz2 675179 BLAKE2B 
04d207c4eaed66bf295ebd31a66d4423e68ed7918ef4e7d0b08e7e178216a016e6d454ed4c0f915d36d6266a74ea08c33db69481bf288c6fe7a1cd00c3ed68e5
 SHA512 
97e2a42bb33dfd2d9c5d258595e4be670d961ce3f5fa537ffb32b748168324f4e572047f026096c142e3a1f5a88caa26da455cbc067121dc9140f79321f272aa
 DIST ipset-7.6.tar.bz2 676777 BLAKE2B 
98b4a0094e4e44dfc8702ad4e61ce3c62de74964afc16ae91d107599fab7f978071693b6e6f57969c35a3dd381fac5b58610fd74a107eebd8af1f8644d819061
 SHA512 
c4d9c65895335dec8f855fca6c940d2ee19e7b8d2292325778a1608e795e2e35caa787cbcdeb8e2877f3695c641ac348b23ac43f73bdc1a8242e8d04f4944084

diff --git a/net-firewall/ipset/ipset-7.4.ebuild 
b/net-firewall/ipset/ipset-7.4.ebuild
deleted file mode 100644
index 827969dce4b..000
--- a/net-firewall/ipset/ipset-7.4.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-MODULES_OPTIONAL_USE=modules
-inherit autotools linux-info linux-mod systemd
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND=">=net-firewall/iptables-1.4.7
-   net-libs/libmnl"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog INSTALL README UPGRADE )
-
-PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
-
-# configurable from outside, e.g. /etc/portage/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
-
-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."
-   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
-   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
-
-   build_modules=0
-   if use modules; then
-   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//... ."
-   die "USE=modules and in-kernel ipset support 
detected."
-   else
-   einfo "Modular kernel detected. 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Lars Wendler]

commit: 6de147b5719df001c6e323214a93a30fa54ed952
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 17 16:34:45 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 17 16:59:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de147b5

net-firewall/ipset: Removed old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 net-firewall/ipset/Manifest  |  5 --
 net-firewall/ipset/ipset-6.30.ebuild | 97 ---
 net-firewall/ipset/ipset-6.32.ebuild | 97 ---
 net-firewall/ipset/ipset-6.34.ebuild | 99 
 net-firewall/ipset/ipset-7.0.ebuild  | 99 
 net-firewall/ipset/ipset-7.1.ebuild  | 99 
 6 files changed, 496 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index a20f69d21f9..e49ddff24af 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,9 +1,4 @@
 DIST ipset-6.29.tar.bz2 542735 BLAKE2B 
2229eb802597b38287f49cc2936a8be1afde2f638bd7212f86a52bc07d4121b7ff6b334ced2e1354bfdb652bcac81957b5204ac545a081dddfce07958c858fe4
 SHA512 
ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
-DIST ipset-6.30.tar.bz2 544054 BLAKE2B 
eb9a6368436f0c4a813a6733b2122be975c752aee4d8ac9a2e7a02ebd2da372351c318cf1b0c06c1b389c523cd9572dfe1bff813e23a4e924391f9c7a946b75b
 SHA512 
6299a6905fbbcc2dd7c2f07862af184fd3b63b586f7bf3af2de5a0cc692f4ec6ef57db64c3435c1acedd6c293570602dca8cfedcb197a00ec18517ced92dc903
-DIST ipset-6.32.tar.bz2 544635 BLAKE2B 
684354b0b24b15a657b21d44fa58b2cf7823f78d78ccd2b3f1c2d50b9e1396db6ed1414edb69102e3f82810d844ccd5eb738d1a968921b76b20e5d15c6ae5fb1
 SHA512 
7b0f5e7ef1a777ab70872aa52f658ff9516cb5de4c67c56d7f596eb88db03467d39b10ffc098441b4bfa4bb21a15f3c5f7f7f825300ce8efbacd767369ad43c7
-DIST ipset-6.34.tar.bz2 547940 BLAKE2B 
a42ad1b0af07250ecae645424d6a9564f16a388da452fa22817318947d114ca6e0a7ac175c2d2ec8a8602529bcefd361a206b083c231c33e96a76570b8ae8bcd
 SHA512 
5a8cd743eee5abdbaba452c3b4508e9f0569a5a5ae83c9aeafb3d92c2c17672b489302a4a0953668c8b6d51cf7e510660b03b9dbd4ccb2deddffa41e6e6db33a
 DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f
 SHA512 
ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
-DIST ipset-7.0.tar.bz2 552144 BLAKE2B 
722559409e0a617bc2e47a05023ff225a6c422d2847534ff8511611cf1e02451f0fde293eac3a1a6e49547b3e6d5f82dc130b08b7e42f8f9fad9d5908e3c29f4
 SHA512 
4d63351cd7c98a5662963d3301522c18644e14aeebf93ea15fb5f4e600e7ccc2040a0640fb6d776aa90ef296905d75630ec5f06e46f8521275befecf9705e669
-DIST ipset-7.1.tar.bz2 669520 BLAKE2B 
0737c4cd780f072dd6fcf67c58ebc8d5afefb33081240c25a972708185771cfad9f746b8ed5135b1e7fca4ce510ed707a7cfd641afc864210184a9998360e699
 SHA512 
eae9bd83f6675754af8ca443a82e0a1c9d47f60f6bf2a7a405a695223cc17063d5d4eb79428fe21a1f0a867109dfaf8ad8071b45e92191ec108b2cd2382fa854
 DIST ipset-7.4.tar.bz2 670906 BLAKE2B 
46875264a4939294f2698149c5aa5793b5a3579da679db06041b702d2eb06b6060082e1d35bb98f54ffb25e77343ab39373c87d32de416db119b506083fa7391
 SHA512 
b155ced6be88aabd38c2402604bac37ba898aeae50c2d5a7d888d1b33b536b4551387826a4f76878ebb10e97ffaca08245b5ed8a5e3c431cc224b23cbb86a196
 DIST ipset-7.5.tar.bz2 675179 BLAKE2B 
04d207c4eaed66bf295ebd31a66d4423e68ed7918ef4e7d0b08e7e178216a016e6d454ed4c0f915d36d6266a74ea08c33db69481bf288c6fe7a1cd00c3ed68e5
 SHA512 
97e2a42bb33dfd2d9c5d258595e4be670d961ce3f5fa537ffb32b748168324f4e572047f026096c142e3a1f5a88caa26da455cbc067121dc9140f79321f272aa

diff --git a/net-firewall/ipset/ipset-6.30.ebuild 
b/net-firewall/ipset/ipset-6.30.ebuild
deleted file mode 100644
index 292b40eb05d..000
--- a/net-firewall/ipset/ipset-6.30.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MODULES_OPTIONAL_USE=modules
-inherit 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 ~arm64 ~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/portage/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 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Lars Wendler]

commit: 5993402fc7e55a6602b8976bbc4bf354f884264f
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 17 16:31:28 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 17 16:59:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5993402f

net-firewall/ipset: Bump to version 7.5

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 net-firewall/ipset/Manifest |   1 +
 net-firewall/ipset/ipset-7.5.ebuild | 111 
 2 files changed, 112 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 55fce9cf618..a20f69d21f9 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -6,3 +6,4 @@ DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14
 DIST ipset-7.0.tar.bz2 552144 BLAKE2B 
722559409e0a617bc2e47a05023ff225a6c422d2847534ff8511611cf1e02451f0fde293eac3a1a6e49547b3e6d5f82dc130b08b7e42f8f9fad9d5908e3c29f4
 SHA512 
4d63351cd7c98a5662963d3301522c18644e14aeebf93ea15fb5f4e600e7ccc2040a0640fb6d776aa90ef296905d75630ec5f06e46f8521275befecf9705e669
 DIST ipset-7.1.tar.bz2 669520 BLAKE2B 
0737c4cd780f072dd6fcf67c58ebc8d5afefb33081240c25a972708185771cfad9f746b8ed5135b1e7fca4ce510ed707a7cfd641afc864210184a9998360e699
 SHA512 
eae9bd83f6675754af8ca443a82e0a1c9d47f60f6bf2a7a405a695223cc17063d5d4eb79428fe21a1f0a867109dfaf8ad8071b45e92191ec108b2cd2382fa854
 DIST ipset-7.4.tar.bz2 670906 BLAKE2B 
46875264a4939294f2698149c5aa5793b5a3579da679db06041b702d2eb06b6060082e1d35bb98f54ffb25e77343ab39373c87d32de416db119b506083fa7391
 SHA512 
b155ced6be88aabd38c2402604bac37ba898aeae50c2d5a7d888d1b33b536b4551387826a4f76878ebb10e97ffaca08245b5ed8a5e3c431cc224b23cbb86a196
+DIST ipset-7.5.tar.bz2 675179 BLAKE2B 
04d207c4eaed66bf295ebd31a66d4423e68ed7918ef4e7d0b08e7e178216a016e6d454ed4c0f915d36d6266a74ea08c33db69481bf288c6fe7a1cd00c3ed68e5
 SHA512 
97e2a42bb33dfd2d9c5d258595e4be670d961ce3f5fa537ffb32b748168324f4e572047f026096c142e3a1f5a88caa26da455cbc067121dc9140f79321f272aa

diff --git a/net-firewall/ipset/ipset-7.5.ebuild 
b/net-firewall/ipset/ipset-7.5.ebuild
new file mode 100644
index 000..b0de78dae51
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.5.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+   net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# configurable from outside, e.g. /etc/portage/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
+
+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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   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//... ."
+   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"
+   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Georgy Yakovlev]

commit: 7c5ae72542771b1ee3bd8b0106b9225bbfdec59b
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Dec 28 21:07:54 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Dec 28 21:32:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5ae725

net-firewall/ipset: keyword 7.4 on ~ppc64

Bug: https://bugs.gentoo.org/679888
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev  gentoo.org>

 net-firewall/ipset/ipset-7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-7.4.ebuild 
b/net-firewall/ipset/ipset-7.4.ebuild
index dbc327ccc29..827969dce4b 100644
--- a/net-firewall/ipset/ipset-7.4.ebuild
+++ b/net-firewall/ipset/ipset-7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: 891e107eb75fd8a9a86893120ff9b592116a58f2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Nov 27 22:25:44 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Nov 27 22:27:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=891e107e

net-firewall/ipset: Add base-system as maintainer

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/metadata.xml | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/net-firewall/ipset/metadata.xml b/net-firewall/ipset/metadata.xml
index 79d462e8557..879b385bee9 100644
--- a/net-firewall/ipset/metadata.xml
+++ b/net-firewall/ipset/metadata.xml
@@ -1,7 +1,13 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-  robb...@gentoo.org
-
+   
+   base-sys...@gentoo.org
+   Gentoo Base System
+   Please assign bugs to this mail 
alias.
+   
+   
+   robb...@gentoo.org
+   Robin H. Johnson
+   
 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/, net-firewall/ipset/

[Thomas Deutschmann]

commit: f7e482662bc47f098378f99aca0a04fdac6f9c5e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Nov 27 21:51:38 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Nov 27 21:52:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e48266

net-firewall/ipset: bump to v7.4

- Add systemd unit

Closes: https://bugs.gentoo.org/680438
Closes: https://bugs.gentoo.org/558038
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-firewall/ipset/Manifest|   1 +
 .../ipset/files/ipset-7.4-fix-pkgconfig-dir.patch  |  11 ++
 net-firewall/ipset/files/ipset.systemd |  15 +++
 net-firewall/ipset/ipset-7.4.ebuild| 111 +
 4 files changed, 138 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 80346c6ee35..55fce9cf618 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -5,3 +5,4 @@ DIST ipset-6.34.tar.bz2 547940 BLAKE2B 
a42ad1b0af07250ecae645424d6a9564f16a388da
 DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f
 SHA512 
ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
 DIST ipset-7.0.tar.bz2 552144 BLAKE2B 
722559409e0a617bc2e47a05023ff225a6c422d2847534ff8511611cf1e02451f0fde293eac3a1a6e49547b3e6d5f82dc130b08b7e42f8f9fad9d5908e3c29f4
 SHA512 
4d63351cd7c98a5662963d3301522c18644e14aeebf93ea15fb5f4e600e7ccc2040a0640fb6d776aa90ef296905d75630ec5f06e46f8521275befecf9705e669
 DIST ipset-7.1.tar.bz2 669520 BLAKE2B 
0737c4cd780f072dd6fcf67c58ebc8d5afefb33081240c25a972708185771cfad9f746b8ed5135b1e7fca4ce510ed707a7cfd641afc864210184a9998360e699
 SHA512 
eae9bd83f6675754af8ca443a82e0a1c9d47f60f6bf2a7a405a695223cc17063d5d4eb79428fe21a1f0a867109dfaf8ad8071b45e92191ec108b2cd2382fa854
+DIST ipset-7.4.tar.bz2 670906 BLAKE2B 
46875264a4939294f2698149c5aa5793b5a3579da679db06041b702d2eb06b6060082e1d35bb98f54ffb25e77343ab39373c87d32de416db119b506083fa7391
 SHA512 
b155ced6be88aabd38c2402604bac37ba898aeae50c2d5a7d888d1b33b536b4551387826a4f76878ebb10e97ffaca08245b5ed8a5e3c431cc224b23cbb86a196

diff --git a/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch 
b/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch
new file mode 100644
index 000..b10ddbd4fae
--- /dev/null
+++ b/net-firewall/ipset/files/ipset-7.4-fix-pkgconfig-dir.patch
@@ -0,0 +1,11 @@
+--- a/lib/Makefile.am
 b/lib/Makefile.am
+@@ -46,7 +46,7 @@ EXTRA_libipset_la_SOURCES = \
+ 
+ EXTRA_DIST = $(IPSET_SETTYPE_LIST) libipset.map
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/$(libdir)/pkgconfig
+ pkgconfig_DATA = libipset.pc
+ 
+ dist_man_MANS = libipset.3

diff --git a/net-firewall/ipset/files/ipset.systemd 
b/net-firewall/ipset/files/ipset.systemd
new file mode 100644
index 000..f7a5eb510a0
--- /dev/null
+++ b/net-firewall/ipset/files/ipset.systemd
@@ -0,0 +1,15 @@
+[Unit]
+Description=ipset service
+Before=network-pre.target iptables.service ip6tables.service firewalld.service
+Wants=network-pre.target
+ConditionFileNotEmpty=/var/lib/ipset/rules-save
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore
+ExecReload=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore
+ExecStop=/usr/sbin/ipset -file /var/lib/ipset/rules-save save
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipset/ipset-7.4.ebuild 
b/net-firewall/ipset/ipset-7.4.ebuild
new file mode 100644
index 000..dbc327ccc29
--- /dev/null
+++ b/net-firewall/ipset/ipset-7.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MODULES_OPTIONAL_USE=modules
+inherit autotools linux-info linux-mod systemd
+
+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 ~arm ~arm64 ~ppc ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND=">=net-firewall/iptables-1.4.7
+   net-libs/libmnl"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog INSTALL README UPGRADE )
+
+PATCHES=( "${FILESDIR}"/${PN}-7.4-fix-pkgconfig-dir.patch )
+
+# configurable from outside, e.g. /etc/portage/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
+
+pkg_setup() {
+   get_version
+   

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Agostino Sarubbo]

commit: 8d51203850437a1043b5033faf0fc8f07152f07a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun  4 20:53:19 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun  4 20:53:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d512038

net-firewall/ipset: amd64 stable wrt bug #663616

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-firewall/ipset/ipset-6.38.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-6.38.ebuild 
b/net-firewall/ipset/ipset-6.38.ebuild
index a2ebc6e6e4f..687c9290f43 100644
--- a/net-firewall/ipset/ipset-6.38.ebuild
+++ b/net-firewall/ipset/ipset-6.38.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~x86"
 
 RDEPEND=">=net-firewall/iptables-1.4.7
net-libs/libmnl"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Sergei Trofimovich]

commit: 6cbeb37866bd25898a8f481b2516831f81188d0c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu May 30 20:27:30 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu May 30 20:27:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cbeb378

net-firewall/ipset: stable 6.38 for ppc, bug #663616

Package-Manager: Portage-2.3.67, Repoman-2.3.13
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-firewall/ipset/ipset-6.38.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-6.38.ebuild 
b/net-firewall/ipset/ipset-6.38.ebuild
index b6bd9375ea6..a2ebc6e6e4f 100644
--- a/net-firewall/ipset/ipset-6.38.ebuild
+++ b/net-firewall/ipset/ipset-6.38.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~x86"
 
 RDEPEND=">=net-firewall/iptables-1.4.7
net-libs/libmnl"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Robin H. Johnson]

commit: 48da1a6befa7654c4bd96a63e879160d714b16ca
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat May 25 23:24:01 2019 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat May 25 23:24:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48da1a6b

net-firewall/ipset: version bumps

Includes intermediate versions for ease of testing over the major
upgrade.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Robin H. Johnson  gentoo.org>

 net-firewall/ipset/Manifest  |  3 ++
 net-firewall/ipset/ipset-6.38.ebuild | 99 
 net-firewall/ipset/ipset-7.0.ebuild  | 99 
 net-firewall/ipset/ipset-7.1.ebuild  | 99 
 4 files changed, 300 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index f909863eb09..80346c6ee35 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -2,3 +2,6 @@ DIST ipset-6.29.tar.bz2 542735 BLAKE2B 
2229eb802597b38287f49cc2936a8be1afde2f638
 DIST ipset-6.30.tar.bz2 544054 BLAKE2B 
eb9a6368436f0c4a813a6733b2122be975c752aee4d8ac9a2e7a02ebd2da372351c318cf1b0c06c1b389c523cd9572dfe1bff813e23a4e924391f9c7a946b75b
 SHA512 
6299a6905fbbcc2dd7c2f07862af184fd3b63b586f7bf3af2de5a0cc692f4ec6ef57db64c3435c1acedd6c293570602dca8cfedcb197a00ec18517ced92dc903
 DIST ipset-6.32.tar.bz2 544635 BLAKE2B 
684354b0b24b15a657b21d44fa58b2cf7823f78d78ccd2b3f1c2d50b9e1396db6ed1414edb69102e3f82810d844ccd5eb738d1a968921b76b20e5d15c6ae5fb1
 SHA512 
7b0f5e7ef1a777ab70872aa52f658ff9516cb5de4c67c56d7f596eb88db03467d39b10ffc098441b4bfa4bb21a15f3c5f7f7f825300ce8efbacd767369ad43c7
 DIST ipset-6.34.tar.bz2 547940 BLAKE2B 
a42ad1b0af07250ecae645424d6a9564f16a388da452fa22817318947d114ca6e0a7ac175c2d2ec8a8602529bcefd361a206b083c231c33e96a76570b8ae8bcd
 SHA512 
5a8cd743eee5abdbaba452c3b4508e9f0569a5a5ae83c9aeafb3d92c2c17672b489302a4a0953668c8b6d51cf7e510660b03b9dbd4ccb2deddffa41e6e6db33a
+DIST ipset-6.38.tar.bz2 545568 BLAKE2B 
14e526ba40f4912cd78d81831d072f9c9c159ac14169ffea8ce7325ee4839b80e28ef76405535e1b2aeaf2d0b7b3dde0f8a1ec42c7489cbc786282700d9d2b0f
 SHA512 
ba8c45fa6b4df1b4af848d8c0c218fb449a50c79c48b1d1550dd3a188f82d320956bc483874730f917249d8650e50c3eedff66c24a68a136246fdbf6e1127d60
+DIST ipset-7.0.tar.bz2 552144 BLAKE2B 
722559409e0a617bc2e47a05023ff225a6c422d2847534ff8511611cf1e02451f0fde293eac3a1a6e49547b3e6d5f82dc130b08b7e42f8f9fad9d5908e3c29f4
 SHA512 
4d63351cd7c98a5662963d3301522c18644e14aeebf93ea15fb5f4e600e7ccc2040a0640fb6d776aa90ef296905d75630ec5f06e46f8521275befecf9705e669
+DIST ipset-7.1.tar.bz2 669520 BLAKE2B 
0737c4cd780f072dd6fcf67c58ebc8d5afefb33081240c25a972708185771cfad9f746b8ed5135b1e7fca4ce510ed707a7cfd641afc864210184a9998360e699
 SHA512 
eae9bd83f6675754af8ca443a82e0a1c9d47f60f6bf2a7a405a695223cc17063d5d4eb79428fe21a1f0a867109dfaf8ad8071b45e92191ec108b2cd2382fa854

diff --git a/net-firewall/ipset/ipset-6.38.ebuild 
b/net-firewall/ipset/ipset-6.38.ebuild
new file mode 100644
index 000..b6bd9375ea6
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.38.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MODULES_OPTIONAL_USE=modules
+inherit 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 ~arm ~arm64 ~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/portage/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
+
+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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
+
+   build_modules=0
+   if use modules; then
+   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 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Mikle Kolyada]

commit: 17266a89e46035fd9bb3816fc1ced0e107cccb8d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jul 23 01:19:00 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jul 23 01:19:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17266a89

net-firewall/ipset: add ~arm keyword wrt bug #633692

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-firewall/ipset/ipset-6.34.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-firewall/ipset/ipset-6.34.ebuild 
b/net-firewall/ipset/ipset-6.34.ebuild
index 98a8e3e335b..789330f6423 100644
--- a/net-firewall/ipset/ipset-6.34.ebuild
+++ b/net-firewall/ipset/ipset-6.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 
 RDEPEND=">=net-firewall/iptables-1.4.7
net-libs/libmnl"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/, net-firewall/ipset/

[Robin H. Johnson]

commit: 40960cbcbab5397a82b1c0eb0cb89af0dee10f6e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Nov 30 20:38:05 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Thu Nov 30 20:38:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40960cbc

net-firewall/ipset: cleanup

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-firewall/ipset/Manifest |   8 ---
 net-firewall/ipset/files/ipset.initd-r2 |  59 -
 net-firewall/ipset/files/ipset.initd-r3 |  95 ---
 net-firewall/ipset/ipset-6.15.ebuild| 111 ---
 net-firewall/ipset/ipset-6.16.1.ebuild  | 110 ---
 net-firewall/ipset/ipset-6.16.ebuild| 110 ---
 net-firewall/ipset/ipset-6.17.ebuild| 110 ---
 net-firewall/ipset/ipset-6.19.ebuild| 110 ---
 net-firewall/ipset/ipset-6.20.1.ebuild  | 113 
 net-firewall/ipset/ipset-6.21.1.ebuild  | 113 
 net-firewall/ipset/ipset-6.24.ebuild|  98 ---
 11 files changed, 1037 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 90a13b0ac8c..f909863eb09 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,11 +1,3 @@
-DIST ipset-6.15.tar.bz2 432771 SHA256 
6f60a472bc2ef7b1c864be6472de65365c90e264dfadf28da48c2361393d8fd1 SHA512 
f72329bb8610717ccdddbfaf7b7774e717a34d71fdb7f9c7eac97e3d1b314915500c88137b6e229411df99c86d2228bef447f26c116bc2cf992cfb60ab1422d3
 WHIRLPOOL 
868ee3cd722c2d86c273aca8f3ca7695e8ef5d00d30111ef0f2bf972a119211008d8cadec1760b43b4f0efb24690f20a2cf5f0fdbbb0700cf66e5660d363ab2a
-DIST ipset-6.16.1.tar.bz2 433347 BLAKE2B 
6998df5f7e02906fd7ac5e40091599e8d734c139ce1d68316ef0d97b3715619d2f5fe238f9a83471882d3d48b479ab105eebd7d13f8200be38ca015815eaa5c7
 SHA512 
e54d32932875a9d06acba598280de9e83529f36326cbaaeb05d38b985bc40d276dc46e37eae3d1d4c1afcdd69b3074678512349ebd964b6189ca1c6871efe304
-DIST ipset-6.16.tar.bz2 433118 BLAKE2B 
20d3080b88126d19c930b2351212acc01cb8e295a4746fc86c67b0c0bfa91c248927516a19f5935dc344b1780bc3b191514bea6574b4d78d66381dc7d0c0fd41
 SHA512 
34ef44af76f3609035ae1bdacb7586f2288ee66701ed8a1a5a0632fb23b5f651fe02b070e0f0f1b0ebae6cab02b3f827cc7e67f740cf77f51ba494c25dcc47dd
-DIST ipset-6.17.tar.bz2 448076 BLAKE2B 
b1ff8d51cc4c9fc0c2053f8dea4f00c05f7d9dacb39fc5550e73b01ffe15c8e37507affc790cdffeb3ec26630a00332a529a3a1bb8b9824b3201609027657877
 SHA512 
668f173b7ddd8a18af2730205e2e2c38610aa9fd191af52f91080e903bcd8e1f38e8e3a7fd57077decb00fd0556df89c3315c91eaffaa6977f2caf2a3300b175
-DIST ipset-6.19.tar.bz2 465927 BLAKE2B 
5df57e88384447e272e8d6a8e2b2a81f910efb703a6f54743c7eb1949fbddcd95922b0dc8659be92e890b8269d61f022161a3e87f7f3050d7ffeffdd4163d0bf
 SHA512 
9e9fdccd8ae34ad56c5fc6da03060b39b3acc9a53154acf7e82df3f2c1545b2bdcc7b5b9b4f6ddd6ee3e8582e81b1fa51fae37cb4f46948c053d5153bdca6f39
-DIST ipset-6.20.1.tar.bz2 500898 BLAKE2B 
bde1cbce6d5cd0862bfa33752375643d7d5c47ce5c8e7435768d41be09763690ec18892fc88275e45c46dbe1510b4fcacb9ec7b79255883d549cdb110e941fe0
 SHA512 
3fda3a71c18c8d5f9567038fc72f95abec81b4c789fbca7f7b9c032b15000cfbd2829f11a07f2f9ad2afcff54d6851923caff0917b2ead73756673a6b3667565
-DIST ipset-6.21.1.tar.bz2 510013 BLAKE2B 
38d3f6841f6c3ffc95d786aeee3e97a68bf0828a7f8651ec10afcfcf3cf3b460cd977b0380c35ab7d73813301f7ab93391c64d521dc5f3ab203b5d0300b7
 SHA512 
c2ffb2eafc780e15370fd48841f4323c39e8fef1893216c8bc0b8aa8d143f9daf078c6e261e4558243004fe9612ce1d5ca4cca16f8b3f324f4194700c1b0accb
-DIST ipset-6.24.tar.bz2 518811 BLAKE2B 
19c7ccd8890386dcb342eefc88559edab2f8d0235b8f76c1a916298d32d4b0ac2f4232755cc1c362823a1397dc29054bf0dcf6375804392b541bee2ba6c2b849
 SHA512 
107bf492030dc4e8e4c2a939e46a715f58458126bfb636dae993e5bf31151d33c2a41b89eb5cca85b71d95b3e36debf97cdfc72c568f351091df17159003d6c6
 DIST ipset-6.29.tar.bz2 542735 BLAKE2B 
2229eb802597b38287f49cc2936a8be1afde2f638bd7212f86a52bc07d4121b7ff6b334ced2e1354bfdb652bcac81957b5204ac545a081dddfce07958c858fe4
 SHA512 
ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
 DIST ipset-6.30.tar.bz2 544054 BLAKE2B 
eb9a6368436f0c4a813a6733b2122be975c752aee4d8ac9a2e7a02ebd2da372351c318cf1b0c06c1b389c523cd9572dfe1bff813e23a4e924391f9c7a946b75b
 SHA512 
6299a6905fbbcc2dd7c2f07862af184fd3b63b586f7bf3af2de5a0cc692f4ec6ef57db64c3435c1acedd6c293570602dca8cfedcb197a00ec18517ced92dc903
 DIST ipset-6.32.tar.bz2 544635 BLAKE2B 
684354b0b24b15a657b21d44fa58b2cf7823f78d78ccd2b3f1c2d50b9e1396db6ed1414edb69102e3f82810d844ccd5eb738d1a968921b76b20e5d15c6ae5fb1
 SHA512 
7b0f5e7ef1a777ab70872aa52f658ff9516cb5de4c67c56d7f596eb88db03467d39b10ffc098441b4bfa4bb21a15f3c5f7f7f825300ce8efbacd767369ad43c7

diff --git a/net-firewall/ipset/files/ipset.initd-r2 
b/net-firewall/ipset/files/ipset.initd-r2

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Robin H. Johnson]

commit: 144d1a90b7a24b5a235723697340d94943950e22
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Nov 30 20:25:53 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Thu Nov 30 20:35:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=144d1a90

net-firewall/ipset: bump

Closes: https://bugs.gentoo.org/617482
Closes: https://bugs.gentoo.org/634158
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-firewall/ipset/Manifest  | 21 
 net-firewall/ipset/ipset-6.34.ebuild | 97 
 2 files changed, 108 insertions(+), 10 deletions(-)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index d3ad7912925..90a13b0ac8c 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,11 +1,12 @@
 DIST ipset-6.15.tar.bz2 432771 SHA256 
6f60a472bc2ef7b1c864be6472de65365c90e264dfadf28da48c2361393d8fd1 SHA512 
f72329bb8610717ccdddbfaf7b7774e717a34d71fdb7f9c7eac97e3d1b314915500c88137b6e229411df99c86d2228bef447f26c116bc2cf992cfb60ab1422d3
 WHIRLPOOL 
868ee3cd722c2d86c273aca8f3ca7695e8ef5d00d30111ef0f2bf972a119211008d8cadec1760b43b4f0efb24690f20a2cf5f0fdbbb0700cf66e5660d363ab2a
-DIST ipset-6.16.1.tar.bz2 433347 SHA256 
cb5b02deab8521946fd473b77c40f00452b76fed621f0eee76746c74e89e4c3c SHA512 
e54d32932875a9d06acba598280de9e83529f36326cbaaeb05d38b985bc40d276dc46e37eae3d1d4c1afcdd69b3074678512349ebd964b6189ca1c6871efe304
 WHIRLPOOL 
ff2276446c7dbb4005de236b73bf9879ead8273f3ec014883160b779f6c089eaf7d4c4dce06233ef357f0a8b5376754b158eec29187ae5f5f7bb52bfd2d8ae3c
-DIST ipset-6.16.tar.bz2 433118 SHA256 
bc3ea05cfbacd43aebff6668825453d0a626edd5d3495a8670103ab895fba464 SHA512 
34ef44af76f3609035ae1bdacb7586f2288ee66701ed8a1a5a0632fb23b5f651fe02b070e0f0f1b0ebae6cab02b3f827cc7e67f740cf77f51ba494c25dcc47dd
 WHIRLPOOL 
3b3c2172626530145401bd813c39114f31bf3546ebe0af6e168ed32ade102c158f3bc5f4690ee8bf0540415adc35929da5d8ca8e4e1c2ec83bf631849a24b8a7
-DIST ipset-6.17.tar.bz2 448076 SHA256 
7987bb8de1b0490b32084ab72165ae53038e497a96ab9940920280d8068629b0 SHA512 
668f173b7ddd8a18af2730205e2e2c38610aa9fd191af52f91080e903bcd8e1f38e8e3a7fd57077decb00fd0556df89c3315c91eaffaa6977f2caf2a3300b175
 WHIRLPOOL 
1d08c841d87c7a5ca355857ac823ee696922b867690e9066c631414615c98f3cf3e59c6dd8d9f556170eef90a029260c7d41dc1e3f47811ede2190c5d0298e8b
-DIST ipset-6.19.tar.bz2 465927 SHA256 
058e7950efdf8b9539ab79eb145de7be60d6cb7b92c0c011edda37e70135024c SHA512 
9e9fdccd8ae34ad56c5fc6da03060b39b3acc9a53154acf7e82df3f2c1545b2bdcc7b5b9b4f6ddd6ee3e8582e81b1fa51fae37cb4f46948c053d5153bdca6f39
 WHIRLPOOL 
31472a732781598c8d99ee562766492c225e359b8153ff68a7769d8fa86f41cac9749eda08e4e3922a6ada5a815192109104b42c59ba3079530f6c0b0169613c
-DIST ipset-6.20.1.tar.bz2 500898 SHA256 
356cac020438cd0871acbfc4cb119b8296030f0bb4661ad0d44bbc115ccbce92 SHA512 
3fda3a71c18c8d5f9567038fc72f95abec81b4c789fbca7f7b9c032b15000cfbd2829f11a07f2f9ad2afcff54d6851923caff0917b2ead73756673a6b3667565
 WHIRLPOOL 
f31cd533d286238e63f38aecbf281d428d75e856b393f61db5f6622d0dc0cd0a6de7aa4d3eaa2831e1da7dd0846e95c22f92b3a586cf3918cee074360a4caff3
-DIST ipset-6.21.1.tar.bz2 510013 SHA256 
cf46c9c35a15aa0f2e0fbab0422586757bd82386c8ad3864936e6cffbd74a331 SHA512 
c2ffb2eafc780e15370fd48841f4323c39e8fef1893216c8bc0b8aa8d143f9daf078c6e261e4558243004fe9612ce1d5ca4cca16f8b3f324f4194700c1b0accb
 WHIRLPOOL 
230ebb4756891283980f5b7f67c0c64772b1527b8e8c0b6cdd2714de450b3f6c2a75d961d44563e440edd1399bdee8cce820fe59f46c28355a6f053ad6b1c37b
-DIST ipset-6.24.tar.bz2 518811 SHA256 
3071fc283f00a6472b5b352ef57f9825c9face70dda5b0d8715f8d43d0e995d0 SHA512 
107bf492030dc4e8e4c2a939e46a715f58458126bfb636dae993e5bf31151d33c2a41b89eb5cca85b71d95b3e36debf97cdfc72c568f351091df17159003d6c6
 WHIRLPOOL 
d34e8d5d197be85cf00ea6a5dbfeb7c52b5d42d9e78299620928e69ba1fbbe124cb16b9f5f2e05d1213b2b7a29a2bed2c1edac2f15ee3c83d8dc19eb3afcc112
-DIST ipset-6.29.tar.bz2 542735 SHA256 
6af58b21c8b475b1058e02529ea9f15b4b727dbc13dc9cbddf89941b0103880e SHA512 
ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
 WHIRLPOOL 
8e6642d180b5e682bb121ffc249638da27650f97bc3b1e8aef75996d7c626eb447c9324b9cf68e25773cef73720e6281c7a16bf3ba96433ab77ef6f437be3999
-DIST ipset-6.30.tar.bz2 544054 SHA256 
65bfa43fec3d51a6b4012f3d7e4b93a748df9b71b6cd6c53adbec8083e804a31 SHA512 
6299a6905fbbcc2dd7c2f07862af184fd3b63b586f7bf3af2de5a0cc692f4ec6ef57db64c3435c1acedd6c293570602dca8cfedcb197a00ec18517ced92dc903
 WHIRLPOOL 
d7721b40c5a1556928778fe8adec6c792d0f281737b61680ab414e4aa11691dc2f9c0bf0e56ec8873f4263011e836963d1ab2e273b206b7a0a98adc2ea3d5468
-DIST ipset-6.32.tar.bz2 544635 SHA256 
d9cbb49a4ae9e32d7808a604f1a37f359f9fc9064c210c4c5f35d629d49fb9fe SHA512 
7b0f5e7ef1a777ab70872aa52f658ff9516cb5de4c67c56d7f596eb88db03467d39b10ffc098441b4bfa4bb21a15f3c5f7f7f825300ce8efbacd767369ad43c7
 WHIRLPOOL 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/files/

[Robin H. Johnson]

commit: 3ae1990e869c46b56da84d4202d52dfb3ebd21aa
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Nov 30 20:28:32 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Thu Nov 30 20:35:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ae1990e

net-firewall/ipset: improve init.d save

Closes: https://bugs.gentoo.org/603376
Signed-off-by: Robin H. Johnson  gentoo.org>
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-firewall/ipset/files/ipset.initd-r4 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-firewall/ipset/files/ipset.initd-r4 
b/net-firewall/ipset/files/ipset.initd-r4
index 08edfcbcf85..32ab581d8c8 100644
--- a/net-firewall/ipset/files/ipset.initd-r4
+++ b/net-firewall/ipset/files/ipset.initd-r4
@@ -88,8 +88,7 @@ reload() {
 
 save() {
 ebegin "Saving ipset session"
-touch "${IPSET_SAVE}"
-chmod 0600 "${IPSET_SAVE}"
+checkpath --file --mode 0600 "${IPSET_SAVE}"
 ipset save > "${IPSET_SAVE}"
 eend $?
 }

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Robin H. Johnson]

commit: 07380791d1f4739ba21be6bcc986b575c6fb8b27
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Nov 30 20:33:14 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Thu Nov 30 20:35:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07380791

net-firewall/ipset: block modules & CONFIG_PAX_CONSTIFY_PLUGIN

Closes: https://bugs.gentoo.org/614896
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Signed-off-by: Robin H. Johnson  gentoo.org>

 net-firewall/ipset/ipset-6.34.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-firewall/ipset/ipset-6.34.ebuild 
b/net-firewall/ipset/ipset-6.34.ebuild
index 292b40eb05d..98a8e3e335b 100644
--- a/net-firewall/ipset/ipset-6.34.ebuild
+++ b/net-firewall/ipset/ipset-6.34.ebuild
@@ -36,6 +36,8 @@ pkg_setup() {
# 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."
+   CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN"
+   ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables 
(#614896)"
 
build_modules=0
if use modules; then

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Jeroen Roovers]

commit: c4fb567923c3cb32cb6b946683c337d66fe3a103
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Sep  4 07:12:44 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Sep  4 07:13:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4fb5679

net-firewall/ipset: Version bump.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-firewall/ipset/Manifest  |  1 +
 net-firewall/ipset/ipset-6.32.ebuild | 97 
 2 files changed, 98 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index e25317a70b8..d3ad7912925 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -8,3 +8,4 @@ DIST ipset-6.21.1.tar.bz2 510013 SHA256 
cf46c9c35a15aa0f2e0fbab0422586757bd82386
 DIST ipset-6.24.tar.bz2 518811 SHA256 
3071fc283f00a6472b5b352ef57f9825c9face70dda5b0d8715f8d43d0e995d0 SHA512 
107bf492030dc4e8e4c2a939e46a715f58458126bfb636dae993e5bf31151d33c2a41b89eb5cca85b71d95b3e36debf97cdfc72c568f351091df17159003d6c6
 WHIRLPOOL 
d34e8d5d197be85cf00ea6a5dbfeb7c52b5d42d9e78299620928e69ba1fbbe124cb16b9f5f2e05d1213b2b7a29a2bed2c1edac2f15ee3c83d8dc19eb3afcc112
 DIST ipset-6.29.tar.bz2 542735 SHA256 
6af58b21c8b475b1058e02529ea9f15b4b727dbc13dc9cbddf89941b0103880e SHA512 
ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
 WHIRLPOOL 
8e6642d180b5e682bb121ffc249638da27650f97bc3b1e8aef75996d7c626eb447c9324b9cf68e25773cef73720e6281c7a16bf3ba96433ab77ef6f437be3999
 DIST ipset-6.30.tar.bz2 544054 SHA256 
65bfa43fec3d51a6b4012f3d7e4b93a748df9b71b6cd6c53adbec8083e804a31 SHA512 
6299a6905fbbcc2dd7c2f07862af184fd3b63b586f7bf3af2de5a0cc692f4ec6ef57db64c3435c1acedd6c293570602dca8cfedcb197a00ec18517ced92dc903
 WHIRLPOOL 
d7721b40c5a1556928778fe8adec6c792d0f281737b61680ab414e4aa11691dc2f9c0bf0e56ec8873f4263011e836963d1ab2e273b206b7a0a98adc2ea3d5468
+DIST ipset-6.32.tar.bz2 544635 SHA256 
d9cbb49a4ae9e32d7808a604f1a37f359f9fc9064c210c4c5f35d629d49fb9fe SHA512 
7b0f5e7ef1a777ab70872aa52f658ff9516cb5de4c67c56d7f596eb88db03467d39b10ffc098441b4bfa4bb21a15f3c5f7f7f825300ce8efbacd767369ad43c7
 WHIRLPOOL 
a87a94f617b269cfcdb3dbf1516d1902b027f82fdec8b1e1d7586c83e1582256f61383be70c7bc5c96959bd0677d290db6a114d03dd2b83108f418a7f843dc99

diff --git a/net-firewall/ipset/ipset-6.32.ebuild 
b/net-firewall/ipset/ipset-6.32.ebuild
new file mode 100644
index 000..292b40eb05d
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.32.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MODULES_OPTIONAL_USE=modules
+inherit 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 ~arm64 ~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/portage/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
+
+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
+   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//... ."
+   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 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Robin H. Johnson]

commit: 3cee52e7db95b616340b636b1229b94e6b760b41
Author: Francesco Turco  fastmail  fm>
AuthorDate: Wed Aug 23 20:41:11 2017 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Thu Aug 24 21:54:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cee52e7

net-firewall/ipset: update make.conf path

(cherry picked from commit 77efd2db889ac159646451503db0f50ac5d9d77d)
Closes: https://github.com/gentoo/gentoo/pull/5517
Signed-off-by: Robin H. Johnson  gentoo.org>

 net-firewall/ipset/ipset-6.15.ebuild   | 4 ++--
 net-firewall/ipset/ipset-6.16.1.ebuild | 4 ++--
 net-firewall/ipset/ipset-6.16.ebuild   | 4 ++--
 net-firewall/ipset/ipset-6.17.ebuild   | 4 ++--
 net-firewall/ipset/ipset-6.19.ebuild   | 4 ++--
 net-firewall/ipset/ipset-6.20.1.ebuild | 4 ++--
 net-firewall/ipset/ipset-6.21.1.ebuild | 4 ++--
 net-firewall/ipset/ipset-6.24.ebuild   | 4 ++--
 net-firewall/ipset/ipset-6.29.ebuild   | 4 ++--
 net-firewall/ipset/ipset-6.30.ebuild   | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/net-firewall/ipset/ipset-6.15.ebuild 
b/net-firewall/ipset/ipset-6.15.ebuild
index fc774b25943..fda7f2ff30d 100644
--- a/net-firewall/ipset/ipset-6.15.ebuild
+++ b/net-firewall/ipset/ipset-6.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog INSTALL README UPGRADE )
 
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
 IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
 
 BUILD_TARGETS="modules"

diff --git a/net-firewall/ipset/ipset-6.16.1.ebuild 
b/net-firewall/ipset/ipset-6.16.1.ebuild
index 75525521716..735cbce7981 100644
--- a/net-firewall/ipset/ipset-6.16.1.ebuild
+++ b/net-firewall/ipset/ipset-6.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog INSTALL README UPGRADE )
 
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
 IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
 
 BUILD_TARGETS="modules"

diff --git a/net-firewall/ipset/ipset-6.16.ebuild 
b/net-firewall/ipset/ipset-6.16.ebuild
index 75525521716..735cbce7981 100644
--- a/net-firewall/ipset/ipset-6.16.ebuild
+++ b/net-firewall/ipset/ipset-6.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog INSTALL README UPGRADE )
 
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
 IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
 
 BUILD_TARGETS="modules"

diff --git a/net-firewall/ipset/ipset-6.17.ebuild 
b/net-firewall/ipset/ipset-6.17.ebuild
index ef6cc77f151..e841595369f 100644
--- a/net-firewall/ipset/ipset-6.17.ebuild
+++ b/net-firewall/ipset/ipset-6.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog INSTALL README UPGRADE )
 
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
 IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
 
 BUILD_TARGETS="modules"

diff --git a/net-firewall/ipset/ipset-6.19.ebuild 
b/net-firewall/ipset/ipset-6.19.ebuild
index 75525521716..735cbce7981 100644
--- a/net-firewall/ipset/ipset-6.19.ebuild
+++ b/net-firewall/ipset/ipset-6.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog INSTALL README UPGRADE )
 
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
 IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
 
 BUILD_TARGETS="modules"

diff --git a/net-firewall/ipset/ipset-6.20.1.ebuild 
b/net-firewall/ipset/ipset-6.20.1.ebuild
index 87ee185a7cc..6bd830949e0 100644
--- a/net-firewall/ipset/ipset-6.20.1.ebuild
+++ b/net-firewall/ipset/ipset-6.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog INSTALL README UPGRADE )
 
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
 IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
 
 BUILD_TARGETS="modules"

diff --git 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Thomas Deutschmann]

commit: 2ccaaec44e7327284303cba0b6312a4bb6612536
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Dec 21 11:00:13 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Dec 21 11:23:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ccaaec4

net-firewall/ipset: x86 stable (bug #502870)

Package-Manager: Portage-2.3.2, Repoman-2.3.1

 net-firewall/ipset/ipset-6.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-6.29.ebuild 
b/net-firewall/ipset/ipset-6.29.ebuild
index d48c8f6..8964d18 100644
--- a/net-firewall/ipset/ipset-6.29.ebuild
+++ b/net-firewall/ipset/ipset-6.29.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 
 RDEPEND=">=net-firewall/iptables-1.4.7
net-libs/libmnl"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Aaron Bauman]

commit: 21545f419691bbda2b4cca951feaeb6f8f904f7d
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Dec 19 10:34:17 2016 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Dec 19 10:34:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21545f41

net-firewall/ipset: amd64 stable wrt bug #502870

 net-firewall/ipset/ipset-6.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-6.29.ebuild 
b/net-firewall/ipset/ipset-6.29.ebuild
index 52ef62d..d48c8f6 100644
--- a/net-firewall/ipset/ipset-6.29.ebuild
+++ b/net-firewall/ipset/ipset-6.29.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86"
 
 RDEPEND=">=net-firewall/iptables-1.4.7
net-libs/libmnl"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Robin H. Johnson]

commit: 1e181c11aed2ee1d724daf60c102f9922dccc9f6
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Oct 28 17:46:55 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Oct 28 17:46:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e181c11

net-firewall/ipset: cleanup repoman inherit warning

Package-Manager: portage-2.3.2

 net-firewall/ipset/ipset-6.24.ebuild | 8 ++--
 net-firewall/ipset/ipset-6.29.ebuild | 8 ++--
 net-firewall/ipset/ipset-6.30.ebuild | 2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/net-firewall/ipset/ipset-6.24.ebuild 
b/net-firewall/ipset/ipset-6.24.ebuild
index 3fb97b7..eb24475 100644
--- a/net-firewall/ipset/ipset-6.24.ebuild
+++ b/net-firewall/ipset/ipset-6.24.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 MODULES_OPTIONAL_USE=modules
-inherit autotools linux-info linux-mod
+inherit linux-info linux-mod
 
 DESCRIPTION="IPset tool for iptables, successor to ippool"
 HOMEPAGE="http://ipset.netfilter.org/;
@@ -62,10 +62,6 @@ pkg_setup() {
[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
 }
 
-#src_prepare() {
-#  eautoreconf
-#}
-
 src_configure() {
econf \
$(use_with modules kmod) \

diff --git a/net-firewall/ipset/ipset-6.29.ebuild 
b/net-firewall/ipset/ipset-6.29.ebuild
index 244fee3..52ef62d 100644
--- a/net-firewall/ipset/ipset-6.29.ebuild
+++ b/net-firewall/ipset/ipset-6.29.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 MODULES_OPTIONAL_USE=modules
-inherit autotools linux-info linux-mod
+inherit linux-info linux-mod
 
 DESCRIPTION="IPset tool for iptables, successor to ippool"
 HOMEPAGE="http://ipset.netfilter.org/;
@@ -62,10 +62,6 @@ pkg_setup() {
[[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup
 }
 
-#src_prepare() {
-#  eautoreconf
-#}
-
 src_configure() {
econf \
$(use_with modules kmod) \

diff --git a/net-firewall/ipset/ipset-6.30.ebuild 
b/net-firewall/ipset/ipset-6.30.ebuild
index 40a8b6f..888d8b1 100644
--- a/net-firewall/ipset/ipset-6.30.ebuild
+++ b/net-firewall/ipset/ipset-6.30.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="6"
 MODULES_OPTIONAL_USE=modules
-inherit autotools linux-info linux-mod
+inherit linux-info linux-mod
 
 DESCRIPTION="IPset tool for iptables, successor to ippool"
 HOMEPAGE="http://ipset.netfilter.org/;

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Robin H. Johnson]

commit: c176bc615b92a2c5aaf00f1ad729e314214d244c
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Oct 28 17:44:14 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Oct 28 17:44:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c176bc61

net-firewall/ipset: bump per bug #598344.

Package-Manager: portage-2.3.2

 net-firewall/ipset/Manifest  |  1 +
 net-firewall/ipset/ipset-6.30.ebuild | 98 
 2 files changed, 99 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 32cf255..e25317a 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -7,3 +7,4 @@ DIST ipset-6.20.1.tar.bz2 500898 SHA256 
356cac020438cd0871acbfc4cb119b8296030f0b
 DIST ipset-6.21.1.tar.bz2 510013 SHA256 
cf46c9c35a15aa0f2e0fbab0422586757bd82386c8ad3864936e6cffbd74a331 SHA512 
c2ffb2eafc780e15370fd48841f4323c39e8fef1893216c8bc0b8aa8d143f9daf078c6e261e4558243004fe9612ce1d5ca4cca16f8b3f324f4194700c1b0accb
 WHIRLPOOL 
230ebb4756891283980f5b7f67c0c64772b1527b8e8c0b6cdd2714de450b3f6c2a75d961d44563e440edd1399bdee8cce820fe59f46c28355a6f053ad6b1c37b
 DIST ipset-6.24.tar.bz2 518811 SHA256 
3071fc283f00a6472b5b352ef57f9825c9face70dda5b0d8715f8d43d0e995d0 SHA512 
107bf492030dc4e8e4c2a939e46a715f58458126bfb636dae993e5bf31151d33c2a41b89eb5cca85b71d95b3e36debf97cdfc72c568f351091df17159003d6c6
 WHIRLPOOL 
d34e8d5d197be85cf00ea6a5dbfeb7c52b5d42d9e78299620928e69ba1fbbe124cb16b9f5f2e05d1213b2b7a29a2bed2c1edac2f15ee3c83d8dc19eb3afcc112
 DIST ipset-6.29.tar.bz2 542735 SHA256 
6af58b21c8b475b1058e02529ea9f15b4b727dbc13dc9cbddf89941b0103880e SHA512 
ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
 WHIRLPOOL 
8e6642d180b5e682bb121ffc249638da27650f97bc3b1e8aef75996d7c626eb447c9324b9cf68e25773cef73720e6281c7a16bf3ba96433ab77ef6f437be3999
+DIST ipset-6.30.tar.bz2 544054 SHA256 
65bfa43fec3d51a6b4012f3d7e4b93a748df9b71b6cd6c53adbec8083e804a31 SHA512 
6299a6905fbbcc2dd7c2f07862af184fd3b63b586f7bf3af2de5a0cc692f4ec6ef57db64c3435c1acedd6c293570602dca8cfedcb197a00ec18517ced92dc903
 WHIRLPOOL 
d7721b40c5a1556928778fe8adec6c792d0f281737b61680ab414e4aa11691dc2f9c0bf0e56ec8873f4263011e836963d1ab2e273b206b7a0a98adc2ea3d5468

diff --git a/net-firewall/ipset/ipset-6.30.ebuild 
b/net-firewall/ipset/ipset-6.30.ebuild
new file mode 100644
index ..40a8b6f
--- /dev/null
+++ b/net-firewall/ipset/ipset-6.30.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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 ~arm64 ~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
+
+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
+   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//... ."
+   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"

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/, net-firewall/ipset/files/

[Robin H. Johnson]

commit: 484498f47913afcc44e9d3219a457e044eebe8d1
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Jun  4 00:33:08 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Jun  4 00:33:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=484498f4

net-firewall/ipset: bug #554904 bump.

Package-Manager: portage-2.2.28

 net-firewall/ipset/Manifest |   1 +
 net-firewall/ipset/files/ipset.initd-r4 |  96 +
 net-firewall/ipset/ipset-6.29.ebuild| 103 
 3 files changed, 200 insertions(+)

diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 0d2769c..32cf255 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -6,3 +6,4 @@ DIST ipset-6.19.tar.bz2 465927 SHA256 
058e7950efdf8b9539ab79eb145de7be60d6cb7b92
 DIST ipset-6.20.1.tar.bz2 500898 SHA256 
356cac020438cd0871acbfc4cb119b8296030f0bb4661ad0d44bbc115ccbce92 SHA512 
3fda3a71c18c8d5f9567038fc72f95abec81b4c789fbca7f7b9c032b15000cfbd2829f11a07f2f9ad2afcff54d6851923caff0917b2ead73756673a6b3667565
 WHIRLPOOL 
f31cd533d286238e63f38aecbf281d428d75e856b393f61db5f6622d0dc0cd0a6de7aa4d3eaa2831e1da7dd0846e95c22f92b3a586cf3918cee074360a4caff3
 DIST ipset-6.21.1.tar.bz2 510013 SHA256 
cf46c9c35a15aa0f2e0fbab0422586757bd82386c8ad3864936e6cffbd74a331 SHA512 
c2ffb2eafc780e15370fd48841f4323c39e8fef1893216c8bc0b8aa8d143f9daf078c6e261e4558243004fe9612ce1d5ca4cca16f8b3f324f4194700c1b0accb
 WHIRLPOOL 
230ebb4756891283980f5b7f67c0c64772b1527b8e8c0b6cdd2714de450b3f6c2a75d961d44563e440edd1399bdee8cce820fe59f46c28355a6f053ad6b1c37b
 DIST ipset-6.24.tar.bz2 518811 SHA256 
3071fc283f00a6472b5b352ef57f9825c9face70dda5b0d8715f8d43d0e995d0 SHA512 
107bf492030dc4e8e4c2a939e46a715f58458126bfb636dae993e5bf31151d33c2a41b89eb5cca85b71d95b3e36debf97cdfc72c568f351091df17159003d6c6
 WHIRLPOOL 
d34e8d5d197be85cf00ea6a5dbfeb7c52b5d42d9e78299620928e69ba1fbbe124cb16b9f5f2e05d1213b2b7a29a2bed2c1edac2f15ee3c83d8dc19eb3afcc112
+DIST ipset-6.29.tar.bz2 542735 SHA256 
6af58b21c8b475b1058e02529ea9f15b4b727dbc13dc9cbddf89941b0103880e SHA512 
ce62c72c4cea1b52f069602a90fbffe9bcb12bf70f5b42d93cacb48e4b5d1192a13b18be45391c66a65421f41968e73416e16af25ae6ef19ba92bdbb2cd45ff3
 WHIRLPOOL 
8e6642d180b5e682bb121ffc249638da27650f97bc3b1e8aef75996d7c626eb447c9324b9cf68e25773cef73720e6281c7a16bf3ba96433ab77ef6f437be3999

diff --git a/net-firewall/ipset/files/ipset.initd-r4 
b/net-firewall/ipset/files/ipset.initd-r4
new file mode 100644
index 000..d3e8409
--- /dev/null
+++ b/net-firewall/ipset/files/ipset.initd-r4
@@ -0,0 +1,96 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_commands="save"
+extra_started_commands="reload"
+
+IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/rules-save}
+
+depend() {
+before iptables ip6tables
+}
+
+checkconfig() {
+if [ ! -f "${IPSET_SAVE}" ] ; then
+eerror "Not starting ${SVCNAME}. First create some rules then run:"
+eerror "/etc/init.d/${SVCNAME} save"
+return 1
+fi
+return 0
+}
+
+start() {
+checkconfig || return 1
+ebegin "Loading ipset session"
+ipset restore < "${IPSET_SAVE}"
+eend $?
+}
+
+stop() {
+# check if there are any references to current sets
+
+if ! ipset list | gawk '
+($1 == "References:") { refcnt += $2 }
+($1 == "Type:" && $2 == "list:set") { set = 1 }
+(scan) { if ($0 != "") setcnt++; else { scan = 0; set = 0 } }
+(set && $1 == "Members:") {scan = 1}
+END { if ((refcnt - setcnt) > 0) exit 1 }
+'; then
+eerror "ipset is in use, can't stop"
+return 1
+fi
+
+if [ "${SAVE_ON_STOP}" = "yes" ] ; then
+save || return 1
+fi
+
+ebegin "Removing kernel IP sets"
+ipset flush
+ipset destroy
+eend $?
+}
+
+reload() {
+ebegin "Reloading ipsets"
+
+# Loading sets from a save file is only additive (there is no
+# automatic flushing or replacing). And, we can not remove sets
+# that are currently used in existing iptables rules.
+#
+# Instead, we create new temp sets for any set that is already
+# in use, and then atomically swap them into place.
+#
+# XXX: This does not clean out previously used ipsets that are
+# not in the new saved policy--it can't, because they may still
+# be referenced in the current iptables rules.
+
+# Build a list of all currently used sets (if any).
+running_ipset_list=$(ipset save | gawk '/^create/{printf "%s ",$2}')
+   running_ipset_list="${running_ipset_list% }"
+# Build a regular expression that matches those set names.
+running_ipset_list_regex="$(echo "$running_ipset_list" | tr -s ' ' '|' )"
+
+# Load up sets from the save file, but rename any set that already
+# exists to a temporary name that we will swap later.
+if ! cat ${IPSET_SAVE} | sed -r 

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipset/

[Matt Thode]

commit: c0d3a3e592bd12f49c9bdd23448f59cfe171fd2f
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Feb 28 07:04:33 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Sun Feb 28 07:04:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d3a3e5

net-firewall/ipset: keywording arm64

merged on X-C1

Package-Manager: portage-2.2.26

 net-firewall/ipset/ipset-6.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipset/ipset-6.24.ebuild 
b/net-firewall/ipset/ipset-6.24.ebuild
index 0db53d7..3fb97b7 100644
--- a/net-firewall/ipset/ipset-6.24.ebuild
+++ b/net-firewall/ipset/ipset-6.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 
 RDEPEND=">=net-firewall/iptables-1.4.7
net-libs/libmnl"