pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/netatalk Make openslp support optional (PR pkg/307...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a781fb379c05
branches: trunk
changeset: 497594:a781fb379c05
user: markd <markd%pkgsrc.org@localhost>
date: Sun Jul 31 13:19:55 2005 +0000
description:
Make openslp support optional (PR pkg/30715) and add an option for PAM.
Bump PKGREVISION.
diffstat:
net/netatalk/MESSAGE.pam | 8 ++++++++
net/netatalk/Makefile | 29 +++++++++++++++++++++++++----
net/netatalk/PLIST | 5 ++++-
net/netatalk/distinfo | 4 ++--
net/netatalk/patches/patch-aa | 19 ++++++++++++++-----
5 files changed, 53 insertions(+), 12 deletions(-)
diffs (161 lines):
diff -r ae8eee2c625d -r a781fb379c05 net/netatalk/MESSAGE.pam
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/netatalk/MESSAGE.pam Sun Jul 31 13:19:55 2005 +0000
@@ -0,0 +1,8 @@
+===========================================================================
+$NetBSD: MESSAGE.pam,v 1.1 2005/07/31 13:19:55 markd Exp $
+
+A netatalk PAM configuration file needs to be installed in the pam.d
+directory. An example file can be found at
+${PREFIX}/share/examples/netatalk/netatalk.pamd
+
+===========================================================================
diff -r ae8eee2c625d -r a781fb379c05 net/netatalk/Makefile
--- a/net/netatalk/Makefile Sun Jul 31 06:03:26 2005 +0000
+++ b/net/netatalk/Makefile Sun Jul 31 13:19:55 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2005/07/30 13:12:24 markd Exp $
+# $NetBSD: Makefile,v 1.45 2005/07/31 13:19:55 markd Exp $
DISTNAME= netatalk-2.0.3
+PKGREVISION= 1
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
EXTRACT_SUFX= .tar.bz2
@@ -37,7 +38,6 @@
CONFIGURE_ARGS+= --enable-netbsd \
--enable-overwrite \
- --enable-srvloc \
--enable-timelord \
--libexecdir=${PREFIX}/libexec/netatalk \
--sbindir=${PREFIX}/libexec/netatalk \
@@ -58,7 +58,7 @@
SUBST_SED.paths+= -e "s,\(NETBSD.*\)/etc/rc.d,\1${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR},"
PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk
-PKG_SUPPORTED_OPTIONS= cups kerberos
+PKG_SUPPORTED_OPTIONS= cups kerberos pam slp
.include "../../mk/bsd.options.mk"
@@ -79,11 +79,32 @@
PLIST_SUBST+= GSSAPI="@comment "
.endif
+.if !empty(PKG_OPTIONS:Mpam)
+.include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+= --with-pam
+PLIST_SUBST+= PAM=""
+MESSAGE_SRC+= MESSAGE MESSAGE.pam
+.else
+CONFIGURE_ARGS+= --without-pam
+PLIST_SUBST+= PAM="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mslp)
+.include "../../net/openslp/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-srvloc
+.else
+CONFIGURE_ARGS+= --disable-srvloc
+.endif
+
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/libexec/psffilters
+.if !empty(PKG_OPTIONS:Mpam)
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/config/netatalk.pamd ${EG_DIR}
+.endif
+
.include "../../databases/db4/buildlink3.mk"
-.include "../../net/openslp/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../security/tcp_wrappers/buildlink3.mk"
diff -r ae8eee2c625d -r a781fb379c05 net/netatalk/PLIST
--- a/net/netatalk/PLIST Sun Jul 31 06:03:26 2005 +0000
+++ b/net/netatalk/PLIST Sun Jul 31 13:19:55 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/05/26 05:47:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.14 2005/07/31 13:19:55 markd Exp $
bin/achfile
bin/acleandir.rc
bin/adv1tov2
@@ -99,9 +99,11 @@
libexec/netatalk/timelord
libexec/netatalk/uams/uams_clrtxt.so
libexec/netatalk/uams/uams_dhx.so
+${PAM}libexec/netatalk/uams/uams_dhx_pam.la
libexec/netatalk/uams/uams_dhx_passwd.la
${GSSAPI}libexec/netatalk/uams/uams_gss.la
libexec/netatalk/uams/uams_guest.la
+${PAM}libexec/netatalk/uams/uams_pam.la
libexec/netatalk/uams/uams_passwd.la
libexec/netatalk/uams/uams_randnum.la
man/man1/achfile.1
@@ -155,6 +157,7 @@
share/examples/netatalk/atalkd.conf
share/examples/netatalk/netatalk.conf
share/examples/netatalk/papd.conf
+${PAM}share/examples/netatalk/netatalk.pamd
share/examples/rc.d/afpd
share/examples/rc.d/atalkd
share/examples/rc.d/papd
diff -r ae8eee2c625d -r a781fb379c05 net/netatalk/distinfo
--- a/net/netatalk/distinfo Sun Jul 31 06:03:26 2005 +0000
+++ b/net/netatalk/distinfo Sun Jul 31 13:19:55 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2005/05/26 05:47:40 markd Exp $
+$NetBSD: distinfo,v 1.19 2005/07/31 13:19:55 markd Exp $
SHA1 (netatalk-2.0.3.tar.bz2) = ce2d5dd123467ccae72fc62ca4ee3738019455f2
RMD160 (netatalk-2.0.3.tar.bz2) = 29b763400a45797ac4a8e499d5328aa91a091c91
Size (netatalk-2.0.3.tar.bz2) = 1471804 bytes
-SHA1 (patch-aa) = 8e4abb33f4ffef681a59c23c2c3706a793020d51
+SHA1 (patch-aa) = 4063221494dadda7a8db1ba090e601d57c200201
SHA1 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2
SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4
diff -r ae8eee2c625d -r a781fb379c05 net/netatalk/patches/patch-aa
--- a/net/netatalk/patches/patch-aa Sun Jul 31 06:03:26 2005 +0000
+++ b/net/netatalk/patches/patch-aa Sun Jul 31 13:19:55 2005 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.13 2005/05/26 05:47:40 markd Exp $
+$NetBSD: patch-aa,v 1.14 2005/07/31 13:19:55 markd Exp $
---- configure.orig Thu Oct 28 03:42:21 2004
+--- configure.orig 2005-05-18 10:14:29.000000000 +1200
+++ configure
-@@ -18190,7 +18190,7 @@
+@@ -16704,7 +16704,7 @@ fi
+ LIBS="$savedLIBS"
+ fi
+
+- netatalk_cv_install_pam=yes
++ netatalk_cv_install_pam=no
+ if test x"$pam_found" = "xyes" -a "x$PAMDIR" = "xNONE"; then
+ { echo "$as_me:$LINENO: WARNING: PAM support can be compiled, but the install location for the netatalk.pamd file could not be determined. Either install this file by hand or specify
the install path." >&5
+ echo "$as_me: WARNING: PAM support can be compiled, but the install location for the netatalk.pamd file could not be determined. Either install this file by hand or specify the install path." >&2;}
+@@ -18190,7 +18190,7 @@ cat >>confdefs.h <<\_ACEOF
#define NETBSD 1
_ACEOF
@@ -11,7 +20,7 @@
need_dash_r=yes
-@@ -18960,7 +18960,7 @@ if test "${enable_krbV_uam+set}" = set;
+@@ -18961,7 +18961,7 @@ if test "${enable_krbV_uam+set}" = set;
if test x"$enableval" = x"yes"; then
FOUND_GSSAPI=no
@@ -20,7 +29,7 @@
GSSAPI_CFLAGS=""
-@@ -19175,7 +19175,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -19176,7 +19176,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <$ac_header>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
Home |
Main Index |
Thread Index |
Old Index