pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/18871
[ On Sunday, March 20, 2005 at 05:29:29 (+0000), jlam%netbsd.org@localhost
wrote: ]
> Subject: Re: pkg/18871
>
> Synopsis: some "enhancements" for security/cyrus-sasl2
>
> State-Changed-From-To: open->closed
> State-Changed-By: jlam%netbsd.org@localhost
> State-Changed-When: Sun, 20 Mar 2005 05:29:29 +0000
> State-Changed-Why:
> testsaslauthd is installed as part of the cyrus-saslauthd package.
Which was a really stupid mistake (separating those packages, that is)
> openssl/buildlink3.mk is only included by the cy2-* plugins that require
> it.
Another stupid mistake causing a great deal of unnecessary complexity.
> USE_GMAKE is not necessary since we supply patches for the configure
> scripts and Makefile.in files.
Huh?!?!? Gmake is _HIGHLY_ advised on all packages that use modern
versions of automake (post 1.7). Failing to use gmake with them can
only lead to unnecessary problems. Just because bmake works on _your_
system doesn't mean gmake isn't beneficial to others.
--
Greg A. Woods
H:+1 416 218-0098 W:+1 416 489-5852 x122 VE3TCP RoboHack
<woods%robohack.ca@localhost>
Planix, Inc. <woods%planix.com@localhost> Secrets of the Weird
<woods%weird.com@localhost>
cvs diff: Diffing security/cyrus-sasl2
Index: security/cyrus-sasl2/Makefile
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/security/cyrus-sasl2/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- security/cyrus-sasl2/Makefile 15 Nov 2004 21:58:16 -0000 1.39
+++ security/cyrus-sasl2/Makefile 6 Jan 2005 19:00:45 -0000
@@ -6,6 +6,9 @@
SVR4_PKGNAME= csasl
COMMENT= Simple Authentication and Security Layer
+PLIST_SRC= ${PKGDIR}/PLIST
+PLIST_SRC+= ${PKGDIR}/PLIST.plugins
+
.if exists(/usr/include/ndbm.h)
SASL_DBTYPE?= ndbm
.else
@@ -21,6 +24,19 @@
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 (not possible without SSL)
+CONFIGURE_ARGS+= --enable-plain # PLAIN
+
+CONFIGURE_ARGS+= --enable-digest # DIGEST-MD5
+CONFIGURE_ARGS+= --with-rc4
+# (SSL is required only for OTP, SRP and NTLM)
+CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
+.include "../../security/openssl/buildlink3.mk"
+
# Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext
# password authentication.
#
@@ -60,8 +76,10 @@
FILES_SUBST+= ROOT_USER=${ROOT_USER}
BUILD_DEFS+= CYRUS_USER CYRUS_GROUP
-PKG_GROUPS= ${CYRUS_GROUP}
-PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
+# group[:groupid]
+PKG_GROUPS= ${CYRUS_GROUP}:${CYRUS_GID}
+# user:group[:[userid][:[descr][:[home][:shell]]]]
+PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP}:${CYRUS_UID}:Cyrus\\
User:/var/imap:${SH}
OWN_DIRS= ${PLUGINDIR}
MESSAGE_SUBST+= _PLUGINDIR=${_PLUGINDIR}
Index: security/cyrus-sasl2/Makefile.common
===================================================================
RCS file:
/cvs/master/m-NetBSD/main/pkgsrc/security/cyrus-sasl2/Makefile.common,v
retrieving revision 1.26
diff -u -r1.26 Makefile.common
--- security/cyrus-sasl2/Makefile.common 15 Nov 2004 21:58:17 -0000
1.26
+++ security/cyrus-sasl2/Makefile.common 8 Jan 2005 05:16:21 -0000
@@ -3,15 +3,6 @@
# This file is currently included by:
#
# security/cyrus-sasl2/Makefile
-# security/cy2-anonymous/Makefile
-# security/cy2-crammd5/Makefile
-# security/cy2-digestmd5/Makefile
-# security/cy2-gssapi/Makefile
-# security/cy2-login/Makefile
-# security/cy2-ntlm/Makefile
-# security/cy2-otp/Makefile
-# security/cy2-plain/Makefile
-# security/cy2-sql/Makefile
#
# This Makefile fragment should be included _below_ any SASL_PLUGIN
# definition and _above_ any CONFIGURE_ARGS definitions.
@@ -46,7 +37,6 @@
USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
-MAKE_ENV+= SHLIBTOOL=${SHLIBTOOL:Q}
DOCDIR= ${PREFIX}/share/doc/cyrus-sasl
PLUGINDIR= ${PREFIX}/lib/sasl2
@@ -54,6 +44,11 @@
CONFIGURE_ARGS+= --with-plugindir=${_PLUGINDIR}
+.if !empty(LDSTATIC)
+CONFIGURE_ARGS+= --with-staticsasl
+CONFIGURE_ARGS+= --disable-staticdlopen
+.endif
+
# Authentication mechanisms
CONFIGURE_ARGS+= --disable-anon # ANONYMOUS
CONFIGURE_ARGS+= --disable-checkapop # CHECKAPOP
@@ -75,15 +70,15 @@
# 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
+post-extract:
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
+
+#ACLOCAL_FLAGS = -I ${WRKSRC}/cmulocal -I ${WRKSRC}/config
+#AUTOCONF_REQD = 2.57
+#AUTOMAKE_FLAGS = -a --gnu -i
+#AUTOMAKE_REQD = 1.7
#
-#pre-configure:
-# cd ${WRKSRC}; \
-# ${ACLOCAL} -I cmulocal -I config; \
-# ${AUTOHEADER}; \
-# ${AUTOMAKE} -a --gnu -i ; \
-# ${AUTOCONF}
+#AUTOCONF_DIRS = ${WRKDIR}/${DISTNAME}
${WRKDIR}/${DISTNAME}/saslauthd
#
#.include "../../mk/automake.mk"
Index: security/cyrus-sasl2/PLIST
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/security/cyrus-sasl2/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- security/cyrus-sasl2/PLIST 15 Nov 2004 21:58:17 -0000 1.5
+++ security/cyrus-sasl2/PLIST 11 Jan 2005 23:21:04 -0000
@@ -7,7 +7,6 @@
include/sasl/saslplug.h
include/sasl/saslutil.h
lib/libsasl2.la
-lib/sasl2/libsasldb.la
man/man3/sasl.3
man/man3/sasl_authorize_t.3
man/man3/sasl_auxprop.3
Index: security/cyrus-sasl2/PLIST.plugins
===================================================================
RCS file:
/cvs/master/m-NetBSD/main/pkgsrc/security/cyrus-sasl2/Attic/PLIST.plugins,v
retrieving revision 1.8
diff -u -r1.8 PLIST.plugins
--- security/cyrus-sasl2/PLIST.plugins 29 Mar 2004 05:47:31 -0000 1.8
+++ security/cyrus-sasl2/PLIST.plugins 11 Jan 2005 23:18:11 -0000
@@ -1,25 +1,7 @@
@comment $NetBSD: PLIST.plugins,v 1.8 2004/03/29 05:47:31 jlam Exp $
lib/sasl2/libanonymous.la
-lib/sasl2/libanonymous.so
-lib/sasl2/libanonymous.so.2
-lib/sasl2/libanonymous.so.2.18
lib/sasl2/libcrammd5.la
-lib/sasl2/libcrammd5.so
-lib/sasl2/libcrammd5.so.2
-lib/sasl2/libcrammd5.so.2.18
lib/sasl2/libdigestmd5.la
-lib/sasl2/libdigestmd5.so
-lib/sasl2/libdigestmd5.so.2
-lib/sasl2/libdigestmd5.so.2.18
lib/sasl2/libotp.la
-lib/sasl2/libotp.so
-lib/sasl2/libotp.so.2
-lib/sasl2/libotp.so.2.18
lib/sasl2/libplain.la
-lib/sasl2/libplain.so
-lib/sasl2/libplain.so.2
-lib/sasl2/libplain.so.2.18
lib/sasl2/libsasldb.la
-lib/sasl2/libsasldb.so
-lib/sasl2/libsasldb.so.2
-lib/sasl2/libsasldb.so.2.18
Index: security/cyrus-sasl2/buildlink3.mk
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/security/cyrus-sasl2/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- security/cyrus-sasl2/buildlink3.mk 25 Nov 2004 22:55:54 -0000 1.8
+++ security/cyrus-sasl2/buildlink3.mk 17 Feb 2005 22:50:11 -0000
@@ -16,7 +16,7 @@
BUILDLINK_PKGSRCDIR.cyrus-sasl?= ../../security/cyrus-sasl2
.endif # CYRUS_SASL_BUILDLINK3_MK
-# Cyrus SASL mechanisms are shared modules loaded via dlopen().
+# Cyrus SASL mechanisms may be dynamic-loaded modules....
.include "../../mk/dlopen.buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
Index: security/cyrus-sasl2/distinfo
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/security/cyrus-sasl2/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- security/cyrus-sasl2/distinfo 15 Nov 2004 21:58:17 -0000 1.23
+++ security/cyrus-sasl2/distinfo 11 Jan 2005 23:14:19 -0000
@@ -2,17 +2,13 @@
SHA1 (cyrus-sasl-2.1.20.tar.gz) = d1eec5644c4e87edb95fa5ab8bf124cfdf277eb6
Size (cyrus-sasl-2.1.20.tar.gz) = 1775163 bytes
-SHA1 (patch-aa) = a6da3823a3a8bd9e90f757245e0e5a60f44123ab
SHA1 (patch-ab) = f3e86c1125e302466e876e5bf31764b9b5cff3ac
SHA1 (patch-ac) = e03731395cefef42c5070021c09928c939fc6a58
SHA1 (patch-ad) = 8a6663e358a67c27380e37be72d71841fd553fdf
SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
-SHA1 (patch-ag) = f62062ecee2bf133572d09049a77c5624ddb7f70
-SHA1 (patch-ah) = 1b0cd2d822dac2b01523fbc712f6544cd9fc298d
SHA1 (patch-ai) = a85078230b06189f4705cfd48b7a6156fbd6ee56
SHA1 (patch-ak) = 1f727d2bc0536ac5d9ba28f5e4cf01c6c1998987
SHA1 (patch-al) = a4d7aa722b334df6b7b9f532b02eb5bc7a797486
-SHA1 (patch-ap) = 3c1f4e554fd49772d2f8f279af3b571eca3a7076
-SHA1 (patch-aq) = 7e4375f0bc8c5b346d050a269fd2eea87f0aaf7c
SHA1 (patch-ar) = f03a9bddfeb7aeb8af19c2bde315a630ce03f331
SHA1 (patch-as) = c8cebac879afda69b282f5c334ffb2c8b5eee6cd
+SHA1 (patch-za) = a2a9b032e8c54700395121a55ff0c571a2cef78b
cvs diff: Diffing security/cyrus-sasl2/patches
Index: security/cyrus-sasl2/patches/patch-aa
===================================================================
RCS file: security/cyrus-sasl2/patches/patch-aa
diff -N security/cyrus-sasl2/patches/patch-aa
--- security/cyrus-sasl2/patches/patch-aa 15 Nov 2004 21:58:17 -0000
1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2004/11/15 21:58:17 jlam Exp $
-
---- configure.in.orig 2004-10-24 16:05:13.000000000 -0400
-+++ configure.in
-@@ -486,7 +486,6 @@ SASL_KERBEROS_V4_CHK
- SASL_GSSAPI_CHK
-
- if test "$gssapi" != "no"; then
-- AC_DEFINE(STATIC_GSSAPIV2,[],[Link GSSAPI Staticly])
- mutex_default="no"
- if test "$gss_impl" = "mit"; then
- mutex_default="yes"
Index: security/cyrus-sasl2/patches/patch-ag
===================================================================
RCS file: security/cyrus-sasl2/patches/patch-ag
diff -N security/cyrus-sasl2/patches/patch-ag
--- security/cyrus-sasl2/patches/patch-ag 4 Aug 2004 19:41:07 -0000
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2004/08/04 19:41:07 jlam Exp $
-
---- plugins/Makefile.in.orig Fri Jul 2 15:40:16 2004
-+++ plugins/Makefile.in
-@@ -125,7 +125,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@
Index: security/cyrus-sasl2/patches/patch-ah
===================================================================
RCS file: security/cyrus-sasl2/patches/patch-ah
diff -N security/cyrus-sasl2/patches/patch-ah
--- security/cyrus-sasl2/patches/patch-ah 13 Aug 2004 18:08:02 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$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@
Index: security/cyrus-sasl2/patches/patch-ap
===================================================================
RCS file: security/cyrus-sasl2/patches/patch-ap
diff -N security/cyrus-sasl2/patches/patch-ap
--- security/cyrus-sasl2/patches/patch-ap 6 Aug 2004 06:36:18 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2004/08/06 06:36:18 jlam Exp $
-
---- sasldb/Makefile.am.orig Fri Jul 2 15:39:41 2004
-+++ sasldb/Makefile.am
-@@ -51,20 +51,8 @@ extra_common_sources = db_none.c db_ndbm
- EXTRA_DIST = NTMakefile
-
- noinst_LTLIBRARIES = libsasldb.la
--noinst_LIBRARIES = libsasldb.a
-
- libsasldb_la_SOURCES = allockey.c sasldb.h
- EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
- libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
- libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
--
--LOCAL_SASL_DB_BACKEND_STATIC := $(shell echo $(SASL_DB_BACKEND_STATIC) | sed
-e "s%\.\./sasldb/%%g")
--
--# Prevent make dist stupidity
--libsasldb_a_SOURCES =
--EXTRA_libsasldb_a_SOURCES =
--
--libsasldb.a: libsasldb.la $(LOCAL_SASL_DB_BACKEND_STATIC)
-- $(AR) cru .libs/$@ $(LOCAL_SASL_DB_BACKEND_STATIC)
--
--
Index: security/cyrus-sasl2/patches/patch-aq
===================================================================
RCS file: security/cyrus-sasl2/patches/patch-aq
diff -N security/cyrus-sasl2/patches/patch-aq
--- security/cyrus-sasl2/patches/patch-aq 6 Aug 2004 06:36:18 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2004/08/06 06:36:18 jlam Exp $
-
---- sasldb/Makefile.in.orig Fri Jul 2 15:40:18 2004
-+++ sasldb/Makefile.in
-@@ -235,28 +235,18 @@ extra_common_sources = db_none.c db_ndbm
- EXTRA_DIST = NTMakefile
-
- noinst_LTLIBRARIES = libsasldb.la
--noinst_LIBRARIES = libsasldb.a
-
- libsasldb_la_SOURCES = allockey.c sasldb.h
- EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
- libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
- libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
-
--LOCAL_SASL_DB_BACKEND_STATIC := $(shell echo $(SASL_DB_BACKEND_STATIC) | sed
-e "s%\.\./sasldb/%%g")
--
--# Prevent make dist stupidity
--libsasldb_a_SOURCES =
--EXTRA_libsasldb_a_SOURCES =
- subdir = sasldb
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LIBRARIES = $(noinst_LIBRARIES)
-
--libsasldb_a_AR = $(AR) cru
--libsasldb_a_LIBADD =
--am_libsasldb_a_OBJECTS =
--libsasldb_a_OBJECTS = $(am_libsasldb_a_OBJECTS)
- LTLIBRARIES = $(noinst_LTLIBRARIES)
-
- libsasldb_la_LDFLAGS =
-@@ -276,10 +266,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libsasldb_a_SOURCES) $(EXTRA_libsasldb_a_SOURCES) \
-- $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES)
-+DIST_SOURCES = $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in
--SOURCES = $(libsasldb_a_SOURCES) $(EXTRA_libsasldb_a_SOURCES)
$(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES)
-+SOURCES = $(libsasldb_la_SOURCES) $(EXTRA_libsasldb_la_SOURCES)
-
- all: all-am
-
-@@ -540,8 +529,6 @@ uninstall-am: uninstall-info-am
- tags uninstall uninstall-am uninstall-info-am
-
-
--libsasldb.a: libsasldb.la $(LOCAL_SASL_DB_BACKEND_STATIC)
-- $(AR) cru .libs/$@ $(LOCAL_SASL_DB_BACKEND_STATIC)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
Index: security/cyrus-sasl2/patches/patch-za
===================================================================
RCS file: security/cyrus-sasl2/patches/patch-za
diff -N security/cyrus-sasl2/patches/patch-za
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/cyrus-sasl2/patches/patch-za 16 Jul 2004 19:38:26 -0000
@@ -0,0 +1,11 @@
+--- saslauthd/configure.orig Fri Jul 16 15:33:51 2004
++++ saslauthd/configure Fri Jul 16 15:37:50 2004
+@@ -8998,7 +8998,7 @@
+
+
+
+- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
++ SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a"
+ fi
+
+
Home |
Main Index |
Thread Index |
Old Index