7 files changed, 6 insertions, 130 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 60525b070ae0..7c70088da862 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	2.2.0
-PORTREVISION=	3
+PORTVERSION=	2.2.1
 PORTEPOCH=	1
 CATEGORIES=	net print
-MASTER_SITES=	SF/netatalk/netatalk/2.2
+MASTER_SITES=	SF
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	File server for Mac OS X
@@ -45,7 +44,7 @@ FILES=		AppleVolumes.default AppleVolumes.system afpd.conf netatalk.conf
 LINKS=		unbin unhex unsingle hqx2bin single2bin macbinary \
 		binheader nadheader
 MAN1=		ad.1 afpldaptest.1 afppasswd.1 apple_dump.1 asip-status.pl.1 \
-		dbd.1 hqx2bin.1 macbinary.1 megatron.1 \
+		dbd.1 hqx2bin.1 macbinary.1 macusers.1 megatron.1 \
 		netatalk-config.1 single2bin.1 unbin.1 unhex.1 uniconv.1 \
 		unsingle.1
 MAN5=		AppleVolumes.5 AppleVolumes.default.5 \
@@ -103,6 +102,7 @@ PLIST_SUB+=		TIMELORD="@comment "
 
 .if defined (WITH_ZEROCONF)
 CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
+CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LIB_DEPENDS+=		avahi-client.3:${PORTSDIR}/net/avahi-app
 USE_GNOME+=		pkgconfig
 SUB_LIST+=		ZEROCONF="avahi_daemon"
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 6866c0e0d6c5..1a3d5cbb562d 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netatalk-2.2.0.tar.bz2) = 31bf7c1ea311f876d9be6d4be9faed24d170a89e6ce692304fc2cb525f25143b
-SIZE (netatalk-2.2.0.tar.bz2) = 1216174
+SHA256 (netatalk-2.2.1.tar.bz2) = 3ab81c6335f8c33fd01ae599459a26c8cfe3b975009ce73640cae823ddc78bbf
+SIZE (netatalk-2.2.1.tar.bz2) = 1227602
diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure
index 51d9f7fadadf..addf52b610e2 100644
--- a/net/netatalk/files/patch-configure
+++ b/net/netatalk/files/patch-configure
@@ -1,22 +1,5 @@
 --- configure.orig	2011-07-27 07:59:28.000000000 -0400
 +++ configure	2011-08-01 03:26:25.000000000 -0400
-@@ -27039,6 +27039,7 @@ fi
- 
-         savedcflags="$CFLAGS"
-         savedldflags="$LDFLAGS"
-+        saved_CPPFLAGS="$CPPFLAGS"
- 	ICONV_CFLAGS=""
- 	ICONV_LIBS=""
- 
-@@ -28265,6 +28266,8 @@ echo "$as_me: error: internal error, ata
- 	if test "x$zeroconf" != "xno"; then
- 		savedcppflags="$CPPFLAGS"
- 		savedldflags="$LDFLAGS"
-+		CPPFLAGS="-I%%LOCALBASE%%/include $CPPFLAGS"
-+		LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
- 
- 		if test "x$zeroconf" = "xyes" -o "x$zeroconf" = "xtry"; then
- 			zeroconf_dir="/usr"
 @@ -31357,7 +31360,7 @@ if test "x$bdb_required" = "xyes"; then
      trybdbdir=""
      dobdbsearch=yes
@@ -26,12 +9,3 @@
  
      bdbfound=no
      savedcflags="$CFLAGS"
-@@ -33387,7 +33390,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
deleted file mode 100644
index 5d67bc65ffd3..000000000000
--- a/net/netatalk/files/patch-etc_afpd_acls.c
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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
deleted file mode 100644
index c2c6b268b412..000000000000
--- a/net/netatalk/files/patch-etc_afpd_afp_asp.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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_cnid_dbd_comm.c b/net/netatalk/files/patch-etc_cnid_dbd_comm.c
deleted file mode 100644
index e6fce5b6a49f..000000000000
--- a/net/netatalk/files/patch-etc_cnid_dbd_comm.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/files/patch-include_atalk_dsi.h b/net/netatalk/files/patch-include_atalk_dsi.h
deleted file mode 100644
index 28885f0fdaac..000000000000
--- a/net/netatalk/files/patch-include_atalk_dsi.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/atalk/dsi.h.orig	2010-06-09 18:46:15.000000000 -0400
-+++ include/atalk/dsi.h	2010-06-09 18:44:22.000000000 -0400
-@@ -11,6 +11,7 @@
- #include <sys/time.h>
- #include <signal.h>
- 
-+#include <sys/socket.h>
- #include <netinet/in.h>
- #include <atalk/afp.h>
- #include <atalk/server_child.h>