Merge pull request #963 from commodo/python-compileall-reduce
authorSteven Barth <steven@midlink.org>
Mon, 2 Mar 2015 06:46:40 +0000 (07:46 +0100)
committerSteven Barth <steven@midlink.org>
Mon, 2 Mar 2015 06:46:40 +0000 (07:46 +0100)
python: reduce size of patch 130

16 files changed:
lang/json4lua/Makefile [new file with mode: 0644]
lang/luarocks/Makefile [new file with mode: 0644]
lang/luarocks/patches/01_dont_modify_bin_shebang.diff [new file with mode: 0644]
lang/php5/Makefile
lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch
lang/uuid/Makefile [new file with mode: 0644]
libs/gnutls/Makefile
libs/libseccomp/Makefile
multimedia/ffmpeg/Makefile
multimedia/mjpg-streamer/Makefile
net/ddns-scripts/Makefile
net/ddns-scripts/files/tld_names.dat
net/ddns-scripts/files/update_nsupdate.sh [new file with mode: 0644]
net/openvswitch/Makefile
utils/haserl/Makefile
utils/haserl/patches/100-replace-lua2c-with-sed.patch

diff --git a/lang/json4lua/Makefile b/lang/json4lua/Makefile
new file mode 100644 (file)
index 0000000..ff8774c
--- /dev/null
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2006-2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#  
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=json4lua
+PKG_VERSION:=0.9.53
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/amrhassan/$(PKG_NAME)/archive/
+PKG_MAINTAINER:=Amr Hassan <amr.hassan@gmail.com>
+PKG_LICENSE=MIT
+
+LUA_MODULE_PATH:=/usr/lib/lua
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/json4lua
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=json4lua
+  URL:=https://github.com/amrhassan/json4lua
+  DEPENDS:=+lua +luasocket
+endef
+
+define Package/json4lua/description
+       JSON and JSONRPC for Lua
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/json4lua/install
+       $(INSTALL_DIR) $(1)/$(LUA_MODULE_PATH)/json
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/json/json.lua $(1)/$(LUA_MODULE_PATH)/json.lua
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/json/rpc.lua $(1)/$(LUA_MODULE_PATH)/json/rpc.lua
+endef
+
+$(eval $(call BuildPackage,json4lua))
diff --git a/lang/luarocks/Makefile b/lang/luarocks/Makefile
new file mode 100644 (file)
index 0000000..15643ff
--- /dev/null
@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2006-2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+# 
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luarocks
+PKG_VERSION:=2.2.0-rc1
+PKG_RELEASE:=2
+
+PKG_SOURCE:=v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/keplerproject/$(PKG_NAME)/archive/
+PKG_MAINTAINER:=Amr Hassan <amr.hassan@gmail.com>
+PKG_INSTALL=1
+PKG_BUILD_DEPENDS:=lua/host luac/host
+PKG_LICENSE=GPL
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/luarocks
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=luarocks
+  URL:=https://github.com/keplerproject/luarocks
+  DEPENDS:=+lua +luac +liblua +luasocket +unzip +curl +luasec
+endef
+
+define Package/luarocks/description
+       LuaRocks is a deployment and management system for Lua modules.
+endef
+
+# My custom args, copied and modified from SDK_ROOT/include/package-defaults.mk
+CONFIGURE_ARGS = \
+    --prefix=$(CONFIGURE_PREFIX) \
+    --sysconfdir=/etc \
+    --with-lua=$(STAGING_DIR_HOST)
+
+define Build/Compile
+       $(call Build/Compile/Default,build)
+endef
+
+define Package/luarocks/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luarocks-5.1 $(1)/usr/bin/luarocks
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luarocks-admin-5.1 $(1)/usr/bin/luarocks-admin
+       $(CP) $(PKG_INSTALL_DIR)/usr/share $(1)/usr/share
+       $(CP) $(PKG_INSTALL_DIR)/etc $(1)/etc
+endef
+
+$(eval $(call BuildPackage,luarocks))
diff --git a/lang/luarocks/patches/01_dont_modify_bin_shebang.diff b/lang/luarocks/patches/01_dont_modify_bin_shebang.diff
new file mode 100644 (file)
index 0000000..a1bad21
--- /dev/null
@@ -0,0 +1,13 @@
+diff -rupN luarocks/Makefile luarocks.new/Makefile
+--- luarocks/Makefile  2015-02-19 13:24:07.027310956 +0200
++++ luarocks.new/Makefile      2015-02-22 13:28:24.497353543 +0200
+@@ -104,7 +104,7 @@ build_bins: cleanup_bins
+       for f in $(BIN_FILES) ;\
+       do \
+          sed "1d" src/bin/$$f > src/bin/$$f.bak ;\
+-         echo "#!$(LUA_BINDIR)/lua$(LUA_SUFFIX)" > src/bin/$$f ;\
++         echo "#!/usr/bin/env lua" > src/bin/$$f ;\
+          echo "package.path = [[$(LUADIR)/?.lua;]]..package.path" | sed "s,//,/,g" >> src/bin/$$f ;\
+          cat src/bin/$$f.bak >> src/bin/$$f ;\
+          chmod +x src/bin/$$f ;\
+Binary files luarocks/src/bin/.luarocks.swp and luarocks.new/src/bin/.luarocks.swp differ
index 8cbdd08ef6f7809c7785a2763b7a2db9c60d7f1d..ccb55f4a55a1289a08b65d4af963ba85b46b3dfd 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
-PKG_VERSION:=5.4.38
+PKG_VERSION:=5.6.6
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -18,9 +18,9 @@ PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.php.net/distributions/
-PKG_MD5SUM:=2bf5007ba4bd012f9895c1b441dd4f50
+PKG_MD5SUM:=b198117ee1d44c8143e030cee15f1b52
 
