Hello community, here is the log from the commit of package SuSEfirewall2 checked in at Thu Mar 1 20:57:47 CET 2007. -------- --- SuSEfirewall2/SuSEfirewall2.changes 2007-02-22 13:14:49.000000000 +0100 +++ /mounts/work_src_done/NOARCH/SuSEfirewall2/SuSEfirewall2.changes 2007-03-01 16:51:03.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 16:50:12 CET 2007 - lnussel@suse.de + +- use /etc/sysconfig/SuSEfirewall2.d/services (#247352) + +------------------------------------------------------------------- Old: ---- SuSEfirewall2-3.6_SVNr165.tar.bz2 New: ---- SuSEfirewall2-3.6_SVNr166.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ --- /var/tmp/diff_new_pack.K24545/_old 2007-03-01 20:56:40.000000000 +0100 +++ /var/tmp/diff_new_pack.K24545/_new 2007-03-01 20:56:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package SuSEfirewall2 (Version 3.6_SVNr165) +# spec file for package SuSEfirewall2 (Version 3.6_SVNr166) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,8 +12,8 @@ # icecream 0 Name: SuSEfirewall2 -Version: 3.6_SVNr165 -Release: 3 +Version: 3.6_SVNr166 +Release: 1 License: GNU General Public License (GPL) Group: Productivity/Networking/Security Requires: lsof iptables @@ -77,7 +77,7 @@ %config(noreplace) /etc/sysconfig/scripts/SuSEfirewall2-custom %config /etc/init.d/SuSEfirewall2_init %config /etc/init.d/SuSEfirewall2_setup -/usr/share/SuSEfirewall2/services/* +/etc/sysconfig/SuSEfirewall2.d/services/* /etc/sysconfig/scripts/SuSEfirewall2-rpcinfo /etc/sysconfig/scripts/SuSEfirewall2-showlog /etc/sysconfig/scripts/SuSEfirewall2-open @@ -193,6 +193,8 @@ rm -rf %{buildroot} %changelog +* Thu Mar 01 2007 - lnussel@suse.de +- use /etc/sysconfig/SuSEfirewall2.d/services (#247352) * Thu Feb 22 2007 - sbrabec@suse.cz - Removed directory ownership of /usr/share/SuSEfirewall2* (#247435). ++++++ SuSEfirewall2-3.6_SVNr165.tar.bz2 -> SuSEfirewall2-3.6_SVNr166.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.6_SVNr165/Makefile new/SuSEfirewall2-3.6_SVNr166/Makefile --- old/SuSEfirewall2-3.6_SVNr165/Makefile 2007-02-12 11:52:34.000000000 +0100 +++ new/SuSEfirewall2-3.6_SVNr166/Makefile 2007-03-01 16:28:25.000000000 +0100 @@ -52,7 +52,7 @@ install -d -m 755 $(DESTDIR)/sbin install -d -m 755 $(DESTDIR)/etc/init.d install -d -m 755 $(DESTDIR)/etc/sysconfig/scripts - install -d -m 755 $(DESTDIR)/usr/share/SuSEfirewall2/services + install -d -m 755 $(DESTDIR)/etc/sysconfig/SuSEfirewall2.d/services install -m 755 SuSEfirewall2 $(DESTDIR)/sbin install -m 755 SuSEfirewall2_init $(DESTDIR)/etc/init.d install -m 755 SuSEfirewall2_setup $(DESTDIR)/etc/init.d @@ -62,7 +62,7 @@ install -m 644 $$i $(DESTDIR)/etc/sysconfig/scripts; \ done install -m 755 SuSEfirewall2-custom.sysconfig $(DESTDIR)/etc/sysconfig/scripts/SuSEfirewall2-custom - install -m 755 SuSEfirewall2.service.TEMPLATE $(DESTDIR)/usr/share/SuSEfirewall2/services/TEMPLATE + install -m 644 SuSEfirewall2.service.TEMPLATE $(DESTDIR)/etc/sysconfig/SuSEfirewall2.d/services/TEMPLATE doc: $(MAKE) -C doc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.6_SVNr165/SuSEfirewall2 new/SuSEfirewall2-3.6_SVNr166/SuSEfirewall2 --- old/SuSEfirewall2-3.6_SVNr165/SuSEfirewall2 2007-02-13 09:56:51.000000000 +0100 +++ new/SuSEfirewall2-3.6_SVNr166/SuSEfirewall2 2007-03-01 16:41:38.000000000 +0100 @@ -154,7 +154,8 @@ . "$SCRIPTSDIR/SuSEfirewall2-$1" } -CONFIGURATIONSDIR="/usr/share/SuSEfirewall2/services" +CONFIGURATIONSDIR_0="/etc/sysconfig/SuSEfirewall2.d/services" +CONFIGURATIONSDIR_1="/usr/share/SuSEfirewall2/services" SCRIPTSDIR="/etc/sysconfig/scripts" FWCONFIG="/etc/sysconfig/SuSEfirewall2" LOCKFILE="/var/lock/SuSEfirewall2.pid" @@ -1040,9 +1041,11 @@ local BROADCAST='' # XXX: could use a sub shell in order to enforce use of known variables only - if ! . $CONFIGURATIONSDIR/$config; then - warning "config '$config' not available" - continue + if [ ! -r $CONFIGURATIONSDIR_0/$config ] || ! . $CONFIGURATIONSDIR_0/$config; then + if ! . $CONFIGURATIONSDIR_1/$config; then + warning "config '$config' not available" + continue + fi fi for var in TCP UDP RPC IP; do ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org