Update security/courier-authlib to 0.57. Changes from version 0.55

include:

	* authlib: create the authtest and authpasswd manual pages.

	* authdaemon.c (auth_generic): Silly bug in auth_generic().
	* authldaplib.c (auth_ldap_do3): Fix call of authcryptpasswd().
	* authpgsqllib.c (auth_pgsql_setpass): Ditto.
	* authmysqllib.c (auth_mysql_setpass): Ditto.
	* authmysqllib.c (auth_mysql_setpass): Fix a memory leak.
	* authpipe: more fixes to the authpipe module.
	* authpipe: various fixes to the authpipe module.
	* authpipe.c (auth_pipe_pre): Fix zombies created by the authpipe
	  module.
	* New authpipe authentication module.
	* authldap.schema: Add mailhost to the recommended LDAP schema.

	* README_authlib.sgml: Document updated authpipe protocol.

	* cryptpassword.c (authcryptpasswd): Fix handling of encryption hints.
	* checkpassword.c (do_authcheckpassword): Ignore {CRYPT} prefix on
	  crypted passwords.
	* checkpasswordsha1.c (authcheckpasswordsha1): Fix {SHA256} passwords.

	* authdaemond.c: Strip full name/gecos field after the first comma.
	* authdaemond: Pass LOGGEROPTS option to authdaemond.

	* liblog/logger.c: Fix wrong args to setuidgid().
	* liblog/logger.c: Added -droproot option to courierlogger.

	* liblock/lockdaemon.c: Try to recover if upgraded daemon process runs
	  under a different uid.

	* Changed -uid and -gid options to -user and -group for consistency
	  with couriertcpd. Change them to affect courierlogger itself,
	  after it has spawned any child.

	* Optional default domain for authentication requests.

	* Fix the error code when an empty password is provided.

7 files changed, 172 insertions, 115 deletions

diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 240ca5d5650..ae1da178899 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:19 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/11 00:03:16 jlam Exp $
 
 .include "Makefile.common"
 
-DISTNAME=	courier-authlib-0.55
-PKGREVISION=	1
+DISTNAME=	courier-authlib-0.57
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,16 +16,17 @@ CONFLICTS+=	courier-authldap-[0-9]*
 CONFLICTS+=	courier-authmysql-[0-9]*
 CONFLICTS+=	courier-authpgsql-[0-9]*
 
-USE_TOOLS+=		cat gmake perl:run
 USE_LIBTOOL=		yes
 PKG_SYSCONFSUBDIR=	authlib
 
-REPLACE_PERL=		sysconftool
+REPLACE_PERL=		samplepipe.pl sysconftool
+
+USE_TOOLS+=		cat:run gmake perl:run
+CONFIGURE_ENV+=		CAT=${TOOLS_CAT:Q}		# makedat
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-pkgconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--without-stdheaderdir
-CONFIGURE_ENV+=		CAT="${TOOLS_CAT}"
 
 AUTHDAEMONVAR?=		${VARBASE}/authdaemon
 CONFIGURE_ARGS+=	--with-authdaemonvar=${AUTHDAEMONVAR}
@@ -36,7 +36,7 @@ FILES_SUBST+=		AUTHDAEMONVAR=${AUTHDAEMONVAR}
 # Expect is used to change the password from within the courier webmail
 # application (sqwebmail).
 #
-CONFIGURE_ENV+=		EXPECT="${LOCALBASE}/bin/expect"
+CONFIGURE_ENV+=		EXPECT=${LOCALBASE:Q}/bin/expect
 
 AUTHLIBDIR=		lib/courier-authlib
 AUTHLIBEXECDIR=		libexec/courier-authlib
@@ -64,7 +64,7 @@ INSTALL_AM_MAKEFLAGS=	authdaemonrc=${EGDIR}/authdaemonrc		\
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS}					\
 			AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
 
-POST_INSTALL_TARGETS=	post-install-common
+POST_INSTALL_TARGETS=	post-install-common post-install-authdaemon
 
 .include "options.mk"
 .include "../../devel/libltdl/buildlink3.mk"
@@ -89,8 +89,8 @@ INSTALLATION_DIRS=	bin sbin
 post-install: ${POST_INSTALL_TARGETS}
 
 post-install-common:
-	${INSTALL_SCRIPT} ${WRKSRC}/makedat/makedat ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/makedat/makedat ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/authldap.schema ${EGDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${PREFIX}/sbin
 	${INSTALL_DATA_DIR} ${DOCDIR}
@@ -99,4 +99,8 @@ post-install-common:
 	${INSTALL_DATA} ${WRKSRC}/README.html ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README_authlib.html ${DOCDIR}
 
+post-install-authdaemon:
+	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${EGDIR}/authdaemonrc.dist
+	${CHMOD} ${SHAREMODE} ${EGDIR}/authdaemonrc.dist
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/courier-authlib/PLIST b/security/courier-authlib/PLIST
index cc720d9a66e..b2b8d1930b6 100644
--- a/security/courier-authlib/PLIST
+++ b/security/courier-authlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/02 20:34:04 reed Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/08/11 00:03:16 jlam Exp $
 bin/courierauthconfig
 bin/makedat
 include/courier_auth_config.h
@@ -12,6 +12,8 @@ lib/courier-authlib/libcourierauthsasl.la
 lib/courier-authlib/libcourierauthsaslclient.la
 libexec/courier-authlib/authdaemond
 libexec/courier-authlib/authsystem.passwd
+man/man1/authpasswd.1
+man/man1/authtest.1
 man/man1/courierlogger.1
 man/man3/auth_enumerate.3
 man/man3/auth_generic.3
@@ -26,6 +28,7 @@ man/man8/userdb.8
 man/man8/userdbpw.8
 sbin/authdaemond
 sbin/authenumerate
+sbin/authpasswd
 sbin/authtest
 sbin/courierlogger
 sbin/sysconftool
diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo
index 15f3d7233cf..6bf0748a8fa 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/03/24 07:13:14 jlam Exp $
+$NetBSD: distinfo,v 1.7 2005/08/11 00:03:16 jlam Exp $
 
-SHA1 (courier-authlib-0.55.tar.bz2) = f8570eeee2d8469e2b3d11ef1b58554d1f14fb83
-RMD160 (courier-authlib-0.55.tar.bz2) = 05907d9e7f8824aafa24c652083f564b9ed03e02
-Size (courier-authlib-0.55.tar.bz2) = 1972024 bytes
-SHA1 (patch-aa) = 4235c3fd951b354c65bbd448fa301bdc442e606b
-SHA1 (patch-ab) = 350254052c0ad63b75cf81e1dab752a78ae3843f
+SHA1 (courier-authlib-0.57.tar.bz2) = dd68cf4ff7f73ce472206c88dc19a0fd93128f63
+RMD160 (courier-authlib-0.57.tar.bz2) = b11e2f39b2af38c1487b81bb89c4925723627c9f
+Size (courier-authlib-0.57.tar.bz2) = 2006138 bytes
+SHA1 (patch-aa) = 2775ced0c6454c15baecf640461484ceccc8eef1
+SHA1 (patch-ab) = 0108a05af5da6dcdb3463a2aeb592264ca914898
+SHA1 (patch-ac) = 2e67a598f39f54de901079c63b9078521b5a5937
diff --git a/security/courier-authlib/options.mk b/security/courier-authlib/options.mk
index 27ab8a77984..8dfa5fbcc3a 100644
--- a/security/courier-authlib/options.mk
+++ b/security/courier-authlib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2005/05/31 11:24:32 dillo Exp $
+# $NetBSD: options.mk,v 1.6 2005/08/11 00:03:16 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.courier-authlib
 PKG_SUPPORTED_OPTIONS=	pam bdb ldap mysql pgsql
@@ -9,10 +9,24 @@ PKG_SUGGESTED_OPTIONS=	bdb
 ###
 ### UNIX (shadow) password authentication
 ###
+CONFIGURE_ARGS+=	--with-authpwd
+CONFIGURE_ARGS+=	--with-authshadow
 AUTHLIB_PLIST+=		${AUTHLIBDIR}/libauthpwd.la
 AUTHLIB_PLIST+=		${AUTHLIBDIR}/libauthshadow.la
 
 ###
+### "pipe-to-external-program" authentication
+###
+CONFIGURE_ARGS+=	--with-authpipe
+REPLACE_PERL+=		samplepipe.pl
+AUTHLIB_PLIST+=		${AUTHLIBDIR}/libauthpipe.la
+AUTHLIB_PLIST+=		${AUTHEXAMPLEDIR}/samplepipe.pl
+POST_INSTALL_TARGETS+=	post-install-pipe
+
+post-install-pipe:
+	${INSTALL_SCRIPT} ${WRKSRC}/samplepipe.pl ${EGDIR}
+
+###
 ### PAM authentication
 ###
 .if !empty(PKG_OPTIONS:Mpam)
@@ -33,12 +47,12 @@ CONFIGURE_ARGS+=	--with-db=db
 CONFIGURE_ARGS+=	--with-authuserdb
 AUTHLIB_PLIST+=		${AUTHLIBDIR}/libauthuserdb.la
 AUTHLIB_PLIST+=		${AUTHLIBEXECDIR}/makedatprog
-AUTHLIB_PLIST+=		sbin/vchkpw2userdb
-AUTHLIB_PLIST+=		sbin/pw2userdb
 AUTHLIB_PLIST+=		sbin/makeuserdb
+AUTHLIB_PLIST+=		sbin/pw2userdb
 AUTHLIB_PLIST+=		sbin/userdb
-AUTHLIB_PLIST+=		sbin/userdbpw
 AUTHLIB_PLIST+=		sbin/userdb-test-cram-md5
+AUTHLIB_PLIST+=		sbin/userdbpw
+AUTHLIB_PLIST+=		sbin/vchkpw2userdb
 .else
 CONFIGURE_ARGS+=	--without-authuserdb
 PLIST_SUBST+=		BDB="@comment "
@@ -58,6 +72,8 @@ GEN_FILES+=		authldaprc
 POST_INSTALL_TARGETS+=	post-install-ldap
 
 post-install-ldap:
+	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${EGDIR}/authldaprc.dist
+	${CHMOD} ${SHAREMODE} ${EGDIR}/authldaprc.dist
 	${INSTALL_DATA} ${WRKSRC}/README.ldap ${DOCDIR}
 .else
 CONFIGURE_ARGS+=	--without-authldap
@@ -76,6 +92,8 @@ GEN_FILES+=		authmysqlrc
 POST_INSTALL_TARGETS+=	post-install-mysql
 
 post-install-mysql:
+	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${EGDIR}/authmysqlrc.dist
+	${CHMOD} ${SHAREMODE} ${EGDIR}/authmysqlrc.dist
 	${INSTALL_DATA} ${WRKSRC}/README.authmysql.html ${DOCDIR}
 .else
 CONFIGURE_ARGS+=	--without-authmysql
@@ -100,6 +118,8 @@ GEN_FILES+=		authpgsqlrc
 POST_INSTALL_TARGETS+=	post-install-pgsql
 
 post-install-pgsql:
+	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${EGDIR}/authpgsqlrc.dist
+	${CHMOD} ${SHAREMODE} ${EGDIR}/authpgsqlrc.dist
 	${INSTALL_DATA} ${WRKSRC}/README.authpostgres.html ${DOCDIR}
 .else
 CONFIGURE_ARGS+=	--without-authpgsql
diff --git a/security/courier-authlib/patches/patch-aa b/security/courier-authlib/patches/patch-aa
index cc5e9122f8f..9e63d495bca 100644
--- a/security/courier-authlib/patches/patch-aa
+++ b/security/courier-authlib/patches/patch-aa
@@ -1,80 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2005/03/24 07:13:14 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2005/08/11 00:03:16 jlam Exp $
 
---- Makefile.in.orig	2005-02-28 21:22:03.000000000 -0500
+--- Makefile.in.orig	2005-07-23 00:06:37.000000000 +0000
 +++ Makefile.in
-@@ -465,6 +465,7 @@ commonlibdep = libcourierauthcommon.la
- commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init'
- commonlibadd = libcourierauthcommon.la
- libcourierauthcommon_t = @CRYPTLIBS@
-+libcourierauthcommon_t := $(libcourierauthcommon_t:-Wl,%=%)
- libcourierauthcommon_la_SOURCES = \
- 	auth.h courierauth.h \
- 	authpwdenumerate.c \
-@@ -481,6 +482,7 @@ libcourierauthcommon_la_LDFLAGS = libcou
- 	$(libcourierauthcommon_t:%=-Wl,%)
- 
- libcourierauth_t = random128/libshrandom128.a rfc822/libshencode.a @NETLIBS@
-+libcourierauth_t := $(libcourierauth_t:-Wl,%=%)
+@@ -448,7 +448,7 @@ libcourierauthcommon_la_SOURCES = \
+ 
+ libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
+ libcourierauthcommon_la_LIBADD = libcourierauth.la
+-libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%)
++libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t)
  libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
  	authmoduser2.c authmoduser3.c debug.c \
  	courierauthdebug.h \
