Update to 2.2.0. See http://netatalk.sourceforge.net/2.2/ReleaseNotes2.2.0.html

for a list of changes in this release.

10 files changed, 187 insertions, 90 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index b20fa3869938..8b0a7318b510 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	2.1.5
-PORTREVISION=	2
+PORTVERSION=	2.2.0
 PORTEPOCH=	1
 CATEGORIES=	net print
-MASTER_SITES=	SF
+MASTER_SITES=	SF/netatalk/netatalk/2.2
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	File server for Mac OS X
@@ -43,18 +42,14 @@ FILES=		AppleVolumes.default AppleVolumes.system afpd.conf \
 		atalkd.conf papd.conf netatalk.conf
 LINKS=		unbin unhex unsingle hqx2bin single2bin macbinary \
 		binheader nadheader
-MAN1=		achfile.1 ad.1 aecho.1 afile.1 afppasswd.1 apple_cp.1 \
-		apple_dump.1 apple_mv.1 apple_rm.1 asip-status.pl.1 dbd.1 \
-		getzones.1 hqx2bin.1 macbinary.1 megatron.1 nbp.1 nbplkup.1 \
-		nbprgstr.1 nbpunrgstr.1 netatalk-config.1 pap.1 papstatus.1 \
-		psorder.1 single2bin.1 unbin.1 unhex.1 uniconv.1 unsingle.1
-MAN3=		atalk_aton.3 nbp_name.3
-MAN4=		atalk.4
+MAN1=		ad.1 afpldaptest.1 afppasswd.1 apple_dump.1 asip-status.pl.1 \
+		dbd.1 hqx2bin.1 macbinary.1 megatron.1 \
+		netatalk-config.1 single2bin.1 unbin.1 unhex.1 uniconv.1 \
+		unsingle.1
 MAN5=		AppleVolumes.5 AppleVolumes.default.5 \
 		AppleVolumes.system.5 afp_ldap.conf.5 afp_signature.conf.5 \
-		afpd.conf.5 atalkd.conf.5 netatalk.conf.5 papd.conf.5
-MAN8=		afp_acls.8 afpd.8 atalkd.8 cnid_dbd.8 cnid_metad.8 papd.8 \
-		papstatus.8 psf.8 timelord.8
+		afp_voluuid.conf.5 afpd.conf.5 netatalk.conf.5
+MAN8=		afpd.8 cnid_dbd.8 cnid_metad.8 timelord.8
 
 CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.* netatalk-1* yudit-[0-9]*
 
@@ -68,9 +63,16 @@ PLIST_SUB+=		NETATALKKRB5="@comment "
 .endif
 
 .if defined(WITH_APPLETALK)
-CONFIGURE_ARGS+=	--with-ddp
+CONFIGURE_ARGS+=	--enable-ddp
+PLIST_SUB+=		APPLETALK=""
+MAN1+=			aecho.1 getzones.1 nbp.1 nbplkup.1 nbprgstr.1 \
+			nbpunrgstr.1 pap.1 papstatus.1 psorder.1
+MAN3+=			atalk_aton.3 nbp_name.3
+MAN4+=			atalk.4
+MAN5+=			atalkd.conf.5 papd.conf.5
+MAN8+=			atalkd.8 papd.8 papstatus.8 psf.8
 .else
-CONFIGURE_ARGS+=	--without-ddp
+PLIST_SUB+=		APPLETALK="@comment "
 .endif
 
 .if defined(WITH_PAM)
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 8e04863727d3..6866c0e0d6c5 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netatalk-2.1.5.tar.bz2) = 11fcce36cc5179de60c5c0b10032ff9e042ed8b8c6e0b99d2d7200c8d0749038
-SIZE (netatalk-2.1.5.tar.bz2) = 1125946
+SHA256 (netatalk-2.2.0.tar.bz2) = 31bf7c1ea311f876d9be6d4be9faed24d170a89e6ce692304fc2cb525f25143b
+SIZE (netatalk-2.2.0.tar.bz2) = 1216174
diff --git a/net/netatalk/files/patch-config_netatalk.conf b/net/netatalk/files/patch-config_netatalk.conf
index 7b7afceb177a..9d3c7bf4c25f 100644
--- a/net/netatalk/files/patch-config_netatalk.conf
+++ b/net/netatalk/files/patch-config_netatalk.conf
@@ -1,43 +1,20 @@
---- config/netatalk.conf.orig	2010-04-19 11:35:26.000000000 +0000
-+++ config/netatalk.conf	2010-05-20 19:14:32.000000000 +0000
+--- config/netatalk.conf.orig	2011-07-22 00:30:42.000000000 -0400
++++ config/netatalk.conf	2011-07-30 18:01:04.000000000 -0400
 @@ -1,4 +1,5 @@
 -# Netatalk configuration
 +# netatalk configuration
 +# For details see man netatalk.conf
