diff options
26 files changed, 265 insertions, 164 deletions
diff --git a/lang/python/host-pip-requirements/cffi.txt b/lang/python/host-pip-requirements/cffi.txt index 869ce3802..16dd6cf79 100644 --- a/lang/python/host-pip-requirements/cffi.txt +++ b/lang/python/host-pip-requirements/cffi.txt @@ -1,2 +1,2 @@ -cffi==1.14.2 --hash=sha256:ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b +cffi==1.14.4 --hash=sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c pycparser==2.20 --hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 diff --git a/lang/python/python-cffi/Makefile b/lang/python/python-cffi/Makefile index 987ee9681..4cb3eaed6 100644 --- a/lang/python/python-cffi/Makefile +++ b/lang/python/python-cffi/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-cffi -PKG_VERSION:=1.14.3 +PKG_VERSION:=1.14.4 PKG_RELEASE:=1 PYPI_NAME:=cffi -PKG_HASH:=f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591 +PKG_HASH:=1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-pyopenssl/Makefile b/lang/python/python-pyopenssl/Makefile index 6580e74fc..5bc59a95e 100644 --- a/lang/python/python-pyopenssl/Makefile +++ b/lang/python/python-pyopenssl/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pyopenssl -PKG_VERSION:=19.1.0 -PKG_RELEASE:=2 +PKG_VERSION:=20.0.0 +PKG_RELEASE:=1 PYPI_NAME:=pyOpenSSL -PKG_HASH:=9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507 +PKG_HASH:=92f08eccbd73701cf744e8ffd6989aa7842d48cbe3fea8a7c031c5647f590ac5 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/lang/vala/Makefile b/lang/vala/Makefile index 3874efc64..3d7d4776d 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vala -PKG_VERSION:=0.50.0 +PKG_VERSION:=0.50.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/vala/0.50 -PKG_HASH:=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071 +PKG_HASH:=2c0d5dc6d65d070f724063075424c403765ab7935c9e6fbcb84981b94d07ceda PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later diff --git a/libs/libfmt/Makefile b/libs/libfmt/Makefile index c19b66dff..1f2e359b5 100644 --- a/libs/libfmt/Makefile +++ b/libs/libfmt/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfmt -PKG_VERSION:=7.1.2 +PKG_VERSION:=7.1.3 PKG_RELEASE:=1 PKG_SOURCE_NAME:=fmt PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fmtlib/$(PKG_SOURCE_NAME)/tar.gz/$(PKG_VERSION)? -PKG_HASH:=4119a1c34dff91631e1d0a3707428f764f1ea22fe3cd5e70af5b4ccd5513831c +PKG_HASH:=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch> diff --git a/libs/unixodbc/Makefile b/libs/unixodbc/Makefile index 5b6325d31..603b93379 100644 --- a/libs/unixodbc/Makefile +++ b/libs/unixodbc/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unixodbc -PKG_VERSION:=2.3.7 +PKG_VERSION:=2.3.9 PKG_RELEASE:=1 PKG_SOURCE:=unixODBC-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.unixodbc.org -PKG_HASH:=45f169ba1f454a72b8fcbb82abd832630a3bf93baa84731cf2949f449e1e3e77 +PKG_HASH:=52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> PKG_LICENSE:=prog GPL libs LGPL diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 9fb39987c..a4956dc8b 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.2.5 +PKG_VERSION:=2.2.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.2/src -PKG_HASH:=63ad1813e01992d0fbe5ac7ca3e516a53fc62cdb17845d5ac90260031b6dd747 +PKG_HASH:=be1c6754cbaceafc4837e0c6036c7f81027a3992516435cbbbc5dc749bf5a087 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \ Christian Lachner <gladiac@gmail.com> diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh index 053404d5c..1304490b7 100755 --- a/net/haproxy/get-latest-patches.sh +++ b/net/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh CLONEURL=https://git.haproxy.org/git/haproxy-2.2.git -BASE_TAG=v2.2.5 +BASE_TAG=v2.2.6 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index 3d47ffe0d..4f4fe2b0d 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lighttpd PKG_VERSION:=1.4.56 -PKG_RELEASE:=1 +PKG_RELEASE:=2 # release candidate ~rcX testing; remove for release #PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.4.56 diff --git a/net/lighttpd/patches/010-meson-lua.patch b/net/lighttpd/patches/010-meson-lua.patch new file mode 100644 index 000000000..d1c96c84a --- /dev/null +++ b/net/lighttpd/patches/010-meson-lua.patch @@ -0,0 +1,30 @@ +From f47d569311d51ec9ab5dad7452b43c1b5a8290b6 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss <gstrauss@gluelogic.com> +Date: Tue, 1 Dec 2020 16:41:58 -0500 +Subject: [PATCH] [PATCH] [meson] do not search for lua versions + +openwrt net/lighttpd/Makefile declares dependency on liblua, and not on +specific lua versions, so have meson.build look for 'lua' and not for +specific lua versions. + +Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com> +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 71e4ec90..14ed9cec 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -381,7 +381,7 @@ endif + liblua = [] + if get_option('with_lua') + found_lua = false +- foreach l: ['lua5.4', 'lua-5.4', 'lua5.3', 'lua-5.3', 'lua5.2', 'lua-5.2', 'lua5.1', 'lua-5.1', 'lua'] ++ foreach l: ['lua'] + if not(found_lua) + liblua = dependency(l, required: false) + if (liblua.found()) +-- +2.28.0 + diff --git a/net/lighttpd/patches/020-webdav-atfile.patch b/net/lighttpd/patches/020-webdav-atfile.patch new file mode 100644 index 000000000..6cf4e253a --- /dev/null +++ b/net/lighttpd/patches/020-webdav-atfile.patch @@ -0,0 +1,78 @@ +From 2a1e55dc62c72893d128400334131a56a218ee1a Mon Sep 17 00:00:00 2001 +From: Glenn Strauss <gstrauss@gluelogic.com> +Date: Tue, 1 Dec 2020 16:23:49 -0500 +Subject: [PATCH] [mod_webdav] define _ATFILE_SOURCE if AT_FDCWD + +Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com> +--- + src/mod_webdav.c | 15 ++++++++++++--- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/src/mod_webdav.c b/src/mod_webdav.c +index c3fe79a2..9c27ad8f 100644 +--- a/src/mod_webdav.c ++++ b/src/mod_webdav.c +@@ -182,9 +182,18 @@ + #include <string.h> + #include <unistd.h> /* getpid() linkat() rmdir() unlinkat() */ + +-/* Note: filesystem access race conditions exist without _ATFILE_SOURCE */ ++#ifdef AT_FDCWD + #ifndef _ATFILE_SOURCE ++#define _ATFILE_SOURCE ++#endif ++#endif ++ ++#ifndef AT_SYMLINK_NOFOLLOW + #define AT_SYMLINK_NOFOLLOW 0 ++#endif ++ ++/* Note: filesystem access race conditions exist without _ATFILE_SOURCE */ ++#ifndef _ATFILE_SOURCE + /*(trigger linkat() fail to fallback logic in mod_webdav.c)*/ + #define linkat(odfd,opath,ndfd,npath,flags) -1 + #endif +@@ -2371,7 +2380,10 @@ webdav_delete_dir (const plugin_config * const pconf, + buffer_append_string_len(&dst->rel_path, de->d_name, len); + + #ifndef _ATFILE_SOURCE +- #ifndef _DIRENT_HAVE_D_TYPE ++ #ifdef _DIRENT_HAVE_D_TYPE ++ if (de->d_type == DT_UNKNOWN) ++ #endif ++ { + struct stat st; + if (0 != stat(dst->path.ptr, &st)) { + dst->path.ptr[ (dst->path.used = dst_path_used) -1]='\0'; +@@ -2379,6 +2391,6 @@ webdav_delete_dir (const plugin_config * const pconf, + continue; /* file *just* disappeared? */ + } + s_isdir = S_ISDIR(st.st_mode); +- #endif ++ } + #endif + +@@ -2903,7 +2902,10 @@ webdav_copymove_dir (const plugin_config * const pconf, + buffer_append_string_len(&dst->rel_path, de->d_name, len); + + #ifndef _ATFILE_SOURCE +- #ifndef _DIRENT_HAVE_D_TYPE ++ #ifdef _DIRENT_HAVE_D_TYPE ++ if (de->d_type == DT_UNKNOWN) ++ #endif ++ { + if (0 != stat(src->path.ptr, &st)) { + src->path.ptr[ (src->path.used = src_path_used) -1]='\0'; + src->rel_path.ptr[(src->rel_path.used = src_rel_path_used)-1]='\0'; +@@ -2912,7 +2914,7 @@ webdav_copymove_dir (const plugin_config * const pconf, + continue; /* file *just* disappeared? */ + } + d_type = st.st_mode; +- #endif ++ } + #endif + + if (S_ISDIR(d_type)) { /* recursive call; depth first */ +-- +2.28.0 + diff --git a/net/lighttpd/patches/030-one-shot-pipes.patch b/net/lighttpd/patches/030-one-shot-pipes.patch new file mode 100644 index 000000000..a4762d49c --- /dev/null +++ b/net/lighttpd/patches/030-one-shot-pipes.patch @@ -0,0 +1,26 @@ +From 716e4d7a5d773607d87d5521f5943cff019bcd97 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss <gstrauss@gluelogic.com> +Date: Mon, 30 Nov 2020 19:31:05 -0500 +Subject: [PATCH] [core] fix lighttpd -1 one-shot with pipes + +Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com> +--- + src/server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server.c b/src/server.c +index 83c0241f..a781027e 100644 +--- a/src/server.c ++++ b/src/server.c +@@ -356,7 +356,7 @@ static int server_oneshot_read_cq(connection *con, chunkqueue *cq, off_t max_byt + /* temporary set con->fd to oneshot_fd (fd input) rather than outshot_fdout + * (lighttpd generally assumes operation on sockets, so this is a kludge) */ + int fd = con->fd; +- con->fd = oneshot_fd; ++ con->fd = oneshot_fdn->fd; + int rc = oneshot_read_cq(con, cq, max_bytes); + con->fd = fd; + +-- +2.28.0 + diff --git a/net/udpxy/Makefile b/net/udpxy/Makefile index 9ad1b9786..0bd289c03 100644 --- a/net/udpxy/Makefile +++ b/net/udpxy/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=udpxy -PKG_VERSION:=1.0-24.1 -PKG_RELEASE:=2 +PKG_VERSION:=1.0-25.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/pcherenkov/udpxy/tar.gz/$(PKG_VERSION)? -PKG_HASH:=27e5d3d2bae29522354d1505a3cc931c96953846d68eeb25bb99fe9b0cb6cbe0 +PKG_HASH:=715c9af36c708a19225233a9013582e06d5c97d16d9a699765067b652c4871f9 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com> PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/wavemon/Makefile b/net/wavemon/Makefile index 7d2ef2ad1..b98fea669 100644 --- a/net/wavemon/Makefile +++ b/net/wavemon/Makefile @@ -8,19 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wavemon -PKG_VERSION:=0.9.1 -PKG_RELEASE:=2 +PKG_VERSION:=0.9.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/uoaerg/wavemon/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=5ebd5b79d3b7c546bc16b95161872c699a75e9acdfc6e3f02ec48dad10802067 +PKG_HASH:=13334ff17720ba4d17f4658dd2b93a50a6b5bc0583dedd72b88fd0cb90db686a PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com> PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING -PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/net/zerotier/Makefile b/net/zerotier/Makefile index 6165c5590..fb854adcd 100644 --- a/net/zerotier/Makefile +++ b/net/zerotier/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zerotier -PKG_VERSION:=1.6.1 +PKG_VERSION:=1.6.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)? -PKG_HASH:=9ac8adb0b28acf46d8f37f63b46a551ab20d77edf590aceb0b781e3eb5486571 +PKG_HASH:=c8087b26c1191d36fda004b42cdfed31042cafd8586e49015586eef786f2c9a5 PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION) PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de> @@ -58,10 +58,6 @@ endef TARGET_CFLAGS += -ffunction-sections -fdata-sections TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed -ifdef CONFIG_USE_UCLIBC - TARGET_CFLAGS += -D'valloc(a)=aligned_alloc(getpagesize(),a)' -endif - define Package/zerotier/conffiles /etc/config/zerotier endef diff --git a/utils/crelay/Makefile b/utils/crelay/Makefile index 6683f291d..283181bbf 100644 --- a/utils/crelay/Makefile +++ b/utils/crelay/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crelay PKG_VERSION:=0.14 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ondrej1024/crelay/tar.gz/V$(PKG_VERSION)? diff --git a/utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch b/utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch new file mode 100644 index 000000000..dbc443384 --- /dev/null +++ b/utils/crelay/patches/011-support-gpio-with-number-bigger-than-255.patch @@ -0,0 +1,92 @@ +From 30a2323bc0a95cda4eca818fe1d523a2e5c031f3 Mon Sep 17 00:00:00 2001 +From: Pawel Dembicki <paweldembicki@gmail.com> +Date: Mon, 2 Nov 2020 14:50:34 +0100 +Subject: [PATCH] support gpio with number bigger than 255 + +Change 8-bit gpio value to 16-bit, which allow to use gpio >255. + +Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> +--- + src/data_types.h | 16 ++++++++-------- + src/relay_drv_gpio.c | 10 +++++----- + 2 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/data_types.h b/src/data_types.h +index f13baeb..d4dc7b1 100644 +--- a/src/data_types.h ++++ b/src/data_types.h +@@ -56,14 +56,14 @@ typedef struct + /* [GPIO drv] */ + uint8_t gpio_num_relays; + uint8_t gpio_active_value; +- uint8_t relay1_gpio_pin; +- uint8_t relay2_gpio_pin; +- uint8_t relay3_gpio_pin; +- uint8_t relay4_gpio_pin; +- uint8_t relay5_gpio_pin; +- uint8_t relay6_gpio_pin; +- uint8_t relay7_gpio_pin; +- uint8_t relay8_gpio_pin; ++ uint16_t relay1_gpio_pin; ++ uint16_t relay2_gpio_pin; ++ uint16_t relay3_gpio_pin; ++ uint16_t relay4_gpio_pin; ++ uint16_t relay5_gpio_pin; ++ uint16_t relay6_gpio_pin; ++ uint16_t relay7_gpio_pin; ++ uint16_t relay8_gpio_pin; + + /* [Sainsmart drv] */ + uint8_t sainsmart_num_relays; +diff --git a/src/relay_drv_gpio.c b/src/relay_drv_gpio.c +index 705c157..28464be 100644 +--- a/src/relay_drv_gpio.c ++++ b/src/relay_drv_gpio.c +@@ -53,7 +53,7 @@ + #define GPIO_BASE_FILE GPIO_BASE_DIR"gpio" + + +-static uint8_t pins[] = ++static uint16_t pins[] = + { + 0, // dummy + 0, // pin 1 +@@ -85,7 +85,7 @@ int set_relay_generic_gpio(char* portname, uint8_t relay, relay_state_t relay_st + * -1 - fail + * -2 - already exported + *********************************************************/ +-static int do_export(uint8_t pin) ++static int do_export(uint16_t pin) + { + int fd; + char b[64]; +@@ -151,7 +151,7 @@ static int do_export(uint8_t pin) + * Return: 0 - success + * -1 - fail + *********************************************************/ +-static int do_unexport(uint8_t pin) ++static int do_unexport(uint16_t pin) + { + int fd; + char b[64]; +@@ -261,7 +261,7 @@ int get_relay_generic_gpio(char* portname, uint8_t relay, relay_state_t* relay_s + int fd; + char b[64]; + char d[1]; +- uint8_t pin; ++ uint16_t pin; + + if (relay<FIRST_RELAY || relay>(FIRST_RELAY+g_num_relays-1)) + { +@@ -324,7 +324,7 @@ int set_relay_generic_gpio(char* portname, uint8_t relay, relay_state_t relay_st + int fd; + char b[64]; + char d[1]; +- uint8_t pin; ++ uint16_t pin; + + if (relay<FIRST_RELAY || relay>(FIRST_RELAY+g_num_relays-1)) + { +-- +2.17.1 + diff --git a/utils/gpsd/Makefile b/utils/gpsd/Makefile index 53428613c..083a22b4c 100644 --- a/utils/gpsd/Makefile +++ b/utils/gpsd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gpsd PKG_VERSION:=3.21 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME) @@ -104,6 +104,7 @@ SCONS_OPTIONS += \ implicit_link=no \ chrpath=no \ manbuild=no \ + sysroot="$(STAGING_DIR)" \ target="$(TARGET_CROSS:-=)" define Build/InstallDev diff --git a/utils/sumo/Makefile b/utils/sumo/Makefile index 0a0b7ba81..e467f9100 100644 --- a/utils/sumo/Makefile +++ b/utils/sumo/Makefile @@ -8,18 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sumo -PKG_VERSION:=1.3.1 +PKG_VERSION:=1.7.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/sumo -PKG_HASH:=dd089814499cc8d21ea90ab506adbb01e7fda9d9685d9d90a1a41cc3fe680505 +PKG_HASH:=1f7a668568c92d1eeaa0e54a8af45052747accf9ba42983b21e906a80b16a9c2 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com> PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING - -CMAKE_INSTALL:=1 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/utils/sumo/patches/010-usleep.patch b/utils/sumo/patches/010-usleep.patch deleted file mode 100644 index 39eb5b348..000000000 --- a/utils/sumo/patches/010-usleep.patch +++ /dev/null @@ -1,73 +0,0 @@ -From d35215b50bfea42c8a1d884c65fda1dee8b62d50 Mon Sep 17 00:00:00 2001 -From: Michael Behrisch <michael.behrisch@dlr.de> -Date: Fri, 4 Oct 2019 11:41:29 +0200 -Subject: [PATCH] removing usleep, refs #12, fix #6133 - ---- - src/utils/foxtools/FXSingleEventThread.cpp | 9 +++------ - src/utils/iodevices/OutputDevice_Network.cpp | 17 ++++------------- - 2 files changed, 7 insertions(+), 19 deletions(-) - -diff --git a/src/utils/foxtools/FXSingleEventThread.cpp b/src/utils/foxtools/FXSingleEventThread.cpp -index 4b12fb920f..f545c18439 100644 ---- a/src/utils/foxtools/FXSingleEventThread.cpp -+++ b/src/utils/foxtools/FXSingleEventThread.cpp -@@ -35,6 +35,8 @@ - #else - #include <process.h> - #endif -+#include <chrono> -+#include <thread> - - #ifndef WIN32 - # define PIPE_READ 0 -@@ -137,12 +139,7 @@ FXSingleEventThread::onThreadEvent(FXObject*, FXSelector, void*) { - - void - FXSingleEventThread::sleep(long ms) { --#ifdef WIN32 -- Sleep(ms); --#else -- long long us = ms * 1000; -- usleep(us); --#endif -+ std::this_thread::sleep_for(std::chrono::milliseconds(ms)); - } - - -diff --git a/src/utils/iodevices/OutputDevice_Network.cpp b/src/utils/iodevices/OutputDevice_Network.cpp -index 2c20ce96aa..6bde32e1e6 100644 ---- a/src/utils/iodevices/OutputDevice_Network.cpp -+++ b/src/utils/iodevices/OutputDevice_Network.cpp -@@ -21,15 +21,10 @@ - // ========================================================================== - // included modules - // ========================================================================== --#include <config.h> // #ifdef _MSC_VER -+#include <config.h> - --#ifdef WIN32 --#define NOMINMAX --#include <windows.h> --#undef NOMINMAX --#else --#include <unistd.h> --#endif -+#include <thread> -+#include <chrono> - #include <vector> - #include "OutputDevice_Network.h" - #include "foreign/tcpip/socket.h" -@@ -57,11 +52,7 @@ OutputDevice_Network::OutputDevice_Network(const std::string& host, - if (wait == 9000) { - throw IOError(toString(e.what()) + " (host: " + host + ", port: " + toString(port) + ")"); - } --#ifdef WIN32 -- Sleep(wait); --#else -- usleep(wait * 1000); --#endif -+ std::this_thread::sleep_for(std::chrono::milliseconds(wait)); - } - } - myFilename = host + ":" + toString(port); diff --git a/utils/sumo/patches/020-strerror.patch b/utils/sumo/patches/020-strerror.patch deleted file mode 100644 index e9529ada5..000000000 --- a/utils/sumo/patches/020-strerror.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/foreign/zstr/strict_fstream.hpp -+++ b/src/foreign/zstr/strict_fstream.hpp -@@ -33,17 +33,17 @@ static std::string strerror() - { - buff = "Unknown error"; - } --#elif __APPLE__ || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) -+#elif defined(__GLIBC__) -+// GNU-specific strerror_r() -+ auto p = strerror_r(errno, &buff[0], buff.size()); -+ std::string tmp(p, std::strlen(p)); -+ std::swap(buff, tmp); -+#else - // XSI-compliant strerror_r() - if (strerror_r(errno, &buff[0], buff.size()) != 0) - { - buff = "Unknown error"; - } --#else --// GNU-specific strerror_r() -- auto p = strerror_r(errno, &buff[0], buff.size()); -- std::string tmp(p, std::strlen(p)); -- std::swap(buff, tmp); - #endif - buff.resize(buff.find('\0')); - return buff; diff --git a/utils/tcsh/Makefile b/utils/tcsh/Makefile index 9960f3cdb..f2a8ceb05 100644 --- a/utils/tcsh/Makefile +++ b/utils/tcsh/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcsh -PKG_VERSION:=6.22.02 -PKG_RELEASE:=2 +PKG_VERSION:=6.22.03 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ @@ -16,7 +16,7 @@ PKG_SOURCE_URL:= \ https://astron.com/pub/tcsh/old \ https://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh \ https://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old -PKG_HASH:=ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b +PKG_HASH:=be2cfd653d2a0c7f506d2dd14c12324ba749bd484037be6df44a3973f52262b7 PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com> PKG_LICENSE:=BSD-3-Clause diff --git a/utils/tcsh/patches/001-sysmalloc.patch b/utils/tcsh/patches/001-sysmalloc.patch index 7cc7e06c6..f46ce3509 100644 --- a/utils/tcsh/patches/001-sysmalloc.patch +++ b/utils/tcsh/patches/001-sysmalloc.patch @@ -1,4 +1,4 @@ ---- a/config_f.h +--- a/config_f.h +++ b/config_f.h @@ -138,11 +138,8 @@ * This can be much slower and no memory statistics will be diff --git a/utils/tcsh/patches/020-cross.patch b/utils/tcsh/patches/020-cross.patch index b1ed1ec86..526b3c45e 100644 --- a/utils/tcsh/patches/020-cross.patch +++ b/utils/tcsh/patches/020-cross.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -447,7 +447,7 @@ pure:$(P) ${OBJS} +@@ -448,7 +448,7 @@ pure:$(P) ${OBJS} gethost: gethost.c sh.err.h tc.const.h sh.h rm -f gethost diff --git a/utils/tcsh/patches/030-gcc10.patch b/utils/tcsh/patches/030-gcc10.patch deleted file mode 100644 index b5a0cf060..000000000 --- a/utils/tcsh/patches/030-gcc10.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6974bc35a5cda6eab748e364bd76a860ca66968b Mon Sep 17 00:00:00 2001 -From: zoulasc <christos@zoulas.com> -Date: Sat, 11 Jan 2020 11:16:51 -0500 -Subject: [PATCH] Remove extra variable definition that cause -fno-common build - to fail (Werner Fink) - ---- - tc.sig.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tc.sig.c b/tc.sig.c -index 77659ca..576605a 100644 ---- a/tc.sig.c -+++ b/tc.sig.c -@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */ - int phup_disabled; /* = 0; */ - int pchild_disabled; /* = 0; */ - int pintr_disabled; /* = 0; */ --int handle_interrupt; /* = 0; */ - - int - handle_pending_signals(void) diff --git a/utils/unrar/Makefile b/utils/unrar/Makefile index a5bb6bd2a..1b47d54a8 100644 --- a/utils/unrar/Makefile +++ b/utils/unrar/Makefile @@ -6,12 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unrar -PKG_VERSION:=5.9.4 +PKG_VERSION:=6.0.2 PKG_RELEASE:=1 PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.rarlab.com/rar -PKG_HASH:=3d010d14223e0c7a385ed740e8f046edcbe885e5c22c5ad5733d009596865300 +PKG_HASH:=81bf188333f89c976780a477af27f651f54aa7da9312303d8d1a804696d3edd3 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/unrar PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>, \ Ted Hess <thess@kitschensync.net> @@ -19,8 +20,8 @@ PKG_LICENSE:=UnRAR PKG_LICENSE_FILES:=license.txt PKG_CPE_ID:=cpe:/a:rarlab:unrar -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/unrar PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk |