pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/cyrus-sasl2 Split out the plugins into indivi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4e733c076906
branches: trunk
changeset: 479393:4e733c076906
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Aug 13 18:08:02 2004 +0000
description:
Split out the plugins into individual packages. This allows us to
explicitly add only those plugins for SASL support for servers that
won't let us exclude any found SASL plugins. Also, don't bother
building the static library since the static library is useless until
the build mechanism is fixed by the Cyrus maintainers.
Bump the PKGREVISION.
diffstat:
security/cyrus-sasl2/Makefile | 41 ++++++++++++++++++++--------------
security/cyrus-sasl2/Makefile.common | 36 +++++++-----------------------
security/cyrus-sasl2/PLIST | 27 +----------------------
security/cyrus-sasl2/distinfo | 3 +-
security/cyrus-sasl2/options.mk | 40 ----------------------------------
security/cyrus-sasl2/patches/patch-ah | 13 +++++++++++
6 files changed, 49 insertions(+), 111 deletions(-)
diffs (263 lines):
diff -r c5a5a54edb02 -r 4e733c076906 security/cyrus-sasl2/Makefile
--- a/security/cyrus-sasl2/Makefile Fri Aug 13 16:18:37 2004 +0000
+++ b/security/cyrus-sasl2/Makefile Fri Aug 13 18:08:02 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2004/08/06 06:36:18 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2004/08/13 18:08:02 jlam Exp $
.include "Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
SVR4_PKGNAME= csasl
COMMENT= Simple Authentication and Security Layer
@@ -21,26 +21,24 @@
CONFIGURE_ARGS+= --with-dblib=${SASL_DBTYPE}
CONFIGURE_ARGS+= --with-dbpath=${PKG_SYSCONFDIR}/sasldb
-# Authentication mechanisms
-CONFIGURE_ARGS+= --enable-anon # ANONYMOUS
-CONFIGURE_ARGS+= --enable-checkapop # CHECKAPOP
-CONFIGURE_ARGS+= --enable-cram # CRAM-MD5
-CONFIGURE_ARGS+= --enable-otp # OTP
-CONFIGURE_ARGS+= --enable-plain # PLAIN
+# Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext
+# password authentication.
+#
+SASLSOCKETDIR?= ${VARBASE}/run/saslauthd
+CONFIGURE_ARGS+= --with-saslauthd=${SASLSOCKETDIR}
+BUILD_DEFS+= SASLSOCKETDIR
-CONFIGURE_ARGS+= --enable-digest # DIGEST-MD5
-CONFIGURE_ARGS+= --with-rc4
-CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
-.include "../../security/openssl/buildlink3.mk"
-
-# Support using the Courier authdaemon (mail/courier-auth*) for
-# plaintext password authentication.
+# Support using the Courier authdaemon (mail/courier-auth*) for plaintext
+# password authentication.
#
AUTHDAEMONVAR?= ${VARBASE}/authdaemon
CONFIGURE_ARGS+= --with-authdaemond=${AUTHDAEMONVAR}
BUILD_DEFS+= AUTHDAEMONVAR
-.include "options.mk"
+# Support using APOP against a POP server for plaintext password
+# authentication.
+#
+CONFIGURE_ARGS+= --enable-checkapop
.if exists(/dev/urandom)
SASL_ENTROPY_SOURCE?= /dev/urandom
@@ -50,9 +48,18 @@
.endif
BUILD_DEFS+= SASL_ENTROPY_SOURCE
-USE_PKGINSTALL= YES
+USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+# CYRUS_USER username of the Cyrus administrator
+# CYRUS_GROUP group of the Cyrus administrator
+#
+CYRUS_USER?= cyrus
+CYRUS_GROUP?= mail
+FILES_SUBST+= CYRUS_USER=${CYRUS_USER}
+FILES_SUBST+= ROOT_USER=${ROOT_USER}
+BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
+
PKG_GROUPS= ${CYRUS_GROUP}
PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
OWN_DIRS= ${PLUGINDIR}
diff -r c5a5a54edb02 -r 4e733c076906 security/cyrus-sasl2/Makefile.common
--- a/security/cyrus-sasl2/Makefile.common Fri Aug 13 16:18:37 2004 +0000
+++ b/security/cyrus-sasl2/Makefile.common Fri Aug 13 18:08:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2004/08/04 19:41:07 jlam Exp $
+# $NetBSD: Makefile.common,v 1.24 2004/08/13 18:08:02 jlam Exp $
#
# This file is currently included by:
#
@@ -41,23 +41,10 @@
USE_LIBTOOL= yes
MAKE_ENV+= SHLIBTOOL=${SHLIBTOOL:Q}
-# CYRUS_USER username of the Cyrus administrator
-# CYRUS_GROUP group of the Cyrus administrator
-#
-CYRUS_USER?= cyrus
-CYRUS_GROUP?= mail
-FILES_SUBST+= CYRUS_USER=${CYRUS_USER}
-FILES_SUBST+= ROOT_USER=${ROOT_USER}
-BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
-
+HTMLDIR= ${PREFIX}/share/doc/html/cyrus-sasl
PLUGINDIR= ${PREFIX}/lib/sasl2
_PLUGINDIR= ${VIEWBASE}/lib/sasl2
-HTMLDIR= ${PREFIX}/share/doc/html/cyrus-sasl
-SASLSOCKETDIR?= ${VARBASE}/run/saslauthd
-BUILD_DEFS+= SASLSOCKETDIR
-
-CONFIGURE_ARGS+= --with-saslauthd=${SASLSOCKETDIR}
CONFIGURE_ARGS+= --with-plugindir=${_PLUGINDIR}
# Authentication mechanisms
@@ -75,14 +62,16 @@
CONFIGURE_ARGS+= --disable-srp # SRP
CONFIGURE_ARGS+= --disable-srp-setpass
CONFIGURE_ARGS+= --with-dblib=none
+CONFIGURE_ARGS+= --without-openssl
CONFIGURE_ARGS+= --without-pam
-
-# clean up a bit to help package maintainer produce patch files
-post-extract:
- ${_PKG_SILENT}${_PKG_DEBUG} \
- ${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
+CONFIGURE_ARGS+= --without-saslauthd
# Left here as reference for patch makers...
+# clean up a bit to help package maintainer produce patch files
+#post-extract:
+# ${_PKG_SILENT}${_PKG_DEBUG} \
+# ${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
+#
#pre-configure:
# cd ${WRKSRC}; \
# ${ACLOCAL} -I cmulocal -I config; \
@@ -91,10 +80,3 @@
# ${AUTOCONF}
#
#.include "../../mk/automake.mk"
-
-post-configure:
- cd ${WRKSRC}; for file in plugins/Makefile; do \
- ${SED} -e "s|^\(LIBTOOL =\).*|\1 \$$(SHLIBTOOL)|g" \
- $$file > $$file.new; \
- ${MV} -f $$file.new $$file; \
- done
diff -r c5a5a54edb02 -r 4e733c076906 security/cyrus-sasl2/PLIST
--- a/security/cyrus-sasl2/PLIST Fri Aug 13 16:18:37 2004 +0000
+++ b/security/cyrus-sasl2/PLIST Fri Aug 13 18:08:02 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/08/04 19:41:07 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/08/13 18:08:02 jlam Exp $
include/sasl/hmac-md5.h
include/sasl/md5.h
include/sasl/md5global.h
@@ -6,35 +6,10 @@
include/sasl/sasl.h
include/sasl/saslplug.h
include/sasl/saslutil.h
-lib/libsasl2.a
lib/libsasl2.la
lib/libsasl2.so
lib/libsasl2.so.2
lib/libsasl2.so.2.19
-lib/sasl2/libanonymous.la
-lib/sasl2/libanonymous.so
-lib/sasl2/libanonymous.so.2
-lib/sasl2/libanonymous.so.2.19
-lib/sasl2/libcrammd5.la
-lib/sasl2/libcrammd5.so
-lib/sasl2/libcrammd5.so.2
-lib/sasl2/libcrammd5.so.2.19
-lib/sasl2/libdigestmd5.la
-lib/sasl2/libdigestmd5.so
-lib/sasl2/libdigestmd5.so.2
-lib/sasl2/libdigestmd5.so.2.19
-${GSSAPI}lib/sasl2/libgssapiv2.la
-${GSSAPI}lib/sasl2/libgssapiv2.so
-${GSSAPI}lib/sasl2/libgssapiv2.so.2
-${GSSAPI}lib/sasl2/libgssapiv2.so.2.19
-lib/sasl2/libotp.la
-lib/sasl2/libotp.so
-lib/sasl2/libotp.so.2
-lib/sasl2/libotp.so.2.19
-lib/sasl2/libplain.la
-lib/sasl2/libplain.so
-lib/sasl2/libplain.so.2
-lib/sasl2/libplain.so.2.19
lib/sasl2/libsasldb.la
lib/sasl2/libsasldb.so
lib/sasl2/libsasldb.so.2
diff -r c5a5a54edb02 -r 4e733c076906 security/cyrus-sasl2/distinfo
--- a/security/cyrus-sasl2/distinfo Fri Aug 13 16:18:37 2004 +0000
+++ b/security/cyrus-sasl2/distinfo Fri Aug 13 18:08:02 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2004/08/06 06:36:18 jlam Exp $
+$NetBSD: distinfo,v 1.22 2004/08/13 18:08:02 jlam Exp $
SHA1 (cyrus-sasl-2.1.19.tar.gz) = 9512d70ecea33b9d44e69d185a323a0f7b133705
Size (cyrus-sasl-2.1.19.tar.gz) = 1537350 bytes
@@ -9,6 +9,7 @@
SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
SHA1 (patch-af) = c024ff3fe7712b9fce2e064bdc037323838231ef
SHA1 (patch-ag) = f62062ecee2bf133572d09049a77c5624ddb7f70
+SHA1 (patch-ah) = 1b0cd2d822dac2b01523fbc712f6544cd9fc298d
SHA1 (patch-ai) = 6cc7ee82c3e0faad0c39868ac156fddf53d36ba7
SHA1 (patch-ak) = 32521eef7f8a9b590089f078edaa706c74d91651
SHA1 (patch-al) = fd99c13ec5618888eb79201363475da6e376d7cb
diff -r c5a5a54edb02 -r 4e733c076906 security/cyrus-sasl2/options.mk
--- a/security/cyrus-sasl2/options.mk Fri Aug 13 16:18:37 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $
-
-# Global and legacy options
-.if defined(KERBEROS) || defined(SASL_USE_GSSAPI)
-. if !defined(PKG_OPTIONS.cyrus-sasl)
-. if defined(KERBEROS)
-PKG_OPTIONS.cyrus-sasl+= kerberos
-. endif
-. if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])
-PKG_OPTIONS.cyrus-sasl+= gssapi
-. endif
-. endif
-.endif
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-sasl
-PKG_SUPPORTED_OPTIONS= gssapi kerberos
-.include "../../mk/bsd.options.mk"
-
-###
-### Kerberos authentication is via GSSAPI.
-###
-.if !empty(PKG_OPTIONS:Mkerberos)
-. if empty(PKG_OPTIONS:Mgssapi)
-PKG_OPTIONS+= gssapi
-. endif
-.endif
-
-###
-### Authentication via GSSAPI (which supports primarily Kerberos 5)
-###
-.if !empty(PKG_OPTIONS:Mgssapi)
-. include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE}
-CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
-GSSIMPL.heimdal= heimdal
-GSSIMPL.mit-krb5= mit
-PLIST_SUBST+= GSSAPI=
-.else
-PLIST_SUBST+= GSSAPI="@comment "
-.endif
diff -r c5a5a54edb02 -r 4e733c076906 security/cyrus-sasl2/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/cyrus-sasl2/patches/patch-ah Fri Aug 13 18:08:02 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.4 2004/08/13 18:08:02 jlam Exp $
+
+--- lib/Makefile.in.orig Fri Aug 13 13:53:00 2004
++++ lib/Makefile.in
+@@ -121,7 +121,7 @@ JAVA_TRUE = @JAVA_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBTOOL = @LIBTOOL@
++LIBTOOL = $(SHLIBTOOL)
+ LIB_CRYPT = @LIB_CRYPT@
+ LIB_DES = @LIB_DES@
+ LIB_DOOR = @LIB_DOOR@
Home |
Main Index |
Thread Index |
Old Index