CVS commit: pkgsrc/net/netatalk4

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Sep  3 15:06:07 UTC 2026

Modified Files:
        pkgsrc/net/netatalk4: Makefile PLIST distinfo
        pkgsrc/net/netatalk4/patches: patch-config_meson.build
Removed Files:
        pkgsrc/net/netatalk4/patches: patch-config_pam_meson.build
            patch-include_atalk_util.h

Log Message:
net/netatalk4: Upgrade to v4.5.1

Netatalk 4.5 brings substantial changes, see
<https://github.com/Netatalk/netatalk/releases>
for upstream's changelog.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/netatalk4/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/netatalk4/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/netatalk4/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/net/netatalk4/patches/patch-config_meson.build
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/net/netatalk4/patches/patch-config_pam_meson.build \
    pkgsrc/net/netatalk4/patches/patch-include_atalk_util.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/netatalk4/Makefile
diff -u pkgsrc/net/netatalk4/Makefile:1.37 pkgsrc/net/netatalk4/Makefile:1.38
--- pkgsrc/net/netatalk4/Makefile:1.37  Wed Sep  2 19:04:01 2026
+++ pkgsrc/net/netatalk4/Makefile       Thu Sep  3 15:06:07 2026
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2026/09/02 19:04:01 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2026/09/03 15:06:07 hauke Exp $
 
 GITHUB_PROJECT=        netatalk
 GITHUB_TAG=    refs/tags/${DISTNAME}
 DISTNAME=      netatalk-${PKGVER:C/\./-/g}
 
 PKGNAME=       ${DISTNAME:C/-[0-9].*$//}-${PKGVER}
-PKGREVISION=   2
-PKGVER=                4.4.2
+PKGVER=                4.5.1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Netatalk/}
 
@@ -65,7 +64,6 @@ LDFLAGS.FreeBSD+=     -lpthread
 # into scripts, so replace manually
 SUBST_CLASSES+=                perlpath
 SUBST_STAGE.perlpath=  pre-configure
-SUBST_FILES.perlpath+= contrib/bin_utils/macusers.pl
 SUBST_FILES.perlpath+= contrib/bin_utils/afpstats.pl
 SUBST_FILES.perlpath+= contrib/bin_utils/addump.pl
 SUBST_FILES.perlpath+= contrib/bin_utils/asip-status.pl

Index: pkgsrc/net/netatalk4/PLIST
diff -u pkgsrc/net/netatalk4/PLIST:1.9 pkgsrc/net/netatalk4/PLIST:1.10
--- pkgsrc/net/netatalk4/PLIST:1.9      Thu Jan  8 17:27:55 2026
+++ pkgsrc/net/netatalk4/PLIST  Thu Sep  3 15:06:07 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2026/01/08 17:27:55 hauke Exp $
+@comment $NetBSD: PLIST,v 1.10 2026/09/03 15:06:07 hauke Exp $
 bin/addump
 ${PLIST.appletalk}bin/aecho
 ${PLIST.ldap}bin/afpldaptest
@@ -8,7 +8,6 @@ bin/asip-status
 bin/dbd
 bin/fce_listen
 ${PLIST.appletalk}bin/getzones
-bin/macusers
 bin/nad
 ${PLIST.appletalk}bin/nbplkup
 ${PLIST.appletalk}bin/nbprgstr
@@ -24,6 +23,7 @@ include/atalk/afp_util.h
 include/atalk/asp.h
 include/atalk/atp.h
 include/atalk/cnid.h
+include/atalk/constant_time.h
 include/atalk/ddp.h
 include/atalk/ea.h
 include/atalk/globals.h
@@ -52,8 +52,8 @@ ${PLIST.appletalk}include/netatalk/ddp_v
 ${PLIST.appletalk}include/netatalk/endian.h
 ${PLIST.appletalk}include/netatalk/phase2.h
 lib/libatalk.so
-lib/libatalk.so.19
-lib/libatalk.so.19.0.0
+lib/libatalk.so.20
+lib/libatalk.so.20.0.0
 lib/netatalk/uams_clrtxt.so
 lib/netatalk/uams_dhx.so
 lib/netatalk/uams_dhx2.so
