Patches based on AA branch Signed-off-by: Johan Peeters <[email protected]> --- package/dnsmasq/Config.in | 25 +++++++++++ package/dnsmasq/ConfigV6.in | 25 +++++++++++ package/dnsmasq/Makefile | 44 +++++++++++++++++++- .../patches/200-fix-Makefile-dependency.patch | 13 ++++++ package/dnsmasq/patches/300-fix-pkg-config.patch | 15 +++++++ package/lua/patches/400-fix_pc_file.patch | 13 ++++++ 6 files changed, 134 insertions(+), 1 deletions(-) create mode 100644 package/dnsmasq/Config.in create mode 100644 package/dnsmasq/ConfigV6.in create mode 100644 package/dnsmasq/patches/200-fix-Makefile-dependency.patch create mode 100644 package/dnsmasq/patches/300-fix-pkg-config.patch create mode 100644 package/lua/patches/400-fix_pc_file.patch
diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in new file mode 100644 index 0000000..c740631 --- /dev/null +++ b/package/dnsmasq/Config.in @@ -0,0 +1,25 @@ +# +# Copyright (C) 2010-2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +menu "Configuration" + depends on PACKAGE_dnsmasq + +config DNSMASQ_LUASCRIPT + bool + prompt "Enable lua scripting support " + default n + help + Provides the ability for lua scripting upon lease state changes. + +config DNSMASQ_CONNTRACK + bool + prompt "Enable conntrack support" + default n + help + Provides the ability to associate generated traffic with querries causing it + +endmenu diff --git a/package/dnsmasq/ConfigV6.in b/package/dnsmasq/ConfigV6.in new file mode 100644 index 0000000..d84eadb --- /dev/null +++ b/package/dnsmasq/ConfigV6.in @@ -0,0 +1,25 @@ +# +# Copyright (C) 2010-2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +menu "Configuration" + depends on PACKAGE_dnsmasq-dhcpv6 + +config DNSMASQV6_LUASCRIPT + bool + prompt "Enable lua scripting support " + default n + help + Provides the ability for lua scripting upon lease state changes. + +config DNSMASQV6_CONNTRACK + bool + prompt "Enable conntrack support" + default n + help + Provides the ability to associate generated traffic with querries causing it + +endmenu diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 4ad0f37..5233762 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -20,6 +20,12 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +PKG_CONFIG_DEPENDS := \ + CONFIG_DNSMASQ_LUASCRIPT \ + CONFIG_DNSMASQ_CONNTRACK \ + CONFIG_DNSMASV6_LUASCRIPT \ + CONFIG_DNSMASV6_CONNTRACK \ + include $(INCLUDE_DIR)/package.mk define Package/dnsmasq/Default @@ -27,17 +33,19 @@ define Package/dnsmasq/Default CATEGORY:=Base system TITLE:=A lightweight DNS and DHCP server URL:=http://www.thekelleys.org.uk/dnsmasq/ + MENU:=1 endef define Package/dnsmasq $(call Package/dnsmasq/Default) VARIANT:=nodhcpv6 + DEPENDS:=+DNSMASQ_CONNTRACK:libnetfilter-conntrack +DNSMASQ_LUASCRIPT:liblua endef define Package/dnsmasq-dhcpv6 $(call Package/dnsmasq/Default) TITLE += (with DHCPv6 support) - DEPENDS:=@IPV6 +kmod-ipv6 + DEPENDS:=@IPV6 +kmod-ipv6 +DNSMASQV6_CONNTRACK:libnetfilter-conntrack +DNSMASQV6_LUASCRIPT:liblua VARIANT:=dhcpv6 endef @@ -51,6 +59,14 @@ $(call Package/dnsmasq/description) This is a variant with DHCPv6 support endef +define Package/dnsmasq/config + source "$(SOURCE)/Config.in" +endef + +define Package/dnsmasq-dhcpv6/config + source "$(SOURCE)/ConfigV6.in" +endef + define Package/dnsmasq/conffiles /etc/config/dhcp /etc/dnsmasq.conf @@ -72,6 +88,32 @@ MAKE_FLAGS := \ LDFLAGS="-Wl,--gc-sections" \ PREFIX="/usr" +define Build/Configure + #adapt the config.h according to the selected package config options + ifneq ($(CONFIG_DNSMASQ_LUASCRIPT),) + $(SED) 's,^/\* #define HAVE_LUASCRIPT.*,#define HAVE_LUASCRIPT,g' $(PKG_BUILD_DIR)/src/config.h + else + $(SED) 's,^#define HAVE_LUASCRIPT,/* & */,g' $(PKG_BUILD_DIR)/src/config.h + endif + ifneq ($(CONFIG_DNSMASQ_CONNTRACK),) + $(SED) 's,^/\* #define HAVE_CONNTRACK.*,#define HAVE_CONNTRACK,g' $(PKG_BUILD_DIR)/src/config.h + else + $(SED) 's,^#define HAVE_CONNTRACK,/* & */,g' $(PKG_BUILD_DIR)/src/config.h + endif + ifneq ($(CONFIG_DNSMASQV6_LUASCRIPT),) + $(SED) 's,^/\* #define HAVE_LUASCRIPT.*,#define HAVE_LUASCRIPT,g' $(PKG_BUILD_DIR)/src/config.h + else + $(SED) 's,^#define HAVE_LUASCRIPT,/* & */,g' $(PKG_BUILD_DIR)/src/config.h + endif + ifneq ($(CONFIG_DNSMASQV6_CONNTRACK),) + $(SED) 's,^/\* #define HAVE_CONNTRACK.*,#define HAVE_CONNTRACK,g' $(PKG_BUILD_DIR)/src/config.h + else + $(SED) 's,^#define HAVE_CONNTRACK,/* & */,g' $(PKG_BUILD_DIR)/src/config.h + endif + $(call Build/Configure/Default) +endef + + define Package/dnsmasq/install $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnsmasq $(1)/usr/sbin/ diff --git a/package/dnsmasq/patches/200-fix-Makefile-dependency.patch b/package/dnsmasq/patches/200-fix-Makefile-dependency.patch new file mode 100644 index 0000000..a195d3b --- /dev/null +++ b/package/dnsmasq/patches/200-fix-Makefile-dependency.patch @@ -0,0 +1,13 @@ +Index: dnsmasq-2.62/Makefile +=================================================================== +--- dnsmasq-2.62.orig/Makefile ++++ dnsmasq-2.62/Makefile +@@ -118,7 +118,7 @@ $(BUILDDIR): + $(objs:.o=.c) $(hdrs): + ln -s $(top)/$(SRC)/$@ . + +-.c.o: ++%.o: %.c $(hdrs) + $(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $< + + dnsmasq : $(hdrs) $(objs) diff --git a/package/dnsmasq/patches/300-fix-pkg-config.patch b/package/dnsmasq/patches/300-fix-pkg-config.patch new file mode 100644 index 0000000..e460c90 --- /dev/null +++ b/package/dnsmasq/patches/300-fix-pkg-config.patch @@ -0,0 +1,15 @@ +Index: dnsmasq-2.62/Makefile +=================================================================== +--- dnsmasq-2.62.orig/Makefile ++++ dnsmasq-2.62/Makefile +@@ -57,8 +57,8 @@ idn_cflags = `echo $(COPTS) | $(top)/bl + idn_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn` + ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack` + ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack` +-lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.1` +-lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1` ++lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua` ++lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua` + sunos_libs = `if uname | grep SunOS >/dev/null 2>&1; then echo -lsocket -lnsl -lposix4; fi` + version = -DVERSION='\"`$(top)/bld/get-version $(top)`\"' + diff --git a/package/lua/patches/400-fix_pc_file.patch b/package/lua/patches/400-fix_pc_file.patch new file mode 100644 index 0000000..af72e23 --- /dev/null +++ b/package/lua/patches/400-fix_pc_file.patch @@ -0,0 +1,13 @@ +Index: lua-5.1.4/etc/lua.pc +=================================================================== +--- lua-5.1.4.orig/etc/lua.pc ++++ lua-5.1.4/etc/lua.pc +@@ -25,7 +25,7 @@ Name: Lua + Description: An Extensible Extension Language + Version: ${R} + Requires: +-Libs: -L${libdir} -llua -lm ++Libs: -L${libdir} -llua -lm -ldl + Cflags: -I${includedir} + + # (end of lua.pc) -- 1.7.1 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
