Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package shorewall for openSUSE:Factory checked in at 2022-09-10 20:17:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shorewall (Old) and /work/SRC/openSUSE:Factory/.shorewall.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shorewall" Sat Sep 10 20:17:40 2022 rev:122 rq:1002413 version:5.2.8 Changes: -------- --- /work/SRC/openSUSE:Factory/shorewall/shorewall.changes 2020-11-11 20:48:23.199759362 +0100 +++ /work/SRC/openSUSE:Factory/.shorewall.new.2083/shorewall.changes 2022-09-10 20:18:03.660947712 +0200 @@ -1,0 +2,16 @@ +Sat Sep 3 12:27:13 UTC 2022 - Bruno Friedmann <[email protected]> + +- Add %dir %{_distconfdir} stop build failing on Leap + +------------------------------------------------------------------- +Thu Sep 1 14:22:19 UTC 2022 - Bruno Friedmann <[email protected]> + +- **Warning** this is the last patch revision to shorewall. + No migration to manage nft will happen upstream. + Be prepared to package removal, and migrate to firewalld. +- Add shorewall-fix-install-manpages.patch fix boo#1203006 +- Update spec copyright and macros +- Move /etc to /usr for Networkmanager and logrotate +- Update rpmlint check list + +------------------------------------------------------------------- New: ---- shorewall-fix-install-manpages.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shorewall.spec ++++++ --- /var/tmp/diff_new_pack.i2hyxG/_old 2022-09-10 20:18:04.324949418 +0200 +++ /var/tmp/diff_new_pack.i2hyxG/_new 2022-09-10 20:18:04.332949439 +0200 @@ -1,7 +1,7 @@ # # spec file for package shorewall # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif +%{!?_distconfdir: %global _distconfdir %{_prefix}%{_sysconfdir}} Name: shorewall Version: 5.2.8 Release: 0 @@ -47,6 +48,8 @@ Patch2: shorewall-fillup-install.patch # PATCH-FIX-OPENSUSE Shorewall-lite (6) use of fillup template Patch3: shorewall-lite-fillup-install.patch +# PATH-FIX-OPENSUSE invalid manpage boo#1203006 +Patch4: shorewall-fix-install-manpages.patch BuildRequires: bash >= 4 BuildRequires: perl-base BuildRequires: pkgconfig @@ -177,16 +180,18 @@ %setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 #PATCH-FIX-OPENSUSE geo_ip has no LE #We keep it with this dynamic form to avoid maintaining manual patch -find . \( -name shorewall*.conf -or -name shorewall*.conf.annotated \) -exec sed -i "s,GEOIPDIR=/usr/share/xt_geoip/LE,GEOIPDIR=/usr/share/xt_geoip,g" {} \; +find . \( -name shorewall*.conf -or -name shorewall*.conf.annotated \) -exec sed -i "s,GEOIPDIR=%{_datadir}/xt_geoip/LE,GEOIPDIR=%{_datadir}/xt_geoip,g" {} \; #PATCH-FIX-OPENSUSUSE for fillup pushd %{name}-init-%{version} %patch1 -p1 popd pushd %{name}-%{version} %patch2 -p1 +%patch4 -p1 popd pushd %{name}6-%{version} %patch2 -p1 +%patch4 -p1 popd pushd %{name}-lite-%{version} %patch3 -p1 @@ -245,13 +250,10 @@ if [ $i != shorewall-init ]; then - DESTDIR=%{buildroot} FILLUPDIR=%{_fillupdir} ./install.sh shorewallrc + BUILD=suse DESTDIR=%{buildroot} FILLUPDIR=%{_fillupdir} ./install.sh shorewallrc else install -d %buildroot/%{_sysconfdir}/NetworkManager/dispatcher.d - %if 0%{?suse_version} - BUILD=suse \ - %endif - DESTDIR=%{buildroot} FILLUPDIR=%{_fillupdir} ./install.sh shorewallrc + BUILD=suse DESTDIR=%{buildroot} FILLUPDIR=%{_fillupdir} ./install.sh shorewallrc if [ -f ${DESTDIR}%{_sysconfdir}/ppp ]; then for directory in ip-up.d ip-down.d ipv6-up.d ipv6-down.d; do @@ -259,6 +261,16 @@ cp -fp ${DESTDIR}${LIBEXEC}/shorewall-init/ifupdown ${DESTDIR}%{_sysconfdir}/ppp/$directory/shorewall done fi + # Move Networkmanager to _prefix + if [ -d "%buildroot/%{_sysconfdir}/NetworkManager/dispatcher.d" ]; then + install -d "%buildroot/%{_prefix}/lib/NetworkManager/" + mv -v "%buildroot/%{_sysconfdir}/NetworkManager/dispatcher.d" "%buildroot/%{_prefix}/lib/NetworkManager/dispatcher.d" + fi + # Move logrotate.d files to _prefix + if [ -d "%{buildroot}%{_sysconfdir}/logrotate.d" ]; then + install -d "%{buildroot}%{_distconfdir}" + mv -v "%{buildroot}%{_sysconfdir}/logrotate.d" "%{buildroot}%{_distconfdir}/logrotate.d" + fi fi popd done @@ -275,6 +287,7 @@ # Since 5.12 we need to remove them again rm -f %{buildroot}/%{_sysconfdir}/sysconfig/%{name}* +# Move %pre %service_add_pre shorewall.service %if %conf_need_update @@ -391,7 +404,9 @@ %dir %{_datadir}/%{name}/deprecated %dir %{_datadir}/%{name}/Shorewall %attr(0700,root,root) %dir %{_localstatedir}/lib/%{name} -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%dir %{_distconfdir} +%dir %{_distconfdir}/logrotate.d/ +%{_distconfdir}/logrotate.d/%{name} %{_datadir}/%{name}/version %{_datadir}/%{name}/actions.std %{_datadir}/%{name}/action.* @@ -422,7 +437,9 @@ %dir %{_datadir}/%{name}-lite %dir %{_libexecdir}/%{name}-lite %attr(0700,root,root) %dir %{_localstatedir}/lib/%{name}-lite -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-lite +%dir %{_distconfdir} +%dir %{_distconfdir}/logrotate.d/ +%{_distconfdir}/logrotate.d/%{name}-lite %{_datadir}/%{name}-lite/version %{_datadir}/%{name}-lite/configpath %attr(- ,root,root) %{_datadir}/%{name}-lite/functions @@ -447,7 +464,9 @@ %dir %{_datadir}/%{name}6/configfiles %dir %{_datadir}/%{name}6/deprecated %attr(0700,root,root) %dir %{_localstatedir}/lib/%{name}6 -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}6 +%dir %{_distconfdir} +%dir %{_distconfdir}/logrotate.d/ +%{_distconfdir}/logrotate.d/%{name}6 %{_datadir}/%{name}6/version %{_datadir}/%{name}6/actions.std %{_datadir}/%{name}6/action.* @@ -475,7 +494,9 @@ %dir %{_datadir}/%{name}6-lite %dir %{_libexecdir}/%{name}6-lite %attr(0700,root,root) %dir %{_localstatedir}/lib/%{name}6-lite -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}6-lite +%dir %{_distconfdir} +%dir %{_distconfdir}/logrotate.d/ +%{_distconfdir}/logrotate.d/%{name}6-lite %{_datadir}/%{name}6-lite/version %{_datadir}/%{name}6-lite/configpath %attr(- ,root,root) %{_datadir}/%{name}6-lite/functions @@ -492,15 +513,17 @@ %attr(0755,root,root) %{_sbindir}/shorewall-init %dir %{_datadir}/%{name}-init %dir %{_libexecdir}/%{name}-init -%dir %attr(0755,root,root) %{_sysconfdir}/NetworkManager -%dir %attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d -%attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/01-%{name} +%dir %attr(0755,root,root) %{_prefix}/lib//NetworkManager +%dir %attr(0755,root,root) %{_prefix}/lib//NetworkManager/dispatcher.d +%attr(0755,root,root) %{_prefix}/lib/NetworkManager/dispatcher.d/01-%{name} %{_datadir}/%{name}-init/version %attr(0544,root,root) %{_libexecdir}/%{name}-init/ifupdown %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* -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-init +%dir %{_distconfdir} +%dir %{_distconfdir}/logrotate.d/ +%{_distconfdir}/logrotate.d/%{name}-init %attr(644,root,root) %{_unitdir}/%{name}-init.service %files core ++++++ shorewall-5.2.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.i2hyxG/_old 2022-09-10 20:18:04.400949614 +0200 +++ /var/tmp/diff_new_pack.i2hyxG/_new 2022-09-10 20:18:04.404949624 +0200 @@ -1,12 +1,4 @@ addFilter("files-duplicate /usr/share/shorewall6/configfiles/scfilter") -addFilter("script-without-shebang /etc/shorewall-lite/shorewall-lite.conf") -addFilter("script-without-shebang /etc/shorewall6-lite/shorewall6-lite.conf") -addFilter("non-executable-script /usr/share/shorewall/prog.header") -addFilter("non-executable-script /usr/share/shorewall/prog.header6") -addFilter("non-executable-script /usr/share/shorewall/configfiles/scfilter") -addFilter("non-executable-script /etc/shorewall/scfilter") -addFilter("non-executable-script /usr/share/shorewall6/configfiles/scfilter") -addFilter("non-executable-script /etc/shorewall6/scfilter") addFilter("perl5-naming-policy-not-applied") addFilter("systemd-service-without-service_del_postun shorewall-init.service") ++++++ shorewall-fix-install-manpages.patch ++++++ diff -rup a/install.sh b/install.sh --- a/install.sh 2020-09-25 00:02:15.000000000 +0200 +++ b/install.sh 2022-09-01 14:15:05.029452644 +0200 @@ -1183,10 +1183,10 @@ if [ ${PRODUCT} = shorewall6 ]; then shorewall-accounting.5 shorewall-ipsets.5 shorewall-providers.5 shorewall-tcclasses.5 \ shorewall-actions.5 shorewall-maclist.5 shorewall-tcdevices.5 \ shorewall-mangle.5 shorewall-proxyndp.5 shorewall-tcfilters.5 \ - shorewall-blacklist.5 shorewall-masq.5 shorewall-routes.5 shorewall-tcinterfaces.5 \ - shorewall-blrules.5 shorewall-modules.5 shorewall-routestopped.5 shorewall-tcpri.5 \ - shorewall-conntrack.5 shorewall-nat.5 shorewall-rtrules.5 shorewall-tcrules.5 \ - shorewall-nesting.5 shorewall-rules.5 shorewall-tos.5 \ + shorewall-routes.5 shorewall-tcinterfaces.5 \ + shorewall-blrules.5 shorewall-modules.5 shorewall-tcpri.5 \ + shorewall-conntrack.5 shorewall-nat.5 shorewall-rtrules.5 \ + shorewall-nesting.5 shorewall-rules.5 \ shorewall-exclusion.5 shorewall-netmap.5 shorewall-secmarks.5 shorewall-tunnels.5 \ shorewall-hosts.5 shorewall-params.5 shorewall-snat.5 shorewall-vardir.5 \ shorewall-interfaces.5 shorewall-policy.5 shorewall-stoppedrules.5 shorewall-zones.5
