Merge pull request #4673 from diizzyy/patch-79

libs/expat: Update to 2.2.3

diff --git a/.travis_do.sh b/.travis_do.sh
index 47a29f4d1609e441b4164b6a369c8aea2bf00696..683dab79fe2dde77089925d6c9e2c55696b13f09 100755 (executable)
--- a/.travis_do.sh
+++ b/.travis_do.sh
@@ -58,7 +58,7 @@ download_sdk() {
 # test_package call make download check for very new/modified package
 test_packages2() {
        # search for new or modified packages. PKGS will hold a list of package like 'admin/muninlite admin/monit ...'
-       PKGS=$(git diff --name-only "$TRAVIS_COMMIT_RANGE" | grep 'Makefile$' | grep -v '/files/' | awk -F'/Makefile' '{ print $1 }')
+       PKGS=$(git diff --diff-filter=d --name-only "$TRAVIS_COMMIT_RANGE" | grep 'Makefile$' | grep -v '/files/' | awk -F'/Makefile' '{ print $1 }')
 
        if [ -z "$PKGS" ] ; then
                echo_blue "No new or modified packages found!"

diff --git a/lang/php7/Makefile b/lang/php7/Makefile
index 7d5a5324d2837021039698babb4fd990674757f3..a1585186fa6f380a4be765e792b477fea979d0bc 100644 (file)
--- a/lang/php7/Makefile
+++ b/lang/php7/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
-PKG_VERSION:=7.1.7
+PKG_VERSION:=7.1.8
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
@@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.php.net/distributions/
-PKG_HASH:=0d42089729be7b2bb0308cbe189c2782f9cb4b07078c8a235495be5874fff729
+PKG_HASH:=8943858738604acb33ecedb865d6c4051eeffe4e2d06f3a3c8f794daccaa2aab
 
 PKG_FIXUP:=libtool autoreconf
 PKG_BUILD_PARALLEL:=1

diff --git a/net/dnscrypt-proxy/Makefile b/net/dnscrypt-proxy/Makefile
index adf8e313ad1e9cda01e3063052594d698420d292..a4c69b2adbe88d07ffd5c09ab04c06126ee93d64 100644 (file)
--- a/net/dnscrypt-proxy/Makefile
+++ b/net/dnscrypt-proxy/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnscrypt-proxy
 PKG_VERSION:=1.9.5
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.dnscrypt.org/dnscrypt-proxy \

diff --git a/net/dnscrypt-proxy/files/dnscrypt-proxy.config b/net/dnscrypt-proxy/files/dnscrypt-proxy.config
index b3cc6a2b4ddf00012d4603694f24bd062b262b7d..3b3935ca0b3a8b47c3a032c39df1041d34cddda8 100644 (file)
--- a/net/dnscrypt-proxy/files/dnscrypt-proxy.config
+++ b/net/dnscrypt-proxy/files/dnscrypt-proxy.config
@@ -1,3 +1,9 @@
+config global
+       # start dnscrypt-proxy from procd interface trigger rather than immediately in init
+       # if needed you can restrict trigger to certain interface(s)
+       # list procd_trigger 'wan'
+       # list procd_trigger 'wan6'
+
 config dnscrypt-proxy ns1
        option address '127.0.0.1'
        option port '5353'

diff --git a/net/dnscrypt-proxy/files/dnscrypt-proxy.init b/net/dnscrypt-proxy/files/dnscrypt-proxy.init
index b38004dddbb46116e9b99c8b261ee6bf44f16782..8a2f3fd102ecba0880c10769e4ed68507aa6d07f 100644 (file)
--- a/net/dnscrypt-proxy/files/dnscrypt-proxy.init
+++ b/net/dnscrypt-proxy/files/dnscrypt-proxy.init
@@ -6,8 +6,13 @@ PROG=/usr/sbin/dnscrypt-proxy
 CONFIG_DIR=/var/etc
 USER=nobody
 
-dnscrypt_instance() {   
-    local config_path="$CONFIG_DIR/dnscrypt-proxy-$1.conf"     
+boot() {
+    dnscrypt_boot=1
+    rc_procd start_service
+}
+
+dnscrypt_instance() {
+    local config_path="$CONFIG_DIR/dnscrypt-proxy-$1.conf"
     create_config_file $1 "$config_path"
 
     procd_open_instance
@@ -33,7 +38,7 @@ create_config_file() {
     config_get      client_key      $1 'client_key'     ''
     config_get      syslog_prefix   $1 'syslog_prefix'  'dnscrypt-proxy'
     config_get      query_log_file  $1 'query_log_file' ''
-    config_get      log_level       $1 'log_level'     '6'
+    config_get      log_level       $1 'log_level'      '6'
     config_get_bool syslog          $1 'syslog'         '1'
     config_get_bool ephemeral_keys  $1 'ephemeral_keys' '0'
     config_get_bool local_cache     $1 'local_cache'    '0'
@@ -48,7 +53,7 @@ create_config_file() {
     append_param            "LocalAddress"  "$address:$port"    $config_path
     append_param_not_empty  "ClientKey"     "$client_key"       $config_path
     append_on_off           "EphemeralKeys" $ephemeral_keys     $config_path
-    append_param            "LogLevel"      "$log_level"       $config_path
+    append_param            "LogLevel"      "$log_level"        $config_path
     append_on_off           "Syslog"        $syslog             $config_path
     append_param            "SyslogPrefix"  "$syslog_prefix"    $config_path
     append_on_off           "LocalCache"    $local_cache        $config_path
@@ -83,7 +88,7 @@ append_on_off() {
 
     if [ $param_value -eq 1 ]
     then
-        value="on"     
+        value="on"
     else
         value="off"
     fi
@@ -99,7 +104,7 @@ append_yes_no() {
 
     if [ $param_value -eq 1 ]
     then
-        value="yes"    
+        value="yes"
     else
         value="no"
     fi
@@ -128,15 +133,32 @@ append_param_not_empty() {
 
 append_blacklists() {
     local value="$1"
-    local config_path="$2"     
+    local config_path="$2"
     append_param_not_empty "BlackList" "$value" $config_path
 }
 
 start_service() {
+    if [ -n "${dnscrypt_boot}" ]
+    then
+        return 0
+    fi
     config_load dnscrypt-proxy
     config_foreach dnscrypt_instance dnscrypt-proxy
 }
 
 service_triggers() {
+    local trigger
+    local triggerlist="$(uci_get dnscrypt-proxy.@global[0].procd_trigger)"
+
+    PROCD_RELOAD_DELAY=2000
+    if [ -n "${triggerlist}" ]
+    then
+        for trigger in ${triggerlist}
+        do
+            procd_add_interface_trigger "interface.*.up" "${trigger}" /etc/init.d/dnscrypt-proxy reload
+        done
+    else
+        procd_add_raw_trigger "interface.*.up" 2000 /etc/init.d/dnscrypt-proxy reload
+    fi
     procd_add_reload_trigger 'dnscrypt-proxy'
 }

diff --git a/net/git/Makefile b/net/git/Makefile
index 5de00f48ade0fe5d1088e2ccc0465226229c6170..b1d1e656fae885d8232bd4e5d504aa8e1b7ec921 100644 (file)
--- a/net/git/Makefile
+++ b/net/git/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=git
-PKG_VERSION:=2.13.3
+PKG_VERSION:=2.14.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/scm/git/
-PKG_HASH:=91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62
+PKG_HASH:=f93e6e6a307d2e953cccafd9f4003c62992628fa508d07586476c953c1655975
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

diff --git a/net/git/patches/100-configure_for_crosscompiling.patch b/net/git/patches/100-configure_for_crosscompiling.patch
index e93f71b4d0bb46287922fd3b8c01061c876f18e1..b077c55c20af7afaa359e725a03c773d86bc87b3 100644 (file)
--- a/net/git/patches/100-configure_for_crosscompiling.patch
+++ b/net/git/patches/100-configure_for_crosscompiling.patch
@@ -1,8 +1,8 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -869,7 +869,8 @@ AC_RUN_IFELSE(
+@@ -926,7 +926,8 @@ AC_RUN_IFELSE(
                FILE *f = fopen(".", "r");
-               return f && fread(&c, 1, 1, f)]])],
+               return f)]])],
        [ac_cv_fread_reads_directories=no],
 -      [ac_cv_fread_reads_directories=yes])
 +      [ac_cv_fread_reads_directories=yes],
@@ -10,7 +10,7 @@
  ])
  if test $ac_cv_fread_reads_directories = yes; then
        FREAD_READS_DIRECTORIES=UnfortunatelyYes
-@@ -903,7 +904,8 @@ AC_RUN_IFELSE(
+@@ -960,7 +961,8 @@ AC_RUN_IFELSE(
                  if (snprintf(buf, 3, "%s", "12345") != 5
                      || strcmp(buf, "12")) return 1]])],
        [ac_cv_snprintf_returns_bogus=no],
@@ -20,7 +20,7 @@
  ])
  if test $ac_cv_snprintf_returns_bogus = yes; then
        SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes
-@@ -926,7 +928,8 @@ yippeeyeswehaveit
+@@ -983,7 +985,8 @@ yippeeyeswehaveit
  #endif
  ]),
        [ac_cv_sane_mode_bits=yes],

diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch
index 4431dab815304828e93fb2a872952e845544318a..1b9c478155a7c4aba260595072afc799853f62c8 100644 (file)
--- a/net/git/patches/200-imapsend_without_curl.patch
+++ b/net/git/patches/200-imapsend_without_curl.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -1137,7 +1137,7 @@ else
+@@ -1197,7 +1197,7 @@ else
        endif
        curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
        ifeq "$(curl_check)" "072200"

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index cbf1c2a481f24511a6166f1d9d60540989b8b3ea..064e33f7210874cf8e8e7425762470374d48229e 100644 (file)
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -13,13 +13,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nmap
-PKG_VERSION:=7.50
+PKG_VERSION:=7.60
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://nmap.org/dist/
-PKG_MD5SUM:=435c7e095bdd4565e0f69c41743a45be
+PKG_SOURCE_URL:=https://nmap.org/dist/
+PKG_HASH:=a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
 
@@ -29,7 +29,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
 
 include $(INCLUDE_DIR)/package.mk
 
-NMAP_DEPENDS:=+libpcap +libstdcpp
+NMAP_DEPENDS:=+libpcap +libstdcpp +zlib +libpcre
 NCAT_DEPENDS:=+libpcap
 NPING_DEPENDS:=+libpcap +libpthread +libstdcpp
 NDIFF_DEPENDS:=+python
@@ -85,7 +85,7 @@ endef
 
 CONFIGURE_ARGS += \
        --with-libdnet=included \
-       --with-libpcre=included \
+       --with-libpcre="$(STAGING_DIR)/usr" \
        --with-libpcap="$(STAGING_DIR)/usr" \
        --without-liblua \
        --without-zenmap
@@ -95,7 +95,7 @@ CONFIGURE_VARS += \
        CXXFLAGS="$$$$CXXFLAGS -fno-builtin"
 
 ifeq ($(BUILD_VARIANT),ssl)
-       CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr"
+       CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr" --without-libssh2
 else
        CONFIGURE_ARGS += --without-openssl
 endif

diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile
index 4223d295926cccf05bec0b51d6ced441a0fdd4a0..e17f5de9f3cc6def7bd6e54da0e871b3609c6e54 100644 (file)
--- a/net/strongswan/Makefile
+++ b/net/strongswan/Makefile
@@ -86,6 +86,7 @@ PKG_MOD_AVAILABLE:= \
        unity \
        uci \
        updown \
+       vici \
        whitelist \
        x509 \
        xauth-eap \
@@ -137,6 +138,8 @@ $(call Package/strongswan/Default)
   TITLE+= (full)
   DEPENDS:= +strongswan \
        +strongswan-charon \
+       +strongswan-charon-cmd \
+       +strongswan-ipsec \
        +strongswan-mod-addrblock \
        +strongswan-mod-aes \
        +strongswan-mod-af-alg \
@@ -202,12 +205,15 @@ $(call Package/strongswan/Default)
        +strongswan-mod-uci \
        +strongswan-mod-unity \
        +strongswan-mod-updown \
+       +strongswan-mod-vici \
        +strongswan-mod-whitelist \
        +strongswan-mod-x509 \
        +strongswan-mod-xauth-eap \
        +strongswan-mod-xauth-generic \
        +strongswan-mod-xcbc \
