CVS commit: pkgsrc/net/netatalk22

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Sun Jan 21 20:00:42 UTC 2024

Modified Files:
        pkgsrc/net/netatalk22: Makefile PLIST distinfo
        pkgsrc/net/netatalk22/patches: patch-config_Makefile.in

Log Message:
Update net/netatalk22 to v2.3.0

For convenience, we'll stick with the package name 'netatalk22', since
gratuitous renames are a pain for package_rolling-replace(8) users.

In hindsight, something like 'netatalk-ddp' would have been more
descriptive.

>From upstream's changelog:

New features

The following compile time options have been added:

    --disable-install-privileged (skips actions that require root access)
    --with-systemd-prefix

Breaking changes

As of Netatalk 2.3.0, the Database Daemon dbd CNID backend is the only
one provided for use in production environments. The last CNID backend
is still available for testing and read-only volumes.

The DHX UAM is now disabled by default, to avoid errors stemming from
OpenSSL v3.0 removal of 128 bit modulus size support. See #358 for
more details on how to make DHX work on your system, and on using
alternative UAMs for authenticating with older clients.

The following features have been removed.

    Concurrent Database (cdb) CNID backend
    Trivial Database (tdb) CNID backend
    Volume mount preexec and postexec commands
    Dropbox / dropkludge
    Force UID/GID
    Andrew File System (AFS)

Compatibility macros for the following long-obsoleted operating
systems have been removed.

    SunOS
    IRIX
    AIX
    Ultrix
    HPUX
    Tru64,
    GNU/kFreeBSD
    UnixWare

afpd

The following runtime options have been removed:

    nodebug (afpd.conf)
    nostat
    preexec
    postexec
    root_preexec
    root_postexec
    preexec_close
    root_preexec_close
    dropbox
    dropkludge

The following compile time options have been removed:

    --enable-debug
    --enable-debug1
    --enable-afs
    --enable-force-uidgid
    --enable-dropkludge
    --with-cnid-tdb-backend
    --with-cnid-cdb-backend
    --with-webmin

Renamed:

    asip-status.pl has been renamed to asip-status

atalkd

Netatalk versions 2.2.7 through 2.2.10 had the non-standard behavior
of not rebroadcasting routing information originating from other
subnets. This made certain Asant� or Dayna LocalTalk hardware bridges
able to coexist with netatalk, with the drawback that subnets behind
other routers aren't visible to the netatalk clients.

Netatalk 2.3.0 restores the correct behavior as per the AppleTalk
specification. If you want to emulate the previous non-standard
behavior, you can start atalkd with the newly introduced -q parameter.

