Changeset f1305f7 in freewrt

Timestamp:

Mar 25, 2007, 3:30:15 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

3bf1856

Parents:

8419f18

Message:

update to 2.4.1 from trunk

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@2261 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/shorewall

Files:

• Makefile (modified) (5 diffs)
• patches/patch-Makefile (deleted)
• patches/patch-compiler (deleted)
• patches/patch-configpath (deleted)
• patches/patch-fallback_sh (deleted)
• patches/patch-firewall (deleted)
• patches/patch-functions (deleted)
• patches/patch-install_sh (deleted)
• patches/patch-shorewall (deleted)
• patches/patch-shorewall_conf (deleted)
• patches/patch-shorewall_spec (deleted)
• patches/patch-uninstall_sh (deleted)

package/shorewall/Makefile

@@ -8 +8 @@
 
 PKG_NAME:=              shorewall
-PKG_VERSION:=           3.2.8
-PKG_RELEASE:=           2
-PKG_MD5SUM:=            d9e354b3f2670ceb021eea51419ff0e9
+PKG_VERSION:=           3.4.1
+PKG_RELEASE:=           1
+PKG_MD5SUM:=            389a62170ad11c683ccaa6e2e071aff4
 PKG_INIT:=              45
-PKG_SOURCE_URL:=        http://www1.shorewall.net/pub/$(PKG_NAME)/3.2/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=        http://www1.shorewall.net/pub/$(PKG_NAME)/3.4/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=            ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
@@ -21 +21 @@
 $(WRKBUILD)/.built:
         PREFIX="$(WRKINST)" $(WRKBUILD)/install.sh -n
+        
+        # remove configfiles folder
+        ${RM} -R ${WRKINST}/usr/share/shorewall/configfiles
+
 ifeq ($(FWRT_PACKAGE_SHOREWALL_STRIPCONF),y)
         $(BASH) ./files/downstrip ${WRKINST}/etc/shorewall
@@ -26 +30 @@
 ifeq ($(FWRT_PACKAGE_SHOREWALL_STRIPSHARED),y)
         $(BASH) ./files/downstrip ${WRKINST}/usr/share/shorewall
+        ${BASH} ./files/downstrip ${WRKINST}/sbin
         gzip -9 ${WRKINST}/usr/share/shorewall/*.template
 endif
@@ -37 +42 @@
         install -m0755 ./files/shorewall.init ${IDIR_SHOREWALL}/etc/init.d/S${PKG_INIT}${PKG_NAME}
         install -m0644 ${WRKINST}/etc/shorewall/* ${IDIR_SHOREWALL}/etc/shorewall/
-        install -m0644 ${WRKINST}/usr/share/shorewall/Limit ${IDIR_SHOREWALL}/usr/share/shorewall
         install -m0644 ${WRKINST}/usr/share/shorewall/actions.std ${IDIR_SHOREWALL}/usr/share/shorewall
         install -m0644 ${WRKINST}/usr/share/shorewall/configpath ${IDIR_SHOREWALL}/usr/share/shorewall
@@ -46 +50 @@
         install -m0644 ${WRKINST}/usr/share/shorewall/macro.* ${IDIR_SHOREWALL}/usr/share/shorewall
         install -m0644 ${WRKINST}/usr/share/shorewall/prog.* ${IDIR_SHOREWALL}/usr/share/shorewall
+        install -m0644 ${WRKINST}/usr/share/shorewall/lib.* ${IDIR_SHOREWALL}/usr/share/shorewall
         install -m0755 ${WRKINST}/usr/share/shorewall/compiler ${IDIR_SHOREWALL}/usr/share/shorewall
         install -m0755 ${WRKINST}/usr/share/shorewall/firewall ${IDIR_SHOREWALL}/usr/share/shorewall
         install -m0755 ${WRKINST}/usr/share/shorewall/functions ${IDIR_SHOREWALL}/usr/share/shorewall
-        install -m0755 ${WRKINST}/usr/share/shorewall/help ${IDIR_SHOREWALL}/usr/share/shorewall
+        install -m0755 ${WRKINST}/usr/share/shorewall/wait4ifup ${IDIR_SHOREWALL}/usr/share/shorewall
         install -m0755 ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/sbin
         $(RSTRIP) $(IDIR_SHOREWALL)