diff options
author | jlam <jlam> | 2007-10-15 15:37:01 +0000 |
---|---|---|
committer | jlam <jlam> | 2007-10-15 15:37:01 +0000 |
commit | e64871e75b0ef2edcab0bdbc988cb6dd035f75b6 (patch) | |
tree | 107d7b0396843c857d227bb8cd4aad95dfc7df77 /security | |
parent | 3a26128b103630a8fe71aec9382bab8703fe479e (diff) | |
download | pkgsrc-e64871e75b0ef2edcab0bdbc988cb6dd035f75b6.tar.gz |
Update security/courier-authlib to 0.60.1. Changes from version 0.59.3
include:
* MYSQL_CHARACTER_SET option.
* Allow underscores, colons and plusses, in account names.
* Add {MD5RAW} hash method.
* Fix runtime problems with hardcoded file descriptors in the daemon
code by using OPEN_MAX instead.
Diffstat (limited to 'security')
-rw-r--r-- | security/courier-authlib/Makefile | 6 | ||||
-rw-r--r-- | security/courier-authlib/distinfo | 14 | ||||
-rw-r--r-- | security/courier-authlib/patches/patch-aa | 31 | ||||
-rw-r--r-- | security/courier-authlib/patches/patch-ab | 12 | ||||
-rw-r--r-- | security/courier-authlib/patches/patch-ad | 12 |
5 files changed, 34 insertions, 41 deletions
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index 0a97a6afe6e..13609d798b8 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2007/08/30 20:11:08 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2007/10/15 15:37:01 jlam Exp $ .include "Makefile.common" -DISTNAME= courier-authlib-0.59.3 +DISTNAME= courier-authlib-0.60.2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} EXTRACT_SUFX= .tar.bz2 @@ -16,6 +16,8 @@ CONFLICTS+= courier-authldap-[0-9]* CONFLICTS+= courier-authmysql-[0-9]* CONFLICTS+= courier-authpgsql-[0-9]* +LICENSE= gnu-gpl-v3 + USE_LIBTOOL= yes PKG_SYSCONFSUBDIR= authlib diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo index 68327671e9d..fda88cf9be7 100644 --- a/security/courier-authlib/distinfo +++ b/security/courier-authlib/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2007/09/05 17:06:55 jlam Exp $ +$NetBSD: distinfo,v 1.11 2007/10/15 15:37:01 jlam Exp $ -SHA1 (courier-authlib-0.59.3.tar.bz2) = d82dd91bac9e51755c9da98736cff96228be4e29 -RMD160 (courier-authlib-0.59.3.tar.bz2) = cd0f0868a8fc09824c590430527b07809a12b2a7 -Size (courier-authlib-0.59.3.tar.bz2) = 2109183 bytes -SHA1 (patch-aa) = 81cd5a4afadd54dd0303ac9d475aa4892aec6e42 -SHA1 (patch-ab) = 802b0636cddbeac782d7bdea3e0060e058cdc65f -SHA1 (patch-ad) = d43b78dcb6b125d436508934a4fa13f6dffb0ff1 +SHA1 (courier-authlib-0.60.2.tar.bz2) = cd5969075de212ecfb406ffb1ac974ea939ddcc0 +RMD160 (courier-authlib-0.60.2.tar.bz2) = bdf6d68b7b6a5c6d13079477d83312f98dd7bd31 +Size (courier-authlib-0.60.2.tar.bz2) = 2158473 bytes +SHA1 (patch-aa) = d7c863f698886753ac2be31c5ee0c3f56215b2b0 +SHA1 (patch-ab) = 7d9ffb781102b998a9bd5c9c7ec3d04aa44770d3 +SHA1 (patch-ad) = 01207ac33e17771c11ae94bf2d93e628a31ce448 diff --git a/security/courier-authlib/patches/patch-aa b/security/courier-authlib/patches/patch-aa index 72267ff8452..3da3f707ef7 100644 --- a/security/courier-authlib/patches/patch-aa +++ b/security/courier-authlib/patches/patch-aa @@ -1,17 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2007/08/10 17:57:21 jlam Exp $ +$NetBSD: patch-aa,v 1.5 2007/10/15 15:37:01 jlam Exp $ ---- Makefile.in.orig 2007-04-22 10:54:10.000000000 -0400 +--- Makefile.in.orig Sat Sep 29 14:43:44 2007 +++ Makefile.in -@@ -241,7 +241,7 @@ AR = @AR@ - AUTHPAMCRYPT = @AUTHPAMCRYPT@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = srcdir=${srcdir} @SHELL@ ${srcdir}/automake.fix @AUTOMAKE@ -+AUTOMAKE = srcdir=${srcdir} $(SHELL) ${srcdir}/automake.fix @AUTOMAKE@ - AWK = @AWK@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ -@@ -449,7 +449,7 @@ libcourierauthcommon_la_SOURCES = \ +@@ -491,7 +491,7 @@ libcourierauthcommon_la_SOURCES = \ libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la libcourierauthcommon_la_LIBADD = libcourierauth.la @@ -20,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2007/08/10 17:57:21 jlam Exp $ libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \ authmoduser2.c authmoduser3.c debug.c \ courierauthdebug.h \ -@@ -601,9 +601,9 @@ authdaemondprog_DEPENDENCIES = libcourie +@@ -643,9 +643,9 @@ authdaemondprog_DEPENDENCIES = libcourie authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \ libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \ @@ -32,7 +23,7 @@ $NetBSD: patch-aa,v 1.4 2007/08/10 17:57:21 jlam Exp $ authdaemontest_SOURCES = authdaemontest.c authdaemontest_DEPENDENCIES = libcourierauthcommon.la authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@ -@@ -1499,19 +1499,19 @@ authvchkpw.lo: authvchkpw.c vpopmail_con +@@ -1549,19 +1549,19 @@ authvchkpw.lo: authvchkpw.c vpopmail_con preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h vpopmail_config.h: @@ -58,7 +49,7 @@ $NetBSD: patch-aa,v 1.4 2007/08/10 17:57:21 jlam Exp $ @HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc: @HAVE_AUTHPGSQL_FALSE@ @: -@@ -1520,19 +1520,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq +@@ -1570,19 +1570,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq @HAVE_AUTHPGSQL_FALSE@ @: authpgsqlrc.h: @@ -84,7 +75,7 @@ $NetBSD: patch-aa,v 1.4 2007/08/10 17:57:21 jlam Exp $ @HAVE_LDAP_FALSE@install-authldaprc: @HAVE_LDAP_FALSE@ @: -@@ -1541,19 +1541,19 @@ authldaplib.lo: authldaplib.c authldaprc +@@ -1591,19 +1591,19 @@ authldaplib.lo: authldaplib.c authldaprc @HAVE_LDAP_FALSE@ @: authldaprc.h: @@ -110,7 +101,7 @@ $NetBSD: patch-aa,v 1.4 2007/08/10 17:57:21 jlam Exp $ @HAVE_AUTHMYSQL_FALSE@install-authmysqlrc: @HAVE_AUTHMYSQL_FALSE@ @: -@@ -1562,27 +1562,27 @@ authmysqllib.lo: authmysqllib.c authmysq +@@ -1612,27 +1612,27 @@ authmysqllib.lo: authmysqllib.c authmysq @HAVE_AUTHMYSQL_FALSE@ @: authmysqlrc.h: @@ -147,7 +138,7 @@ $NetBSD: patch-aa,v 1.4 2007/08/10 17:57:21 jlam Exp $ echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h -@@ -1600,20 +1600,20 @@ authchangepwdir.h: config.status +@@ -1650,20 +1650,20 @@ authchangepwdir.h: config.status echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h sbindir.h: config.status @@ -172,7 +163,7 @@ $NetBSD: patch-aa,v 1.4 2007/08/10 17:57:21 jlam Exp $ dist-hook: for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done -@@ -1629,10 +1629,10 @@ install-exec-hook: +@@ -1679,10 +1679,10 @@ install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(sbindir) || : $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond @@ -187,7 +178,7 @@ $NetBSD: patch-aa,v 1.4 2007/08/10 17:57:21 jlam Exp $ test "@LIBAUTHUSERDB@" = "" && exit 0 ;\ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \ $(DESTDIR)$(pkglibexecdir)/makedatprog ; \ -@@ -1735,13 +1735,13 @@ README_authlib.html: README_authlib.html +@@ -1785,13 +1785,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 db7f10c126e..b6374edf532 100644 --- a/security/courier-authlib/patches/patch-ab +++ b/security/courier-authlib/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.4 2007/08/10 17:57:21 jlam Exp $ +$NetBSD: patch-ab,v 1.5 2007/10/15 15:37:01 jlam Exp $ ---- configure.orig 2007-04-22 10:54:09.000000000 -0400 +--- configure.orig Sat Sep 29 14:43:43 2007 +++ configure -@@ -23367,7 +23367,7 @@ done +@@ -23855,7 +23855,7 @@ done test -n "$PG_CONFIG" || PG_CONFIG="pg_config" -PGSQL_LIBS="-lpq" +test -n "$PGSQL_LIBS" || PGSQL_LIBS="-lpq" - # Check whether --with-pgsql-libs or --without-pgsql-libs was given. + # Check whether --with-pgsql-libs was given. if test "${with_pgsql_libs+set}" = set; then -@@ -25263,7 +25263,7 @@ rm -f authdaemonrc.h authldaprc.h authmy +@@ -25649,7 +25649,7 @@ rm -f authdaemonrc.h authldaprc.h authmy result="" @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.4 2007/08/10 17:57:21 jlam Exp $ then $COURIERCONFIG >conftest.out || exit 1 sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1 -@@ -25275,7 +25275,7 @@ then +@@ -25661,7 +25661,7 @@ then result=" (from courier-config)" fi diff --git a/security/courier-authlib/patches/patch-ad b/security/courier-authlib/patches/patch-ad index ba71d4e4b58..e95eda134dd 100644 --- a/security/courier-authlib/patches/patch-ad +++ b/security/courier-authlib/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1 2007/09/05 17:06:55 jlam Exp $ +$NetBSD: patch-ad,v 1.2 2007/10/15 15:37:01 jlam Exp $ ---- authldaplib.c.orig 2007-01-20 12:03:22.000000000 -0500 +--- authldaplib.c.orig Sat Jan 20 17:03:22 2007 +++ authldaplib.c @@ -126,7 +126,7 @@ authldap_free_config removed - no longer static char **l_get_values(LDAP *ld, LDAPMessage *entry, const char *attribut) @@ -11,12 +11,12 @@ $NetBSD: patch-ad,v 1.1 2007/09/05 17:06:55 jlam Exp $ char **a; if (!p) -@@ -144,8 +144,6 @@ static char **l_get_values(LDAP *ld, LDA +@@ -143,8 +143,6 @@ static char **l_get_values(LDAP *ld, LDA + ldap_value_free_len(p); return NULL; } - -- int i; - +- int i; + for (i=0; i<n; i++) { - if ((a[i]=malloc(p[i]->bv_len+1)) == NULL) |