From ed6046a1e9f03c35297399d65a7cfa24224cf1a1 Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 14 Jun 2004 16:16:12 +0000 Subject: [PATCH] Add %attr spec for /etc/init.d/shorewall git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1398 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/changelog.txt | 4 +++- Shorewall2/releasenotes.txt | 5 ++++- Shorewall2/shorewall.conf | 2 ++ Shorewall2/shorewall.spec | 4 +++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 0f439402d..839cfbd87 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -26,4 +26,6 @@ Changes since 2.0.2 12) Add 'key' to sample tunnel file. -13) Allow multiple saved configurations. \ No newline at end of file +13) Allow multiple saved configurations. + +14) Add %attr spec to /etc/init.d/shorewall in the .spec file. diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index 0d339991a..1f801e12f 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -1,4 +1,4 @@ -Shorewall 2.0.3 Beta 1 +Shorewall 2.0.3 Beta 2 ---------------------------------------------------------------------- Problems Corrected since 2.0.2 @@ -29,6 +29,9 @@ Problems Corrected since 2.0.2 8) The 'newnotsyn' option in /etc/shorewall/hosts has no effect. +9) The file /etc/init.d/shorewall now gets proper ownership when the + RPM is built by a non-root user. + ----------------------------------------------------------------------- Issues when migrating from Shorewall 2.0.2 to Shorewall 2.0.3: diff --git a/Shorewall2/shorewall.conf b/Shorewall2/shorewall.conf index 9dd047999..7961726f8 100755 --- a/Shorewall2/shorewall.conf +++ b/Shorewall2/shorewall.conf @@ -266,6 +266,8 @@ CONFIG_PATH=/etc/shorewall:/usr/share/shorewall # # shorewall -f start # shorewall restore +# shorewall save +# shorewall forget # Failure of shorewall start or shorewall restart # # The value of the option must be the name of an executable file in the diff --git a/Shorewall2/shorewall.spec b/Shorewall2/shorewall.spec index e6403d2a7..6913002dd 100644 --- a/Shorewall2/shorewall.spec +++ b/Shorewall2/shorewall.spec @@ -68,7 +68,7 @@ if [ $1 = 0 ]; then fi %files -/etc/init.d/shorewall +%attr(0544,root,root) /etc/init.d/shorewall %attr(0700,root,root) %dir /etc/shorewall %attr(0700,root,root) %dir /usr/share/shorewall %attr(0700,root,root) %dir /var/lib/shorewall @@ -141,6 +141,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %changelog +* Mon Jun 14 2004 Tom Eastep tom@shorewall.net +- Added %attr spec for /etc/init.d/shorewall * Sat May 15 2004 Tom Eastep tom@shorewall.net - Updated for 2.0.2a-1 * Thu May 13 2004 Tom Eastep tom@shorewall.net