Hello community, here is the log from the commit of package shorewall for openSUSE:Factory checked in at 2012-04-17 07:49:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shorewall (Old) and /work/SRC/openSUSE:Factory/.shorewall.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shorewall", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/shorewall/shorewall.changes 2012-03-23 12:10:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.shorewall.new/shorewall.changes 2012-04-17 07:49:54.000000000 +0200 @@ -1,0 +2,58 @@ +Sun Apr 15 09:00:27 UTC 2012 - tog...@opensuse.org + +- Update to 4.5.2.2 For more details see changelog.txt and + releasenotes.txt + * If a shorewallrc file is passed to the 4.5.2.1 Shorewall-core + install.sh, subsequent compilations fail. The error message + indicates that the compiler is looking for lib.core, but the + pathname has embedded spaces. + + * The 4.5.2.1 Shorewall/Shorewall6 installer installs an + incorrect file as /etc/shorewall[6]/Makefile. + +------------------------------------------------------------------- +Sat Apr 14 19:27:13 UTC 2012 - tog...@opensuse.org + +- Update to 4.5.2.1 For more details see changelog.txt and + releasenotes.txt + + * In release 4.5.2, if an INCLUDE directive appeared inside a ?IF + ... ?ENDIF sequence, then the following error would be + generated after the included file had been read: + + ERROR: Missing ?ENDIF to match the ?IF at line ... + * An error in the shorewallrc.apple file has been corrected. + * The shorewallrc.redhat file has been change to conform to + Fedora packaging guidelines. + * The output of the 'version -a' command reflected incorrect + versions when Shorewall-core 4.5.2 was installed. That has been + corrected. + + +------------------------------------------------------------------- +Fri Apr 13 13:58:52 UTC 2012 - tog...@opensuse.org + +- Update to 4.5.2 For more details see changelog.txt and + releasenotes.txt + * The generated firewall script includes code to automatically + create ipsets that are referenced but that don't exist. That code + was broken in releases 4.4.22 and later. This defect has been + corrected. As part of the fix, the generated script will now + issue a warning message when it creates an ipset. + * The 'mss' option is now supported in the /etc/shorewall[6]/hosts + files. See the manpages for details. + * It is now possible to conditionally include or omit + configuration entries based on the settings of shell variables. + See http://www.shorewall.net/configuration_file_basics.htm + for details. + * The MARK/CLASSIFY column in /etc/shorewall[6]/tcrules has been + renamed ACTION to reflect the expanded set of actions that can + be specified in the column. + * Some users are finding these ipset warnings objectionable: + + Warning when a referenced ipset does not exist. + + Warning when using [src] in a destination column or [dst] in + a source column. + These warnings may now be suppressed by setting + IPSET_WARNINGS=No in shorewall.conf and/or shorewall6.conf. + +------------------------------------------------------------------- Old: ---- install-4.4.14.patch shorewall-4.5.1.1.tar.bz2 shorewall-core-4.5.1.1.tar.bz2 shorewall-docs-html-4.5.1.1.tar.bz2 shorewall-init-4.5.1.1.tar.bz2 shorewall-lite-4.4.14.init.patch shorewall-lite-4.5.1.1.tar.bz2 shorewall6-4.5.1.1.tar.bz2 shorewall6-init-4.4.14.patch shorewall6-lite-4.4.14.init.patch shorewall6-lite-4.5.1.1.tar.bz2 New: ---- shorewall-4.5.2.2.tar.bz2 shorewall-core-4.5.2.2.tar.bz2 shorewall-docs-html-4.5.2.2.tar.bz2 shorewall-init-4.5.2-install.patch shorewall-init-4.5.2.2.tar.bz2 shorewall-lite-4.5.2-init.patch shorewall-lite-4.5.2.2.tar.bz2 shorewall6-4.5.2-init.patch shorewall6-4.5.2.2.tar.bz2 shorewall6-lite-4.5.2-init.patch shorewall6-lite-4.5.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shorewall.spec ++++++ --- /var/tmp/diff_new_pack.VvZLC4/_old 2012-04-17 07:49:55.000000000 +0200 +++ /var/tmp/diff_new_pack.VvZLC4/_new 2012-04-17 07:49:55.000000000 +0200 @@ -17,34 +17,34 @@ Name: shorewall -Version: 4.5.1.1 +Version: 4.5.2.2 Release: 0 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems License: GPL-2.0 Group: Productivity/Networking/Security Url: http://www.shorewall.net/ -Source0: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.1/%name-%version.tar.bz2 -Source1: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.1/%name-core-%version.tar.bz2 -Source2: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.1/%name-lite-%version.tar.bz2 -Source3: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.1/%name-init-%version.tar.bz2 -Source4: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.1/%{name}6-lite-%version.tar.bz2 -Source5: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.1/%{name}6-%version.tar.bz2 -Source6: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.1/%name-docs-html-%version.tar.bz2 +Source0: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.2/%name-%version.tar.bz2 +Source1: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.2/%name-core-%version.tar.bz2 +Source2: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.2/%name-lite-%version.tar.bz2 +Source3: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.2/%name-init-%version.tar.bz2 +Source4: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.2/%{name}6-lite-%version.tar.bz2 +Source5: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.2/%{name}6-%version.tar.bz2 +Source6: http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.2/%name-docs-html-%version.tar.bz2 Source7: %name-4.4.22.rpmlintrc Source8: README.openSUSE # PATCH-FIX-UPSTREAM init-4.4.14 tog...@opensuse.org -- Required-Stop and Short descriprtion Patch0: init-4.4.14.patch -# PATCH-FIX-UPSTREAM shorewall-lite-4.4.14.init.patch tog...@opensuse.org Required-Stop and Short descriprtion -Patch1: shorewall-lite-4.4.14.init.patch -# PATCH-FIX-UPSTREAM shorewall6-init-4.4.14.patch tog...@opensuse.org Required-Stop and Short descriprtion -Patch2: shorewall6-init-4.4.14.patch -# PATCH-FIX-UPSTREAM shorewall6-lite-4.4.14.init.patch tog...@opensuse.org Required-Stop and Short descriprtion -Patch3: shorewall6-lite-4.4.14.init.patch +# PATCH-FIX-UPSTREAM shorewall-lite-4.5.2.init.patch tog...@opensuse.org Required-Stop and Short descriprtion +Patch1: shorewall-lite-4.5.2-init.patch +# PATCH-FIX-UPSTREAM shorewall6--4.5.2-init.patch tog...@opensuse.org Required-Stop and Short descriprtion +Patch2: shorewall6-4.5.2-init.patch +# PATCH-FIX-UPSTREAM shorewall6-lite-4.5.2.init.patch tog...@opensuse.org Required-Stop and Short descriprtion +Patch3: shorewall6-lite-4.5.2-init.patch # PATCH-FIX-UPSTREAM shorewall-init-4.4.21_init_sh.patch tog...@opensuse.org # Required-Start/Stop Patch4: shorewall-init-4.4.21_init_sh.patch -# PATCH-FIX-OPENSUSE install-4.4.14.patch tog...@opensuse.org -- use of fillup template -Patch5: install-4.4.14.patch +# PATCH-FIX-OPENSUSE shorewall-init-4.5.2-install.patch tog...@opensuse.org -- use of fillup template +Patch5: shorewall-init-4.5.2-install.patch %if 0%{?suse_version} >= 1210 BuildRequires: systemd %{?systemd_requires} @@ -64,8 +64,8 @@ Requires: logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +BuildRequires: openSUSE-release BuildRequires: perl-Digest-SHA1 -#BuildRequires: openSUSE-release Conflicts: SuSEfirewall2 @@ -203,24 +203,37 @@ # apply patches to shorewall-lite pushd %name-lite-%version -%patch1 +%patch1 -p2 popd # apply patches to shorewall6 pushd %{name}6-%version -%patch2 +%patch2 -p2 popd # apply patches to shorewall-lite pushd %{name}6-lite-%version -%patch3 +%patch3 -p2 + popd -# apply patches to shorewall-lite +# apply patches to shorewall-init pushd %name-init-%version %patch4 -%patch5 +%patch5 -p2 popd +targets="shorewall shorewall-core shorewall-lite shorewall6 shorewall6-lite shorewall-init" + +for i in $targets;do + pushd ${i}-%version + ./configure --host=%{_vendor} \ + --prefix=%{_prefix} \ + --perllibdir=%{perl_vendorlib} \ + --libexecdir=%{_libexecdir} \ + --sharedir=%_datadir + popd +done + chmod -x %name-docs-html-%version/images/*.png chmod -x %{name}6-%version/tunnel chmod -x %{name}6-%version/ipv6 @@ -236,14 +249,7 @@ %define shorewall_target SUSE %define shorewall_initdir %_initddir export DESTDIR=%buildroot -export HOST=%_vendor -export BUILD=%_vendor -export PREFIX=%buildroot export LIBEXEC=%_libexecdir -export PERLLIB=%perl_vendorlib -export OWNER="root" -export GROUP="root" -export INITDIR=%shorewall_initdir %if 0%{?suse_version} < 1210 export SYSTEMD="" %endif @@ -253,10 +259,10 @@ for i in $targets;do pushd ${i}-%version if [ $i != shorewall-init ];then - %_buildshell install.sh + %_buildshell install.sh shorewallrc else install -d %buildroot/%_sysconfdir/NetworkManager/dispatcher.d - %_buildshell install.sh + %_buildshell install.sh shorewallrc install -m 700 shorewall-init %buildroot/sbin/shorewall-init if [ -f ${DESTDIR}/etc/ppp ]; then for directory in ip-up.d ip-down.d ipv6-up.d ipv6-down.d; do @@ -607,6 +613,7 @@ %{_datadir}/shorewall/lib.common %dir %{_libexecdir}/shorewall %{_libexecdir}/shorewall/wait4ifup +%{_datadir}/shorewall/shorewallrc %files docs %defattr(-,root,root,-) ++++++ shorewall-4.5.1.1.tar.bz2 -> shorewall-4.5.2.2.tar.bz2 ++++++ ++++ 7801 lines of diff (skipped) ++++++ shorewall-core-4.5.1.1.tar.bz2 -> shorewall-core-4.5.2.2.tar.bz2 ++++++ ++++ 2022 lines of diff (skipped) ++++++ shorewall-docs-html-4.5.1.1.tar.bz2 -> shorewall-docs-html-4.5.2.2.tar.bz2 ++++++ ++++ 6965 lines of diff (skipped) ++++++ shorewall-init-4.5.2-install.patch ++++++ >From 54007d96d266d8dcd3e9a4ccefcb2979893c0dd3 Mon Sep 17 00:00:00 2001 From: Togan Muftuoglu <tog...@opensuse.org> Date: Fri, 13 Apr 2012 12:28:56 +0200 Subject: [PATCH] shorewall-init 4.5.2 install --- Shorewall-init/install.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 1b12f0a..7db1aaf 100755 --- a/Shorewall-init/install.sh +++ b/Shorewall-init/install.sh @@ -335,10 +335,10 @@ else fi fi fi + mkdir -p ${DESTDIR}/var/adm/fillup-templates + install_file sysconfig ${DESTDIR}/var/adm/fillup-templates/sysconfig.shorewall-init 0644 + - if [ -d ${DESTDIR}${SYSCONFDIR} -a ! -f ${DESTDIR}${SYSCONFDIR}/shorewall-init ]; then - install_file sysconfig ${DESTDIR}${SYSCONFDIR}/shorewall-init 0644 - fi fi # -- 1.7.7 ++++++ shorewall-init-4.5.1.1.tar.bz2 -> shorewall-init-4.5.2.2.tar.bz2 ++++++ ++++ 1889 lines of diff (skipped) ++++++ shorewall-lite-4.5.2-init.patch ++++++ >From debf34fb8dd896663cc9da577f43514dda146263 Mon Sep 17 00:00:00 2001 From: Togan Muftuoglu <tog...@opensuse.org> Date: Thu, 12 Apr 2012 15:27:12 +0200 Subject: [PATCH] shorewall-lite 4.5.2 init --- Shorewall-lite/init.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall-lite/init.sh b/Shorewall-lite/init.sh index 3bae9c5..e7fe4b7 100755 --- a/Shorewall-lite/init.sh +++ b/Shorewall-lite/init.sh @@ -1,5 +1,4 @@ #!/bin/sh -RCDLINKS="2,S41 3,S41 6,K41" # # The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5 # @@ -43,10 +42,11 @@ RCDLINKS="2,S41 3,S41 6,K41" ### BEGIN INIT INFO # Provides: shorewall-lite # Required-Start: $network -# Required-Stop: +# Required-Stop: $null # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Description: starts and stops the shorewall firewall +# Short-Description: Packet filtering firewall ### END INIT INFO ################################################################################ -- 1.7.7 ++++++ shorewall-lite-4.5.1.1.tar.bz2 -> shorewall-lite-4.5.2.2.tar.bz2 ++++++ ++++ 2134 lines of diff (skipped) ++++++ shorewall6-4.5.2-init.patch ++++++ >From 2ca964d81e5dfd4e6916a64538cdc3ffff59a721 Mon Sep 17 00:00:00 2001 From: Togan Muftuoglu <tog...@opensuse.org> Date: Thu, 12 Apr 2012 15:35:17 +0200 Subject: [PATCH] shorewall6 4.5.2 init --- Shorewall6/init.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Shorewall6/init.sh b/Shorewall6/init.sh index 4736277..54c3efe 100755 --- a/Shorewall6/init.sh +++ b/Shorewall6/init.sh @@ -1,5 +1,4 @@ #!/bin/sh -RCDLINKS="2,S41 3,S41 6,K41" # # The Shoreline Firewall (Shorewall6) Packet Filtering Firewall - V4.5 # @@ -44,10 +43,12 @@ RCDLINKS="2,S41 3,S41 6,K41" # Provides: shorewall6 # Required-Start: $local_fs $remote_fs $syslog # Should-Start: VMware $time $named -# Required-Stop: +# Should-Stop: $null +# Required-Stop: $null # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Description: starts and stops the shorewall6 firewall +# Short-Description: Packet filtering firewall ### END INIT INFO ################################################################################ -- 1.7.7 ++++++ shorewall-4.5.1.1.tar.bz2 -> shorewall6-4.5.2.2.tar.bz2 ++++++ ++++ 99429 lines of diff (skipped) ++++++ shorewall6-lite-4.5.2-init.patch ++++++ >From 712e07be288877bdf12169936c64187a47d30396 Mon Sep 17 00:00:00 2001 From: Togan Muftuoglu <tog...@opensuse.org> Date: Thu, 12 Apr 2012 15:53:23 +0200 Subject: [PATCH] shorewall6-lite 4.5.2 init --- Shorewall6-lite/init.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall6-lite/init.sh b/Shorewall6-lite/init.sh index 17c39d3..645df72 100755 --- a/Shorewall6-lite/init.sh +++ b/Shorewall6-lite/init.sh @@ -1,5 +1,4 @@ #!/bin/sh -RCDLINKS="2,S41 3,S41 6,K41" # # The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5 # @@ -43,10 +42,11 @@ RCDLINKS="2,S41 3,S41 6,K41" ### BEGIN INIT INFO # Provides: shorewall6-lite # Required-Start: $network -# Required-Stop: +# Required-Stop: $null # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Description: starts and stops the shorewall firewall +# Short-Description: Packet filtering firewall ### END INIT INFO ################################################################################ -- 1.7.7 ++++++ shorewall-lite-4.5.1.1.tar.bz2 -> shorewall6-lite-4.5.2.2.tar.bz2 ++++++ ++++ 8170 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org