ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 05:38:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

firewall3: rename to firewall, move into base system menu, update to git head with compatibility fixes for AA

Browse Source 
SVN-Revision: 36838
This commit is contained in:
Jo-Philipp Wich 2013-06-04 12:21:52 +00:00
parent 0dd6753c09
commit b721c92221
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/target.mk
View File

@ -14,7 +14,7 @@ DEVICE_TYPE?=router
# Default packages - the really basic set # Default packages - the really basic set
DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg hotplug2 netifd DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg hotplug2 netifd
# For router targets # 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:= DEFAULT_PACKAGES.bootloader:=
ifneq ($(DUMP),) ifneq ($(DUMP),)

22
package/network/config/firewall3/Makefile → package/network/config/firewall/Makefile
View File

@ -7,14 +7,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=firewall3 PKG_NAME:=firewall
PKG_VERSION:=2013-06-04 PKG_VERSION:=2013-06-04
PKG_RELEASE:=$(PKG_SOURCE_VERSION) PKG_RELEASE:=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git 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_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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
@ -23,18 +23,18 @@ include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
define Package/firewall3 define Package/firewall
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Base system
TITLE:=UCI C Firewall TITLE:=OpenWrt C Firewall
DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libxtables DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libxtables
endef endef
define Package/firewall3/description define Package/firewall/description
This package provides a config-compatible C implementation of the UCI firewall. This package provides a config-compatible C implementation of the UCI firewall.
endef endef
define Package/firewall3/conffiles define Package/firewall/conffiles
/etc/config/firewall /etc/config/firewall
/etc/firewall.user /etc/firewall.user
endef endef
@ -50,9 +50,9 @@ TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections TARGET_LDFLAGS += -Wl,--gc-sections
CMAKE_OPTIONS += $(if $(CONFIG_IPV6),,-DDISABLE_IPV6=1) CMAKE_OPTIONS += $(if $(CONFIG_IPV6),,-DDISABLE_IPV6=1)
define Package/firewall3/install define Package/firewall/install
$(INSTALL_DIR) $(1)/sbin $(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_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall $(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
@ -63,4 +63,4 @@ define Package/firewall3/install
$(INSTALL_DATA) ./files/firewall.user $(1)/etc/firewall.user $(INSTALL_DATA) ./files/firewall.user $(1)/etc/firewall.user
endef endef
$(eval $(call BuildPackage,firewall3)) $(eval $(call BuildPackage,firewall))

0
package/network/config/firewall3/files/firewall.config → package/network/config/firewall/files/firewall.config
View File

0
package/network/config/firewall3/files/firewall.hotplug → package/network/config/firewall/files/firewall.hotplug
View File

0
package/network/config/firewall3/files/firewall.init → package/network/config/firewall/files/firewall.init
View File

0
package/network/config/firewall3/files/firewall.user → package/network/config/firewall/files/firewall.user
View File