Changeset a0dec5f in freewrt

Timestamp:

Feb 13, 2007, 1:01:31 PM (19 years ago)

Author:

Ralph Paßgang <tha@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

aae7eb1

Parents:

a0a4b6a

Message:

• merging the last trunk changes to branch

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@1963 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/shorewall

Files:

• Makefile (modified) (1 diff)
• ipkg/shorewall.postinst (modified) (1 diff)
• ipkg/shorewall.prerm (added)
• patches/patch-Makefile (added)
• patches/patch-compiler (added)
• patches/patch-configpath (added)
• patches/patch-fallback_sh (added)
• patches/patch-firewall (added)
• patches/patch-functions (modified) (1 diff)
• patches/patch-install_sh (modified) (3 diffs)
• patches/patch-shorewall (modified) (2 diffs)
• patches/patch-shorewall_conf (modified) (2 diffs)
• patches/patch-shorewall_spec (added)
• patches/patch-uninstall_sh (added)

package/shorewall/Makefile

@@ -34 +34 @@
         install -d -m0755 ${IDIR_SHOREWALL}/etc/shorewall
         install -d -m0755 ${IDIR_SHOREWALL}/usr/share/shorewall
-        install -d -m0755 ${IDIR_SHOREWALL}/var/lib/shorewall
         install -d -m0755 ${IDIR_SHOREWALL}/sbin
         install -m0755 ./files/shorewall.init ${IDIR_SHOREWALL}/etc/init.d/S${PKG_INIT}${PKG_NAME}

package/shorewall/ipkg/shorewall.postinst

@@ -2 +2 @@
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf shorewall shorewall NO
+
+mkdir -p $IPKG_INSTROOT/usr/share/shorewall/runtime
+chmod 0700 $IPKG_INSTROOT/usr/share/shorewall/runtime

package/shorewall/patches/patch-functions

@@ -1 +1 @@
 $FreeWRT$
 --- shorewall-3.2.8.orig/functions      2007-01-09 16:59:41.000000000 +0100
-+++ shorewall-3.2.8/functions   2007-01-30 22:06:54.000000000 +0100
++++ shorewall-3.2.8/functions   2007-02-13 00:06:32.000000000 +0100
+@@ -23,7 +23,7 @@
+ 
+ LIBVERSION=30200
+ 
+-[ -n "${VARDIR:=/var/lib/shorewall}" ]
++[ -n "${VARDIR:=/usr/share/shorewall/runtime}" ]
+ [ -n "${SHAREDIR:=/usr/share/shorewall}" ]
+ [ -n "${CONFDIR:=/etc/shorewall}" ]
+ 
 @@ -2331,7 +2331,7 @@ get_routed_networks() # $1 = interface n
      local address

package/shorewall/patches/patch-install_sh

@@ -1 +1 @@
 $FreeWRT$
 --- shorewall-3.2.8.orig/install.sh     2007-01-17 00:44:59.000000000 +0100
-+++ shorewall-3.2.8/install.sh  2007-01-27 19:25:56.000000000 +0100
++++ shorewall-3.2.8/install.sh  2007-02-13 00:06:58.000000000 +0100
 @@ -183,7 +183,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/
  #
@@ -26 +26 @@
  
  #
-@@ -238,14 +228,7 @@ echo "shorewall control program installe
+@@ -225,27 +215,20 @@ if [ -d ${PREFIX}/etc/shorewall ]; then
+     if [ -z "$NOBACKUP" ]; then
+        backup_directory ${PREFIX}/etc/shorewall
+        backup_directory ${PREFIX}/usr/share/shorewall
+-       backup_directory ${PREFIX}/var/lib/shorewall
++       backup_directory ${PREFIX}/usr/share/shorewall/runtime
+     fi
+ else
+     first_install="Yes"
+ fi
+ 
+-install_file_with_backup shorewall ${PREFIX}/sbin/shorewall 0555 ${PREFIX}/var/lib/shorewall-${VERSION}.bkout
++install_file_with_backup shorewall ${PREFIX}/sbin/shorewall 0555 ${PREFIX}/usr/share/shorewall/runtime-${VERSION}.bkout
+ 
+ echo "shorewall control program installed in ${PREFIX}/sbin/shorewall"
+ 
  #
  # Install the Firewall Script
@@ -42 +57 @@
  echo  "Shorewall script installed in ${PREFIX}${DEST}/$INIT"
  
+@@ -255,7 +238,7 @@ echo  "Shorewall script installed in ${P
+ mkdir -p ${PREFIX}/etc/shorewall
+ mkdir -p ${PREFIX}/usr/share/shorewall
+ mkdir -p ${PREFIX}/usr/share/shorewall/configfiles
+-mkdir -p ${PREFIX}/var/lib/shorewall
++mkdir -p ${PREFIX}/usr/share/shorewall/runtime
+ 
+ chmod 755 ${PREFIX}/etc/shorewall
+ chmod 755 ${PREFIX}/usr/share/shorewall
 @@ -273,10 +256,6 @@ if [ ! -f ${PREFIX}/etc/shorewall/shorew
     echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf"

package/shorewall/patches/patch-shorewall

@@ -1 +1 @@
 $FreeWRT$
 --- shorewall-3.2.8.orig/shorewall      2006-12-12 18:40:34.000000000 +0100
-+++ shorewall-3.2.8/shorewall   2007-01-27 19:33:27.000000000 +0100
++++ shorewall-3.2.8/shorewall   2007-02-13 00:07:33.000000000 +0100
 @@ -202,13 +202,17 @@ get_config() {
  
@@ -22 +22 @@
  
         if [ -n "$IPTABLES" ]; then
+@@ -1804,7 +1808,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/
+ MUTEX_TIMEOUT=
+ 
+ SHAREDIR=/usr/share/shorewall
+-VARDIR=/var/lib/shorewall
++VARDIR=/usr/share/shorewall/runtime
+ CONFDIR=/etc/shorewall
+ export PRODUCT="Shorewall"
+ 

package/shorewall/patches/patch-shorewall_conf

@@ -1 +1 @@
 $FreeWRT$
 --- shorewall-3.2.8.orig/shorewall.conf 2006-10-13 20:03:18.000000000 +0200
-+++ shorewall-3.2.8/shorewall.conf      2007-01-27 19:24:08.000000000 +0100
++++ shorewall-3.2.8/shorewall.conf      2007-02-13 00:07:50.000000000 +0100
 @@ -125,7 +125,7 @@ VERBOSITY=1
  #             http://www.shorewall.net/shorewall_logging.html
@@ -11 +11 @@
  #
  # LOG FORMAT
-@@ -329,7 +329,7 @@
+@@ -329,7 +329,7 @@ SHOREWALL_SHELL=/bin/sh
  # use lock files, set this to "".
  #
-
+ 
 -SUBSYSLOCK=/var/lock/subsys/shorewall
 +SUBSYSLOCK=/var/run/shorewall
-
+ 
  #
  # KERNEL MODULE DIRECTORY
-
+@@ -370,7 +370,7 @@ CONFIG_PATH=/etc/shorewall:/usr/share/sh
+ #      Failure of shorewall start or shorewall restart
+ #
+ # The value of the option must be the name of an executable file in the
+-# directory /var/lib/shorewall. If this option is not set or if it is
++# directory /usr/share/shorewall/runtime. If this option is not set or if it is
+ # set to the empty value (RESTOREFILE="") then RESTOREFILE=restore is
+ # assumed.
+ #