From 135261e7e4223181cbe1244f4f6fb025e05883b5 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 16 Jun 2009 22:45:06 +0000 Subject: [PATCH] luci-0.9: merge r4856-r4859 --- contrib/package/cyassl-luci/Makefile | 6 +-- contrib/package/freifunk-firewall/Makefile | 52 +++++++++++++++++++ .../files}/etc/firewall.freifunk | 0 .../etc/hotplug.d/iface/22-firewall-nat-fix | 0 contrib/package/freifunk-p2pblock/Makefile | 5 +- contrib/package/freifunk-watchdog/Makefile | 5 +- contrib/package/luci/Makefile | 16 +++--- contrib/package/olsrd-luci/Makefile | 5 +- contrib/package/zoneinfo/Makefile | 6 +-- 9 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 contrib/package/freifunk-firewall/Makefile rename {modules/freifunk/root => contrib/package/freifunk-firewall/files}/etc/firewall.freifunk (100%) rename {modules/freifunk/root => contrib/package/freifunk-firewall/files}/etc/hotplug.d/iface/22-firewall-nat-fix (100%) diff --git a/contrib/package/cyassl-luci/Makefile b/contrib/package/cyassl-luci/Makefile index 6d1b6a655..7c23eb4b7 100644 --- a/contrib/package/cyassl-luci/Makefile +++ b/contrib/package/cyassl-luci/Makefile @@ -27,9 +27,9 @@ endef define Package/libcyassl-luci $(call Package/cyassl-luci/Default) - SECTION:=libs - SUBMENU:=SSL - CATEGORY:=Libraries + SECTION:=luci + CATEGORY:=LuCI + SUBMENU:=Libraries TITLE+= (library) endef diff --git a/contrib/package/freifunk-firewall/Makefile b/contrib/package/freifunk-firewall/Makefile new file mode 100644 index 000000000..d2ae07588 --- /dev/null +++ b/contrib/package/freifunk-firewall/Makefile @@ -0,0 +1,52 @@ +# +# Copyright (C) 2009 Jo-Philipp Wich +# +# This is free software, licensed under the Apache 2.0 license. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=freifunk-firewall +PKG_RELEASE:=1 + +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) + +include $(INCLUDE_DIR)/package.mk + +define Package/freifunk-firewall + SECTION:=luci + CATEGORY:=LuCI + SUBMENU:=Freifunk + TITLE:=Freifunk Firewall Addon + DEPENDS:=+firewall +endef + +define Package/freifunk-firewall/description + Various firewall extensions for Freifunk. Includes NAT fixes and advanced settings. +endef + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) +endef + +define Build/Configure +endef + +define Build/Compile +endef + +define Package/freifunk-firewall/postinst +#!/bin/sh + +if ! grep -q /etc/firewall.freifunk /etc/config/firewall; then + uci add firewall include >/dev/null + uci set firewall.@include[-1].path=/etc/firewall.freifunk + uci commit firewall +fi +endef + +define Package/freifunk-firewall/install + $(CP) ./files/* $(1)/ +endef + +$(eval $(call BuildPackage,freifunk-firewall)) diff --git a/modules/freifunk/root/etc/firewall.freifunk b/contrib/package/freifunk-firewall/files/etc/firewall.freifunk similarity index 100% rename from modules/freifunk/root/etc/firewall.freifunk rename to contrib/package/freifunk-firewall/files/etc/firewall.freifunk diff --git a/modules/freifunk/root/etc/hotplug.d/iface/22-firewall-nat-fix b/contrib/package/freifunk-firewall/files/etc/hotplug.d/iface/22-firewall-nat-fix similarity index 100% rename from modules/freifunk/root/etc/hotplug.d/iface/22-firewall-nat-fix rename to contrib/package/freifunk-firewall/files/etc/hotplug.d/iface/22-firewall-nat-fix diff --git a/contrib/package/freifunk-p2pblock/Makefile b/contrib/package/freifunk-p2pblock/Makefile index 0da9a32ff..3189f0c89 100644 --- a/contrib/package/freifunk-p2pblock/Makefile +++ b/contrib/package/freifunk-p2pblock/Makefile @@ -15,8 +15,9 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define Package/freifunk-p2pblock - SECTION:=net - CATEGORY:=Network + SECTION:=luci + CATEGORY:=LuCI + SUBMENU:=Freifunk TITLE:=Freifunk p2pblock Addon DEPENDS:=+iptables-mod-filter +l7-protocols +iptables-mod-conntrack-extra endef diff --git a/contrib/package/freifunk-watchdog/Makefile b/contrib/package/freifunk-watchdog/Makefile index e4cb550f6..4876a94de 100644 --- a/contrib/package/freifunk-watchdog/Makefile +++ b/contrib/package/freifunk-watchdog/Makefile @@ -16,8 +16,9 @@ PKG_BUILD_DEPENDS := uci include $(INCLUDE_DIR)/package.mk define Package/freifunk-watchdog - SECTION:=utils - CATEGORY:=Utilities + SECTION:=luci + CATEGORY:=LuCI + SUBMENU:=Freifunk TITLE:=Freifunk Ad-Hoc watchdog daemon DEPENDS:=libuci endef diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 4cc734a0e..e942353dc 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -50,36 +50,36 @@ endef ### Templates ### define Package/luci/libtemplate - SECTION:=admin - CATEGORY:=Administration + SECTION:=luci + CATEGORY:=LuCI TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.freifunk-halle.net/ MAINTAINER:=Steven Barth - SUBMENU:=LuCI Libraries + SUBMENU:=Libraries DEPENDS:=+luci-core endef define Package/luci/fftemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Freifunk Support + SUBMENU:=Freifunk DEPENDS:=+luci-mod-freifunk endef define Package/luci/i18ntemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Translations + SUBMENU:=Translations DEPENDS:=+luci-web endef define Package/luci/thtemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Themes + SUBMENU:=Themes DEPENDS:=+luci-web endef define Package/luci/webtemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Components + SUBMENU:=Components endef @@ -402,7 +402,7 @@ endef define Package/luci-mod-freifunk $(call Package/luci/fftemplate) - DEPENDS:=+luci-admin-full +luci-json + DEPENDS:=+luci-admin-full +luci-json +PACKAGE_luci-mod-freifunk:freifunk-firewall TITLE:=LuCI Freifunk module endef diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile index 29c0740aa..5928dfe02 100644 --- a/contrib/package/olsrd-luci/Makefile +++ b/contrib/package/olsrd-luci/Makefile @@ -33,8 +33,9 @@ include $(INCLUDE_DIR)/package.mk define Package/olsrd-luci/common_info - SECTION:=net - CATEGORY:=Network + SECTION:=luci + CATEGORY:=LuCI + SUBMENU:=Freifunk TITLE:=OLSR - Optimized Link State Routing Daemon URL:=http://www.olsr.org/ MAINTAINER:=Jo-Philipp Wich diff --git a/contrib/package/zoneinfo/Makefile b/contrib/package/zoneinfo/Makefile index ee0ac13d8..82beeb82e 100644 --- a/contrib/package/zoneinfo/Makefile +++ b/contrib/package/zoneinfo/Makefile @@ -30,10 +30,10 @@ endef $(eval $(call Download,tzcode)) define Package/zoneinfo/default - SUBMENU:=Zones (ZoneInfo) + SUBMENU:=ZoneInfo TITLE:=Zone Information - SECTION:=net - CATEGORY:=Network + SECTION:=luci + CATEGORY:=LuCI endef define Package/zoneinfo-core -- 2.25.1