From 5ae886a44fbac20a146a562cbc5705f92cd6b9cc Mon Sep 17 00:00:00 2001 From: pettai Date: Tue, 15 Jun 2010 23:10:44 +0000 Subject: [PATCH] courier-authlib-0.63.0: * authldapescape.c: Factor out LDAP string escape function. * authldap.schema: Various fixes * authldap.ldif (olcObjectClasses): Create LDIF format schema from authldap.schema * authoption.c (auth_getoptionenvint): For account options that are parsed to an int, an option value that begins with t, T, y, or Y is evaluated as 1, other alphabetic values as 0; so that 'true' or 'yes' get evaluated as 1. (See the Changelog for the previous releases) Based on patch(es) from PR pkg/42989 by Brian Candler --- security/courier-authlib/Makefile | 5 ++-- security/courier-authlib/buildlink3.mk | 4 +-- security/courier-authlib/distinfo | 12 ++++----- security/courier-authlib/patches/patch-aa | 30 +++++++++++------------ security/courier-authlib/patches/patch-ab | 8 +++--- 5 files changed, 29 insertions(+), 30 deletions(-) diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index e1355c9e2e08..58e8813d0810 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2010/03/21 16:29:43 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2010/06/15 23:10:44 pettai Exp $ .include "Makefile.common" -DISTNAME= courier-authlib-0.62.2 -PKGREVISION= 1 +DISTNAME= courier-authlib-0.63.0 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} EXTRACT_SUFX= .tar.bz2 diff --git a/security/courier-authlib/buildlink3.mk b/security/courier-authlib/buildlink3.mk index 40c0e9e9272e..d2278d8a6aae 100644 --- a/security/courier-authlib/buildlink3.mk +++ b/security/courier-authlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:16 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2010/06/15 23:10:44 pettai Exp $ BUILDLINK_TREE+= courier-authlib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= courier-authlib COURIER_AUTHLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.courier-authlib+= courier-authlib>=0.53 -BUILDLINK_ABI_DEPENDS.courier-authlib?= courier-authlib>=0.58nb2 +BUILDLINK_ABI_DEPENDS.courier-authlib?= courier-authlib>=0.63.0 BUILDLINK_PKGSRCDIR.courier-authlib?= ../../security/courier-authlib .endif # COURIER_AUTHLIB_BUILDLINK3_MK diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo index 5d842e2d1811..31b04ef85365 100644 --- a/security/courier-authlib/distinfo +++ b/security/courier-authlib/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.13 2009/07/02 12:23:44 obache Exp $ +$NetBSD: distinfo,v 1.14 2010/06/15 23:10:44 pettai Exp $ -SHA1 (courier-authlib-0.62.2.tar.bz2) = dc495ad6c54c271483d4862e09788621d86629a9 -RMD160 (courier-authlib-0.62.2.tar.bz2) = c0f4f32994056f8034f30055cfe55238d137a2ca -Size (courier-authlib-0.62.2.tar.bz2) = 2233216 bytes -SHA1 (patch-aa) = 6984af03cce59cee3987526d5c87bb71c8eac635 -SHA1 (patch-ab) = 0f3d86e9bd296c9abc044917656495fd8584bc08 +SHA1 (courier-authlib-0.63.0.tar.bz2) = c0877274de8b58ec4c7a41cfd87ad9b37c408304 +RMD160 (courier-authlib-0.63.0.tar.bz2) = 4528672a11895c9d705340523e578284e40b5dea +Size (courier-authlib-0.63.0.tar.bz2) = 2817119 bytes +SHA1 (patch-aa) = 19e4481ef98ccce9376222611f4ac179af747ed3 +SHA1 (patch-ab) = a266fc7b01fb77117b78630892574ebee81f9a57 diff --git a/security/courier-authlib/patches/patch-aa b/security/courier-authlib/patches/patch-aa index e6300a69b2ad..fd313e1bf857 100644 --- a/security/courier-authlib/patches/patch-aa +++ b/security/courier-authlib/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ +$NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $ --- Makefile.in.orig 2009-02-03 23:39:56.000000000 +0000 +++ Makefile.in -@@ -453,7 +453,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h +@@ -511,7 +511,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h DISTCLEANFILES = dbobj.config README_authlib.html commonlibdep = libcourierauthcommon.la @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ commonlibadd = libcourierauthcommon.la libcourierauthcommon_t = @CRYPTLIBS@ libcourierauthcommon_la_SOURCES = \ -@@ -468,7 +468,7 @@ libcourierauthcommon_la_SOURCES = \ +@@ -527,7 +527,7 @@ libcourierauthcommon_la_SOURCES = \ libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la libcourierauthcommon_la_LIBADD = libcourierauth.la @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \ authmoduser2.c authmoduser3.c debug.c \ courierauthdebug.h \ -@@ -477,7 +477,7 @@ libcourierauth_la_SOURCES = authdaemon.c +@@ -536,7 +536,7 @@ libcourierauth_la_SOURCES = authdaemon.c libcourierauth_la_LIBADD = libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la numlib/libnumlib.la \ random128/librandom128.la rfc822/libencode.la @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ # The userdb module libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@ -@@ -569,7 +569,7 @@ libcourierauthsasl_la_SOURCES = \ +@@ -629,7 +629,7 @@ libcourierauthsasl_la_SOURCES = \ authsaslfrombase64.c authsasltobase64.c libcourierauthsasl_la_LIBADD = libcourierauth.la @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \ authsaslclient.c authsaslclient.h authsaslclientcram.c \ authsaslclientcrammd5.c authsaslclientcramsha1.c \ -@@ -578,7 +578,7 @@ libcourierauthsaslclient_la_SOURCES = co +@@ -638,7 +638,7 @@ libcourierauthsaslclient_la_SOURCES = co authsaslfrombase64.c authsasltobase64.c libcourierauthsaslclient_la_LIBADD = libcourierauth.la @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \ courierauthsaslclient.h courierauthdebug.h -@@ -609,9 +609,9 @@ authdaemondprog_DEPENDENCIES = libcourie +@@ -669,9 +669,9 @@ authdaemondprog_DEPENDENCIES = libcourie authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \ libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \ @@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ authdaemontest_SOURCES = authdaemontest.c authdaemontest_DEPENDENCIES = libcourierauthcommon.la authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@ -@@ -1517,14 +1517,14 @@ uninstall-man: uninstall-man1 uninstall- +@@ -1689,14 +1689,14 @@ uninstall-man: uninstall-man1 uninstall- authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc: @@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ @HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc: @HAVE_AUTHPGSQL_FALSE@ @: -@@ -1533,19 +1533,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq +@@ -1705,19 +1705,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq @HAVE_AUTHPGSQL_FALSE@ @: authpgsqlrc.h: @@ -105,7 +105,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ @HAVE_LDAP_FALSE@install-authldaprc: @HAVE_LDAP_FALSE@ @: -@@ -1554,19 +1554,19 @@ authldaplib.lo: authldaplib.c authldaprc +@@ -1726,19 +1726,19 @@ authldaplib.lo: authldaplib.c authldaprc @HAVE_LDAP_FALSE@ @: authldaprc.h: @@ -131,7 +131,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ @HAVE_AUTHMYSQL_FALSE@install-authmysqlrc: @HAVE_AUTHMYSQL_FALSE@ @: -@@ -1575,27 +1575,27 @@ authmysqllib.lo: authmysqllib.c authmysq +@@ -1747,27 +1747,27 @@ authmysqllib.lo: authmysqllib.c authmysq @HAVE_AUTHMYSQL_FALSE@ @: authmysqlrc.h: @@ -168,7 +168,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h -@@ -1613,20 +1613,20 @@ authchangepwdir.h: config.status +@@ -1785,20 +1785,20 @@ authchangepwdir.h: config.status echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h sbindir.h: config.status @@ -193,7 +193,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ dist-hook: for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done -@@ -1642,10 +1642,10 @@ install-exec-hook: +@@ -1814,10 +1814,10 @@ install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(sbindir) || : $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond @@ -208,7 +208,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ test "@LIBAUTHUSERDB@" = "" && exit 0 ;\ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \ $(DESTDIR)$(pkglibexecdir)/makedatprog ; \ -@@ -1659,7 +1659,6 @@ install-exec-hook: +@@ -1831,7 +1831,6 @@ install-exec-hook: $(DESTDIR)$(sbindir)/userdbpw ; \ $(INSTALL_SCRIPT) userdb-test-cram-md5.pl \ $(DESTDIR)$(sbindir)/userdb-test-cram-md5 @@ -216,7 +216,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $ uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond -@@ -1751,13 +1750,13 @@ README_authlib.html: README_authlib.html +@@ -1930,13 +1930,13 @@ README_authlib.html: README_authlib.html authdaemond.o: authdaemonrc.h authdaemond.c install-migrate: authmigrate diff --git a/security/courier-authlib/patches/patch-ab b/security/courier-authlib/patches/patch-ab index d7f393ef8f5f..644eea0e5936 100644 --- a/security/courier-authlib/patches/patch-ab +++ b/security/courier-authlib/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2009/07/02 12:23:44 obache Exp $ +$NetBSD: patch-ab,v 1.7 2010/06/15 23:10:44 pettai Exp $ --- configure.orig 2009-02-03 23:39:55.000000000 +0000 +++ configure -@@ -23578,7 +23578,7 @@ done +@@ -17617,7 +17617,7 @@ done test -n "$PG_CONFIG" || PG_CONFIG="pg_config" @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2009/07/02 12:23:44 obache Exp $ # Check whether --with-pgsql-libs was given. if test "${with_pgsql_libs+set}" = set; then -@@ -25365,7 +25365,7 @@ rm -f authdaemonrc.h authldaprc.h authmy +@@ -19439,7 +19439,7 @@ rm -f authdaemonrc.h authldaprc.h authmy result="" @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.6 2009/07/02 12:23:44 obache Exp $ then $COURIERCONFIG >conftest.out || exit 1 sed -n '/^mail/p' conftest2.out || exit 1 -@@ -25377,7 +25377,7 @@ then +@@ -19451,7 +19451,7 @@ then result=" (from courier-config)" fi