Changeset 3a535ffc in freewrt


Ignore:
Timestamp:
Mar 16, 2007, 11:48:04 PM (19 years ago)
Author:
Christian Gmeiner <austriancoder@…>
Children:
604531a
Parents:
bea7fa3
Message:

update to shorewall 3.4.1

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

Location:
package/shorewall
Files:
8 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • package/shorewall/Makefile

    rbea7fa3 r3a535ffc  
    88
    99PKG_NAME:=              shorewall
    10 PKG_VERSION:=           3.2.9
     10PKG_VERSION:=           3.4.1
    1111PKG_RELEASE:=           1
    12 PKG_MD5SUM:=            2527f79eb57fb06dbd0432ba050e0221
     12PKG_MD5SUM:=            389a62170ad11c683ccaa6e2e071aff4
    1313PKG_INIT:=              45
    14 PKG_SOURCE_URL:=        http://www1.shorewall.net/pub/${PKG_NAME}/3.2/${PKG_NAME}-${PKG_VERSION}
     14PKG_SOURCE_URL:=        http://www1.shorewall.net/pub/${PKG_NAME}/3.4/${PKG_NAME}-${PKG_VERSION}
    1515PKG_SOURCE:=            ${PKG_NAME}-${PKG_VERSION}.tar.bz2
    1616
    … …  
    2121do-install:
    2222        PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n
     23
     24        # remove configfiles folder
     25        ${RM} -R ${WRKINST}/usr/share/shorewall/configfiles
     26
    2327ifeq ($(FWRT_PACKAGE_SHOREWALL_STRIPCONF),y)
    2428        ${BASH} ./files/downstrip ${WRKINST}/etc/shorewall
    2529endif
     30
    2631ifeq ($(FWRT_PACKAGE_SHOREWALL_STRIPSHARED),y)
    2732        ${BASH} ./files/downstrip ${WRKINST}/usr/share/shorewall
    … …  
    2934        gzip -9 ${WRKINST}/usr/share/shorewall/*.template
    3035endif
     36
     37post-install:
    3138        ${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/init.d
    3239        ${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/shorewall
    3340        ${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/share/shorewall
    3441        ${INSTALL_DIR} ${IDIR_SHOREWALL}/sbin
     42
    3543        ${INSTALL_BIN} ./files/shorewall.init ${IDIR_SHOREWALL}/etc/init.d/S${PKG_INIT}${PKG_NAME}
     44
    3645        ${INSTALL_DATA} ${WRKINST}/etc/shorewall/* ${IDIR_SHOREWALL}/etc/shorewall/
    37         ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/Limit ${IDIR_SHOREWALL}/usr/share/shorewall
    3846        ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/actions.std ${IDIR_SHOREWALL}/usr/share/shorewall
    3947        ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/configpath ${IDIR_SHOREWALL}/usr/share/shorewall
    … …  
    4452        ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/macro.* ${IDIR_SHOREWALL}/usr/share/shorewall
    4553        ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/prog.* ${IDIR_SHOREWALL}/usr/share/shorewall
     54        ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/lib.* ${IDIR_SHOREWALL}/usr/share/shorewall
     55
    4656        ${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/compiler ${IDIR_SHOREWALL}/usr/share/shorewall
    4757        ${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/firewall ${IDIR_SHOREWALL}/usr/share/shorewall
    4858        ${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/functions ${IDIR_SHOREWALL}/usr/share/shorewall
    49         ${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/help ${IDIR_SHOREWALL}/usr/share/shorewall
     59        ${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/wait4ifup ${IDIR_SHOREWALL}/usr/share/shorewall
    5060        ${INSTALL_BIN} ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/sbin
    5161

  • package/shorewall/files/shorewall.init

    rbea7fa3 r3a535ffc  
    99        ;;
    1010start)
     11        touch /var/log/message 
     12        mkdir -p /var/lock/subsys
    1113        /sbin/shorewall -f start 1>/dev/null
    1214        ;;

  • package/shorewall/patches/patch-install_sh

    rbea7fa3 r3a535ffc  
    11$FreeWRT$
    2 --- shorewall-3.2.8.orig/install.sh     2007-01-17 00:44:59.000000000 +0100
    3 +++ shorewall-3.2.8/install.sh  2007-02-13 00:06:58.000000000 +0100
     2--- shorewall-3.4.1.orig/install.sh     2007-03-15 17:05:58.000000000 +0100
     3+++ shorewall-3.4.1/install.sh  2007-03-16 23:15:01.000000000 +0100
    44@@ -183,7 +183,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/
    55 #
    … …  
    2626 
    2727 #
    28 @@ -225,27 +215,20 @@ if [ -d ${PREFIX}/etc/shorewall ]; then
    29      if [ -z "$NOBACKUP" ]; then
    30         backup_directory ${PREFIX}/etc/shorewall
    31         backup_directory ${PREFIX}/usr/share/shorewall
    32 -       backup_directory ${PREFIX}/var/lib/shorewall
    33 +       backup_directory ${PREFIX}/usr/share/shorewall/runtime
    34      fi
    35  else
    36      first_install="Yes"
    37  fi
    38  
    39 -install_file_with_backup shorewall ${PREFIX}/sbin/shorewall 0555 ${PREFIX}/var/lib/shorewall-${VERSION}.bkout
    40 +install_file_with_backup shorewall ${PREFIX}/sbin/shorewall 0555 ${PREFIX}/usr/share/shorewall/runtime-${VERSION}.bkout
    41  
    42  echo "shorewall control program installed in ${PREFIX}/sbin/shorewall"
    43  
     28@@ -234,14 +224,7 @@ echo "shorewall control program installe
    4429 #
    4530 # Install the Firewall Script
    4631 #
    4732-if [ -n "$DEBIAN" ]; then
    48 -    install_file_with_backup init.debian.sh ${PREFIX}/etc/init.d/shorewall 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
     33-    install_file_with_backup init.debian.sh /etc/init.d/shorewall 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
    4934-elif [ -n "$ARCHLINUX" ]; then
    5035-    install_file_with_backup init.archlinux.sh ${PREFIX}${DEST}/$INIT 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
    … …  
    5742 echo  "Shorewall script installed in ${PREFIX}${DEST}/$INIT"
    5843 
    59 @@ -255,7 +238,7 @@ echo  "Shorewall script installed in ${P
    60  mkdir -p ${PREFIX}/etc/shorewall
    61  mkdir -p ${PREFIX}/usr/share/shorewall
    62  mkdir -p ${PREFIX}/usr/share/shorewall/configfiles
    63 -mkdir -p ${PREFIX}/var/lib/shorewall
    64 +mkdir -p ${PREFIX}/usr/share/shorewall/runtime
    65  
    66  chmod 755 ${PREFIX}/etc/shorewall
    67  chmod 755 ${PREFIX}/usr/share/shorewall
    68 @@ -273,10 +256,6 @@ if [ ! -f ${PREFIX}/etc/shorewall/shorew
     44@@ -268,10 +251,6 @@ if [ ! -f ${PREFIX}/etc/shorewall/shorew
    6945    echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf"
    7046 fi
    … …  
    7753 # Install the zones file
    7854 #
    79 @@ -675,43 +654,6 @@ fi
     55@@ -674,71 +653,10 @@ if [ -z "$PREFIX" ]; then
     56 fi
     57 
     58 #
     59-# Install the Man Pages
     60-#
     61-
     62-rm -f *.gz
     63-
     64-cd manpages
     65-
     66-for f in *.5; do
     67-    gzip $f
     68-    run_install -D  -m 0444 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
     69-    echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
     70-done
     71-
     72-for f in *.8; do
     73-    gzip $f
     74-    run_install -D  -m 0444 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
     75-    echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
     76-done
     77-
     78-cd ..
     79-
     80-echo "Man Pages Installed"
     81-
     82-#
     83 # Install the firewall script
    8084 #
    8185 install_file firewall ${PREFIX}/usr/share/shorewall/firewall 0555

  • package/shorewall/patches/patch-shorewall

    rbea7fa3 r3a535ffc  
    11$FreeWRT$
    2 --- shorewall-3.2.9.orig/shorewall      2007-01-24 20:12:15.000000000 +0100
    3 +++ shorewall-3.2.9/shorewall   2007-03-01 20:51:47.000000000 +0100
    4 @@ -202,13 +202,17 @@ get_config() {
     2--- shorewall-3.4.1.orig/shorewall      2007-02-21 03:16:05.000000000 +0100
     3+++ shorewall-3.4.1/shorewall   2007-03-16 23:36:59.000000000 +0100
     4@@ -212,7 +212,6 @@ get_config() {
    55 
    6         [ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
     6     export VERBOSE
    77 
    8 +       LOGFILEPATH=${LOGFILE%/*}
    9 +       if [ ! -f $LOGFILEPATH ]; then
    10 +               mkdir -p $LOGFILEPATH
    11 +       fi
    12 +
    13         if ( ps ax 2> /dev/null | grep -v grep |  qt grep 'syslogd.*-C' ) ; then
    14             LOGREAD="logread"
    15         elif [ -f $LOGFILE ]; then
    16             LOGREAD="cat $LOGFILE"
    17         else
    18 -           echo "LOGFILE ($LOGFILE) does not exist!" >&2
    19 -           exit 2
    20 +               touch $LOGFILE
    21         fi
     8-    [ -n "${HOSTNAME:=$(hostname)}" ]
    229 
    23         if [ -n "$IPTABLES" ]; then
    24 @@ -537,8 +541,8 @@ start_command() {
    25             ${VARDIR}/.start $debugging start
    26             rc=$?
    27         else
    28 -           logger -p kern.err "ERROR:Shorewall start failed"
    29             rc=$?
    30 +           logger -p kern.err "ERROR:Shorewall start failed"
    31         fi
    32  
    33         [ -n "$nolock" ] || mutex_off
    34 @@ -852,8 +856,8 @@ restart_command() {
    35         $SHOREWALL_SHELL ${VARDIR}/.restart $debugging restart
    36         rc=$?
    37      else
    38 -       logger -p kern.err "ERROR:Shorewall restart failed"
    39         rc=$?
    40 +       logger -p kern.err "ERROR:Shorewall restart failed"
    41      fi
    42  
    43      [ -n "$nolock" ] || mutex_off
    44 @@ -919,7 +923,11 @@ refresh_command() {
    45         $SHOREWALL_SHELL ${VARDIR}/.refresh $debugging refresh
    46      fi
    47  
    48 +    rc=$?
    49 +
    50      [ -n "$nolock" ] || mutex_off
    51 +
    52 +    return $rc
    5310 }
    5411 
    55  #
    56 @@ -1815,7 +1823,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/
    57  MUTEX_TIMEOUT=
     12@@ -1269,7 +1268,7 @@ else
     13     exit 1
     14 fi
    5815 
    59  SHAREDIR=/usr/share/shorewall
    60 -VARDIR=/var/lib/shorewall
    61 +VARDIR=/usr/share/shorewall/runtime
    62  CONFDIR=/etc/shorewall
    63  export PRODUCT="Shorewall"
     16-banner="Shorewall-$version Status at $HOSTNAME -"
     17+banner="Shorewall-$version Status at FreeWRT -"
    6418 
     19 case $(echo -e) in
     20     -e*)
     21@@ -1335,7 +1334,7 @@ case "$COMMAND" in
     22        ;;
     23     status)
     24        [ $# -eq 1 ] || usage 1
     25-       echo "Shorewall-$version Status at $HOSTNAME - $(date)"
     26+       echo "Shorewall-$version Status at FreeWRT - $(date)"
     27        echo
     28        if shorewall_is_started ; then
     29            echo "Shorewall is running"

  • package/shorewall/patches/patch-shorewall_conf

    rbea7fa3 r3a535ffc  
    11$FreeWRT$
    2 --- shorewall-3.2.8.orig/shorewall.conf 2006-10-13 20:03:18.000000000 +0200
    3 +++ shorewall-3.2.8/shorewall.conf      2007-02-13 00:07:50.000000000 +0100
    4 @@ -125,7 +125,7 @@ VERBOSITY=1
    5  #             http://www.shorewall.net/shorewall_logging.html
    6  #
     2--- shorewall-3.4.1.orig/shorewall.conf 2007-02-09 17:15:08.000000000 +0100
     3+++ shorewall-3.4.1/shorewall.conf      2007-03-16 23:16:28.000000000 +0100
     4@@ -64,7 +64,7 @@ SHOREWALL_SHELL=/bin/sh
    75 
    8 -LOGFILE=/var/log/messages
    9 +LOGFILE=/var/log/shorewall
     6 SUBSYSLOCK=/var/lock/subsys/shorewall
    107 
    11  #
    12  # LOG FORMAT
    13 @@ -329,7 +329,7 @@ SHOREWALL_SHELL=/bin/sh
    14  # use lock files, set this to "".
    15  #
     8-MODULESDIR=
     9+MODULESDIR=/lib/modules/`uname -r`/
    1610 
    17 -SUBSYSLOCK=/var/lock/subsys/shorewall
    18 +SUBSYSLOCK=/var/run/shorewall
     11 CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
    1912 
    20  #
    21  # KERNEL MODULE DIRECTORY
    22 @@ -370,7 +370,7 @@ CONFIG_PATH=/etc/shorewall:/usr/share/sh
    23  #      Failure of shorewall start or shorewall restart
    24  #
    25  # The value of the option must be the name of an executable file in the
    26 -# directory /var/lib/shorewall. If this option is not set or if it is
    27 +# directory /usr/share/shorewall/runtime. If this option is not set or if it is
    28  # set to the empty value (RESTOREFILE="") then RESTOREFILE=restore is
    29  # assumed.
    30  #
Note: See TracChangeset for help on using the changeset viewer.