Merge pull request #3461 from Shulyaka/mailman

mailman: update to 2.1.23

diff --git a/admin/debootstrap/Makefile b/admin/debootstrap/Makefile
index eef7bf2e138bf6e334bdced8a48a910a4e47aa10..a7d45c2640224db9a605d81c590c7141e80feaa9 100644 (file)
--- a/admin/debootstrap/Makefile
+++ b/admin/debootstrap/Makefile
@@ -28,7 +28,7 @@ define Package/debootstrap
   CATEGORY:=Administration
   TITLE:=Bootstrap a basic Debian system
   URL:=http://wiki.debian.org/Debootstrap
-  DEPENDS:= +coreutils +coreutils-chroot +coreutils-sha1sum +ar
+  DEPENDS:= +coreutils +coreutils-chroot +coreutils-sha1sum +ar +xz
 endef
 
 define Package/debootstrap/description

diff --git a/lang/python-dns/Makefile b/lang/python-dns/Makefile
index 8dd7106d9d0509af801c150e89d34be844a13896..d36f4d9e0edf2519118f1a344e9c112f15f68e80 100644 (file)
--- a/lang/python-dns/Makefile
+++ b/lang/python-dns/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-dns
 PKG_RELEASE:=1
-PKG_VERSION:=1.12.0
+PKG_VERSION:=1.15.0
 PKG_SOURCE_URL:=http://www.dnspython.org/kits/$(PKG_VERSION)
-PKG_MD5SUM:=3f2601ef3c8b77fc6d21a9c77a81efeb
+PKG_MD5SUM:=63a679089822fb86127867c315286dc5
 PKG_SOURCE:=dnspython-$(PKG_VERSION).tar.gz
 PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
 PKG_LICENSE:=ISC

diff --git a/lang/python-urllib3/Makefile b/lang/python-urllib3/Makefile
index 8c799ec0ad45d0bc476cfc018416ad65ed3b7460..318ece049ac4bb83bdbc33e14d20c45ef4c617eb 100644 (file)
--- a/lang/python-urllib3/Makefile
+++ b/lang/python-urllib3/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-urllib3
-PKG_VERSION:=1.16
+PKG_VERSION:=1.18.1
 PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 
 PKG_SOURCE:=urllib3-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/urllib3-$(PKG_VERSION)/
-PKG_SOURCE_URL:=https://pypi.python.org/packages/3b/f0/e763169124e3f5db0926bc3dbfcd580a105f9ca44cf5d8e6c7a803c9f6b5/
-PKG_MD5SUM:=fcaab1c5385c57deeb7053d3d7d81d59
+PKG_SOURCE_URL:=https://pypi.python.org/packages/d8/1f/7e5e7e7d36fa82c179085ef06c32abe2a1f8a25067e1724921f7e871da1a/
+PKG_MD5SUM:=30b6f366a691b7b5d2eb67d20932b77f
 PKG_BUILD_DEPENDS:=python python-setuptools
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk
index 080704bbaac9d0e8503aeba24f8b6b30e39110c5..0a5eb4193eea752b337fdd266c349241255cdaa9 100644 (file)
--- a/lang/python/files/python-host.mk
+++ b/lang/python/files/python-host.mk
@@ -5,7 +5,13 @@
 # See /LICENSE for more information.
 #
 
-HOST_PYTHON_DIR:=$(HOST_BUILD_PREFIX)
+# Compatibility fallback for older OpenWrt and LEDE versions
+ifeq ($(STAGING_DIR_HOSTPKG),)
+  $(warning STAGING_DIR_HOSTPKG is unset - falling back to $$(STAGING_DIR)/host)
+  STAGING_DIR_HOSTPKG := $(STAGING_DIR)/host
+endif
+
+HOST_PYTHON_DIR:=$(STAGING_DIR_HOSTPKG)
 HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION)
 HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION)
 
@@ -13,7 +19,7 @@ HOST_PYTHON_PKG_DIR:=/lib/python$(PYTHON_VERSION)/site-packages
 
 HOST_PYTHON_BIN:=$(HOST_PYTHON_DIR)/bin/python$(PYTHON_VERSION)
 
-HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(HOST_BUILD_PREFIX)/$(HOST_PYTHON_PKG_DIR)
+HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR_HOSTPKG)/$(HOST_PYTHON_PKG_DIR)
 
 define HostPython
        if [ "$(strip $(3))" == "HOST" ]; then \
@@ -44,7 +50,7 @@ define Build/Compile/HostPyRunHost
                LDSHARED="$(HOSTCC) -shared" \
                CFLAGS="$(HOST_CFLAGS)" \
                CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON_INC_DIR)" \
-               LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(HOST_BUILD_PREFIX)/lib" \
+               LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR_HOSTPKG)/lib" \
                _PYTHON_HOST_PLATFORM=linux2 \
                $(3) \
                , \

diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk
index d2697d9d4bf5b3168c081e9237f05788c8e69e1a..1a12d13ddf3c34600448418d638ea08dd39945a6 100644 (file)
--- a/lang/python3/files/python3-package.mk
+++ b/lang/python3/files/python3-package.mk
@@ -5,6 +5,12 @@
 # See /LICENSE for more information.
 #
 
+# Compatibility fallback for older OpenWrt and LEDE versions
+ifeq ($(STAGING_DIR_HOSTPKG),)
+  $(warning STAGING_DIR_HOSTPKG is unset - falling back to $$(STAGING_DIR)/host)
+  STAGING_DIR_HOSTPKG := $(STAGING_DIR)/host
+endif
+
 PYTHON3_VERSION_MAJOR:=3
 PYTHON3_VERSION_MINOR:=5
 PYTHON3_VERSION_MICRO:=2
