From 207ef24d9cda6f1f1a14d09c4d883a4f1ac0d7dc Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 12 Mar 2006 01:01:37 +0000
Subject: [PATCH] move firewall related stuff from base-files to iptables, bump
 release number for both packages

SVN-Revision: 3347
---
 openwrt/package/base-files/Makefile                      | 2 +-
 openwrt/package/base-files/ipkg/base-files.conffiles     | 2 --
 openwrt/package/iptables/Makefile                        | 9 ++++++++-
 .../default/usr/lib => iptables/files}/firewall.awk      | 0
 .../config/firewall => iptables/files/firewall.config}   | 0
 .../init.d/S45firewall => iptables/files/firewall.init}  | 0
 .../default/etc => iptables/files}/firewall.user         | 0
 openwrt/package/iptables/ipkg/iptables.conffiles         | 2 ++
 8 files changed, 11 insertions(+), 4 deletions(-)
 rename openwrt/package/{base-files/default/usr/lib => iptables/files}/firewall.awk (100%)
 rename openwrt/package/{base-files/default/etc/config/firewall => iptables/files/firewall.config} (100%)
 rename openwrt/package/{base-files/default/etc/init.d/S45firewall => iptables/files/firewall.init} (100%)
 rename openwrt/package/{base-files/default/etc => iptables/files}/firewall.user (100%)
 create mode 100644 openwrt/package/iptables/ipkg/iptables.conffiles

diff --git a/openwrt/package/base-files/Makefile b/openwrt/package/base-files/Makefile
index 18423ef775..1c7fee60a0 100644
--- a/openwrt/package/base-files/Makefile
+++ b/openwrt/package/base-files/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
 
 include $(TOPDIR)/package/rules.mk
diff --git a/openwrt/package/base-files/ipkg/base-files.conffiles b/openwrt/package/base-files/ipkg/base-files.conffiles
index 4c317bd68e..17024f6fa8 100644
--- a/openwrt/package/base-files/ipkg/base-files.conffiles
+++ b/openwrt/package/base-files/ipkg/base-files.conffiles
@@ -1,5 +1,3 @@
-/etc/config/firewall
-/etc/firewall.user
 /etc/group
 /etc/hosts
 /etc/ipkg.conf
diff --git a/openwrt/package/iptables/Makefile b/openwrt/package/iptables/Makefile
index a8493ed8bf..50e92b0ed9 100644
--- a/openwrt/package/iptables/Makefile
+++ b/openwrt/package/iptables/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iptables
 PKG_VERSION:=1.3.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=86d88455520cfdc56fd7ae27897a80a4
 
 PKG_SOURCE_URL:=http://www.netfilter.org/files \
@@ -72,6 +72,13 @@ $(PKG_BUILD_DIR)/.built:
 	touch $@
 		
 $(IPKG_IPTABLES):
+	install -d -m0755 $(IDIR_IPTABLES)/etc/config
+	install -m0644 ./files/firewall.config $(IDIR_IPTABLES)/etc/config/firewall
+	install -d -m0755 $(IDIR_IPTABLES)/etc/init.d
+	install -m0755 ./files/firewall.init $(IDIR_IPTABLES)/etc/init.d/S45firewall
+	install -m0755 ./files/firewall.user $(IDIR_IPTABLES)/etc/
+	install -d -m0755 $(IDIR_IPTABLES)/usr/lib
+	install -m0644 ./files/firewall.awk $(IDIR_IPTABLES)/usr/lib
 	install -d -m0755 $(IDIR_IPTABLES)/usr/sbin
 	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/
 	install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables
diff --git a/openwrt/package/base-files/default/usr/lib/firewall.awk b/openwrt/package/iptables/files/firewall.awk
similarity index 100%
rename from openwrt/package/base-files/default/usr/lib/firewall.awk
rename to openwrt/package/iptables/files/firewall.awk
diff --git a/openwrt/package/base-files/default/etc/config/firewall b/openwrt/package/iptables/files/firewall.config
similarity index 100%
rename from openwrt/package/base-files/default/etc/config/firewall
rename to openwrt/package/iptables/files/firewall.config
diff --git a/openwrt/package/base-files/default/etc/init.d/S45firewall b/openwrt/package/iptables/files/firewall.init
similarity index 100%
rename from openwrt/package/base-files/default/etc/init.d/S45firewall
rename to openwrt/package/iptables/files/firewall.init
diff --git a/openwrt/package/base-files/default/etc/firewall.user b/openwrt/package/iptables/files/firewall.user
similarity index 100%
rename from openwrt/package/base-files/default/etc/firewall.user
rename to openwrt/package/iptables/files/firewall.user
diff --git a/openwrt/package/iptables/ipkg/iptables.conffiles b/openwrt/package/iptables/ipkg/iptables.conffiles
new file mode 100644
index 0000000000..06194ca679
--- /dev/null
+++ b/openwrt/package/iptables/ipkg/iptables.conffiles
@@ -0,0 +1,2 @@
+/etc/config/firewall
+/etc/firewall.user
-- 
2.30.2