From b721c9222110f0bbf2203da602f60ac0ec6f32ff Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 4 Jun 2013 12:21:52 +0000 Subject: [PATCH] firewall3: rename to firewall, move into base system menu, update to git head with compatibility fixes for AA SVN-Revision: 36838 --- include/target.mk | 2 +- .../config/{firewall3 => firewall}/Makefile | 22 +++++++++---------- .../files/firewall.config | 0 .../files/firewall.hotplug | 0 .../files/firewall.init | 0 .../files/firewall.user | 0 6 files changed, 12 insertions(+), 12 deletions(-) rename package/network/config/{firewall3 => firewall}/Makefile (81%) rename package/network/config/{firewall3 => firewall}/files/firewall.config (100%) rename package/network/config/{firewall3 => firewall}/files/firewall.hotplug (100%) rename package/network/config/{firewall3 => firewall}/files/firewall.init (100%) rename package/network/config/{firewall3 => firewall}/files/firewall.user (100%) diff --git a/include/target.mk b/include/target.mk index 6774076f91..c1768023e8 100644 --- a/include/target.mk +++ b/include/target.mk @@ -14,7 +14,7 @@ DEVICE_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg hotplug2 netifd # For router targets -DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall3 6relayd odhcp6c +DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall 6relayd odhcp6c DEFAULT_PACKAGES.bootloader:= ifneq ($(DUMP),) diff --git a/package/network/config/firewall3/Makefile b/package/network/config/firewall/Makefile similarity index 81% rename from package/network/config/firewall3/Makefile rename to package/network/config/firewall/Makefile index 76d756ef09..deb27ea71a 100644 --- a/package/network/config/firewall3/Makefile +++ b/package/network/config/firewall/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=firewall3 +PKG_NAME:=firewall PKG_VERSION:=2013-06-04 PKG_RELEASE:=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://nbd.name/firewall3.git +PKG_SOURCE_URL:=git://nbd.name/firewall.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=182abe47ae4686944482580b42a972827a0e4b51 +PKG_SOURCE_VERSION:=5ee2129eaa23a28bfef6d20c273cafc0be559b3d PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Jo-Philipp Wich @@ -23,18 +23,18 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/cmake.mk -define Package/firewall3 +define Package/firewall SECTION:=net - CATEGORY:=Network - TITLE:=UCI C Firewall + CATEGORY:=Base system + TITLE:=OpenWrt C Firewall DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libxtables endef -define Package/firewall3/description +define Package/firewall/description This package provides a config-compatible C implementation of the UCI firewall. endef -define Package/firewall3/conffiles +define Package/firewall/conffiles /etc/config/firewall /etc/firewall.user endef @@ -50,9 +50,9 @@ TARGET_CFLAGS += -ffunction-sections -fdata-sections TARGET_LDFLAGS += -Wl,--gc-sections CMAKE_OPTIONS += $(if $(CONFIG_IPV6),,-DDISABLE_IPV6=1) -define Package/firewall3/install +define Package/firewall/install $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/firewall3 $(1)/sbin/fw3 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/firewall $(1)/sbin/fw3 $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall $(INSTALL_DIR) $(1)/etc/hotplug.d/iface @@ -63,4 +63,4 @@ define Package/firewall3/install $(INSTALL_DATA) ./files/firewall.user $(1)/etc/firewall.user endef -$(eval $(call BuildPackage,firewall3)) +$(eval $(call BuildPackage,firewall)) diff --git a/package/network/config/firewall3/files/firewall.config b/package/network/config/firewall/files/firewall.config similarity index 100% rename from package/network/config/firewall3/files/firewall.config rename to package/network/config/firewall/files/firewall.config diff --git a/package/network/config/firewall3/files/firewall.hotplug b/package/network/config/firewall/files/firewall.hotplug similarity index 100% rename from package/network/config/firewall3/files/firewall.hotplug rename to package/network/config/firewall/files/firewall.hotplug diff --git a/package/network/config/firewall3/files/firewall.init b/package/network/config/firewall/files/firewall.init similarity index 100% rename from package/network/config/firewall3/files/firewall.init rename to package/network/config/firewall/files/firewall.init diff --git a/package/network/config/firewall3/files/firewall.user b/package/network/config/firewall/files/firewall.user similarity index 100% rename from package/network/config/firewall3/files/firewall.user rename to package/network/config/firewall/files/firewall.user