Mon Feb 5 15:02:16 2024 UTC (111d)
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


(hauke)
diff -r1.59 -r1.60 pkgsrc/net/netatalk3/Makefile
diff -r1.2 -r1.3 pkgsrc/net/netatalk3/PLIST
diff -r1.15 -r1.16 pkgsrc/net/netatalk3/distinfo
diff -r1.1 -r1.2 pkgsrc/net/netatalk3/patches/patch-configure
diff -r1.2 -r1.3 pkgsrc/net/netatalk3/patches/patch-macros_quota-check.m4
cvs diff -r1.59 -r1.60 pkgsrc/net/netatalk3/Makefile (expand / switch to unified diff)

--- pkgsrc/net/netatalk3/Makefile 2023/11/08 13:20:32 1.59
+++ pkgsrc/net/netatalk3/Makefile 2024/02/05 15:02:15 1.60
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.59 2023/11/08 13:20:32 wiz Exp $ 1# $NetBSD: Makefile,v 1.60 2024/02/05 15:02:15 hauke Exp $
2 2
3DISTNAME= netatalk-3.1.15 3DISTNAME= netatalk-3.1.18
4PKGNAME= ${DISTNAME:C/-/3-/} 4PKGNAME= ${DISTNAME:C/-/3-/}
5PKGREVISION= 4 
6CATEGORIES= net 5CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/${DISTNAME:S/./-/g}/ 6MASTER_SITES= ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/${DISTNAME:S/./-/g}/
 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= hauke@NetBSD.org 9MAINTAINER= hauke@NetBSD.org
10HOMEPAGE= http://netatalk.sourceforge.net/ 10HOMEPAGE= http://netatalk.io/
11COMMENT= Netatalk AFP file services 11COMMENT= Netatalk AFP file services
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= gmake pkg-config perl:run 15USE_TOOLS+= gmake pkg-config perl:run
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17PKG_CONFIG= yes 17PKG_CONFIG= yes
18 18
19PKG_SYSCONFSUBDIR= netatalk 19PKG_SYSCONFSUBDIR= netatalk
20 20
21EGDIR= ${PREFIX}/share/examples/netatalk 21EGDIR= ${PREFIX}/share/examples/netatalk
22CONF_FILES= ${EGDIR}/afp.conf ${PKG_SYSCONFDIR}/afp.conf 22CONF_FILES= ${EGDIR}/afp.conf ${PKG_SYSCONFDIR}/afp.conf
23CONF_FILES+= ${EGDIR}/extmap.conf ${PKG_SYSCONFDIR}/extmap.conf 23CONF_FILES+= ${EGDIR}/extmap.conf ${PKG_SYSCONFDIR}/extmap.conf
cvs diff -r1.2 -r1.3 pkgsrc/net/netatalk3/PLIST (expand / switch to unified diff)

--- pkgsrc/net/netatalk3/PLIST 2017/03/21 20:03:03 1.2
+++ pkgsrc/net/netatalk3/PLIST 2024/02/05 15:02:15 1.3
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1@comment $NetBSD: PLIST,v 1.2 2017/03/21 20:03:03 hauke Exp $ 1@comment $NetBSD: PLIST,v 1.3 2024/02/05 15:02:15 hauke Exp $
2${PLIST.ea}bin/ad 2bin/ad
3bin/afpldaptest 3bin/afpldaptest
4bin/afppasswd 4bin/afppasswd
5bin/afpstats 5bin/afpstats
6bin/apple_dump 6bin/apple_dump
7bin/asip-status.pl 7bin/asip-status
8bin/cnid2_create 
9bin/dbd 8bin/dbd
10bin/macusers 9bin/macusers
11bin/netatalk-config 10bin/netatalk-config
12include/atalk/acl.h 11include/atalk/acl.h
13include/atalk/adouble.h 12include/atalk/adouble.h
14include/atalk/afp.h 13include/atalk/afp.h
15include/atalk/bstrlib.h 14include/atalk/bstrlib.h
16include/atalk/cnid.h 15include/atalk/cnid.h
17include/atalk/compat.h 16include/atalk/compat.h
18include/atalk/dictionary.h 17include/atalk/dictionary.h
19include/atalk/ea.h 18include/atalk/ea.h
20include/atalk/globals.h 19include/atalk/globals.h
21include/atalk/hash.h 20include/atalk/hash.h
@@ -29,47 +28,41 @@ include/atalk/uam.h @@ -29,47 +28,41 @@ include/atalk/uam.h
29include/atalk/unicode.h 28include/atalk/unicode.h
30include/atalk/unix.h 29include/atalk/unix.h
31include/atalk/util.h 30include/atalk/util.h
32include/atalk/vfs.h 31include/atalk/vfs.h
33include/atalk/volume.h 32include/atalk/volume.h
34lib/libatalk.la 33lib/libatalk.la
35libexec/netatalk/afpd 34libexec/netatalk/afpd
36libexec/netatalk/cnid_dbd 35libexec/netatalk/cnid_dbd
37libexec/netatalk/cnid_metad 36libexec/netatalk/cnid_metad
38libexec/netatalk/netatalk 37libexec/netatalk/netatalk
39libexec/netatalk/uams/uams_clrtxt.so 38libexec/netatalk/uams/uams_clrtxt.so
40libexec/netatalk/uams/uams_dhx.so 39libexec/netatalk/uams/uams_dhx.so
41libexec/netatalk/uams/uams_dhx2.so 40libexec/netatalk/uams/uams_dhx2.so
42${PLIST.pam}libexec/netatalk/uams/uams_dhx2_pam.la 
43libexec/netatalk/uams/uams_dhx2_passwd.la 41libexec/netatalk/uams/uams_dhx2_passwd.la
44${PLIST.pam}libexec/netatalk/uams/uams_dhx_pam.la 
45libexec/netatalk/uams/uams_dhx_passwd.la 42libexec/netatalk/uams/uams_dhx_passwd.la
46${PLIST.gssapi}libexec/netatalk/uams/uams_gss.la 
47libexec/netatalk/uams/uams_guest.la 43libexec/netatalk/uams/uams_guest.la
48${PLIST.pam}libexec/netatalk/uams/uams_pam.la 
49libexec/netatalk/uams/uams_passwd.la 44libexec/netatalk/uams/uams_passwd.la
50libexec/netatalk/uams/uams_randnum.la 45libexec/netatalk/uams/uams_randnum.la
51man/man1/ad.1 46man/man1/ad.1
52man/man1/afpldaptest.1 47man/man1/afpldaptest.1
53man/man1/afppasswd.1 48man/man1/afppasswd.1
54man/man1/afpstats.1 49man/man1/afpstats.1
55man/man1/apple_dump.1 50man/man1/apple_dump.1
56man/man1/asip-status.pl.1 51man/man1/asip-status.1
57man/man1/dbd.1 52man/man1/dbd.1
58man/man1/macusers.1 53man/man1/macusers.1
59man/man1/netatalk-config.1 54man/man1/netatalk-config.1
60man/man1/uniconv.1 
61man/man5/afp.conf.5 55man/man5/afp.conf.5
62man/man5/afp_signature.conf.5 56man/man5/afp_signature.conf.5
63man/man5/afp_voluuid.conf.5 57man/man5/afp_voluuid.conf.5
64man/man5/extmap.conf.5 58man/man5/extmap.conf.5
65man/man8/afpd.8 59man/man8/afpd.8
66man/man8/cnid_dbd.8 60man/man8/cnid_dbd.8
67man/man8/cnid_metad.8 61man/man8/cnid_metad.8
68man/man8/netatalk.8 62man/man8/netatalk.8
69share/aclocal/netatalk.m4 63share/aclocal/netatalk.m4
70share/examples/netatalk/afp.conf 64share/examples/netatalk/afp.conf
71share/examples/netatalk/dbus-session.conf 65share/examples/netatalk/dbus-session.conf
72share/examples/netatalk/extmap.conf 66share/examples/netatalk/extmap.conf
73${PLIST.pam}share/examples/netatalk/netatalk.pam 
74@pkgdir libexec/psffilters 67@pkgdir libexec/psffilters
75@pkgdir etc/netatalk 68@pkgdir etc/netatalk
cvs diff -r1.15 -r1.16 pkgsrc/net/netatalk3/distinfo (expand / switch to unified diff)

--- pkgsrc/net/netatalk3/distinfo 2023/05/04 16:53:07 1.15
+++ pkgsrc/net/netatalk3/distinfo 2024/02/05 15:02:15 1.16
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.15 2023/05/04 16:53:07 hauke Exp $ 1$NetBSD: distinfo,v 1.16 2024/02/05 15:02:15 hauke Exp $
2 2
3BLAKE2s (netatalk-3.1.15.tar.gz) = 07fe90222f1bac3db17574358f40a5b1ee40fe3ea860905bd042c58c49b7bb6e 3BLAKE2s (netatalk-3.1.18.tar.xz) = 3a73d677d58e14efb67d5b3a064b678ec547239cfcb0cb22844d2afb31658039
4SHA512 (netatalk-3.1.15.tar.gz) = ccba1bb3d7136194d5897e2c560fb81f8182ec1ac19446954c910e303cb43dab5a1cf1c842d75e5040dd43ab1b55c646857b7866ddb362e35afbb4110b296015 4SHA512 (netatalk-3.1.18.tar.xz) = 06c56754afacbf9c71dc2ab7b80c231f5c25f522967e1d825b4e9e129233528bd1e7101144239b52636b9efe7f1f86a37749da8a8af611169155bca9711798d0
5Size (netatalk-3.1.15.tar.gz) = 1837072 bytes 5Size (netatalk-3.1.18.tar.xz) = 974852 bytes
6SHA1 (patch-bin_ad_ad__cp.c) = 8f32b7b0d66bcd16a7e31af27df54dd4ff53d86f 6SHA1 (patch-bin_ad_ad__cp.c) = 8f32b7b0d66bcd16a7e31af27df54dd4ff53d86f
7SHA1 (patch-config.h.in) = bd9e735c6d1c8bb8a1534f6674fa6358b29922c1 7SHA1 (patch-config.h.in) = bd9e735c6d1c8bb8a1534f6674fa6358b29922c1
8SHA1 (patch-config_Makefile.in) = 81fff584e5cb98537a4fa671fb551ad0258ba092 8SHA1 (patch-config_Makefile.in) = 81fff584e5cb98537a4fa671fb551ad0258ba092
9SHA1 (patch-config_pam_Makefile.in) = 8f69225c333b327b4c57ef12994666cc521e5c70 9SHA1 (patch-config_pam_Makefile.in) = 8f69225c333b327b4c57ef12994666cc521e5c70
10SHA1 (patch-configure) = 7d2ce8e0d06b8de5b2a1ac45f926ee08b6fd5c3b 10SHA1 (patch-configure) = 97d3b32d02eb902fc1891e936d7aab459e6446df
11SHA1 (patch-distrib_initscripts_Makefile.in) = fbeffa06a051fb61819d09e0396695cbe564780e 11SHA1 (patch-distrib_initscripts_Makefile.in) = fbeffa06a051fb61819d09e0396695cbe564780e
12SHA1 (patch-distrib_initscripts_netatalk.xml.tmpl) = dd7591e12eca3c1e7d7bc768cd1e060979dc383e 12SHA1 (patch-distrib_initscripts_netatalk.xml.tmpl) = dd7591e12eca3c1e7d7bc768cd1e060979dc383e
13SHA1 (patch-etc_afpd_afp__dsi.c) = 024cc7a0935ece2ed43d1ab3142c8d6bb1b376be 13SHA1 (patch-etc_afpd_afp__dsi.c) = 024cc7a0935ece2ed43d1ab3142c8d6bb1b376be
14SHA1 (patch-etc_afpd_quota.c) = 1779029a084e1991b343214f50ddf459ce9f6dfa 14SHA1 (patch-etc_afpd_quota.c) = 1779029a084e1991b343214f50ddf459ce9f6dfa
15SHA1 (patch-etc_cnid__dbd_cnid__metad.c) = 6c28332ca3e11d11f3b5bb13fa01783dbb94c30f 15SHA1 (patch-etc_cnid__dbd_cnid__metad.c) = 6c28332ca3e11d11f3b5bb13fa01783dbb94c30f
16SHA1 (patch-etc_cnid__dbd_usockfd.c) = a3b6c498ed73dc449b84d092f2b9e13eeae3dfc5 16SHA1 (patch-etc_cnid__dbd_usockfd.c) = a3b6c498ed73dc449b84d092f2b9e13eeae3dfc5
17SHA1 (patch-etc_netatalk_netatalk.c) = 2bdbfc035e4bea9859cf970cd6b9a6503244185e 17SHA1 (patch-etc_netatalk_netatalk.c) = 2bdbfc035e4bea9859cf970cd6b9a6503244185e
18SHA1 (patch-include_atalk_util.h) = a7a0763c5866288ad89a8b6b90c71767ee4d9d64 18SHA1 (patch-include_atalk_util.h) = a7a0763c5866288ad89a8b6b90c71767ee4d9d64
19SHA1 (patch-libatalk_dsi_dsi__tcp.c) = eacb939dba2749925e36ca05fa0480b3391d0f80 19SHA1 (patch-libatalk_dsi_dsi__tcp.c) = eacb939dba2749925e36ca05fa0480b3391d0f80
20SHA1 (patch-libatalk_util_getiface.c) = 1a46bd695c96e0666b6f45493eb44501c0f4e0b5 20SHA1 (patch-libatalk_util_getiface.c) = 1a46bd695c96e0666b6f45493eb44501c0f4e0b5
21SHA1 (patch-macros_quota-check.m4) = a6502693ae8c7218b7c4426b134e0aa590412e1f 21SHA1 (patch-macros_quota-check.m4) = bd90329a15e5fc84ac58f856cfa0f7016457e5ce
cvs diff -r1.1 -r1.2 pkgsrc/net/netatalk3/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/net/netatalk3/patches/patch-configure 2023/04/04 18:16:06 1.1
+++ pkgsrc/net/netatalk3/patches/patch-configure 2024/02/05 15:02:16 1.2
@@ -1,57 +1,58 @@ @@ -1,57 +1,58 @@
1$NetBSD: patch-configure,v 1.1 2023/04/04 18:16:06 bouyer Exp $ 1$NetBSD: patch-configure,v 1.2 2024/02/05 15:02:16 hauke Exp $
 2
2apply changes from patch-macros_quota-check.m4 for NetBSD's quota 3apply changes from patch-macros_quota-check.m4 for NetBSD's quota
3 4
4--- configure.orig 2023-03-29 15:04:35.180307136 +0200 5--- configure.orig 2024-02-05 14:15:24.671242466 +0000
5+++ configure 2023-03-29 15:04:40.662623659 +0200 6+++ configure
6@@ -16762,65 +16762,63 @@ 7@@ -17464,65 +17464,63 @@ then :
7 QUOTA_LIBS="-lrpcsvc" 8 QUOTA_LIBS="-lrpcsvc"
8 fi 9 fi
9  10
10- for ac_header in rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h 11- for ac_header in rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h
11-do : 12-do :
12- as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` 13- as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
13-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 14-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
14-if eval test \"x\$"$as_ac_Header"\" = x"yes" 15-if eval test \"x\$"$as_ac_Header"\" = x"yes"
15+ ac_fn_c_check_header_compile "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_rpc_h" "$ac_includes_default" 16+ ac_fn_c_check_header_compile "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_rpc_h" "$ac_includes_default"
16+if test "x$ac_cv_header_rpc_rpc_h" = xyes 17+if test "x$ac_cv_header_rpc_rpc_h" = xyes
17 then : 18 then :
18- cat >>confdefs.h <<_ACEOF 19- cat >>confdefs.h <<_ACEOF
19-#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 20-#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
20-_ACEOF 21-_ACEOF
21- 22-
22-else $as_nop 23-else $as_nop
 24-
 25- QUOTA_LIBS=""
 26- netatalk_cv_quotasupport="no"
23+ printf "%s\n" "#define HAVE_RPC_RPC_H 1" >>confdefs.h 27+ printf "%s\n" "#define HAVE_RPC_RPC_H 1" >>confdefs.h
24  28
25- QUOTA_LIBS="" 
26- netatalk_cv_quotasupport="no" 
27- 
28-printf "%s\n" "#define NO_QUOTA_SUPPORT 1" >>confdefs.h 29-printf "%s\n" "#define NO_QUOTA_SUPPORT 1" >>confdefs.h
29+fi 30+fi
30+ac_fn_c_check_header_compile "$LINENO" "rpc/pmap_prot.h" "ac_cv_header_rpc_pmap_prot_h" "$ac_includes_default" 31+ac_fn_c_check_header_compile "$LINENO" "rpc/pmap_prot.h" "ac_cv_header_rpc_pmap_prot_h" "$ac_includes_default"
31+if test "x$ac_cv_header_rpc_pmap_prot_h" = xyes 32+if test "x$ac_cv_header_rpc_pmap_prot_h" = xyes
32+then : 33+then :
33+ printf "%s\n" "#define HAVE_RPC_PMAP_PROT_H 1" >>confdefs.h 34+ printf "%s\n" "#define HAVE_RPC_PMAP_PROT_H 1" >>confdefs.h
34  35
35+fi 36+fi
36+ac_fn_c_check_header_compile "$LINENO" "rpcsvc/rquota.h" "ac_cv_header_rpcsvc_rquota_h" "$ac_includes_default" 37+ac_fn_c_check_header_compile "$LINENO" "rpcsvc/rquota.h" "ac_cv_header_rpcsvc_rquota_h" "$ac_includes_default"
37+if test "x$ac_cv_header_rpcsvc_rquota_h" = xyes 38+if test "x$ac_cv_header_rpcsvc_rquota_h" = xyes
38+then : 39+then :
39+ printf "%s\n" "#define HAVE_RPCSVC_RQUOTA_H 1" >>confdefs.h 40+ printf "%s\n" "#define HAVE_RPCSVC_RQUOTA_H 1" >>confdefs.h
40  41
41 fi 42 fi
42  43
43-done 44-done
44- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getfsquota in -lquota" >&5 45- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getfsquota in -lquota" >&5
45-printf %s "checking for getfsquota in -lquota... " >&6; } 46-printf %s "checking for getfsquota in -lquota... " >&6; }
46-if test ${ac_cv_lib_quota_getfsquota+y} 47-if test ${ac_cv_lib_quota_getfsquota+y}
47+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for quota_open in -lquota" >&5 48+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for quota_open in -lquota" >&5
48+printf %s "checking for quota_open in -lquota... " >&6; } 49+printf %s "checking for quota_open in -lquota... " >&6; }
49+if test ${ac_cv_lib_quota_quota_open+y} 50+if test ${ac_cv_lib_quota_quota_open+y}
50 then : 51 then :
51 printf %s "(cached) " >&6 52 printf %s "(cached) " >&6
52 else $as_nop 53 else $as_nop
53 ac_check_lib_save_LIBS=$LIBS 54 ac_check_lib_save_LIBS=$LIBS
54-LIBS="-lquota -lprop -lrpcsvc $LIBS" 55-LIBS="-lquota -lprop -lrpcsvc $LIBS"
55+LIBS="-lquota -lrpcsvc $LIBS" 56+LIBS="-lquota -lrpcsvc $LIBS"
56 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 57 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
57 /* end confdefs.h. */ 58 /* end confdefs.h. */
cvs diff -r1.2 -r1.3 pkgsrc/net/netatalk3/patches/patch-macros_quota-check.m4 (expand / switch to unified diff)

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