CVS commit: pkgsrc/net/netatalk4

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Sat Nov 15 15:21:43 UTC 2025

Modified Files:
        pkgsrc/net/netatalk4: Makefile PLIST distinfo options.mk
Removed Files:
        pkgsrc/net/netatalk4: MESSAGE

Log Message:
net/netatalk4 - Update to v4.3.2

Lose MESSAGES, but keep the pam message

Introduce cnid db selection between Berkeley db, last, mysql and sqlite

>From upstream's changelog:

4.3.2
    build(deps): bump SonarSource/sonarqube-scan-action from 5.3.0 to
        5.3.1 by @dependabot[bot] in #2394
    Bump to development version 4.3.2 by @rdmark in #2395
    GitHub CI: Refactor the SonarQube scan action with supported GitHub
        expressions by @rdmark in #2396
    GitHub CI: Change file endings of checksum files to match meson
        by @rdmark in #2397
    meson.build: check for init bins only if installing service by
        @EricFromCanada in #2398
    meson.build: prefer mDNS over Avahi on Darwin systems by
        @trodemaster in #2400
    Bump to bstring 1.0.2 subproject by @rdmark in #2406
    GitHub CI: Install shared bstring library on macOS build job
        by @rdmark in #2407
    afpd: Revert to non-reentrant getpwnam() in the uam module
        by @rdmark in #2403
    Release netatalk v4.3.2 by @rdmark in #2409

4.3.1

    FIX: afpd: Refactor the afpd version helptext for readability
        and brevity, GitHub #2367
    FIX: libatalk: remove macros, define interface for netddp_{close,
        recvfrom, sendto}, GitHub #2383
    FIX: rtmpqry: Fix code quality issues in rtmpqry and disambiguate
        comments, GitHub #2379
    NEW: testsuite: Added Linux IO monitoring to afp_lantest and
        refactored results display, GitHub #2354
        The -C option has been renamed to -K in afp_lantest
    FIX: test: Consistently initialize buffers before use in afpd
        component tests, GitHub #2380
    FIX: docker: Bring back the RandNum password creation by
        default, GitHub #2338
    NEW: docker: Expose Classic Mac OS login message option,
        GitHub #2339
    FIX: distrib: substitute lockfile path in netatalkd init
        scripts for macOS, GitHub #2357
    NEW: docs: Create separate nbplkup and nbprgstr man pages
        and improve them, GitHub #2336
    UPD: docs: update logtypes list in afp.conf man page, GitHub #2364
    UPD: docs: Flesh out the afpstats.1 man page, GitHub #2389
    NEW: Introduce yaml code style guide and automatic formatting,
        GitHub #2351
    NEW: contrib: Add support for beautifying markdown to
        codefmt.sh, GitHub #2356


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/net/netatalk4/MESSAGE
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/netatalk4/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/netatalk4/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/netatalk4/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/netatalk4/options.mk

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.26 pkgsrc/net/netatalk4/Makefile:1.27
--- pkgsrc/net/netatalk4/Makefile:1.26  Thu Oct 23 20:38:52 2025
+++ pkgsrc/net/netatalk4/Makefile       Sat Nov 15 15:21:42 2025
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2025/10/23 20:38:52 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2025/11/15 15:21:42 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.3.0
+PKGVER=                4.3.2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Netatalk/}
 
@@ -164,6 +163,7 @@ post-install:
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/iniparser/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=        libevent>=2

Index: pkgsrc/net/netatalk4/PLIST
diff -u pkgsrc/net/netatalk4/PLIST:1.7 pkgsrc/net/netatalk4/PLIST:1.8
--- pkgsrc/net/netatalk4/PLIST:1.7      Wed Aug 13 09:03:26 2025
+++ pkgsrc/net/netatalk4/PLIST  Sat Nov 15 15:21:42 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2025/08/13 09:03:26 hauke Exp $
+@comment $NetBSD: PLIST,v 1.8 2025/11/15 15:21:42 hauke Exp $
 ${PLIST.ea}bin/ad
 bin/addump
 ${PLIST.appletalk}bin/aecho
@@ -70,7 +70,6 @@ ${PLIST.appletalk}man/man1/aecho.1
 man/man1/afpldaptest.1
 man/man1/afppasswd.1
 man/man1/afpstats.1
-man/man1/afptest.1
 man/man1/asip-status.1
 man/man1/dbd.1
 man/man1/fce_listen.1

