Date: Mon, 1 Apr 2013 23:57:53 GMT From: Douglas Carmichael <dcarmich@dcarmichael.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/177569: I have updated net/netatalk3 to version 3.0.3 Message-ID: <201304012357.r31NvrZM063066@red.freebsd.org> Resent-Message-ID: <201304020000.r32001UX036810@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177569
>Category: ports
>Synopsis: I have updated net/netatalk3 to version 3.0.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 02 00:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Douglas Carmichael
>Release: 9.1-RELEASE
>Organization:
n/a
>Environment:
FreeBSD dc-freebsd 9.1-RELEASE-p1 FreeBSD 9.1-RELEASE-p1 #1: Tue Feb 19 17:44:00 CST 2013 root@dc-freebsd:/usr/src/sys/amd64/compile/VMWARE91-64 amd64
>Description:
I have updated net/netatalk3 to version 3.0.3.
A patch is attached.
>How-To-Repeat:
n/a
>Fix:
A patch is attached.
Patch attached with submission follows:
diff -ruN netatalk3.orig/Makefile netatalk3/Makefile
--- netatalk3.orig/Makefile 2013-02-04 02:17:11.000000000 -0600
+++ netatalk3/Makefile 2013-04-01 18:13:41.000000000 -0500
@@ -2,11 +2,11 @@
# Date created: 23 Jul 1997
# Whom: stb
#
-# $FreeBSD: ports/net/netatalk3/Makefile,v 1.11 2013/01/13 02:42:19 svnexp Exp $
+# $FreeBSD: ports/net/netatalk3/Makefile,v 1.13 2013/02/25 04:59:50 svnexp Exp $
#
PORTNAME= netatalk
-PORTVERSION= 3.0.1
+PORTVERSION= 3.0.3
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
@@ -46,13 +46,15 @@
KRB5 "Enable Kerberos V UAM" off \
ZEROCONF "Enable Zeroconf (Bonjour) support" on \
LDAP "Enable LDAP support" off \
+ DTRACE "Enable DTrace support" off \
SENDFILE "Enable sendfile support" off \
KERBEROS "Enable Kerberos support" on
MAN1= ad.1 afpldaptest.1 afppasswd.1 apple_dump.1 asip-status.pl.1 \
dbd.1 macusers.1 \
netatalk-config.1 uniconv.1
-MAN5= afp.conf.5 afp_signature.conf.5 afp_voluuid.conf.5
+MAN5= afp.conf.5 afp_signature.conf.5 afp_voluuid.conf.5 \
+ extmap.conf.5
MAN8= afpd.8 cnid_dbd.8 cnid_metad.8 netatalk.8
CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit-[0-9]*
@@ -66,6 +68,12 @@
PLIST_SUB+= NETATALKKRB5="@comment "
.endif
+.if defined (WITH_DTRACE)
+CONFIGURE_ARGS+= --with-dtrace
+.else
+CONFIGURE_ARGS+= --without-dtrace
+.endif
+
.if defined (WITH_KERBEROS)
CONFIGURE_ARGS+= --with-kerberos
.else
@@ -122,6 +130,8 @@
${PREFIX}/bin/macusers
[ -f ${PREFIX}/etc/afp.conf ] || \
${INSTALL_DATA} -c ${PREFIX}/etc/afp.conf.dist ${PREFIX}/etc/afp.conf
+ [ -f ${PREFIX}/etc/extmap.conf ] || \
+ ${INSTALL_DATA} -c ${PREFIX}/etc/extmap.conf.dist ${PREFIX}/etc/extmap.conf
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff -ruN netatalk3.orig/distinfo netatalk3/distinfo
--- netatalk3.orig/distinfo 2013-02-04 02:17:11.000000000 -0600
+++ netatalk3/distinfo 2013-04-01 16:41:09.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (netatalk-3.0.1.tar.bz2) = 31f2a30d8eac0de5a8b8beddbd7b3418ba898a0d60b4d20c3ed6b568e91cc203
-SIZE (netatalk-3.0.1.tar.bz2) = 1633970
+SHA256 (netatalk-3.0.3.tar.bz2) = e15e30d54ea720dce527555cd1278947ecc22b4dbde051929204e3818cdd1325
+SIZE (netatalk-3.0.3.tar.bz2) = 1656819
diff -ruN netatalk3.orig/files/patch-config_Makefile.in netatalk3/files/patch-config_Makefile.in
--- netatalk3.orig/files/patch-config_Makefile.in 2013-02-04 02:17:11.000000000 -0600
+++ netatalk3/files/patch-config_Makefile.in 1969-12-31 18:00:00.000000000 -0600
@@ -1,38 +0,0 @@
---- config/Makefile.in.orig 2012-07-09 07:43:25.000000000 -0400
-+++ config/Makefile.in 2012-09-03 10:39:47.000000000 -0400
-@@ -704,8 +704,8 @@ install-data-local: install-config-files
-
- uninstall-local:
- for f in $(CONFFILES) $(GENFILES); do \
-- echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
-- rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
-+ echo rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
-+ rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
- done
- rm -f $(DESTDIR)$(localstatedir)/netatalk/README
- rm -f $(DESTDIR)$(localstatedir)/netatalk/CNID/README
-@@ -714,20 +714,12 @@ uninstall-local:
- install-config-files: $(CONFFILES) $(GENFILES)
- $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
- for f in $(CONFFILES) ; do \
-- if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
-- echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
-- $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgconfdir); \
-- else \
-- echo "not overwriting $$f"; \
-- fi; \
-+ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \
-+ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
- done
- for f in $(GENFILES); do \
-- if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
-- echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
-- $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \
-- else \
-- echo "not overwriting $$f"; \
-- fi; \
-+ echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \
-+ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
- done
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -ruN netatalk3.orig/files/patch-configure netatalk3/files/patch-configure
--- netatalk3.orig/files/patch-configure 2013-02-04 02:17:11.000000000 -0600
+++ netatalk3/files/patch-configure 1969-12-31 18:00:00.000000000 -0600
@@ -1,20 +0,0 @@
---- configure.orig 2012-04-26 10:27:12.000000000 -0400
-+++ configure 2012-07-08 21:21:38.000000000 -0400
-@@ -16127,7 +16127,7 @@ fi
- fi
-
- # mDNS support using mDNSResponder
-- ac_fn_c_check_header_mongrel "$LINENO" "dns_sd.h" "ac_cv_header_dns_sd_h" "$ac_includes_default"
-+ ac_fn_c_check_header_mongrel "$LINENO" "xxxdns_sd.hxxx" "ac_cv_header_dns_sd_h" "$ac_includes_default"
- if test "x$ac_cv_header_dns_sd_h" = xyes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DNSServiceRegister in -ldns_sd" >&5
- $as_echo_n "checking for DNSServiceRegister in -ldns_sd... " >&6; }
-@@ -18150,7 +18150,7 @@ if test "x$bdb_required" = "xyes"; then
- trybdbdir=""
- dobdbsearch=yes
- bdb_search_dirs="/usr/local /usr"
-- search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
-+ search_subdirs="/%%DB_NAME%% / /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
-
- bdbfound=no
- savedcflags="$CFLAGS"
diff -ruN netatalk3.orig/files/patch-etc_apfd_Makefile.in netatalk3/files/patch-etc_apfd_Makefile.in
--- netatalk3.orig/files/patch-etc_apfd_Makefile.in 2013-02-04 02:17:11.000000000 -0600
+++ netatalk3/files/patch-etc_apfd_Makefile.in 1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
---- etc/afpd/Makefile.in.orig 2012-07-09 07:43:26.000000000 -0400
-+++ etc/afpd/Makefile.in 2012-09-03 10:41:54.000000000 -0400
-@@ -370,7 +370,7 @@ afpd_SOURCES = afp_avahi.c afp_config.c
- $(am__append_1)
- afpd_LDADD = \
- $(top_builddir)/libatalk/libatalk.la \
-- @LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@ @KRB5_LIBS@
-+ @LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@ @KRB5_LIBS@ @PAM_LIBS@
-
- afpd_LDFLAGS = -export-dynamic
- afpd_CFLAGS = \
diff -ruN netatalk3.orig/files/patch-libatalk_util_netatalk_conf.c netatalk3/files/patch-libatalk_util_netatalk_conf.c
--- netatalk3.orig/files/patch-libatalk_util_netatalk_conf.c 2013-02-04 02:17:11.000000000 -0600
+++ netatalk3/files/patch-libatalk_util_netatalk_conf.c 1969-12-31 18:00:00.000000000 -0600
@@ -1,20 +0,0 @@
---- ./libatalk/util/netatalk_conf.c.orig 2013-01-07 12:21:30.309544508 +0000
-+++ ./libatalk/util/netatalk_conf.c 2013-01-07 12:23:22.360529479 +0000
-@@ -563,7 +563,7 @@
- EC_INIT;
- struct vol *volume = NULL;
- int i, suffixlen, vlen, tmpvlen, u8mvlen, macvlen;
-- char *tmpname;
-+ char tmpname[AFPVOL_U8MNAMELEN+1];
- ucs2_t u8mtmpname[(AFPVOL_U8MNAMELEN+1)*2], mactmpname[(AFPVOL_MACNAMELEN+1)*2];
- char suffix[6]; /* max is #FFFF */
- uint16_t flags;
-@@ -643,7 +643,7 @@
- EC_NULL( volume->v_maccodepage = strdup(obj->options.maccodepage) );
-
- vlen = strlen(name);
-- tmpname = strdup(name);
-+ strlcpy(tmpname, name, sizeof(tmpname));
- for(i = 0; i < vlen; i++)
- if(tmpname[i] == '/') tmpname[i] = ':';
-
diff -ruN netatalk3.orig/pkg-install netatalk3/pkg-install
--- netatalk3.orig/pkg-install 1969-12-31 18:00:00.000000000 -0600
+++ netatalk3/pkg-install 2013-02-24 22:59:50.000000000 -0600
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin
+
+DBDIR=/var/netatalk
+
+case $2 in
+ POST-INSTALL)
+ umask 22
+ mkdir -p $DBDIR/CNID
+ chown root:wheel $DBDIR $DBDIR/CNID
+ tee $DBDIR/README > $DBDIR/CNID/README <<-'EOF'
+ This directory contains modifiable Netatalk configuration files and the CNID databases.
+ EOF
+ ;;
+esac
diff -ruN netatalk3.orig/pkg-plist netatalk3/pkg-plist
--- netatalk3.orig/pkg-plist 2013-02-04 02:17:11.000000000 -0600
+++ netatalk3/pkg-plist 2013-04-01 18:53:03.000000000 -0500
@@ -8,9 +8,8 @@
bin/macusers
bin/netatalk-config
bin/uniconv
-@unexec if cmp -s %D/etc/afp.conf %D/etc/afp.conf.dist; then rm -f %D/etc/afp.conf; fi
-etc/afp.conf.dist
-@exec [ ! -f %B/afp.conf ] && cp %B/%f %B/afp.conf
+etc/afp.conf
+etc/extmap.conf
libexec/netatalk-uams/uams_clrtxt.so
libexec/netatalk-uams/uams_dhx.so
libexec/netatalk-uams/uams_dhx2.so
@@ -66,7 +65,7 @@
lib/libatalk.a
lib/libatalk.la
lib/libatalk.so
-lib/libatalk.so.2
+lib/libatalk.so.4
sbin/afpd
sbin/cnid_dbd
sbin/cnid_metad
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304012357.r31NvrZM063066>