Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Oct 2016 03:46:59 +0000 (UTC)
From:      Joe Marcus Clarke <marcus@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r423633 - in head/net/netatalk3: . files
Message-ID:  <201610100346.u9A3kxjb066281@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marcus
Date: Mon Oct 10 03:46:59 2016
New Revision: 423633
URL: https://svnweb.freebsd.org/changeset/ports/423633

Log:
  * Fix PAM installation [1]
  * Fix build with mDNSResponder [2]
  
  PR:		213349 [1]
  		213350 [2]

Added:
  head/net/netatalk3/files/netatalk.pam   (contents, props changed)
Deleted:
  head/net/netatalk3/pkg-message
Modified:
  head/net/netatalk3/Makefile

Modified: head/net/netatalk3/Makefile
==============================================================================
--- head/net/netatalk3/Makefile	Mon Oct 10 03:46:19 2016	(r423632)
+++ head/net/netatalk3/Makefile	Mon Oct 10 03:46:59 2016	(r423633)
@@ -34,12 +34,10 @@ CONFIGURE_ARGS+=	--with-pkgconfdir=${PRE
 			--with-ssl-dir=${OPENSSLBASE} \
 			--without-dtrace
 
-OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP \
-	       ZEROCONF
-OPTIONS_DEFAULT=KERBEROS DBUS LIBWRAP ZEROCONF
+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_IMPLIES=AVAHI
 ZEROCONF_DESC=	Zeroconf(Bonjour) support
 MYSQL_DESC=	Enable MySQL CNID backend support
 SENDFILE_DESC=	Enable Sendfile support
@@ -54,6 +52,7 @@ AVAHI_CONFIGURE_ON=	--enable-zeroconf=${
 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}
@@ -89,7 +88,7 @@ post-install:
 		${STAGEDIR}${PREFIX}/bin/macusers
 
 post-install-PAM-on:
-	${INSTALL_DATA} ${PATCHDIR}/netatalk \
+	${INSTALL_DATA} ${FILESDIR}/netatalk.pam \
 	    	${STAGEDIR}${PREFIX}/etc/pam.d/netatalk
 
 .include <bsd.port.mk>

Added: head/net/netatalk3/files/netatalk.pam
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/netatalk3/files/netatalk.pam	Mon Oct 10 03:46:59 2016	(r423633)
@@ -0,0 +1,3 @@
+netatalk        auth    required        pam_unix.so     try_first_pass
+netatalk        account required        pam_unix.so     try_first_pass
+netatalk        session required        pam_permit.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610100346.u9A3kxjb066281>