summaryrefslogtreecommitdiff
path: root/security/courier-authlib
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-08-10 17:57:21 +0000
committerjlam <jlam@pkgsrc.org>2007-08-10 17:57:21 +0000
commita1df00f39632c5d7ce9e1e12b2f7255579cdf98e (patch)
tree024f5d82a4c455d9be501d6608292edfdecc1654 /security/courier-authlib
parentd84da67bc0c7a130065b5cc2402b3ccab1cd17ba (diff)
downloadpkgsrc-a1df00f39632c5d7ce9e1e12b2f7255579cdf98e.tar.gz
Update security/courier-authlib to 0.59.3. Changes from version 0.58
include: * authpipe.c (auth_pipe_pre): Fix leak when authpipe module is enabled, but the actual authpipe script/external prog is not installed. * authmysqlrc: Implement SSL-encrypted MySQL connections * authldaplib.c (l_simple_bind_s): Fix anon binds. * authldaplib.c (auth_ldap_enumerate): Fix LDAP account enumeration * userdb/makeuserdb.in: Added the -f option to makeuserdb * authldaplib.c: Try to recover when the LDAP server closes the persistent socket, for inactivity.
Diffstat (limited to 'security/courier-authlib')
-rw-r--r--security/courier-authlib/Makefile12
-rw-r--r--security/courier-authlib/PLIST3
-rw-r--r--security/courier-authlib/distinfo12
-rw-r--r--security/courier-authlib/patches/patch-aa77
-rw-r--r--security/courier-authlib/patches/patch-ab14
5 files changed, 68 insertions, 50 deletions
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index e2654bbe09d..172b42435ed 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2006/07/02 10:34:55 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2007/08/10 17:57:21 jlam Exp $
.include "Makefile.common"
-DISTNAME= courier-authlib-0.58
-PKGREVISION= 3
+DISTNAME= courier-authlib-0.59.3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
@@ -36,9 +35,10 @@ OWN_DIRS_PERMS= ${AUTHDAEMONVAR} ${COURIER_USER} ${COURIER_GROUP} 0750
FILES_SUBST+= AUTHDAEMONVAR=${AUTHDAEMONVAR:Q}
# Expect is used to change the password from within the courier webmail
-# application (sqwebmail).
+# application (sqwebmail). Assume that it's installed in the same prefix
+# as courier-authlib.
#
-CONFIGURE_ENV+= EXPECT=${LOCALBASE:Q}/bin/expect
+CONFIGURE_ENV+= EXPECT=${PREFIX:Q}/bin/expect
AUTHLIBDIR= lib/courier-authlib
AUTHLIBEXECDIR= libexec/courier-authlib
@@ -90,7 +90,6 @@ post-install: ${POST_INSTALL_TARGETS}
post-install-common:
${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/makedat/makedat ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${PREFIX}/sbin
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${DOCDIR}
@@ -102,5 +101,4 @@ post-install-authdaemon:
${CHOWN} ${SHAREOWN}:${SHAREGRP} ${EGDIR}/authdaemonrc.dist
${CHMOD} ${SHAREMODE} ${EGDIR}/authdaemonrc.dist
-.include "../../lang/tcl-expect/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/courier-authlib/PLIST b/security/courier-authlib/PLIST
index b2b8d1930b6..e64cd774318 100644
--- a/security/courier-authlib/PLIST
+++ b/security/courier-authlib/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2005/08/11 00:03:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/08/10 17:57:21 jlam Exp $
bin/courierauthconfig
-bin/makedat
include/courier_auth_config.h
include/courierauth.h
include/courierauthdebug.h
diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo
index 14e64e8aeb4..c17f60cd409 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2006/01/03 03:50:45 jlam Exp $
+$NetBSD: distinfo,v 1.9 2007/08/10 17:57:21 jlam Exp $
-SHA1 (courier-authlib-0.58.tar.bz2) = 8bdab3c2e734cc8f47230924ec638ba3609a92a1
-RMD160 (courier-authlib-0.58.tar.bz2) = 6474612496cd287f294c7f52239ea853c44e4aa1
-Size (courier-authlib-0.58.tar.bz2) = 2006735 bytes
-SHA1 (patch-aa) = 2775ced0c6454c15baecf640461484ceccc8eef1
-SHA1 (patch-ab) = 0108a05af5da6dcdb3463a2aeb592264ca914898
+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
diff --git a/security/courier-authlib/patches/patch-aa b/security/courier-authlib/patches/patch-aa
index 9e63d495bca..72267ff8452 100644
--- a/security/courier-authlib/patches/patch-aa
+++ b/security/courier-authlib/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2007/08/10 17:57:21 jlam Exp $
---- Makefile.in.orig 2005-07-23 00:06:37.000000000 +0000
+--- Makefile.in.orig 2007-04-22 10:54:10.000000000 -0400
+++ Makefile.in
-@@ -448,7 +448,7 @@ libcourierauthcommon_la_SOURCES = \
+@@ -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 = \
libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
libcourierauthcommon_la_LIBADD = libcourierauth.la
@@ -11,23 +20,30 @@ $NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
authmoduser2.c authmoduser3.c debug.c \
courierauthdebug.h \
-@@ -590,8 +590,8 @@ authdaemondprog_SOURCES = authdaemond.c
- authdaemondprog_DEPENDENCIES = libcourierauthcommon.la \
- liblock/liblock.la $(modules)
+@@ -601,9 +601,9 @@ authdaemondprog_DEPENDENCIES = libcourie
+
+ authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \
+ libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \
+- rfc822/libencode.la numlib/libnumlib.la
++ rfc822/libencode.la numlib/libnumlib.la $(DL_LIBS)
--authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la
-authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) @NETLIBS@
-+authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la $(DL_LIBS)
+authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) $(DL_LDFLAGS) @NETLIBS@
authdaemontest_SOURCES = authdaemontest.c
authdaemontest_DEPENDENCIES = libcourierauthcommon.la
authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
-@@ -1480,14 +1480,14 @@ vpopmail_config.h:
+@@ -1499,19 +1499,19 @@ authvchkpw.lo: authvchkpw.c vpopmail_con
+ preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h
+
+ vpopmail_config.h:
+- echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h
++ echo '#include "$(vpopmail_home)/include/config.h"' >vpopmail_config.h
+
authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
@HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
--@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@`
-+@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authpgsqlrc)`
+-@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :
++@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authpgsqlrc)` || :
@HAVE_AUTHPGSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \
-@HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)@authpgsqlrc@.dist
-@HAVE_AUTHPGSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist
@@ -42,7 +58,7 @@ $NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
@HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc:
@HAVE_AUTHPGSQL_FALSE@ @:
-@@ -1496,19 +1496,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
+@@ -1520,19 +1520,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
@HAVE_AUTHPGSQL_FALSE@ @:
authpgsqlrc.h:
@@ -52,8 +68,8 @@ $NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
authldaplib.lo: authldaplib.c authldaprc.h
@HAVE_LDAP_TRUE@install-authldaprc:
--@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@`
-+@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authldaprc)`
+-@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :
++@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authldaprc)` || :
@HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \
-@HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc@.dist
-@HAVE_LDAP_TRUE@ -chown @mailuser@ $(DESTDIR)@authldaprc@.dist
@@ -68,7 +84,7 @@ $NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
@HAVE_LDAP_FALSE@install-authldaprc:
@HAVE_LDAP_FALSE@ @:
-@@ -1517,19 +1517,19 @@ authldaplib.lo: authldaplib.c authldaprc
+@@ -1541,19 +1541,19 @@ authldaplib.lo: authldaplib.c authldaprc
@HAVE_LDAP_FALSE@ @:
authldaprc.h:
@@ -78,8 +94,8 @@ $NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
authmysqllib.lo: authmysqllib.c authmysqlrc.h
@HAVE_AUTHMYSQL_TRUE@install-authmysqlrc:
--@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@`
-+@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authmysqlrc)`
+-@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
++@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authmysqlrc)` || :
@HAVE_AUTHMYSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \
-@HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc@.dist
-@HAVE_AUTHMYSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist
@@ -94,7 +110,7 @@ $NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
@HAVE_AUTHMYSQL_FALSE@install-authmysqlrc:
@HAVE_AUTHMYSQL_FALSE@ @:
-@@ -1538,27 +1538,27 @@ authmysqllib.lo: authmysqllib.c authmysq
+@@ -1562,27 +1562,27 @@ authmysqllib.lo: authmysqllib.c authmysq
@HAVE_AUTHMYSQL_FALSE@ @:
authmysqlrc.h:
@@ -108,8 +124,8 @@ $NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
+ echo "#define PIPE_PROGRAM \"$(authProg)\"" >authpiperc.h
install-authdaemonrc:
-- $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@`
-+ $(mkinstalldirs) $(DESTDIR)`dirname $(authdaemonrc)`
+- $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || :
++ $(mkinstalldirs) $(DESTDIR)`dirname $(authdaemonrc)` || :
sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp
- $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist
+ $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)$(authdaemonrc).dist
@@ -131,7 +147,7 @@ $NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h
echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h
echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h
-@@ -1576,7 +1576,7 @@ authchangepwdir.h: config.status
+@@ -1600,20 +1600,20 @@ authchangepwdir.h: config.status
echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h
sbindir.h: config.status
@@ -140,7 +156,12 @@ $NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
pkglibdir.h: config.status
echo '#define PKGLIBDIR "$(pkglibdir)"' >pkglibdir.h
-@@ -1588,8 +1588,8 @@ pkgincludedir.h: config.status
+
+ packageversion.h: config.status
+- echo '#define PKGVERSION "@PACKAGE_VERSION@"' >packageversion.h
++ echo '#define PKGVERSION "$(PACKAGE_VERSION)"' >packageversion.h
+
+ pkgincludedir.h: config.status
echo '#define PKGINCLUDEDIR "$(includedir)"' >pkgincludedir.h
mailusergroup.h: config.status
@@ -151,22 +172,22 @@ $NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
dist-hook:
for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done
-@@ -1605,10 +1605,10 @@ install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(sbindir)
- $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
+@@ -1629,10 +1629,10 @@ install-exec-hook:
+ $(mkinstalldirs) $(DESTDIR)$(sbindir) || :
+ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
-- $(mkinstalldirs) $(DESTDIR)@authdaemonvar@
+- $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
- chmod 750 $(DESTDIR)@authdaemonvar@
- -chown @mailuser@ $(DESTDIR)@authdaemonvar@
- -chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
-+ $(mkinstalldirs) $(DESTDIR)$(authdaemonvar)
++ $(mkinstalldirs) $(DESTDIR)$(authdaemonvar) || :
+ chmod 750 $(DESTDIR)$(authdaemonvar)
+ -chown $(mailuser) $(DESTDIR)$(authdaemonvar)
+ -chgrp $(mailgroup) $(DESTDIR)$(authdaemonvar)
test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
-@@ -1711,13 +1711,13 @@ README_authlib.html: README_authlib.html
+@@ -1735,13 +1735,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 1e446bc60ac..db7f10c126e 100644
--- a/security/courier-authlib/patches/patch-ab
+++ b/security/courier-authlib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2005/08/11 00:03:16 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2007/08/10 17:57:21 jlam Exp $
---- configure.orig 2005-07-22 20:06:39.000000000 -0400
+--- configure.orig 2007-04-22 10:54:09.000000000 -0400
+++ configure
-@@ -23788,7 +23788,7 @@ done
+@@ -23367,7 +23367,7 @@ done
test -n "$PG_CONFIG" || PG_CONFIG="pg_config"
@@ -11,21 +11,21 @@ $NetBSD: patch-ab,v 1.3 2005/08/11 00:03:16 jlam Exp $
# Check whether --with-pgsql-libs or --without-pgsql-libs was given.
if test "${with_pgsql_libs+set}" = set; then
-@@ -25684,7 +25684,7 @@ rm -f authdaemonrc.h authldaprc.h authmy
+@@ -25263,7 +25263,7 @@ rm -f authdaemonrc.h authldaprc.h authmy
result=""
-if test -x "$COURIERCONFIG"
-+if false
++if false && test -x "$COURIERCONFIG"
then
$COURIERCONFIG >conftest.out || exit 1
sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
-@@ -25696,7 +25696,7 @@ then
+@@ -25275,7 +25275,7 @@ then
result=" (from courier-config)"
fi
-if test -x "$bindir/courierauthconfig"
-+if false
++if false && test -x "$bindir/courierauthconfig"
then
$bindir/courierauthconfig --configfiles >conftest.out || exit 1
sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1