Update net/netatalk3 to v3.1.18

Includes a patch for security issue CVE-2022-22995.

What's Changed

    FIX: CVE-2022-22995: Harden create_appledesktop_folder(), GitHub #480
    FIX: Correct syntax for libwrap check in tcp-wrappers.m4, GitHub #500
    FIX: Correct syntax for libiconv check in iconv.m4, GitHub #491
    FIX: quota is not supported on macOS, GitHub #492
    FIX: dtrace is not supported on FreeBSD aarch64, GitHub #498

3.1.17 - What's Changed

    FIX: CVE-2023-42464: Validate data type in dalloc_value_for_key(), GitHub #486
    FIX: Declare a variable before using it in a loop, which was
    throwing off the default compiler on RHEL7, GitHub #481
    UPD: Distribute tarballs with xz compression by default, instead
    of gzip, GitHub #478
    UPD: Add AUTHOR sections to all man pages with a reference to
    CONTRIBUTORS, and standardize headers and footers, GitHub #462

3.1.16 - What's Changed

    FIX: libatalk: Fix CVE-2022-23121, CVE-2022-23123 regression
        Added guard check before access ad_entry(), GitHub #357
        Allow zero length entry, for AppleDouble specification, GitHub #368
        Remove special handling for COMMENT entries, GitHub #236
        The assertion for invalid entires is still enabled, so please
        report any future "Invalid metadata EA" errors!
    FIX: build system: Fix autoconf warnings and modernize bootstrap
        and configure.ac, GitHub #331
    FIX: build system: Correct syntax in libevent search macro,
        summary macro and netatalk executable makefile, GitHub #342
    FIX: build system: Fix native libiconv detection on macOS, GitHub
        #343
    FIX: build system: Use non-interactive PAM session when available,
        GitHub #361
    FIX: build system: Fix detection of Berkeley DB installed in
        multiarch location, GitHub #380
    FIX: build system: Fix support for cross-compilation with
        mysql_config and dtrace, GitHub #384
    FIX: build system: Support building quota against libtirpc, GitHub
        #385
    FIX: build system: Fix variable substitution in configure summary,
        GitHub #443
    UPD: build system: Remove ABI checks and the
        --enable-developer option, GitHub #262
    FIX: initscript: Improvements to Debian SysV init script
        Source init-functions, GitHub #386
        Add a Description and Short-Description, GitHub #428
    FIX: docs: Clarify localstate dir configurability in manual, GitHub #401
    UPD: docs: Make BerkeleyDB 5.3.x the recommended version, GitHub #8
    FIX: docs: Update SourceForge URLs to fix CSS styles and download links
    FIX: docs: Remove obsoleted bug reporting sections, GitHub #455
    FIX: Sundry typo fixes in user visible strings and docs, GitHub
        #381, GitHub #382
    UPD: Rename asip-status.pl as asip-status to make naming
        implementation-agnostic, GitHub #379
    UPD: Remove redundant uid.c|h files in etc/afpd
    UPD: Don't build and distribute deprecated cnid2_create tool, GitHub #412
    UPD: Remove deprecated megatron code and man page, GitHub #456
    UPD: Remove deprecated uniconv code and man page, GitHub #457
    UPD: Improvements to the GitHub CI workflow

net/netatalk3/Makefile

@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.59 2023/11/08 13:20:32 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2024/02/05 15:02:15 hauke Exp $
 
-DISTNAME=	netatalk-3.1.15
+DISTNAME=	netatalk-3.1.18
 PKGNAME=	${DISTNAME:C/-/3-/}
-PKGREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/${DISTNAME:S/./-/g}/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	hauke@NetBSD.org
-HOMEPAGE=	http://netatalk.sourceforge.net/
+HOMEPAGE=	http://netatalk.io/
 COMMENT=	Netatalk AFP file services
 LICENSE=	gnu-gpl-v2
 

net/netatalk3/PLIST

@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2017/03/21 20:03:03 hauke Exp $
-${PLIST.ea}bin/ad
+@comment $NetBSD: PLIST,v 1.3 2024/02/05 15:02:15 hauke Exp $
+bin/ad
 bin/afpldaptest
 bin/afppasswd
 bin/afpstats
 bin/apple_dump
-bin/asip-status.pl
-bin/cnid2_create
+bin/asip-status
 bin/dbd
 bin/macusers
 bin/netatalk-config
@@ -39,25 +38,20 @@ libexec/netatalk/netatalk
 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
 man/man1/afpldaptest.1
 man/man1/afppasswd.1
 man/man1/afpstats.1
 man/man1/apple_dump.1
-man/man1/asip-status.pl.1
+man/man1/asip-status.1
 man/man1/dbd.1
 man/man1/macusers.1
 man/man1/netatalk-config.1
-man/man1/uniconv.1
 man/man5/afp.conf.5
 man/man5/afp_signature.conf.5
 man/man5/afp_voluuid.conf.5
@@ -70,6 +64,5 @@ share/aclocal/netatalk.m4
 share/examples/netatalk/afp.conf
 share/examples/netatalk/dbus-session.conf
 share/examples/netatalk/extmap.conf
-${PLIST.pam}share/examples/netatalk/netatalk.pam
 @pkgdir libexec/psffilters
 @pkgdir etc/netatalk

net/netatalk3/distinfo

@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.15 2023/05/04 16:53:07 hauke Exp $
+$NetBSD: distinfo,v 1.16 2024/02/05 15:02:15 hauke Exp $
 
-BLAKE2s (netatalk-3.1.15.tar.gz) = 07fe90222f1bac3db17574358f40a5b1ee40fe3ea860905bd042c58c49b7bb6e
-SHA512 (netatalk-3.1.15.tar.gz) = ccba1bb3d7136194d5897e2c560fb81f8182ec1ac19446954c910e303cb43dab5a1cf1c842d75e5040dd43ab1b55c646857b7866ddb362e35afbb4110b296015
-Size (netatalk-3.1.15.tar.gz) = 1837072 bytes
+BLAKE2s (netatalk-3.1.18.tar.xz) = 3a73d677d58e14efb67d5b3a064b678ec547239cfcb0cb22844d2afb31658039
+SHA512 (netatalk-3.1.18.tar.xz) = 06c56754afacbf9c71dc2ab7b80c231f5c25f522967e1d825b4e9e129233528bd1e7101144239b52636b9efe7f1f86a37749da8a8af611169155bca9711798d0
+Size (netatalk-3.1.18.tar.xz) = 974852 bytes
 SHA1 (patch-bin_ad_ad__cp.c) = 8f32b7b0d66bcd16a7e31af27df54dd4ff53d86f
 SHA1 (patch-config.h.in) = bd9e735c6d1c8bb8a1534f6674fa6358b29922c1
 SHA1 (patch-config_Makefile.in) = 81fff584e5cb98537a4fa671fb551ad0258ba092
 SHA1 (patch-config_pam_Makefile.in) = 8f69225c333b327b4c57ef12994666cc521e5c70
-SHA1 (patch-configure) = 7d2ce8e0d06b8de5b2a1ac45f926ee08b6fd5c3b
+SHA1 (patch-configure) = 97d3b32d02eb902fc1891e936d7aab459e6446df
 SHA1 (patch-distrib_initscripts_Makefile.in) = fbeffa06a051fb61819d09e0396695cbe564780e
 SHA1 (patch-distrib_initscripts_netatalk.xml.tmpl) = dd7591e12eca3c1e7d7bc768cd1e060979dc383e
 SHA1 (patch-etc_afpd_afp__dsi.c) = 024cc7a0935ece2ed43d1ab3142c8d6bb1b376be
@@ -18,4 +18,4 @@ SHA1 (patch-etc_netatalk_netatalk.c) = 2bdbfc035e4bea9859cf970cd6b9a6503244185e
 SHA1 (patch-include_atalk_util.h) = a7a0763c5866288ad89a8b6b90c71767ee4d9d64
 SHA1 (patch-libatalk_dsi_dsi__tcp.c) = eacb939dba2749925e36ca05fa0480b3391d0f80
 SHA1 (patch-libatalk_util_getiface.c) = 1a46bd695c96e0666b6f45493eb44501c0f4e0b5
-SHA1 (patch-macros_quota-check.m4) = a6502693ae8c7218b7c4426b134e0aa590412e1f
+SHA1 (patch-macros_quota-check.m4) = bd90329a15e5fc84ac58f856cfa0f7016457e5ce

net/netatalk3/patches/patch-configure

@@ -1,13 +1,14 @@
-$NetBSD: patch-configure,v 1.1 2023/04/04 18:16:06 bouyer Exp $
+$NetBSD: patch-configure,v 1.2 2024/02/05 15:02:16 hauke Exp $
+
 apply changes from patch-macros_quota-check.m4 for NetBSD's quota
 
---- configure.orig	2023-03-29 15:04:35.180307136 +0200
-+++ configure	2023-03-29 15:04:40.662623659 +0200
-@@ -16762,65 +16762,63 @@
+--- configure.orig	2024-02-05 14:15:24.671242466 +0000
++++ configure
+@@ -17464,65 +17464,63 @@ then :
    QUOTA_LIBS="-lrpcsvc"
  fi
 
--	       for ac_header in rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h
+-			       for ac_header in rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h
 -do :
 -  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
 -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -20,11 +21,11 @@ apply changes from patch-macros_quota-check.m4 for NetBSD's quota
 -_ACEOF
 -
 -else $as_nop
+-
+-				QUOTA_LIBS=""
+-				netatalk_cv_quotasupport="no"
 +  printf "%s\n" "#define HAVE_RPC_RPC_H 1" >>confdefs.h
 
--		QUOTA_LIBS=""
--		netatalk_cv_quotasupport="no"
--
 -printf "%s\n" "#define NO_QUOTA_SUPPORT 1" >>confdefs.h
 +fi
 +ac_fn_c_check_header_compile "$LINENO" "rpc/pmap_prot.h" "ac_cv_header_rpc_pmap_prot_h" "$ac_includes_default"
@@ -41,7 +42,7 @@ apply changes from patch-macros_quota-check.m4 for NetBSD's quota
  fi
 
 -done
--	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getfsquota in -lquota" >&5
+-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getfsquota in -lquota" >&5
 -printf %s "checking for getfsquota in -lquota... " >&6; }
 -if test ${ac_cv_lib_quota_getfsquota+y}
 +	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for quota_open in -lquota" >&5

net/netatalk3/patches/patch-macros_quota-check.m4

@@ -1,23 +1,23 @@
-$NetBSD: patch-macros_quota-check.m4,v 1.2 2016/11/07 12:46:52 christos Exp $
+$NetBSD: patch-macros_quota-check.m4,v 1.3 2024/02/05 15:02:16 hauke Exp $
 
 NetBSD flavor of quota
 
---- macros/quota-check.m4.orig	2013-06-24 16:47:02.000000000 +0000
+--- macros/quota-check.m4.orig	2023-10-05 11:12:30.000000000 +0000
 +++ macros/quota-check.m4
-@@ -9,13 +9,9 @@ AC_DEFUN([AC_NETATALK_CHECK_QUOTA], [
- 	QUOTA_LIBS=""
- 	netatalk_cv_quotasupport="yes"
- 	AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS="-lrpcsvc"])
--	AC_CHECK_HEADERS([rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h],[],[
--		QUOTA_LIBS=""
--		netatalk_cv_quotasupport="no"
--		AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])
--	])
--	AC_CHECK_LIB(quota, getfsquota, [QUOTA_LIBS="-lquota -lprop -lrpcsvc"
--	    AC_DEFINE(HAVE_LIBQUOTA, 1, [define if you have libquota])], [], [-lprop -lrpcsvc])
-+	AC_CHECK_HEADERS([rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h],[],[])
-+	AC_CHECK_LIB(quota, quota_open, [QUOTA_LIBS="-lquota -lrpcsvc"
-+	    AC_DEFINE(HAVE_LIBQUOTA, 1, [define if you have libquota])], [], [-lrpcsvc])
+@@ -21,13 +21,9 @@ AC_DEFUN([AC_NETATALK_CHECK_QUOTA], [
+ 			QUOTA_LIBS=""
+ 			netatalk_cv_quotasupport="yes"
+ 			AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS="-lrpcsvc"])
+-			AC_CHECK_HEADERS([rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h],[],[
+-				QUOTA_LIBS=""
+-				netatalk_cv_quotasupport="no"
+-				AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])
+-			])
+-			AC_CHECK_LIB(quota, getfsquota, [QUOTA_LIBS="-lquota -lprop -lrpcsvc"
+-				AC_DEFINE(HAVE_LIBQUOTA, 1, [define if you have libquota])], [], [-lprop -lrpcsvc])
++			AC_CHECK_HEADERS([rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h],[],[])
++			AC_CHECK_LIB(quota, quota_open, [QUOTA_LIBS="-lquota -lrpcsvc"
++	    		AC_DEFINE(HAVE_LIBQUOTA, 1, [define if you have libquota])], [], [-lrpcsvc])
+ 		fi
  	else
  		netatalk_cv_quotasupport="no"
- 		AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])