Index: head/net/netatalk3/Makefile =================================================================== --- head/net/netatalk3/Makefile (revision 363215) +++ head/net/netatalk3/Makefile (revision 363216) @@ -1,162 +1,161 @@ # Created by: stb # $FreeBSD$ PORTNAME= netatalk -PORTVERSION= 3.1.2 -PORTREVISION= 1 +PORTVERSION= 3.1.3 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF #MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/3.1 PKGNAMESUFFIX= 3 MAINTAINER= marcus@FreeBSD.org COMMENT= File server for Mac OS X LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libevent.so:${PORTSDIR}/devel/libevent2 USE_BDB= 5+ USES= iconv gmake pkgconfig perl5 libtool tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= netatalk CONFIGURE_ARGS+= --with-pkgconfdir=${PREFIX}/etc \ --with-libgcrypt-dir=${LOCALBASE} \ --with-uams-path=${PREFIX}/libexec/netatalk-uams \ --with-bdb=${LOCALBASE} \ ${ICONV_CONFIGURE_BASE} \ --localstatedir=/var \ --disable-bundled-libevent \ --with-libevent-header=${LOCALBASE}/include -OPTIONS_DEFINE=PAM KRB5 LDAP SENDFILE KERBEROS DTRACE DBUS MYSQL ACL TCPWRAP +OPTIONS_DEFINE=PAM KRB5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL TCPWRAP OPTIONS_DEFAULT=KERBEROS DBUS TCPWRAP OPTIONS_RADIO=ZEROCONF OPTIONS_RADIO_ZEROCONF=AVAHI MDNSRESPONDER OPTIONS_DEFAULT+=AVAHI NOZEROCONF_DESC=Disable Zeroconf(Bonjour) support KRB5_DESC= Enable Kerberos V UAM -DTRACE_DESC= Enable DTrace support +#DTRACE_DESC= Enable DTrace support MYSQL_DESC= Enable MySQL CNID backend support SENDFILE_DESC= Enable Sendfile support ACL_DESC= Enable ACL support TCPWRAP_DESC= Enable TCP Wrappers support .include CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit-[0-9]* .if ${PORT_OPTIONS:MKRB5} CONFIGURE_ARGS+= --enable-krbV-uam PLIST_SUB+= NETATALKKRB5="" .else PLIST_SUB+= NETATALKKRB5="@comment " .endif .if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+= --with-dtrace .else CONFIGURE_ARGS+= --without-dtrace .endif .if ${PORT_OPTIONS:MKERBEROS} CONFIGURE_ARGS+= --with-kerberos .else CONFIGURE_ARGS+= --without-kerberos .endif .if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+= --with-pam PLIST_SUB+= NETATALKPAM="" .else CONFIGURE_ARGS+= --without-pam PLIST_SUB+= NETATALKPAM="@comment " .endif .if ${PORT_OPTIONS:MNOZEROCONF} CONFIGURE_ARGS+= --disable-zeroconf SUB_LIST+= ZEROCONF="" .endif .if ${PORT_OPTIONS:MAVAHI} CONFIGURE_ARGS+= --enable-zeroconf=${LOCALBASE} CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app SUB_LIST+= ZEROCONF="avahi_daemon" .endif .if ${PORT_OPTIONS:MMDNSRESPONDER} CONFIGURE_ARGS+= --enable-zeroconf=${LOCALBASE} CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder SUB_LIST+= ZEROCONF="mdnsd" .endif .if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+= --with-ldap=${LOCALBASE} CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib USE_OPENLDAP= yes .else CONFIGURE_ARGS+= --without-ldap .endif .if ${PORT_OPTIONS:MSENDFILE} CONFIGURE_ARGS+= --enable-sendfile .else CONFIGURE_ARGS+= --disable-sendfile .endif .if ${PORT_OPTIONS:MDBUS} || exists(${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc) LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus PLIST_SUB+= DBUS="" .else PLIST_SUB+= DBUS="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes .else CONFIGURE_ARGS+=--with-mysql-config=/nonexistent .endif .if ${PORT_OPTIONS:MACL} LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl CONFIGURE_ARGS+=--with-acls .else CONFIGURE_ARGS+=--without-acls .endif .if ${PORT_OPTIONS:MTCPWRAP} CONFIGURE_ARGS+=--enable-tcp-wrappers .else CONFIGURE_ARGS+=--disable-tcp-wrappers .endif .if ${OSVERSION} < 800031 PLIST_SUB+= ATFUNCS="@comment " .else PLIST_SUB+= ATFUNCS="" .endif post-patch: @${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \ s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/configure post-install: ${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \ ${STAGEDIR}${PREFIX}/bin/macusers [ -f ${STAGEDIR}${PREFIX}/etc/afp.conf ] || \ ${INSTALL_DATA} -c ${STAGEDIR}${PREFIX}/etc/afp.conf.dist ${STAGEDIR}${PREFIX}/etc/afp.conf [ -f ${STAGEDIR}${PREFIX}/etc/extmap.conf ] || \ ${INSTALL_DATA} -c ${STAGEDIR}${PREFIX}/etc/extmap.conf.dist ${STAGEDIR}${PREFIX}/etc/extmap.conf @${CAT} ${PKGMESSAGE} .include Index: head/net/netatalk3/distinfo =================================================================== --- head/net/netatalk3/distinfo (revision 363215) +++ head/net/netatalk3/distinfo (revision 363216) @@ -1,2 +1,2 @@ -SHA256 (netatalk-3.1.2.tar.bz2) = 040b6e9add6ad9f2a0a9a58f5f1381ee5e6b9a60e7610f6722747c834f1de990 -SIZE (netatalk-3.1.2.tar.bz2) = 1785777 +SHA256 (netatalk-3.1.3.tar.bz2) = e19d289400d7c9600653e2e6155506c00bbd4f5b6fe45f2e53b1843fe15f6b37 +SIZE (netatalk-3.1.3.tar.bz2) = 1823258 Index: head/net/netatalk3/files/patch-libatalk_adouble_ad_open.c =================================================================== --- head/net/netatalk3/files/patch-libatalk_adouble_ad_open.c (revision 363215) +++ head/net/netatalk3/files/patch-libatalk_adouble_ad_open.c (nonexistent) @@ -1,11 +0,0 @@ ---- libatalk/adouble/ad_open.c.orig 2014-05-27 12:33:15.000000000 -0400 -+++ libatalk/adouble/ad_open.c 2014-05-27 12:34:00.000000000 -0400 -@@ -586,7 +586,7 @@ static int ad_convert_osx(const char *pa - - origlen = ad_getentryoff(ad, ADEID_RFORK) + ad_getentrylen(ad, ADEID_RFORK); - -- map = mmap(NULL, origlen, PROT_WRITE, MAP_SHARED, ad_reso_fileno(ad), 0); -+ map = mmap(NULL, origlen, PROT_READ | PROT_WRITE, MAP_SHARED, ad_reso_fileno(ad), 0); - if (map == MAP_FAILED) { - LOG(log_error, logtype_ad, "mmap AppleDouble: %s\n", strerror(errno)); - EC_FAIL; Property changes on: head/net/netatalk3/files/patch-libatalk_adouble_ad_open.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/netatalk3/files/patch-etc_apfd_Makefile.in =================================================================== --- head/net/netatalk3/files/patch-etc_apfd_Makefile.in (revision 363215) +++ head/net/netatalk3/files/patch-etc_apfd_Makefile.in (revision 363216) @@ -1,20 +1,20 @@ ---- etc/afpd/Makefile.in.orig 2014-03-13 07:33:40.000000000 -0400 -+++ etc/afpd/Makefile.in 2014-03-17 15:02:55.000000000 -0400 -@@ -141,7 +141,7 @@ spot_DEPENDENCIES = $(top_builddir)/liba - spot_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(spot_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ +--- etc/afpd/Makefile.in.orig 2014-07-03 03:56:14.000000000 -0400 ++++ etc/afpd/Makefile.in 2014-07-28 10:51:17.000000000 -0400 +@@ -198,7 +198,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 -@@ -404,7 +404,7 @@ afpd_SOURCES = afp_avahi.c afp_config.c +@@ -479,7 +479,7 @@ afpd_SOURCES = afp_avahi.c afp_config.c 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@ \ - @MYSQL_LIBS@ $(am__append_7) + @MYSQL_LIBS@ @PAM_LIBS@ $(am__append_7) afpd_LDFLAGS = -export-dynamic $(am__append_6) afpd_CFLAGS = @ZEROCONF_CFLAGS@ @GSSAPI_CFLAGS@ @KRB5_CFLAGS@ \ @PTHREAD_CFLAGS@ -DAPPLCNAME -DSERVERTEXT=\"$(SERVERTEXT)/\" \ Index: head/net/netatalk3/files/patch-include_atalk_acl.h =================================================================== --- head/net/netatalk3/files/patch-include_atalk_acl.h (nonexistent) +++ head/net/netatalk3/files/patch-include_atalk_acl.h (revision 363216) @@ -0,0 +1,10 @@ +--- 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 */ Property changes on: head/net/netatalk3/files/patch-include_atalk_acl.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/netatalk3/pkg-plist =================================================================== --- head/net/netatalk3/pkg-plist (revision 363215) +++ head/net/netatalk3/pkg-plist (revision 363216) @@ -1,94 +1,94 @@ %%ATFUNCS%%bin/ad bin/afpldaptest bin/afppasswd %%DBUS%%bin/afpstats bin/apple_dump bin/asip-status.pl bin/cnid2_create bin/dbd bin/macusers bin/netatalk-config @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 %%DBUS%%etc/dbus-1/system.d/netatalk-dbus.conf %%DBUS%%etc/dbus-session.conf.netatalk @unexec if cmp -s %D/etc/extmap.conf %D/etc/extmap.conf.dist; then rm -f %D/etc/extmap.conf; fi etc/extmap.conf.dist @exec [ -f %B/extmap.conf ] || cp %B/%f %B/extmap.conf libexec/netatalk-uams/uams_clrtxt.so libexec/netatalk-uams/uams_dhx.so libexec/netatalk-uams/uams_dhx2.so %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx2_pam.a %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx2_pam.so libexec/netatalk-uams/uams_dhx2_passwd.a libexec/netatalk-uams/uams_dhx2_passwd.so %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.a %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.so libexec/netatalk-uams/uams_dhx_passwd.a libexec/netatalk-uams/uams_dhx_passwd.so %%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.a %%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.so libexec/netatalk-uams/uams_guest.a libexec/netatalk-uams/uams_guest.so %%NETATALKPAM%%libexec/netatalk-uams/uams_pam.a %%NETATALKPAM%%libexec/netatalk-uams/uams_pam.so libexec/netatalk-uams/uams_passwd.a libexec/netatalk-uams/uams_passwd.so libexec/netatalk-uams/uams_randnum.a libexec/netatalk-uams/uams_randnum.so include/atalk/acl.h include/atalk/adouble.h include/atalk/afp.h include/atalk/bstrlib.h include/atalk/cnid.h include/atalk/compat.h include/atalk/dictionary.h include/atalk/ea.h include/atalk/globals.h include/atalk/hash.h include/atalk/iniparser.h include/atalk/list.h include/atalk/logger.h include/atalk/netatalk_conf.h include/atalk/paths.h include/atalk/standards.h include/atalk/uam.h include/atalk/unicode.h include/atalk/unix.h include/atalk/util.h include/atalk/vfs.h include/atalk/volume.h lib/libatalk.a lib/libatalk.so -lib/libatalk.so.14 -lib/libatalk.so.14.0.0 +lib/libatalk.so.15 +lib/libatalk.so.15.0.0 man/man1/ad.1.gz man/man1/afpldaptest.1.gz man/man1/afppasswd.1.gz %%DBUS%%man/man1/afpstats.1.gz man/man1/apple_dump.1.gz man/man1/asip-status.pl.1.gz man/man1/dbd.1.gz man/man1/macusers.1.gz man/man1/netatalk-config.1.gz man/man1/uniconv.1.gz man/man5/afp.conf.5.gz man/man5/afp_signature.conf.5.gz man/man5/afp_voluuid.conf.5.gz man/man5/extmap.conf.5.gz man/man8/afpd.8.gz man/man8/cnid_dbd.8.gz man/man8/cnid_metad.8.gz man/man8/netatalk.8.gz sbin/afpd sbin/cnid_dbd sbin/cnid_metad sbin/netatalk share/aclocal/netatalk.m4 @dirrm include/atalk @dirrm libexec/netatalk-uams @unexec rm -f /var/netatalk/CNID/README @unexec rm -f /var/netatalk/README @unexec rmdir /var/netatalk/CNID 2>/dev/null || true @unexec rmdir /var/netatalk 2>/dev/null || true