@@ -20,8 +26,8 @@ PYTHON3_PKG_DIR:=/usr/lib/python$(PYTHON3_VERSION)/site-packages
 
 PYTHON3:=python$(PYTHON3_VERSION)
 
-HOST_PYTHON3_LIB_DIR:=$(HOST_BUILD_PREFIX)/lib/python$(PYTHON3_VERSION)
-HOST_PYTHON3_BIN:=$(HOST_BUILD_PREFIX)/bin/python3
+HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR_HOSTPKG)/lib/python$(PYTHON3_VERSION)
+HOST_PYTHON3_BIN:=$(STAGING_DIR_HOSTPKG)/bin/python3
 
 PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
 define HostPython3

diff --git a/lang/simplejson/Makefile b/lang/simplejson/Makefile
index 2d7c75ccf88d51c93031128071e569a3644ef87e..c6d9c2b3c7176f62f3492f0adeedfcf74dc47c5f 100644 (file)
--- a/lang/simplejson/Makefile
+++ b/lang/simplejson/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=simplejson
-PKG_VERSION:=3.8.2
+PKG_VERSION:=3.10.0
 PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://pypi.python.org/packages/source/s/simplejson/
-PKG_MD5SUM:=53b1371bbf883b129a12d594a97e9a18
+PKG_SOURCE_URL:=https://pypi.python.org/packages/40/ad/52c1f3a562df3b210e8f165e1aa243a178c454ead65476a39fa3ce1847b6/
+PKG_MD5SUM:=426a9631d22851a7a970b1a677368b15
 PKG_BUILD_DEPENDS:=python python-setuptools
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 2dd639e6fd2fac8df325ff71a07947eaa2f868ce..f9049eee25e254602b4d9fe8db237008c8df8fa8 100644 (file)
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vala
-PKG_VERSION:=0.32.0
+PKG_VERSION:=0.34.2
 PKG_RELEASE:=1
 PKG_LICENSE:=LGPL-2.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/vala/0.32/
-PKG_MD5SUM:=d3ff298424bb80476f7d189e6b614c35
+PKG_SOURCE_URL:=@GNOME/vala/0.34/
+PKG_MD5SUM:=f9b4a0a10b76b56b0b6e914c506a6828
 
 PKG_BUILD_DEPENDS:=glib2 glib2/host vala/host
 HOST_BUILD_DEPENDS:=glib2/host
@@ -48,45 +48,45 @@ endef
 
 define Build/InstallDev
        $(INSTALL_DIR) \
-               $(1)/usr/share/vala-0.32/vapi \
+               $(1)/usr/share/vala-0.34/vapi \
                $(1)/usr/lib \
