diff --git a/lang/python/python-hatchling/Makefile b/lang/python/python-hatchling/Makefile index 661d62611..76ca4fc1a 100644 --- a/lang/python/python-hatchling/Makefile +++ b/lang/python/python-hatchling/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-hatchling -PKG_VERSION:=1.14.1 +PKG_VERSION:=1.17.0 PKG_RELEASE:=1 PYPI_NAME:=hatchling -PKG_HASH:=55fbc88cbd0d96c09c3e9392b51db513fd4cb4caf47615d65f935a5ef1756133 +PKG_HASH:=b1244db3f45b4ef5a00106a46612da107cdfaf85f1580b8e1c059fefc98b0930 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.txt diff --git a/libs/libpciaccess/Makefile b/libs/libpciaccess/Makefile index 7cae04bcc..5053d89de 100644 --- a/libs/libpciaccess/Makefile +++ b/libs/libpciaccess/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpciaccess -PKG_VERSION:=0.16 +PKG_VERSION:=0.17 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://www.x.org/releases/individual/lib/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=214c9d0d884fdd7375ec8da8dcb91a8d3169f263294c9a90c575bf1938b9f489 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_HASH:=74283ba3c974913029e7a547496a29145b07ec51732bbb5b5c58d5025ad95b73 PKG_MAINTAINER:= Lucian Cristian PKG_LICENSE_FILES:=COPYING diff --git a/libs/libpciaccess/patches/010-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versions.patch b/libs/libpciaccess/patches/010-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versions.patch new file mode 100644 index 000000000..254dafc52 --- /dev/null +++ b/libs/libpciaccess/patches/010-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versions.patch @@ -0,0 +1,39 @@ +From 833c86ce15cee2a84a37ae71015f236fd32615d9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 11 Nov 2022 11:15:58 -0800 +Subject: [PATCH] linux_sysfs: Use pwrite/pread instead of 64bit versions + +pread64/pwrite64 are aliased to pread/pwrite when largefile support is +enabled e.g. using _FILE_OFFSET_BITS=64 macro + +This helps it compile on latest musl C library based systems where these +functions are put under _LARGEFILE64_SOURCE which is to be removed once +all packages start using 64bit off_t, it works with glibc becuase +_GNU_SOURCE feature macro also defines _LARGEFILE64_SOURCE, thats not +the case with musl + +Signed-off-by: Khem Raj +--- + src/linux_sysfs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/src/linux_sysfs.c ++++ b/src/linux_sysfs.c +@@ -462,7 +462,7 @@ pci_device_linux_sysfs_read( struct pci_ + + + while ( temp_size > 0 ) { +- const ssize_t bytes = pread64( fd, data_bytes, temp_size, offset ); ++ const ssize_t bytes = pread( fd, data_bytes, temp_size, offset ); + + /* If zero bytes were read, then we assume it's the end of the + * config file. +@@ -522,7 +522,7 @@ pci_device_linux_sysfs_write( struct pci + + + while ( temp_size > 0 ) { +- const ssize_t bytes = pwrite64( fd, data_bytes, temp_size, offset ); ++ const ssize_t bytes = pwrite( fd, data_bytes, temp_size, offset ); + + /* If zero bytes were written, then we assume it's the end of the + * config file. diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index c7a3a1f57..5996a9620 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nfs-kernel-server PKG_VERSION:=2.6.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=26d46448982252e9e2c8346d10cf13e1143e7089c866f53e25db3359f3e9493c PKG_SOURCE_URL:=@SF/nfs @@ -100,6 +100,10 @@ TARGET_CFLAGS += -Wno-error=implicit-function-declaration \ -Wno-error=undef \ -Wno-error=missing-include-dirs +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib/libevent CONFIGURE_ARGS += \ diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 06cba0afe..f2112a40f 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh PKG_VERSION:=9.3p1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 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_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ + https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ PKG_HASH:=e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8 PKG_LICENSE:=BSD ISC @@ -31,10 +31,10 @@ include $(INCLUDE_DIR)/package.mk define Package/openssh/Default SECTION:=net CATEGORY:=Network - DEPENDS:=+libopenssl +zlib + DEPENDS:= TITLE:=OpenSSH MAINTAINER:=Peter Wagner - URL:=http://www.openssh.com/ + URL:=https://www.openssh.com/ SUBMENU:=SSH endef @@ -50,6 +50,7 @@ endef define Package/openssh-client $(call Package/openssh/Default) + DEPENDS+= +libopenssl +zlib TITLE+= client ALTERNATIVES:=\ 200:/usr/bin/ssh:/usr/libexec/ssh-openssh \ @@ -66,7 +67,7 @@ endef define Package/openssh-client-utils $(call Package/openssh/Default) - DEPENDS+= +openssh-client +openssh-keygen + DEPENDS+= +libopenssl +zlib +openssh-client +openssh-keygen TITLE+= client utilities endef @@ -76,6 +77,7 @@ endef define Package/openssh-keygen $(call Package/openssh/Default) + DEPENDS+= +libopenssl +zlib TITLE+= keygen endef @@ -85,7 +87,7 @@ endef define Package/openssh-server $(call Package/openssh/Default) - DEPENDS+= +openssh-keygen +OPENSSH_LIBFIDO2:libfido2 + DEPENDS+= +libopenssl +zlib +openssh-keygen +OPENSSH_LIBFIDO2:libfido2 TITLE+= server USERID:=sshd=22:sshd=22 VARIANT:=without-pam @@ -110,7 +112,7 @@ endef define Package/openssh-server-pam $(call Package/openssh/Default) - DEPENDS+= +libpthread +openssh-keygen +libpam + DEPENDS+= +libopenssl +zlib +libpthread +openssh-keygen +libpam TITLE+= server (with PAM support) VARIANT:=with-pam USERID:=sshd=22:sshd=22 diff --git a/utils/acpid/Makefile b/utils/acpid/Makefile index dc9421426..ff894a302 100644 --- a/utils/acpid/Makefile +++ b/utils/acpid/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acpid -PKG_VERSION:=2.0.32 -PKG_RELEASE:=3 +PKG_VERSION:=2.0.34 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/acpid2 -PKG_HASH:=f2d2d30b3edc3234bd82f6f7186699a6aa3c85c8d20bc4e30e9b3c68a1ed157e +PKG_HASH:=2d095c8cfcbc847caec746d62cdc8d0bff1ec1bc72ef7c674c721e04da6ab333 PKG_MAINTAINER:=Thomas Heil PKG_LICENSE:=GPL-2.0-or-later diff --git a/utils/acpid/patches/010-Replace-stat64-with-stat.patch b/utils/acpid/patches/010-Replace-stat64-with-stat.patch new file mode 100644 index 000000000..d559a8e56 --- /dev/null +++ b/utils/acpid/patches/010-Replace-stat64-with-stat.patch @@ -0,0 +1,28 @@ +From 81df3ad69585629f952972228d7edb6da0596b94 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 14 Dec 2022 15:04:30 -0800 +Subject: [PATCH] Replace stat64 with stat + +It already checks for largefile support in configure.ac via +AC_SYS_LARGEFILE macro, which will ensure that 64bit elements +are correctly setup for stat APIs on platforms needing large +file support. + +Signed-off-by: Khem Raj +--- + sock.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sock.c ++++ b/sock.c +@@ -54,8 +54,8 @@ int non_root_clients; + static int + isfdtype(int fd, int fdtype) + { +- struct stat64 st; +- if (fstat64(fd, &st) != 0) ++ struct stat st; ++ if (fstat(fd, &st) != 0) + return -1; + return ((st.st_mode & S_IFMT) == (mode_t)fdtype); + } diff --git a/utils/apk/Makefile b/utils/apk/Makefile index 0a4e5a525..56e473c5b 100644 --- a/utils/apk/Makefile +++ b/utils/apk/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apk -PKG_VERSION:=2.12.11 +PKG_VERSION:=2.14.0 PKG_RELEASE:=1 PKG_SOURCE:=apk-tools-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v$(PKG_VERSION) -PKG_HASH:=2cc2cd8dd515a729609066f08edc7317b5bca33a335ca4f6a56367aa018856c5 +PKG_HASH:=4c6db13039280814a10a3b3d89b29837b59769c69214a1861997e088eac107a5 PKG_BUILD_DIR:=$(BUILD_DIR)/apk-tools-v$(PKG_VERSION) PKG_MAINTAINER:=Paul Spooren diff --git a/utils/apk/patches/010-openssl-deprecated.patch b/utils/apk/patches/010-openssl-deprecated.patch index d6ee852d0..bdfafb671 100644 --- a/utils/apk/patches/010-openssl-deprecated.patch +++ b/utils/apk/patches/010-openssl-deprecated.patch @@ -16,7 +16,7 @@ Signed-off-by: Rosen Penev --- a/libfetch/common.c +++ b/libfetch/common.c -@@ -531,15 +531,11 @@ static int fetch_ssl_setup_client_certif +@@ -583,15 +583,11 @@ static int fetch_ssl_setup_client_certif int fetch_ssl(conn_t *conn, const struct url *URL, int verbose) { @@ -50,7 +50,7 @@ Signed-off-by: Rosen Penev #include #include "apk_defines.h" -@@ -378,25 +373,6 @@ static int parse_options(int argc, char +@@ -423,25 +418,6 @@ static int parse_options(int argc, char return 0; } @@ -76,15 +76,15 @@ Signed-off-by: Rosen Penev static void on_sigwinch(int s) { apk_reset_screen_width(); -@@ -475,7 +451,7 @@ int main(int argc, char **argv) +@@ -534,7 +510,7 @@ int main(int argc, char **argv) apk_force |= applet->forced_force; } - init_openssl(); + apk_openssl_init(); setup_automatic_flags(); - fetchConnectionCacheInit(32, 4); - + fetchTimeout = 60; + fetchRedirectMethod = fetch_redirect; --- a/src/apk_openssl.h +++ b/src/apk_openssl.h @@ -11,7 +11,11 @@