diff --git a/libs/rpcsvc-proto/Makefile b/libs/rpcsvc-proto/Makefile index 4a668d2b4..cc665af83 100644 --- a/libs/rpcsvc-proto/Makefile +++ b/libs/rpcsvc-proto/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rpcsvc-proto PKG_VERSION:=1.4.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/thkukuk/rpcsvc-proto/releases/download/v$(PKG_VERSION) @@ -13,6 +13,7 @@ PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +PKG_FIXUP:=autoreconf HOST_BUILD_DEPENDS:=gettext-full/host PKG_BUILD_DEPENDS:=rpcsvc-proto/host diff --git a/net/git/Makefile b/net/git/Makefile index fd1eb240e..7d674d78c 100644 --- a/net/git/Makefile +++ b/net/git/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=git -PKG_VERSION:=2.34.7 +PKG_VERSION:=2.39.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/scm/git/ -PKG_HASH:=59754e404b7a5fd1544a67b50c2abdeb02b41012d831c02146cb148f1f3d2e5e +PKG_HASH:=475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING @@ -97,10 +97,6 @@ MAKE_FLAGS := \ NO_TCLTK="YesPlease" \ NO_INSTALL_HARDLINKS="yes" \ gitwebdir="/www/cgi-bin" \ - GITWEB_JS="/gitweb/gitweb.js" \ - GITWEB_CSS="/gitweb/gitweb.css" \ - GITWEB_LOGO="/gitweb/gitweb-logo.png" \ - GITWEB_FAVICON="/gitweb/gitweb-favicon.png" \ uname_S="Linux" \ CONFIGURE_ARGS += \ @@ -153,6 +149,11 @@ endef define Package/git-gitweb/install $(INSTALL_DIR) $(1)/www/cgi-bin $(1)/www/gitweb $(INSTALL_BIN) $(PKG_INSTALL_DIR)/www/cgi-bin/gitweb.cgi $(1)/www/cgi-bin/ + # work around https://lore.kernel.org/git/80eb3972-4960-5727-ce86-acc3a4425fd4@nic.cz/T/#u + $(SED) 's,^our @stylesheets .*,our @stylesheets = ("/gitweb/gitweb.css");,' $(1)/www/cgi-bin/gitweb.cgi + $(SED) 's,^our $$$$logo .*,our $$$$logo = "/gitweb/git-logo.png";,' $(1)/www/cgi-bin/gitweb.cgi + $(SED) 's,^our $$$$favicon .*,our $$$$favicon = "/gitweb/git-favicon.png";,' $(1)/www/cgi-bin/gitweb.cgi + $(SED) 's,^our $$$$javascript .*,our $$$$javascript = "/gitweb/gitweb.js";,' $(1)/www/cgi-bin/gitweb.cgi $(CP) $(PKG_INSTALL_DIR)/www/cgi-bin/static/* $(1)/www/gitweb/ endef diff --git a/net/git/patches/100-configure_for_crosscompiling.patch b/net/git/patches/100-configure_for_crosscompiling.patch index a782c7e7b..b2c77052f 100644 --- a/net/git/patches/100-configure_for_crosscompiling.patch +++ b/net/git/patches/100-configure_for_crosscompiling.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -966,7 +966,8 @@ AC_RUN_IFELSE( +@@ -955,7 +955,8 @@ AC_RUN_IFELSE( FILE *f = fopen(".", "r"); return f != NULL;]])], [ac_cv_fread_reads_directories=no], @@ -10,7 +10,7 @@ ]) if test $ac_cv_fread_reads_directories = yes; then FREAD_READS_DIRECTORIES=UnfortunatelyYes -@@ -1000,7 +1001,8 @@ AC_RUN_IFELSE( +@@ -989,7 +990,8 @@ AC_RUN_IFELSE( if (snprintf(buf, 3, "%s", "12345") != 5 || strcmp(buf, "12")) return 1]])], [ac_cv_snprintf_returns_bogus=no], @@ -20,7 +20,7 @@ ]) if test $ac_cv_snprintf_returns_bogus = yes; then SNPRINTF_RETURNS_BOGUS=UnfortunatelyYes -@@ -1023,7 +1025,8 @@ yippeeyeswehaveit +@@ -1012,7 +1014,8 @@ yippeeyeswehaveit #endif ]), [ac_cv_sane_mode_bits=yes], diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch index 126058faa..6bd363719 100644 --- a/net/git/patches/200-imapsend_without_curl.patch +++ b/net/git/patches/200-imapsend_without_curl.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -1436,7 +1436,7 @@ else +@@ -1621,7 +1621,7 @@ else endif curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "072200" diff --git a/net/git/patches/300-openssl-deprecated.patch b/net/git/patches/300-openssl-deprecated.patch index 20a5a2a0b..c0eb5a06f 100644 --- a/net/git/patches/300-openssl-deprecated.patch +++ b/net/git/patches/300-openssl-deprecated.patch @@ -14,7 +14,7 @@ Signed-off-by: Rosen Penev --- a/imap-send.c +++ b/imap-send.c -@@ -284,8 +284,10 @@ static int ssl_socket_connect(struct ima +@@ -274,8 +274,10 @@ static int ssl_socket_connect(struct ima int ret; X509 *cert; diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index bf84d48de..f45cfcda6 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.6.9 +PKG_VERSION:=2.6.10 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.6/src -PKG_HASH:=f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701 +PKG_HASH:=e71b2cd9ca1043345f083a5225078ccf824dced2b5779d86f11fa4e88f451773 PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh index 8c17d3e4f..a082c690d 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.6.git -BASE_TAG=v2.6.9 +BASE_TAG=v2.6.10 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 8d103f604..66c32f7ba 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh -PKG_VERSION:=9.2p1 +PKG_VERSION:=9.3p1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ https://ftp.spline.de/pub/OpenBSD/OpenSSH/portable/ -PKG_HASH:=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46 +PKG_HASH:=e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8 PKG_LICENSE:=BSD ISC PKG_LICENSE_FILES:=LICENCE diff --git a/net/rclone/Makefile b/net/rclone/Makefile index e0b5518fd..43806bfbc 100644 --- a/net/rclone/Makefile +++ b/net/rclone/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone -PKG_VERSION:=1.61.1 +PKG_VERSION:=1.62.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/rclone/rclone/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=f9fb7bae1f19896351db64e3713b67bfd151c49b2b28e6c6233adf67dbc2c899 +PKG_HASH:=6741c81ae5b5cb48a04055f280f6e220ed4b35d26fe43f59510d0f7740044748 PKG_LICENSE:=MIT PKG_LICENSE_FILE:=LICENSE diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index cab4f5892..8c38c703d 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan -PKG_VERSION:=5.9.9 +PKG_VERSION:=5.9.10 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ -PKG_HASH:=5e16580998834658c17cebfb31dd637e728669cf2fdd325460234a4643b8d81d +PKG_HASH:=3b72789e243c9fa6f0a01ccaf4f83766eba96a5e5b1e071d36e997572cf34654 PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Philip Prindeville , Noel Kuntze PKG_CPE_ID:=cpe:/a:strongswan:strongswan diff --git a/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch b/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch index 113e88d34..ded7b21a4 100644 --- a/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch +++ b/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch @@ -26,7 +26,7 @@ Subject: [PATCH 904/904] gmpdh: Plugin that implements gmp DH functions in an ARG_DISBL_SET([curve25519], [disable Curve25519 Diffie-Hellman plugin.]) ARG_DISBL_SET([hmac], [disable HMAC crypto implementation plugin.]) ARG_DISBL_SET([kdf], [disable KDF (prf+) implementation plugin.]) -@@ -1566,6 +1567,7 @@ ADD_PLUGIN([pkcs8], [s ch +@@ -1565,6 +1566,7 @@ ADD_PLUGIN([pkcs8], [s ch ADD_PLUGIN([af-alg], [s charon pki scripts medsrv attest nm cmd aikgen]) ADD_PLUGIN([fips-prf], [s charon nm cmd]) ADD_PLUGIN([gmp], [s charon pki scripts manager medsrv attest nm cmd aikgen fuzz]) @@ -34,7 +34,7 @@ Subject: [PATCH 904/904] gmpdh: Plugin that implements gmp DH functions in an ADD_PLUGIN([curve25519], [s charon pki scripts nm cmd]) ADD_PLUGIN([agent], [s charon nm cmd]) ADD_PLUGIN([keychain], [s charon cmd]) -@@ -1708,6 +1710,7 @@ AM_CONDITIONAL(USE_SHA3, test x$sha3 = x +@@ -1706,6 +1708,7 @@ AM_CONDITIONAL(USE_SHA3, test x$sha3 = x AM_CONDITIONAL(USE_MGF1, test x$mgf1 = xtrue) AM_CONDITIONAL(USE_FIPS_PRF, test x$fips_prf = xtrue) AM_CONDITIONAL(USE_GMP, test x$gmp = xtrue) @@ -42,7 +42,7 @@ Subject: [PATCH 904/904] gmpdh: Plugin that implements gmp DH functions in an AM_CONDITIONAL(USE_CURVE25519, test x$curve25519 = xtrue) AM_CONDITIONAL(USE_RDRAND, test x$rdrand = xtrue) AM_CONDITIONAL(USE_AESNI, test x$aesni = xtrue) -@@ -1985,6 +1988,7 @@ AC_CONFIG_FILES([ +@@ -1983,6 +1986,7 @@ AC_CONFIG_FILES([ src/libstrongswan/plugins/mgf1/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile diff --git a/net/transmission/Makefile b/net/transmission/Makefile index dc95537c2..e0c03f3ca 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=transmission -PKG_VERSION:=4.0.1 +PKG_VERSION:=4.0.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/transmission/transmission/releases/download/$(PKG_VERSION)/ -PKG_HASH:=8fc5aef23638c983406f6a3ee9918369e4cdc84e3228bd2fb3d01dd55cdad900 +PKG_HASH:=39bf7a104a722805a9dc089cdaaffe33bf90b82230a7ea7f340cae59f00a2ee8 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=GPL-2.0-or-later diff --git a/utils/open-vm-tools/Makefile b/utils/open-vm-tools/Makefile index 172639304..c86af28a2 100644 --- a/utils/open-vm-tools/Makefile +++ b/utils/open-vm-tools/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=open-vm-tools -PKG_VERSION:=12.1.5 +PKG_VERSION:=12.2.0 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20735119.tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-21223074.tar.gz PKG_SOURCE_URL:=https://github.com/vmware/open-vm-tools/releases/download/stable-$(PKG_VERSION) -PKG_HASH:=72cb68c71c59fd429bcb357926f41f07e21c737a341534b707fc1df010ed4868 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-20735119 +PKG_HASH:=ddc797cb75c435ad03c197ee0753156add148d06aefb14587dd31bff7556479a +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-21223074 PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=LICENSE @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=glib2/host +PKG_BUILD_DEPENDS:=glib2/host rpcsvc-proto/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk diff --git a/utils/open-vm-tools/patches/0001-werror.patch b/utils/open-vm-tools/patches/0001-werror.patch index 223939b73..09eb72d38 100644 --- a/utils/open-vm-tools/patches/0001-werror.patch +++ b/utils/open-vm-tools/patches/0001-werror.patch @@ -13,7 +13,7 @@ Signed-off-by: Natanael Copa --- a/configure.ac +++ b/configure.ac -@@ -1451,7 +1451,17 @@ AC_C_VOLATILE +@@ -1461,7 +1461,17 @@ AC_C_VOLATILE ### General flags / actions CFLAGS="$CFLAGS -Wall" diff --git a/utils/open-vm-tools/patches/0003-Use-configure-test-for-struct-timespec.patch b/utils/open-vm-tools/patches/0003-Use-configure-test-for-struct-timespec.patch index de31de4a1..90392f69b 100644 --- a/utils/open-vm-tools/patches/0003-Use-configure-test-for-struct-timespec.patch +++ b/utils/open-vm-tools/patches/0003-Use-configure-test-for-struct-timespec.patch @@ -14,7 +14,7 @@ Signed-off-by: Natanael Copa --- a/configure.ac +++ b/configure.ac -@@ -1441,6 +1441,7 @@ AC_TYPE_OFF_T +@@ -1451,6 +1451,7 @@ AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_SIZE_T AC_CHECK_MEMBERS([struct stat.st_rdev]) diff --git a/utils/open-vm-tools/patches/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch b/utils/open-vm-tools/patches/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch index 3e0b8f316..579846b42 100644 --- a/utils/open-vm-tools/patches/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ b/utils/open-vm-tools/patches/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -27,7 +27,7 @@ Signed-off-by: Natanael Copa --- a/configure.ac +++ b/configure.ac -@@ -1169,6 +1169,7 @@ AC_CHECK_FUNCS( +@@ -1179,6 +1179,7 @@ AC_CHECK_FUNCS( AC_CHECK_FUNCS([ecvt]) AC_CHECK_FUNCS([fcvt]) @@ -35,7 +35,7 @@ Signed-off-by: Natanael Copa AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) -@@ -1378,10 +1379,13 @@ fi +@@ -1388,10 +1389,13 @@ fi ### AC_CHECK_HEADERS([crypt.h]) @@ -65,7 +65,7 @@ Signed-off-by: Natanael Copa #ifdef __APPLE__ #include #include -@@ -1025,31 +1022,32 @@ Id_EndSuperUser(uid_t uid) // IN: +@@ -1025,24 +1022,23 @@ Id_EndSuperUser(uid_t uid) // IN: static Bool IdIsSetUGid(void) { @@ -77,13 +77,13 @@ Signed-off-by: Natanael Copa * We use __secure_getenv, which returns NULL if the binary is - * setuid or setgid. Alternatives include, + * setuid or setgid, when issetugid or getauxval(AT_SECURE) is not -+ * available. Alternatives include, ++ * available. Alternatives included * - * a) getauxval(AT_SECURE); not available until glibc 2.16. - * b) __libc_enable_secure; may not be exported. + * a) issetugid(); not (yet?) available in glibc. + * b) getauxval(AT_SECURE); not available until glibc 2.16. -+ * c) __libc_enable_secure; may not be exported. ++ * c) c) __libc_enable_secure; may not be exported. * - * Use (a) when we are based on glibc 2.16, or newer. + * Use (b) when we are based on glibc 2.16, or newer. @@ -99,10 +99,11 @@ Signed-off-by: Natanael Copa +#elif HAVE___SECURE_GETENV static const char envName[] = "VMW_SETUGID_TEST"; - if (setenv(envName, "1", TRUE) == -1) { - return TRUE; /* Conservative */ + /* +@@ -1062,7 +1058,9 @@ IdIsSetUGid(void) + return secure_getenv(envName) == NULL; } - return __secure_getenv(envName) == NULL; + return TRUE; -#endif +#else + /* Android does not have a secure_getenv, so be conservative. */ diff --git a/utils/open-vm-tools/patches/0008-Rename-poll.h-to-vm_poll.h.patch b/utils/open-vm-tools/patches/0008-Rename-poll.h-to-vm_poll.h.patch index 9de17af2e..e4935b186 100644 --- a/utils/open-vm-tools/patches/0008-Rename-poll.h-to-vm_poll.h.patch +++ b/utils/open-vm-tools/patches/0008-Rename-poll.h-to-vm_poll.h.patch @@ -40,7 +40,7 @@ Signed-off-by: Natanael Copa #include "unicodeOperations.h" --- a/lib/include/asyncsocket.h +++ b/lib/include/asyncsocket.h -@@ -171,7 +171,7 @@ typedef struct AsyncSocket AsyncSocket; +@@ -175,7 +175,7 @@ typedef struct AsyncSocket AsyncSocket; * Or the client can specify its favorite poll class and locking behavior. * Use of IVmdbPoll is only supported for regular sockets and for Attach. */ diff --git a/utils/open-vm-tools/patches/010-warnings.patch b/utils/open-vm-tools/patches/010-warnings.patch index 6681586a9..b63a1081f 100644 --- a/utils/open-vm-tools/patches/010-warnings.patch +++ b/utils/open-vm-tools/patches/010-warnings.patch @@ -38,7 +38,7 @@ #include #include #include -@@ -2573,7 +2574,7 @@ HgfsStatToFileAttr(struct stat *stats, +@@ -2566,7 +2567,7 @@ HgfsStatToFileAttr(struct stat *stats, # define FMTTIMET "l" # endif #else @@ -47,7 +47,7 @@ #endif LOG(4, "access: %"FMTTIMET"d/%"FMT64"u \nwrite: %"FMTTIMET"d/%"FMT64"u \n" "attr: %"FMTTIMET"d/%"FMT64"u\n", -@@ -5301,7 +5302,7 @@ HgfsWriteCheckIORange(off_t offset, +@@ -5294,7 +5295,7 @@ HgfsWriteCheckIORange(off_t offset, goto exit; }