-               $(1)/usr/share/pkgconfig
+               $(1)/usr/lib/pkgconfig
 
        $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/share/vala-0.32/vapi/* \
-               $(1)/usr/share/vala-0.32/vapi
+               $(PKG_INSTALL_DIR)/usr/share/vala-0.34/vapi/* \
+               $(1)/usr/share/vala-0.34/vapi
 
        $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/libvala-0.32.{so*,la} \
+               $(PKG_INSTALL_DIR)/usr/lib/libvala-0.34.{so*,la} \
                $(1)/usr/lib
 
        $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/share/pkgconfig/*.pc \
-               $(1)/usr/share/pkgconfig
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
+               $(1)/usr/lib/pkgconfig
 endef
 
 define Package/vala/install
        $(INSTALL_DIR) \
-               $(1)/usr/share/vala-0.32/vapi \
+               $(1)/usr/share/vala-0.34/vapi \
                $(1)/usr/lib \
-               $(1)/usr/share/pkgconfig \
+               $(1)/usr/lib/pkgconfig \
                $(1)/usr/bin
 
        $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/share/vala-0.32/vapi/* \
-               $(1)/usr/share/vala-0.32/vapi
+               $(PKG_INSTALL_DIR)/usr/share/vala-0.34/vapi/* \
+               $(1)/usr/share/vala-0.34/vapi
 
        $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/libvala-0.32.{so*,la} \
+               $(PKG_INSTALL_DIR)/usr/lib/libvala-0.34.{so*,la} \
                $(1)/usr/lib
 
        $(INSTALL_BIN) \
-               $(PKG_INSTALL_DIR)/usr/bin/{vala,vala-0.32,valac,valac-0.32,vapicheck,vapicheck-0.32,vapigen,vapigen-0.32,vala-gen-introspect,vala-gen-introspect-0.32} \
+               $(PKG_INSTALL_DIR)/usr/bin/{vala,vala-0.34,valac,valac-0.34,vapicheck,vapicheck-0.34,vapigen,vapigen-0.34,vala-gen-introspect,vala-gen-introspect-0.34} \
                $(1)/usr/bin
 
        $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/share/pkgconfig/*.pc \
-               $(1)/usr/share/pkgconfig
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
+               $(1)/usr/lib/pkgconfig
 endef
 
 $(eval $(call HostBuild))

diff --git a/libs/elektra/Makefile b/libs/elektra/Makefile
index 9077904847e00f6c6de328deda8df0810ac6088b..3b98e23efedb4320c9835eec8a046dd3446a23ea 100644 (file)
--- a/libs/elektra/Makefile
+++ b/libs/elektra/Makefile
@@ -14,11 +14,11 @@ PKG_MAINTAINER:=Harald Geyer <harald@ccbib.org>
 PKG_NAME:=elektra
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=doc/COPYING
-PKG_VERSION:=0.8.17
-PKG_RELEASE:=2
+PKG_VERSION:=0.8.18
+PKG_RELEASE:=1
 
 # Use this for official releasees
-PKG_MD5SUM:=e53efdb9a5e0852c58b21280b1e6c07d
+PKG_MD5SUM:=62fe0fbf9ee57ffaa58a982f602f596a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://ftp.libelektra.org/ftp/elektra/releases
 
@@ -97,7 +97,7 @@ define Package/libelektra-plugins
 endef
 
 define CONTENT_ELEKTRA_PLUGINS_TEXT
-cachefilter ccode conditionals csvstorage enum filecheck glob
+boolean cachefilter ccode conditionals csvstorage enum filecheck glob
 hexcode hidden hosts iconv keytometa line lineendings list mathcheck
 network null path profile shell syslog uname validation
 endef
@@ -245,14 +245,20 @@ define Package/libelektra-extra
   DEPENDS:=+libelektra-core
 endef
 
-CONTENT_ELEKTRA_EXTRA:=constants counter dpkg error fstab logchange rename timeofday tracer
+define CONTENT_EXTRA_PLUGINS_TEXT
+blockresolver constants counter desktop dpkg error fstab logchange
+mozprefs passwd rename timeofday tracer
+endef
+
+CONTENT_ELEKTRA_EXTRA:=$(strip $(CONTENT_EXTRA_PLUGINS_TEXT))
 
 define Package/libelektra-extra/description
 $(call Package/libelektra/Default-description)
 
 This package contains extra plugins that are only useful for debugging
-or as an example of what can be done. Currently this includes:
-$(CONTENT_ELEKTRA_EXTRA)
+or as an example of what can be done. Also most experimental plugins are
+included in this package. Currently this includes:
+$(CONTENT_EXTRA_PLUGINS_TEXT)
 endef
 
 CMAKE_OPTIONS = \
@@ -264,6 +270,7 @@ CMAKE_OPTIONS = \
        -DBUILD_TESTING=OFF \
        -DKDB_DEFAULT_RESOLVER=resolver_fm_pb_b \
        -DKDB_DEFAULT_STORAGE=ini \
+       -DENABLE_OPTIMIZATIONS=OFF \
        -DPLUGINS="ALL"
 
 CMAKE_HOST_OPTIONS = \

diff --git a/libs/libjpeg/Makefile b/libs/libjpeg/Makefile
index 2aa82221aadbb15ea6bac67cf4f685bc925e6705..c88bca0300b835d747b935a332c67ecdb9e3ee7c 100644 (file)
--- a/libs/libjpeg/Makefile
+++ b/libs/libjpeg/Makefile
@@ -41,6 +41,7 @@ define Package/jpeg-tools
   $(call Package/jpeg/Default)
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=Image Manipulation
   DEPENDS:=+libjpeg
   TITLE+= manipulation tools
 endef

diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile
index 6d83fe79a97ae5ae8b82cabe600577fcc56aa0e4..7c8d18e6b362905d63446a915032bf2b0609ad24 100644 (file)
--- a/libs/tiff/Makefile
+++ b/libs/tiff/Makefile
@@ -54,6 +54,7 @@ define Package/tiff-utils
 $(call Package/tiff/Default)
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=Image Manipulation
   TITLE+= utilities
   DEPENDS:=+libtiff
 endef

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 137a45b1c0d04eb3134311c12eda329f05cc0bcb..29ce3304f07fefa5ad84f086e3e2065bad2e2f58 100644 (file)
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=postfix
 PKG_RELEASE:=1
 PKG_SOURCE_URL:=ftp://ftp.porcupine.org/mirrors/postfix-release/official/
-PKG_VERSION:=3.1.0
-PKG_MD5SUM:=b4a506fa74c69c6fb1875c0971268344
+PKG_VERSION:=3.1.3
+PKG_MD5SUM:=28a1dedbbbedfcf5fc09fd88bac116b6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
 PKG_LICENSE:=IPL-1.0

diff --git a/mail/postfix/files/main.cf.default b/mail/postfix/files/main.cf.default
index 9075498a938f315681d6b430dbb43173ecc32870..5024579bdd8fc551730c5fda3f42f3ae29d75307 100644 (file)
--- a/mail/postfix/files/main.cf.default
+++ b/mail/postfix/files/main.cf.default
@@ -313,8 +313,8 @@ local_transport_rate_delay = $default_transport_rate_delay
 luser_relay =
 mail_name = Postfix
 mail_owner = postfix
-mail_release_date = 20160224
-mail_version = 3.1.0
+mail_release_date = 20161001
+mail_version = 3.1.3
 mailbox_command =
 mailbox_command_maps =
 mailbox_delivery_lock = fcntl, dotlock
@@ -768,7 +768,7 @@ tls_random_exchange_name = ${data_directory}/prng_exch
 tls_random_prng_update_period = 3600s
 tls_random_reseed_period = 3600s
 tls_random_source = dev:/dev/urandom
-tls_session_ticket_cipher = aes-128-cbc
+tls_session_ticket_cipher = aes-256-cbc
 tls_ssl_options =
 tls_wildcard_matches_multiple_labels = yes
 tlsmgr_service_name = tlsmgr

diff --git a/mail/postfix/files/postfix.init b/mail/postfix/files/postfix.init
index dbedc407169ecbaa8dd927e71726019caceda257..912f8fcf2a7eae91092a971582527a3f39d25cd0 100644 (file)
--- a/mail/postfix/files/postfix.init
+++ b/mail/postfix/files/postfix.init
@@ -3,60 +3,59 @@
 
 START=50
 STOP=50
-EXTRA_COMMANDS="status abort flush"
+EXTRA_COMMANDS="status abort flush postinst"
 EXTRA_HELP="   status  Display the service status
        abort   Stop the service abruptly. Running processes are signaled to stop immediately
-       flush   Force delivery: attempt to deliver every message in the deferred mail queue"
+       flush   Force delivery: attempt to deliver every message in the deferred mail queue
+       postinst Force running a script that checks for users, group, configuration, permissions, etc"
 
-upgrade() {
-       config_directory="$IPKG_INSTROOT"/etc/postfix
+config_directory="$IPKG_INSTROOT"/etc/postfix
 
-       if [ -f "$config_directory"/opkg_postinst ]; then
-               rm -f "$config_directory"/opkg_postinst
+postinst() {
+       rm -f "$config_directory"/opkg_postinst
 
-               group_exists postfix || group_add postfix 87
-               user_exists postfix || user_add postfix 87
-               group_exists postdrop || group_add postdrop 88
+       group_exists postfix || group_add postfix 87
+       user_exists postfix || user_add postfix 87
+       group_exists postdrop || group_add postdrop 88
 
-               echo "myhostname = $(uci get system.@system[0].hostname)" >> "$config_directory"/main.cf.default
-               echo "mydomain = $(uci get system.@system[0].hostname|sed -e "s/[^\.]*\.\(.*\)/\1/")" >> "$config_directory"/main.cf.default
-               (eval $(ipcalc.sh $(uci get network.lan.ipaddr) $(uci get network.lan.netmask)); echo mynetworks = 127.0.0.0/8 $NETWORK/$PREFIX) >> "$config_directory"/main.cf.default
-               echo "mynetworks_style = subnet" >> "$config_directory"/main.cf.default
+       echo "myhostname = $(uci get system.@system[0].hostname)" >> "$config_directory"/main.cf.default
+       echo "mydomain = $(uci get system.@system[0].hostname|sed -e "s/[^\.]*\.\(.*\)/\1/")" >> "$config_directory"/main.cf.default
+       (eval $(ipcalc.sh $(uci get network.lan.ipaddr) $(uci get network.lan.netmask)); echo mynetworks = 127.0.0.0/8 $NETWORK/$PREFIX) >> "$config_directory"/main.cf.default
+       echo "mynetworks_style = subnet" >> "$config_directory"/main.cf.default
 
-               grep -qc "^sendmail_path[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^sendmail_path =" "$config_directory"/main.cf.default)"
-               grep -qc "^newaliases_path[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^newaliases_path =" "$config_directory"/main.cf.default)"
-               grep -qc "^mailq_path[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mailq_path =" "$config_directory"/main.cf.default)"
-               grep -qc "^html_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^html_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^manpage_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^manpage_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^sample_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^sample_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^readme_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^readme_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^command_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^command_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^daemon_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^daemon_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^data_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^data_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^queue_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^queue_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^config_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^config_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^mail_spool_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mail_spool_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^mail_owner[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mail_owner =" "$config_directory"/main.cf.default)"
-               grep -qc "^setgid_group[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^setgid_group =" "$config_directory"/main.cf.default)"
-               grep -qc "^myhostname[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^myhostname =" "$config_directory"/main.cf.default)"
-               grep -qc "^mydomain[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mydomain =" "$config_directory"/main.cf.default)"
-               #grep -qc "^mynetworks[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mynetworks =" "$config_directory"/main.cf.default)" #Setting mynetworks_style is enough
-               grep -qc "^mynetworks_style[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mynetworks_style =" "$config_directory"/main.cf.default)"
-               grep -qc "^shlib_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^shlib_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^meta_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^meta_directory =" "$config_directory"/main.cf.default)"
-               grep -qc "^smtputf8_enable[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^smtputf8_enable =" "$config_directory"/main.cf.default)"
+       grep -qc "^sendmail_path[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^sendmail_path =" "$config_directory"/main.cf.default)"
+       grep -qc "^newaliases_path[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^newaliases_path =" "$config_directory"/main.cf.default)"
+       grep -qc "^mailq_path[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mailq_path =" "$config_directory"/main.cf.default)"
+       grep -qc "^html_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^html_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^manpage_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^manpage_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^sample_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^sample_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^readme_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^readme_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^command_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^command_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^daemon_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^daemon_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^data_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^data_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^queue_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^queue_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^config_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^config_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^mail_spool_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mail_spool_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^mail_owner[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mail_owner =" "$config_directory"/main.cf.default)"
+       grep -qc "^setgid_group[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^setgid_group =" "$config_directory"/main.cf.default)"
+       grep -qc "^myhostname[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^myhostname =" "$config_directory"/main.cf.default)"
+       grep -qc "^mydomain[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mydomain =" "$config_directory"/main.cf.default)"
+       #grep -qc "^mynetworks[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mynetworks =" "$config_directory"/main.cf.default)" #Setting mynetworks_style is enough
+       grep -qc "^mynetworks_style[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^mynetworks_style =" "$config_directory"/main.cf.default)"
+       grep -qc "^shlib_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^shlib_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^meta_directory[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^meta_directory =" "$config_directory"/main.cf.default)"
+       grep -qc "^smtputf8_enable[^_]" "$config_directory"/main.cf >/dev/null || postconf -e "$(grep "^smtputf8_enable =" "$config_directory"/main.cf.default)"
 
-               postfix set-permissions
-               postfix post-install upgrade-source
-               postfix upgrade-configuration
-               newaliases
-               postmap "$config_directory"/virtual
-               postfix check
-       fi
+       postfix set-permissions
+       postfix post-install upgrade-source
+       postfix upgrade-configuration
+       newaliases
+       postmap "$config_directory"/virtual
+       postfix check
 }
 
 start() {
-       upgrade
+       test -f "$config_directory"/opkg_postinst && postinst
        postfix start
 }
 
@@ -65,7 +64,7 @@ stop() {
 }
 
 reload() {
-       upgrade
+       test -f "$config_directory"/opkg_postinst && postinst
        postfix reload
 }
 

diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 064c14bc83ef54591aa3c4aea56582a2a05cbaae..22db52a04867387aad8c270f34e2b5684cf64230 100644 (file)
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ssmtp
 PKG_VERSION:=2.64
-PKG_RELEASE:=3
+PKG_RELEASE:=5
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 PKG_LICENSE:=GPL-2.0+
 

diff --git a/net/bind/Makefile b/net/bind/Makefile
index e3bfb067d28c89afb358e0d930e7d19d8db9d758..0f1212cedb1dfaea7b0e11b6ca6ac48fa86fac73 100644 (file)
--- a/net/bind/Makefile
+++ b/net/bind/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bind
-PKG_VERSION:=9.9.9-P3
+PKG_VERSION:=9.10.4-P4
 PKG_RELEASE:=1
 USERID:=bind=57:bind=57
 
@@ -20,7 +20,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= \
        ftp://ftp.isc.org/isc/bind9/$(PKG_VERSION) \
        http://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION)
-PKG_MD5SUM:=98d46cebb3fac3c6f282e8467424821b
+PKG_MD5SUM:=e110904a1d54f83f01d4be8bcd842927
 
 PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES:=aclocal.m4 libtool.m4

diff --git a/net/bind/patches/001-no-tests.patch b/net/bind/patches/001-no-tests.patch
index c969c5e9684250f16a3c24ddef2cd6373e3c2a40..321924b0c1f84604a475147d10e8ae338e2b3aad 100644 (file)
--- a/net/bind/patches/001-no-tests.patch
+++ b/net/bind/patches/001-no-tests.patch
@@ -1,26 +1,26 @@
-Index: bind-9.9.4/bin/Makefile.in
+Index: bind-9.10.4-P3/bin/Makefile.in
 ===================================================================
---- bind-9.9.4.orig/bin/Makefile.in
-+++ bind-9.9.4/bin/Makefile.in
+--- bind-9.10.4-P3.orig/bin/Makefile.in
++++ bind-9.10.4-P3/bin/Makefile.in
 @@ -19,7 +19,7 @@ srcdir =     @srcdir@
  VPATH =               @srcdir@
  top_srcdir =  @top_srcdir@
  
--SUBDIRS =     named rndc dig dnssec tools tests nsupdate \
-+SUBDIRS =     named rndc dig dnssec tools nsupdate \
+-SUBDIRS =     named rndc dig delv dnssec tools tests nsupdate \
++SUBDIRS =     named rndc dig delv dnssec tools nsupdate \
                check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
  TARGETS =
  
-Index: bind-9.9.4/lib/Makefile.in
+Index: bind-9.10.4-P3/lib/Makefile.in
 ===================================================================
---- bind-9.9.4.orig/lib/Makefile.in
-+++ bind-9.9.4/lib/Makefile.in
+--- bind-9.10.4-P3.orig/lib/Makefile.in
++++ bind-9.10.4-P3/lib/Makefile.in
 @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@
  # Attempt to disable parallel processing.
  .NOTPARALLEL:
  .NO_PARALLEL:
--SUBDIRS =     isc isccc dns isccfg bind9 lwres tests
-+SUBDIRS =     isc isccc dns isccfg bind9 lwres
+-SUBDIRS =     isc isccc dns isccfg bind9 lwres irs tests samples
++SUBDIRS =     isc isccc dns isccfg bind9 lwres irs samples
  TARGETS =
  
  @BIND9_MAKE_RULES@

diff --git a/net/bind/patches/002-autoconf-ar-fix.patch b/net/bind/patches/002-autoconf-ar-fix.patch
index 501fa7d3b3854def87f10ee8cea6fd831d94eb5a..c3602603458058d2432c61eb8c90c40465ec43f6 100644 (file)
--- a/net/bind/patches/002-autoconf-ar-fix.patch
+++ b/net/bind/patches/002-autoconf-ar-fix.patch
@@ -1,6 +1,8 @@
---- a/configure.in
-+++ b/configure.in
-@@ -93,26 +93,11 @@ esac
+Index: bind-9.10.4-P3/configure.in
+===================================================================
+--- bind-9.10.4-P3.orig/configure.in
++++ bind-9.10.4-P3/configure.in
+@@ -167,26 +167,11 @@ esac
  #
  AC_CONFIG_FILES([make/rules make/includes])
  

diff --git a/net/fossil/Makefile b/net/fossil/Makefile
index 3faf4587ec485b681a73335fb3d80076ebfa4f5c..3b7a47aac89ecc8c6fa2d549f0da8219a92bf8a4 100644 (file)
--- a/net/fossil/Makefile
+++ b/net/fossil/Makefile
@@ -14,8 +14,8 @@ PKG_RELEASE:=1
 PKG_LICENSE:=BSD-2-Clause
 PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
-PKG_SOURCE:=$(PKG_NAME)-src-${PKG_VERSION}.tar.gz
-PKG_SOURCE_URL:=http://www.fossil-scm.org/download/
+PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://www.fossil-scm.org/index.html/uv/download
 PKG_MD5SUM:=3d5a7da5c506a47784942236a788b29b
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-src-$(PKG_VERSION)

diff --git a/net/ser2net/Makefile b/net/ser2net/Makefile
index 2e38ac8038e10f34946ac5fb84fc216e914af2de..2f36e66f4a518c099959fd57f5372c12ba33174d 100644 (file)
--- a/net/ser2net/Makefile
+++ b/net/ser2net/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ser2net
 PKG_VERSION:=3.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ser2net
@@ -29,6 +29,7 @@ define Package/ser2net
   CATEGORY:=Network
   TITLE:=Serial to Network Proxy
   URL:=http://sourceforge.net/projects/ser2net/
+  DEPENDS:=+USE_UCLIBC:libpthread
 endef
 
 define Package/ser2net/description

diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile
index 8e3d2fb29bf250915e798811a83934f445401e20..029b8bff760a9fb70a88c34e4b82b30631105b05 100644 (file)
--- a/net/strongswan/Makefile
+++ b/net/strongswan/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=strongswan
-PKG_VERSION:=5.5.0
+PKG_VERSION:=5.5.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.strongswan.org/ http://download2.strongswan.org/
-PKG_MD5SUM:=a96fa7eb6c62b40143dadb064b6bd586
+PKG_MD5SUM:=4eba9474f7dc6c8c8d7037261358e68d
 PKG_LICENSE:=GPL-2.0+
-PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
+PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
 
 PKG_MOD_AVAILABLE:= \
        addrblock \
@@ -393,6 +393,7 @@ define Package/strongswan/conffiles
 /etc/ipsec.secrets
 /etc/ipsec.user
 /etc/strongswan.conf
+/etc/strongswan.d/
 endef
 
 define Package/strongswan/install

diff --git a/net/strongswan/patches/101-musl-fixes.patch b/net/strongswan/patches/101-musl-fixes.patch
index ff7afa4eda4ab664cfe307f997ab87afdf15e562..cbb6c047d19ed8b38a415938024c9f74b1c6d597 100644 (file)
--- a/net/strongswan/patches/101-musl-fixes.patch
+++ b/net/strongswan/patches/101-musl-fixes.patch
@@ -52,15 +52,14 @@
 +#undef encrypt
 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
 +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
-@@ -18,6 +18,8 @@
-  * for more details.
+@@ -19,6 +19,7 @@
   */
  
