Hello community, here is the log from the commit of package SuSEfirewall2 for openSUSE:Factory checked in at Fri Jul 17 17:50:38 CEST 2009. -------- --- SuSEfirewall2/SuSEfirewall2.changes 2009-07-09 15:51:22.000000000 +0200 +++ SuSEfirewall2/SuSEfirewall2.changes 2009-07-17 12:05:19.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 17 10:04:48 UTC 2009 - lnussel@suse.de + +- remove chkconfig calls (bnc#522268) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- SuSEfirewall2-3.6_SVNr219.tar.bz2 New: ---- SuSEfirewall2-3.6_SVNr220.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ --- /var/tmp/diff_new_pack.yThZaL/_old 2009-07-17 17:49:06.000000000 +0200 +++ /var/tmp/diff_new_pack.yThZaL/_new 2009-07-17 17:49:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package SuSEfirewall2 (Version 3.6_SVNr219) +# spec file for package SuSEfirewall2 (Version 3.6_SVNr220) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: SuSEfirewall2 -Version: 3.6_SVNr219 +Version: 3.6_SVNr220 Release: 1 License: GPL v2 or later Group: Productivity/Networking/Security ++++++ SuSEfirewall2-3.6_SVNr219.tar.bz2 -> SuSEfirewall2-3.6_SVNr220.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSEfirewall2-3.6_SVNr219/SuSEfirewall2_ifup new/SuSEfirewall2-3.6_SVNr220/SuSEfirewall2_ifup --- old/SuSEfirewall2-3.6_SVNr219/SuSEfirewall2_ifup 2009-06-09 16:15:29.000000000 +0200 +++ new/SuSEfirewall2-3.6_SVNr220/SuSEfirewall2_ifup 2009-07-17 12:00:43.000000000 +0200 @@ -26,7 +26,12 @@ export PATH=/sbin:/usr/sbin:/usr/bin:/bin -. /etc/sysconfig/network/config 2>/dev/null +. /etc/sysconfig/network/config + +sfw2_active() +{ + { test -e /proc/net/ip_tables_names && iptables -nL reject_func >/dev/null 2>&1; } || return 1 +} case "$0" in # @@ -60,12 +65,12 @@ case $1 in net-reconfig-init) [ "$FIREWALL" = 'yes' ] || exit 2 - /sbin/SuSEfirewall2 -q status &>/dev/null || exit 3 + sfw2_active || exit 3 /sbin/SuSEfirewall2 bootlock ;; net-reconfig-done) [ "$FIREWALL" = 'yes' ] || exit 2 - /sbin/SuSEfirewall2 -q status &>/dev/null || exit 3 + sfw2_active || exit 3 /sbin/SuSEfirewall2 --bootunlock start ;; running) @@ -73,12 +78,12 @@ ;; status) - /sbin/SuSEfirewall2 -q status &>/dev/null + sfw2_active ;; try-restart) - /sbin/chkconfig --check SuSEfirewall2_setup && \ - /sbin/SuSEfirewall2 -q status &>/dev/null && \ - /sbin/SuSEfirewall2 start + if sfw2_active; then + /sbin/SuSEfirewall2 start + fi ;; esac ;; @@ -95,9 +100,9 @@ [ "$FIREWALL" = 'yes' ] || exit 0 - /sbin/chkconfig --check SuSEfirewall2_setup && \ - /sbin/SuSEfirewall2 -q status &>/dev/null && \ - /sbin/SuSEfirewall2 -q start + if sfw2_active; then + /sbin/SuSEfirewall2 -q start + fi ;; *) echo "don't know what to do" >&2 ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSEfirewall2-3.6_SVNr219/SuSEfirewall2_setup new/SuSEfirewall2-3.6_SVNr220/SuSEfirewall2_setup --- old/SuSEfirewall2-3.6_SVNr219/SuSEfirewall2_setup 2008-09-30 10:47:51.000000000 +0200 +++ new/SuSEfirewall2-3.6_SVNr220/SuSEfirewall2_setup 2009-07-17 12:00:43.000000000 +0200 @@ -63,7 +63,7 @@ ;; status) echo -n "Checking the status of SuSEfirewall2 " - iptables -nL reject_func >/dev/null 2>&1 || rc_failed 3 + { test -e /proc/net/ip_tables_names && iptables -nL reject_func >/dev/null 2>&1; } || rc_failed 3 rc_status -v ;; *) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org