-@@ -491,6 +493,7 @@ libcourierauth_la_LDFLAGS = -Wl,numlib/l
- 
- # The userdb module
- libauthuserdb_t = userdb/libshuserdb.a @shdblibrary@ @LIBGDBM@ @LIBDB@
-+libauthuserdb_t := $(libauthuserdb_t:-Wl,%=%)
- libauthuserdb_la_SOURCES = authuserdb.c preauthuserdb.c preauthuserdbcommon.c \
- 	 authuserdbpwd.c
- 
-@@ -500,6 +503,7 @@ libauthuserdb_la_LDFLAGS = $(commonldfla
- 
- # the authpam module
- libauthpam_t = -lpam @SHADOWLIBS@ @AUTHPAMCRYPT@ @LIBDL@
-+libauthpam_t := $(libauthpam_t:-Wl,%=%)
- libauthpam_la_SOURCES = authpam.c preauthpam.c authwait.h
- libauthpam_la_DEPENDENCIES = $(commonlibdep)
- libauthpam_la_LIBADD = $(commonlibadd)
-@@ -513,6 +517,7 @@ libauthpwd_la_LDFLAGS = $(commonldflags)
- 
- # The authshadow module
- libauthshadow_t = @SHADOWLIBS@
-+libauthshadow_t := $(libauthshadow_t:-Wl,%=%)
- libauthshadow_la_SOURCES = authshadow.c preauthshadow.c
- libauthshadow_la_DEPENDENCIES = $(commonlibdep)
- libauthshadow_la_LIBADD = $(commonlibadd)
-@@ -520,6 +525,7 @@ libauthshadow_la_LDFLAGS = $(commonldfla
- 
- # The authvchkpw module
- libauthvchkpw_t = @VPOPMAILLIBS@ @LIBM@
-+libauthvchkpw_t := $(libauthvchkpw_t:-Wl,%=%)
- libauthvchkpw_la_SOURCES = authvchkpw.c authvchkpwlib.c preauthvchkpw.c
- libauthvchkpw_la_DEPENDENCIES = $(commonlibdep)
- libauthvchkpw_la_LIBADD = $(commonlibadd)
-@@ -527,6 +533,7 @@ libauthvchkpw_la_LDFLAGS = $(commonldfla
- 
- # The authpgsql module
- libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@
-+libauthpgsql_t := $(libauthpgsql_t:-Wl,%=%)
- libauthpgsql_la_SOURCES = authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h
- libauthpgsql_la_DEPENDENCIES = $(commonlibdep)
- libauthpgsql_la_LIBADD = $(commonlibadd)
-@@ -534,6 +541,7 @@ libauthpgsql_la_LDFLAGS = $(commonldflag
- 
- # The authldap module
- libauthldap_t = @LDAPLIBS@ @NETLIBS@
-+libauthldap_t := $(libauthldap_t:-Wl,%=%)
- libauthldap_la_SOURCES = authldap.c preauthldap.c authldaplib.c authldap.h
- libauthldap_la_DEPENDENCIES = $(commonlibdep)
- libauthldap_la_LIBADD = $(commonlibadd)
-@@ -541,6 +549,7 @@ libauthldap_la_LDFLAGS = $(commonldflags
- 
- # The authmysql module
- libauthmysql_t = @MYSQL_LIBS@ @LIBM@ @NETLIBS@
-+libauthmysql_t := $(libauthmysql_t:-Wl,%=%)
- libauthmysql_la_SOURCES = authmysql.c preauthmysql.c authmysqllib.c authmysql.h
- libauthmysql_la_DEPENDENCIES = $(commonlibdep)
- libauthmysql_la_LIBADD = $(commonlibadd)
-@@ -608,8 +617,8 @@ authdaemondprog_SOURCES = authdaemond.c
+@@ -590,8 +590,8 @@ authdaemondprog_SOURCES = authdaemond.c
  authdaemondprog_DEPENDENCIES = libcourierauthcommon.la \
  	liblock/liblock.la $(modules)
  
@@ -85,18 +22,19 @@ $NetBSD: patch-aa,v 1.2 2005/03/24 07:13:14 jlam Exp $
  authdaemontest_SOURCES = authdaemontest.c
  authdaemontest_DEPENDENCIES = libcourierauthcommon.la
  authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
-@@ -1437,14 +1446,12 @@ vpopmail_config.h:
+@@ -1480,14 +1480,14 @@ vpopmail_config.h:
  authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
  
  @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
 -@HAVE_AUTHPGSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@`
--@HAVE_AUTHPGSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/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
 -@HAVE_AUTHPGSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist
-+@HAVE_AUTHPGSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname $(authpgsqlrc)`
-+@HAVE_AUTHPGSQL_TRUE@	$(INSTALL_DATA) $(srcdir)/authpgsqlrc \
 +@HAVE_AUTHPGSQL_TRUE@		$(DESTDIR)$(authpgsqlrc).dist
++@HAVE_AUTHPGSQL_TRUE@	-chown $(mailuser) $(DESTDIR)$(authpgsqlrc).dist
++@HAVE_AUTHPGSQL_TRUE@	-chgrp $(mailgroup) $(DESTDIR)$(authpgsqlrc).dist
  
  @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:
 -@HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)@authpgsqlrc@.dist
@@ -104,18 +42,25 @@ $NetBSD: patch-aa,v 1.2 2005/03/24 07:13:14 jlam Exp $
  
  @HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc:
  @HAVE_AUTHPGSQL_FALSE@	@:
-@@ -1458,14 +1465,12 @@ authpgsqlrc.h:
+@@ -1496,19 +1496,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
+ @HAVE_AUTHPGSQL_FALSE@	@:
+ 
+ authpgsqlrc.h:
+-	echo "#define AUTHPGSQLRC \"@authpgsqlrc@\"" >authpgsqlrc.h
++	echo "#define AUTHPGSQLRC \"$(authpgsqlrc)\"" >authpgsqlrc.h
+ 
  authldaplib.lo: authldaplib.c authldaprc.h
  
  @HAVE_LDAP_TRUE@install-authldaprc:
 -@HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` 
--@HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/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
 -@HAVE_LDAP_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist
-+@HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname $(authldaprc)` 
-+@HAVE_LDAP_TRUE@	$(INSTALL_DATA) $(srcdir)/authldaprc \
 +@HAVE_LDAP_TRUE@		$(DESTDIR)$(authldaprc).dist
++@HAVE_LDAP_TRUE@	-chown $(mailuser) $(DESTDIR)$(authldaprc).dist
++@HAVE_LDAP_TRUE@	-chgrp $(mailgroup) $(DESTDIR)$(authldaprc).dist
  
  @HAVE_LDAP_TRUE@uninstall-authldaprc:
 -@HAVE_LDAP_TRUE@	rm -f $(DESTDIR)@authldaprc@.dist
@@ -123,18 +68,25 @@ $NetBSD: patch-aa,v 1.2 2005/03/24 07:13:14 jlam Exp $
  
  @HAVE_LDAP_FALSE@install-authldaprc:
  @HAVE_LDAP_FALSE@	@:
-@@ -1479,14 +1484,12 @@ authldaprc.h:
+@@ -1517,19 +1517,19 @@ authldaplib.lo: authldaplib.c authldaprc
+ @HAVE_LDAP_FALSE@	@:
+ 
+ authldaprc.h:
+-	echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
++	echo "#define AUTHLDAPRC \"$(authldaprc)\"" >authldaprc.h
+ 
  authmysqllib.lo: authmysqllib.c authmysqlrc.h
  
  @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc:
 -@HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@`
--@HAVE_AUTHMYSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/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
 -@HAVE_AUTHMYSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist
-+@HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname $(authmysqlrc)`
-+@HAVE_AUTHMYSQL_TRUE@	$(INSTALL_DATA) $(srcdir)/authmysqlrc \
 +@HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)$(authmysqlrc).dist
++@HAVE_AUTHMYSQL_TRUE@	-chown $(mailuser) $(DESTDIR)$(authmysqlrc).dist
++@HAVE_AUTHMYSQL_TRUE@	-chgrp $(mailgroup) $(DESTDIR)$(authmysqlrc).dist
  
  @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:
 -@HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)@authmysqlrc@.dist
@@ -142,22 +94,64 @@ $NetBSD: patch-aa,v 1.2 2005/03/24 07:13:14 jlam Exp $
  
  @HAVE_AUTHMYSQL_FALSE@install-authmysqlrc:
  @HAVE_AUTHMYSQL_FALSE@	@:
-@@ -1498,12 +1501,10 @@ authmysqlrc.h:
- 	echo "#define AUTHMYSQLRC \"@authmysqlrc@\"" >authmysqlrc.h
+@@ -1538,27 +1538,27 @@ authmysqllib.lo: authmysqllib.c authmysq
+ @HAVE_AUTHMYSQL_FALSE@	@:
+ 
+ authmysqlrc.h:
+-	echo "#define AUTHMYSQLRC \"@authmysqlrc@\"" >authmysqlrc.h
++	echo "#define AUTHMYSQLRC \"$(authmysqlrc)\"" >authmysqlrc.h
+ 
+ authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h
+ 
+ authpiperc.h:
+-	echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
++	echo "#define PIPE_PROGRAM \"$(authProg)\"" >authpiperc.h
  
  install-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) authdaemonrc.tmp $(DESTDIR)$(authdaemonrc).dist
++	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)$(authdaemonrc).dist
  	rm -f authdaemonrc.tmp
 -	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist
 -	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist
++	-chown $(mailuser) $(DESTDIR)$(authdaemonrc).dist
++	-chgrp $(mailgroup) $(DESTDIR)$(authdaemonrc).dist
  
  uninstall-authdaemonrc:
- 	rm -f $(DESTDIR)@authdaemonrc@.dist
-@@ -1557,10 +1558,6 @@ install-exec-hook:
+-	rm -f $(DESTDIR)@authdaemonrc@.dist
++	rm -f $(DESTDIR)$(authdaemonrc).dist
+ 
+ authdaemonrc.h:
+-	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
+-	echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h
++	echo "#define AUTHDAEMONRC \"$(authdaemonrc)\"" >authdaemonrc.h
++	echo "#define AUTHDAEMONVAR \"$(authdaemonvar)\"" >>authdaemonrc.h
+ 	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
+ 	echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h
+ 
+ sbindir.h: config.status
+-	echo '#define SBINDIR "@sbindir@"' >sbindir.h
++	echo '#define SBINDIR "$(sbindir)"' >sbindir.h
+ 
+ pkglibdir.h: config.status
+ 	echo '#define PKGLIBDIR "$(pkglibdir)"' >pkglibdir.h
+@@ -1588,8 +1588,8 @@ pkgincludedir.h: config.status
+ 	echo '#define PKGINCLUDEDIR "$(includedir)"' >pkgincludedir.h
+ 
+ mailusergroup.h: config.status
+-	echo '#define MAILUSER "@mailuser@"' >mailusergroup.h
+-	echo '#define MAILGROUP "@mailgroup@"' >>mailusergroup.h
++	echo '#define MAILUSER "$(mailuser)"' >mailusergroup.h
++	echo '#define MAILGROUP "$(mailgroup)"' >>mailusergroup.h
+ 
+ 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)
  	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