-+#include <musl.h>
-+
  #define _GNU_SOURCE
++#include <musl.h>
  #include <sys/types.h>
  #include <sys/socket.h>
+ #include <stdint.h>
 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
 +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
 @@ -37,6 +37,8 @@

diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index 8ba951a95584de48dbaca795ae211b394cdf9277..7954c51e0ec4e96f0c4cc97fee9e5738eed209dd 100644 (file)
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -9,12 +9,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=wireguard
 
-PKG_VERSION:=0.0.20161025
+PKG_VERSION:=0.0.20161103
 PKG_RELEASE:=1
 
 PKG_SOURCE:=WireGuard-experimental-$(PKG_VERSION).tar.xz
 # This is actually SHA256, but OpenWRT/LEDE will figure it out based on the length
-PKG_MD5SUM:=433fb84d00afa566d77dcb29f87c30e17c1c9c8dc9a9a0026619addfc6553027
+PKG_MD5SUM:=e9d6a97002e0b63bb9572bf42037a7f5b67ccad421fec3afac684e4fc5e931ac
 PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/
 PKG_BUILD_DIR:=$(BUILD_DIR)/WireGuard-experimental-$(PKG_VERSION)
 

diff --git a/utils/avrdude/Makefile b/utils/avrdude/Makefile
index 5ea0e5542c9c6326b122358c79cae315d8837fa2..f933cc155da249601eadf8ce641b7786e652608b 100644 (file)
--- a/utils/avrdude/Makefile
+++ b/utils/avrdude/Makefile
@@ -28,6 +28,7 @@ include $(INCLUDE_DIR)/nls.mk
 define Package/avrdude
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=Microcontroller programming
   TITLE:=AVR Downloader/UploaDEr
   URL:=http://www.nongnu.org/avrdude/
   DEPENDS:=+libncurses +libreadline +libusb-compat +libftdi1 +libelf1

