From owner-svn-ports-head@freebsd.org Wed Jul 20 15:56:34 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44FA2B9ED4C; Wed, 20 Jul 2016 15:56:34 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F6E8199C; Wed, 20 Jul 2016 15:56:34 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6KFuX3i088446; Wed, 20 Jul 2016 15:56:33 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6KFuWDX088438; Wed, 20 Jul 2016 15:56:32 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201607201556.u6KFuWDX088438@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Wed, 20 Jul 2016 15:56:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418842 - in head/net/netatalk3: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jul 2016 15:56:34 -0000 Author: marcus Date: Wed Jul 20 15:56:32 2016 New Revision: 418842 URL: https://svnweb.freebsd.org/changeset/ports/418842 Log: Update to 3.1.9 and normalize patches. See http://netatalk.sourceforge.net/3.1/ReleaseNotes3.1.9.html for changes in this release. Added: head/net/netatalk3/files/patch-etc_afpd_Makefile.in (contents, props changed) head/net/netatalk3/files/patch-etc_afpd_volume.c (contents, props changed) head/net/netatalk3/files/patch-etc_cnid__dbd_cnid__metad.c (contents, props changed) Deleted: head/net/netatalk3/files/patch-etc_apfd_Makefile.in head/net/netatalk3/files/patch-etc_cnid_dbd_cnid_metad.c head/net/netatalk3/files/patch-include_atalk_acl.h Modified: head/net/netatalk3/Makefile head/net/netatalk3/distinfo head/net/netatalk3/files/patch-config_Makefile.in head/net/netatalk3/files/patch-libatalk_vfs_extattr.c Modified: head/net/netatalk3/Makefile ============================================================================== --- head/net/netatalk3/Makefile Wed Jul 20 15:36:05 2016 (r418841) +++ head/net/netatalk3/Makefile Wed Jul 20 15:56:32 2016 (r418842) @@ -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=${PRE --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 Modified: head/net/netatalk3/distinfo ============================================================================== --- head/net/netatalk3/distinfo Wed Jul 20 15:36:05 2016 (r418841) +++ head/net/netatalk3/distinfo Wed Jul 20 15:56:32 2016 (r418842) @@ -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 Modified: head/net/netatalk3/files/patch-config_Makefile.in ============================================================================== --- head/net/netatalk3/files/patch-config_Makefile.in Wed Jul 20 15:36:05 2016 (r418841) +++ head/net/netatalk3/files/patch-config_Makefile.in Wed Jul 20 15:56:32 2016 (r418842) @@ -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 \ Added: head/net/netatalk3/files/patch-etc_afpd_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/netatalk3/files/patch-etc_afpd_Makefile.in Wed Jul 20 15:56:32 2016 (r418842) @@ -0,0 +1,20 @@ +--- 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 = +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +@@ -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@ \ +- @GSSAPI_LIBS@ @KRB5_LIBS@ @MYSQL_LIBS@ $(am__append_2) \ ++ @GSSAPI_LIBS@ @KRB5_LIBS@ @MYSQL_LIBS@ @PAM_LIBS@ $(am__append_2) \ + $(am__append_10) + afpd_LDFLAGS = -export-dynamic $(am__append_9) + afpd_CFLAGS = @GSSAPI_CFLAGS@ @KRB5_CFLAGS@ @PTHREAD_CFLAGS@ \ Added: head/net/netatalk3/files/patch-etc_afpd_volume.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/netatalk3/files/patch-etc_afpd_volume.c Wed Jul 20 15:56:32 2016 (r418842) @@ -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) Added: head/net/netatalk3/files/patch-etc_cnid__dbd_cnid__metad.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/netatalk3/files/patch-etc_cnid__dbd_cnid__metad.c Wed Jul 20 15:56:32 2016 (r418842) @@ -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 + #include + #include ++#include + #include + #include + #include Modified: head/net/netatalk3/files/patch-libatalk_vfs_extattr.c ============================================================================== --- head/net/netatalk3/files/patch-libatalk_vfs_extattr.c Wed Jul 20 15:36:05 2016 (r418841) +++ head/net/netatalk3/files/patch-libatalk_vfs_extattr.c Wed Jul 20 15:56:32 2016 (r418842) @@ -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) {