-PKG_FIXUP:=libtool no-autoreconf
+PKG_FIXUP:=libtool autoreconf
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
index 216a5180a3e99b019a5dddb0a94ddd924cae4d34..02b1f644c11d287cffa2f57dd78b433ae12862aa 100644 (file)
@@ -1,6 +1,7 @@
---- a/configure.in
-+++ b/configure.in
-@@ -453,7 +453,10 @@ PHP_CHECK_FUNC(gethostname, nsl)
+diff -u --recursive php-5.6.6-vanilla/configure.in php-5.6.6/configure.in
+--- php-5.6.6-vanilla/configure.in     2015-02-26 22:10:51.865487530 -0500
++++ php-5.6.6/configure.in     2015-02-26 22:29:59.043102135 -0500
+@@ -453,7 +453,10 @@
  PHP_CHECK_FUNC(gethostbyaddr, nsl)
  PHP_CHECK_FUNC(yp_get_default_domain, nsl)
  
  if test "$ac_cv_func_dlopen" = "yes"; then
    AC_DEFINE(HAVE_LIBDL, 1, [ ])
  fi
+diff -u --recursive php-5.6.6-vanilla/ext/fileinfo/config.m4 php-5.6.6/ext/fileinfo/config.m4
+--- php-5.6.6-vanilla/ext/fileinfo/config.m4   2015-02-26 22:10:51.639487135 -0500
++++ php-5.6.6/ext/fileinfo/config.m4   2015-02-26 22:22:47.645609128 -0500
+@@ -46,6 +46,10 @@
+     AC_MSG_RESULT(no)
+     AC_MSG_NOTICE(using libmagic strcasestr implementation)
+     libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
++  ],[
++    dnl cross-compiling; assume not present
++    AC_MSG_NOTICE(using libmagic strcasestr implementation)
++    libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
+   ])
+   PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
+diff -u --recursive php-5.6.6-vanilla/ext/opcache/config.m4 php-5.6.6/ext/opcache/config.m4
+--- php-5.6.6-vanilla/ext/opcache/config.m4    2015-02-26 22:10:51.790487399 -0500
++++ php-5.6.6/ext/opcache/config.m4    2015-02-26 22:34:19.240414394 -0500
+@@ -341,7 +341,14 @@
+       flock_type=linux
+     AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
+     AC_MSG_RESULT("yes")
+-], AC_MSG_RESULT("no") )
++], [
++    AC_MSG_RESULT("no")
++], [
++    dnl cross-compiling; assume Linux
++      flock_type=linux
++    AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
++    AC_MSG_RESULT("yes")
++])
+ AC_MSG_CHECKING("whether flock struct is BSD ordered")
+ AC_TRY_RUN([
+@@ -357,7 +364,12 @@
+       flock_type=bsd
+     AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) 
+     AC_MSG_RESULT("yes")
+-], AC_MSG_RESULT("no") )
++], [
++    AC_MSG_RESULT("no")
++], [
++    dnl cross-compiling; assume Linux
++    AC_MSG_RESULT("no")
++])
+ if test "$flock_type" == "unknown"; then
+       AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
diff --git a/lang/uuid/Makefile b/lang/uuid/Makefile
new file mode 100644 (file)
index 0000000..7ec89e3
--- /dev/null
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2006-2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=uuid
+PKG_VERSION:=0.2.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=version_$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/Tieske/$(PKG_NAME)/archive/
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-version_$(PKG_VERSION)
+PKG_MAINTAINER:=Amr Hassan <amr.hassan@gmail.com>
+PKG_LICENSE=Apache-2.0
+
+LUA_MODULE_PATH:=/usr/lib/lua
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/uuid
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=uuid
+  URL:=https://github.com/Tieske/uuid
+  DEPENDS:=+lua +luasocket
+endef
+
+define Package/uuid/description
+       A pure Lua uuid generator
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/uuid/install
+       $(INSTALL_DIR) $(1)/$(LUA_MODULE_PATH)
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/uuid.lua $(1)/$(LUA_MODULE_PATH)/uuid.lua
+endef
+
+$(eval $(call BuildPackage,uuid))
index a7aedf9df31dc551386a76ea32718b868776c662..fed88fa13ce964c420e596d6e54d6600e71cc16a 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnutls
-PKG_VERSION:=3.3.12
+PKG_VERSION:=3.3.13
 PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3