diff --git a/utils/dfu-programmer/Makefile b/utils/dfu-programmer/Makefile
index 153c69f71cb72b97dd6ca3d365a6828badbb8133..777f92d2f0939eed1c854af5f0016d5fe66455c9 100644 (file)
--- a/utils/dfu-programmer/Makefile
+++ b/utils/dfu-programmer/Makefile
@@ -27,6 +27,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/dfu-programmer
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=Microcontroller programming
   TITLE:=USB programmer for Atmel microcontrollers
   URL:=http://dfu-programmer.github.io/
   DEPENDS:=+libusb-1.0

diff --git a/utils/gptfdisk/Makefile b/utils/gptfdisk/Makefile
index 900a9dc3889d12ca382bead393c5c8ab5bfee359..3ce5a697348a91ed2b66732d0fa1d3436b35380e 100644 (file)
--- a/utils/gptfdisk/Makefile
+++ b/utils/gptfdisk/Makefile
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gptfdisk/default
   SECTION:=utils
   CATEGORY:=Utilities
-  SUBMENU:=disc
+  SUBMENU:=Disc
   URL:=http://www.rodsbooks.com/gdisk
   MAINTAINER:=Daniel Engberg <daniel.engberg.lists@pyret.net>
 endef

diff --git a/utils/hd-idle/Makefile b/utils/hd-idle/Makefile
index 7bf0053e55d25b222d308acc8f621773edeb83d9..a0c9cca4a6732ce0a0f725737558b417cc5a4219 100644 (file)
--- a/utils/hd-idle/Makefile
+++ b/utils/hd-idle/Makefile
@@ -27,7 +27,7 @@ define Package/hd-idle
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Another idle-daemon for attached hard drives
-  SUBMENU:=disc
+  SUBMENU:=Disc
   URL:=http://hd-idle.sourceforge.net/
 endef
 

