Changeset 45c2d26 in freewrt

Timestamp:

Jan 28, 2007, 9:26:26 PM (19 years ago)

Author:

Christian Gmeiner <austriancoder@…>

Children:

b79caca

Parents:

d979a96

Message:

version bump

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@1792 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/shorewall

Files:

• Makefile (modified) (1 diff)
• patches/01-whoami.patch (deleted)
• patches/02-config.patch (deleted)
• patches/04-autocreatelogfile.patch (deleted)
• patches/patch-install_sh (moved) (moved from package/shorewall/patches/03-installscript.patch ) (4 diffs)
• patches/patch-shorewall (added)
• patches/patch-shorewall_conf (added)

package/shorewall/Makefile

@@ -8 +8 @@
 
 PKG_NAME:=              shorewall
-PKG_VERSION:=           3.2.6
+PKG_VERSION:=           3.2.8
 PKG_RELEASE:=           1
-PKG_MD5SUM:=            4be5e3af5180252492dcaf48f699404f
+PKG_MD5SUM:=            d9e354b3f2670ceb021eea51419ff0e9
 PKG_INIT:=              45
 PKG_SOURCE_URL:=        http://www1.shorewall.net/pub/${PKG_NAME}/3.2/${PKG_NAME}-${PKG_VERSION}

package/shorewall/patches/patch-install_sh

@@ -1 @@
-diff -Nur shorewall-3.2.6_org/install.sh shorewall-3.2.6/install.sh
---- shorewall-3.2.6_org/install.sh      2006-11-12 16:50:09.000000000 +0100
-+++ shorewall-3.2.6/install.sh  2006-11-29 18:20:35.000000000 +0100
-@@ -180,23 +180,8 @@
+$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
+@@ -183,7 +183,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/
+ #
+ # Determine where to install the firewall script
+ #
+-DEBIAN=
  
- PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
- 
--#
--# Determine where to install the firewall script
--#
--DEBIAN=
--
  OWNERSHIP="-o $OWNER -g $GROUP"
  
--if [ -d /etc/apt -a -e /usr/bin/dpkg ]; then
+@@ -195,15 +194,6 @@ if [ -n "$PREFIX" ]; then
+ 
+        install -d $OWNERSHIP -m 755 ${PREFIX}/sbin
+        install -d $OWNERSHIP -m 755 ${PREFIX}${DEST}
+-elif [ -d /etc/apt -a -e /usr/bin/dpkg ]; then
 -    DEBIAN=yes
 -elif [ -f /etc/slackware-version ] ; then
@@ -22 +23 @@
 -      INIT="shorewall"
 -      ARCHLINUX=yes
--fi
- if [ -n "$PREFIX" ]; then
-        if [ `id -u` != 0 ] ; then
-            echo "Not setting file owner/group permissions, not running as root."
-@@ -239,14 +224,7 @@
+ fi
+ 
+ #
+@@ -238,14 +228,7 @@ echo "shorewall control program installe
  #
  # Install the Firewall Script
  #
 -if [ -n "$DEBIAN" ]; then
--    install_file_with_backup init.debian.sh /etc/init.d/shorewall 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
+-    install_file_with_backup init.debian.sh ${PREFIX}/etc/init.d/shorewall 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
 -elif [ -n "$ARCHLINUX" ]; then
 -    install_file_with_backup init.archlinux.sh ${PREFIX}${DEST}/$INIT 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
@@ -42 +42 @@
  echo  "Shorewall script installed in ${PREFIX}${DEST}/$INIT"
  
-@@ -274,10 +252,6 @@
+@@ -273,10 +256,6 @@ if [ ! -f ${PREFIX}/etc/shorewall/shorew
     echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf"
  fi
@@ -53 +53 @@
  # Install the zones file
  #
-@@ -676,43 +650,6 @@
+@@ -675,43 +654,6 @@ fi
  #
  install_file firewall ${PREFIX}/usr/share/shorewall/firewall 0555