Hello community, here is the log from the commit of package shorewall for openSUSE:12.1:Update:Test checked in at 2012-03-05 14:14:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/shorewall (Old) and /work/SRC/openSUSE:12.1:Update:Test/.shorewall.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shorewall", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/shorewall/shorewall.changes 2012-03-05 14:14:56.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.shorewall.new/shorewall.changes 2012-03-05 14:14:59.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 00:01:23 UTC 2012 - toganm@opensuse.org + +- Add /sbin/shorewall-init (bnc#749724) + +------------------------------------------------------------------- New: ---- shorewall-init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shorewall.spec ++++++ --- /var/tmp/diff_new_pack.dSBDul/_old 2012-03-05 14:15:00.000000000 +0100 +++ /var/tmp/diff_new_pack.dSBDul/_new 2012-03-05 14:15:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package shorewall # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,13 @@ # - Name: shorewall Version: 4.4.24.1 -Release: 1 -License: GPL-2.0 +Release: 0 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems -Url: http://www.shorewall.net/ +License: GPL-2.0 Group: Productivity/Networking/Security +Url: http://www.shorewall.net/ Source0: http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/%name-%version.t... Source1: http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/%name-lite-%vers... Source2: http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/%name-init-%vers... @@ -32,6 +31,8 @@ Source5: http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/%name-docs-html-... Source6: %name-4.4.22.rpmlintrc Source7: README.openSUSE +# PATCH-FIX-UPSTREAM shorewall-init (bnc#749724) teastep@shorewall.net --provide /sbin/shorewall-init for systemd +Source8: shorewall-init # PATCH-FIX-UPSTREAM init-4.4.14 toganm@opensuse.org -- Required-Stop and Short descriprtion Patch0: init-4.4.14.patch # PATCH-FIX-UPSTREAM shorewall-lite-4.4.14.init.patch toganm@opensuse.org Required-Stop and Short descriprtion @@ -55,9 +56,9 @@ PreReq: %fillup_prereq PreReq: %insserv_prereq %endif -Requires: xtables-addons Requires: iproute2 Requires: iptables +Requires: xtables-addons %if 0%{?suse_version} < 1140 Requires: perl = %{perl_version} @@ -83,6 +84,7 @@ %package lite Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems +License: GPL-2.0 Group: Productivity/Networking/Security %if 0%{?suse_version} > 1140 Requires(pre): systemd @@ -111,6 +113,8 @@ %package -n %{name}6 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems +License: GPL-2.0 +Group: Productivity/Networking/Security %if 0%{?suse_version} > 1140 Requires(pre): systemd Requires(post): systemd @@ -122,7 +126,6 @@ %endif Requires: logrotate Conflicts: SuSEfirewall2 -Group: Productivity/Networking/Security %description -n %{name}6 The Shoreline Firewall 6, more commonly known as "Shorewall6", is a Netfilter @@ -132,6 +135,8 @@ %package -n %{name}6-lite Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems +License: GPL-2.0 +Group: Productivity/Networking/Security %if 0%{?suse_version} > 1140 Requires(pre): systemd Requires(post): systemd @@ -143,7 +148,6 @@ %endif Requires: logrotate Conflicts: SuSEfirewall2 -Group: Productivity/Networking/Security %description -n %{name}6-lite The Shoreline Firewall 6, more commonly known as "Shorewall6", is a Netfilter @@ -156,6 +160,8 @@ %package init Summary: Adds functionality to Shoreline Firewall (Shorewall) +License: GPL-2.0 +Group: Productivity/Networking/Security %if 0%{?suse_version} > 1140 Requires(pre): systemd Requires(post): systemd @@ -165,10 +171,9 @@ PreReq: %fillup_prereq PreReq: %insserv_prereq %endif -Requires: logrotate Requires: %name > 4.4.9 Requires: %{name}6 > 4.4.9 -Group: Productivity/Networking/Security +Requires: logrotate %description init The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter @@ -181,8 +186,8 @@ %package docs Summary: HTML documentation for shorewall configuration +License: SUSE-GFDL-1.2+ Group: Documentation/Other -License: FDLv1.2+ %description docs HTML documentation for the Shoreline Firewall. Highly recommend to read before @@ -259,6 +264,7 @@ pushd %name-init-%version %__mkdir_p %buildroot%_sysconfdir/NetworkManager/dispatcher.d/ PREFIX=%buildroot DEST=%_initddir %_buildshell install.sh +install -m 755 %{S:8} %buildroot/sbin/shorewall-init popd %pre @@ -574,7 +580,7 @@ %attr(0755,root,root) %_sysconfdir/NetworkManager/dispatcher.d/01-%name %_datadir/%name-init/version %attr(0544,root,root) %_libexecdir/%name-init/ifupdown - +%attr(0755,root,root) /sbin/%{name}-init %attr(0544,root,root) %_sysconfdir/sysconfig/network/if-down.d/%name %attr(0755,root,root) %_sysconfdir/sysconfig/network/if-up.d/%name %_mandir/man8/%name-init.8* ++++++ shorewall-init ++++++ #! /bin/bash # The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5 # # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # # (c) 2012 - Tom Eastep (teastep@shorewall.net) # # On most distributions, this file should be called /etc/init.d/shorewall. # # Complete documentation is available at http://shorewall.net # # This program is free software; you can redistribute it and/or modify # it under the terms of Version 2 of the GNU General Public License # as published by the Free Software Foundation. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # ######################################################################################### if [ "$(id -u)" != "0" ] then echo "You must be root to start, stop or restart \"Shorewall \"." exit 1 fi # check if shorewall-init is configured or not if [ -f "/etc/sysconfig/shorewall-init" ] then . /etc/sysconfig/shorewall-init if [ -z "$PRODUCTS" ] then echo "ERROR: No products configured" >&2 exit 1 fi else echo "ERROR: /etc/sysconfig/shorewall-init not found" >&2 exit 1 fi # Initialize the firewall shorewall_start () { local PRODUCT local VARDIR echo -n "Initializing \"Shorewall-based firewalls\": " for PRODUCT in $PRODUCTS; do VARDIR=/var/lib/$PRODUCT [ -f /etc/$PRODUCT/vardir ] && . /etc/$PRODUCT/vardir if [ -x ${VARDIR}/firewall ]; then if ! /sbin/$PRODUCT status > /dev/null 2>&1; then ${VARDIR}/firewall stop || exit 1 fi fi done if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then ipset -R < "$SAVE_IPSETS" fi return 0 } # Clear the firewall shorewall_stop () { local PRODUCT local VARDIR echo -n "Clearing \"Shorewall-based firewalls\": " for PRODUCT in $PRODUCTS; do VARDIR=/var/lib/$PRODUCT [ -f /etc/$PRODUCT/vardir ] && . /etc/$PRODUCT/vardir if [ -x ${VARDIR}/firewall ]; then ${VARDIR}/firewall clear || exit 1 fi done if [ -n "$SAVE_IPSETS" ]; then mkdir -p $(dirname "$SAVE_IPSETS") if ipset -S > "${SAVE_IPSETS}.tmp"; then grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS" fi fi return 0 } case "$1" in start) shorewall_start ;; stop) shorewall_stop ;; *) echo "Usage: $0 {start|stop}" exit 1 esac exit 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org