CVS commit: pkgsrc/net/netatalk4

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Mon May  5 13:57:00 UTC 2025

Modified Files:
        pkgsrc/net/netatalk4: Makefile PLIST distinfo
        pkgsrc/net/netatalk4/patches: patch-config_meson.build
            patch-meson.build

Log Message:
Update net/netatalk4 to v4.2.2

>From upstream's changelog:

Netatalk 4.2.2
    docs: Format man page code blocks without backticks by @rdmark in #2114
    GitHub CI: Use secret context for secure AFP test password handling by @rdmark in #2115
    docs: Touch up afp.conf man page description of cnid schemes by @rdmark in #2118
    libatalk: Create MySQL CNID database automatically if needed by @rdmark in #2119
    testsuite: Skip tests not compatible with the mysql backend by @rdmark in #2120
    docker: Support for the mysql CNID backend in container by @rdmark in #2117
    GitHub CI: Run the spectest against the production netatalk container by @rdmark in #2124
    docker: Introduce an AFP_EXTMAP option to enable extension mapping by @rdmark in #2125
    docker: Introduce AFP_EXCLUDE_TESTS flag for triggering test exclusion by @rdmark in #2126
    webmin: Support the editing of extmap.conf by @rdmark in #2129
    webmin: Correct handling of volume and volume preset names by @rdmark in #2130
    webmin: Treat uams_randnum.so as a standard UAM by @rdmark in #2131
    docker: Containerized netatalk webmin module by @rdmark in #2132
    meson: Use pandoc to generate documentation when available by @rdmark in #2127
    docker: Introduce DISABLE_SPOTLIGHT flag for turning off indexing by @rdmark in #2128
    webmin: Option for hiding service controls by @rdmark in #2133
    meson: Make it possible to generate the html manual with plain cmark by @rdmark in #2134
    meson: Properly build the localized html manual by @rdmark in #2136
    Rewrite the make Compilation readme script in Perl by @rdmark in #2137
    docs: Cleaner markdown sources with contents moved around by @rdmark in #2138
    libatalk: Tweak NULL check logic to appease gcc 13.3 on Ubuntu by @rdmark in #2139

Netatalk 4.2.1

    Update SECURITY.md with minor version policy by @rdmark in #2066
    Update afp.conf examples with new volume name scheme by @rdmark in #2067
    docs: Reflect accurate authorship of the Japanese localization by @rdmark in #2068
    Remove iniparser's dictionary.h header by @rdmark in #2069
    meson: Introduce option for controlling state dir creation by @rdmark in #2070
    meson: Option for controlling CUPS libdir path prefix and pap backend by @rdmark in #2071
    meson: Generate Unicode lookup table sources before using them by @rdmark in #2072
    webmin: Print volume name as well as section name in volumes list by @rdmark in #2073
    webmin: Sort lists of index page items in alphabetical order by @rdmark in #2074
    webmin: Consistently return to the correct index tab from other actions by @rdmark in #2075
    docker: Tweak startup messages for DDP services by @rdmark in #2076
    bstring: Rename bgetsa function to bgetstreama by @rdmark in #2079
    docs: Join chapters and appendices in website manual sidebar by @rdmark in #2080
    Restore the author\u2019s email address in pap shell script by @rdmark in #2081
    docs: Append man page chapter to man page html file name by @rdmark in #2082
    Consistently credit two authors with email address by @rdmark in #2083
    Create bstring README with redistribution notes and full credits by @rdmark in #2077
    docs: Improve grammar and layout in signature and UUID man pages by @rdmark in #2084
    GitHub CI: FreeBSD has migrated from tracker to localsearch by @rdmark in #2086
    Handle DSIWrite() bug in ASC 3.7.x by @NJRoadfan in #2085
    testsuite: Fix test399() to work with AFP3.4 by @NJRoadfan in #2090
    GitHub CI: Always use latest vmactions runners by @rdmark in #2091
    Fix extension mapping on macOS hosts by @NJRoadfan in #2092
    testsuite: Use common pattern for validating error code in test432 by @rdmark in #2093
    GitHub CI: Actually use Debian Dockerfile for Debian test container by @rdmark in #2094
    testsuite: Print a summary of skipped tests at end of spectest run by @rdmark in #2095
    testsuite: Run test221 with AFP 3.1 or later by @rdmark in #2096
    testsuite: Use matching return value types for DSI status codes by @rdmark in #2098
    docs: Major additions to the afptest man page by @rdmark in #2100
    meson: Do not install the pap CUPS backend by default by @rdmark in #2101
    Fall back to no EA rather than AD when the EA support check fails by @rdmark in #2103
    testsuite: Break out separate FPGetExtAttr test module by @rdmark in #2104
    docs: Transition Compilation from manual chapter to readme by @rdmark in #2106
    GitHub CI: Build the testsuite on all OSes by @rdmark in #2108
    docs: Reduce overlap between install chapter and install readme by @rdmark in #2107
    GitHub CI: Build on FreeBSD with the latest mysql91-client by @rdmark in #2110
    testsuite: Print usage helptext when running test binaries without params by @rdmark in #2111
    libatalk: Restore cnid mysql pw option that had fallen off by @rdmark in #2112

Netatalk 4.2.0
    Convert documentation from XML to Markdown by @rdmark in #1905
    docs: Touch up documentation for web publishing by @rdmark in #1917
    docs: Add notes on the po4a dependency to the documentation by @rdmark in #1918
    docs: Use correct Markdown hyperlinks in manual by @rdmark in #1920
    docs: Correct misspelling of uams_cleartxt.so by @rdmark in #1922
    docs: Touch up text styling of manual pages by @rdmark in #1924
    Avoid compiler complaints re: getpwnam() argument being NULL by @sqrmax in #1926
    Remove traces of unsupported LDAP SASL auth by @rdmark in #1925
    meson: Introduce with-unicode-data option to build case tables by @rdmark in #1928
    Bundle Thomas Kaiser's pap backend for CUPS by @rdmark in #1930
    libatalk: Use getaddrinfo() instead of deprecated gethostbyname() by @rdmark in #1934
    uams: Check account validity after calling pam_authenticate() by @rdmark in #1935
    uams: Validate PAM account after root auth in DHX2 UAM by @rdmark in #1937
    Avoid TOCTOU conditions by @rdmark in #1936
    meson: Refactor root includes list by @rdmark in #1939
    meson: Clean up obsolete header and function checks by @rdmark in #1947
    docker: Remove dependence on bash in entry script by @rdmark in #1941
    Link with shared iniparser library by @rdmark in #1948
    GitHub CI: Build without Spotlight support on macOS by @rdmark in #1949
    GitHub CI: SonarQube static analysis in own workflow, using v4 action by @rdmark in #1950
    Fix pointer declaration so it is a const by @sqrmax in #1951
    Improved logging for the case where charset conversion fails by @sqrmax in #1952
    meson: Detect cracklib library and dictionary on macOS / Homebrew by @rdmark in #1953
    Memory and thread safety in afpd and libatalk by @rdmark in #1954
    libatalk: Plug another two potential memory leaks by @rdmark in #1955
    libatalk: Plug yet another potential memory leak by @rdmark in #1956
    Avoid TOCTOU race conditions in libatalk code by @rdmark in #1938
    Make testsuite AppleDouble v2 compatible, and run it in CI by @rdmark in #1958
    libatalk: Use file descriptors and exclusive access to avoid TOCTOU conditions by @rdmark in #1957
    libatalk: Refactor vfs write_ea() to write directly without temp file by @rdmark in #1962
    libatalk: Refactor vfs ea_open() to avoid TOCTOU race condition by @rdmark in #1964
    libatalk: Refactor vfs write_ea() to avoid TOCTOU race condition (take 2) by @rdmark in #1965
    Fix high severity memory safety bugs by @rdmark in #1966
    Config file handling compatible with upstream iniparser by @rdmark in #1968
    docs: Create a more navigation friendly local html manual by @rdmark in #1969
    docs: Correct description of hostname option in afp.conf by @rdmark in #1970
    libatalk: Introduce standardized interface for iniparser by @rdmark in #1973
    Introduce 'server name' Global option in afp.conf by @rdmark in #1974
    docs: Elaborate on the relationship between cnid server and cnid listen by @rdmark in #1975
    Rename option to 'volume name' rather than the ambiguous 'name' by @rdmark in #1976
    afpd: Use servername for ASP connections with hostname fallback by @rdmark in #1978
    docker: New and improved env variable options by @rdmark in #1977
    docker: Introduce env variable flag for enabling debug mode in entry script by @rdmark in #1979
    docker: Recommended naming pattern of the testsuite Dockerfile by @rdmark in #1980
    docker: Introduce dropbox mode option for guest access by @rdmark in #1981
    Control metadata settings with 'ea' solely, removing 'appledouble' option by @rdmark in #1983
    meson: Disable quota on NetBSD while addressing GitHub #1225 by @rdmark in #1986
    webmin: Support for recently modified afp.conf options by @rdmark in #1984
    bstrlib: Protect against buffer overflow, null pointer dereference by @rdmark in #1987
    Remove standards.h with macros that are defined by the build system now by @rdmark in #1988
    Protect against memory leaks and out of bounds array access by @rdmark in #1989
    docs: Install macipgw.conf.5 man page only with appletalk by @rdmark in #1991
    atalkd: Bring back freeing of allocated memory into rtmp_delzonemap loop by @rdmark in #1992
    Plug a number of potential memory leaks in optarg and error handling by @rdmark in #1993
    Avoid a handful of potential memory leaks by @rdmark in #1994
    cnid_dbd: Use file descriptors for managing access in scanvol check dir by @rdmark in #1995
    Safer memory handling and afpd and the ftw library by @rdmark in #1996
    Update asip-status.in license grant and copyright year by @rdmark in #1998
    afpd: Refactor FCE file skip logic, make comma the standard delineator by @rdmark in #1997
    afpd: Additional buffer length sanity checks in appl.c by @rdmark in #2001
    afpd: Use explicitly sized buffer for desktop file with appl data by @rdmark in #2003
    afpd: In enumerate module, more precise check for buffer space by @rdmark in #2004
    libatalk: Double check before freeing memory, reverting previous fix for ftw by @rdmark in #2005
    afpd: Use MAXPATHLEN macro to manage limits in enumerate_loop by @rdmark in #2007
    libatalk: Bail out early when actsize is 0 in ftw library by @rdmark in #2008
    libatalk: In the ftw library, use manual memory allocation instead of realloc() by @rdmark in #2009
    libatalk: atalk/util.h is needed for MIN/MAX macros on Solaris by @rdmark in #2010
    Remove MIN/MAX macros that are already defined centrally by @rdmark in #2011
    libatalk: Protect against very large entry sizes in ftw dirstream by @rdmark in #2012
    libatalk: Use standard early OSX UTF8 filename length limit in ftw by @rdmark in #2013
    Update uams_guest.c with accurate copyright header by @rdmark in #1999
    Protect against null pointer dereference; use correct return values; division by zero by @rdmark in #2014
    Thoroughly initialize variables to avoid accessing garbage data by @rdmark in #2015
    Address a last handful of accessing garbage values by @rdmark in #2016
    Initialize the last few variables that were once flagged as: uninitialized ok by @rdmark in #2017
    Eliminate obsoleted NO_REAL_USER_NAME capability flag macro by @rdmark in #2018
    docs: Clean up markdown indentation in manual and man pages by @rdmark in #2020
    docs: Rearrange sections on the afp.conf man page for better organization by @rdmark in #2021
    Update afp_util.c with named copyright holder by @rdmark in #2022
    Update email address for contributor Joe Clarke by @rdmark in #2023
    afpd: Register FCE file creation event when copying files by @rdmark in #2027
    libatalk: Undefine _FORTIFY_SOURCE macro only when defined by @rdmark in #2028
    GitHub CI: Build on DragonflyBSD without krb5 by @rdmark in #2030
    Remove remnants of nested afp.conf ini file inclusion by @rdmark in #2029
    libatalk: Secure global temp dir handling in libatalk util module by @rdmark in #2031
    Always use at functions of the standard C library by @rdmark in #2034
    meson: Clean up a multitude of obsoleted compatibility macros by @rdmark in #2035
    meson: Cross-platform crypt library detection; always use shadow when available by @rdmark in #2036
    GitHub CI: Don't build with PAM on OpenBSD by @rdmark in #2042
    afpd: Use getpwnam_shadow() for basic auth on OpenBSD by @rdmark in #2040
    libatalk: IPv6 sockets only accept IPv6 connections on OpenBSD by @rdmark in #2039
    uams: Return properly when ClearTxt shadow password has expired by @rdmark in #2041
    libatalk: Use unspecified network stack by default on OpenBSD by @rdmark in #2044
    afpd: Simplify getpwnam_shadow() compatibility code by @rdmark in #2045
    uams: Support for OpenBSD flavor crypt_checkpass() for password validation by @rdmark in #2037
    [webmin] Add RandNum UAM option to Global config. by @NJRoadfan in #2047
    Use BSD extension strlcpy/strlcat/snprintf to manage buffer size by @rdmark in #2048
    getzones: do not attempt to bind to the address we're also going to send packets to by @cheesestraws in #2051
    meson: Remove legacy IRIX XFS extended attributes API by @rdmark in #2052
    Consolidate redundant code and headers in testsuite by @rdmark in #2053
    Handle errors in f|chdir() and remove unused daemonize() params by @rdmark in #2054
    Remove redundant parentheses from return statements by @rdmark in #2055
    getiface.c: fix headers order for Apple by @barracuda156 in #2056
    Remove redundant parentheses in function calls and if statements by @rdmark in #2057
    Fix ad cp loss of FinderInfo by @NJRoadfan in #2058
    Apply additional hardening to the Netatalk Metadata EA handling by @NJRoadfan in #2059
    Fix for CNID error with ad mv utility by @NJRoadfan in #2060
    GitHub CI: Bump vmactions runner to FreeBSD 13.5 by @rdmark in #2062
    docker: Introduce test container that runs Debian Trixie by @rdmark in #2061
    Improve and harden the FCE listener app by @rdmark in #2063
    meson: Standardize lists of features as bar separated lower-case words by @rdmark in #2064
    testsuite: Print a list of failed tests at the end of a test run by @rdmark in #2065


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/netatalk4/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/netatalk4/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/netatalk4/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/net/netatalk4/patches/patch-config_meson.build
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/netatalk4/patches/patch-meson.build

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.16 pkgsrc/net/netatalk4/Makefile:1.17
--- pkgsrc/net/netatalk4/Makefile:1.16  Thu Apr 24 14:15:27 2025
+++ pkgsrc/net/netatalk4/Makefile       Mon May  5 13:57:00 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2025/04/24 14:15:27 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2025/05/05 13:57:00 hauke Exp $
 
 GITHUB_PROJECT=        netatalk
 GITHUB_TAG=    refs/tags/${DISTNAME}