-       +strongswan-utils \
+       +strongswan-pki \
+       +strongswan-scepclient \
+       +strongswan-swanctl \
        @DEVEL
 endef
 
@@ -225,6 +231,7 @@ $(call Package/strongswan/Default)
   TITLE+= (default)
   DEPENDS:= +strongswan \
        +strongswan-charon \
+       +strongswan-ipsec \
        +strongswan-mod-aes \
        +strongswan-mod-attr \
        +strongswan-mod-connmark \
@@ -253,8 +260,7 @@ $(call Package/strongswan/Default)
        +strongswan-mod-updown \
        +strongswan-mod-x509 \
        +strongswan-mod-xauth-generic \
-       +strongswan-mod-xcbc \
-       +strongswan-utils
+       +strongswan-mod-xcbc
 endef
 
 define Package/strongswan-default/description
@@ -268,6 +274,7 @@ $(call Package/strongswan/Default)
   TITLE+= (isakmp)
   DEPENDS:= +strongswan \
        +strongswan-charon \
+       +strongswan-ipsec \
        +strongswan-mod-aes \
        +strongswan-mod-des \
        +strongswan-mod-gmpdh \
@@ -281,8 +288,7 @@ $(call Package/strongswan/Default)
        +strongswan-mod-socket-default \
        +strongswan-mod-stroke \
        +strongswan-mod-uci \
-       +strongswan-mod-updown \
-       +strongswan-utils
+       +strongswan-mod-updown
 endef
 
 define Package/strongswan-isakmp/description
@@ -329,15 +335,59 @@ $(call Package/strongswan/description/Default)
  This package contains charon, an IKEv2 keying daemon.
 endef
 
-define Package/strongswan-utils
+define Package/strongswan-charon-cmd
+$(call Package/strongswan/Default)
+  TITLE+= charon-cmd utility
+  DEPENDS:= +strongswan +strongswan-charon
+endef
+
+define Package/strongswan-charon-cmd/description
+$(call Package/strongswan/description/Default)
+ This package contains the charon-cmd utility.
+endef
+
+define Package/strongswan-ipsec
 $(call Package/strongswan/Default)
   TITLE+= utilities
   DEPENDS:= +strongswan
 endef
 
-define Package/strongswan-utils/description
+define Package/strongswan-ipsec/description
+$(call Package/strongswan/description/Default)
+ This package contains the ipsec utility.
+endef
+
+define Package/strongswan-pki
+$(call Package/strongswan/Default)
+  TITLE+= PKI tool
+  DEPENDS:= +strongswan
+endef
+
+define Package/strongswan-pki/description
+$(call Package/strongswan/description/Default)
+ This package contains the pki tool.
+endef
+
+define Package/strongswan-scepclient
+$(call Package/strongswan/Default)
+  TITLE+= SCEP client
+  DEPENDS:= +strongswan
+endef
+
+define Package/strongswan-scepclient/description
 $(call Package/strongswan/description/Default)
- This package contains the pki & scepclient utilities.
+ This package contains the SCEP client.
+endef
+
+define Package/strongswan-swanctl
+$(call Package/strongswan/Default)
+  TITLE+= swanctl utility
+  DEPENDS:= +strongswan +strongswan-mod-vici
+endef
+
+define Package/strongswan-swanctl/description
+$(call Package/strongswan/description/Default)
+ This package contains the swanctl utility.
 endef
 
 define Package/strongswan-libtls
@@ -378,7 +428,9 @@ CONFIGURE_ARGS+= \
        --disable-fast \
        --enable-mediation \
        --with-systemdsystemunitdir=no \
-       $(if $(CONFIG_PACKAGE_strongswan-utils),--enable-pki --enable-scepclient,--disable-pki --disable-scepclient) \
+       $(if $(CONFIG_PACKAGE_strongswan-charon-cmd),--enable-cmd,--disable-cmd) \
+       $(if $(CONFIG_PACKAGE_strongswan-pki),--enable-pki,--disable-pki) \
+       $(if $(CONFIG_PACKAGE_strongswan-scepclient),--enable-scepclient,--disable-scepclient) \
        --with-random-device=/dev/random \
        --with-urandom-device=/dev/urandom \
        --with-routing-table="$(call qstrip,$(CONFIG_STRONGSWAN_ROUTING_TABLE))" \
