[gentoo-commits] gentoo-x86 commit in net-firewall/ipset/files: ipset.initd-r3 ipset.confd ipset.initd-r2

[Robin H. Johnson (robbat2)]

robbat2     13/12/01 19:16:16

  Modified:             ipset.confd ipset.initd-r2
  Added:                ipset.initd-r3
  Log:
  Bump per bug #486836, adds new modules and future warning about NET_NS. Make USE=-modules not introduce kernel-sources via MODULES_OPTIONAL_USE. Bug #433411: Drop use
  
  (Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.2                  net-firewall/ipset/files/ipset.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/files/ipset.confd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/files/ipset.confd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/files/ipset.confd?r1=1.1&r2=1.2

Index: ipset.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/files/ipset.confd,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- ipset.confd	17 Dec 2011 03:30:59 -0000	1.1
+++ ipset.confd	1 Dec 2013 19:16:15 -0000	1.2
@@ -6,3 +6,11 @@ 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"



1.2                  net-firewall/ipset/files/ipset.initd-r2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/files/ipset.initd-r2?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/files/ipset.initd-r2?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/files/ipset.initd-r2?r1=1.1&r2=1.2

Index: ipset.initd-r2
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/files/ipset.initd-r2,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- ipset.initd-r2	17 Dec 2011 03:30:59 -0000	1.1
+++ ipset.initd-r2	1 Dec 2013 19:16:15 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/files/ipset.initd-r2,v 1.1 2011/12/17 03:30:59 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/files/ipset.initd-r2,v 1.2 2013/12/01 19:16:15 robbat2 Exp $
 
 extra_commands="save"
 
@@ -9,7 +9,6 @@ IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/
 
 depend() {
     before iptables ip6tables
-    use logger
 }
 
 checkconfig() {



1.1                  net-firewall/ipset/files/ipset.initd-r3

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/files/ipset.initd-r3?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipset/files/ipset.initd-r3?rev=1.1&content-type=text/plain

Index: ipset.initd-r3
===================================================================
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/files/ipset.initd-r3,v 1.1 2013/12/01 19:16:15 robbat2 Exp $

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="${running_ipset_list// /|}"

    # 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"
    touch "${IPSET_SAVE}"
    chmod 0600 "${IPSET_SAVE}"
    ipset save > "${IPSET_SAVE}"
    eend $?
}