diff --git a/utils/hdparm/Makefile b/utils/hdparm/Makefile
index fabc4643990ee3dabfa1efbf3501c7b177a52e09..9de3da9ac03b3434d250734455d5126c5a720252 100644 (file)
--- a/utils/hdparm/Makefile
+++ b/utils/hdparm/Makefile
@@ -25,7 +25,7 @@ TARGET_CFLAGS+=-D_GNU_SOURCE
 define Package/hdparm
   SECTION:=utils
   CATEGORY:=Utilities
-  SUBMENU:=disc
+  SUBMENU:=Disc
   TITLE:=Hard disk drive configuration utilitity
   URL:=http://sourceforge.net/projects/hdparm/
 endef

diff --git a/utils/i2c-tools/Makefile b/utils/i2c-tools/Makefile
index c66c80ea8d40b67cb7f4abb24b83d182be85b9e2..4fb9b50f51b434b2397fccf4621acc3dabfd4604 100644 (file)
--- a/utils/i2c-tools/Makefile
+++ b/utils/i2c-tools/Makefile
@@ -26,6 +26,7 @@ PKG_LICENSE_FILES:=COPYING
 
 include $(INCLUDE_DIR)/package.mk
 $(call include_mk, python-package.mk)
+$(call include_mk, python3-package.mk)
 
 define Package/i2c/Default
   URL:=http://lm-sensors.org/wiki/I2CTools
