diff --git a/config/rootfiles/packages/netatalk b/config/rootfiles/packages/netatalk index 074ae442d..d23b05390 100644 --- a/config/rootfiles/packages/netatalk +++ b/config/rootfiles/packages/netatalk @@ -1,4 +1,5 @@ etc/afp.conf +#etc/dbus-1/system.d/netatalk-dbus.conf etc/dbus-session.conf etc/extmap.conf etc/pam.d/netatalk @@ -8,8 +9,7 @@ usr/bin/afpldaptest usr/bin/afppasswd usr/bin/afpstats usr/bin/apple_dump -usr/bin/asip-status.pl -usr/bin/cnid2_create +usr/bin/asip-status usr/bin/dbd usr/bin/macusers #usr/bin/netatalk-config @@ -19,7 +19,6 @@ usr/bin/macusers #usr/include/atalk/afp.h #usr/include/atalk/bstrlib.h #usr/include/atalk/cnid.h -#usr/include/atalk/compat.h #usr/include/atalk/dictionary.h #usr/include/atalk/ea.h #usr/include/atalk/globals.h @@ -36,8 +35,6 @@ usr/bin/macusers #usr/include/atalk/util.h #usr/include/atalk/vfs.h #usr/include/atalk/volume.h -#usr/lib/libatalk.a -#usr/lib/libatalk.la #usr/lib/libatalk.so usr/lib/libatalk.so.18 usr/lib/libatalk.so.18.0.0 @@ -45,45 +42,28 @@ usr/lib/libatalk.so.18.0.0 #usr/lib/netatalk/uams_clrtxt.so usr/lib/netatalk/uams_dhx.so usr/lib/netatalk/uams_dhx2.so -#usr/lib/netatalk/uams_dhx2_pam.a -#usr/lib/netatalk/uams_dhx2_pam.la usr/lib/netatalk/uams_dhx2_pam.so -#usr/lib/netatalk/uams_dhx2_passwd.a -#usr/lib/netatalk/uams_dhx2_passwd.la usr/lib/netatalk/uams_dhx2_passwd.so -#usr/lib/netatalk/uams_dhx_pam.a -#usr/lib/netatalk/uams_dhx_pam.la usr/lib/netatalk/uams_dhx_pam.so -#usr/lib/netatalk/uams_dhx_passwd.a -#usr/lib/netatalk/uams_dhx_passwd.la usr/lib/netatalk/uams_dhx_passwd.so -#usr/lib/netatalk/uams_guest.a -#usr/lib/netatalk/uams_guest.la +usr/lib/netatalk/uams_gss.so usr/lib/netatalk/uams_guest.so -#usr/lib/netatalk/uams_pam.a -#usr/lib/netatalk/uams_pam.la usr/lib/netatalk/uams_pam.so -#usr/lib/netatalk/uams_passwd.a -#usr/lib/netatalk/uams_passwd.la usr/lib/netatalk/uams_passwd.so -#usr/lib/netatalk/uams_randnum.a -#usr/lib/netatalk/uams_randnum.la usr/lib/netatalk/uams_randnum.so usr/sbin/afpd usr/sbin/cnid_dbd usr/sbin/cnid_metad usr/sbin/netatalk -#usr/share/aclocal/netatalk.m4 #usr/share/man/man1/ad.1 #usr/share/man/man1/afpldaptest.1 #usr/share/man/man1/afppasswd.1 #usr/share/man/man1/afpstats.1 #usr/share/man/man1/apple_dump.1 -#usr/share/man/man1/asip-status.pl.1 +#usr/share/man/man1/asip-status.1 #usr/share/man/man1/dbd.1 #usr/share/man/man1/macusers.1 #usr/share/man/man1/netatalk-config.1 -#usr/share/man/man1/uniconv.1 #usr/share/man/man5/afp.conf.5 #usr/share/man/man5/afp_signature.conf.5 #usr/share/man/man5/afp_voluuid.conf.5 diff --git a/lfs/netatalk b/lfs/netatalk index 5875fb1b2..57f6bcaf9 100644 --- a/lfs/netatalk +++ b/lfs/netatalk @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,15 +26,15 @@ include Config SUMMARY = AppleShare file server -VER = 3.1.12 +VER = 3.2.5 THISAPP = netatalk-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = netatalk -PAK_VER = 8 +PAK_VER = 9 DEPS = avahi dbus @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 912bb85045952202becc42899f87ada33427ded987de6c7a6b56c061c1eb6d1a96d95a1700522bfe2119c6db8bbec94eeb4c64c480f59ff7d406542390705efc +$(DL_FILE)_BLAKE2 = 017c8390f4d6e7f81fcc9ddde459af48a47acd9e3fdf3b230887d36ebf96518a96e3483ac063ee734b20e9bca39c7cc2c9c1720265fb05d49358447bedc2976d install : $(TARGET) @@ -82,15 +82,17 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var/state \ - --without-libevent - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/netatalk-3.2.5_remove_prefix_from_sysconfdir_and_localstatedir.patch + cd $(DIR_APP) && meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var/state \ + -Dwith-pam-config-path=/etc/pam.d \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install # Backup install -v -m 644 $(DIR_SRC)/config/backup/includes/netatalk \ diff --git a/src/patches/netatalk-3.2.5_remove_prefix_from_sysconfdir_and_localstatedir.patch b/src/patches/netatalk-3.2.5_remove_prefix_from_sysconfdir_and_localstatedir.patch new file mode 100644 index 000000000..51ce3d648 --- /dev/null +++ b/src/patches/netatalk-3.2.5_remove_prefix_from_sysconfdir_and_localstatedir.patch @@ -0,0 +1,15 @@ +--- netatalk-3.2.5/meson.build.orig 2024-08-01 12:16:47.000000000 +0200 ++++ netatalk-3.2.5/meson.build 2024-08-08 16:07:31.337732788 +0200 +@@ -39,10 +39,10 @@ + datadir = prefix / get_option('datadir') + includedir = prefix / get_option('includedir') + libdir = prefix / get_option('libdir') +-localstatedir = prefix / get_option('localstatedir') ++localstatedir = get_option('localstatedir') + mandir = prefix / get_option('mandir') + sbindir = prefix / get_option('sbindir') +-sysconfdir = prefix / get_option('sysconfdir') ++sysconfdir = get_option('sysconfdir') + + pkgconfdir = get_option('with-pkgconfdir-path') + if pkgconfdir == ''