-PKG_MD5SUM:=a37b20b4352a5f542367ded904729c90
+PKG_MD5SUM:=a7387fe8bf3e604bf518a6da9ab2a4e6
 PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org>
 
 PKG_INSTALL:=1
index e3ff8b44e25121888b533986721910a4600fd6e3..217c847e089c561eafd8bfd4a0a5305fc9ce1f11 100644 (file)
@@ -51,8 +51,6 @@ define Package/libseccomp/description
 endef
 
 define Build/Configure
-       $(SED) 's,-I$$$${includedir},,g' $(PKG_BUILD_DIR)/configure
-       $(SED) 's,-L$$$${libdir},,g' $(PKG_BUILD_DIR)/configure
        $(call Build/Configure/Default)
 endef
 
index 9b46edb3062187dca949d9786537386aa10336a1..13293a83a839eeeba2f92f4dc249677ed76a79fa 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=2.5.3
+PKG_VERSION:=2.5.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=efba7c5cfbea9ce58ff693cd08f90ffa
+PKG_MD5SUM:=af92a816b642d32134a764d2d7f55b75
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 PKG_LICENSE:=LGPL-2.1+ GPL-2+ LGPL-3
index 24e569df8e101a711227bcf4c6d0a970c1bcff29..d2e1537d9ff9a778fa74f4b2335cc9cdf314a8ac 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=mjpg-streamer
 PKG_REV:=182
 PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2
@@ -54,7 +54,7 @@ CAMBOZOLA:=cambozola-latest.tar.gz
 define Download/cambozola
   URL:=http://www.andywilcock.com/code/cambozola
   FILE:=$(CAMBOZOLA)
-  MD5SUM:=6c48fd994685d4d72668850eeb613e24
+  MD5SUM:=c9b0da91f8e6e72efccd307e04e2b75b
 endef
 
 # Fetch latest cambozola that works with latest Java(s)
index 7c834c2ab649bf4109e06b00540cb0163712c109..54379bf1dc2019291d2ad20219c1263888098224 100644 (file)
@@ -3,17 +3,19 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ddns-scripts
 # Version == major.minor.patch
 # increase on new functionality (minor) or patches (patch)
-PKG_VERSION:=2.3.0
+PKG_VERSION:=2.4.0
 # Release == build
 # increase on changes of services files or tld_names.dat
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
+# no default dependencies
+PKG_DEFAULT_DEPENDS=
+
 define Package/$(PKG_NAME)/Default
     SECTION:=net
     CATEGORY:=Network
@@ -21,6 +23,7 @@ define Package/$(PKG_NAME)/Default
     PKGARCH:=all
 endef
 
