Index: head/net/netatalk3/pkg-message =================================================================== --- head/net/netatalk3/pkg-message (revision 424188) +++ head/net/netatalk3/pkg-message (nonexistent) @@ -1,10 +0,0 @@ -### -If you compiled with optional PAM support, you need to create a pam.d -file called `netatalk'. With the following contents: - -%PAM-1.0 -auth include system -account include system -password include system -session include system -### Property changes on: head/net/netatalk3/pkg-message ___________________________________________________________________ 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/Makefile =================================================================== --- head/net/netatalk3/Makefile (revision 424188) +++ head/net/netatalk3/Makefile (revision 424189) @@ -1,90 +1,97 @@ # Created by: stb # $FreeBSD$ PORTNAME= netatalk PORTVERSION= 3.1.10 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF PKGNAMESUFFIX= 3 MAINTAINER= marcus@FreeBSD.org COMMENT= File server for Mac OS X LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libevent.so:devel/libevent2 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} \ --with-uams-path=${PREFIX}/libexec/netatalk-uams \ --with-bdb=${LOCALBASE} \ ${ICONV_CONFIGURE_BASE} \ --localstatedir=/var \ --disable-bundled-libevent \ --with-libevent-header=${LOCALBASE}/include \ --with-libevent-lib=${LOCALBASE}/lib \ --with-ssl-dir=${OPENSSLBASE} \ --without-dtrace OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP OPTIONS_DEFAULT=AVAHI DBUS KERBEROS LIBWRAP OPTIONS_RADIO=ZEROCONF OPTIONS_RADIO_ZEROCONF=AVAHI MDNSRESPONDER ZEROCONF_DESC= Zeroconf(Bonjour) support MYSQL_DESC= Enable MySQL CNID backend support SENDFILE_DESC= Enable Sendfile support ACL_DESC= Enable ACL support OPTIONS_SUB= yes KERBEROS5_CONFIGURE_ON= --enable-krbV-uam 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_CONFIGURE_ENV= ac_cv_lib_avahi_client_avahi_client_new=no 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 CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit-[0-9]* +.include + 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 @${REINPLACE_CMD} -e 's|%%PYTHONCMD%%|${PYTHONCMD}|' \ ${WRKSRC}/contrib/shell_utils/afpstats post-install: ${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \ ${STAGEDIR}${PREFIX}/bin/macusers -.include +.if ${PORT_OPTIONS:MPAM} + ${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/netatalk.sample +.endif + +.include Index: head/net/netatalk3/files/pam.conf =================================================================== --- head/net/netatalk3/files/pam.conf (nonexistent) +++ head/net/netatalk3/files/pam.conf (revision 424189) @@ -0,0 +1,17 @@ +# +# $FreeBSD$ +# +# PAM configuration for the "netatalk" service +# + +# auth +auth include system + +# account +account include system + +# password +password include system + +# session +session include system Property changes on: head/net/netatalk3/files/pam.conf ___________________________________________________________________ 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 424188) +++ head/net/netatalk3/pkg-plist (revision 424189) @@ -1,89 +1,89 @@ 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 @sample etc/afp.conf.sample %%DBUS%%etc/dbus-1/system.d/netatalk-dbus.conf %%DBUS%%etc/dbus-session.conf.netatalk @sample etc/extmap.conf.sample -%%PAM%%etc/pam.d/netatalk +%%PAM%%@sample etc/pam.d/netatalk.sample libexec/netatalk-uams/uams_clrtxt.so libexec/netatalk-uams/uams_dhx.so libexec/netatalk-uams/uams_dhx2.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 %%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 %%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 %%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 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.18 lib/libatalk.so.18.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 /var/netatalk/CNID/README /var/netatalk/README @dir /var/netatalk/CNID @dir /var/netatalk