What's Changed

    [2.2] Run distcheck target in Ubuntu job by @rdmark in #395
    [2.2] Add Documentation tags to systemd templates by @rdmark in #394
    [2.2] Support building against libtirpc as separate from glibc
          by @rdmark in #387
    [2.2] Fix detection of Berkeley DB installed in multiarch location
          by @rdmark in #391
    [2.2] Configurable systemd prefix by @rdmark in #417
    [2.2] autoconf: Option to skip privileged hooks for make install
          by @rdmark in #419
    Flip the check for tm->tm_gmtoff to appease FreeBSD by @rdmark in #416
    [2.2] Rename asip-status.pl to asip-status by @rdmark in #397
    [2.2] Fix user visible typos and improve English grammar by @rdmark in #399
    [2.2] autoconf: put UAM libraries in $libdir by @rdmark in #420
    [2.2] Correct install hook for static config files by @rdmark in #421
    [2.2] Create man page for cnid2_create tool by @rdmark in #411
    [2.2] Do not install at.h when glibc header is present by @rdmark in #414
    [2.2] autoconf: Fold a2boot and timelord under the appletalk conditional
          by @rdmark in #424
    [2.2] Write a Description and Short-Description for the Debian init script
          by @rdmark in #437
    [2.2] Document binheader, nadheader, and showpap in man pages
          by @rdmark in #438
    [2.2] Improve readability of manual README by @rdmark in #440
    [2.2] Recommend BerkeleyDB 5.3 by @rdmark in #447
    [2.2] Update URL for css stylesheet in manual pages by @rdmark in #445
    [2.2] workflow: Flesh out pull_request trigger and remove ignored paths
          by @rdmark in #453
    [2.2] Use absolute XSL stylesheet path and source VERSION for manual pages
          by @rdmark in #459
    [2.2] Remove obsoleted bug reporting sections by @rdmark in #466
    [2.2] manpages: Fix typos, improve layout in afpd.conf man page
          by @rdmark in #472
    Revert "[2.2] Update atalkd.service to be consistent with other init
    scripts." by @rdmark in #473
    [2.2] Default to xz compression for tarballs by @rdmark in #483
    [2.2] Remove vestiges of a Webmin install target by @rdmark in #517
    [2.2] Name the default home dir shared volume; clean up template
          by @rdmark in #519
    [2.2] Remove redundant id properties in man page by @rdmark in #520
    [2.3] Port 2.x fork code quality improvements by @rdmark in #521
    [2.2] Rearrange the dummy file system paths for the tests by @rdmark in #522
    [2.3] Don't seteuid() if process is already running as that uid.
          by @rdmark in #532
    [2.3] Enable, sort, and flesh out file type translation by @rdmark in #534
    [2.3] Remove dangerous afprun module from codebase by @dgsga in #531
    [2.3] Remove experimental Dropbox Kludge feature by @rdmark in #539
    [2.3] Remove redundant AUTHORS file by @rdmark in #537
    [2.3] Remove the "Force UID/GID" feature by @rdmark in #541
    [2.3] Add long-forgotten patch to make papd safer. by @rdmark in #527
    [2.3] Remove nostat option by @rdmark in #542
    [2.3] Minor cleanup of man pages by @rdmark in #544
    [2.3] Validate size of ace_count in FPSetACL request by @rdmark in #551
    [2.3] Run apt-get update before installing packages by @rdmark in #558
    [2.3] Fixes for clean compilation on OpenIndiana by @rdmark in #564
    Revert Asante and Dayna GS/OS Fix. by @NJRoadfan in #596
    Add README for the v2.3 branch by @rdmark in #588
    [2.3] Document the correct default log level for afpd by @rdmark in #589
    [2.3] Standardize man page heading case by @rdmark in #590
    [2.3] Deprecate AFS (Andrew File System) support by @rdmark in #591
    atalkd: Introduce 3rd party bridge quirks mode by @rdmark in #597
    [2.3] uams: Link PGP UAM with CRYPT_LIBS by @rdmark in #607
    [2.3] Build Kerberos V and PGP UAMs in CI workflow by @rdmark in #613
    [2.3] Improve logger_test, while re-enabling the syslog tests
          by @rdmark in #616
    [2.3] Enable only DHX2 UAM by default by @rdmark in #619
    [2.3] Switch from compile-time debug to run-time debug where applicable
          by @rdmark in #618
    [2.3] Remove cdb and tdb CNID backends by @rdmark in #611
    [2.3] Use portable fcntl() instead of flock() by @rdmark in #626
    [2.3] afpd: Use correct username length in afp_changepw by @rdmark in #630
    [2.3] Clean up residual svn commit headers by @rdmark in #631
    [2.3] Minor cleanup of residual afprun code by @rdmark in #632
    Preparing for stable release 2.3.0 by @rdmark in #633


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/net/netatalk22/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/netatalk22/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/netatalk22/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/net/netatalk22/patches/patch-config_Makefile.in

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

Modified files:

Index: pkgsrc/net/netatalk22/Makefile
diff -u pkgsrc/net/netatalk22/Makefile:1.60 pkgsrc/net/netatalk22/Makefile:1.61
--- pkgsrc/net/netatalk22/Makefile:1.60 Wed Nov  8 13:20:32 2023
+++ pkgsrc/net/netatalk22/Makefile      Sun Jan 21 20:00:42 2024
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.60 2023/11/08 13:20:32 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2024/01/21 20:00:42 hauke Exp $
 
-DISTNAME=      netatalk-2.2.10
+DISTNAME=      netatalk-2.3.0
 PKGNAME=       ${DISTNAME:C/-/22-/}
-PKGREVISION=   3
 CATEGORIES=    net print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/${DISTNAME:C/\./-/g}/