+##### **********************************
 define Package/$(PKG_NAME)
     $(call Package/$(PKG_NAME)/Default)
     TITLE:=Dynamic DNS Client scripts (with IPv6 support)
@@ -41,31 +44,53 @@ define Package/$(PKG_NAME)/config
                  - Proxy server support
                  - log file support
                  - support to run once
-
+               .
                Version: $(PKG_VERSION)-$(PKG_RELEASE)
                Info   : http://wiki.openwrt.org/doc/howto/ddns.client
-
+               .
                $(PKG_MAINTAINER)
 endef
 
-define Package/$(PKG_NAME)_CloudFlare
+##### **********************************
+define Package/$(PKG_NAME)_cloudflare
     $(call Package/$(PKG_NAME)/Default)
     TITLE:=DDNS extension for CloudFlare
     DEPENDS:=$(PKG_NAME)
 endef
-define Package/$(PKG_NAME)_CloudFlare/description
+define Package/$(PKG_NAME)_cloudflare/description
     Dynamic DNS Client scripts extension for CloudFlare
 endef
 
-define Package/$(PKG_NAME)_No-IP_com
+##### **********************************
+define Package/$(PKG_NAME)_no-ip_com
     $(call Package/$(PKG_NAME)/Default)
     TITLE:=DDNS extension for No-IP.com
     DEPENDS:=$(PKG_NAME)
 endef
-define Package/$(PKG_NAME)_No-IP_com/description
+define Package/$(PKG_NAME)_no-ip_com/description
     Dynamic DNS Client scripts extension for No-IP.com
 endef
 
+##### **********************************
+define Package/$(PKG_NAME)_nsupdate
+    $(call Package/$(PKG_NAME)/Default)
+    TITLE:=DDNS extension using Bind nsupdate
+    DEPENDS:=$(PKG_NAME) +bind-client
+endef
+define Package/$(PKG_NAME)_nsupdate/description
+    Dynamic DNS Client scripts extension for direct updates using Bind nsupdate
+endef
+define Package/$(PKG_NAME)_nsupdate/config
+    help
+       The script directly updates a PowerDNS (or maybe bind server) via nsupdate 
+       from bind-client package. It requires 
+       "option dns_server" to be set to the server to be used by nsupdate.
+       "option username" should be set to the key name and 
+       "option password" to the base64 encoded shared secret.
+
+endef
+
+##### **********************************
 define Build/Configure
 endef
 define Build/Compile
@@ -84,6 +109,7 @@ define Package/$(PKG_NAME)/conffiles
 /etc/config/ddns
 endef
 
+##### **********************************
 define Package/$(PKG_NAME)/install
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/ddns.hotplug $(1)/etc/hotplug.d/iface/95-ddns
@@ -96,16 +122,6 @@ define Package/$(PKG_NAME)/install
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/files/services* $(1)/usr/lib/ddns
        $(INSTALL_BIN)  $(PKG_BUILD_DIR)/files/dynamic_*.sh $(1)/usr/lib/ddns
 endef
-define Package/$(PKG_NAME)_CloudFlare/install
-       $(INSTALL_DIR) $(1)/usr/lib/ddns
-       $(INSTALL_BIN)  $(PKG_BUILD_DIR)/files/update_CloudFlare.sh $(1)/usr/lib/ddns
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/files/tld_names.dat $(1)/usr/lib/ddns
-endef
-define Package/$(PKG_NAME)_No-IP_com/install
-       $(INSTALL_DIR) $(1)/usr/lib/ddns
-       $(INSTALL_BIN)  $(PKG_BUILD_DIR)/files/update_No-IP.com.sh $(1)/usr/lib/ddns
-endef
-
 define Package/$(PKG_NAME)/postinst
        #!/bin/sh
        # if run within buildroot exit
@@ -123,17 +139,6 @@ define Package/$(PKG_NAME)/postinst
 
        exit 0
 endef
-define Package/$(PKG_NAME)_CloudFlare/postinst
-       #!/bin/sh
-       echo -e '"CloudFlare"\t"update_CloudFlare.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services
-       echo -e '"CloudFlare"\t"update_CloudFlare.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services_ipv6
-endef
-define Package/$(PKG_NAME)_No-IP_com/postinst
-       #!/bin/sh
-       echo -e '"No-IP.com"\t"update_No-IP.com.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services
-       echo -e '"NoIP.com"\t"update_No-IP.com.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services
-endef
-
 define Package/$(PKG_NAME)/prerm
        #!/bin/sh
        # if run within buildroot exit
