Tue Jan 10 22:07:33 2023 UTC ()
Update net/netatalk22 to v2.2.7.

From the upstream ChangeLog:

[2.2] Fix 'multiple definition' compile time errors by @rdmark in #136
[2.2] Remove bitrotted code by @rdmark in #139
[2.2] Fixes for the OpenSSL 1.1 API; add OpenSSL 1.0 backwards compat by @rdmark in #142
[2.2] Install afp_ldap.conf based on LDAP support, not availability of ACLs. by @rdmark in #143
[2.2] Resolve gcc 10 compile time warnings on Linux by @rdmark in #165
[2.2] Downstream patches for NetBSD compatibility by @rdmark in #148
[2.2] Make timelord work on non-big-endian systems; ability to sync localtime by @rdmark in #151
[2.2] Resolve papd compile time errors due to deprecated CUPS calls by @rdmark in #152
[2.2] Resolve automake warnings running bootstrap by @rdmark in #153
[2.2] Handle special FIRSTNET behavior on NetBSD by @rdmark in #154
[2.2] papd patches for compatibility with older Apple LaserWriter drivers on Mac and GS/OS by @rdmark in #156
[2.2] Allow non-unicode volume to be scanned by the repair tool. by @rdmark in #158
[2.2] Update init script templates to start/stop a2boot daemon. by @rdmark in #160
[2.2] Backport Netatalk 3 patches by @rdmark in #161
[2.2] papd: Send replies to client when printing to prompt more data by @rdmark in #162
[2.2] afpd: Add option to disable afp session tickles by @rdmark in #163
[2.2] Update for Unicode 14 by @rdmark in #164
[2.2] Made the AsanteTalk bridge consistently start up in AppleTalk Phase 2

(hauke)
diff -r1.49 -r1.50 pkgsrc/net/netatalk22/Makefile
diff -r1.13 -r1.14 pkgsrc/net/netatalk22/distinfo
diff -r1.6 -r1.7 pkgsrc/net/netatalk22/options.mk
diff -r1.2 -r1.3 pkgsrc/net/netatalk22/patches/patch-config_Makefile.in
diff -r1.2 -r1.3 pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__passwd.c
diff -r1.2 -r0 pkgsrc/net/netatalk22/patches/patch-config_afpd.conf.tmpl
diff -r1.2 -r0 pkgsrc/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in
diff -r1.2 -r0 pkgsrc/net/netatalk22/patches/patch-etc_afpd_afp__options.c
diff -r1.2 -r0 pkgsrc/net/netatalk22/patches/patch-etc_papd_magics.c
diff -r1.2 -r0 pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__dhx__pam.c
diff -r1.2 -r0 pkgsrc/net/netatalk22/patches/patch-etc_uams_uams__randnum.c
diff -r1.2 -r0 pkgsrc/net/netatalk22/patches/patch-libatalk_asp_asp__getsess.c
diff -r1.2 -r0 pkgsrc/net/netatalk22/patches/patch-man_man5_afpd.conf.5.tmpl
diff -r1.3 -r1.4 pkgsrc/net/netatalk22/patches/patch-configure
diff -r1.1 -r0 pkgsrc/net/netatalk22/patches/patch-etc_atalkd_main.c
diff -r1.1 -r0 pkgsrc/net/netatalk22/patches/patch-etc_cnid_dbd_cmd_dbd_scanvol.c
diff -r1.1 -r0 pkgsrc/net/netatalk22/patches/patch-etc_papd_file.c
diff -r1.1 -r0 pkgsrc/net/netatalk22/patches/patch-etc_papd_file.h
diff -r1.1 -r0 pkgsrc/net/netatalk22/patches/patch-libatalk_bstring_bstrlib.c
diff -r1.3 -r0 pkgsrc/net/netatalk22/patches/patch-etc_papd_print_cups.c
diff -r1.3 -r0 pkgsrc/net/netatalk22/patches/patch-include_atalk_ldapconfig.h
cvs diff -r1.49 -r1.50 pkgsrc/net/netatalk22/Makefile (expand / switch to unified diff)

--- pkgsrc/net/netatalk22/Makefile 2023/01/03 17:38:02 1.49
+++ pkgsrc/net/netatalk22/Makefile 2023/01/10 22:07:33 1.50
@@ -1,21 +1,19 @@ @@ -1,21 +1,19 @@
1# $NetBSD: Makefile,v 1.49 2023/01/03 17:38:02 wiz Exp $ 1# $NetBSD: Makefile,v 1.50 2023/01/10 22:07:33 hauke Exp $
2 2
3DISTNAME= netatalk-2.2.6 3DISTNAME= netatalk-2.2.7
4PKGNAME= ${DISTNAME:C/-/22-/} 4PKGNAME= ${DISTNAME:C/-/22-/}
5PKGREVISION= 33 
6CATEGORIES= net print 5CATEGORIES= net print
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=Netatalk/}Netatalk/releases/download/netatalk-2-2-7/
8EXTRACT_SUFX= .tar.bz2 
9#PATCHFILES= patch-adv1tov2.c 7#PATCHFILES= patch-adv1tov2.c
10PATCH_SITES= http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \ 8PATCH_SITES= http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \
11 http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/ 9 http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/
12 10
13MAINTAINER= markd@NetBSD.org 11MAINTAINER= markd@NetBSD.org
14HOMEPAGE= http://netatalk.sourceforge.net/ 12HOMEPAGE= http://netatalk.sourceforge.net/
15COMMENT= Netatalk appletalk file and print services 13COMMENT= Netatalk appletalk file and print services
16LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
17 15
18BDB_ACCEPTED= db4 db5 16BDB_ACCEPTED= db4 db5
19USE_LIBTOOL= yes 17USE_LIBTOOL= yes
20USE_TOOLS+= gmake pkg-config perl:run 18USE_TOOLS+= gmake pkg-config perl:run
21GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
@@ -49,34 +47,32 @@ CONFIGURE_ARGS+= --localstatedir=${VARBA @@ -49,34 +47,32 @@ CONFIGURE_ARGS+= --localstatedir=${VARBA
49CONFIGURE_ARGS+= --with-uams-path=${PREFIX}/libexec/netatalk/uams 47CONFIGURE_ARGS+= --with-uams-path=${PREFIX}/libexec/netatalk/uams
50CONFIGURE_ARGS+= --with-bdb=${BDBBASE} 48CONFIGURE_ARGS+= --with-bdb=${BDBBASE}
51CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl} 49CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl}
52CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} 50CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
53 51
54MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg 52MAKE_DIRS+= ${PKG_SYSCONFDIR}/msg
55 53
56SUBST_CLASSES+= paths 54SUBST_CLASSES+= paths
57SUBST_MESSAGE.paths= Fixing hardcoded paths. 55SUBST_MESSAGE.paths= Fixing hardcoded paths.
58SUBST_STAGE.paths= pre-configure 56SUBST_STAGE.paths= pre-configure
59SUBST_FILES.paths= etc/psf/etc2ps.sh 57SUBST_FILES.paths= etc/psf/etc2ps.sh
60SUBST_SED.paths= -e 's,^\(DVIPS="*\)/usr\(/bin\),\1${PREFIX}\2,' 58SUBST_SED.paths= -e 's,^\(DVIPS="*\)/usr\(/bin\),\1${PREFIX}\2,'
61 59
62PLIST_VARS+= rcd 
63.if ${OPSYS} == "NetBSD" 60.if ${OPSYS} == "NetBSD"
64CONFIGURE_ARGS+= --enable-netbsd 61CONFIGURE_ARGS+= --enable-netbsd
65RCD_SCRIPTS= afpd atalkd papd timelord cnid_metad 62RCD_SCRIPTS= afpd atalkd papd timelord cnid_metad
66. for f in ${RCD_SCRIPTS} 63. for f in ${RCD_SCRIPTS}
67RCD_SCRIPT_SRC.${f}= ${WRKSRC}/distrib/initscripts/${f} 64RCD_SCRIPT_SRC.${f}= ${WRKSRC}/distrib/initscripts/${f}
68. endfor 65. endfor
69PLIST.rcd= yes 
70.endif 66.endif
71 67
72PLIST_VARS+= ea 68PLIST_VARS+= ea
73.if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \ 69.if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
74 (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 070000) || \ 70 (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 070000) || \
75 ${OPSYS} == "FreeBSD" 71 ${OPSYS} == "FreeBSD"
76PLIST.ea= yes 72PLIST.ea= yes
77.endif 73.endif
78 74
79CHECK_SSP_SKIP+= libexec/netatalk/uams/*.a 75CHECK_SSP_SKIP+= libexec/netatalk/uams/*.a
80 76
81.include "options.mk" 77.include "options.mk"
82 78
cvs diff -r1.13 -r1.14 pkgsrc/net/netatalk22/distinfo (expand / switch to unified diff)

--- pkgsrc/net/netatalk22/distinfo 2022/01/28 21:18:18 1.13
+++ pkgsrc/net/netatalk22/distinfo 2023/01/10 22:07:33 1.14
@@ -1,23 +1,8 @@ @@ -1,23 +1,8 @@
1$NetBSD: distinfo,v 1.13 2022/01/28 21:18:18 nat Exp $ 1$NetBSD: distinfo,v 1.14 2023/01/10 22:07:33 hauke Exp $
2 2
3BLAKE2s (netatalk-2.2.6.tar.bz2) = 22951265586889d7ac4f01ade0707f1e63389a14623beec787f587e4ef74b891 3BLAKE2s (netatalk-2.2.7.tar.gz) = a828870c06fcec3aaf1ec4fd6c06411ecc0e687b73f4d29257743de0667798df
4SHA512 (netatalk-2.2.6.tar.bz2) = 74aa3415a43293a8804b00b0eda564d6536310e59c3f0d067d634db89f4d612a1dfd932df18607c32b948922ae032bc25471e21635ab149a78629ff95c341f47 4SHA512 (netatalk-2.2.7.tar.gz) = fb6664b2ea700f1a8307eaf452954e2f0c3bb7d082f2df211f17a79d1fc7f3ca4dff0b805beb7b8d10fb23d749fd1990a6b07c029d89d09299677a41b8161220
5Size (netatalk-2.2.6.tar.bz2) = 1301887 bytes 5Size (netatalk-2.2.7.tar.gz) = 1849800 bytes
6SHA1 (patch-config_Makefile.in) = e6b020cf4cf11572a648bee7de0937add1948ea8 6SHA1 (patch-config_Makefile.in) = 37ed88693c64b5e34396da26f9d7105102ed479b
7SHA1 (patch-config_afpd.conf.tmpl) = 4ff3dc9ea7af77319dc5be499e04648220022404 7SHA1 (patch-configure) = 6b9d73ac0c8ba4913834402a587b734d342c3830
8SHA1 (patch-configure) = 9919625c3cd54e34ab45c6606094e12215630d33 8SHA1 (patch-etc_uams_uams__dhx__passwd.c) = a4eb368ae6f1698d906fe1ba2f1600b7a0b20539
9SHA1 (patch-distrib_initscripts_Makefile.in) = 706890f9e0aacab4d523cc1900048b7fab96f5d4 
10SHA1 (patch-etc_afpd_afp__options.c) = ab65d03c61f8be65e8afc3bd102e5e13e642f1b9 
11SHA1 (patch-etc_atalkd_main.c) = bdd452b9ca62e506d056e3818fb7f5b54a9d38c5 
12SHA1 (patch-etc_cnid_dbd_cmd_dbd_scanvol.c) = df844b4047e614a3fd44cbcea252627f6fe43b65 
13SHA1 (patch-etc_papd_file.c) = 8d050430e8013501230462375c874c8188f12e73 
14SHA1 (patch-etc_papd_file.h) = 2464cc27385a8300f8cc3503643db4512d5f368f 
15SHA1 (patch-etc_papd_magics.c) = 3f25cb45e7a860505895c628490905fe42a1ed62 
16SHA1 (patch-etc_papd_print_cups.c) = 8dada275f9525b9229a85492050de982b1e54295 
17SHA1 (patch-etc_uams_uams__dhx__pam.c) = 8ed99ff32ca932367c5df7af6889db1abbde7a2e 
18SHA1 (patch-etc_uams_uams__dhx__passwd.c) = 52e2862aa55268349dfc64a7d71ebc17e1b8830b 
19SHA1 (patch-etc_uams_uams__randnum.c) = 0608eb6a7b43b0cc360879849c9ca0b38ffdc684 
20SHA1 (patch-include_atalk_ldapconfig.h) = e69d212f45ace23773d15c122ca2e550b025f845 
21SHA1 (patch-libatalk_asp_asp__getsess.c) = 0ae089ef4f882a1580298707fbeee5d519c83482 
22SHA1 (patch-libatalk_bstring_bstrlib.c) = f43818328237b908166f956de464f532d578d2c4 
23SHA1 (patch-man_man5_afpd.conf.5.tmpl) = 43dfb930851329e5fe77d2fae4b8b7237a3fe42c 
cvs diff -r1.6 -r1.7 pkgsrc/net/netatalk22/options.mk (expand / switch to unified diff)

--- pkgsrc/net/netatalk22/options.mk 2021/04/02 09:54:26 1.6
+++ pkgsrc/net/netatalk22/options.mk 2023/01/10 22:07:33 1.7
@@ -1,38 +1,36 @@ @@ -1,38 +1,36 @@
1# $NetBSD: options.mk,v 1.6 2021/04/02 09:54:26 hauke Exp $ 1# $NetBSD: options.mk,v 1.7 2023/01/10 22:07:33 hauke Exp $
2# 2#
3PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk 3PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk
4PKG_SUPPORTED_OPTIONS= cups debug dnssd kerberos ldap pam slp 4PKG_SUPPORTED_OPTIONS= cups debug dnssd kerberos ldap pam slp
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8.if !empty(PKG_OPTIONS:Mcups) 8.if !empty(PKG_OPTIONS:Mcups)
9.include "../../print/cups-base/buildlink3.mk" 9.include "../../print/cups-base/buildlink3.mk"
10CONFIGURE_ARGS+= --enable-cups 10CONFIGURE_ARGS+= --enable-cups
11.else 11.else
12CONFIGURE_ARGS+= --disable-cups 12CONFIGURE_ARGS+= --disable-cups
13.endif 13.endif
14 14
15PLIST_VARS+= debug 
16.if !empty(PKG_OPTIONS:Mdebug) 15.if !empty(PKG_OPTIONS:Mdebug)
17# Debugging 16# Debugging
18CONFIGURE_ARGS+= --enable-debug1 17CONFIGURE_ARGS+= --enable-debug1
19CONFIGURE_ARGS+= --enable-debug 18CONFIGURE_ARGS+= --enable-debug
20CONFIGURE_ARGS+= --enable-debugging 19CONFIGURE_ARGS+= --enable-debugging
21CFLAGS+= -g3 20CFLAGS+= -g3
22INSTALL_UNSTRIPPED= yes 21INSTALL_UNSTRIPPED= yes
23.endif 22.endif
24 23
25PLIST_VARS+= dnssd 
26.if !empty(PKG_OPTIONS:Mdnssd) 24.if !empty(PKG_OPTIONS:Mdnssd)
27.include "../../net/mDNSResponder/buildlink3.mk" 25.include "../../net/mDNSResponder/buildlink3.mk"
28CONFIGURE_ARGS+= --enable-zeroconf 26CONFIGURE_ARGS+= --enable-zeroconf
29.else 27.else
30# configure patched to zeroconf="no" 28# configure patched to zeroconf="no"
31.endif 29.endif
32 30
33PLIST_VARS+= gssapi 31PLIST_VARS+= gssapi
34.if !empty(PKG_OPTIONS:Mkerberos) 32.if !empty(PKG_OPTIONS:Mkerberos)
35.include "../../mk/krb5.buildlink3.mk" 33.include "../../mk/krb5.buildlink3.mk"
36CONFIGURE_ARGS+= --with-gssapi --enable-krbV-uam 34CONFIGURE_ARGS+= --with-gssapi --enable-krbV-uam
37CONFIGURE_ENV+= GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err" 35CONFIGURE_ENV+= GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err"
38PLIST.gssapi= yes 36PLIST.gssapi= yes
cvs diff -r1.2 -r1.3 pkgsrc/net/netatalk22/patches/patch-config_Makefile.in (expand / switch to unified diff)

--- pkgsrc/net/netatalk22/patches/patch-config_Makefile.in 2021/04/02 09:54:26 1.2
+++ pkgsrc/net/netatalk22/patches/patch-config_Makefile.in 2023/01/10 22:07:33 1.3
@@ -1,33 +1,22 @@ @@ -1,33 +1,22 @@
1$NetBSD: patch-config_Makefile.in,v 1.2 2021/04/02 09:54:26 hauke Exp $ 1$NetBSD: patch-config_Makefile.in,v 1.3 2023/01/10 22:07:33 hauke Exp $
2 
3Install afp_ldap.conf based on LDAP support, not ACL support. 
4 2
5Install config files to examples/netatalk, and leave installation to 3Install config files to examples/netatalk, and leave installation to
6the pkginstall framerwork. 4the pkginstall framerwork.
7 5
8Renamed from patch-ah 6Renamed from patch-ah
9 7
10--- config/Makefile.in.orig 2017-07-09 11:27:05.000000000 +0000 8--- config/Makefile.in.orig 2017-07-09 11:27:05.000000000 +0000
11+++ config/Makefile.in 9+++ config/Makefile.in
12@@ -88,7 +88,7 @@ POST_UNINSTALL = : 
13 build_triplet = @build@ 
14 host_triplet = @host@ 
15 target_triplet = @target@ 
16-@HAVE_ACLS_TRUE@am__append_1 = afp_ldap.conf 
17+@HAVE_LDAP_TRUE@am__append_1 = afp_ldap.conf 
18 @USE_APPLETALK_TRUE@am__append_2 = atalkd.conf papd.conf 
19 subdir = config 
20 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
21@@ -759,13 +759,14 @@ uninstall-local: 10@@ -759,13 +759,14 @@ uninstall-local:
22 rm -f $(DESTDIR)$(pkgconfdir)/$$f; \ 11 rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
23 done 12 done
24 @USE_DEBIAN_TRUE@ rm -f $(DESTDIR)/etc/default/netatalk 13 @USE_DEBIAN_TRUE@ rm -f $(DESTDIR)/etc/default/netatalk
25+egconfdir = @prefix@/share/examples/netatalk 14+egconfdir = @prefix@/share/examples/netatalk
26  15
27 install-config-files: $(CONFFILES) $(GENFILES) 16 install-config-files: $(CONFFILES) $(GENFILES)
28- $(mkinstalldirs) $(DESTDIR)$(pkgconfdir) 17- $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
29+ $(mkinstalldirs) $(DESTDIR)$(egconfdir) 18+ $(mkinstalldirs) $(DESTDIR)$(egconfdir)
30 for f in $(CONFFILES) $(GENFILES); do \ 19 for f in $(CONFFILES) $(GENFILES); do \
31- if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \ 20- if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
32- echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \ 21- echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
33- $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \ 22- $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \
cvs diff -r1.2 -r1.3 pkgsrc/net/netatalk22/patches/Attic/patch-etc_uams_uams__dhx__passwd.c (expand / switch to unified diff)

--- pkgsrc/net/netatalk22/patches/Attic/patch-etc_uams_uams__dhx__passwd.c 2021/04/02 09:54:26 1.2
+++ pkgsrc/net/netatalk22/patches/Attic/patch-etc_uams_uams__dhx__passwd.c 2023/01/10 22:07:33 1.3
@@ -1,45 +1,14 @@ @@ -1,45 +1,14 @@
1$NetBSD: patch-etc_uams_uams__dhx__passwd.c,v 1.2 2021/04/02 09:54:26 hauke Exp $ 1$NetBSD: patch-etc_uams_uams__dhx__passwd.c,v 1.3 2023/01/10 22:07:33 hauke Exp $
2 2
3Adapt for new OpenSSL API. 3Don't include headers that are not shipped
4 4
5--- etc/uams/uams_dhx_passwd.c.orig 2014-03-16 11:17:48.000000000 +0000 5--- etc/uams/uams_dhx_passwd.c.orig 2022-07-12 04:08:24.000000000 +0000
6+++ etc/uams/uams_dhx_passwd.c 6+++ etc/uams/uams_dhx_passwd.c
7@@ -81,6 +81,7 @@ static int pwd_login(void *obj, char *us 7@@ -37,7 +37,6 @@
8 struct spwd *sp; 8 #include <openssl/bn.h>
9 #endif /* SHADOWPW */ 9 #include <openssl/dh.h>
10 BIGNUM *bn, *gbn, *pbn; 10 #include <openssl/cast.h>
11+ const BIGNUM *pub_key; 11-#include "openssl_compat.h"
12 u_int16_t sessid; 12 #else /* OPENSSL_DHX */
13 size_t i; 13 #include <bn.h>
14 DH *dh; 14 #include <dh.h>
15@@ -144,10 +145,18 @@ static int pwd_login(void *obj, char *us 
16 return AFPERR_PARAM; 
17 } 
18  
19+ if (!DH_set0_pqg(dh, pbn, NULL, gbn)) { 
20+ BN_free(pbn); 
21+ BN_free(gbn); 
22+ goto passwd_fail; 
23+ } 
24+ 
25 /* generate key and make sure we have enough space */ 
26- dh->p = pbn; 
27- dh->g = gbn; 
28- if (!DH_generate_key(dh) || (BN_num_bytes(dh->pub_key) > KEYSIZE)) { 
29+ if (!DH_generate_key(dh)) { 
30+ goto passwd_fail; 
31+ } 
32+ DH_get0_key(dh, &pub_key, NULL); 
33+ if (BN_num_bytes(pub_key) > KEYSIZE) { 
34 goto passwd_fail; 
35 } 
36  
37@@ -164,7 +173,7 @@ static int pwd_login(void *obj, char *us 
38 *rbuflen += sizeof(sessid); 
39  
40 /* send our public key */ 
41- BN_bn2bin(dh->pub_key, (unsigned char *)rbuf);  
42+ BN_bn2bin(pub_key, (unsigned char *)rbuf);  
43 rbuf += KEYSIZE; 
44 *rbuflen += KEYSIZE; 
45  
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-config_afpd.conf.tmpl
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-distrib_initscripts_Makefile.in
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-etc_afpd_afp__options.c
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-etc_papd_magics.c
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-etc_uams_uams__dhx__pam.c
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-etc_uams_uams__randnum.c
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-libatalk_asp_asp__getsess.c
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-man_man5_afpd.conf.5.tmpl
cvs diff -r1.3 -r1.4 pkgsrc/net/netatalk22/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/net/netatalk22/patches/patch-configure 2017/07/12 13:56:00 1.3
+++ pkgsrc/net/netatalk22/patches/patch-configure 2023/01/10 22:07:33 1.4
@@ -1,41 +1,15 @@ @@ -1,41 +1,15 @@
1$NetBSD: patch-configure,v 1.3 2017/07/12 13:56:00 hauke Exp $ 1$NetBSD: patch-configure,v 1.4 2023/01/10 22:07:33 hauke Exp $
2 
3Disable zeroconf explicitely, unless enabled - the distribution 
4appears not to allow for this. 
5 
6We do not at this point support zeroconf via avahi. Since configure 
7does not allow for building without avahi, and native avahi is picked 
8up on some Linuxen, we disable all avahi tests unconditionally here. 
9 2
10Fix build on SunOS by disabling the isainfo bitness check  3Fix build on SunOS by disabling the isainfo bitness check
11 4
12--- configure.orig 2013-07-23 09:11:35.000000000 +0000 5--- configure.orig 2023-01-10 08:57:35.000000000 +0000
13+++ configure 6+++ configure
14@@ -16109,7 +16109,7 @@ fi 7@@ -19331,7 +19331,7 @@ printf %s "checking if we have to build
15 if test "${enable_zeroconf+set}" = set; then : 
16 enableval=$enable_zeroconf; zeroconf=$enableval 
17 else 
18- zeroconf=try 
19+ zeroconf=no 
20  
21 fi 
22  
23@@ -16185,7 +16185,8 @@ $as_echo "#define HAVE_MDNS 1" >>confdef 
24 fi 
25  
26 # mDNS support using Avahi 
27- if test x"$found_zeroconf" != x"yes" ; then 
28+ #if test x"$found_zeroconf" != x"yes" ; then 
29+ if 0 ; then 
30 ac_fn_c_check_header_mongrel "$LINENO" "avahi-client/client.h" "ac_cv_header_avahi_client_client_h" "$ac_includes_default" 
31 if test "x$ac_cv_header_avahi_client_client_h" = xyes; then : 
32 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_client_new in -lavahi-client" >&5 
33@@ -17535,7 +17536,7 @@ $as_echo_n "checking if we have to build 
34 # check for isainfo, if not found it has to be a 32 bit kernel (<=2.6) 8 # check for isainfo, if not found it has to be a 32 bit kernel (<=2.6)
35 if test -x /usr/bin/isainfo; then 9 if test -x /usr/bin/isainfo; then
36 # check for 64 bit platform 10 # check for 64 bit platform
37- if isainfo -kv | grep '^64-bit'; then 11- if isainfo -kv | grep '^64-bit'; then
38+ if test "$MACHINE_ARCH" = "x86_64"; then 12+ if test "$MACHINE_ARCH" = "x86_64"; then
39 COMPILE_64BIT_KMODULE=yes 13 COMPILE_64BIT_KMODULE=yes
40 fi 14 fi
41 fi 15 fi
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-etc_atalkd_main.c
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-etc_cnid_dbd_cmd_dbd_scanvol.c
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-etc_papd_file.c
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-etc_papd_file.h
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-libatalk_bstring_bstrlib.c
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-etc_papd_print_cups.c
File Deleted: pkgsrc/net/netatalk22/patches/Attic/patch-include_atalk_ldapconfig.h