-DISTNAME=      netatalk-4-1-2
-PKGREVISION=   4
+DISTNAME=      netatalk-4-2-2
 
 PKGVER=                ${GITHUB_TAG:C/^.+netatalk-//:C/-/./g}
 PKGNAME=       ${DISTNAME:C/-[0-9].*$//}-${PKGVER}
@@ -165,6 +164,7 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/iniparser/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=        libevent>=2
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../security/cracklib/buildlink3.mk"

Index: pkgsrc/net/netatalk4/PLIST
diff -u pkgsrc/net/netatalk4/PLIST:1.3 pkgsrc/net/netatalk4/PLIST:1.4
--- pkgsrc/net/netatalk4/PLIST:1.3      Mon Mar 17 17:42:44 2025
+++ pkgsrc/net/netatalk4/PLIST  Mon May  5 13:57:00 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2025/03/17 17:42:44 hauke Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/05/05 13:57:00 hauke Exp $
 ${PLIST.ea}bin/ad
 bin/addump
 ${PLIST.appletalk}bin/aecho
@@ -7,6 +7,7 @@ bin/afppasswd
 bin/afpstats
 bin/asip-status
 bin/dbd
+bin/fce_listen
 ${PLIST.appletalk}bin/getzones
 bin/macusers
 ${PLIST.appletalk}bin/nbplkup
@@ -23,11 +24,9 @@ include/atalk/atp.h
 include/atalk/bstrlib.h
 include/atalk/cnid.h
 include/atalk/ddp.h
-include/atalk/dictionary.h
 include/atalk/ea.h
 include/atalk/globals.h
 include/atalk/hash.h
-include/atalk/iniparser.h
 include/atalk/list.h
 include/atalk/logger.h
 include/atalk/nbp.h
@@ -36,7 +35,6 @@ include/atalk/netddp.h
 include/atalk/pap.h
 include/atalk/queue.h
 include/atalk/rtmp.h
-include/atalk/standards.h
 include/atalk/uam.h
 include/atalk/unicode.h
 include/atalk/unix.h
@@ -80,6 +78,7 @@ man/man1/afpstats.1
 man/man1/afptest.1
 man/man1/asip-status.1
 man/man1/dbd.1
+man/man1/fce_listen.1
 ${PLIST.appletalk}man/man1/getzones.1
 man/man1/macusers.1
 ${PLIST.appletalk}man/man1/nbp.1
@@ -116,12 +115,13 @@ ${PLIST.appletalk}sbin/macipgw
 sbin/netatalk
 ${PLIST.appletalk}sbin/papd
 ${PLIST.appletalk}sbin/timelord
-share/doc/netatalk/CONTRIBUTORS
-share/doc/netatalk/DEVELOPER
+share/doc/netatalk/APPLETALK.txt
+share/doc/netatalk/COMPILATION.txt
+share/doc/netatalk/CONTRIBUTORS.txt
+share/doc/netatalk/DEVELOPER.txt
 share/doc/netatalk/DOCKER.txt
 share/doc/netatalk/INSTALL.txt
-share/doc/netatalk/NEWS
-${PLIST.appletalk}share/doc/netatalk/README.AppleTalk
+share/doc/netatalk/NEWS.txt
 share/doc/netatalk/README.txt
 share/doc/netatalk/SECURITY.txt
 share/examples/netatalk/afp.conf

Index: pkgsrc/net/netatalk4/distinfo
diff -u pkgsrc/net/netatalk4/distinfo:1.7 pkgsrc/net/netatalk4/distinfo:1.8
--- pkgsrc/net/netatalk4/distinfo:1.7   Mon Mar 17 17:42:44 2025
+++ pkgsrc/net/netatalk4/distinfo       Mon May  5 13:57:00 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2025/03/17 17:42:44 hauke Exp $
+$NetBSD: distinfo,v 1.8 2025/05/05 13:57:00 hauke Exp $
 
-BLAKE2s (netatalk-4-1-2.tar.gz) = a0b33a04528152322b84f2e10345871f96e343d88079610cefcf1b4aef819665
-SHA512 (netatalk-4-1-2.tar.gz) = b1fde5a0b27e6e67751caf40759e8648e48f3daeb8d43041761023147dc3edac33d07f8c40ec853dffd57ec7b69ebc94c99a0d7ded72ea0ff803865e937b8aba
-Size (netatalk-4-1-2.tar.gz) = 1327961 bytes
-SHA1 (patch-config_meson.build) = 5a746388b89d094ca6847e487e6ef18d98dac0ca
+BLAKE2s (netatalk-4-2-2.tar.gz) = 7b90146ab9590e2b9ce975338cb669ac77eb3165980b395b50e5159fad464b74
+SHA512 (netatalk-4-2-2.tar.gz) = b303decb79061ef093b71715c29de18513bfa8665a931a4b331dfdb1c5d7243bc2ea6df6a59fdb84b81d3c5b1eb7f61fff691a04db6f6326fdf566091957223a
+Size (netatalk-4-2-2.tar.gz) = 1389697 bytes
+SHA1 (patch-config_meson.build) = 2bae343245bcd33869ccb2f47f802fb8e2290050
 SHA1 (patch-config_pam_meson.build) = f321c7bd246f1d82c287e745ea75c9561bc528a9
-SHA1 (patch-meson.build) = 6f407838065addb4807dc46a43440d4a97a35129
+SHA1 (patch-meson.build) = 39ed212aee8af8e7dde2ddea33f976c8ff86cbb1

Index: pkgsrc/net/netatalk4/patches/patch-config_meson.build
diff -u pkgsrc/net/netatalk4/patches/patch-config_meson.build:1.2 pkgsrc/net/netatalk4/patches/patch-config_meson.build:1.3
--- pkgsrc/net/netatalk4/patches/patch-config_meson.build:1.2   Wed Mar 12 09:54:41 2025
+++ pkgsrc/net/netatalk4/patches/patch-config_meson.build       Mon May  5 13:57:00 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-config_meson.build,v 1.2 2025/03/12 09:54:41 hauke Exp $
+$NetBSD: patch-config_meson.build,v 1.3 2025/05/05 13:57:00 hauke Exp $
 
 Leave installation of config files to pkgsrc framework
 
---- config/meson.build.orig    2025-02-10 20:41:20.000000000 +0000
+--- config/meson.build.orig    2025-04-27 20:58:10.000000000 +0000
 +++ config/meson.build
-@@ -4,75 +4,14 @@ afp_conf = configure_file(
+@@ -4,47 +4,12 @@ afp_conf = configure_file(
      configuration: cdata,
  )
  
@@ -32,8 +32,8 @@ Leave installation of config files to pk
 -    else
 -        install_data(dbus_session_conf, install_dir: pkgconfdir)
 -    endif
- endif
- 
+-endif
+-
 -if have_afpstats
 -    if (
 -        fs.exists(dbus_sysconfpath / 'netatalk-dbus.conf')
@@ -49,13 +49,23 @@ Leave installation of config files to pk
 -
 -if have_appletalk
 -    static_conf_files += ['atalkd.conf', 'macipgw.conf', 'papd.conf']
+ endif
+ 
+ cups_libdir = ''
+@@ -62,37 +27,7 @@ if have_appletalk and have_cups and get_
+         input: 'pap.in',
+         output: 'pap',
+         configuration: cdata,
+-        install: true,
+-        install_dir: cups_libdir / 'cups/backend',
+-    )
 -endif
 -
 -foreach file : static_conf_files
 -    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)
@@ -75,8 +85,8 @@ Leave installation of config files to pk
 -    )
 -endif
 -
--install_data('README', install_dir: localstatedir / 'netatalk/CNID')
--
- if have_pam
-     subdir('pam')
+-if get_option('with-statedir-creation')
+-    install_data('README', install_dir: localstatedir / 'netatalk/CNID')
  endif
+ 
+ if have_pam

Index: pkgsrc/net/netatalk4/patches/patch-meson.build
diff -u pkgsrc/net/netatalk4/patches/patch-meson.build:1.5 pkgsrc/net/netatalk4/patches/patch-meson.build:1.6
--- pkgsrc/net/netatalk4/patches/patch-meson.build:1.5  Mon Mar 17 17:42:45 2025
+++ pkgsrc/net/netatalk4/patches/patch-meson.build      Mon May  5 13:57:00 2025
@@ -1,93 +1,59 @@
-$NetBSD: patch-meson.build,v 1.5 2025/03/17 17:42:45 hauke Exp $
+$NetBSD: patch-meson.build,v 1.6 2025/05/05 13:57:00 hauke Exp $
 
 Add PREFIXed paths (include, lib) for all OSes.
 
 Make PREFIX path configurable.
 
-Quota support on NetBSD is currently broken, pull up an upstream
-change to disable it explicitly.
-
-While NetBSD has libwrap, the meson code doesn't find it. The test
-cond still succeeds, so add a branch that does not require the
-library.
-
 Install at.h on Linux, we do it on NetBSD, too.
 
---- meson.build.orig   2025-02-10 20:41:20.000000000 +0000
+--- meson.build.orig   2025-04-27 20:58:10.000000000 +0000
 +++ meson.build
-@@ -162,7 +162,7 @@ if host_os in ['dragonfly', 'freebsd', '
-         'include',
-         'sys',
-         'etc/afpd',
--        '/usr/local/include',
-+        get_option('prefix') / 'include',
-     )
- elif host_os == 'netbsd'
-     root_includes = include_directories(
-@@ -170,7 +170,7 @@ elif host_os == 'netbsd'
-         'include',
-         'sys',
-         'etc/afpd',
--        '/usr/pkg/include',
-+        get_option('prefix') / 'include',
-     )
- elif host_os == 'omnios'
-     root_includes = include_directories(
-@@ -178,7 +178,7 @@ elif host_os == 'omnios'
-         'include',
-         'sys',
-         'etc/afpd',
--        '/opt/local/include',
-+        get_option('prefix') / 'include',
-     )
- else
-     root_includes = include_directories(
-@@ -186,6 +186,7 @@ else
-         'include',
-         'sys',
-         'etc/afpd',
-+        get_option('prefix') / 'include',
-     )
- endif
+@@ -152,16 +152,9 @@ include_dirs = [
+     'include',
+     'sys',
+     'etc/afpd',
++    get_option('prefix') / 'include',
+ ]
+ 
+-if host_os in ['dragonfly', 'freebsd', 'openbsd']
+-    include_dirs += ['/usr/local/include']
+-elif host_os == 'netbsd'
+-    include_dirs += ['/usr/pkg/include']
+-elif uname.found() and uname_stdout.to_lower().contains('omnios')
+-    include_dirs += ['/opt/local/include']
+-endif
+-
+ # note: the brew app is not visible from within the brew build wrapper iteslf,
+ # so rather than checking for brew we apply a blanket prefix
+ brew_prefix = ''
+@@ -183,13 +176,7 @@ endif
  
-@@ -201,7 +202,7 @@ cmarkgfm = find_program('cmark-gfm', req
- if host_os == 'darwin'
-     bison = find_program(brew_prefix / 'opt/bison/bin/bison', required: false)
-     if not bison.found()
--        bison = find_program('/opt/local/bin/bison', required: false)
-+        bison = find_program( get_option('prefix') / 'bison', required: false)
-     endif
- else
-     bison = find_program('bison', required: false)
-@@ -215,15 +216,15 @@ uname_stdout = run_command(uname, '-a',
  libsearch_dirs = []
  
- if host_os in ['dragonfly', 'freebsd', 'openbsd']
+-if host_os in ['dragonfly', 'freebsd', 'openbsd']
 -    libsearch_dirs += '/usr/local/lib'
-+    libsearch_dirs += get_option('prefix') / 'lib'
- endif
- 
- if host_os == 'netbsd'
+-elif host_os == 'netbsd'
 -    libsearch_dirs += '/usr/pkg/lib'
-+    libsearch_dirs += get_option('prefix') / 'lib'
- endif
- 
- if uname.found() and uname_stdout.to_lower().contains('omnios')
+-elif uname.found() and uname_stdout.to_lower().contains('omnios')
 -    libsearch_dirs += '/opt/local/lib'
-+    libsearch_dirs += get_option('prefix') / 'lib'
- endif
+-endif
++libsearch_dirs += get_option('prefix') / 'lib'
  
- socket = cc.find_library('socket', required: false)
-@@ -260,7 +261,7 @@ add_global_link_arguments(netatalk_commo
+ if brew_prefix != ''
+     libsearch_dirs += brew_prefix + '/lib'
+@@ -227,9 +214,8 @@ add_global_link_arguments(netatalk_commo
+ #################
  
  header_dir = []
- if host_os in ['dragonfly', 'freebsd', 'openbsd']
+-if host_os in ['dragonfly', 'freebsd', 'openbsd']
 -    header_dir += '/usr/local/include'
-+    header_dir += get_option('prefix') / 'include'
- endif
+-endif
++
++header_dir += get_option('prefix') / 'include'
  
  check_headers = [
-@@ -456,9 +457,7 @@ else
+     'acl/libacl.h',
+@@ -386,9 +372,7 @@ else
      endif
  
      bdb_dirs += [
@@ -98,41 +64,16 @@ Install at.h on Linux, we do it on NetBS
          '/usr',
      ]
  endif
-@@ -610,8 +609,7 @@ unicode_dirs = [
-     meson.current_source_dir(),
-     '/usr/share/unicode',
-     '/usr/share/unicode/ucd',
--    '/usr/pkg/share/texmf-dist/tex/generic/unicode-data',
--    '/usr/local/share/texmf-dist/tex/generic/unicode-data/',
-+    get_option('prefix') / 'share/texmf-dist/tex/generic/unicode-data',
- ]
- 
- unicode_data_path = get_option('with-unicode-data-path')
-@@ -1025,6 +1023,12 @@ endif
- 
- enable_quota = get_option('with-quota')
- 
-+if host_os == 'netbsd'
-+    enable_quota = false
-+    cdata.set('NO_QUOTA_SUPPORT', 1)
-+    warning('quota is broken on NetBSD, see https://github.com/Netatalk/netatalk/issues/1225')
-+endif
-+
- prop = cc.find_library('prop', required: false)
- quota = cc.find_library('quota', required: false)
- rpcsvc = cc.find_library('rpcsvc', required: false)
-@@ -1644,9 +1648,7 @@ else
-         '/usr/share/xml/docbook/stylesheet/docbook-xsl',
-         '/usr/share/xml/docbook/xsl-stylesheets-nons',
-         '/usr/share/xml/docbook/xsl-stylesheets',
--        '/opt/local/share/xsl/docbook',
--        '/usr/local/share/xsl/docbook',
--        '/usr/pkg/share/xsl/docbook',
-+        get_option('prefix') / 'share/xsl/docbook',
-     ]
- endif
- 
-@@ -1714,7 +1716,7 @@ else
+@@ -824,7 +808,7 @@ endif
+ if host_os == 'darwin'
+     bison = find_program(brew_prefix / 'opt/bison/bin/bison', required: false)
+     if not bison.found()
+-        bison = find_program('/opt/local/bin/bison', required: false)
++        bison = find_program( get_option('prefix') / 'bison', required: false)
+     endif
+ else
+     bison = find_program('bison', required: false)
+@@ -1540,7 +1524,7 @@ else
          pam_paths = [
              '/',
              '/usr',
@@ -141,8 +82,12 @@ Install at.h on Linux, we do it on NetBS
          ]
  
          foreach path : pam_paths
-@@ -2066,12 +2068,8 @@ if fs.is_dir('/usr/share/cracklib')
+@@ -1870,16 +1854,10 @@ cracklib_dict = ''
+ 
+ if fs.is_dir('/usr/share/cracklib')
      cracklib_dict += '/usr/share/cracklib/pw_dict'
++elif fs.is_dir(get_option('prefix') / 'share/cracklib')
++    cracklib_dict += get_option('prefix') / 'share/cracklib/cracklib-small'
  elif fs.is_dir('/var/cache/cracklib')
      cracklib_dict += '/var/cache/cracklib/cracklib_dict'
 -elif fs.is_dir('/usr/local/libdata/cracklib')
@@ -151,12 +96,12 @@ Install at.h on Linux, we do it on NetBS
 -    cracklib_dict += '/usr/pkg/share/cracklib/pw_dict'
 -elif fs.is_dir('/usr/local/share/cracklib')
 -    cracklib_dict += '/usr/local/share/cracklib/cracklib-small'
-+elif fs.is_dir(get_option('prefix') / 'share/cracklib')
-+    cracklib_dict += get_option('prefix') / 'share/cracklib/cracklib-small'
+-elif fs.is_dir('/opt/homebrew/share/cracklib')
+-    cracklib_dict += '/opt/homebrew/share/cracklib/cracklib-small'
  endif
  
  if not enable_cracklib
-@@ -2193,7 +2191,6 @@ if host_os.contains('freebsd')
+@@ -2001,7 +1979,6 @@ if host_os.contains('freebsd')
      cdata.set('FREEBSD', 1)
      cdata.set('OPEN_NOFOLLOW_ERRNO', 'EMLINK')
  elif host_os.contains('linux')