Untangle the m0nster patch to configure. To the quota experts: Please

check all the bells and whistles are still in place, and functional.

While here, update to Netatalk 2.2.4. Note that we will ship Netatalk
2 as long as NetBSD ships ddp ("netatalk") support, so v3 is not a
replacement.


Changes to package setup:

Set PLIST_VARS.{ea,acl} so that the package builds on Ubuntu Linux 10
LTS. I guess there are version and file-system dependencies?

Add dnssd option for mDNSResponder ("zeroconf") support.


Remaining (upstream) issues:

dbd(8) breaks with a less-than-helpful error message, see end of
PR pkg/47578

afpd(8) mis-maps user IDs -- a security issue


Upstream changes:

Changes in 2.2.4
================

* FIX: Missing UAM links
* FIX: Lockup in AFP logout on Fedora 17
* FIX: Reset signal handlers and alarm timer after successfull PAM
       authentication. Fixes a problem with AFP disconnects caused
       by pam_smbpass.so messing with our handlers and timer.
* FIX: afpd: Fix a possible problem with sendfile on Solaris derived
       platforms

Changes in 2.2.3
================

* NEW: afpd: support for mdnsresponder
* NEW: afpd: new LDAP config option ldap_uuid_string
* UPD: based on Unicode 6.1.0
* UPD: experimental systemd service files: always run both afpd and cnid_metad
* UPD: afpd: Ensure our umask is not altered by eg pam_umask
* UPD: afpd: Use GSS_C_NO_NAME as server principal when Kerberos options -fqdn
       and -krb5service are not set, from Jamie Gilbertson
* UPD: afpd: Changed behaviour for TimeMachine volumes in case there's a problem
       talking to the CNID daemons. Previously the volume was flagged read-only
       and an AFP message was sent to the client. As this might result in
       TimeMachine assuming the backup sparse bundle is damaged, we now just
       switch the CNID database to an in-memory tdb without the additional stuff.
* FIX: afpd: sendfile() on FreeBSD was broken, courtesy of Denis Ahrens
* FIX: afpd: Dont use searchdb when doing partial name search
* FIX: afpd: Fix a possible bug handling disconnected sessions,
       NetAFP Bug ID #16
* FIX: afpd: Close IPC fds in afpd session child inherited from the afpd
       master process
* FIX: dbd: Don't remove BerkeleyDB if it's still in use by eg cnid_dbd, fixes
       bug introduced in 2.2.2
* FIX: debian initscript: start avahi-daemon (if available) before atalkd
* FIX: Zeroconf could not advertise non-ASCII time machine volume name

Changes in 2.2.2
================

* NEW: afpd: New option "adminauthuser". Specifying eg "-adminauthuser root"
       whenever a normal user login fails, afpd tries to authenticate as
       the specified adminauthuser. If this succeeds, a normal session is
       created for the original connecting user. Said differently: if you
       know the password of adminauthuser, you can authenticate as any other
       user.
* NEW: configure option "--enable-suse-systemd" for openSUSE12.1 and later.
       "--enable-redhat-systemd" and "--enable-suse-systemd" are same as
       "--enable-systemd".
       "--enable-suse" is renamed "--enable-suse-sysv".
* NEW: experimental systemd service files in distrib/systemd/
* UPD: afpd: Enhanced POSIX ACL mapping semantics, from Laura Mueller
* UPD: afpd: Reset options every time a :DEFAULT: line is found in a
       AppleVolumes file
* UPD: afpd: Convert passwords from legacy encoding (wire format) to host
       encoding, NetAFP Bug ID #14
* UPD: afpd: Don't set ATTRBIT_SHARED flag for directories
* UPD: afpd: Use sendfile() on Solaris and FreeBSD for sending data
* UPD: afpd: Faster volume used size calculation for "volsizelimit" option,
       cf man AppleVolume.default for details
* FIX: afpd: ACL access checking
* FIX: afpd: Fix an error when duplicating files that lacked an AppleDouble
       file which lead to a possible Finder crash
* FIX: afpd: Read-only filesystems lead to afpd processes running as root
* FIX: afpd: Fix for filesystem without NFSv4 ACL support on Solaris
* FIX: afpd: Fix catsearch bug, NetAFP Bug ID #12
* FIX: afpd: Fix dircache bug, NetAFP Bug ID #13
* FIX: dbd: Better checking for duplicated or bogus CNIDs from AppleDouble
       files
* FIX: dbd: Remove BerkeleyDB database environment after running `dbd`. This
       is crucial for the automatic BerkeleyDB database upgrade feature which
       is built into cnid_dbd and dbd.
* FIX: Fix compilation error when AppleTalk support is disabled
* FIX: Portability fixes
* FIX: search of surrogate pair

net/netatalk/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2013/04/06 12:45:05 hauke Exp $
+# $NetBSD: Makefile,v 1.99 2013/04/30 15:43:30 hauke Exp $
 
-DISTNAME=	netatalk-2.2.1
-PKGREVISION=	11
+DISTNAME=	netatalk-2.2.4
+#PKGREVISION=	1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
@@ -69,14 +69,14 @@ PLIST.rcd=		yes
 .endif
 
 PLIST_VARS+=		ea
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || \
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
 	(${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-6].[0-8]*))
 PLIST.ea=		yes
 .endif
 
 PLIST_VARS+=		acl
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "HPUX" || ${OPSYS} == "IRIX" || \
-	${OPSYS} == "AIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "Linux"
+	${OPSYS} == "AIX" || ${OPSYS} == "OSF1"
 PLIST.acl=		yes
 CONF_FILES+=	${EGDIR}/afp_ldap.conf ${PKG_SYSCONFDIR}/afp_ldap.conf
 .endif