@@ -48,6 +49,15 @@ define Package/python-smbus
   DEPENDS:=+python-light
 endef
 
+define Package/python3-smbus
+  $(call Package/i2c/Default)
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Python bindings for the SMBUS
+  DEPENDS:=+python3-light
+endef
+
 define Package/i2c-tools/description
  This package contains an heterogeneous set of I2C tools for Linux. These tools
  were originally part of the lm-sensors package.
@@ -57,6 +67,10 @@ define Package/python-smbus/description
  This package contain the python bindings for Linux SMBus access through i2c-dev.
 endef
 
+define Package/python3-smbus/description
+ This package contain the python bindings for Linux SMBus access through i2c-dev.
+endef
+
 TARGET_CPPFLAGS += -I$(PKG_BUILD_DIR)/include
 
 ifdef CONFIG_PACKAGE_python-smbus
@@ -68,6 +82,15 @@ ifdef CONFIG_PACKAGE_python-smbus
   endef
 endif
 
+ifdef CONFIG_PACKAGE_python3-smbus
+  define Build/Compile/python3-smbus
+       $(if $(Build/Compile/Py3Mod),,@echo Python3 packaging code not found.; false)
+       $(call Build/Compile/Py3Mod,./py-smbus/, \
+               install --prefix="$(PKG_INSTALL_DIR)/usr", \
+       )
+  endef
+endif
+
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                LINUX="$(LINUX_DIR)" \
@@ -76,6 +99,7 @@ define Build/Compile
                LDFLAGS="$(TARGET_LDFLAGS)" \
                CFLAGS="$(TARGET_CFLAGS)"
        $(Build/Compile/python-smbus)
+       $(Build/Compile/python3-smbus)
 endef
 
 define Package/i2c-tools/install
@@ -87,9 +111,15 @@ define Package/i2c-tools/install
 endef
 
 define PyPackage/python-smbus/filespec
-+|$(PYTHON_PKG_DIR)/smbus.so
++|$(PYTHON_PKG_DIR)
+endef
+
+define PyPackage/python3-smbus/filespec
++|$(PYTHON3_PKG_DIR)
 endef
 
 $(eval $(call BuildPackage,i2c-tools))
 $(eval $(call PyPackage,python-smbus))
 $(eval $(call BuildPackage,python-smbus))
+$(eval $(call PyPackage,python3-smbus))
+$(eval $(call BuildPackage,python3-smbus))

diff --git a/utils/luci-app-lxc/Makefile b/utils/luci-app-lxc/Makefile
index 210f030a112345884687148cfbdef9af8ddee257..026f714cdf3cd1c784d7c722ae576e9e6f3d62ed 100644 (file)
--- a/utils/luci-app-lxc/Makefile
+++ b/utils/luci-app-lxc/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-lxc
-PKG_RELEASE:=20160616
+PKG_RELEASE:=20161030
 
 PKG_LICENSE:=Apache-2.0
 
@@ -21,7 +21,7 @@ define Package/luci-app-lxc
   CATEGORY:=LuCI
   SUBMENU:=3. Applications
   TITLE:=LXC management Web UI
-  DEPENDS:=+luci-mod-admin-full +lxc +lxc-create +liblxc +rpcd-mod-lxc
+  DEPENDS:=+luci-mod-admin-full +lxc +lxc-create +liblxc +rpcd-mod-lxc +getopt +xz
   MAINTAINER:=Petar Koretic <petar.koretic@sartura.hr>
 endef
 

diff --git a/utils/luci-app-lxc/files/view/lxc.htm b/utils/luci-app-lxc/files/view/lxc.htm
index bc767f3664d57952f197525ad5dac9608447b5e6..edfff8e063765fb81b61b2df71ec263b00f2eb14 100644 (file)
--- a/utils/luci-app-lxc/files/view/lxc.htm
+++ b/utils/luci-app-lxc/files/view/lxc.htm
@@ -450,7 +450,7 @@ Author: Petar Koretic <petar.koretic@sartura.hr>
                {
                        var option = document.createElement('option');
                        option.value = data[key];
-                       option.text = data[key].replace(/[_:]/, ' ');
+                       option.text = data[key].replace(/[_:]/g, ' ');
                        select.add(option, -1);
                }
        })

diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile
index 024143a5f0d392b9e312edfdb44edbed9c090dd5..928050a9f010fa2257dc523b56206f4d9c2c8a08 100644 (file)
--- a/utils/lvm2/Makefile
+++ b/utils/lvm2/Makefile
@@ -37,7 +37,7 @@ endef
 define Package/lvm2
   SECTION:=utils
   CATEGORY:=Utilities
-  SUBMENU:=disc
+  SUBMENU:=Disc
   TITLE:=The Linux Logical Volume Manager
   URL:=http://sourceware.org/lvm2/
   DEPENDS:=+libdevmapper +libblkid +libreadline +libncurses