@@ -148,16 +153,57 @@ define Package/$(PKG_NAME)/prerm
 
        exit 0
 endef
-define Package/$(PKG_NAME)_CloudFlare/prerm
+
+##### **********************************
+define Package/$(PKG_NAME)_cloudflare/install
+       $(INSTALL_DIR) $(1)/usr/lib/ddns
+       $(INSTALL_BIN)  $(PKG_BUILD_DIR)/files/update_CloudFlare.sh $(1)/usr/lib/ddns
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/files/tld_names.dat $(1)/usr/lib/ddns
+endef
+define Package/$(PKG_NAME)_cloudflare/postinst
+       #!/bin/sh
+       echo -e '"CloudFlare"\t"update_CloudFlare.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services
+       echo -e '"CloudFlare"\t"update_CloudFlare.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services_ipv6
+endef
+define Package/$(PKG_NAME)_cloudflare/prerm
        #!/bin/sh
        /bin/sed -i '/update_CloudFlare\.sh/ d' $${IPKG_INSTROOT}/usr/lib/ddns/services
        /bin/sed -i '/update_CloudFlare\.sh/ d' $${IPKG_INSTROOT}/usr/lib/ddns/services_ipv6
 endef
-define Package/$(PKG_NAME)_No-IP_com/prerm
+
+##### **********************************
+define Package/$(PKG_NAME)_no-ip_com/install
+       $(INSTALL_DIR) $(1)/usr/lib/ddns
+       $(INSTALL_BIN)  $(PKG_BUILD_DIR)/files/update_No-IP.com.sh $(1)/usr/lib/ddns
+endef
+define Package/$(PKG_NAME)_no-ip_com/postinst
+       #!/bin/sh
+       echo -e '"No-IP.com"\t"update_No-IP.com.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services
+       echo -e '"NoIP.com"\t"update_No-IP.com.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services
+endef
+define Package/$(PKG_NAME)_no-ip_com/prerm
        #!/bin/sh
        /bin/sed -i '/update_No-IP\.com\.sh/ d' $${IPKG_INSTROOT}/usr/lib/ddns/services
 endef
 
+##### **********************************
+define Package/$(PKG_NAME)_nsupdate/install
+       $(INSTALL_DIR) $(1)/usr/lib/ddns
+       $(INSTALL_BIN)  $(PKG_BUILD_DIR)/files/update_nsupdate.sh $(1)/usr/lib/ddns
+endef
+define Package/$(PKG_NAME)_nsupdate/postinst
+       #!/bin/sh
+       echo -e '"Bind-nsupdate"\t"update_nsupdate.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services
+       echo -e '"Bind-nsupdate"\t"update_nsupdate.sh"' >> $${IPKG_INSTROOT}/usr/lib/ddns/services_ipv6
+endef
+define Package/$(PKG_NAME)_nsupdate/prerm
+       #!/bin/sh
+       /bin/sed -i '/update_nsupdate\.sh/ d' $${IPKG_INSTROOT}/usr/lib/ddns/services
+       /bin/sed -i '/update_nsupdate\.sh/ d' $${IPKG_INSTROOT}/usr/lib/ddns/services_ipv6
+endef
+
+##### **********************************
 $(eval $(call BuildPackage,$(PKG_NAME)))
-$(eval $(call BuildPackage,$(PKG_NAME)_CloudFlare))
-$(eval $(call BuildPackage,$(PKG_NAME)_No-IP_com))
+$(eval $(call BuildPackage,$(PKG_NAME)_cloudflare))
+$(eval $(call BuildPackage,$(PKG_NAME)_no-ip_com))
+$(eval $(call BuildPackage,$(PKG_NAME)_nsupdate))
index 7e1959f42580c3ada24c69f989dd6b1f4c2db6c3..f9274e43b01774d388e60383ae376c5c5ba3c837 100644 (file)
@@ -6153,6 +6153,38 @@ store.st
 
 // su : http://en.wikipedia.org/wiki/.su
 su
