Update Netatalk to 2.1.4

Changes in 2.1.4
 ~~~~~~~~~~~~~~~~
 * FIX: afpd: Downstream fix for FreeBSD PR 148022
 * FIX: afpd: Fixes for bugs 3074077 and 3074078
 * FIX: afpd: Better handling of symlinks in combination with ACLs and EAs.
        Fixes bug 3074076.
 * FIX: dbd: Adding a file with the CNID from it's adouble file did
        not work in case that CNID was alread occupied in the database
 * FIX: macusers: add support for Solaris
 * NEW: cnid_metad: use a PID lockfile
 * NEW: afpd: prevent log flooding
 * UPD: dbd: ignore ".zfs" snapshot directories
 * UPD: dbd: support interrupting -re mode

Does not fix pkg/43953, unfortunately.

4 files changed, 22 insertions, 20 deletions

diff --git a/net/netatalk/MESSAGE b/net/netatalk/MESSAGE
index 7297e5a9820..1157fb210a6 100644
--- a/net/netatalk/MESSAGE
+++ b/net/netatalk/MESSAGE
@@ -1,11 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2009/02/22 07:35:16 taca Exp $
+$NetBSD: MESSAGE,v 1.6 2010/10/17 14:12:10 hauke Exp $
 
-For users migrating from netatalk 1.x, note that CAP encoding isn't
-supported by Netatalk 2 any more.  You could convert encoding of file
-names from CAP to UTF-8 with some tools, but it is simple and safe way.
+For users migrating from Netatalk 1.x, note that CAP encoding is not
+supported by Netatalk 2 any more. There are tools to convert CAP
+encoded file names to UTF-8, but that is not a simple and safe way.
 
-* You should backup your volumes to a client.
-* Restore backuped volumes from the client.
+Instead, consider backing up your Netatalk 1.x volumes to a client before
+the update, and restoring the backups from the client to the Netatalk 2
+server.
 
 ===========================================================================
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index ccbb82a5f36..849192dd828 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2010/09/16 08:06:17 adam Exp $
+# $NetBSD: Makefile,v 1.73 2010/10/17 14:12:10 hauke Exp $
 
-DISTNAME=	netatalk-2.1.3
-PKGREVISION=	1
+DISTNAME=	netatalk-2.1.4
+#PKGREVISION=	1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 003bbdd9e40..3988ea20b72 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2010/07/19 21:21:25 markd Exp $
+$NetBSD: distinfo,v 1.35 2010/10/17 14:12:10 hauke Exp $
 
-SHA1 (netatalk-2.1.3.tar.bz2) = a1a3fa649ecb454c4ed2e476e27877ba06a338d9
-RMD160 (netatalk-2.1.3.tar.bz2) = de9810c014549099e412bbc52fb3bb5e780b30e5
-Size (netatalk-2.1.3.tar.bz2) = 1122920 bytes
+SHA1 (netatalk-2.1.4.tar.bz2) = eed42b3958c315be0a1bf453e1a7b829d4d4f9cf
+RMD160 (netatalk-2.1.4.tar.bz2) = 10da904a80a6e81262e6a0ac987a4f8b89db1de1
+Size (netatalk-2.1.4.tar.bz2) = 1123981 bytes
 SHA1 (patch-adv1tov2.c) = f72a55c65a1f5f60ad49e6bd52696103d3993bbf
 RMD160 (patch-adv1tov2.c) = 7fed71cba8494afb2dafdde3f392103ccbdf2e93
 Size (patch-adv1tov2.c) = 714 bytes
@@ -10,7 +10,7 @@ SHA1 (patch-aa) = 53a73a0e6b064606e3ffa6970fb5970c7747866e
 SHA1 (patch-ac) = 605e87479202cbf093dfbadb25f2972595246d97
 SHA1 (patch-ae) = 925dc745303f9d21a5ea9f52593734700d07bbb5
 SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2
-SHA1 (patch-ah) = bb98cf49d9ac1d602414296c329fb5118c94d17a
+SHA1 (patch-ah) = a990c3109c9f45f80c645f3dd5d22bf1443ea29b
 SHA1 (patch-am) = a01ab55a793c5249cc6fa0a4d98d61e43f173021
 SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
 SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9
diff --git a/net/netatalk/patches/patch-ah b/net/netatalk/patches/patch-ah
index a7e5fb846d3..542fe927a2c 100644
--- a/net/netatalk/patches/patch-ah
+++ b/net/netatalk/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.7 2010/07/19 21:21:25 markd Exp $
+$NetBSD: patch-ah,v 1.8 2010/10/17 14:12:11 hauke Exp $
 
---- config/Makefile.in.orig	2010-02-07 18:59:32.000000000 +0000
+--- config/Makefile.in.orig	2010-10-15 10:10:05.000000000 +0000
 +++ config/Makefile.in
-@@ -668,12 +668,14 @@ uninstall-local:
- 		rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
- 	done
+@@ -598,12 +598,14 @@ uninstall-local:
+ 
+ @USE_DEBIAN_TRUE@	rm -f $(DESTDIR)/etc/default/netatalk;
  
 +egconfdir = @prefix@/share/examples/netatalk
 +
@@ -12,9 +12,10 @@ $NetBSD: patch-ah,v 1.7 2010/07/19 21:21:25 markd Exp $
 -	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
 +	$(mkinstalldirs) $(DESTDIR)$(egconfdir)
  	for f in $(CONFFILES) $(GENFILES); do \
- 		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
+-		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
 -			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
 -			$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \
++		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(egconfdir)/$$f; then \
 +			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(egconfdir)"; \
 +			$(INSTALL_DATA) $$f $(DESTDIR)$(egconfdir); \
  		else \