diff --git a/utils/rng-tools/Makefile b/utils/rng-tools/Makefile
index b97cbf2ae2b45225cfacb115c398c0894a4dc23f..0aad15b52a00c70eb27d39cf604e34cda00c38f5 100644 (file)
--- a/utils/rng-tools/Makefile
+++ b/utils/rng-tools/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rng-tools
 PKG_VERSION:=5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/gkernel/rng-tools/$(PKG_VERSION)/
 PKG_MD5SUM:=6726cdc6fae1f5122463f24ae980dd68
 PKG_LICENSE:=GPLv2
-PKG_MAINTAINER:=Hannu Nyman <hannu.nyman@iki.fi>
+PKG_MAINTAINER:=Nathaniel Wesley Filardo <nwfilardo@gmail.com>
 
 PKG_FIXUP:=autoreconf
 
@@ -52,6 +52,8 @@ CONFIGURE_ARGS += \
 define Package/rng-tools/install
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/rngd.init $(1)/etc/init.d/rngd
+       $(INSTALL_DIR) $(1)/etc/uci_defaults
+       $(INSTALL_BIN) ./files/rngd.uci_defaults $(1)/etc/uci_defaults/rngd
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/rngtest $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/sbin

diff --git a/utils/rng-tools/files/rngd.init b/utils/rng-tools/files/rngd.init
index e9fba9097b796ddecc5422c793ee10973edb3fdc..e18288e53b9d64c8938164d6e230463179d177a0 100644 (file)
--- a/utils/rng-tools/files/rngd.init
+++ b/utils/rng-tools/files/rngd.init
@@ -3,12 +3,20 @@
 
 START=98
 
-RNGD_AMOUNT=4000
-RNGD_DEVICE="/dev/urandom"
-# Use /dev/urandom as source, as hardware sources like /dev/hwrng are usually not present
+RNGD_FILLWATER=$(uci -q get system.@rngd[0].fill_watermark)
+RNGD_DEVICE=$(uci -q get system.@rngd[0].device)
+RNGD_ENABLED=$(uci -q get system.@rngd[0].enabled)
+RNGD_PRECMD=$(uci -q get system.@rngd[0].precmd)
+
+: ${RNGD_FILLWATER:=4000}
+
+echo PRECMD=\'$RNGD_PRECMD\'
 
 start() {
-       service_start /sbin/rngd -r $RNGD_DEVICE -W $RNGD_AMOUNT
+    [ 1 -eq "$RNGD_ENABLED" ] && {
+      [ -z "${RNGD_PRECMD}" ] || ${RNGD_PRECMD} ${RNGD_DEVICE}
+      service_start /sbin/rngd -r ${RNGD_DEVICE} -W ${RNGD_FILLWATER}
+    }
 }
 
 stop() {

diff --git a/utils/rng-tools/files/rngd.uci_defaults b/utils/rng-tools/files/rngd.uci_defaults
new file mode 100644 (file)
index 0000000..6a26cf0
--- /dev/null
+++ b/utils/rng-tools/files/rngd.uci_defaults
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+uci -q show system.@rngd[0] || {
+       uci add system rngd
+       uci set system.@rngd[0].enabled=0
+       uci set system.@rngd[0].device=/dev/urandom
+       uci commit
+}

diff --git a/utils/stm32flash/Makefile b/utils/stm32flash/Makefile
index c1f6b9b748a00e93e795f1728895c8c3864a6838..6ceb87a10d903ed9b61f18040bb7a8dbffee45ea 100644 (file)
--- a/utils/stm32flash/Makefile
+++ b/utils/stm32flash/Makefile
@@ -23,6 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/stm32flash
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=Microcontroller programming
   URL:=http://code.google.com/p/stm32flash/
   TITLE:=Firmware flash tool for STM32's serial bootloader
 endef

diff --git a/utils/zoneinfo/Makefile b/utils/zoneinfo/Makefile
index 45ee8fddd63b8eecd57ed14863359ffc3a05ff14..fbd3fde259b0a347ace11f9266ae1055eb71153d 100644 (file)
--- a/utils/zoneinfo/Makefile
+++ b/utils/zoneinfo/Makefile
@@ -9,8 +9,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zoneinfo
-PKG_VERSION:=2016h
-PKG_VERSION_CODE:=2016h
+PKG_VERSION:=2016i
+PKG_VERSION_CODE:=2016i
 PKG_RELEASE:=1
 
 #As i couldn't find real license used "Public Domain"
@@ -20,20 +20,20 @@ PKG_LICENSE:=Public Domain
 PKG_SOURCE:=tzdata$(PKG_VERSION).tar.gz
 PKG_SOURCE_CODE:=tzcode$(PKG_VERSION_CODE).tar.gz
 PKG_SOURCE_URL:=http://www.iana.org/time-zones/repository/releases
-PKG_MD5SUM:=878f0ec3fd9e4026ea11dd1b649a315a
+PKG_MD5SUM:=73912ecfa6a9a8048ddf2e719d9bc39d
 
 include $(INCLUDE_DIR)/package.mk
 
 define Download/tzcode
    FILE=$(PKG_SOURCE_CODE)
    URL=$(PKG_SOURCE_URL)
-   MD5SUM:=00c20689d996dea4cf5b45504724ce8f
+   MD5SUM:=8fae14cba9396462955b7859cf04ba48
 endef
 
 $(eval $(call Download,tzcode))
 
 define Package/zoneinfo/Default
-  SUBMENU:=zoneinfo
+  SUBMENU:=Zoneinfo
   TITLE:=Zone Information
   SECTION:=utils
   CATEGORY:=Utilities