+adygeya.su
+arkhangelsk.su
+balashov.su
+bashkiria.su
+bryansk.su
+dagestan.su
+grozny.su
+ivanovo.su
+kalmykia.su
+kaluga.su
+karelia.su
+khakassia.su
+krasnodar.su
+kurgan.su
+lenug.su
+mordovia.su
+msk.su
+murmansk.su
+nalchik.su
+nov.su
+obninsk.su
+penza.su
+pokrovsk.su
+sochi.su
+spb.su
+togliatti.su
+troitsk.su
+tula.su
+tuva.su
+vladikavkaz.su
+vladimir.su
+vologda.su
 
 // sv : http://www.svnet.org.sv/niveldos.pdf
 sv
@@ -9508,6 +9540,7 @@ zuerich
 
 // ===END ICANN DOMAINS===
 // ===BEGIN PRIVATE DOMAINS===
+// (Note: these are in alphabetical order by company name)
 
 // Amazon CloudFront : https://aws.amazon.com/cloudfront/
 // Submitted by Donavan Miller <donavanm@amazon.com> 2013-03-22
@@ -9941,6 +9974,10 @@ firebaseapp.com
 // Submitted by Jonathan Rudenberg <jonathan@flynn.io> 2014-07-12
 flynnhub.com
 
+// GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains
+// Submitted by David Illsley <david.illsley@digital.cabinet-office.gov.uk> 2014-08-28
+service.gov.uk
+
 // GitHub, Inc.
 // Submitted by Ben Toews <btoews@github.com> 2014-02-06
 github.io
@@ -10052,17 +10089,19 @@ poznan.pl
 wroc.pl
 zakopane.pl
 
+// priv.at : http://www.nic.priv.at/
+// Submitted by registry <lendl@nic.at> 2008-06-09
+priv.at
+
 // Red Hat, Inc. OpenShift : https://openshift.redhat.com/
 // Submitted by Tim Kramer <tkramer@rhcloud.com> 2012-10-24
 rhcloud.com
 
-// GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains
-// Submitted by David Illsley <david.illsley@digital.cabinet-office.gov.uk> 2014-08-28
-service.gov.uk
-
-// priv.at : http://www.nic.priv.at/
-// Submitted by registry <lendl@nic.at> 2008-06-09
-priv.at
+// SinaAppEngine : http://sae.sina.com.cn/
+// Submitted by SinaAppEngine <saesupport@sinacloud.com> 2015-02-02
+sinaapp.com
+vipsinaapp.com
+1kapp.com
 
 // TASK geographical domains (www.task.gda.pl/uslugi/dns)
 gda.pl
diff --git a/net/ddns-scripts/files/update_nsupdate.sh b/net/ddns-scripts/files/update_nsupdate.sh
new file mode 100644 (file)
index 0000000..1af9404
--- /dev/null
@@ -0,0 +1,46 @@
+#
+#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
+#
+# The script directly updates a PowerDNS (or maybe bind server) via nsupdate from bind-client package.
+#.based on github request #957 by Jan Riechers <de at r-jan dot de>
+#.2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+#
+# This script is parsed by dynamic_dns_functions.sh inside send_update() function
+#
+# using following options from /etc/config/ddns
+# option username   - keyname 
+# option password   - shared secret (base64 encoded)
+# option domain     - full qualified domain to update
+# option dns_server - DNS server to update
+#
+# variable __IP already defined with the ip-address to use for update
+#
+local __TTL=600                #.preset DNS TTL (in seconds)
+local __RRTYPE __PW __TCP
+
+[ -x /usr/bin/nsupdate ] || write_log 14 "'nsupdate' not installed or not executable !"
+
+[ -z "$username" ]   && write_log 14 "Service section not configured correctly! Missing 'username'"
+[ -z "$password" ]   && write_log 14 "Service section not configured correctly! Missing 'password'"
+[ -z "$dns_server" ] && write_log 14 "Service section not configured correctly! Missing 'dns_server'"
+
+[ $use_ipv6 -ne 0 ] && __RRTYPE="AAAA" || __RRTYPE="A"
+[ $force_dnstcp -ne 0 ] && __TCP="-v" || __TCP=""
+
+# create command file
+cat >$DATFILE <<-EOF
+server $dns_server
+key $username $password
+update del $domain $__RRTYPE
+update add $domain $__TTL $__RRTYPE $__IP
+show
+send
+quit
+EOF
+
+/usr/bin/nsupdate -d $__TCP $DATFILE >$ERRFILE 2>&1
+
+# nsupdate always return success
+write_log 7 "nsupdate reports:\n$(cat $ERRFILE)"
+
+return 0
\ No newline at end of file
index 7f3737cfba0488a4ff5e95bb651dd408e60a6b48..97e782e89976a94cd32b02dfa029312262f0f6ef 100644 (file)
@@ -50,7 +50,8 @@ endef
 define Package/openvswitch
   $(call Package/openvswitch/Default)
   TITLE:=Open vSwitch Userspace Package