@@ -66,6 +66,7 @@ lib/netatalk/uams_guest.so
 ${PLIST.pam}lib/netatalk/uams_pam.so
 lib/netatalk/uams_passwd.so
 lib/netatalk/uams_randnum.so
+lib/netatalk/uams_srp.so
 man/man1/addump.1
 ${PLIST.appletalk}man/man1/aecho.1
 man/man1/afpldaptest.1
@@ -75,7 +76,6 @@ man/man1/asip-status.1
 man/man1/dbd.1
 man/man1/fce_listen.1
 ${PLIST.appletalk}man/man1/getzones.1
-man/man1/macusers.1
 man/man1/nad.1
 ${PLIST.appletalk}man/man1/nbp.1
 ${PLIST.appletalk}man/man1/nbplkup.1
@@ -83,9 +83,6 @@ ${PLIST.appletalk}man/man1/nbprgstr.1
 ${PLIST.appletalk}man/man1/nbpunrgstr.1
 ${PLIST.appletalk}man/man1/pap.1
 ${PLIST.appletalk}man/man1/rtmpqry.1
-man/man3/atalk_aton.3
-man/man3/nbp_name.3
-man/man4/atalk.4
 man/man5/afp.conf.5
 man/man5/afp_signature.conf.5
 man/man5/afp_voluuid.conf.5
@@ -113,7 +110,7 @@ sbin/netatalk
 ${PLIST.appletalk}sbin/papd
 ${PLIST.appletalk}sbin/timelord
 share/doc/netatalk/CODE_OF_CONDUCT.txt
-share/doc/netatalk/COMPILATION.txt
+share/doc/netatalk/CONTAINERS.txt
 share/doc/netatalk/CONTRIBUTING.txt
 share/doc/netatalk/CONTRIBUTORS.txt
 share/doc/netatalk/INSTALL.txt

Index: pkgsrc/net/netatalk4/distinfo
diff -u pkgsrc/net/netatalk4/distinfo:1.16 pkgsrc/net/netatalk4/distinfo:1.17
--- pkgsrc/net/netatalk4/distinfo:1.16  Fri May  1 19:35:46 2026
+++ pkgsrc/net/netatalk4/distinfo       Thu Sep  3 15:06:07 2026
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.16 2026/05/01 19:35:46 hauke Exp $
+$NetBSD: distinfo,v 1.17 2026/09/03 15:06:07 hauke Exp $
 
-BLAKE2s (netatalk-4-4-2.tar.gz) = a481c722fd92bc3c4e03bc54dde1904bf6ced304e1f1715d5a99f5d6d01082d8
-SHA512 (netatalk-4-4-2.tar.gz) = 1df617a7f4e4357dd40e359a1fbcd38c9e423d276796e380d656c8d146538e7e2b4900d6c2254e369836f279be3e75c0e20ec393744b2d8b6870fdea5e44f2ac
-Size (netatalk-4-4-2.tar.gz) = 1578726 bytes
-SHA1 (patch-config_meson.build) = 8fdc8f4d9da98d68003ef24347475983c4fbb35b
-SHA1 (patch-config_pam_meson.build) = f1d5d285f146ff88c58f7671b4f94fc3363b113f
-SHA1 (patch-include_atalk_util.h) = 419ea5f3bbdb38d7b18df682b36fb55e46bb9110
+BLAKE2s (netatalk-4-5-1.tar.gz) = 5fc349709dc4714f7aa6c4e8586689dcfd9076936cf05260f71e552010e76a85
+SHA512 (netatalk-4-5-1.tar.gz) = 980217ea4cd0840a6fa80762e14ebcf6d115fae8ef42b3fd1bc35ac6454531dd02a76392492a3d618e1a03d72399d87bc6e461100ad33e83a9185107329d4e03
+Size (netatalk-4-5-1.tar.gz) = 1816413 bytes
+SHA1 (patch-config_meson.build) = 06c7a98f93dd4ac3eb4f510ec0e157a69f5b51e3
 SHA1 (patch-meson.build) = e40b41b2be15bc7172b9676b2f044097e579d662

