diff options
Diffstat (limited to 'package/shorewall-common')
| -rw-r--r-- | package/shorewall-common/Config.in | 40 | ||||
| -rw-r--r-- | package/shorewall-common/Makefile | 53 | ||||
| -rw-r--r-- | package/shorewall-common/patches/patch-install_sh | 27 | ||||
| -rw-r--r-- | package/shorewall-common/patches/patch-shorewall_conf | 6 |
4 files changed, 61 insertions, 65 deletions
diff --git a/package/shorewall-common/Config.in b/package/shorewall-common/Config.in deleted file mode 100644 index 59296e1fe..000000000 --- a/package/shorewall-common/Config.in +++ /dev/null @@ -1,40 +0,0 @@ -config ADK_PACKAGE_SHOREWALL - prompt "shorewall......................... high-level netfilter configuration tool" - tristate - default n - select ADK_PACKAGE_IPTABLES - help - The Shoreline Firewall, more commonly known as "Shorewall", is a - high-level tool for configuring Netfilter. You describe your - firewall/gateway requirements using entries in a set of configuration - files. Shorewall reads those configuration files and with the help - of the iptables utility, Shorewall configures Netfilter to match - your requirements. - - http://www.shorewall.net/ - -config ADK_PACKAGE_SHOREWALL_STRIPCONF - prompt "Strip shorewall configuration files" - bool - default n - depends on ADK_PACKAGE_SHOREWALL - help - To save space, all shorewall files in /etc/shorewall will get striped. - This means that all comments, empty lines etc. are removed. - - By default this option is not enabled, because the comments - in the configfiles helps the user a lot to configure shorewall. - -config ADK_PACKAGE_SHOREWALL_STRIPSHARED - prompt "Strip shared shorewall files (macros & actions mainly)" - bool - default y - depends on ADK_PACKAGE_SHOREWALL - help - To save space, all shared shorewall files in /usr/share/shorewall - will get striped. This means that all comments, empty lines etc. - are removed. - - By default this option is enabled, because for normal usage the user - doesn't need to change files in /usr/share/shorewall. Comments in all - shared files just would waste disk space on most embedded devices. diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile index 44ddbfffe..5e311d358 100644 --- a/package/shorewall-common/Makefile +++ b/package/shorewall-common/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= shorewall-common PKG_VERSION:= 4.0.7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 2df43356b1fdbc91920d48c5595aa101 PKG_DESCR:= high-level netfilter configuration tool PKG_SECTION:= net @@ -17,11 +17,14 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SHOREWALL,shorewall,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -do-install: - PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n +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 @@ -35,22 +38,34 @@ ifeq ($(ADK_PACKAGE_SHOREWALL_STRIPSHARED),y) gzip -9 ${WRKINST}/usr/share/shorewall/*.template endif -post-install: +do-install: ${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/shorewall ${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/share/shorewall - ${INSTALL_DIR} ${IDIR_SHOREWALL}/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}/sbin + ${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 ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/shorewall-common/patches/patch-install_sh b/package/shorewall-common/patches/patch-install_sh index 715d0130a..b9ed10574 100644 --- a/package/shorewall-common/patches/patch-install_sh +++ b/package/shorewall-common/patches/patch-install_sh @@ -1,6 +1,6 @@ $Id$ ---- shorewall-common-4.0.5.orig/install.sh 2007-10-19 16:33:06.000000000 +0000 -+++ shorewall-common-4.0.5/install.sh 2007-10-23 23:33:47.000000000 +0000 +--- 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 @@ -52,7 +52,28 @@ $Id$ # # Install the zones file # -@@ -704,43 +683,6 @@ echo "Man Pages Installed" +@@ -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 diff --git a/package/shorewall-common/patches/patch-shorewall_conf b/package/shorewall-common/patches/patch-shorewall_conf index 80a55f3e9..c6b781088 100644 --- a/package/shorewall-common/patches/patch-shorewall_conf +++ b/package/shorewall-common/patches/patch-shorewall_conf @@ -1,7 +1,7 @@ $Id$ ---- shorewall-3.4.5.orig/shorewall.conf 2007-06-20 14:30:57.000000000 +0000 -+++ shorewall-3.4.5/shorewall.conf 2007-07-17 11:08:12.000000000 +0000 -@@ -71,7 +71,7 @@ SHOREWALL_SHELL=/bin/sh +--- 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 |