-  DEPENDS:=+libpcap +libopenssl +librt +libatomic +kmod-openvswitch
+  DEPENDS:=+libpcap +libopenssl +librt +libatomic +kmod-openvswitch \
+           @(LINUX_3_8||LINUX_3_10||LINUX_3_13||LINUX_3_14)
 endef
 
 define Package/openvswitch/description
index 90bfd24fd36ad49e7bde124d3ea47c06436a4bfa..89cfa4ab5bbd752cbb8d891848c5beb2d9f7e14a 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haserl
-PKG_VERSION:=0.9.33
+PKG_VERSION:=0.9.34
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/haserl
-PKG_MD5SUM:=a9decddb508944d56f71dd2f821e2ec5
+PKG_MD5SUM:=cae2240f25040c7a0a270c35cf7abda4
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
index 5b19fc1ec63ce1e7192c0b9cad4a44cf5a99aa0d..4626a0289e12ceaefc2437cb654c5ed12c21e3b0 100644 (file)
@@ -1,6 +1,8 @@
---- a/src/Makefile.in  2013-09-20 23:52:15.000000000 +0300
-+++ b/src/Makefile.in  2014-05-03 23:06:17.000000000 +0300
-@@ -76,7 +76,6 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 31d45f7..d249f67 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -86,7 +86,6 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -8,7 +10,7 @@
  @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h
  @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h
  bin_PROGRAMS = haserl$(EXEEXT)
-@@ -115,9 +114,6 @@
+@@ -124,9 +123,6 @@ am__DEPENDENCIES_1 =
  haserl_DEPENDENCIES = $(am__DEPENDENCIES_1)
  haserl_LINK = $(CCLD) $(haserl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
@@ -18,7 +20,7 @@
  AM_V_P = $(am__v_P_@AM_V@)
  am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
  am__v_P_0 = false
-@@ -150,8 +146,8 @@
+@@ -159,8 +155,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
  am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
  am__v_CCLD_0 = @echo "  CCLD    " $@;
  am__v_CCLD_1 = 
@@ -29,7 +31,7 @@
  am__can_run_installinfo = \
    case $$AM_UPDATE_INFO_DIR in \
      n|no|NO) false;; \
-@@ -273,7 +269,7 @@
+@@ -284,7 +280,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -38,7 +40,7 @@
  
  # Not strictly required, but we explicitly do not distribute the generated inc file
  nodist_haserl_SOURCES = haserl_lualib.inc
-@@ -386,10 +382,6 @@
+@@ -396,10 +392,6 @@ haserl$(EXEEXT): $(haserl_OBJECTS) $(haserl_DEPENDENCIES) $(EXTRA_haserl_DEPENDE
        @rm -f haserl$(EXEEXT)
        $(AM_V_CCLD)$(haserl_LINK) $(haserl_OBJECTS) $(haserl_LDADD) $(LIBS)
  
@@ -49,7 +51,7 @@
  mostlyclean-compile:
        -rm -f *.$(OBJEXT)
  
-@@ -406,7 +398,6 @@
+@@ -416,7 +408,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-haserl.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-rfc2388.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-sliding_buffer.Po@am__quote@
@@ -57,8 +59,8 @@
  
  .c.o:
  @am__fastdepCC_TRUE@  $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -758,17 +749,13 @@
-       tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+@@ -770,17 +761,13 @@ uninstall-am: uninstall-binPROGRAMS
+ .PRECIOUS: Makefile
  
  
 -# lua2c_LIBS ?= -llua -ldl -lm