From 4f46ce9f6f073d72f9088842a98d07d7ebedde31 Mon Sep 17 00:00:00 2001 From: teastep Date: Thu, 10 Mar 2005 16:24:57 +0000 Subject: [PATCH] Fix install.sh handling of action.\* files git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1992 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- STABLE2/changelog.txt | 2 ++ STABLE2/install.sh | 10 +++------- STABLE2/releasenotes.txt | 3 +++ Shorewall2/changelog.txt | 2 ++ Shorewall2/install.sh | 10 +++------- Shorewall2/releasenotes.txt | 3 +++ 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt index 7a78aa456..11663d81f 100644 --- a/STABLE2/changelog.txt +++ b/STABLE2/changelog.txt @@ -19,6 +19,8 @@ Changes in 2.2.2 8) Correct port numbers in action.AllowPCA. +9) Fix installer's handling of action.* files. + Changes in 2.2.1 1) Add examples to the zones and policy files. diff --git a/STABLE2/install.sh b/STABLE2/install.sh index 3ed86d1c7..36e6d36fe 100755 --- a/STABLE2/install.sh +++ b/STABLE2/install.sh @@ -514,13 +514,9 @@ fi # Install the Action files # for f in action.* ; do - if [ -f ${PREFIX}/usr/share/shorewall/$f ]; then - backup_file /usr/share/shorewall/$f - else - run_install -o $OWNER -g $GROUP -m 0600 $f ${PREFIX}/usr/share/shorewall/$f - echo - echo "Action ${f#*.} file installed as ${PREFIX}/usr/share/shorewall/$f" - fi + install_file_with_backup $f ${PREFIX}/usr/share/shorewall/$f 0600 + echo + echo "Action ${f#*.} file installed as ${PREFIX}/usr/share/shorewall/$f" done # # Backup the version file diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt index d7b266b5b..09600e120 100644 --- a/STABLE2/releasenotes.txt +++ b/STABLE2/releasenotes.txt @@ -17,6 +17,9 @@ Problems corrected in version 2.2.2 4) The port numbers for UDP and TCP were previously reversed in the /usr/share/shorewall/action.AllowPCA file. +5) Previously, the 'install.sh' script did not update the + /usr/share/shorewall/action.* files. + ----------------------------------------------------------------------- New Features in version 2.2.2 diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 7a78aa456..11663d81f 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -19,6 +19,8 @@ Changes in 2.2.2 8) Correct port numbers in action.AllowPCA. +9) Fix installer's handling of action.* files. + Changes in 2.2.1 1) Add examples to the zones and policy files. diff --git a/Shorewall2/install.sh b/Shorewall2/install.sh index 3ed86d1c7..36e6d36fe 100755 --- a/Shorewall2/install.sh +++ b/Shorewall2/install.sh @@ -514,13 +514,9 @@ fi # Install the Action files # for f in action.* ; do - if [ -f ${PREFIX}/usr/share/shorewall/$f ]; then - backup_file /usr/share/shorewall/$f - else - run_install -o $OWNER -g $GROUP -m 0600 $f ${PREFIX}/usr/share/shorewall/$f - echo - echo "Action ${f#*.} file installed as ${PREFIX}/usr/share/shorewall/$f" - fi + install_file_with_backup $f ${PREFIX}/usr/share/shorewall/$f 0600 + echo + echo "Action ${f#*.} file installed as ${PREFIX}/usr/share/shorewall/$f" done # # Backup the version file diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index d7b266b5b..09600e120 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -17,6 +17,9 @@ Problems corrected in version 2.2.2 4) The port numbers for UDP and TCP were previously reversed in the /usr/share/shorewall/action.AllowPCA file. +5) Previously, the 'install.sh' script did not update the + /usr/share/shorewall/action.* files. + ----------------------------------------------------------------------- New Features in version 2.2.2