Hello community,
here is the log from the commit of package SuSEfirewall2 for openSUSE:Factory
checked in at Sun Oct 16 12:40:18 CEST 2011.
--------
--- openSUSE:Factory/SuSEfirewall2/SuSEfirewall2.changes 2011-09-23
01:51:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/SuSEfirewall2/SuSEfirewall2.changes
2011-10-14 11:46:56.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Oct 14 09:46:33 UTC 2011 - lnus...@suse.de
+
+- fix manual rcSuSEfirewall2 stop with sytemd (bnc#717583)
+
+-------------------------------------------------------------------
+Tue Oct 4 14:53:13 UTC 2011 - lnus...@suse.de
+
+- fix typo (bnc#721845)
+- atomic zone status writing
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
SuSEfirewall2-3.6.277.tar.bz2
New:
----
SuSEfirewall2-3.6.280.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ SuSEfirewall2.spec ++++++
--- /var/tmp/diff_new_pack.CJkEOl/_old 2011-10-16 12:40:14.000000000 +0200
+++ /var/tmp/diff_new_pack.CJkEOl/_new 2011-10-16 12:40:14.000000000 +0200
@@ -19,7 +19,7 @@
Name: SuSEfirewall2
-Version: 3.6.277
+Version: 3.6.280
Release: 1
License: GPLv2+
Group: Productivity/Networking/Security
++++++ SuSEfirewall2-3.6.277.tar.bz2 -> SuSEfirewall2-3.6.280.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SuSEfirewall2-3.6.277/SuSEfirewall2
new/SuSEfirewall2-3.6.280/SuSEfirewall2
--- old/SuSEfirewall2-3.6.277/SuSEfirewall2 2011-09-06 11:33:05.000000000
+0200
+++ new/SuSEfirewall2-3.6.280/SuSEfirewall2 2011-10-14 11:45:56.000000000
+0200
@@ -997,7 +997,8 @@
rm -rf "$STATUSDIR/status/interfaces/$d"
else
eval local seen_$d=1
- echo $z > "$STATUSDIR/status/interfaces/$d/zone"
+ echo $z > "$STATUSDIR/status/interfaces/$d/.zone.new"
+ mv "$STATUSDIR/status/interfaces/$d/.zone.new"
"$STATUSDIR/status/interfaces/$d/zone"
fi
done
for d in ${!iface_*}; do
@@ -1005,7 +1006,8 @@
d=${d#iface_}
eval [ -n "\"\$seen_$d\"" ] && continue
mkdir "$STATUSDIR/status/interfaces/$d"
- echo $z > "$STATUSDIR/status/interfaces/$d/zone"
+ echo $z > "$STATUSDIR/status/interfaces/$d/.zone.new"
+ mv "$STATUSDIR/status/interfaces/$d/.zone.new"
"$STATUSDIR/status/interfaces/$d/zone"
done
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SuSEfirewall2-3.6.277/SuSEfirewall2.sysconfig
new/SuSEfirewall2-3.6.280/SuSEfirewall2.sysconfig
--- old/SuSEfirewall2-3.6.277/SuSEfirewall2.sysconfig 2011-09-06
11:33:05.000000000 +0200
+++ new/SuSEfirewall2-3.6.280/SuSEfirewall2.sysconfig 2011-10-14
11:45:56.000000000 +0200
@@ -382,7 +382,7 @@
# details.
#
# Note: In older SuSEfirewall2 version this setting took place after
-# FW_SERVICES_ACCEPT_*, not it takes precedence.
+# FW_SERVICES_ACCEPT_*, now it takes precedence.
#
FW_SERVICES_DROP_EXT=""
@@ -411,7 +411,7 @@
# details.
#
# Note: In older SuSEfirewall2 version this setting took place after
-# FW_SERVICES_ACCEPT_*, not it takes precedence.
+# FW_SERVICES_ACCEPT_*, now it takes precedence.
#
FW_SERVICES_REJECT_EXT=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/SuSEfirewall2-3.6.277/SuSEfirewall2_setup
new/SuSEfirewall2-3.6.280/SuSEfirewall2_setup
--- old/SuSEfirewall2-3.6.277/SuSEfirewall2_setup 2011-09-06
11:33:05.000000000 +0200
+++ new/SuSEfirewall2-3.6.280/SuSEfirewall2_setup 2011-10-14
11:45:56.000000000 +0200
@@ -36,14 +36,16 @@
rc_status -v
;;
stop)
+ called_manually=''
if [ -e /sys/fs/cgroup/systemd ]; then
- # when using systemd we don't know whether we are
- # called due to shutdown of the machine. So we can't
- # unload rules here. Call /sbin/SuSEfirewall2
- # directly instead to unload rules.
- echo -n "Not unloading firewall rules when using systemd "
- rc_status -s
+ # XXX: find a better way to check whether shutdown is in
progress
+ if ! systemctl --no-pager --full --all list-units | grep -q
'basic\.target.*active.*stop'; then
+ called_manually=yes
+ fi
elif [ -z "$REDIRECT" ]; then
+ called_manually=yes
+ fi
+ if [ "$called_manually" = yes ]; then
echo -n "Unloading firewall rules"
$SUSEFWALL -q stop
rc_status -v
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
