Update to 3.1.9 and normalize patches.

See http://netatalk.sourceforge.net/3.1/ReleaseNotes3.1.9.html for changes in this release.

9 files changed, 42 insertions, 37 deletions

diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index b4b9b850285d..aecea4ea29bf 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netatalk
-PORTVERSION=	3.1.8
+PORTVERSION=	3.1.9
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
@@ -16,8 +16,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libevent.so:devel/libevent2
 
-USE_BDB=	5+
-USES=		iconv gmake pkgconfig perl5 libtool tar:bzip2
+USES=		iconv gmake pkgconfig perl5 libtool tar:bzip2 bdb:5+ ssl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	netatalk
@@ -30,7 +29,8 @@ CONFIGURE_ARGS+=	--with-pkgconfdir=${PREFIX}/etc \
 			--localstatedir=/var \
 			--disable-bundled-libevent \
 			--with-libevent-header=${LOCALBASE}/include \
-			--with-libevent-lib=${LOCALBASE}/lib
+			--with-libevent-lib=${LOCALBASE}/lib \
+			--with-ssl-dir=${OPENSSLBASE}
 
 OPTIONS_DEFINE=PAM KRB5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL TCPWRAP
 OPTIONS_DEFAULT=KERBEROS DBUS TCPWRAP
diff --git a/net/netatalk3/distinfo b/net/netatalk3/distinfo
index 07304c325b5d..ef636d050374 100644
--- a/net/netatalk3/distinfo
+++ b/net/netatalk3/distinfo
@@ -1,2 +1,3 @@
-SHA256 (netatalk-3.1.8.tar.bz2) = 34668d5f53b780e9f143c2d7ee06ebc1c2bd7758c60ca483c8b08da27dcc4d4c
-SIZE (netatalk-3.1.8.tar.bz2) = 1802404
+TIMESTAMP = 1469020005
+SHA256 (netatalk-3.1.9.tar.bz2) = 70db9c82e9e92bbf2083b9b322e58d2a8ddea9f09ac5204c18998439b7feb0d0
+SIZE (netatalk-3.1.9.tar.bz2) = 1801139
diff --git a/net/netatalk3/files/patch-config_Makefile.in b/net/netatalk3/files/patch-config_Makefile.in
index dd71e0aa3a38..fc87e9eea82e 100644
--- a/net/netatalk3/files/patch-config_Makefile.in
+++ b/net/netatalk3/files/patch-config_Makefile.in
@@ -1,6 +1,6 @@
---- config/Makefile.in.orig	2013-10-28 11:49:55.000000000 -0400
-+++ config/Makefile.in	2013-11-11 11:05:05.000000000 -0500
-@@ -790,8 +790,8 @@ install-data-local: install-config-files
+--- config/Makefile.in.orig	2016-06-22 09:01:44 UTC
++++ config/Makefile.in
+@@ -820,8 +820,8 @@ install-data-local: install-config-files
  
  uninstall-local:
  	@for f in $(CONFFILES) $(GENFILES); do \
@@ -11,7 +11,7 @@
  	done
  	rm -f $(DESTDIR)$(pkgconfdir)/dbus-session.conf
  	rm -f $(DESTDIR)$(localstatedir)/netatalk/README
-@@ -801,21 +801,16 @@ uninstall-local:
+@@ -831,21 +831,16 @@ uninstall-local:
  install-config-files: $(CONFFILES) $(GENFILES)
  	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
  	@for f in $(CONFFILES) ; do \
diff --git a/net/netatalk3/files/patch-etc_apfd_Makefile.in b/net/netatalk3/files/patch-etc_afpd_Makefile.in
index 572d277c6bb1..3a51c0f0cdb9 100644
--- a/net/netatalk3/files/patch-etc_apfd_Makefile.in
+++ b/net/netatalk3/files/patch-etc_afpd_Makefile.in
@@ -1,6 +1,6 @@
---- etc/afpd/Makefile.in.orig	2014-08-27 02:22:37.000000000 -0400
-+++ etc/afpd/Makefile.in	2014-09-07 11:59:30.000000000 -0400
-@@ -181,7 +181,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+--- etc/afpd/Makefile.in.orig	2016-06-22 09:01:44 UTC
++++ etc/afpd/Makefile.in
+@@ -186,7 +186,7 @@ AM_V_at = $(am__v_at_@AM_V@)
  am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
  am__v_at_0 = @
  am__v_at_1 = 
@@ -9,7 +9,7 @@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
  am__mv = mv -f
-@@ -459,7 +459,7 @@ afpd_SOURCES = afp_config.c afp_dsi.c af
+@@ -468,7 +468,7 @@ afpd_SOURCES = afp_config.c afp_dsi.c af
  	$(am__append_7)
  afpd_LDADD = $(top_builddir)/libatalk/libatalk.la @LIBGCRYPT_LIBS@ \
  	@QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @PTHREAD_LIBS@ \
diff --git a/net/netatalk3/files/patch-etc_afpd_volume.c b/net/netatalk3/files/patch-etc_afpd_volume.c
new file mode 100644
index 000000000000..5fecade00436
--- /dev/null
+++ b/net/netatalk3/files/patch-etc_afpd_volume.c
@@ -0,0 +1,14 @@
+--- etc/afpd/volume.c.orig	2016-07-20 13:19:58 UTC
++++ etc/afpd/volume.c
+@@ -380,7 +380,11 @@ static int getvolparams(const AFPObj *ob
+                         ashort |= VOLPBIT_ATTR_UNIXPRIV;
+                     if (vol->v_flags & AFPVOL_TM)
+                         ashort |= VOLPBIT_ATTR_TM;
++#ifdef HAVE_LDAP
+                     if (!ldap_config_valid || vol->v_flags & AFPVOL_NONETIDS)
++#else
++                    if (vol->v_flags & AFPVOL_NONETIDS)
++#endif
+                         ashort |= VOLPBIT_ATTR_NONETIDS;
+                     if (obj->afp_version >= 32) {
+                         if (vol->v_vfs_ea)
diff --git a/net/netatalk3/files/patch-etc_cnid__dbd_cnid__metad.c b/net/netatalk3/files/patch-etc_cnid__dbd_cnid__metad.c
new file mode 100644
index 000000000000..e5788547b681
--- /dev/null
+++ b/net/netatalk3/files/patch-etc_cnid__dbd_cnid__metad.c
@@ -0,0 +1,10 @@
+--- etc/cnid_dbd/cnid_metad.c.orig	2016-06-06 11:21:51 UTC
++++ etc/cnid_dbd/cnid_metad.c
+@@ -39,6 +39,7 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <sys/types.h>
++#include <sys/resource.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/wait.h>
diff --git a/net/netatalk3/files/patch-etc_cnid_dbd_cnid_metad.c b/net/netatalk3/files/patch-etc_cnid_dbd_cnid_metad.c
deleted file mode 100644
index e83a11997d16..000000000000
--- a/net/netatalk3/files/patch-etc_cnid_dbd_cnid_metad.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/netatalk3/files/patch-include_atalk_acl.h b/net/netatalk3/files/patch-include_atalk_acl.h
deleted file mode 100644
index 22d69aa3c152..000000000000
--- a/net/netatalk3/files/patch-include_atalk_acl.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/atalk/acl.h.orig	2014-07-28 11:01:46.000000000 -0400
-+++ include/atalk/acl.h	2014-07-28 11:01:58.000000000 -0400
-@@ -61,6 +61,7 @@ extern int remove_acl_vfs(const char *na
- #else /* HAVE_ACLS=no */
- 
- #define O_NETATALK_ACL 0
-+#define O_IGNORE 0
- #define chmod_acl chmod
- 
- #endif /* HAVE_ACLS */
diff --git a/net/netatalk3/files/patch-libatalk_vfs_extattr.c b/net/netatalk3/files/patch-libatalk_vfs_extattr.c
index f804823dd74d..02f7382f820e 100644
--- a/net/netatalk3/files/patch-libatalk_vfs_extattr.c
+++ b/net/netatalk3/files/patch-libatalk_vfs_extattr.c
@@ -1,6 +1,6 @@
---- libatalk/vfs/extattr.c.orig	2014-06-03 01:40:44.000000000 -0400
-+++ libatalk/vfs/extattr.c	2014-06-07 14:09:11.000000000 -0400
-@@ -193,6 +193,8 @@ ssize_t sys_fgetxattr (int filedes, cons
+--- libatalk/vfs/extattr.c.orig	2016-06-22 08:57:37 UTC
++++ libatalk/vfs/extattr.c
+@@ -194,6 +194,8 @@ ssize_t sys_fgetxattr (int filedes, cons
      const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
  
      if((retval=extattr_get_fd(filedes, attrnamespace, attrname, NULL, 0)) >= 0) {