Index: pkgsrc/net/netatalk4/patches/patch-config_meson.build
diff -u pkgsrc/net/netatalk4/patches/patch-config_meson.build:1.4 pkgsrc/net/netatalk4/patches/patch-config_meson.build:1.5
--- pkgsrc/net/netatalk4/patches/patch-config_meson.build:1.4   Tue Aug 12 18:22:55 2025
+++ pkgsrc/net/netatalk4/patches/patch-config_meson.build       Thu Sep  3 15:06:07 2026
@@ -1,22 +1,23 @@
-$NetBSD: patch-config_meson.build,v 1.4 2025/08/12 18:22:55 hauke Exp $
+$NetBSD: patch-config_meson.build,v 1.5 2026/09/03 15:06:07 hauke Exp $
 
 Leave installation of config files to pkgsrc framework
 
---- config/meson.build.orig    2025-08-05 13:56:32.000000000 +0000
+--- config/meson.build.orig    2026-07-16 12:01:12.000000000 +0000
 +++ config/meson.build
-@@ -4,41 +4,12 @@ afp_conf = configure_file(
+@@ -4,12 +4,6 @@ afp_conf = configure_file(
      configuration: cdata,
  )
  
 -if (fs.exists(pkgconfdir / 'afp.conf') and not get_option('with-overwrite'))
 -    message('will not replace existing', pkgconfdir / 'afp.conf')
 -else
--    install_data(afp_conf, install_dir: pkgconfdir)
+-    install_data(afp_conf, install_dir: pkgconfdir, install_tag: 'config')
 -endif
 -
- if have_spotlight
-     dbus_session_conf = configure_file(
-         input: 'dbus-session.conf.in',
+ if have_spotlight and use_spotlight_localsearch
+     subdir('dconf')
+ 
+@@ -18,15 +12,6 @@ if have_spotlight and use_spotlight_loca
          output: 'dbus-session.conf',
          configuration: cdata,
      )
@@ -27,31 +28,18 @@ Leave installation of config files to pk
 -    )
 -        message('will not replace existing', pkgconfdir / 'dbus-session.conf')
 -    else
--        install_data(dbus_session_conf, install_dir: pkgconfdir)
--    endif
--endif
--
--if have_afpstats
--    if (
--        fs.exists(dbus_sysconfpath / 'netatalk-dbus.conf')
--        and not get_option('with-overwrite')
--    )
--        message(
--            'will not replace existing',
--            dbus_sysconfpath / 'netatalk-dbus.conf',
--        )
--    else
--        install_data('netatalk-dbus.conf', install_dir: dbus_sysconfpath)
+-        install_data(dbus_session_conf, install_dir: pkgconfdir, install_tag: 'config')
 -    endif
  endif
  
  static_conf_files = ['extmap.conf']
-@@ -62,33 +33,17 @@ if have_appletalk and have_cups and get_
+@@ -50,20 +35,9 @@ if have_appletalk and have_cups and get_
          input: 'pap.in',
          output: 'pap',
          configuration: cdata,
 -        install: true,
 -        install_dir: cups_libdir / 'cups/backend',
+-        install_tag: 'runtime',
      )
  endif
  
@@ -59,22 +47,23 @@ Leave installation of config files to pk
 -    if (fs.exists(pkgconfdir / file) and not get_option('with-overwrite'))
 -        message('will not replace existing', pkgconfdir / file)
 -    else
--        install_data(file, install_dir: pkgconfdir)
+-        install_data(file, install_dir: pkgconfdir, install_tag: 'config')
 -    endif
 -endforeach
 -
  if (fs.exists('/etc/ld.so.conf.d') and get_option('with-ldsoconf'))
      configure_file(
          input: 'libatalk.conf.in',
-         output: 'libatalk.conf',
-         configuration: cdata,
--        install: true,
--        install_dir: '/etc/ld.so.conf.d',
+@@ -75,14 +49,6 @@ if (fs.exists('/etc/ld.so.conf.d') and g
      )
  endif
  
 -if get_option('with-statedir-creation')
--    install_data('README', install_dir: localstatedir / 'netatalk/CNID')
+-    install_data(
+-        'README',
+-        install_dir: localstatedir / 'netatalk/CNID',
+-        install_tag: 'doc',
+-    )
 -endif
 -
  if have_pam