@@ -428,20 +480,46 @@ define Package/strongswan-minimal/install
 endef
 
 define Package/strongswan-charon/install
+       $(INSTALL_DIR) $(1)/etc/strongswan.d
+       $(CP) $(PKG_INSTALL_DIR)/etc/strongswan.d/charon.conf $(1)/etc/strongswan.d
+       $(CP) $(PKG_INSTALL_DIR)/etc/strongswan.d/charon-logging.conf $(1)/etc/strongswan.d
        $(INSTALL_DIR) $(1)/usr/lib/ipsec
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ipsec/charon $(1)/usr/lib/ipsec/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libcharon.so.* $(1)/usr/lib/ipsec/
 endef
 
-define Package/strongswan-utils/install
+define Package/strongswan-charon-cmd/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/charon-cmd $(1)/usr/sbin/
+endef
+
+define Package/strongswan-ipsec/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ipsec $(1)/usr/sbin/
+endef
+
+define Package/strongswan-pki/install
+       $(INSTALL_DIR) $(1)/etc/strongswan.d
+       $(CP) $(PKG_INSTALL_DIR)/etc/strongswan.d/pki.conf $(1)/etc/strongswan.d/
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pki $(1)/usr/bin/
+endef
+
+define Package/strongswan-scepclient/install
+       $(INSTALL_DIR) $(1)/etc/strongswan.d
+       $(CP) $(PKG_INSTALL_DIR)/etc/strongswan.d/scepclient.conf $(1)/etc/strongswan.d/
        $(INSTALL_DIR) $(1)/usr/lib/ipsec
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ipsec/scepclient $(1)/usr/lib/ipsec/
 endef
 
+define Package/strongswan-swanctl/install
+       $(INSTALL_DIR) $(1)/etc/swanctl/{bliss,ecdsa,pkcs{12,8},private,pubkey,rsa}
+       $(INSTALL_DIR) $(1)/etc/swanctl/x509{,aa,ac,ca,crl,ocsp}
+       $(CP) $(PKG_INSTALL_DIR)/etc/swanctl/swanctl.conf $(1)/etc/swanctl/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/swanctl $(1)/usr/sbin/
+endef
+
 define Package/strongswan-libtls/install
        $(INSTALL_DIR) $(1)/usr/lib/ipsec
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libtls.so.* $(1)/usr/lib/ipsec/
@@ -486,6 +564,12 @@ define Plugin/updown/install
        $(INSTALL_DIR) $(1)/etc
 endef
 
+define Plugin/vici/install
+       $(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libvici.so.* $(1)/usr/lib/ipsec/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-vici.so $(1)/usr/lib/ipsec/plugins/
+endef
+
 define Plugin/whitelist/install
        $(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/whitelist $(1)/usr/lib/ipsec/
@@ -503,7 +587,11 @@ $(eval $(call BuildPackage,strongswan-full))
 $(eval $(call BuildPackage,strongswan-minimal))
 $(eval $(call BuildPackage,strongswan-isakmp))
 $(eval $(call BuildPackage,strongswan-charon))
-$(eval $(call BuildPackage,strongswan-utils))
+$(eval $(call BuildPackage,strongswan-charon-cmd))
+$(eval $(call BuildPackage,strongswan-ipsec))
+$(eval $(call BuildPackage,strongswan-pki))
+$(eval $(call BuildPackage,strongswan-scepclient))
+$(eval $(call BuildPackage,strongswan-swanctl))
 $(eval $(call BuildPackage,strongswan-libtls))
 $(eval $(call BuildPlugin,addrblock,RFC 3779 address block constraint support,))
 $(eval $(call BuildPlugin,aes,AES crypto,))
@@ -568,11 +656,12 @@ $(eval $(call BuildPlugin,socket-dynamic,dynamic socket implementation for charo
 $(eval $(call BuildPlugin,sql,SQL database interface,))
 $(eval $(call BuildPlugin,sqlite,SQLite database interface,+strongswan-mod-sql +PACKAGE_strongswan-mod-sqlite:libsqlite3))
 $(eval $(call BuildPlugin,sshkey,SSH key decoding,))
-$(eval $(call BuildPlugin,stroke,Stroke,+strongswan-charon +strongswan-utils))
+$(eval $(call BuildPlugin,stroke,Stroke,+strongswan-charon +strongswan-ipsec))
 $(eval $(call BuildPlugin,test-vectors,crypto test vectors,))
 $(eval $(call BuildPlugin,uci,UCI config interface,+PACKAGE_strongswan-mod-uci:libuci))
 $(eval $(call BuildPlugin,unity,Cisco Unity extension,))
 $(eval $(call BuildPlugin,updown,updown firewall,))
+$(eval $(call BuildPlugin,vici,Versatile IKE Configuration Interface,))
 $(eval $(call BuildPlugin,whitelist,peer identity whitelisting,))
 $(eval $(call BuildPlugin,x509,x509 certificate,))
 $(eval $(call BuildPlugin,xauth-eap,EAP XAuth backend,))

diff --git a/net/strongswan/files/ipsec.init b/net/strongswan/files/ipsec.init
index 4635eae9cfe092911d83c7ccb480ad564a41c843..311679d69af96caa6283e7b8ff147d12e936b7dc 100644 (file)
--- a/net/strongswan/files/ipsec.init
+++ b/net/strongswan/files/ipsec.init
@@ -3,9 +3,10 @@
 START=90
 STOP=10
 
-. $IPKG_INSTROOT/lib/functions.sh
+USE_PROCD=1
+PROG=/usr/lib/ipsec/starter
 
-UCI_IPSEC_CONFIG=/etc/config/ipsec
+. $IPKG_INSTROOT/lib/functions.sh
 
 IPSEC_SECRETS_FILE=/etc/ipsec.secrets
 IPSEC_CONN_FILE=/etc/ipsec.conf
@@ -15,8 +16,6 @@ IPSEC_VAR_SECRETS_FILE=/var/ipsec/ipsec.secrets
 IPSEC_VAR_CONN_FILE=/var/ipsec/ipsec.conf
 STRONGSWAN_VAR_CONF_FILE=/var/ipsec/strongswan.conf
 
-ENABLED_REMOTE_PEERS=0
-
 file_reset() {
        : > "$1"
 }
@@ -225,9 +224,7 @@ config_remote() {
        config_name=$1
 
        config_get_bool enabled "$1" enabled 0
-       [ "$enabled" = "0" ] && return
-
-       ENABLED_REMOTE_PEERS=$((ENABLED_REMOTE_PEERS + 1))
+       [ $enabled -eq 0 ] && return
 
        config_get gateway           "$1" gateway
        config_get pre_shared_key    "$1" pre_shared_key
@@ -280,7 +277,7 @@ config_ipsec() {
 
        config_get debug "$1" debug 0
        config_get_bool rtinstall_enabled "$1" rtinstall_enabled 1
-       [ $rtinstall_enabled = "1" ] && install_routes=yes || install_routes=no
+       [ $rtinstall_enabled -eq 1 ] && install_routes=yes || install_routes=no
 
        # prepare extra charon config option ignore_routing_tables
        for routing_table in $(config_get "$1" "ignore_routing_tables"); do
@@ -321,28 +318,34 @@ prepare_env() {
        config_foreach config_remote remote
 }
 
-start() {
+reload_service() {
        prepare_env
-       [ $ENABLED_REMOTE_PEERS != 0 -o ! -f $UCI_IPSEC_CONFIG ] && ipsec start
+       if ipsec status > /dev/null 2>&1; then
+               ipsec rereadall
+               ipsec reload
+       else
+               ipsec start
+       fi
 }
 
-stop() {
-       ipsec stop
+service_triggers() {
+       procd_add_reload_trigger "ipsec"
 }
 
-restart() {
+start_service() {
        prepare_env
-       [ $ENABLED_REMOTE_PEERS != 0 -o ! -f $UCI_IPSEC_CONFIG ] && ipsec restart || ipsec stop
-}
 
-reload() {
-       prepare_env
-       [ $ENABLED_REMOTE_PEERS != 0 -o ! -f $UCI_IPSEC_CONFIG ] && {
-               ipsec secrets
-               if [[ ! -z "$(ipsec status)" ]]; then
-                       ipsec reload
-               else
-                       ipsec start
-               fi
-       } || ipsec stop
+       procd_open_instance
+
+       procd_set_param command $PROG --daemon charon --nofork
+
+       procd_set_param file $IPSEC_CONN_FILE
+       procd_append_param file $IPSEC_SECRETS_FILE
+       procd_append_param file $STRONGSWAN_CONF_FILE
+       procd_append_param file /etc/strongswan.d/*.conf
+       procd_append_param file /etc/strongswan.d/charon/*.conf
+
+       procd_set_param respawn
+
+       procd_close_instance
 }

diff --git a/utils/domoticz/Makefile b/utils/domoticz/Makefile
index a7871d180d0356d80daa8bff35c860defd150f2f..8a330be17339a7b2e367dd6c7a1c119abea7dba2 100644 (file)
--- a/utils/domoticz/Makefile
+++ b/utils/domoticz/Makefile
@@ -70,9 +70,10 @@ define Build/Prepare
        # Remove unwanted scripts
        cd $(PKG_BUILD_DIR)/scripts && rm -rf \
                buienradar_rain_example.pl \
-               _domoticz_main.bat \
+               _domoticz_main* \
                download_update.sh \
-               dzVents/{documentation,examples,runtime/{integration-tests,tests}} \
+               dzVents/{.gitignore,documentation,examples} \
+               dzVents/runtime/{integration-tests,misc/smoothing.xlsx,tests} \
                logrotate/ \
                lua_parsers/example* \
                lua/*demo.lua \

diff --git a/utils/gptfdisk/Makefile b/utils/gptfdisk/Makefile
deleted file mode 100644 (file)
index 3ce5a69..0000000
--- a/utils/gptfdisk/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Copyright (C) 2016 Daniel Engberg <daniel.engberg.lists@pyret.net>
-#
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gptfdisk
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/gptfdisk
-PKG_MD5SUM:=d7f3d306b083123bcc6f5941efade586
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gptfdisk/default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Disc
-  URL:=http://www.rodsbooks.com/gdisk
-  MAINTAINER:=Daniel Engberg <daniel.engberg.lists@pyret.net>
-endef
-
-define Package/gdisk
-  $(call Package/gptfdisk/default)
-  TITLE:=GPT partition table manipulation utility
-  DEPENDS:=+libstdcpp +libuuid +libpopt
-endef
-
-define Package/gdisk/description
- GPT partition table manipulation utility with an interface
- similar to fdisk. It can read and convert MBR partitions in GPT
- but is otherwise unable to generate or modify MBR partitions.
-endef
-
-define Package/sgdisk
-  $(call Package/gptfdisk/default)
-  TITLE:=script-friendly GPT partition table manipulation utility
-  DEPENDS:=+libstdcpp +libuuid +libpopt
-endef
-
-define Package/sgdisk/description
- Script-friendly GPT partition table manipulation utility.
- It can read and convert MBR partitions in GPT but is otherwise
- unable to generate or modify MBR partitions.
- To the contrary of gdisk, its interface is geared towards scripts,
- so it takes command line arguments instead of being interactive.
- It will NOT ask confirmation before carrying out the operations.
- It has a slightly smaller footprint than gdisk tool.
-endef
-
-define Package/cgdisk
- $(call Package/gptfdisk/default)
- TITLE:=ncurses-based GPT partition table manipulation utility
- DEPENDS:=+libstdcpp +libuuid +libncurses +libpopt
-endef
-
-define Package/cgdisk/description
-ncurses-based partition table manipulation utility with GPT support.
-Similar to sfdisk, but works with GPT partitions. Shares the same limitations
-of the gdisk partition utility. While it can read and convert MBR partitions
-in GPT, it cannot modify MBR partitions on its own.
-endef
-
-define Package/gdisk/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/gdisk $(1)/usr/sbin
-endef
-
-define Package/sgdisk/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/sgdisk $(1)/usr/sbin
-endef
-
-define Package/cgdisk/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/cgdisk $(1)/usr/sbin
-endef
-
-$(eval $(call BuildPackage,gdisk))
-$(eval $(call BuildPackage,sgdisk))
-$(eval $(call BuildPackage,cgdisk))