diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/shorewall-common | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/shorewall-common')
| -rw-r--r-- | package/shorewall-common/Makefile | 14 | ||||
| -rw-r--r-- | package/shorewall-common/files/shorewall-common.conffiles (renamed from package/shorewall-common/ipkg/shorewall-common.conffiles) | 0 | ||||
| -rw-r--r-- | package/shorewall-common/files/shorewall-common.postinst (renamed from package/shorewall-common/ipkg/shorewall-common.postinst) | 0 | ||||
| -rw-r--r-- | package/shorewall-common/files/shorewall-common.prerm (renamed from package/shorewall-common/ipkg/shorewall-common.prerm) | 0 | ||||
| -rw-r--r-- | package/shorewall-common/files/shorewall.init | 4 | ||||
| -rw-r--r-- | package/shorewall-common/ipkg/shorewall-common.control | 5 |
6 files changed, 10 insertions, 13 deletions
diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile index d2e234d92..230d6e56d 100644 --- a/package/shorewall-common/Makefile +++ b/package/shorewall-common/Makefile @@ -9,12 +9,17 @@ PKG_NAME:= shorewall-common PKG_VERSION:= 4.0.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 2df43356b1fdbc91920d48c5595aa101 -MASTER_SITES:= http://www1.shorewall.net/pub/shorewall/4.0/shorewall-${PKG_VERSION}/ +PKG_DESCR:= high-level netfilter configuration tool +PKG_SECTION:= net +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 ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) do-install: PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n @@ -33,13 +38,9 @@ ifeq ($(ADK_PACKAGE_SHOREWALL_STRIPSHARED),y) endif post-install: - ${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/init.d ${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/shorewall ${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/share/shorewall ${INSTALL_DIR} ${IDIR_SHOREWALL}/sbin - - ${INSTALL_BIN} ./files/shorewall.init ${IDIR_SHOREWALL}/etc/init.d/shorewall - ${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/ @@ -49,7 +50,6 @@ post-install: ${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/ diff --git a/package/shorewall-common/ipkg/shorewall-common.conffiles b/package/shorewall-common/files/shorewall-common.conffiles index 99893804c..99893804c 100644 --- a/package/shorewall-common/ipkg/shorewall-common.conffiles +++ b/package/shorewall-common/files/shorewall-common.conffiles diff --git a/package/shorewall-common/ipkg/shorewall-common.postinst b/package/shorewall-common/files/shorewall-common.postinst index bade6304b..bade6304b 100644 --- a/package/shorewall-common/ipkg/shorewall-common.postinst +++ b/package/shorewall-common/files/shorewall-common.postinst diff --git a/package/shorewall-common/ipkg/shorewall-common.prerm b/package/shorewall-common/files/shorewall-common.prerm index 805b69980..805b69980 100644 --- a/package/shorewall-common/ipkg/shorewall-common.prerm +++ b/package/shorewall-common/files/shorewall-common.prerm diff --git a/package/shorewall-common/files/shorewall.init b/package/shorewall-common/files/shorewall.init index c2800f732..da2ea2a51 100644 --- a/package/shorewall-common/files/shorewall.init +++ b/package/shorewall-common/files/shorewall.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 45 +#PKG shorewall-common +#INIT 45 + . /etc/rc.conf case $1 in diff --git a/package/shorewall-common/ipkg/shorewall-common.control b/package/shorewall-common/ipkg/shorewall-common.control deleted file mode 100644 index 41b7d8e43..000000000 --- a/package/shorewall-common/ipkg/shorewall-common.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: shorewall-common -Priority: optional -Section: net -Depends: iptables -Description: high-level netfilter configuration tool |