@@ -165,6 +159,29 @@ $NetBSD: patch-aa,v 1.2 2005/03/24 07:13:14 jlam Exp $
 -	chmod 750 $(DESTDIR)@authdaemonvar@
 -	-chown @mailuser@ $(DESTDIR)@authdaemonvar@
 -	-chgrp @mailgroup@ $(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
+ authdaemond.o: authdaemonrc.h authdaemond.c
+ 
+ install-migrate: authmigrate
+-	@SHELL@ authmigrate
++	$(SHELL) authmigrate
+ 
+ install-configure:
+-	test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true
+-	test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true
+-	test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true
+-	test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true
++	test -f $(DESTDIR)$(authdaemonrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authdaemonrc).dist || true
++	test -f $(DESTDIR)$(authmysqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authmysqlrc).dist || true
++	test -f $(DESTDIR)$(authpgsqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authpgsqlrc).dist || true
++	test -f $(DESTDIR)$(authldaprc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authldaprc).dist || true
+ 
+ # For maintainer's use only
+ 
diff --git a/security/courier-authlib/patches/patch-ab b/security/courier-authlib/patches/patch-ab
index 200bdc88ed6..1e446bc60ac 100644
--- a/security/courier-authlib/patches/patch-ab
+++ b/security/courier-authlib/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2005/03/18 20:20:48 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2005/08/11 00:03:16 jlam Exp $
 
---- configure.orig	2005-02-13 11:26:31.000000000 +0000
+--- configure.orig	2005-07-22 20:06:39.000000000 -0400
 +++ configure
-@@ -23766,7 +23766,7 @@ done
+@@ -23788,7 +23788,7 @@ done
  test -n "$PG_CONFIG" || PG_CONFIG="pg_config"
  
  
 -PGSQL_LIBS="-lpq"
-+test -z "$PGSQL_LIBS" && PGSQL_LIBS="-lpq"
++test -n "$PGSQL_LIBS" || PGSQL_LIBS="-lpq"
  
  # Check whether --with-pgsql-libs or --without-pgsql-libs was given.
  if test "${with_pgsql_libs+set}" = set; then
-@@ -25547,7 +25547,7 @@ rm -f authdaemonrc.h authldaprc.h authmy
+@@ -25684,7 +25684,7 @@ rm -f authdaemonrc.h authldaprc.h authmy
  
  result=""
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2005/03/18 20:20:48 jlam Exp $
  then
  	$COURIERCONFIG >conftest.out || exit 1
  	sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
-@@ -25559,7 +25559,7 @@ then
+@@ -25696,7 +25696,7 @@ then
  	result=" (from courier-config)"
  fi
  
diff --git a/security/courier-authlib/patches/patch-ac b/security/courier-authlib/patches/patch-ac
new file mode 100644
index 00000000000..ca6390654c5
--- /dev/null
+++ b/security/courier-authlib/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2005/08/11 00:03:16 jlam Exp $
+
+--- authpipelib.c.orig	2005-07-02 01:08:43.000000000 +0000
++++ authpipelib.c
+@@ -16,6 +16,7 @@
+ /*  used to avoid zombies */
+ #include <signal.h>
+ #include <sys/wait.h>
++#include <sys/time.h>
+ #include <sys/select.h>
+ 
+ #include	"auth.h"