summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/shorewall-common/Makefile71
-rw-r--r--package/shorewall-common/files/downstrip7
-rw-r--r--package/shorewall-common/files/shorewall-common.conffiles33
-rw-r--r--package/shorewall-common/files/shorewall-common.postinst5
-rw-r--r--package/shorewall-common/files/shorewall-common.prerm8
-rw-r--r--package/shorewall-common/files/shorewall.init35
-rw-r--r--package/shorewall-common/patches/patch-install_sh119
-rw-r--r--package/shorewall-common/patches/patch-shorewall_conf12
-rw-r--r--package/shorewall-shell/Makefile43
-rw-r--r--package/shorewall-shell/files/downstrip7
10 files changed, 0 insertions, 340 deletions
diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile
deleted file mode 100644
index 2c45fdd6c..000000000
--- a/package/shorewall-common/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${ADK_TOPDIR}/rules.mk
-
-PKG_NAME:= shorewall-common
-PKG_VERSION:= 4.0.7
-PKG_RELEASE:= 2
-PKG_HASH:= bd392afff2bd4fd0488401d41192c6205f4694faaa7231065fed62fa03fc814c
-PKG_DESCR:= high-level netfilter configuration tool
-PKG_SECTION:= net/firewall
-PKG_DEPENDS:= iptables
-PKG_URL:= http://www.shorewall.net
-PKG_SITES:= http://www1.shorewall.net/pub/shorewall/4.0/shorewall-${PKG_VERSION}/
-
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,SHOREWALL,shorewall,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:= manual
-BUILD_STYLE:= manual
-INSTALL_STYLE:= manual
-
-do-build:
- PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n
- # remove configfiles folder
- ${RM} -R ${WRKINST}/usr/share/shorewall/configfiles
-
-ifeq ($(ADK_PACKAGE_SHOREWALL_STRIPCONF),y)
- ${BASH} ./files/downstrip ${WRKINST}/etc/shorewall
-endif
-
-ifeq ($(ADK_PACKAGE_SHOREWALL_STRIPSHARED),y)
- ${BASH} ./files/downstrip ${WRKINST}/usr/share/shorewall
- ${BASH} ./files/downstrip ${WRKINST}/sbin
- gzip -9 ${WRKINST}/usr/share/shorewall/*.template
-endif
-
-do-install:
- ${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/shorewall
- ${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/share/shorewall
- ${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/sbin
- ${INSTALL_DATA} ${WRKINST}/etc/shorewall/* \
- ${IDIR_SHOREWALL}/etc/shorewall/
- ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/actions.std \
- ${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/configpath \
- ${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/modules \
- ${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/rfc1918 \
- ${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/version \
- ${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/action.* \
- ${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/macro.* \
- ${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/lib.* \
- ${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/firewall \
- ${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/functions \
- ${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/wait4ifup \
- ${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_BIN} ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/usr/sbin
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/shorewall-common/files/downstrip b/package/shorewall-common/files/downstrip
deleted file mode 100644
index 040eded62..000000000
--- a/package/shorewall-common/files/downstrip
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-cd $1
-for i in $( ls -1 $1 |grep -v ".template"); do
- sed -e '/^$/d' -e '/^#$/d' -e '/^#[^!]/d' -e '/^[ *]$/d' -e 's/\t/ /g' -i $i
-done
-
diff --git a/package/shorewall-common/files/shorewall-common.conffiles b/package/shorewall-common/files/shorewall-common.conffiles
deleted file mode 100644
index 99893804c..000000000
--- a/package/shorewall-common/files/shorewall-common.conffiles
+++ /dev/null
@@ -1,33 +0,0 @@
-/etc/shorewall/Makefile
-/etc/shorewall/accounting
-/etc/shorewall/actions
-/etc/shorewall/blacklist
-/etc/shorewall/continue
-/etc/shorewall/ecn
-/etc/shorewall/hosts
-/etc/shorewall/init
-/etc/shorewall/initdone
-/etc/shorewall/interfaces
-/etc/shorewall/ipsec
-/etc/shorewall/maclist
-/etc/shorewall/masq
-/etc/shorewall/nat
-/etc/shorewall/netmap
-/etc/shorewall/params
-/etc/shorewall/policy
-/etc/shorewall/providers
-/etc/shorewall/proxyarp
-/etc/shorewall/route_rules
-/etc/shorewall/routestopped
-/etc/shorewall/rules
-/etc/shorewall/shorewall.conf
-/etc/shorewall/start
-/etc/shorewall/started
-/etc/shorewall/stop
-/etc/shorewall/stopped
-/etc/shorewall/tcclasses
-/etc/shorewall/tcdevices
-/etc/shorewall/tcrules
-/etc/shorewall/tos
-/etc/shorewall/tunnels
-/etc/shorewall/zones
diff --git a/package/shorewall-common/files/shorewall-common.postinst b/package/shorewall-common/files/shorewall-common.postinst
deleted file mode 100644
index 7b1c5e5cc..000000000
--- a/package/shorewall-common/files/shorewall-common.postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf shorewall NO
-mkdir -p $IPKG_INSTROOT/usr/share/shorewall/runtime
-chmod 0700 $IPKG_INSTROOT/usr/share/shorewall/runtime
diff --git a/package/shorewall-common/files/shorewall-common.prerm b/package/shorewall-common/files/shorewall-common.prerm
deleted file mode 100644
index 805b69980..000000000
--- a/package/shorewall-common/files/shorewall-common.prerm
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# commented out: we never change this information ourselves
-# plus: this will destroy /etc/rc.conf entirely.
-# read some info about shell redirections if you don’t know why.
-#cat $IPKG_INSTROOT/etc/rc.conf | grep -v "shorewall" >$IPKG_INSTROOT/etc/rc.conf
-
-rm -rf /usr/share/shorewall/runtime
diff --git a/package/shorewall-common/files/shorewall.init b/package/shorewall-common/files/shorewall.init
deleted file mode 100644
index 5c5a4660a..000000000
--- a/package/shorewall-common/files/shorewall.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#PKG shorewall-common
-#INIT 45
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
- test x"${shorewall:-NO}" != x"YES" && exit 0
- test x"$shorewall" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
- exec sh $0 start
- ;;
-start)
- touch /var/log/messages
- mkdir -p /var/lock/subsys
- /sbin/shorewall -f start 1>/dev/null
- ;;
-stop)
- /sbin/shorewall stop 1>/dev/null
- ;;
-restart)
- if [ -f /var/lib/shorewall/restore ] ; then
- /sbin/shorewall restore
- else
- /sbin/shorewall restart 1>/dev/null
- fi
- ;;
-clear)
- /sbin/shorewall clear
- ;;
-*)
- echo "Usage: $0 {start|stop|restart|clear}"
- ;;
-esac
-exit $?
diff --git a/package/shorewall-common/patches/patch-install_sh b/package/shorewall-common/patches/patch-install_sh
deleted file mode 100644
index b9ed10574..000000000
--- a/package/shorewall-common/patches/patch-install_sh
+++ /dev/null
@@ -1,119 +0,0 @@
-$Id$
---- shorewall-common-4.0.7.orig/install.sh 2007-12-26 22:15:47.000000000 +0100
-+++ shorewall-common-4.0.7/install.sh 2009-12-11 23:10:40.000000000 +0100
-@@ -183,7 +183,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/
- #
- # Determine where to install the firewall script
- #
--DEBIAN=
-
- OWNERSHIP="-o $OWNER -g $GROUP"
-
-@@ -198,16 +197,6 @@ if [ -n "$PREFIX" ]; then
- else
- [ -x /usr/share/shorewall-shell/compiler -o -x /usr/share/shorewall-perl/compiler.pl ] || \
- { echo " ERROR: No Shorewall compiler is installed" >&2; exit 1; }
-- if [ -d /etc/apt -a -e /usr/bin/dpkg ]; then
-- DEBIAN=yes
-- elif [ -f /etc/slackware-version ] ; then
-- DEST="/etc/rc.d"
-- INIT="rc.firewall"
-- elif [ -f /etc/arch-release ] ; then
-- DEST="/etc/rc.d"
-- INIT="shorewall"
-- ARCHLINUX=yes
-- fi
- fi
-
- #
-@@ -238,14 +227,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
--elif [ -n "$ARCHLINUX" ]; then
-- install_file_with_backup init.archlinux.sh ${PREFIX}${DEST}/$INIT 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
--
--else
-- install_file_with_backup init.sh ${PREFIX}${DEST}/$INIT 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
--fi
-+install_file_with_backup init.sh ${PREFIX}${DEST}/$INIT 0544 ${PREFIX}/usr/share/shorewall-${VERSION}.bkout
-
- echo "Shorewall script installed in ${PREFIX}${DEST}/$INIT"
-
-@@ -273,9 +255,6 @@ if [ ! -f ${PREFIX}/etc/shorewall/shorew
- fi
-
-
--if [ -n "$ARCHLINUX" ] ; then
-- sed -e 's!LOGFILE=/var/log/messages!LOGFILE=/var/log/messages.log!' -i ${PREFIX}/etc/shorewall/shorewall.conf
--fi
- #
- # Install the zones file
- #
-@@ -683,15 +662,18 @@ fi
-
- cd manpages
-
-+run_install -d ${PREFIX}/usr/share/man/man5
-+run_install -d ${PREFIX}/usr/share/man/man8
-+
- for f in *.5; do
- gzip -c $f > $f.gz
-- run_install -D -m 0644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
-+ run_install -m 0644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
- echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
- done
-
- for f in *.8; do
- gzip -c $f > $f.gz
-- run_install -D -m 0644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
-+ run_install -m 0644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
- echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
- done
-
-@@ -704,43 +686,6 @@ echo "Man Pages Installed"
- #
- install_file firewall ${PREFIX}/usr/share/shorewall/firewall 0755
-
--if [ -z "$PREFIX" -a -n "$first_install" ]; then
-- if [ -n "$DEBIAN" ]; then
-- run_install $OWNERSHIP -m 0644 default.debian /etc/default/shorewall
-- ln -s ../init.d/shorewall /etc/rcS.d/S40shorewall
-- echo "shorewall will start automatically at boot"
-- echo "Set startup=1 in /etc/default/shorewall to enable"
-- touch /var/log/shorewall-init.log
-- qt mywhich perl && perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' /etc/shorewall/shorewall.conf
-- else
-- if [ -x /sbin/insserv -o -x /usr/sbin/insserv ]; then
-- if insserv /etc/init.d/shorewall ; then
-- echo "shorewall will start automatically at boot"
-- echo "Set STARTUP_ENABLED=Yes in /etc/shorewall/shorewall.conf to enable"
-- else
-- cant_autostart
-- fi
-- elif [ -x /sbin/chkconfig -o -x /usr/sbin/chkconfig ]; then
-- if chkconfig --add shorewall ; then
-- echo "shorewall will start automatically in run levels as follows:"
-- echo "Set STARTUP_ENABLED=Yes in /etc/shorewall/shorewall.conf to enable"
-- chkconfig --list shorewall
-- else
-- cant_autostart
-- fi
-- elif [ -x /sbin/rc-update ]; then
-- if rc-update add shorewall default; then
-- echo "shorewall will start automatically at boot"
-- echo "Set STARTUP_ENABLED=Yes in /etc/shorewall/shorewall.conf to enable"
-- else
-- cant_autostart
-- fi
-- elif [ "$INIT" != rc.firewall ]; then #Slackware starts this automatically
-- cant_autostart
-- fi
-- fi
--fi
--
- #
- # Report Success
- #
diff --git a/package/shorewall-common/patches/patch-shorewall_conf b/package/shorewall-common/patches/patch-shorewall_conf
deleted file mode 100644
index c6b781088..000000000
--- a/package/shorewall-common/patches/patch-shorewall_conf
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- shorewall-common-4.0.7.orig/shorewall.conf 2007-12-10 22:17:04.000000000 +0100
-+++ shorewall-common-4.0.7/shorewall.conf 2009-12-11 22:58:41.000000000 +0100
-@@ -72,7 +72,7 @@ SHOREWALL_SHELL=/bin/sh
-
- SUBSYSLOCK=/var/lock/subsys/shorewall
-
--MODULESDIR=
-+MODULESDIR=/lib/modules/`uname -r`/
-
- CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
-
diff --git a/package/shorewall-shell/Makefile b/package/shorewall-shell/Makefile
deleted file mode 100644
index a088da714..000000000
--- a/package/shorewall-shell/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${ADK_TOPDIR}/rules.mk
-
-PKG_NAME:= shorewall-shell
-PKG_VERSION:= 4.0.14.1
-PKG_RELEASE:= 1
-PKG_HASH:= ff8e1eaf98f06e8fca611c83fd5bcacda464d80fb1c208e984160a839f0c23a6
-PKG_DESCR:= shell compiler for shorewall
-PKG_SECTION:= net/firewall
-PKG_URL:= http://www.shorewall.net
-PKG_SITES:= http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.14/
-
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,SHOREWALL_SHELL,shorewall-shell,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:= manual
-BUILD_STYLE:= manual
-INSTALL_STYLE:= manual
-
-do-build:
- PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n
-
-ifeq ($(ADK_PACKAGE_SHOREWALL_STRIPSHARED),y)
- ${BASH} ./files/downstrip ${WRKINST}/usr/share/${PKG_NAME}
-endif
-
-do-install:
- ${INSTALL_DIR} ${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}
- ${INSTALL_DATA} ${WRKINST}/usr/share/${PKG_NAME}/version \
- ${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
- ${INSTALL_DATA} ${WRKINST}/usr/share/${PKG_NAME}/lib.* \
- ${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
- ${INSTALL_DATA} ${WRKINST}/usr/share/${PKG_NAME}/prog.* \
- ${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
- ${INSTALL_BIN} ${WRKINST}/usr/share/${PKG_NAME}/compiler \
- ${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/shorewall-shell/files/downstrip b/package/shorewall-shell/files/downstrip
deleted file mode 100644
index 040eded62..000000000
--- a/package/shorewall-shell/files/downstrip
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-cd $1
-for i in $( ls -1 $1 |grep -v ".template"); do
- sed -e '/^$/d' -e '/^#$/d' -e '/^#[^!]/d' -e '/^[ *]$/d' -e 's/\t/ /g' -i $i
-done
-