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

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

[Robin H. Johnson]

commit:     3ae1990e869c46b56da84d4202d52dfb3ebd21aa
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 20:28:32 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 20:35:48 2017 +0000
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 <robbat2 <AT> 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/files/

[Michał Górny]

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

net-firewall/ipset: remove unused files

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Michał Górny <mgorny <AT> 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..000000000000
--- 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..000000000000
--- 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..000000000000
--- a/net-firewall/ipset/files/ipset.systemd
+++ /dev/null
@@ -1,15 +0,0 @@
-[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

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

[Conrad Kostecki]

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

net-firewall/ipset: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> 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..000000000000
--- 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 <sam@gentoo.org>
-Date: Thu, 24 Nov 2022 04:38:28 +0000
-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 <sam@gentoo.org>
---- 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 <linux/types.h>
- 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/files/

[Conrad Kostecki]

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

net-firewall/ipset: remove unused file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> 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..000000000000
--- 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/files/

[Conrad Kostecki]

commit:     1e4bbd99cb33746c1bf9c0276154bf2a7cd63d20
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jul 15 16:56:47 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 15:04:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4bbd99

net-firewall/ipset: remove unused file

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

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

diff --git a/net-firewall/ipset/files/ipset.initd-r6 b/net-firewall/ipset/files/ipset.initd-r6
deleted file mode 100644
index 949bdad76044..000000000000
--- a/net-firewall/ipset/files/ipset.initd-r6
+++ /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 -output save list > "${IPSET_SAVE}"
-    eend $?
-}