From 2411efad3742339541dd347c4ab638e7ef00de3e Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 14 Nov 2024 16:59:29 +0800 Subject: [PATCH 01/14] xray-core: Update to 24.11.11 Signed-off-by: Tianling Shen (cherry picked from commit 41457908b83d32c4b1037ab99a82f59456fc0e22) --- net/xray-core/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/xray-core/Makefile b/net/xray-core/Makefile index 01ee70be2c..bb8971044b 100644 --- a/net/xray-core/Makefile +++ b/net/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-core -PKG_VERSION:=24.9.30 +PKG_VERSION:=24.11.11 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=0771120ddbf866fba44f2e8978bcc20f3843663f5726bd8db9e03e1a27e1212a +PKG_HASH:=4ba61bf03096809ef9a7fb27fa7e8232bcc79ae1cc2ac1b601abe0366879111c PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 From f3907d211ab04c4e952a123ca049a81228607983 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 28 Nov 2024 15:02:17 +0800 Subject: [PATCH 02/14] xray-core: Update to 24.11.21 Signed-off-by: Tianling Shen (cherry picked from commit 3d05b2c1a9f3f631670e292f494c3525eba0c61a) --- net/xray-core/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/xray-core/Makefile b/net/xray-core/Makefile index bb8971044b..d8c3d63b7a 100644 --- a/net/xray-core/Makefile +++ b/net/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-core -PKG_VERSION:=24.11.11 +PKG_VERSION:=24.11.21 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=4ba61bf03096809ef9a7fb27fa7e8232bcc79ae1cc2ac1b601abe0366879111c +PKG_HASH:=e45ad1fa11457101776d2c0d7ed8ed7c669b714e7687a85830e44a6e4a52fe05 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 From 346e9f420ad9a01549703fab671892f954392adc Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 2 Nov 2024 19:19:10 +0800 Subject: [PATCH 03/14] v2ray-geodata: Update to latest version Signed-off-by: Tianling Shen (cherry picked from commit 5fb541f00f0ef9dd10793c40d0418809647105ba) --- net/v2ray-geodata/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/v2ray-geodata/Makefile b/net/v2ray-geodata/Makefile index 055f82083c..edce27e348 100644 --- a/net/v2ray-geodata/Makefile +++ b/net/v2ray-geodata/Makefile @@ -12,31 +12,31 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202410030052 +GEOIP_VER:=202410310053 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL_FILE:=geoip.dat FILE:=$(GEOIP_FILE) - HASH:=061c2116e650932c8058b663c14cd03be2241c6048bba6a2765ee1ea38481bff + HASH:=2762fa0a7d1728089b7723b7796cb5ca955330a3fa2e4407fa40e480fbf9cea7 endef -GEOSITE_VER:=20240920063125 +GEOSITE_VER:=20241013063848 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=aeefcd8b3e5b27c22e2e7dfb6ff5e8d0741fd540d96ab355fd00a0472f5884a7 + HASH:=f820556ed3aa02eb7eadba7a3743d7e6df8e9234785d0d82d2d1edce20fe4b3c endef -GEOSITE_IRAN_VER:=202409300035 +GEOSITE_IRAN_VER:=202410280036 GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER) define Download/geosite-ir URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/ URL_FILE:=iran.dat FILE:=$(GEOSITE_IRAN_FILE) - HASH:=b10725db0a82d919cc72cd161dec4b14b6870c760322f6e503c55de3c1828f3d + HASH:=5059e9d5ffcc80a8e2d7824dde704e8f086e41ccfc90ae36c355b49564a7ce68 endef define Package/v2ray-geodata/template From 030d96422ad81eac64ac73d6bec11c10263bb781 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 14 Nov 2024 16:59:55 +0800 Subject: [PATCH 04/14] v2ray-geodata: Update to latest version Signed-off-by: Tianling Shen (cherry picked from commit d76d51a4b826588e09404515fbaf19f3f4442a62) --- net/v2ray-geodata/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/v2ray-geodata/Makefile b/net/v2ray-geodata/Makefile index edce27e348..371dbf0545 100644 --- a/net/v2ray-geodata/Makefile +++ b/net/v2ray-geodata/Makefile @@ -12,31 +12,31 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202410310053 +GEOIP_VER:=202411140052 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL_FILE:=geoip.dat FILE:=$(GEOIP_FILE) - HASH:=2762fa0a7d1728089b7723b7796cb5ca955330a3fa2e4407fa40e480fbf9cea7 + HASH:=c9114fd3157e44f1234976a3cba6d8ffee28fb8331890f0909d64e5b6677494e endef -GEOSITE_VER:=20241013063848 +GEOSITE_VER:=20241112092643 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=f820556ed3aa02eb7eadba7a3743d7e6df8e9234785d0d82d2d1edce20fe4b3c + HASH:=f04433837b88a3f49d7cd6517c91e8f5de4e4496f3d88ef3b7c6be5bb63f4c6f endef -GEOSITE_IRAN_VER:=202410280036 +GEOSITE_IRAN_VER:=202411110034 GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER) define Download/geosite-ir URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/ URL_FILE:=iran.dat FILE:=$(GEOSITE_IRAN_FILE) - HASH:=5059e9d5ffcc80a8e2d7824dde704e8f086e41ccfc90ae36c355b49564a7ce68 + HASH:=57ebf16e74ef4baaaa2e39c7489784f5ae7f2bf87bc1c7fe9a3f9d1c5e4026a9 endef define Package/v2ray-geodata/template From 65587765dee1bba236430170ee32799459a950bb Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 11 Feb 2024 14:27:25 -0800 Subject: [PATCH 05/14] yajl: backport CVE-2023-33460 fix Removed old uclibc patches. Not relevant with modern musl or glibc. Signed-off-by: Rosen Penev (cherry picked from commit c9ff829fdb046a774c25cf3ce3382979b795edfd) --- libs/yajl/Makefile | 2 +- libs/yajl/patches/010-CVE-2023-33460.patch | 41 +++++++++++++++++++ .../100-link-reformatter-uclibc-libm.patch | 11 ----- .../patches/101-link-perf-uclibc-libm.patch | 8 ---- 4 files changed, 42 insertions(+), 20 deletions(-) create mode 100644 libs/yajl/patches/010-CVE-2023-33460.patch delete mode 100644 libs/yajl/patches/100-link-reformatter-uclibc-libm.patch delete mode 100644 libs/yajl/patches/101-link-perf-uclibc-libm.patch diff --git a/libs/yajl/Makefile b/libs/yajl/Makefile index bb496786d3..fac9dcc31c 100644 --- a/libs/yajl/Makefile +++ b/libs/yajl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yajl PKG_VERSION:=2.1.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/lloyd/yajl diff --git a/libs/yajl/patches/010-CVE-2023-33460.patch b/libs/yajl/patches/010-CVE-2023-33460.patch new file mode 100644 index 0000000000..4edc1d3a67 --- /dev/null +++ b/libs/yajl/patches/010-CVE-2023-33460.patch @@ -0,0 +1,41 @@ +From 31531a6e6b5641398237ce15b7e62da02d975fc6 Mon Sep 17 00:00:00 2001 +From: Like Ma +Date: Sat, 2 Dec 2023 19:55:55 +0800 +Subject: [PATCH] Fix for CVE-2023-33460a + +Memory leak in yajl 2.1.0 with use of yajl_tree_parse function +See https://github.com/lloyd/yajl/issues/250#issuecomment-1628695214 + +Origin: https://github.com/openEuler-BaseService/yajl/commit/23a122eddaa28165a6c219000adcc31ff9a8a698 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1039984 +Bug: https://github.com/lloyd/yajl/issues/250 +--- + src/yajl_tree.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/src/yajl_tree.c ++++ b/src/yajl_tree.c +@@ -143,7 +143,7 @@ static yajl_val context_pop(context_t *c + ctx->stack = stack->next; + + v = stack->value; +- ++ free (stack->key); + free (stack); + + return (v); +@@ -444,7 +444,14 @@ yajl_val yajl_tree_parse (const char *in + snprintf(error_buffer, error_buffer_size, "%s", internal_err_str); + YA_FREE(&(handle->alloc), internal_err_str); + } ++ while(ctx.stack != NULL) { ++ yajl_val v = context_pop(&ctx); ++ yajl_tree_free(v); ++ } + yajl_free (handle); ++ //If the requested memory is not released in time, it will cause memory leakage ++ if(ctx.root) ++ yajl_tree_free(ctx.root); + return NULL; + } + diff --git a/libs/yajl/patches/100-link-reformatter-uclibc-libm.patch b/libs/yajl/patches/100-link-reformatter-uclibc-libm.patch deleted file mode 100644 index 21aa41f63c..0000000000 --- a/libs/yajl/patches/100-link-reformatter-uclibc-libm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/reformatter/CMakeLists.txt -+++ b/reformatter/CMakeLists.txt -@@ -26,7 +26,7 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_ - - ADD_EXECUTABLE(json_reformat ${SRCS}) - --TARGET_LINK_LIBRARIES(json_reformat yajl_s) -+TARGET_LINK_LIBRARIES(json_reformat yajl_s m) - - # In some environments, we must explicitly link libm (like qnx, - # thanks @shahbag) diff --git a/libs/yajl/patches/101-link-perf-uclibc-libm.patch b/libs/yajl/patches/101-link-perf-uclibc-libm.patch deleted file mode 100644 index 797c4a7daf..0000000000 --- a/libs/yajl/patches/101-link-perf-uclibc-libm.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/perf/CMakeLists.txt -+++ b/perf/CMakeLists.txt -@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_ - - ADD_EXECUTABLE(perftest ${SRCS}) - --TARGET_LINK_LIBRARIES(perftest yajl_s) -+TARGET_LINK_LIBRARIES(perftest yajl_s m) From 032b806dae3860f1b8fc153b7c5adbca4bbe3856 Mon Sep 17 00:00:00 2001 From: Antonio Pastor Date: Tue, 28 May 2024 20:24:13 -0400 Subject: [PATCH 06/14] netatalk: update to 3.2.0. Commit restores package after it was removed from OpenWrt 21.02. Signed-off-by: Antonio Pastor --- net/netatalk/Makefile | 99 ++++++++++++++++++++++++++++++++++++ net/netatalk/files/afpd.init | 23 +++++++++ 2 files changed, 122 insertions(+) create mode 100644 net/netatalk/Makefile create mode 100644 net/netatalk/files/afpd.init diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile new file mode 100644 index 0000000000..9b397ac541 --- /dev/null +++ b/net/netatalk/Makefile @@ -0,0 +1,99 @@ +# +# Copyright (C) 2009-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=netatalk +PKG_VERSION:=3.2.0 +PKG_RELEASE:=1 + +#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@SF/netatalk +PKG_HASH:=0c2b4b47450bc7ac95a268d1033471f572a3e06b64131fcef9b66e73663b6d08 + +PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 +PKG_FIXUP:=autoreconf + +PKG_CPE_ID:=cpe:/a:netatalk:netatalk + +PKG_BUILD_DEPENDS:=libevent2 + +include $(INCLUDE_DIR)/package.mk + +define Package/netatalk + SECTION:=net + CATEGORY:=Network + SUBMENU:=Filesystem + DEPENDS:=+libattr +libdb47 +libgcrypt +libopenssl +libevent2 + TITLE:=netatalk + URL:=http://netatalk.sourceforge.net + MAINTAINER:=Alexandru Ardelean +endef + +define Package/netatalk/decription + Netatalk is a freely-available Open Source AFP fileserver. + It also provides a kernel level implementation of the AppleTalk + Protocol Suite. +endef + +TARGET_CFLAGS += -std=gnu99 + +CONFIGURE_ARGS += \ + --disable-afs \ + --disable-hfs \ + --enable-debugging \ + --disable-shell-check \ + --disable-timelord \ + --disable-a2boot \ + --disable-cups \ + --disable-tcp-wrappers \ + --with-cnid-default-backend=dbd \ + --with-bdb="$(STAGING_DIR)/usr/" \ + --with-libevent=no \ + --with-libgcrypt-dir="$(STAGING_DIR)/usr" \ + --with-ssl-dir="$(STAGING_DIR)/usr" \ + --with-uams-path="/usr/lib/uams" \ + --without-acls \ + --without-kerberos \ + --without-mysql \ + --with-mysql-config=false \ + --without-pam \ + --disable-admin-group \ + --disable-srvloc \ + --disable-zeroconf \ + $(if $(CONFIG_SHADOW_PASSWORDS),--with-shadow,--without-shadow) \ + --without-dtrace \ + --without-ldap + +define Package/netatalk/conffiles +/etc/afp.conf +/etc/extmap.conf +/etc/netatalk/ +endef + +define Package/netatalk/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/lib/uams + $(INSTALL_DIR) $(1)/etc/init.d + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatalk.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/bin/dbd $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ad $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/afppasswd $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/afpd $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_dbd $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_metad $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/uams/*.so $(1)/usr/lib/uams/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/afp.conf $(1)/etc/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/extmap.conf $(1)/etc/ + $(INSTALL_BIN) ./files/afpd.init $(1)/etc/init.d/afpd +endef + +$(eval $(call BuildPackage,netatalk)) diff --git a/net/netatalk/files/afpd.init b/net/netatalk/files/afpd.init new file mode 100644 index 0000000000..8fab349e31 --- /dev/null +++ b/net/netatalk/files/afpd.init @@ -0,0 +1,23 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2010-2012 OpenWrt.org + +START=80 +STOP=10 + +USE_PROCD=1 + +start_service() { + mkdir -p /var/netatalk/CNID/ + + procd_open_instance + procd_set_param command /usr/sbin/afpd -d -F /etc/afp.conf + procd_set_param file /etc/afp.conf + procd_set_param respawn + procd_close_instance + + procd_open_instance + procd_set_param command /usr/sbin/cnid_metad -d + procd_set_param respawn + procd_close_instance +} + From ec3650b5492887b2c8e37aaae6423c3011ee6a3e Mon Sep 17 00:00:00 2001 From: Antonio Pastor Date: Thu, 8 Aug 2024 15:10:33 -0400 Subject: [PATCH 07/14] netatalk: Update to 3.2.5 Compile tested/run: ipq806x No changes to package other than using latest available codebase. Signed-off-by: Antonio Pastor --- net/netatalk/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 9b397ac541..b4d0709da0 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netatalk -PKG_VERSION:=3.2.0 +PKG_VERSION:=3.2.5 PKG_RELEASE:=1 +PKG_LICENSE:=GPL-2.0-or-later #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/netatalk -PKG_HASH:=0c2b4b47450bc7ac95a268d1033471f572a3e06b64131fcef9b66e73663b6d08 +PKG_HASH:=57de9a7ed411029d6176e429a14ef314460251d8aebe7139aeadc35633d9584b PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 @@ -33,7 +34,7 @@ define Package/netatalk DEPENDS:=+libattr +libdb47 +libgcrypt +libopenssl +libevent2 TITLE:=netatalk URL:=http://netatalk.sourceforge.net - MAINTAINER:=Alexandru Ardelean + MAINTAINER:=An Pa endef define Package/netatalk/decription From 8fee849de601c1aef8a4bf410af6cb98481bef16 Mon Sep 17 00:00:00 2001 From: Antonio Pastor Date: Fri, 25 Oct 2024 00:03:33 -0400 Subject: [PATCH 08/14] netatalk: Update to 4.0.4 Maintainer: Antonio Pastor / @APCCV Compile tested: ipq806x (23.05.3, snapshot) Run tested: ipq806x - C2600: start server, connect from MacOS, read/write files to home share, create/update TimeMachine backups Description: No changes to package other than using latest available upstream code base. Starting Netatalk 4.x build uses meson instead of autotools. Signed-off-by: Antonio Pastor --- net/netatalk/Makefile | 84 ++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 45 deletions(-) diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index b4d0709da0..6fa7454f40 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -8,30 +8,27 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netatalk -PKG_VERSION:=3.2.5 +PKG_VERSION:=4.0.4 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0-or-later -#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/netatalk -PKG_HASH:=57de9a7ed411029d6176e429a14ef314460251d8aebe7139aeadc35633d9584b - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf +PKG_HASH:=3234ed4aee2dff05319544eec53eda232ecc94742c5cbee39376899551351219 PKG_CPE_ID:=cpe:/a:netatalk:netatalk PKG_BUILD_DEPENDS:=libevent2 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +include $(INCLUDE_DIR)/meson.mk define Package/netatalk SECTION:=net CATEGORY:=Network SUBMENU:=Filesystem - DEPENDS:=+libattr +libdb47 +libgcrypt +libopenssl +libevent2 + DEPENDS:=+libevent2 +libdb47 +libgcrypt TITLE:=netatalk URL:=http://netatalk.sourceforge.net MAINTAINER:=An Pa @@ -43,34 +40,35 @@ define Package/netatalk/decription Protocol Suite. endef -TARGET_CFLAGS += -std=gnu99 - -CONFIGURE_ARGS += \ - --disable-afs \ - --disable-hfs \ - --enable-debugging \ - --disable-shell-check \ - --disable-timelord \ - --disable-a2boot \ - --disable-cups \ - --disable-tcp-wrappers \ - --with-cnid-default-backend=dbd \ - --with-bdb="$(STAGING_DIR)/usr/" \ - --with-libevent=no \ - --with-libgcrypt-dir="$(STAGING_DIR)/usr" \ - --with-ssl-dir="$(STAGING_DIR)/usr" \ - --with-uams-path="/usr/lib/uams" \ - --without-acls \ - --without-kerberos \ - --without-mysql \ - --with-mysql-config=false \ - --without-pam \ - --disable-admin-group \ - --disable-srvloc \ - --disable-zeroconf \ - $(if $(CONFIG_SHADOW_PASSWORDS),--with-shadow,--without-shadow) \ - --without-dtrace \ - --without-ldap +MESON_ARGS += \ + -Dwith-appletalk=false \ + -Dwith-zeroconf=false \ + -Dwith-cups=false \ + -Dwith-quota=false \ + -Dwith-afpstats=false \ + -Dwith-acls=false \ + -Dwith-ldap=false \ + -Dwith-cnid-default-backend=dbd \ + -Dwith-cnid-dbd-backend=true \ + -Dwith-cnid-mysql-backend=false \ + -Dwith-pam=false \ + -Dwith-tests=false \ + -Dwith-testsuite=false \ + -Dwith-bdb-path="$(STAGING_DIR)/usr/" \ + -Dwith-unicode-data-path="$(STAGING_DIR_HOST)/share/gnulib/tests/uniname/" \ + -Dwith-libgcrypt-path="$(STAGING_DIR)/usr/" \ + -Dwith-kerberos=false \ + -Dwith-krbV-uam=false \ + -Dwith-libiconv=false \ + -Dwith-spotlight=false \ + $(if $(CONFIG_SHADOW_PASSWORDS),-Dwith-shadow=true,-Dwith-shadow=false) \ + -Dwith-dtrace=false \ + -Dwith-tcp-wrappers=false \ + -Dwith-debug=false \ + -Dwith-shell-check=false \ + -Dwith-readmes=false \ + -Dwith-manual=none \ + -Dwith-init-style=none \ define Package/netatalk/conffiles /etc/afp.conf @@ -81,17 +79,13 @@ endef define Package/netatalk/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib/netatalk $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_DIR) $(1)/usr/lib/uams $(INSTALL_DIR) $(1)/etc/init.d - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatalk.so* $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/bin/dbd $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ad $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/afppasswd $(1)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/afpd $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_dbd $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/cnid_metad $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/uams/*.so $(1)/usr/lib/uams/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatalk.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/netatalk/*.so $(1)/usr/lib/netatalk/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/afp.conf $(1)/etc/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/extmap.conf $(1)/etc/ $(INSTALL_BIN) ./files/afpd.init $(1)/etc/init.d/afpd From 2a61b7d2b96cf965b60834941e24c8ca700efa05 Mon Sep 17 00:00:00 2001 From: Antonio Pastor Date: Sun, 3 Nov 2024 13:40:02 -0500 Subject: [PATCH 09/14] netatalk: Clean up Makefile Updated title. Updated description. Reordered to match most common layout Signed-off-by: Antonio Pastor --- net/netatalk/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 6fa7454f40..af242e6b19 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -10,16 +10,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netatalk PKG_VERSION:=4.0.4 PKG_RELEASE:=1 -PKG_LICENSE:=GPL-2.0-or-later PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/netatalk PKG_HASH:=3234ed4aee2dff05319544eec53eda232ecc94742c5cbee39376899551351219 +PKG_MAINTAINER:=Antonio Pastor +PKG_LICENSE:=GPL-2.0-or-later +PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:netatalk:netatalk -PKG_BUILD_DEPENDS:=libevent2 - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/meson.mk @@ -28,16 +28,18 @@ define Package/netatalk SECTION:=net CATEGORY:=Network SUBMENU:=Filesystem - DEPENDS:=+libevent2 +libdb47 +libgcrypt - TITLE:=netatalk + TITLE:=Netatalk - Apple Filing Protocol (AFP) file server. URL:=http://netatalk.sourceforge.net - MAINTAINER:=An Pa + DEPENDS:=+libevent2 +libdb47 +libgcrypt endef define Package/netatalk/decription - Netatalk is a freely-available Open Source AFP fileserver. - It also provides a kernel level implementation of the AppleTalk - Protocol Suite. + Netatalk is an Open Source Apple Filing Protocol (AFP) fileserver. + Implements a service that allows Macintosh file sharing + and Time Machine backups. Modern MacOS prefers Samba network shares + but AFP has shown superior throughput. High Sierra and older MacOS + only support AFP for Time Machine backups. + Does not support old AppleTalk protocols to talk to non OSX Macs. endef MESON_ARGS += \ From eb65df7171e4812adfb24da7cb8e9075e3c6bb8c Mon Sep 17 00:00:00 2001 From: Antonio Pastor Date: Sun, 3 Nov 2024 13:41:21 -0500 Subject: [PATCH 10/14] netatalk: Enable AppleTalk feature Starting v4.0.0, netatalk brings back AppleTalk features lost in v3. Updated description. Signed-off-by: Antonio Pastor --- net/netatalk/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index af242e6b19..fd7b18162c 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -39,15 +39,15 @@ define Package/netatalk/decription and Time Machine backups. Modern MacOS prefers Samba network shares but AFP has shown superior throughput. High Sierra and older MacOS only support AFP for Time Machine backups. - Does not support old AppleTalk protocols to talk to non OSX Macs. + Includes support of AppleTalk protocols to network with pre-OSX Macs. endef MESON_ARGS += \ - -Dwith-appletalk=false \ + -Dwith-appletalk=true \ -Dwith-zeroconf=false \ -Dwith-cups=false \ -Dwith-quota=false \ - -Dwith-afpstats=false \ + -Dwith-afpstats=true \ -Dwith-acls=false \ -Dwith-ldap=false \ -Dwith-cnid-default-backend=dbd \ @@ -76,6 +76,8 @@ define Package/netatalk/conffiles /etc/afp.conf /etc/extmap.conf /etc/netatalk/ +/etc/atalkd.conf +/etc/papd.conf endef define Package/netatalk/install @@ -90,6 +92,8 @@ define Package/netatalk/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/afp.conf $(1)/etc/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/extmap.conf $(1)/etc/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/papd.conf $(1)/etc/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/atalkd.conf $(1)/etc/ $(INSTALL_BIN) ./files/afpd.init $(1)/etc/init.d/afpd endef From 12e59e2bbad231c2ae7928f0f52b1da4cc0a6f24 Mon Sep 17 00:00:00 2001 From: Antonio Pastor Date: Mon, 4 Nov 2024 17:18:56 -0500 Subject: [PATCH 11/14] netatalk: Remove apfstats feature to solve dependency issues afpstats requires several libraries that would increase significantly final install size. Signed-off-by: Antonio Pastor --- net/netatalk/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index fd7b18162c..ae3c74035b 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -33,7 +33,7 @@ define Package/netatalk DEPENDS:=+libevent2 +libdb47 +libgcrypt endef -define Package/netatalk/decription +define Package/netatalk/description Netatalk is an Open Source Apple Filing Protocol (AFP) fileserver. Implements a service that allows Macintosh file sharing and Time Machine backups. Modern MacOS prefers Samba network shares @@ -47,7 +47,7 @@ MESON_ARGS += \ -Dwith-zeroconf=false \ -Dwith-cups=false \ -Dwith-quota=false \ - -Dwith-afpstats=true \ + -Dwith-afpstats=false \ -Dwith-acls=false \ -Dwith-ldap=false \ -Dwith-cnid-default-backend=dbd \ From 2da11f9cb48326202d60df33c3b0ea116f47c33c Mon Sep 17 00:00:00 2001 From: Antonio Pastor Date: Thu, 5 Dec 2024 19:05:46 -0500 Subject: [PATCH 12/14] netatalk: Update to 4.0.7 Maintainer: Antonio Pastor / @APCCV Compile tested: ipq806x (24.10-rc2, snapshot) Run tested: ipq806x - C2600 (snapshot): install apk, start/stop sfpd service & review logs Description: Bump to version 4.0.7 Signed-off-by: Antonio Pastor --- net/netatalk/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index ae3c74035b..43aadc1932 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netatalk -PKG_VERSION:=4.0.4 +PKG_VERSION:=4.0.7 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/netatalk -PKG_HASH:=3234ed4aee2dff05319544eec53eda232ecc94742c5cbee39376899551351219 +PKG_HASH:=64ab20c888de061468c4b49dcb703a68c31b6157b3957557f8d302558f0c4c21 PKG_MAINTAINER:=Antonio Pastor PKG_LICENSE:=GPL-2.0-or-later From 8bf3f985dc6964fc8d153cde7cb38ef68494a03c Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Tue, 17 Dec 2024 21:13:32 +0100 Subject: [PATCH 13/14] travelmate: update to 2.1.3-3 * properly escape double quotes in travelmate option values * minor procd tweaks Signed-off-by: Dirk Brenken (cherry picked from commit 128875aa67c378dd065582220980df9cfd4576a7) --- net/travelmate/Makefile | 2 +- net/travelmate/files/travelmate.init | 4 ++-- net/travelmate/files/travelmate.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile index 361e793438..dfaf419ef3 100644 --- a/net/travelmate/Makefile +++ b/net/travelmate/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=travelmate PKG_VERSION:=2.1.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/travelmate/files/travelmate.init b/net/travelmate/files/travelmate.init index 4a7dbf2609..37b301950a 100755 --- a/net/travelmate/files/travelmate.init +++ b/net/travelmate/files/travelmate.init @@ -33,8 +33,8 @@ start_service() { procd_set_param command "${trm_script}" "${@}" procd_set_param pidfile "${trm_pidfile}" procd_set_param nice "$(uci_get travelmate global trm_nice "0")" - procd_set_param stdout 1 - procd_set_param stderr 1 + procd_set_param stdout 0 + procd_set_param stderr 0 procd_close_instance fi } diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh index 5e32379ec1..442918d6b8 100755 --- a/net/travelmate/files/travelmate.sh +++ b/net/travelmate/files/travelmate.sh @@ -84,11 +84,11 @@ f_env() { if [ "${name}" = "travelmate" ] && [ "${type}" = "global" ]; then option_cb() { - local option="${1}" value="${2}" + local option="${1}" value="${2//\"/\\\"}" eval "${option}=\"${value}\"" } list_cb() { - local option="${1}" value="${2}" + local option="${1}" value="${2//\"/\\\"}" if [ "${option}" = "trm_vpnifacelist" ] && ! printf "%s" "${trm_vpnifacelist}" | "${trm_grepcmd}" -q "${value}"; then eval "trm_vpnifacelist=\"$(printf "%s" "${trm_vpnifacelist}") ${value}\"" fi From 49ebe6a057e404083cffcc6a4808287ed434cdcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 12 Dec 2024 20:19:04 +0000 Subject: [PATCH 14/14] lrzsz: fix random build failures by really disabling autofoo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we're seeing random build failures, caused by autofoo being called on very ancient bundled autofoo: cd . && aclocal aclocal.real: warning: autoconf input should be named 'configure.ac', not 'configure.in' acinclude.m4:2: warning: underquoted definition of AC_REPLACE_GNU_GETOPT acinclude.m4:2: run info Automake 'Extending aclocal' acinclude.m4:2: or see https://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal configure.in:106: error: automatic de-ANSI-fication support has been removed For some reason that `touch` based neutralization introduced in commit 6d6c4b21b5e2 ("lrzsz: update to v0.12.21rc and fix a CVE") doesn't always work. So lets fix it by removing the autofoo bits from the bundled Makefile.in and while at it remove processing of man and testsuite subdirs to save some computing cycles. Fixes: #25543 Fixes: 6d6c4b21b5e2 ("lrzsz: update to v0.12.21rc and fix a CVE") Signed-off-by: Petr Štetiar (cherry picked from commit 3e612586041d40ebfafadb65eaa6fc34b2061ee8) --- utils/lrzsz/Makefile | 7 -- .../patches/300-neutralize-autofoo.patch | 72 +++++++++++++++++++ 2 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 utils/lrzsz/patches/300-neutralize-autofoo.patch diff --git a/utils/lrzsz/Makefile b/utils/lrzsz/Makefile index 7de52aac02..524e5b525f 100644 --- a/utils/lrzsz/Makefile +++ b/utils/lrzsz/Makefile @@ -41,13 +41,6 @@ define Package/lrzsz/description from a variety of programs running under various operating systems. endef -# to stop automake from running, the bundled autohell crap is too old -define Build/Configure - touch $(PKG_BUILD_DIR)/* - touch $(PKG_BUILD_DIR)/*/* - $(call Build/Configure/Default) -endef - define Package/lrzsz/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lrz $(1)/usr/bin/ diff --git a/utils/lrzsz/patches/300-neutralize-autofoo.patch b/utils/lrzsz/patches/300-neutralize-autofoo.patch new file mode 100644 index 0000000000..4769e49878 --- /dev/null +++ b/utils/lrzsz/patches/300-neutralize-autofoo.patch @@ -0,0 +1,72 @@ +autofoo stuff is really ancient, so lets make sure, that its never called. + +Fixes: openwrt/packages/issues/25543 +Signed-off-by: Petr Štetiar +--- a/Makefile.in ++++ b/Makefile.in +@@ -92,7 +92,7 @@ USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + l = @l@ + +-SUBDIRS = lib intl src po man testsuite ++SUBDIRS = lib intl src po + EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux README.gettext rpmrc buildrpm systype.in fastcheck.sh README.tests beos-runpiped.c fastcheck.beos + + noinst_SCRIPTS = systype +@@ -117,19 +117,16 @@ GZIP_ENV = --best + all: all-redirect + .SUFFIXES: + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + + $(ACLOCAL_M4): configure.in acinclude.m4 +- cd $(srcdir) && $(ACLOCAL) + + config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +- cd $(srcdir) && $(AUTOCONF) + + config.h: stamp-h + @if test ! -f $@; then \ +@@ -147,7 +144,6 @@ $(srcdir)/config.h.in: $(srcdir)/stamp-h + $(MAKE) $(srcdir)/stamp-h.in; \ + else :; fi + $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h +- cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null + + mostlyclean-hdr: +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -141,7 +141,6 @@ all: all-redirect + .SUFFIXES: + .SUFFIXES: .S .c .o .s + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ +--- a/man/Makefile.in ++++ b/man/Makefile.in +@@ -111,7 +111,6 @@ GZIP_ENV = --best + all: all-redirect + .SUFFIXES: + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile + + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ +@@ -168,8 +167,6 @@ distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ +- cd $(top_srcdir) \ +- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \