Changeset 19191


Ignore:
Timestamp:
2010-01-17T18:33:30+01:00 (8 years ago)
Author:
jow
Message:

[PATCH] Shorewall-lite and shorewall6-lite upgraded to 4.4
Upgrades shorewall to 4.4 and removes some packages useful only to shorewall 3.
Signed-off-by: Matthew King <matthew.king@…>

Location:
packages
Files:
1 added
3 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • packages/ipv6/shorewall6-lite/Makefile

    r18735 r19191  
    99 
    1010PKG_NAME:=shorewall6-lite 
    11 PKG_VERSION:=4.2.11.2 
    12 PKG_VERSION_DIR:=4.2.11 
     11PKG_VERSION:=4.4.5.4 
     12PKG_DIRECTORY:=4.4.5 
    1313PKG_RELEASE:=1 
    1414 
    15 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/ \ 
    16         http://www1.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/ \ 
    17         http://slovakia.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/ \ 
    18         http://shorewall.de/pub/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/ \ 
    19         http://www.shorewall.com.au/4.2/shorewall-$(PKG_VERSION_DIR)/ \ 
    20         http://shorewall.infohiiway.com/pub/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/ \ 
    21         http://www.shorewall.com.ar/pub/shorewall/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/ 
     15PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     16        http://www1.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     17        http://slovakia.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     18        http://shorewall.de/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     19        http://www.shorewall.com.au/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     20        http://shorewall.infohiiway.com/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     21        http://www.shorewall.com.ar/pub/shorewall/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ 
    2222PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    23 PKG_MD5SUM:=ade665881a4bb0b5592276e8d90c4681 
     23PKG_MD5SUM:=498f622be657df38beec256876adabb6 
    2424 
    2525include $(INCLUDE_DIR)/package.mk 
  • packages/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch

    r18735 r19191  
    55     [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] 
    66  
    7 -    [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter 
    8 +    [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r) 
     7-    [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched 
     8+    [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched:/lib/modules/$(uname -r) 
    99     MODULES=$(lsmod | cut -d ' ' -f1) 
    1010  
     
    1414  
    1515     [ -z "$MODULESDIR" ] && \ 
    16 -       MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter 
    17 +       MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r) 
     16-       MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched 
     17+       MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched:/lib/modules/$(uname -r) 
    1818  
    1919     for directory in $(split $MODULESDIR); do 
  • packages/ipv6/shorewall6-lite/patches/120-LOGFILE.patch

    r18735 r19191  
    1 --- a/shorewall6-lite   2009-12-05 22:35:20.000000000 -0500 
    2 +++ b/shorewall6-lite   2009-12-05 22:35:27.000000000 -0500 
    3 @@ -95,7 +95,7 @@ 
    4   
    5      if ( ps ax 2> /dev/null | grep -v grep |  qt grep 'syslogd.*-C' ) ; then 
    6         LOGREAD="logread | tac" 
    7 -    elif [ -f $LOGFILE ]; then 
    8 +    elif [ -r $LOGFILE ]; then 
    9         LOGREAD="tac $LOGFILE" 
    10      else 
    11         echo "LOGFILE ($LOGFILE) does not exist!" >&2 
    121--- a/shorewall6-lite.conf      2009-12-05 22:37:43.000000000 -0500 
    132+++ b/shorewall6-lite.conf      2009-12-05 22:37:51.000000000 -0500 
    14 @@ -46,4 +46,6 @@ 
     3@@ -28,7 +28,7 @@ 
     4 #                             L O G G I N G 
     5 ############################################################################### 
    156  
    16  RESTOREFILE= 
     7-LOGFILE= 
     8+LOGFILE=/dev/null 
    179  
    18 +LOGFILE=/dev/null 
    19 + 
    20  #LAST LINE -- DO NOT REMOVE 
     10 LOGFORMAT= 
     11  
  • packages/ipv6/shorewall6-lite/patches/130-portability.patch

    r18736 r19191  
    11--- a/install.sh 
    22+++ b/install.sh 
    3 @@ -337,13 +337,15 @@ cd manpages 
     3@@ -294,13 +294,15 @@ cd manpages 
    44  
    55 for f in *.5; do 
  • packages/net/shorewall-lite/Makefile

    r18737 r19191  
    99 
    1010PKG_NAME:=shorewall-lite 
    11 PKG_VERSION:=4.2.11 
     11PKG_VERSION:=4.4.5.4 
     12PKG_DIRECTORY:=4.4.5 
    1213PKG_RELEASE:=1 
    1314 
    14 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/ \ 
    15         http://www1.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/ \ 
    16         http://slovakia.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/ \ 
    17         http://shorewall.de/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/ \ 
    18         http://www.shorewall.com.au/4.2/shorewall-$(PKG_VERSION)/ \ 
    19         http://shorewall.infohiiway.com/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/ \ 
    20         http://www.shorewall.com.ar/pub/shorewall/shorewall/4.2/shorewall-$(PKG_VERSION)/ 
     15PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     16        http://www1.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     17        http://slovakia.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     18        http://shorewall.de/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     19        http://www.shorewall.com.au/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     20        http://shorewall.infohiiway.com/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ 
     21        http://www.shorewall.com.ar/pub/shorewall/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ 
    2122PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    22 PKG_MD5SUM:=cb34824f076fdff6b7457d85e124ea74 
     23PKG_MD5SUM:=3e8fb21ccff0f2c7503d8c3bf8607dd7 
    2324 
    2425include $(INCLUDE_DIR)/package.mk 
  • packages/net/shorewall-lite/patches/110-MODULESDIR.patch

    r18737 r19191  
    11--- a/lib.base 
    22+++ b/lib.base 
    3 @@ -267,7 +267,7 @@ reload_kernel_modules() { 
     3@@ -220,7 +220,7 @@ reload_kernel_modules() { 
    44  
    55     [ -z "$MODULESDIR" ] && \ 
    66        uname=$(uname -r) && \ 
    7 -       MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset 
    8 +       MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname 
     7-       MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset 
     8+       MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname 
    99  
    1010     MODULES=$(lsmod | cut -d ' ' -f1) 
    1111  
    12 @@ -306,7 +306,7 @@ load_kernel_modules() # $1 = Yes, if we  
     12@@ -259,7 +259,7 @@ load_kernel_modules() # $1 = Yes, if we 
    1313  
    1414     [ -z "$MODULESDIR" ] && \ 
    1515        uname=$(uname -r) && \ 
    16 -       MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset 
    17 +       MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname 
     16-       MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset 
     17+       MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname 
    1818  
    1919     for directory in $(split $MODULESDIR); do 
  • packages/net/shorewall-lite/patches/120-LOGFILE.patch

    r18742 r19191  
    1 --- a/shorewall-lite    2009-12-05 22:35:20.000000000 -0500 
    2 +++ b/shorewall-lite    2009-12-05 22:35:27.000000000 -0500 
    3 @@ -95,7 +95,7 @@ 
    4   
    5      if ( ps ax 2> /dev/null | grep -v grep |  qt grep 'syslogd.*-C' ) ; then 
    6         LOGREAD="logread | tac" 
    7 -    elif [ -f $LOGFILE ]; then 
    8 +    elif [ -r $LOGFILE ]; then 
    9         LOGREAD="tac $LOGFILE" 
    10      else 
    11         echo "LOGFILE ($LOGFILE) does not exist!" >&2 
    121--- a/shorewall-lite.conf       2009-12-05 22:37:43.000000000 -0500 
    132+++ b/shorewall-lite.conf       2009-12-05 22:37:51.000000000 -0500 
    14 @@ -46,4 +46,6 @@ 
     3@@ -28,7 +28,7 @@ 
     4 #                             L O G G I N G 
     5 ############################################################################### 
    156  
    16  RESTOREFILE= 
     7-LOGFILE= 
     8+LOGFILE=/dev/null 
    179  
    18 +LOGFILE=/dev/null 
    19 + 
    20  #LAST LINE -- DO NOT REMOVE 
     10 LOGFORMAT= 
     11  
Note: See TracChangeset for help on using the changeset viewer.