From 399e8b3b38be844376ebb039caf6282ccb9189fa Mon Sep 17 00:00:00 2001 From: Antonio Pastor Date: Fri, 25 Oct 2024 00:03:33 -0400 Subject: [PATCH] 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 (cherry picked from commit d0abe3d52de9a3052d4d32a1f72ae2c23b73bc6a) --- 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 -- 2.30.2