Merge pull request #4907 from stargieg/master

knxd: Fix config file location and init script.

diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile
index 5033099743f001243d248b03a186a3363e7181fc..f33309643f739a3d5a8cd669a5e50d8bdd104524 100644 (file)
--- a/libs/libxml2/Makefile
+++ b/libs/libxml2/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libxml2
-PKG_VERSION:=2.9.5
+PKG_VERSION:=2.9.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://gd.tuwien.ac.at/languages/libxml/ \
        http://xmlsoft.org/sources/ \
        ftp://fr.rpmfind.net/pub/libxml/
-PKG_HASH:=4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38
+PKG_HASH:=8b9038cca7240e881d462ea391882092dfdc6d4f483f72683e817be08df5ebbc
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 2f7e8ace16759303be5e4c9d3e6cada4a3ab41f1..0039802c404a654165a6f1826ad877e02e6930f5 100644 (file)
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -8,10 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=postfix
-PKG_RELEASE:=3
-PKG_SOURCE_URL:=ftp://ftp.porcupine.org/mirrors/postfix-release/official/
-PKG_VERSION:=3.2.2
-PKG_HASH:=d06849418d119d09366997b2b481bb23f737629769b4e4a52da42fb3ad8b0576
+PKG_RELEASE:=1
+PKG_VERSION:=3.2.3
+PKG_SOURCE_URL:= \
+       https://cdn.postfix.johnriley.me/mirrors/postfix-release/official/ \
+       ftp://ftp.porcupine.org/mirrors/postfix-release/official/
+
+PKG_HASH:=5b0b975d075ea7561028d4109c581549b794aa92d733429ea6d9fa57751140bf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
 PKG_LICENSE:=IPL-1.0

diff --git a/net/horst/Makefile b/net/horst/Makefile
index 63e2f55ec6fc692f2507a2de8b1e1311e4404820..c18e7454e2b45d5a39c90a200977f67f14717d6d 100644 (file)
--- a/net/horst/Makefile
+++ b/net/horst/Makefile
@@ -12,11 +12,8 @@ PKG_VERSION:=5.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://github.com/br101/horst.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-PKG_MIRROR_HASH:=22f4be94e839c58ac85ebdc2359b813fd5f68dfd71e1b0c9ed9545020d1abc7d
+PKG_SOURCE_URL:=https://github.com/br101/horst/archive/v$(PKG_VERSION)/
+PKG_HASH:=74b4cb1143d93c73c3b4bbbe0c36f89a790401bde9e894e94e2a27339ca384d9
 
 PKG_MAINTAINER:=Bruno Randolf <br1@einfach.org>
 PKG_LICENSE:=GPL-2.0+

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 6b25a3bc5fd465013bc532a94a9c5bc9ec9d4839..7a4cd3685dc7829aae18041ca7cad19a73e69933 100644 (file)
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lftp
 PKG_VERSION:=4.8.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://lftp.tech/ftp/ \
                https://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/
@@ -53,7 +53,7 @@ CONFIGURE_ARGS += \
        --with-zlib="$(STAGING_DIR)/usr" \
        --disable-static
 
-EXTRA_CXXFLAGS += -std=c++0x
+TARGET_CXXFLAGS+= -std=c++11
 
 define Package/lftp/install
        $(INSTALL_DIR) $(1)/usr/bin

diff --git a/net/noddos/Makefile b/net/noddos/Makefile
index 0fe5fe392736409c3e86e5d85fcc6827750c0e57..7e05c3a4ef8d12e432e2c8294f54cc31cae4b2d4 100644 (file)
--- a/net/noddos/Makefile
+++ b/net/noddos/Makefile
@@ -13,10 +13,10 @@ PKG_RELEASE:=1
 PKG_LICENSE:=GPLv3
 PKG_MAINTAINER:=Steven Hessing <steven.hessing@gmail.com>
 
-PKG_SOURCE_VERSION:=0.5.1
+PKG_SOURCE_VERSION:=0.5.2
 PKG_SOURCE_URL:=https://github.com/noddos/noddos/releases/download/v$(PKG_SOURCE_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_HASH:=246bccaf9b4ad589a2884da3bfa449e4adc5fcb951307f1b5a5c2c1bcdef95c1
+PKG_HASH:=63fe85fc4a588da2d71b7b7db68f1c80ba19520467a3800bdb43bc516a6cff72
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 4b80ac00bd0cd34bf732da59e2f2504475acf72d..26b49273747355cfbb2ac4293494f6450a4cb5e1 100644 (file)
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rp-pppoe
 PKG_VERSION:=3.12
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 PKG_MAINTAINER:=Daniel Dickinson <lede@cshore.thecshore.com>
 PKG_LICENSE:=LGPL-2.0+
 

diff --git a/net/rp-pppoe/files/pppoe-relay.init b/net/rp-pppoe/files/pppoe-relay.init
index 4aeeee8c18483b45d97b9d54f338a0affa96d1a8..1c9b16ec77c8e7d4b942b2bea2ee24b4b9cd67a0 100755 (executable)
--- a/net/rp-pppoe/files/pppoe-relay.init
+++ b/net/rp-pppoe/files/pppoe-relay.init
@@ -27,7 +27,7 @@ pppoe_relay_instance() {
     config_get server_interfaces "$cfg" server_interface
     config_get client_interfaces "$cfg" client_interface
     config_get both_interfaces "$cfg" both_interfaces
-    config_get maxsessions "$cfg" maxsesssions
+    config_get maxsessions "$cfg" maxsessions
     config_get timeout "$cfg" timeout
     config_get_bool use_non_uci_config "$cfg" use_non_uci_config 0
 
@@ -44,7 +44,7 @@ pppoe_relay_instance() {
        for interface in $both_interfaces; do
            append OPTIONS "-B $interface"
        done
-       [ -n "$maxsesssions" ] && append OPTIONS "-n $maxsesssions"
+       [ -n "$maxsessions" ] && append OPTIONS "-n $maxsessions"
        [ -n "$timeout" ] && append OPTIONS "-i $timeout"
     fi
 

diff --git a/net/rp-pppoe/files/pppoe-server.init b/net/rp-pppoe/files/pppoe-server.init
index dd2568ec89863e09bed142584d49472835312d7d..f3a53dfd68f80d3bca3f7dfa6f2b715e68b60bc5 100755 (executable)
--- a/net/rp-pppoe/files/pppoe-server.init
+++ b/net/rp-pppoe/files/pppoe-server.init
@@ -16,7 +16,7 @@ pppoe_instance() {
        config_get interface "$cfg" interface
        config_get ac_name "$cfg" ac_name
        config_get service_names "$cfg" service_name
-       config_get maxsessionsperpeer "$cfg" maxsesssionsperpeer
+       config_get maxsessionsperpeer "$cfg" maxsessionsperpeer
        config_get localip "$cfg" localip
        config_get firstremoteip "$cfg" firstremoteip
        config_get maxsessions "$cfg" maxsessions
@@ -38,7 +38,7 @@ pppoe_instance() {
                append OPTIONS "-S $service_name"
            done
            append OPTIONS "-I $interface"
-           [ -n "$maxsesssionsperpeer" ] && append OPTIONS "-x $maxsesssionsperpeer"
+           [ -n "$maxsessionsperpeer" ] && append OPTIONS "-x $maxsessionsperpeer"
            [ -n "$localip" ] && append OPTIONS "-L $localip"
            [ -n "$firstremoteip" ] && append OPTIONS "-R $firstremoteip"
            [ -n "maxsessions" ] && append OPTIONS "-N $maxsessions"

diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index 45074e8cb0cd15a66450b0b2090b7d70e7382515..4679ff3ee3dd4617b7b08ffa8093d0a20454031d 100644 (file)
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=wireguard
 
-PKG_VERSION:=0.0.20171001
+PKG_VERSION:=0.0.20171005
 PKG_RELEASE:=1
 
 PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/
-PKG_HASH:=ecff9a184685b7dd2d81576eba5bd96bb59031c9e9b5eeee05d6dc298f30998e
+PKG_HASH:=832a3b7cbb510f6986fd0c3a6b2d86bc75fc9f23b6754d8f46bc58ea8e02d608
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING