Index: Makefile =================================================================== --- Makefile +++ Makefile @@ -3,6 +3,7 @@ PORTNAME= netatalk PORTVERSION= 3.1.9 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF @@ -16,10 +17,11 @@ LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libevent.so:devel/libevent2 -USES= iconv gmake pkgconfig perl5 libtool tar:bzip2 bdb:5+ ssl +USES= bdb:5+ gettext gmake iconv libtool perl5 pkgconfig ssl tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= netatalk +INSTALL_TARGET=install-strip CONFIGURE_ARGS+= --with-pkgconfdir=${PREFIX}/etc \ --with-libgcrypt-dir=${LOCALBASE} \ @@ -32,128 +34,61 @@ --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 +OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP ZEROCONF +OPTIONS_DEFAULT=KERBEROS DBUS LIBWRAP 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 +ZEROCONF_IMPLIES=AVAHI +ZEROCONF_DESC= Zeroconf(Bonjour) support MYSQL_DESC= Enable MySQL CNID backend support SENDFILE_DESC= Enable Sendfile support ACL_DESC= Enable ACL support -TCPWRAP_DESC= Enable TCP Wrappers support +OPTIONS_SUB= yes +KERBEROS5_CONFIGURE_ON= --enable-krbV-uam +DTRACE_CONFIGURE_WITH= dtrace +DTRACE_BROKEN= "Doesn't compile in FreeBSD" +KERBEROS_CONFIGURE_WITH=kerberos +KERBEROS_LIB_DEPENDS=libgpg-error.so:security/libgpg-error +PAM_CONFIGURE_WITH=pam +ZEROCONF_CONFIGURE_OFF= --disable-zeroconf +AVAHI_CONFIGURE_ON= --enable-zeroconf=${LOCALBASE} +AVAHI_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib +AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app +MDNSRESPONDER_CONFIGURE_ON= --enable-zeroconf=${LOCALBASE} +MDNSRESPONDER_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib +MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder +LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} +LDAP_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_OFF= --without-ldap +SENDFILE_CONFIGURE_ENABLE=sendfile +DBUS_USES= python:2 +DBUS_USE= GNOME=glib20 +DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ + libdbus-1.so:devel/dbus +DBUS_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus +MYSQL_USE= MYSQL=yes +MYSQL_CONFIGURE_OFF=--with-mysql-config=/nonexistent +ACL_LIB_DEPENDS= libsunacl.so:sysutils/libsunacl +ACL_CONFIGURE_WITH=acls +LIBWRAP_CONFIGURE_ENABLE=tcp-wrappers -.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: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: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) -USES+= python:2 -LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dbus/_dbus.py: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: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 - 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 + @${REINPLACE_CMD} -e 's|\.dist|\.sample|g' \ + ${WRKSRC}/config/Makefile.in -post-stage: - @${RM} -f ${STAGEDIR}${PREFIX}/etc/afp.conf \ - ${STAGEDIR}${PREFIX}/etc/extmap.conf - 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 +post-install-PAM-on: + ${INSTALL_DATA} ${PATCHDIR}/netatalk \ + ${STAGEDIR}${PREFIX}/etc/pam.d/netatalk + .include Index: files/patch-configure =================================================================== --- files/patch-configure +++ files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2015-12-28 21:02:04.000000000 -0500 -+++ configure 2015-12-31 12:34:21.340885027 -0500 -@@ -17342,7 +17342,7 @@ if test "x$bdb_required" = "xyes"; then +--- configure.orig 2016-06-22 09:01:46 UTC ++++ configure +@@ -17356,7 +17356,7 @@ if test "x$bdb_required" = "xyes"; then trybdbdir="" dobdbsearch=yes bdb_search_dirs="/usr/local /usr" Index: files/patch-etc_afpd_volume.c =================================================================== --- files/patch-etc_afpd_volume.c +++ files/patch-etc_afpd_volume.c @@ -1,4 +1,4 @@ ---- etc/afpd/volume.c.orig 2016-07-20 13:19:58 UTC +--- etc/afpd/volume.c.orig 2016-06-06 11:24:38 UTC +++ etc/afpd/volume.c @@ -380,7 +380,11 @@ static int getvolparams(const AFPObj *ob ashort |= VOLPBIT_ATTR_UNIXPRIV; Index: pkg-install =================================================================== --- pkg-install +++ pkg-install @@ -6,9 +6,6 @@ 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 Index: pkg-plist =================================================================== --- pkg-plist +++ pkg-plist @@ -8,27 +8,28 @@ bin/dbd bin/macusers bin/netatalk-config -@sample etc/afp.conf.dist etc/afp.conf +@sample etc/afp.conf.sample %%DBUS%%etc/dbus-1/system.d/netatalk-dbus.conf %%DBUS%%etc/dbus-session.conf.netatalk -@sample etc/extmap.conf.dist etc/extmap.conf +@sample etc/extmap.conf.sample +%%PAM%%etc/pam.d/netatalk 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 +%%PAM%%libexec/netatalk-uams/uams_dhx2_pam.a +%%PAM%%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 +%%PAM%%libexec/netatalk-uams/uams_dhx_pam.a +%%PAM%%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 +%%KERBEROS5%%libexec/netatalk-uams/uams_gss.a +%%KERBEROS5%%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 +%%PAM%%libexec/netatalk-uams/uams_pam.a +%%PAM%%libexec/netatalk-uams/uams_pam.so libexec/netatalk-uams/uams_passwd.a libexec/netatalk-uams/uams_passwd.so libexec/netatalk-uams/uams_randnum.a