[shorewall: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/shorewall
Jonathan G. Underwood
jgu at fedoraproject.org
Thu Jul 21 00:28:45 UTC 2011
commit 8e832a1ed3d8cdc2bb44cb60a70a048f367fc9dc
Merge: 57c9ea4 de894b2
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date: Thu Jul 21 01:28:02 2011 +0100
Merge branch 'master' of ssh://pkgs.fedoraproject.org/shorewall
Conflicts:
.gitignore
shorewall.spec
sources
.gitignore | 5 +++++
shorewall.spec | 7 +++++--
2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 8086f4a,4453352..6f47a0b
--- a/.gitignore
+++ b/.gitignore
@@@ -13,8 -13,8 +13,13 @@@ shorewall-lite-4.4.11.1.tar.bz
/shorewall6-lite-4.4.17.tar.bz2
/shorewall-init-4.4.17.tar.bz2
/shorewall-lite-4.4.17.tar.bz2
+ /shorewall-4.4.19.4.tar.bz2
+ /shorewall6-4.4.19.4.tar.bz2
+ /shorewall6-lite-4.4.19.4.tar.bz2
+ /shorewall-init-4.4.19.4.tar.bz2
+ /shorewall-lite-4.4.19.4.tar.bz2
+/shorewall-4.4.21.1.tar.bz2
+/shorewall6-4.4.21.1.tar.bz2
+/shorewall6-lite-4.4.21.1.tar.bz2
+/shorewall-lite-4.4.21.1.tar.bz2
+/shorewall-init-4.4.21.1.tar.bz2
diff --cc shorewall.spec
index 5c63396,802beb4..928aa05
--- a/shorewall.spec
+++ b/shorewall.spec
@@@ -1,4 -1,5 +1,4 @@@
- %global _baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{version}/
-%global mainver 4.4.19
+ %global _baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{mainver}/
# A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
# which is found at http://www.shorewall.net/Anatomy.html
@@@ -219,18 -213,61 +219,19 @@@ f
%config(noreplace) %{_sysconfdir}/shorewall/*
%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall
-%dir %{_datadir}/shorewall
-%attr(0755,root,root) %{_datadir}/shorewall/wait4ifup
-%attr(0755,root,root) %{_datadir}/shorewall/compiler.pl
-%attr(0755,root,root) %{_datadir}/shorewall/getparams
-%{_datadir}/shorewall/action.*
-%{_datadir}/shorewall/actions.std
-%{_datadir}/shorewall/configpath
-%{_datadir}/shorewall/macro.*
-%{_datadir}/shorewall/version
-%{_datadir}/shorewall/modules*
-%{_datadir}/shorewall/configfiles
-%{_datadir}/shorewall/functions
-%{_datadir}/shorewall/lib.*
-%{_datadir}/shorewall/Shorewall
-%{_datadir}/shorewall/prog.*
-%{_datadir}/shorewall/helpers
-%dir %{_localstatedir}/lib/shorewall
++<<<<<<< HEAD
+%{_libexecdir}/shorewall
+%{_datadir}/shorewall
-# Man files - can't use /man5/* here as shorewall-lite also has man5 pages
-%{_mandir}/man5/shorewall-tunnels.5.gz
-%{_mandir}/man5/shorewall-nat.5.gz
-%{_mandir}/man5/shorewall-proxyarp.5.gz
-%{_mandir}/man5/shorewall-vardir.5.gz
-%{_mandir}/man5/shorewall-accounting.5.gz
-%{_mandir}/man5/shorewall-policy.5.gz
-%{_mandir}/man5/shorewall-route_rules.5.gz
-%{_mandir}/man5/shorewall-providers.5.gz
-%{_mandir}/man5/shorewall-modules.5.gz
-%{_mandir}/man5/shorewall-tcrules.5.gz
-%{_mandir}/man5/shorewall-params.5.gz
-%{_mandir}/man5/shorewall-zones.5.gz
-%{_mandir}/man5/shorewall.conf.5.gz
-%{_mandir}/man5/shorewall-blacklist.5.gz
-%{_mandir}/man5/shorewall-tcclasses.5.gz
-%{_mandir}/man5/shorewall-routestopped.5.gz
-%{_mandir}/man5/shorewall-rules.5.gz
-%{_mandir}/man5/shorewall-actions.5.gz
-%{_mandir}/man5/shorewall-tos.5.gz
-%{_mandir}/man5/shorewall-ecn.5.gz
-%{_mandir}/man5/shorewall-nesting.5.gz
-%{_mandir}/man5/shorewall-exclusion.5.gz
-%{_mandir}/man5/shorewall-masq.5.gz
-%{_mandir}/man5/shorewall-hosts.5.gz
-%{_mandir}/man5/shorewall-tcdevices.5.gz
-%{_mandir}/man5/shorewall-tcfilters.5.gz
-%{_mandir}/man5/shorewall-netmap.5.gz
-%{_mandir}/man5/shorewall-tcinterfaces.5.gz
-%{_mandir}/man5/shorewall-tcpri.5.gz
-%{_mandir}/man5/shorewall-interfaces.5.gz
-%{_mandir}/man5/shorewall-maclist.5.gz
-%{_mandir}/man5/shorewall-notrack.5.gz
-%{_mandir}/man5/shorewall-ipsets.5.gz
-%{_mandir}/man5/shorewall-routes.5.gz
-%{_mandir}/man5/shorewall-secmarks.5.gz
-%{_mandir}/man8/shorewall.8.gz
+%{_mandir}/man5/shorewall*
+%exclude %{_mandir}/man5/shorewall6*
+%exclude %{_mandir}/man5/shorewall-lite*
+
+%{_mandir}/man8/shorewall*
+%exclude %{_mandir}/man8/shorewall6*
+%exclude %{_mandir}/man8/shorewall-lite*
+
+%dir %{_localstatedir}/lib/shorewall
%files lite
%defattr(0644,root,root,0755)
@@@ -243,15 -277,21 +244,14 @@@
%config(noreplace) %{_sysconfdir}/shorewall-lite/shorewall-lite.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall-lite
%{_sysconfdir}/shorewall-lite/Makefile
-%attr(0755,root,root) %{_initrddir}/shorewall-lite
-%dir %{_localstatedir}/lib/shorewall-lite
-
-%dir %{_datadir}/shorewall-lite
-%{_datadir}/shorewall-lite/version
-%{_datadir}/shorewall-lite/configpath
-%{_datadir}/shorewall-lite/functions
-%{_datadir}/shorewall-lite/helpers
-%{_datadir}/shorewall-lite/lib.*
-%{_datadir}/shorewall-lite/modules*
-%attr(0755,root,root) %{_datadir}/shorewall-lite/shorecap
-%attr(0755,root,root) %{_datadir}/shorewall-lite/wait4ifup
-%{_mandir}/man5/shorewall-lite.conf.5.gz
-%{_mandir}/man5/shorewall-lite-vardir.5.gz
-%{_mandir}/man8/shorewall-lite.8.gz
+%{_datadir}/shorewall-lite
+%{_libexecdir}/shorewall-lite
+
+%{_mandir}/man5/shorewall-lite*
+%{_mandir}/man8/shorewall-lite*
+
+%dir %{_localstatedir}/lib/shorewall-lite
%files -n shorewall6
%defattr(0644,root,root,0755)
@@@ -298,22 -374,18 +298,25 @@@
%files init
%defattr(0644,root,root,0755)
%doc shorewall-init-%{version}/{COPYING,changelog.txt,releasenotes.txt}
-%attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/01-shorewall
+
%attr(0755,root,root) %{_initrddir}/shorewall-init
+
+%attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/01-shorewall
%config(noreplace) %{_sysconfdir}/sysconfig/shorewall-init
+
%{_mandir}/man8/shorewall-init.8.*
-%dir %{_datadir}/shorewall-init
-%attr(0755,root,root) %{_datadir}/shorewall-init/ifupdown
-%{_datadir}/shorewall-init/version
+
+%{_datadir}/shorewall-init
+%{_libexecdir}/shorewall-init
%changelog
+* Thu Jul 21 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.21-1
+- Update to 4.4.21.1
+- Fix BZ 720713 (incorrect init file LSB headers)
+
+ * Wed May 25 2011 Orion Poplawski <orion at cora.nwra.com> - 4.4.19.4-1
+ - Update to 4.4.19.4
+
* Sat Mar 5 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.17-2
- Add executable permission to getparams
More information about the scm-commits
mailing list