Index: pkgsrc/net/netatalk4/distinfo
diff -u pkgsrc/net/netatalk4/distinfo:1.12 pkgsrc/net/netatalk4/distinfo:1.13
--- pkgsrc/net/netatalk4/distinfo:1.12  Tue Aug 12 18:22:55 2025
+++ pkgsrc/net/netatalk4/distinfo       Sat Nov 15 15:21:42 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2025/08/12 18:22:55 hauke Exp $
+$NetBSD: distinfo,v 1.13 2025/11/15 15:21:42 hauke Exp $
 
-BLAKE2s (netatalk-4-3-0.tar.gz) = 4bde9fe5f31633a048ae6a3826f6020e7dc88ce833bb3ad06079d6752f9cf60c
-SHA512 (netatalk-4-3-0.tar.gz) = 0b11db1f688695318eceddc22601468632b34837fd5ae4ce239f26f6d09d0989958030c2ec3498461b954f7f0d6e56dc28e41d61de532510ca59f727d3e5f60c
-Size (netatalk-4-3-0.tar.gz) = 1438687 bytes
+BLAKE2s (netatalk-4-3-2.tar.gz) = 5945891c7beb2d47cc06795d9b0e6041cf431214f90811c29badd955877bc174
+SHA512 (netatalk-4-3-2.tar.gz) = 6f00c2e4cb1a738aebe948116db78fccb2fcbcc81871e5d410879be61bc7cbff37730e8182aa04e250149adb17894d183002299b1a2226105c551fdffc664faf
+Size (netatalk-4-3-2.tar.gz) = 1447103 bytes
 SHA1 (patch-config_meson.build) = 8fdc8f4d9da98d68003ef24347475983c4fbb35b
 SHA1 (patch-config_pam_meson.build) = f1d5d285f146ff88c58f7671b4f94fc3363b113f
 SHA1 (patch-include_atalk_util.h) = 419ea5f3bbdb38d7b18df682b36fb55e46bb9110

Index: pkgsrc/net/netatalk4/options.mk
diff -u pkgsrc/net/netatalk4/options.mk:1.5 pkgsrc/net/netatalk4/options.mk:1.6
--- pkgsrc/net/netatalk4/options.mk:1.5 Mon Mar 17 17:42:44 2025
+++ pkgsrc/net/netatalk4/options.mk     Sat Nov 15 15:21:42 2025
@@ -1,10 +1,16 @@
-# $NetBSD: options.mk,v 1.5 2025/03/17 17:42:44 hauke Exp $
+# $NetBSD: options.mk,v 1.6 2025/11/15 15:21:42 hauke Exp $
 #
 PKG_OPTIONS_VAR=               PKG_OPTIONS.netatalk
-PKG_SUPPORTED_OPTIONS=         debug dnssd kerberos ldap pam
+PKG_SUPPORTED_OPTIONS=         debug dnssd kerberos ldap pam mysql
 # Untested
 #PKG_SUPPORTED_OPTIONS+=       spotlight
-PKG_SUGGESTED_OPTIONS=         dnssd pam
+PKG_SUGGESTED_OPTIONS=         bdb dnssd pam
+
+PKG_OPTIONS_REQUIRED_GROUPS=   db
+PKG_OPTIONS_GROUP.db=          bdb last sqlite
+.if !empty(PKG_OPTIONS:Mmysql)
+PKG_OPTIONS_GROUP.db+=         mysql
+.endif
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -35,6 +41,18 @@ RCD_SCRIPT_SRC.${rs}=        ${WRKSRC}/output/d
 MESON_ARGS+=           -Dwith-appletalk=false
 .endif
 
+# Default CNID database - depend on mysql only if selected
+.if !empty(PKG_OPTIONS:Mdbd)
+MESON_ARGS+=           -Dwith-cnid-default-backend=dbd
+.elif !empty(PKG_OPTIONS:Mlast)
+MESON_ARGS+=           -Dwith-cnid-default-backend=last
+.elif !empty(PKG_OPTIONS:Mmysql)
+.include "../../mk/mysql.buildlink3.mk"
+MESON_ARGS+=           -Dwith-cnid-default-backend=mysql
+.elif !empty(PKG_OPTIONS:Msqlite)
+MESON_ARGS+=           -Dwith-cnid-default-backend=sqlite
+.endif
+
 .if !empty(PKG_OPTIONS:Mdebug)
 MESON_ARGS+=           -Dwith-debug=true
 MESON_ARGS+=           -Dwith-debugging=true
@@ -71,7 +89,7 @@ MESON_ARGS+=          -Dwith-ldap=false
 .include "../../mk/pam.buildlink3.mk"
 PLIST.pam=             yes
 MESON_ARGS+=           -Dwith-pam=true
-MESSAGE_SRC+=          MESSAGE MESSAGE.pam
+MESSAGE_SRC+=          MESSAGE.pam
 .else
 MESON_ARGS+=           -Dwith-pam=false
 .endif