- # Change this to increase the maximum number of clients that can connect:
- AFPD_MAX_CLIENTS=20
  
-@@ -6,7 +7,7 @@
- # NOTE: if your zone has spaces in it, you're better off specifying
- #       it in afpd.conf
- #ATALK_ZONE=@zone
--ATALK_NAME=`echo ${HOSTNAME}|cut -d. -f1`
-+ATALK_NAME=`/bin/hostname -s`
+ #########################################################################
+ # Global configuration
+@@ -21,8 +22,8 @@ export ATALK_MAC_CHARSET
  
- # specify the Mac and unix charsets to be used
- ATALK_MAC_CHARSET='MAC_ROMAN'
-@@ -20,24 +21,5 @@
- # Change this to set the id of the guest user
- AFPD_GUEST=nobody
- 
--# Set which daemons to run.
--# If you need legacy AppleTalk, run atalkd.
--# papd, timelord and a2boot are dependent upon atalkd.
--# If you use "AFP over TCP" server only, run only cnid_metad and afpd.
--ATALKD_RUN=no
--PAPD_RUN=no
--TIMELORD_RUN=no
--A2BOOT_RUN=no
+ #### Set which daemons to run.
+ #### If you use AFP file server, run both cnid_metad and afpd.
 -CNID_METAD_RUN=yes
 -AFPD_RUN=yes
--
--# Control whether the daemons are started in the background.
--# If it is dissatisfied that atalkd starts slowly, set "yes".
--ATALK_BGROUND=no
--
--# export the charsets, read form ENV by apps
--export ATALK_MAC_CHARSET
--export ATALK_UNIX_CHARSET
--
- # config for cnid_metad. Default log config:
- # CNID_CONFIG="-l log_note"
++#CNID_METAD_RUN=yes
++#AFPD_RUN=yes
+ 
+ #### maximum number of clients that can connect:
+ #AFPD_MAX_CLIENTS=20
diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure
index f4cd7a42b1f6..fd67276b8504 100644
--- a/net/netatalk/files/patch-configure
+++ b/net/netatalk/files/patch-configure
@@ -1,11 +1,33 @@
---- configure.orig	2010-07-10 06:18:22.000000000 -0400
-+++ configure	2010-07-24 21:33:50.000000000 -0400
-@@ -30958,7 +30958,7 @@ if test "x$bdb_required" = "xyes"; then
+--- configure.orig	2011-07-27 07:59:28.000000000 -0400
++++ configure	2011-07-30 18:23:04.000000000 -0400
+@@ -20316,10 +20316,10 @@ fi
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS=" /usr/local/share/libtool/config/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
+ 
+ # Prevent multiple expansion
+ 
+@@ -31357,7 +31357,7 @@ if test "x$bdb_required" = "xyes"; then
      trybdbdir=""
      dobdbsearch=yes
      bdb_search_dirs="/usr/local /usr"
--    search_subdirs="/ /db5 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
-+    search_subdirs="/%%DB_NAME%% / /db5 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
+-    search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
++    search_subdirs="/db46 / /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
  
      bdbfound=no
      savedcflags="$CFLAGS"
+@@ -33387,7 +33387,7 @@ rm -f core conftest.err conftest.$ac_obj
+ fi
+ { echo "$as_me:$LINENO: result: $netatalk_cv_HAVE_ACL_GET_PERM_NP" >&5
+ echo "${ECHO_T}$netatalk_cv_HAVE_ACL_GET_PERM_NP" >&6; }
+-			if test x"netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
++			if test x"$netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_ACL_GET_PERM_NP 1
diff --git a/net/netatalk/files/patch-etc_afpd_acls.c b/net/netatalk/files/patch-etc_afpd_acls.c
new file mode 100644
index 000000000000..5d67bc65ffd3
--- /dev/null
+++ b/net/netatalk/files/patch-etc_afpd_acls.c
@@ -0,0 +1,63 @@
+--- etc/afpd/acls.c.orig	2011-07-30 18:08:35.000000000 -0400
++++ etc/afpd/acls.c	2011-07-30 18:19:19.000000000 -0400
+@@ -1060,7 +1060,59 @@ static int set_acl(const struct vol *vol
+ #ifdef HAVE_ACL_FROM_MODE
+     EC_NULL_LOG_ERR(acc_acl = acl_from_mode(st.st_mode), AFPERR_MISC);
+ #else
+-#error "Missing acl_from_mode() replacement"
++    /* Implement the non POSIX.1e function acl_from_mode
++     *
++     * Taken from http://people.freebsd.org/~markus/stuff/kacl.diff
++     */
++    {
++	    acl_t new_acl = acl_init( 3 );
++	    acl_entry_t entry;
++	    acl_permset_t permset = 0;
++	    int error = 0;
++
++	    /* Add owner entry */
++	    if ( ( error = acl_create_entry( &new_acl, &entry ) ) == 0 ) {
++		    /* Set owner permissions */
++		    acl_set_tag_type( entry, ACL_USER_OBJ );
++		    acl_get_permset( entry, &permset );
++		    acl_clear_perms( permset );
++		    if ( st.st_mode & S_IRUSR ) acl_add_perm( permset, ACL_READ );
++		    if ( st.st_mode & S_IWUSR ) acl_add_perm( permset, ACL_WRITE );
++		    if ( st.st_mode & S_IXUSR ) acl_add_perm( permset, ACL_EXECUTE );
++		    acl_set_permset( entry, permset );
++
++		    /* Add group entry */
++		    if ( ( error = acl_create_entry( &new_acl, &entry ) ) == 0 ) {
++			    /* Set group permissions */
++			    acl_set_tag_type( entry, ACL_GROUP_OBJ );
++			    acl_get_permset( entry, &permset );
++			    acl_clear_perms( permset );
++			    if ( st.st_mode & S_IRGRP ) acl_add_perm( permset, ACL_READ );
++			    if ( st.st_mode & S_IWGRP ) acl_add_perm( permset, ACL_WRITE );
++			    if ( st.st_mode & S_IXGRP ) acl_add_perm( permset, ACL_EXECUTE );
++			    acl_set_permset( entry, permset );
++
++			    /* Add other entry */
++			    if ( ( error = acl_create_entry( &new_acl, &entry ) ) == 0 ) {
++				    /* Set other permissions */
++				    acl_set_tag_type( entry, ACL_OTHER );
++				    acl_get_permset( entry, &permset );
++				    acl_clear_perms( permset );
++				    if ( st.st_mode & S_IROTH ) acl_add_perm( permset, ACL_READ );
++				    if ( st.st_mode & S_IWOTH ) acl_add_perm( permset, ACL_WRITE );
++				    if ( st.st_mode & S_IXOTH ) acl_add_perm( permset, ACL_EXECUTE );
++				    acl_set_permset( entry, permset );
++			    }
++		    }
++	    }
++
++	    if ( error ) {
++		    acl_free( &new_acl );
++		    EC_NULL_LOG_ERR(acc_acl = NULL, AFPERR_MISC);
++	    }
++	    else
++		    acc_acl = new_acl;
++    }
+ #endif
+     /* adds the clients aces */
+     EC_ZERO_ERR(map_aces_darwin_to_posix(daces, &def_acl, &acc_acl, ace_count), AFPERR_MISC);
diff --git a/net/netatalk/files/patch-etc_afpd_afp_asp.c b/net/netatalk/files/patch-etc_afpd_afp_asp.c
new file mode 100644
index 000000000000..c2c6b268b412
--- /dev/null
+++ b/net/netatalk/files/patch-etc_afpd_afp_asp.c
@@ -0,0 +1,13 @@
+--- etc/afpd/afp_asp.c.orig	2011-07-30 23:13:47.000000000 -0400
++++ etc/afpd/afp_asp.c	2011-07-30 23:14:22.000000000 -0400
+@@ -31,9 +31,9 @@
+ #include <atalk/atp.h>
+ #include <atalk/asp.h>
+ #include <atalk/compat.h>
++#include <atalk/globals.h>
+ #include <atalk/util.h>
+ 
+-#include "globals.h"
+ #include "switch.h"
+ #include "auth.h"
+ #include "fork.h"
diff --git a/net/netatalk/files/patch-etc_apfd_Makefile.in b/net/netatalk/files/patch-etc_apfd_Makefile.in
index 6dd9ec021a7b..e91692393775 100644
--- a/net/netatalk/files/patch-etc_apfd_Makefile.in
+++ b/net/netatalk/files/patch-etc_apfd_Makefile.in
@@ -1,11 +1,11 @@
---- etc/afpd/Makefile.in.orig	2011-05-08 19:04:22.000000000 -0400
-+++ etc/afpd/Makefile.in	2011-05-08 19:04:34.000000000 -0400
-@@ -295,7 +295,7 @@ afpd_SOURCES = unix.c ofork.c main.c swi
- 	afp_dsi.c messages.c afp_config.c nfsquota.c quota.c uam.c \
- 	afs.c uid.c afp_util.c catsearch.c afprun.c hash.c extattrs.c \
- 	$(am__append_1)
--afpd_LDADD = $(top_builddir)/libatalk/cnid/libcnid.la $(top_builddir)/libatalk/libatalk.la @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@
-+afpd_LDADD = $(top_builddir)/libatalk/cnid/libcnid.la $(top_builddir)/libatalk/libatalk.la @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @PAM_LIBS@
+--- etc/afpd/Makefile.in.orig	2011-07-27 07:59:24.000000000 -0400
++++ etc/afpd/Makefile.in	2011-07-30 18:03:30.000000000 -0400
+@@ -317,7 +317,7 @@ afpd_SOURCES = afp_asp.c afp_avahi.c afp
+ afpd_LDADD = \
+ 	$(top_builddir)/libatalk/cnid/libcnid.la \
+ 	$(top_builddir)/libatalk/libatalk.la \
+-	@LIBGCRYPT_LIBS@ @ZEROCONF_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @PTHREAD_LIBS@
++	@LIBGCRYPT_LIBS@ @ZEROCONF_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @PTHREAD_LIBS@ @PAM_LIBS@
+ 
  afpd_LDFLAGS = -export-dynamic 
- afpd_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
- 	 @SLP_CFLAGS@ \
+ afpd_CFLAGS = \
diff --git a/net/netatalk/files/patch-etc_cnid_dbd_cnid_metad.c b/net/netatalk/files/patch-etc_cnid_dbd_cnid_metad.c
new file mode 100644
index 000000000000..e83a11997d16
--- /dev/null
+++ b/net/netatalk/files/patch-etc_cnid_dbd_cnid_metad.c
@@ -0,0 +1,10 @@
+--- etc/cnid_dbd/cnid_metad.c.orig	2011-07-30 18:28:32.000000000 -0400
++++ etc/cnid_dbd/cnid_metad.c	2011-07-30 18:29:01.000000000 -0400
+@@ -39,6 +39,7 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <sys/types.h>
++#include <sys/resource.h>
+ #include <sys/time.h>
+ #include <sys/wait.h>
+ #include <sys/uio.h>
diff --git a/net/netatalk/files/patch-etc_cnid_dbd_comm.c b/net/netatalk/files/patch-etc_cnid_dbd_comm.c
new file mode 100644
index 000000000000..e6fce5b6a49f
--- /dev/null
+++ b/net/netatalk/files/patch-etc_cnid_dbd_comm.c
@@ -0,0 +1,12 @@
+--- etc/cnid_dbd/comm.c.orig	2011-07-30 18:27:55.000000000 -0400
++++ etc/cnid_dbd/comm.c	2011-07-30 18:28:04.000000000 -0400
+@@ -9,9 +9,6 @@
+ #include "config.h"
+ #endif
+ 
+-#ifndef _XOPEN_SOURCE
+-# define _XOPEN_SOURCE 600
+-#endif
+ #ifndef __EXTENSIONS__
+ # define __EXTENSIONS__
+ #endif
diff --git a/net/netatalk/pkg-plist b/net/netatalk/pkg-plist
index c25f6ac31f2d..c151b831958a 100644
--- a/net/netatalk/pkg-plist
+++ b/net/netatalk/pkg-plist
@@ -1,20 +1,15 @@
-bin/achfile
 bin/ad
 bin/add_netatalk_printer
 bin/adv1tov2
-bin/aecho
-bin/afile
+%%APPLETALK%%bin/aecho
+bin/afpldaptest
 bin/afppasswd
-bin/apple_cp
 bin/apple_dump
-bin/apple_mv
-bin/apple_rm
 bin/binheader
 bin/asip-status.pl
 bin/cnid2_create
 bin/dbd
-bin/getzones
-bin/logger_test
+%%APPLETALK%%bin/getzones
 bin/macusers
 bin/megatron
 @exec cd %B && ln -s megatron hqx2bin
@@ -31,14 +26,13 @@ bin/megatron
 @unexec rm -f %B/unbin
 @unexec rm -f %B/unhex
 @unexec rm -f %B/unsingle
-bin/nbplkup
-bin/nbprgstr
-bin/nbpunrgstr
-bin/netacnv
+%%APPLETALK%%bin/nbplkup
+%%APPLETALK%%bin/nbprgstr
+%%APPLETALK%%bin/nbpunrgstr
 bin/netatalk-config
-bin/pap
-bin/papstatus
-bin/psorder
+%%APPLETALK%%bin/pap
+%%APPLETALK%%bin/papstatus
+%%APPLETALK%%bin/psorder
 bin/showppd
 bin/uniconv
 @unexec if cmp -s %D/etc/AppleVolumes.default %D/etc/AppleVolumes.default.dist; then rm -f %D/etc/AppleVolumes.default; fi
@@ -50,15 +44,18 @@ etc/AppleVolumes.system.dist
 @unexec if cmp -s %D/etc/afpd.conf %D/etc/afpd.conf.dist; then rm -f %D/etc/afpd.conf; fi
 etc/afpd.conf.dist
 @exec [ ! -f %B/afpd.conf ] && cp %B/%f %B/afpd.conf
-@unexec if cmp -s %D/etc/atalkd.conf %D/etc/atalkd.conf.dist; then rm -f %D/etc/atalkd.conf; fi
-etc/atalkd.conf.dist
-@exec [ ! -f %B/atalkd.conf ] && cp %B/%f %B/atalkd.conf
+@unexec if cmp -s %D/etc/afp_ldap.conf %D/etc/afp_ldap.conf.dist; then rm -f %D/etc/afp_ldap.conf; fi
+etc/afp_ldap.conf.dist
+@exec [ ! -f %B/afp_ldap.conf ] && cp %B/%f %B/afp_ldap.conf
+%%APPLETALK%%@unexec if cmp -s %D/etc/atalkd.conf %D/etc/atalkd.conf.dist; then rm -f %D/etc/atalkd.conf; fi
+%%APPLETALK%%etc/atalkd.conf.dist
+%%APPLETALK%%@exec [ ! -f %B/atalkd.conf ] && cp %B/%f %B/atalkd.conf
 @unexec if cmp -s %D/etc/netatalk.conf %D/etc/netatalk.conf.dist; then rm -f %D/etc/netatalk.conf; fi
 etc/netatalk.conf.dist
 @exec [ ! -f %B/netatalk.conf ] && cp %B/%f %B/netatalk.conf
 @unexec if cmp -s %D/etc/papd.conf %D/etc/papd.conf.dist; then rm -f %D/etc/papd.conf; fi
-etc/papd.conf.dist
-@exec [ ! -f %B/papd.conf ] && cp %B/%f %B/papd.conf
+%%APPLETALK%%etc/papd.conf.dist
+%%APPLETALK%%@exec [ ! -f %B/papd.conf ] && cp %B/%f %B/papd.conf
 libexec/netatalk-uams/uams_clrtxt.so
 libexec/netatalk-uams/uams_dhx.so
 libexec/netatalk-uams/uams_dhx2.so
@@ -108,6 +105,7 @@ include/atalk/list.h
 include/atalk/logger.h
 include/atalk/nbp.h
 include/atalk/netddp.h
+include/atalk/queue.h
 include/atalk/pap.h
 include/atalk/paths.h
 include/atalk/rtmp.h
@@ -146,7 +144,7 @@ libexec/ofpap
 libexec/ofwmpap
 libexec/ofwpap
 libexec/psa
-libexec/psf
+%%APPLETALK%%libexec/psf
 libexec/tfmpap
 libexec/tfmpaprev
 libexec/tfpap
@@ -156,10 +154,10 @@ libexec/tfwmpaprev
 libexec/tfwpap
 libexec/tfwpaprev
 sbin/afpd
-sbin/atalkd
+%%APPLETALK%%sbin/atalkd
 sbin/cnid_dbd
 sbin/cnid_metad
-sbin/papd
+%%APPLETALK%%sbin/papd
 %%TIMELORD%%sbin/timelord
 share/aclocal/netatalk.m4
 %%DATADIR%%/pagecount.ps