diff --git a/DEVELOPERS b/DEVELOPERS index f7b7db53ce98..e181382fe918 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1484,6 +1484,7 @@ F: package/fxdiv/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/libjcat/ F: package/libucontext/ F: package/lilv/ F: package/lv2/ diff --git a/package/Config.in b/package/Config.in index b9f5c4d7c26f..4a38c282a394 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1531,6 +1531,7 @@ endmenu menu "Compression and decompression" source "package/libarchive/Config.in" source "package/libdeflate/Config.in" + source "package/libjcat/Config.in" source "package/libmspack/Config.in" source "package/libsquish/Config.in" source "package/libzip/Config.in" diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index 9a2b69c73111..e1cf9f657a54 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b c-ares-1.27.0.tar.gz +sha256 072ff6b30b9682d965b87eb9b77851dc1cd8e6d8090f6821a56bd8fa89595061 c-ares-1.32.2.tar.gz # Hash for license file -sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md +sha256 8a9994f85a8e531e1a3217ab7ba509787c6b93056aabe702137ce662db8321c2 LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index c2403b9c4cb1..4b7342cadb17 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,8 +4,8 @@ # ################################################################################ -C_ARES_VERSION = 1.27.0 -C_ARES_SITE = https://github.com/c-ares/c-ares/releases/download/cares-1_27_0 +C_ARES_VERSION = 1.32.2 +C_ARES_SITE = https://github.com/c-ares/c-ares/releases/download/v1.32.2 C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT diff --git a/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch b/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch deleted file mode 100644 index 81b08d34b7ec..000000000000 --- a/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ea27b1363ef709ce4b169138017b67ef624b127b Mon Sep 17 00:00:00 2001 -From: Xiangyu Chen -Date: Tue, 12 Dec 2023 10:47:42 +0800 -Subject: [PATCH] libcrun: fix compile error without libseccomp and libcap - -Fixed compile error without libseccomp and libcap, running -clang-format to format the code style. - -Upstream: https://github.com/containers/crun/commit/ea27b1363ef709ce4b169138017b67ef624b127b -Signed-off-by: Xiangyu Chen ---- - src/libcrun/container.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/libcrun/container.c b/src/libcrun/container.c -index 34649f8..ffcdb24 100644 ---- a/src/libcrun/container.c -+++ b/src/libcrun/container.c -@@ -23,7 +23,9 @@ - #include "container.h" - #include "utils.h" - #include "seccomp.h" --#include -+#ifdef HAVE_SECCOMP -+# include -+#endif - #include "scheduler.h" - #include "seccomp_notify.h" - #include "custom-handler.h" -@@ -47,7 +49,9 @@ - #include - #include - #include --#include -+#ifdef HAVE_CAP -+# include -+#endif - #include - #include - #include -@@ -3829,6 +3833,7 @@ populate_array_field (char ***field, char *array[], size_t num_elements) - (*field)[i] = NULL; - } - -+#ifdef HAVE_CAP - static void - populate_capabilities (struct features_info_s *info, char ***capabilities, size_t *num_capabilities) - { -@@ -3876,6 +3881,7 @@ populate_capabilities (struct features_info_s *info, char ***capabilities, size_ - (*capabilities)[index] = NULL; // Terminate the array with NULL - populate_array_field (&(info->linux.capabilities), *capabilities, *num_capabilities); - } -+#endif - - static void - retrieve_mount_options (struct features_info_s **info) --- -2.34.1 - diff --git a/package/crun/crun.hash b/package/crun/crun.hash index c461d78d97ff..b111e941ddbe 100644 --- a/package/crun/crun.hash +++ b/package/crun/crun.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 a76982ac076a5c9bf9f85bd8d25b1dc6344e252399a7e9231504357fc019f7cc crun-1.12.tar.gz +sha256 a03ba1e58b8823ae77d010024b43bd94c5a99f7d652257b1b23abd2d2cdb087f crun-1.15.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.libcrun diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 005d5fb39738..b48f15304bf9 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRUN_VERSION = 1.12 +CRUN_VERSION = 1.15 CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION) CRUN_DEPENDENCIES = host-pkgconf yajl diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index 886ceb1142ad..6bba59cf82ef 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -9,6 +9,7 @@ EVEMU_SITE = http://www.freedesktop.org/software/evemu EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz EVEMU_LICENSE = LGPL-3.0 (library), GPL-3.0 (tools) EVEMU_LICENSE_FILES = COPYING +EVEMU_AUTORECONF = YES EVEMU_INSTALL_STAGING = YES # asciidoc used to generate manpages, which we don't need, and if it's diff --git a/package/flashrom/0001-Makefile-CONFIG_INTERNAL-depends-on-raw-mem-access.patch b/package/flashrom/0001-Makefile-CONFIG_INTERNAL-depends-on-raw-mem-access.patch deleted file mode 100644 index 9d3f3d9c51a1..000000000000 --- a/package/flashrom/0001-Makefile-CONFIG_INTERNAL-depends-on-raw-mem-access.patch +++ /dev/null @@ -1,35 +0,0 @@ -From aac91025386aa9d7b8214f8ad1746ef5c02f2d8d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 5 Nov 2023 10:38:32 +0100 -Subject: [PATCH] Makefile: CONFIG_INTERNAL depends on raw mem access - -CONFIG_INTERNAL depends on raw mem access resulting in the following -build failure on sh4 since version 1.3.0: - -/home/thomas/autobuild/instance-3/output-1/per-package/flashrom/host/bin/../lib/gcc/sh4a-buildroot-linux-gnu/12.3.0/../../../../sh4a-buildroot-linux-gnu/bin/ld: libflashrom.a(internal.o): in function `internal_chip_readn': -internal.c:(.text+0x8): undefined reference to `mmio_readn' - -Fixes: - - http://autobuild.buildroot.org/results/f74a9d315fb519f284428234713f43fcf4e35fd0 - -Signed-off-by: Fabrice Fontaine -Upstream: https://review.coreboot.org/c/flashrom/+/78930 ---- - Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile b/Makefile -index bf01d0f8..cd21f22f 100644 ---- a/Makefile -+++ b/Makefile -@@ -115,6 +115,7 @@ DEPENDS_ON_RAW_MEM_ACCESS := \ - CONFIG_ATAPROMISE \ - CONFIG_DRKAISER \ - CONFIG_GFXNVIDIA \ -+ CONFIG_INTERNAL \ - CONFIG_INTERNAL_X86 \ - CONFIG_IT8212 \ - CONFIG_NICINTEL \ --- -2.42.0 - diff --git a/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch b/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch new file mode 100644 index 000000000000..1ee8d0f7e365 --- /dev/null +++ b/package/flashrom/0001-chipset_enable.c-Drop-_LARGEFILE64_SOURCE.patch @@ -0,0 +1,38 @@ +From 59287a0bd0e4d58a4d2b434bde3db9b2376ac7c1 Mon Sep 17 00:00:00 2001 +From: Angel Pons +Date: Tue, 16 May 2023 11:13:17 +0200 +Subject: [PATCH] chipset_enable.c: Drop `_LARGEFILE64_SOURCE` + +This file does not access any large files, so there's no need to define +this feature test macro. + +Change-Id: I866cfa2f996eeea5846e5d9189647ad7a4a4e3e4 +Signed-off-by: Angel Pons +Reviewed-on: https://review.coreboot.org/c/flashrom/+/75271 +Tested-by: build bot (Jenkins) +Reviewed-by: Nico Huber +Reviewed-by: Anastasia Klimchuk +Reviewed-by: Alexander Goncharov + +Upstream: https://github.com/flashrom/flashrom/commit/59287a0bd0e4d58a4d2b434bde3db9b2376ac7c1 +Signed-off-by: James Hilliard +--- + chipset_enable.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/chipset_enable.c b/chipset_enable.c +index 9d3df5f8..3846ecfb 100644 +--- a/chipset_enable.c ++++ b/chipset_enable.c +@@ -24,8 +24,6 @@ + * Contains the chipset specific flash enables. + */ + +-#define _LARGEFILE64_SOURCE +- + #include + #include + #include +-- +2.34.1 + diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 86bfec40cceb..60774b962104 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -9,41 +9,74 @@ FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING -FLASHROM_MAKE_OPTS = WARNERROR=no +FLASHROM_INSTALL_STAGING = YES +FLASHROM_CONF_OPTS = \ + -Dclassic_cli=enabled \ + -Dclassic_cli_print_wiki=disabled \ + -Dich_descriptors_tool=enabled \ + -Dtests=disabled \ + -Duse_internal_dmi=true + +FLASHROM_PROGRAMMERS = \ + buspirate_spi \ + linux_mtd \ + linux_spi \ + parade_lspcon \ + mediatek_i2c_spi \ + mstarddc_spi \ + pony_spi \ + realtek_mst_i2c_spi \ + serprog + +ifeq ($(BR2_i386)$(BR2_x86_64),y) +FLASHROM_PROGRAMMERS += rayer_spi +endif ifeq ($(BR2_PACKAGE_LIBFTDI1),y) FLASHROM_DEPENDENCIES += host-pkgconf libftdi1 -FLASHROM_MAKE_OPTS += \ - CONFIG_FT2232_SPI=yes \ - CONFIG_USBBLASTER_SPI=yes -else -FLASHROM_MAKE_OPTS += \ - CONFIG_FT2232_SPI=no \ - CONFIG_USBBLASTER_SPI=no +FLASHROM_PROGRAMMERS += \ + ft2232_spi \ + usbblaster_spi endif ifeq ($(BR2_PACKAGE_LIBUSB),y) FLASHROM_DEPENDENCIES += host-pkgconf libusb -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=yes -else -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=no +FLASHROM_PROGRAMMERS += \ + ch341a_spi \ + dediprog \ + developerbox_spi \ + digilent_spi \ + dirtyjtag_spi \ + pickit2_spi \ + raiden_debug_spi \ + stlinkv3_spi endif ifeq ($(BR2_PACKAGE_PCIUTILS),y) FLASHROM_DEPENDENCIES += pciutils -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes -else -FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no -endif +FLASHROM_PROGRAMMERS += \ + atavia \ + drkaiser \ + gfxnvidia \ + internal \ + it8212 \ + nicintel \ + nicintel_eeprom \ + nicintel_spi \ + ogp_spi \ + satamv \ + satasii -define FLASHROM_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -DHAVE_STRNLEN" \ - $(FLASHROM_MAKE_OPTS) -C $(@D) -endef +ifeq ($(BR2_i386)$(BR2_x86_64),y) +FLASHROM_PROGRAMMERS += \ + atahpt \ + atapromise \ + nic3com \ + nicnatsemi \ + nicrealtek +endif +endif -define FLASHROM_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/flashrom $(TARGET_DIR)/usr/sbin/flashrom -endef +FLASHROM_CONF_OPTS += -Dprogrammer=$(subst $(space),$(comma),$(strip $(FLASHROM_PROGRAMMERS))) -$(eval $(generic-package)) +$(eval $(meson-package)) diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index b37fb92236fb..29948fbba888 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 76ae204a7027652ac3981b9fa5817c083ba23114340284c58e756b259cd2259a fribidi-1.0.14.tar.xz +sha256 0bbc7ff633bfa208ae32d7e369cf5a7d20d5d2557a0b067c9aa98bcbf9967587 fribidi-1.0.15.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index 7c6d32fb76bd..ab7fe703074c 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.14 +LIBFRIBIDI_VERSION = 1.0.15 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ diff --git a/package/libjcat/Config.in b/package/libjcat/Config.in new file mode 100644 index 000000000000..3e3718de3ac7 --- /dev/null +++ b/package/libjcat/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBJCAT + bool "libjcat" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_LIBGLIB2 + help + Library for reading and writing Jcat files. + + https://github.com/hughsie/libjcat + +comment "libjcat needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libjcat/libjcat.hash b/package/libjcat/libjcat.hash new file mode 100644 index 000000000000..b6dc8d2f6957 --- /dev/null +++ b/package/libjcat/libjcat.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a6232aeca3c3fab6dbb3bed06ec3832088b49a4b278a7119558d72be60ce921f libjcat-0.2.1.tar.xz +sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 LICENSE diff --git a/package/libjcat/libjcat.mk b/package/libjcat/libjcat.mk new file mode 100644 index 000000000000..e13e5dbfb743 --- /dev/null +++ b/package/libjcat/libjcat.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# libjcat +# +################################################################################ + +LIBJCAT_VERSION = 0.2.1 +LIBJCAT_SITE = https://github.com/hughsie/libjcat/releases/download/$(LIBJCAT_VERSION) +LIBJCAT_SOURCE = libjcat-$(LIBJCAT_VERSION).tar.xz +LIBJCAT_LICENSE = LGPL-2.1+ +LIBJCAT_LICENSE_FILES = LICENSE +LIBJCAT_INSTALL_STAGING = YES +LIBJCAT_DEPENDENCIES = host-pkgconf json-glib libglib2 + +LIBJCAT_CONF_OPTS = \ + -Dgtkdoc=false \ + -Dtests=false \ + -Ded25519=false \ + -Dman=false \ + -Dcli=true + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBJCAT_DEPENDENCIES += host-vala gobject-introspection +LIBJCAT_CONF_OPTS += -Dintrospection=true -Dvapi=true +else +LIBJCAT_CONF_OPTS += -Dintrospection=false -Dvapi=false +endif + +ifeq ($(BR2_PACKAGE_LIBGPG_ERROR)$(BR2_PACKAGE_LIBGPGME),yy) +LIBJCAT_DEPENDENCIES += libgpg-error libgpgme +LIBJCAT_CONF_OPTS += -Dgpg=true +else +LIBJCAT_CONF_OPTS += -Dgpg=false +endif + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBJCAT_DEPENDENCIES += gnutls +LIBJCAT_CONF_OPTS += -Dpkcs7=true +else +LIBJCAT_CONF_OPTS += -Dpkcs7=false +endif + +$(eval $(meson-package)) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 2cbbf766f5c3..61bda55098f1 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.12.0/SHASUMS256.txt.asc -sha256 007ca2699cf6e84290e5bed844ed66ef9d707d23561dfaf117212b7dce216ba7 node-v20.12.0-linux-arm64.tar.xz -sha256 668fb421a24be596c98f00a31049fbf6ada14d221b7382e0f1caa55ab421431a node-v20.12.0-linux-armv7l.tar.xz -sha256 78dc3b7ad993c332684802e35c1f0de2b76193d13394bc89e3bab216828587c7 node-v20.12.0-linux-ppc64le.tar.xz -sha256 0a126adf5b6a5eb11a37bad76a0c626a18f20b6811322e68aae0e3cf9bf580bd node-v20.12.0-linux-x64.tar.xz -sha256 76e5346cebfd581528f699f764f4d1a6e87cb818b696708f235ddcb625a0f78d node-v20.12.0.tar.xz +# From https://nodejs.org/dist/v20.15.1/SHASUMS256.txt.asc +sha256 10d47a46ef208b3e4b226e4d595a82659123b22397ed77b7975d989114ec317e node-v20.15.1-linux-arm64.tar.xz +sha256 7bc120efdd8018f6915471b963d9b80adf4ed406d6dc9edb4ae944b85f505c4c node-v20.15.1-linux-armv7l.tar.xz +sha256 b33e684802251397ad62ad3f8a1836267ee8b7723f87f669470018ad0035287b node-v20.15.1-linux-ppc64le.tar.xz +sha256 26700f8d3e78112ad4a2618a9c8e2816e38a49ecf0213ece80e54c38cb02563f node-v20.15.1-linux-x64.tar.xz +sha256 fdd53a5729d936691a2a1151046fb4897721cb8b0fca2af957823a9b40fe0c34 node-v20.15.1.tar.xz # Locally calculated -sha256 d3a9fbfe0a1fb78627ee296cd5ca5b498822d4d1c5da3b8e8100c41bd7b791fd LICENSE +sha256 49cd410e0fe6a8879a40d0764092d1e6114cc85fe41d4efed990d028eec25582 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 9ed51fbe9baf..104d2cf258c6 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.12.0 +NODEJS_COMMON_VERSION = 20.15.1 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index 69b6b0adf680..9f321eea62e9 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/pango/1.52/pango-1.52.2.sha256sum -sha256 d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b pango-1.52.2.tar.xz +# From https://download.gnome.org/sources/pango/1.54/pango-1.54.0.sha256sum +sha256 8a9eed75021ee734d7fc0fdf3a65c3bba51dfefe4ae51a9b414a60c70b2d1ed8 pango-1.54.0.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index ec0f5127e748..df82b456fb26 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -4,8 +4,8 @@ # ################################################################################ -PANGO_VERSION_MAJOR = 1.52 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).2 +PANGO_VERSION_MAJOR = 1.54 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).0 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = https://download.gnome.org/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES diff --git a/package/python3/python3.mk b/package/python3/python3.mk index a82bc47a57dd..f85dcfad3099 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -205,8 +205,8 @@ define PYTHON3_REMOVE_USELESS_FILES rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config rm -f $(TARGET_DIR)/usr/bin/python3-config find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)*/ \ - -type f -not -name Makefile -exec rm -rf {} \; - find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ -type d \ + -depth -type f -not -name Makefile -exec rm -rf {} \; + find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ -depth -type d \ -name __pycache__ -exec rm -rf {} \; endef diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in index 3315a6ddc9ff..c9b9fe8c3571 100644 --- a/package/sysklogd/Config.in +++ b/package/sysklogd/Config.in @@ -15,8 +15,18 @@ config BR2_PACKAGE_SYSKLOGD if BR2_PACKAGE_SYSKLOGD +config BR2_PACKAGE_SYSKLOGD_DNS_DELAY + int "Retry DNS delay (sec)" + default "60" + help + Retry delay (seconds) for attempting to resolve DNS names of + remote syslog servers. This is the internal retry delay, not + that of the resolver in your C library or DNS cache. + + Default: 60 seconds + config BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY - int "Retry delay (sec)" + int "Retry remote delay (sec)" default "180" help Retry delay (seconds) for sending to remote syslog servers. diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 7e0099017431..361d68a157d4 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 9da4444285772ce2bfc9c687be8f978b7a9fe7d3937347cd4938eda0c4545e05 sysklogd-2.5.2.tar.gz +sha256 c5ae067b479b54ef90fa9352c277d44ff7b4314023fc6ee0a37e81b99a78a917 sysklogd-2.6.0.tar.gz # Locally calculated sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 083f505a2b2d..59081f273415 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.5.2 +SYSKLOGD_VERSION = 2.6.0 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE @@ -16,6 +16,7 @@ SYSKLOGD_CPE_ID_VALID = YES SYSKLOGD_CONF_OPTS = \ --bindir=/usr/bin \ --sbindir=/sbin \ + --with-dns-delay=$(BR2_PACKAGE_SYSKLOGD_DNS_DELAY) \ --with-suspend-time=$(BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY) # Disable/Enable utilities diff --git a/package/tio/Config.in b/package/tio/Config.in index e4241fa5e14c..953b26a349be 100644 --- a/package/tio/Config.in +++ b/package/tio/Config.in @@ -1,8 +1,10 @@ config BR2_PACKAGE_TIO bool "tio" - depends on !BR2_sparc64 && !BR2_sparc depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_INIH + depends on BR2_USE_MMU # glib2 + depends on BR2_USE_WCHAR # glib2 + depends on BR2_PACKAGE_HAS_LUAINTERPRETER + depends on !BR2_PACKAGE_LUAJIT help "tio" is a simple TTY terminal application which features a straightforward commandline interface to easily connect to @@ -10,12 +12,13 @@ config BR2_PACKAGE_TIO https://tio.github.io/ -# tio is disabled for sparc and sparc64 architectures because it fails -# to build with a redefinition of 'struct termio' error, with no proper -# fix or workaround for now -comment "tio is disabled for sparc and sparc64 architectures" - depends on BR2_sparc64 || BR2_sparc - -comment "tio needs a toolchain w/ threads" +comment "tio needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU depends on !BR2_sparc64 && !BR2_sparc - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + +comment "tio needs lua (but not luajit)" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + depends on !BR2_PACKAGE_HAS_LUAINTERPRETER || BR2_PACKAGE_LUAJIT diff --git a/package/tio/tio.hash b/package/tio/tio.hash index 02699fdeb435..d1caeeebc676 100644 --- a/package/tio/tio.hash +++ b/package/tio/tio.hash @@ -1,5 +1,5 @@ -# From https://github.com/tio/tio/releases/download/v2.7/tio-2.7.tar.xz.sha256sum: -sha256 bf8fe434848c2c1b6540af0b42503c986068176ddc1a988cf02e521e7de5daa5 tio-2.7.tar.xz +# From https://github.com/tio/tio/releases/download/v3.5/tio-3.5.tar.xz.sha256sum: +sha256 efd3e9a406f827ac22d4157e345079dde15ee5a948b24156561d6c97a54e6ec0 tio-3.5.tar.xz # Hash for license files: sha256 9248dee77ee136321f24556a96e07ff8f90461013941884a9defd0ac825ef131 LICENSE diff --git a/package/tio/tio.mk b/package/tio/tio.mk index 95831e8ce693..637a7bdd8318 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -4,12 +4,14 @@ # ################################################################################ -TIO_VERSION = 2.7 +TIO_VERSION = 3.5 TIO_SOURCE = tio-$(TIO_VERSION).tar.xz TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) TIO_LICENSE = GPL-2.0+ TIO_LICENSE_FILES = LICENSE -TIO_DEPENDENCIES = inih +TIO_DEPENDENCIES = libglib2 luainterpreter + +TIO_CONF_OPTS += -Dinstall_man_pages=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) TIO_CONF_OPTS +=-Dbashcompletiondir=/usr/share/bash-completion/completions