+EXTRACT_SUFX=  .tar.xz
+
 #PATCHFILES=   patch-adv1tov2.c
 PATCH_SITES=   http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \
                http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/

Index: pkgsrc/net/netatalk22/PLIST
diff -u pkgsrc/net/netatalk22/PLIST:1.5 pkgsrc/net/netatalk22/PLIST:1.6
--- pkgsrc/net/netatalk22/PLIST:1.5     Thu Apr 27 15:08:44 2023
+++ pkgsrc/net/netatalk22/PLIST Sun Jan 21 20:00:42 2024
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2023/04/27 15:08:44 hauke Exp $
-${PLIST.ea}bin/ad
+@comment $NetBSD: PLIST,v 1.6 2024/01/21 20:00:42 hauke Exp $
+bin/ad
 bin/add_netatalk_printer
 bin/adv1tov2
 bin/aecho
 bin/afpldaptest
 bin/afppasswd
 bin/apple_dump
-bin/asip-status.pl
+bin/asip-status
 bin/binheader
 bin/cnid2_create
 bin/dbd
@@ -54,7 +54,6 @@ include/atalk/queue.h
 include/atalk/rtmp.h
 include/atalk/server_child.h
 include/atalk/server_ipc.h
-include/atalk/tdb.h
 include/atalk/uam.h
 include/atalk/unicode.h
 include/atalk/unix.h
@@ -105,13 +104,9 @@ libexec/netatalk/timelord
 libexec/netatalk/uams/uams_clrtxt.so
 libexec/netatalk/uams/uams_dhx.so
 libexec/netatalk/uams/uams_dhx2.so
-${PLIST.pam}libexec/netatalk/uams/uams_dhx2_pam.la
 libexec/netatalk/uams/uams_dhx2_passwd.la
-${PLIST.pam}libexec/netatalk/uams/uams_dhx_pam.la
 libexec/netatalk/uams/uams_dhx_passwd.la
-${PLIST.gssapi}libexec/netatalk/uams/uams_gss.la
 libexec/netatalk/uams/uams_guest.la
-${PLIST.pam}libexec/netatalk/uams/uams_pam.la
 libexec/netatalk/uams/uams_passwd.la
 libexec/netatalk/uams/uams_randnum.la
 man/man1/ad.1
@@ -119,13 +114,16 @@ man/man1/aecho.1
 man/man1/afpldaptest.1
 man/man1/afppasswd.1
 man/man1/apple_dump.1
-man/man1/asip-status.pl.1
+man/man1/asip-status.1
+man/man1/binheader.1
+man/man1/cnid2_create.1
 man/man1/dbd.1
 man/man1/getzones.1
 man/man1/hqx2bin.1
 man/man1/macbinary.1
 man/man1/macusers.1
 man/man1/megatron.1
+man/man1/nadheader.1
 man/man1/nbp.1
 man/man1/nbplkup.1
 man/man1/nbprgstr.1
@@ -134,13 +132,12 @@ man/man1/netatalk-config.1
 man/man1/pap.1
 man/man1/papstatus.1
 man/man1/psorder.1
+man/man1/showppd.1
 man/man1/single2bin.1
 man/man1/unbin.1
 man/man1/unhex.1
 man/man1/uniconv.1
 man/man1/unsingle.1
-man/man3/atalk_aton.3
-man/man3/nbp_name.3
 man/man4/atalk.4
 man/man5/AppleVolumes.5
 man/man5/AppleVolumes.default.5
@@ -164,11 +161,9 @@ man/man8/timelord.8
 share/aclocal/netatalk.m4
 share/examples/netatalk/AppleVolumes.default
 share/examples/netatalk/AppleVolumes.system
-${PLIST.ldap}share/examples/netatalk/afp_ldap.conf
 share/examples/netatalk/afpd.conf
 share/examples/netatalk/atalkd.conf
 share/examples/netatalk/netatalk.conf
-${PLIST.pam}share/examples/netatalk/netatalk.pam
 share/examples/netatalk/papd.conf
 share/netatalk/pagecount.ps
 @pkgdir libexec/psffilters

Index: pkgsrc/net/netatalk22/distinfo
diff -u pkgsrc/net/netatalk22/distinfo:1.18 pkgsrc/net/netatalk22/distinfo:1.19
--- pkgsrc/net/netatalk22/distinfo:1.18 Fri Sep  1 13:09:56 2023
+++ pkgsrc/net/netatalk22/distinfo      Sun Jan 21 20:00:42 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2023/09/01 13:09:56 hauke Exp $
+$NetBSD: distinfo,v 1.19 2024/01/21 20:00:42 hauke Exp $
 
-BLAKE2s (netatalk-2.2.10.tar.gz) = 1b3fd793f7e53243bd10494db94eba630afbb1a903997a390377c4e850742038
-SHA512 (netatalk-2.2.10.tar.gz) = c604aa76ecfc7f66aea157850ae6f4aff7a1122b69431c2fdf39e1bc661896b0546680f4f76851dd29e2fc513f4d25bed1c264c479f2cb0c3630b0b7dab3225c
-Size (netatalk-2.2.10.tar.gz) = 1844076 bytes
-SHA1 (patch-config_Makefile.in) = 37ed88693c64b5e34396da26f9d7105102ed479b
+BLAKE2s (netatalk-2.3.0.tar.xz) = d916e7cc4015fc50a562f2e858bdd6063b7f4e7e16d3b355ab69d0be1ccab978
+SHA512 (netatalk-2.3.0.tar.xz) = dae412486cc0ffca6a01c356dc69c51e13ed1a9982345b6bc1aba52a2539fb126c72b08807472419ec672305d15320f3b2eb73e27038d62e8cee82e77b2adb7c
+Size (netatalk-2.3.0.tar.xz) = 976584 bytes
+SHA1 (patch-config_Makefile.in) = c50f69262dacf559265d615cea798830eaa3b0e6
 SHA1 (patch-configure) = 6b9d73ac0c8ba4913834402a587b734d342c3830

Index: pkgsrc/net/netatalk22/patches/patch-config_Makefile.in
diff -u pkgsrc/net/netatalk22/patches/patch-config_Makefile.in:1.3 pkgsrc/net/netatalk22/patches/patch-config_Makefile.in:1.4
--- pkgsrc/net/netatalk22/patches/patch-config_Makefile.in:1.3  Tue Jan 10 22:07:33 2023
+++ pkgsrc/net/netatalk22/patches/patch-config_Makefile.in      Sun Jan 21 20:00:42 2024
@@ -1,22 +1,36 @@
-$NetBSD: patch-config_Makefile.in,v 1.3 2023/01/10 22:07:33 hauke Exp $
+$NetBSD: patch-config_Makefile.in,v 1.4 2024/01/21 20:00:42 hauke Exp $
 
 Install config files to examples/netatalk, and leave installation to
 the pkginstall framerwork.
 
 Renamed from patch-ah
 
---- config/Makefile.in.orig    2017-07-09 11:27:05.000000000 +0000
+--- config/Makefile.in.orig    2023-12-28 12:14:55.000000000 +0000
 +++ config/Makefile.in
-@@ -759,13 +759,14 @@ uninstall-local:
-               rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
+@@ -751,23 +751,25 @@ uninstall-local:
        done
  @USE_DEBIAN_TRUE@     rm -f $(DESTDIR)/etc/default/netatalk
-+egconfdir = @prefix@/share/examples/netatalk
  
++egconfdir = @prefix@/share/examples/netatalk
++
  install-config-files: $(CONFFILES) $(GENFILES)
 -      $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
 +      $(mkinstalldirs) $(DESTDIR)$(egconfdir)
-       for f in $(CONFFILES) $(GENFILES); do \
+       for f in $(CONFFILES); do \
+               if test -f $(srcdir)$$f; then \
+                       echo "origin file not found $(srcdir)$$f"; \
+                       exit 1; \
+-              elif test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
+-                      echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
+-                      $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgconfdir); \
++              elif test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(egconfdir)/$$f; then \
++                      echo "$(INSTALL_DATA) $$f $(DESTDIR)$(egconfdir)"; \
++                      $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(egconfdir); \
+               else \
+                       echo "not overwriting $$f"; \
+               fi; \
+       done
+       for f in $(GENFILES); do \
 -              if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
 -                      echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
 -                      $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \