Changeset d8db183 in freewrt


Ignore:
Timestamp:
Jul 17, 2007, 11:16:48 AM (18 years ago)
Author:
Christian Gmeiner <austriancoder@…>
Children:
96fe8da
Parents:
542f06c
Message:

update shorewall

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

Location:
package/shorewall
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • package/shorewall/Makefile

    r542f06c rd8db183  
    88
    99PKG_NAME:=              shorewall
    10 PKG_VERSION:=           3.4.2
    11 PKG_RELEASE:=           7
    12 PKG_MD5SUM:=            6fe1a8e4bf552ade7fdc327be94f09f4
     10PKG_VERSION:=           3.4.5
     11PKG_RELEASE:=           1
     12PKG_MD5SUM:=            cf1f94bb1564fa7fedb4184a18656d11
    1313MASTER_SITES:=          http://www1.shorewall.net/pub/${PKG_NAME}/3.4/${PKG_NAME}-${PKG_VERSION}/
    1414DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2

  • package/shorewall/patches/patch-install_sh

    r542f06c rd8db183  
    11$FreeWRT$
    2 --- shorewall-3.4.2.orig/install.sh     2007-04-02 01:33:26.000000000 +0200
    3 +++ shorewall-3.4.2/install.sh  2007-04-09 13:00:27.000000000 +0200
    4 @@ -183,8 +183,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/
    5  #
    6  # Determine where to install the firewall script
    7  #
     2--- shorewall-3.4.5.orig/install.sh     2007-07-13 16:32:57.000000000 +0000
     3+++ shorewall-3.4.5/install.sh  2007-07-17 11:01:54.000000000 +0000
     4@@ -180,31 +180,15 @@ done
     5 
     6 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
     7 
     8-#
     9-# Determine where to install the firewall script
     10-#
    811-DEBIAN=
    9 -
     12 
    1013 OWNERSHIP="-o $OWNER -g $GROUP"
    1114 
    12  if [ -n "$PREFIX" ]; then
    13 @@ -195,15 +193,6 @@ if [ -n "$PREFIX" ]; then
    14  
    15         install -d $OWNERSHIP -m 755 ${PREFIX}/sbin
    16         install -d $OWNERSHIP -m 755 ${PREFIX}${DEST}
     15-if [ -n "$PREFIX" ]; then
     16-       if [ `id -u` != 0 ] ; then
     17-           echo "Not setting file owner/group permissions, not running as root."
     18-           OWNERSHIP=""
     19-       fi
     20-
     21-       install -d $OWNERSHIP -m 755 ${PREFIX}/sbin
     22-       install -d $OWNERSHIP -m 755 ${PREFIX}${DEST}
    1723-elif [ -d /etc/apt -a -e /usr/bin/dpkg ]; then
    1824-    DEBIAN=yes
    … …  
    2430-      INIT="shorewall"
    2531-      ARCHLINUX=yes
     32+if [ `id -u` != 0 ] ; then
     33+    echo "Not setting file owner/group permissions, not running as root."
     34+    OWNERSHIP=""
    2635 fi
     36+install -d $OWNERSHIP -m 755 ${PREFIX}/sbin
     37+install -d $OWNERSHIP -m 755 ${PREFIX}${DEST}
    2738 
    2839 #
    29 @@ -234,14 +223,7 @@ echo "shorewall control program installe
     40 # Change to the directory containing this script
     41@@ -234,15 +218,7 @@ echo "shorewall control program installe
    3042 #
    3143 # Install the Firewall Script
    … …  
    3951-    install_file_with_backup init.sh ${PREFIX}${DEST}/$INIT 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
    4052-fi
     53-
    4154+install_file_with_backup init.sh ${PREFIX}${DEST}/$INIT 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
    42  
    4355 echo  "Shorewall script installed in ${PREFIX}${DEST}/$INIT"
    4456 
    45 @@ -268,10 +250,6 @@ if [ ! -f ${PREFIX}/etc/shorewall/shorew
     57 #
     58@@ -268,10 +244,6 @@ if [ ! -f ${PREFIX}/etc/shorewall/shorew
    4659    echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf"
    4760 fi
    … …  
    5467 # Install the zones file
    5568 #
    56 @@ -674,71 +652,10 @@ if [ -z "$PREFIX" ]; then
     69@@ -676,69 +648,10 @@ if [ -z "$PREFIX" ]; then
    5770 fi
    5871 
    … …  
    6376-cd manpages
    6477-
    65 -rm -f *.gz
    66 -
    6778-for f in *.5; do
    68 -    gzip $f
     79-    gzip -c $f > $f.gz
    6980-    run_install -D  -m 0444 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
    7081-    echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
    … …  
    7283-
    7384-for f in *.8; do
    74 -    gzip $f
     85-    gzip -c $f > $f.gz
    7586-    run_install -D  -m 0444 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
    7687-    echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"

  • package/shorewall/patches/patch-lib_base

    r542f06c rd8db183  
    11$FreeWRT$
    2 --- shorewall-3.4.2.orig/lib.base       2007-04-01 00:28:50.000000000 +0200
    3 +++ shorewall-3.4.2/lib.base    2007-04-19 17:58:28.000000000 +0200
    4 @@ -676,7 +676,7 @@ find_peer() {
     2--- shorewall-3.4.5.orig/lib.base       2007-06-17 21:36:04.000000000 +0000
     3+++ shorewall-3.4.5/lib.base    2007-07-17 11:04:30.000000000 +0000
     4@@ -692,7 +692,7 @@ find_peer() {
    55 #
    66 
    … …  
    1111            */*)
    1212                in_network ${1%/*} $addr && echo $(find_device $rest)
    13 @@ -697,14 +697,14 @@ find_rt_interface() {
     13@@ -713,14 +713,14 @@ find_rt_interface() {
    1414 
    1515 find_nexthop() # $1 = interface
    … …  
    2828     done
    2929 }
    30 @@ -1201,7 +1201,7 @@ detect_gateway() # $1 = interface
     30@@ -1236,7 +1236,7 @@ detect_gateway() # $1 = interface
    3131     #
    3232     # Maybe there's a default route through this gateway already

  • package/shorewall/patches/patch-lib_cli

    r542f06c rd8db183  
    11$FreeWRT$
    2 --- shorewall-3.4.2.orig/lib.cli        2007-03-18 03:57:30.000000000 +0100
    3 +++ shorewall-3.4.2/lib.cli     2007-04-19 17:58:43.000000000 +0200
    4 @@ -360,11 +360,11 @@ show_routing() {
     2--- shorewall-3.4.5.orig/lib.cli        2007-06-28 18:21:28.000000000 +0000
     3+++ shorewall-3.4.5/lib.cli     2007-07-17 11:05:58.000000000 +0000
     4@@ -370,11 +370,11 @@ show_routing() {
    55            echo ${rule##* }
    66        done | sort -u | while read table; do

  • package/shorewall/patches/patch-shorewall

    r542f06c rd8db183  
    11$FreeWRT$
    2 --- shorewall-3.4.2.orig/shorewall      2007-04-01 00:28:50.000000000 +0200
    3 +++ shorewall-3.4.2/shorewall   2007-04-09 13:02:13.000000000 +0200
    4 @@ -211,9 +211,6 @@ get_config() {
    5      VERBOSE=$(($VERBOSE_OFFSET + $VERBOSITY))
    6  
    7      export VERBOSE
    8 -
    9 -    [ -n "${HOSTNAME:=$(hostname)}" ]
    10 -
    11  }
    12  
    13  #
    14 @@ -1285,7 +1282,7 @@ else
     2--- shorewall-3.4.5.orig/shorewall      2007-07-02 15:38:48.000000000 +0000
     3+++ shorewall-3.4.5/shorewall   2007-07-17 11:07:25.000000000 +0000
     4@@ -1513,7 +1513,7 @@ else
    155     exit 1
    166 fi
    … …  
    2111 case $(echo -e) in
    2212     -e*)
    23 @@ -1351,7 +1348,7 @@ case "$COMMAND" in
    24         ;;
     13@@ -1590,7 +1590,7 @@ case "$COMMAND" in
    2514     status)
    2615        [ $# -eq 1 ] || usage 1
     16        get_config
    2717-       echo "Shorewall-$version Status at $HOSTNAME - $(date)"
    2818+       echo "Shorewall-$version Status at FreeWRT - $(date)"
    … …  
    3020        if shorewall_is_started ; then
    3121            echo "Shorewall is running"
     22@@ -1636,7 +1636,7 @@ case "$COMMAND" in
     23        ;;
     24     logwatch)
     25        get_config Yes Yes Yes
     26-       banner="Shorewall-$version Logwatch at $HOSTNAME -"
     27+       banner="Shorewall-$version Logwatch at FreeWRT -"
     28        logwatch_command $@
     29        ;;
     30     drop)

  • package/shorewall/patches/patch-shorewall_conf

    r542f06c rd8db183  
    11$FreeWRT$
    2 --- shorewall-3.4.2.orig/shorewall.conf 2007-04-01 00:28:50.000000000 +0200
    3 +++ shorewall-3.4.2/shorewall.conf      2007-04-09 13:01:21.000000000 +0200
     2--- shorewall-3.4.5.orig/shorewall.conf 2007-06-20 14:30:57.000000000 +0000
     3+++ shorewall-3.4.5/shorewall.conf      2007-07-17 11:08:12.000000000 +0000
    44@@ -71,7 +71,7 @@ SHOREWALL_SHELL=/bin/sh
    55 
Note: See TracChangeset for help on using the changeset viewer.