aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--lang/python/python3-django-cors-headers/Makefile6
-rw-r--r--libs/giflib/Makefile2
-rw-r--r--libs/libtasn1/Makefile1
-rw-r--r--libs/postgresql/Makefile4
-rw-r--r--libs/protobuf-c/Makefile1
-rw-r--r--libs/sqlite3/Makefile4
-rw-r--r--net/clamav/Makefile6
-rw-r--r--net/miniupnpd/Makefile2
-rw-r--r--net/miniupnpd/files/miniupnpd.hotplug41
-rw-r--r--net/miniupnpd/files/miniupnpd.init32
-rw-r--r--net/modemmanager/Makefile2
-rwxr-xr-xnet/modemmanager/files/modemmanager.proto5
-rw-r--r--utils/collectd/Makefile2
-rwxr-xr-xutils/collectd/files/exec-scripts/sqm_collectd.sh7
-rw-r--r--utils/docker-ce/Makefile10
-rw-r--r--utils/libnetwork/Makefile6
17 files changed, 81 insertions, 52 deletions
diff --git a/README.md b/README.md
index 373f74e24..4b8b9e94c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
This is the OpenWrt "packages"-feed containing community-maintained build scripts, options and patches for applications, modules and libraries used within OpenWrt.
-Installation of pre-built packages is handled directly by the **opkg** utility within your running OpenWrt system or by using the [OpenWrt SDK](https://openwrt.org/docs/guide-developer/obtain.firmware.sdk) on a build system.
+Installation of pre-built packages is handled directly by the **opkg** utility within your running OpenWrt system or by using the [OpenWrt SDK](https://openwrt.org/docs/guide-developer/using_the_sdk) on a build system.
## Usage
diff --git a/lang/python/python3-django-cors-headers/Makefile b/lang/python/python3-django-cors-headers/Makefile
index 1279516a0..73a2cc54e 100644
--- a/lang/python/python3-django-cors-headers/Makefile
+++ b/lang/python/python3-django-cors-headers/Makefile
@@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=django-cors-headers
-PKG_VERSION:=3.2.1
-PKG_RELEASE:=3
+PKG_VERSION:=3.3.0
+PKG_RELEASE:=1
PYPI_NAME:=django-cors-headers
-PKG_HASH:=a5960addecc04527ab26617e51b8ed42f0adab4594b24bb0f3c33e2bd3857c3f
+PKG_HASH:=73d654950b5f5e7e4f67c05183d2169d4f7518ceb87734eb0d68f9e43be59f1c
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
diff --git a/libs/giflib/Makefile b/libs/giflib/Makefile
index b59e37ffe..2f8eb4c53 100644
--- a/libs/giflib/Makefile
+++ b/libs/giflib/Makefile
@@ -23,7 +23,6 @@ PKG_CPE_ID:=cpe:/a:giflib_project:giflib
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
-include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
define Package/giflib
@@ -75,6 +74,5 @@ define Package/giflib-utils/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
endef
-$(eval $(call HostBuild))
$(eval $(call BuildPackage,giflib))
$(eval $(call BuildPackage,giflib-utils))
diff --git a/libs/libtasn1/Makefile b/libs/libtasn1/Makefile
index d471c6ecf..e5bf554fe 100644
--- a/libs/libtasn1/Makefile
+++ b/libs/libtasn1/Makefile
@@ -39,6 +39,7 @@ define Package/libtasn1/description
Distinguish Encoding Rules (DER) manipulation.
endef
+HOST_CFLAGS += -std=gnu99
TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections
diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile
index 77e0f1bce..c33bbd442 100644
--- a/libs/postgresql/Makefile
+++ b/libs/postgresql/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=postgresql
PKG_VERSION:=12.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=PostgreSQL
PKG_CPE_ID:=cpe:/a:postgresql:postgresql
@@ -156,6 +156,8 @@ CONFIGURE_ARGS += \
--enable-depend \
$(if $(CONFIG_arc),--disable-spinlocks)
+HOST_CFLAGS += -std=gnu99
+
# Need a native zic and pg_config for build
define Host/Compile
+$(HOST_MAKE_VARS) MAKELEVEL=0 $(MAKE) -C $(HOST_BUILD_DIR)/src/bin/pg_config CC="$(HOSTCC)"
diff --git a/libs/protobuf-c/Makefile b/libs/protobuf-c/Makefile
index 0a54ea2a6..42d48269d 100644
--- a/libs/protobuf-c/Makefile
+++ b/libs/protobuf-c/Makefile
@@ -48,6 +48,7 @@ endef
CMAKE_HOST_OPTIONS += \
-DBUILD_SHARED_LIBS=ON \
+ -DCMAKE_CXX_STANDARD=11 \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile
index bbaccccdd..168257373 100644
--- a/libs/sqlite3/Makefile
+++ b/libs/sqlite3/Makefile
@@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sqlite
-PKG_VERSION:=3310100
+PKG_VERSION:=3320000
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz
-PKG_HASH:=62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae
+PKG_HASH:=598317fd74f5dcc8921949c47665b9e512d0d9c6a445a2e843430f04dc10bda4
PKG_SOURCE_URL:=https://www.sqlite.org/2020/
PKG_LICENSE:=PUBLICDOMAIN
diff --git a/net/clamav/Makefile b/net/clamav/Makefile
index 5a4da2a3a..567ffe119 100644
--- a/net/clamav/Makefile
+++ b/net/clamav/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=clamav
-PKG_VERSION:=0.102.2
-PKG_RELEASE:=2
+PKG_VERSION:=0.102.3
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.clamav.net/downloads/production/
-PKG_HASH:=89fcdcc0eba329ca84d270df09d2bb89ae55f5024b0c3bddb817512fb2c907d3
+PKG_HASH:=ed3050c4569989ee7ab54c7b87246b41ed808259632849be0706467442dc0693
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> \
Lucian Cristian <lucian.cristian@gmail.com>
diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 4d255dab2..ae95b4a2c 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=miniupnpd
PKG_VERSION:=2.1.20191006
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/net/miniupnpd/files/miniupnpd.hotplug b/net/miniupnpd/files/miniupnpd.hotplug
index 9664b54ba..059b2b606 100644
--- a/net/miniupnpd/files/miniupnpd.hotplug
+++ b/net/miniupnpd/files/miniupnpd.hotplug
@@ -12,18 +12,35 @@
[ "$ACTION" != "ifup" ] && procd_running "miniupnpd" "*" && exit 0
tmpconf="/var/etc/miniupnpd.conf"
-extiface=$(uci get upnpd.config.external_iface)
-extzone=$(uci get upnpd.config.external_zone)
+external_iface=$(uci get upnpd.config.external_iface)
+external_iface6=$(uci get upnpd.config.external_iface6)
+external_zone=$(uci get upnpd.config.external_zone)
. /lib/functions/network.sh
-[ -z "$extiface" ] && {
- # manual external zone (if dynamically find interfaces
- # belonging to it) overrides network_find_wan*
- [ -n "$extzone" ] && ifname=$(fw3 -q zone "$extzone" | head -1)
- [ -z "$extiface" ] && network_find_wan extiface
- [ -z "$extiface" ] && network_find_wan6 extiface
-}
-
-[ -z "$ifname" ] && network_get_device ifname "$extiface"
-grep -q "ext_ifname=$ifname" "$tmpconf" || /etc/init.d/miniupnpd restart
+if [ -n "$external_iface" ] ; then
+ network_get_device ifname "$external_iface"
+else
+ if [ -n "$external_zone" ] ; then
+ ifname=$(fw3 -q zone "$external_zone" 2>/dev/null | head -1)
+ else
+ network_find_wan external_iface && \
+ network_get_device ifname "$external_iface"
+ fi
+fi
+if [ -n "$external_iface6" ] ; then
+ network_get_device ifname6 "$external_iface6"
+else
+ if [ -n "$external_zone" ] ; then
+ ifname6=$(fw3 -q zone "$external_zone" 2>/dev/null | head -1)
+ else
+ network_find_wan6 external_iface6 && \
+ network_get_device ifname6 "$external_iface6"
+ fi
+fi
+
+[ "$DEVICE" != "$ifname" ] && [ "$DEVICE" != "$ifname6" ] && exit 0
+
+grep -q "^ext_ifname=$ifname" "$tmpconf" && grep -q "^ext_ifname6=$ifname6" "$tmpconf" && exit 0
+
+/etc/init.d/miniupnpd restart
diff --git a/net/miniupnpd/files/miniupnpd.init b/net/miniupnpd/files/miniupnpd.init
index d90c290a7..22461f9f6 100644
--- a/net/miniupnpd/files/miniupnpd.init
+++ b/net/miniupnpd/files/miniupnpd.init
@@ -67,6 +67,7 @@ upnpd() {
[ "$enabled" -eq 0 ] && return 1
config_get external_iface config external_iface
+ config_get external_iface6 config external_iface6
config_get external_zone config external_zone
config_get external_ip config external_ip
config_get internal_iface config internal_iface
@@ -91,17 +92,26 @@ upnpd() {
. /lib/functions/network.sh
- # manual external interface overrides everything
- [ -z "$external_iface" ] && {
- # manual external zone (if dynamically find interfaces
- # belonging to it) overrides network_find_wan*
- [ -n "$external_zone" ] && ifname=$(fw3 -q zone "$external_zone" | head -1)
- [ -z "$external_iface" ] && network_find_wan external_iface
- [ -z "$external_iface6" ] && network_find_wan6 external_iface6
- }
-
- [ -z "$ifname" ] && network_get_device ifname "$external_iface"
- [ -z "$ifname6" ] && network_get_device ifname6 "$external_iface6"
+ if [ -n "$external_iface" ] ; then
+ network_get_device ifname "$external_iface"
+ else
+ if [ -n "$external_zone" ] ; then
+ ifname=$(fw3 -q zone "$external_zone" 2>/dev/null | head -1)
+ else
+ network_find_wan external_iface && \
+ network_get_device ifname "$external_iface"
+ fi
+ fi
+ if [ -n "$external_iface6" ] ; then
+ network_get_device ifname6 "$external_iface6"
+ else
+ if [ -n "$external_zone" ] ; then
+ ifname6=$(fw3 -q zone "$external_zone" 2>/dev/null | head -1)
+ else
+ network_find_wan6 external_iface6 && \
+ network_get_device ifname6 "$external_iface6"
+ fi
+ fi
if [ -n "$config_file" ]; then
conf="$config_file"
diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index f38e3abf8..5092ccd5c 100644
--- a/net/modemmanager/Makefile
+++ b/net/modemmanager/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=modemmanager
PKG_VERSION:=1.12.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager
diff --git a/net/modemmanager/files/modemmanager.proto b/net/modemmanager/files/modemmanager.proto
index 536073dce..be1bcb3df 100755
--- a/net/modemmanager/files/modemmanager.proto
+++ b/net/modemmanager/files/modemmanager.proto
@@ -204,10 +204,9 @@ modemmanager_connected_method_static_ipv4() {
proto_notify_error "${interface}" PREFIX_MISSING
return
}
-
mask=$(cdr2mask "${prefix}")
- # TODO: mtu reporting in proto handler
+ [ -n "${mtu}" ] && /sbin/ip link set dev "${wwan}" mtu "${mtu}"
proto_init_update "${wwan}" 1
proto_set_keep 1
@@ -270,7 +269,7 @@ modemmanager_connected_method_static_ipv6() {
return
}
- # TODO: mtu reporting in proto handler
+ [ -n "${mtu}" ] && /sbin/ip link set dev "${wwan}" mtu "${mtu}"
proto_init_update "${wwan}" 1
proto_set_keep 1
diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index e8a8bcfff..5dc542349 100644
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=collectd
PKG_VERSION:=5.11.0
-PKG_RELEASE:=5
+PKG_RELEASE:=7
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://collectd.org/files/ \
diff --git a/utils/collectd/files/exec-scripts/sqm_collectd.sh b/utils/collectd/files/exec-scripts/sqm_collectd.sh
index 66ba8df38..ad84fc762 100755
--- a/utils/collectd/files/exec-scripts/sqm_collectd.sh
+++ b/utils/collectd/files/exec-scripts/sqm_collectd.sh
@@ -3,7 +3,7 @@
. /usr/share/libubox/jshn.sh
HOSTNAME="${COLLECTD_HOSTNAME:-localhost}"
-INTERVAL="${COLLECTD_INTERVAL:-60.000}"
+INTERVAL="${COLLECTD_INTERVAL:-60}"
handle_cake() {
local ifc ifr tin i
@@ -79,7 +79,8 @@ process_qdisc() {
local ifc jsn
ifc="$1"
- jsn=$(tc -s -j qdisc show dev "$ifc")
+ jsn=$(tc -s -j qdisc show dev "$ifc") || return
+
# strip leading & trailing []
jsn="${jsn#[}" ; jsn="${jsn%]}"
@@ -102,5 +103,5 @@ while true ; do
for ifc in "$@" ; do
process_qdisc "$ifc"
done
- sleep "${INTERVAL%.000}"
+ sleep "${INTERVAL%%.*}"
done
diff --git a/utils/docker-ce/Makefile b/utils/docker-ce/Makefile
index 0305a132f..56ac8564e 100644
--- a/utils/docker-ce/Makefile
+++ b/utils/docker-ce/Makefile
@@ -1,15 +1,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=docker-ce
-PKG_VERSION:=19.03.8
-PKG_RELEASE:=3
+PKG_VERSION:=19.03.9
+PKG_RELEASE:=1
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=components/cli/LICENSE components/engine/LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/docker/docker-ce/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=781c69e00e98f64fb167ee61de764882bd4926a873d98ce6f370d3cd3435b501
-PKG_SOURCE_VERSION:=afacb8b7f0 # SHA1 used within the docker executables
+PKG_HASH:=f1b9e28e789516b4ba741cc4683c2c088e8c4893e2acbd7ac272a75ddeccc1a1
+PKG_SOURCE_VERSION:=9d988398e7 # SHA1 used within the docker executables
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
@@ -23,7 +23,7 @@ endef
# values from respective '.installer' files at https://github.com/docker/docker-ce/blob/v$(PKG_VERSION)/components/engine/hack/dockerfile/install/
$(eval $(call CheckExpectedSrcVer,../containerd/Makefile,7ad184331fa3e55e52b890ea95e65ba581ae3429))
-$(eval $(call CheckExpectedSrcVer,../libnetwork/Makefile,9fd385be8302dbe1071a3ce124891893ff27f90f))
+$(eval $(call CheckExpectedSrcVer,../libnetwork/Makefile,0941c3f409260d5f05cfa6fc68420d8ad45ee483))
$(eval $(call CheckExpectedSrcVer,../runc/Makefile,dc9208a3303feef5b3839f4323d9beb36df0a9dd))
$(eval $(call CheckExpectedSrcVer,../tini/Makefile,fec3683b971d9c3ef73f284f176672c44b448662))
diff --git a/utils/libnetwork/Makefile b/utils/libnetwork/Makefile
index 2c7377852..84a369dfd 100644
--- a/utils/libnetwork/Makefile
+++ b/utils/libnetwork/Makefile
@@ -12,9 +12,9 @@ GO_PKG_BUILD_PKG:= \
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://$(GO_PKG)
-PKG_SOURCE_VERSION:=9fd385be8302dbe1071a3ce124891893ff27f90f
-PKG_SOURCE_DATE:=2020-01-03
-PKG_MIRROR_HASH:=16cea9d9978b11869029bc9ae0da533c2d7fdf4b9c1f7905bf6c98f443347831
+PKG_SOURCE_VERSION:=0941c3f409260d5f05cfa6fc68420d8ad45ee483
+PKG_SOURCE_DATE:=2020-03-19
+PKG_MIRROR_HASH:=678e1d3175fd78833fddd38965baa3784993dbf53c3f56f5f7d39364eeaf93e1
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
Powered by cgit, Themed by Ted Yin.