net/netatalk/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2012/06/13 07:18:19 obache Exp $
+@comment $NetBSD: PLIST,v 1.26 2013/04/30 15:43:30 hauke Exp $
 ${PLIST.ea}bin/ad
 bin/add_netatalk_printer
 bin/adv1tov2
@@ -36,7 +36,6 @@ include/atalk/aep.h
 include/atalk/afp.h
 include/atalk/asp.h
 include/atalk/atp.h
-include/atalk/boolean.h
 include/atalk/cnid.h
 include/atalk/compat.h
 include/atalk/ddp.h

net/netatalk/distinfo

@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.49 2013/03/28 21:36:21 joerg Exp $
+$NetBSD: distinfo,v 1.50 2013/04/30 15:43:30 hauke Exp $
 
-SHA1 (netatalk-2.2.1.tar.bz2) = e588b89eced7769f65e213bc4b1b1e4f8035c8b3
-RMD160 (netatalk-2.2.1.tar.bz2) = bc55a591fe134d3bf05ca442aa5b5246fd766b8c
-Size (netatalk-2.2.1.tar.bz2) = 1227602 bytes
-SHA1 (patch-aa) = 3d253738afdfa81e862fbbc67f30337b8acb42c0
+SHA1 (netatalk-2.2.4.tar.bz2) = da2d59634a6bf3cb2e21e339b2acd0b8da3885d1
+RMD160 (netatalk-2.2.4.tar.bz2) = ba94a55d2d6338b52ffaa3ee3c306549f34fec51
+Size (netatalk-2.2.4.tar.bz2) = 1289663 bytes
 SHA1 (patch-ac) = 605e87479202cbf093dfbadb25f2972595246d97
 SHA1 (patch-ae) = e114085fbe2abf2fb821f2d2737e877c53e7c151
 SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2
@@ -13,12 +12,12 @@ SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
 SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9
 SHA1 (patch-ap) = c5e7cc0e1773d7e60106df7e1f3ded234308bb8c
 SHA1 (patch-aq) = 0793cf5ec158aa27c42b5d8a96651307d7c7c8b6
-SHA1 (patch-ar) = 8c6c6169496b9b2cdec6049d2ee45884d5513d11
 SHA1 (patch-au) = 8505351fee21ac1effa4dc620b8006c572b913c1
 SHA1 (patch-bin_ad_ad__cp.c) = 0a9e93f6149ff53f0f0d8c36ea4c5e635b5b624c
-SHA1 (patch-bj) = abbc2809b6b7fe75ec2d2f8f2fa8d6cd9d6de7b0
-SHA1 (patch-bk) = c3fb7c3a42f148171fa99b6121b099dd4998947a
-SHA1 (patch-etc_afpd_afp_config.c) = 37813324c503fae05af12dba8dad5741a21ea4ed
+SHA1 (patch-configure) = 06e67a8bb5c89ea94497957d6833db6566d5b06c
+SHA1 (patch-distrib_initscripts_Makefile.in) = 3dc520f998b2b35ea60cd8f1a2a96d465a9e474a
+SHA1 (patch-etc_afpd_afp_mdns.c) = ab87bf511466ef183de1ee8f8a9ad1fbb8776066
 SHA1 (patch-etc_afpd_quota_c) = 5005abb6528c0b3160a587fbe9fb285f485e6759
 SHA1 (patch-etc_uams_uams_gss.c) = b9ff59c368e01d3f269e95f5eaeb239dc17e701c
+SHA1 (patch-include_atalk_ldapconfig.h) = d0bb4a1bf520b18228de6ab87b646f4496852fce
 SHA1 (patch-macros_quota-check.m4) = b1484f83a2a6ba5bd50623ab525d5366bb71abaa

net/netatalk/options.mk

@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2012/09/11 00:30:13 manu Exp $
+# $NetBSD: options.mk,v 1.5 2013/04/30 15:43:30 hauke Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.netatalk
-PKG_SUPPORTED_OPTIONS=	cups debug kerberos pam slp ldap
+PKG_SUPPORTED_OPTIONS=	cups debug dnssd kerberos ldap pam slp
 
 .include "../../mk/bsd.options.mk"
 
@@ -22,6 +22,14 @@ CFLAGS+=		-g3
 INSTALL_UNSTRIPPED=	yes
 .endif
 
+PLIST_VARS+=		dnssd
+.if !empty(PKG_OPTIONS:Mdnssd)
+.include "../../net/mDNSResponder/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-zeroconf
+.else
+# configure patched to zeroconf="no"
+.endif
+
 PLIST_VARS+=		gssapi
 .if !empty(PKG_OPTIONS:Mkerberos)
 .include "../../mk/krb5.buildlink3.mk"
@@ -32,6 +40,13 @@ PLIST.gssapi=		yes
 CONFIGURE_ARGS+=	--without-gssapi
 .endif
 
+.if !empty(PKG_OPTIONS:Mldap)
+.include "../../databases/openldap-client/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-ldap=yes
+.else
+CONFIGURE_ARGS+=       --with-ldap=no
+.endif
+
 PLIST_VARS+=		pam
 .if !empty(PKG_OPTIONS:Mpam)
 .include "../../mk/pam.buildlink3.mk"
@@ -48,10 +63,3 @@ CONFIGURE_ARGS+=	--enable-srvloc
 .else
 CONFIGURE_ARGS+=	--disable-srvloc
 .endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-.include "../../databases/openldap-client/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-ldap=yes
-.else
-CONFIGURE_ARGS+=       --with-ldap=no
-.endif