5 files changed, 134 insertions, 175 deletions

diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index aa2c2859d9e5..40ce6cc5ec65 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.62.2
+PORTVERSION=	0.62.4
 CATEGORIES?=	security mail
 .if defined(PKGNAMESUFFIX)
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo
index 5860b8352ebf..bdddb0fe6687 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (courier-authlib-0.62.2.tar.bz2) = 8b69745b1cb191ae5f743b8758ad2ff9
-SHA256 (courier-authlib-0.62.2.tar.bz2) = 8ce756df57c7f4c09219fe9c70b4f7e6002a2e0fbf9de73f304c22b316387c50
-SIZE (courier-authlib-0.62.2.tar.bz2) = 2233216
+MD5 (courier-authlib-0.62.4.tar.bz2) = 40b01d7f19c29db7c919c0938a7537c7
+SHA256 (courier-authlib-0.62.4.tar.bz2) = ab033565dbec9fd65e1f7618a311a614214cf72f4a3052adb9e0b9a6cecaf081
+SIZE (courier-authlib-0.62.4.tar.bz2) = 2175238
diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in
index a824c0900e2d..3380d9874e34 100644
--- a/security/courier-authlib/files/patch-Makefile.in
+++ b/security/courier-authlib/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-07-12 21:41:08.000000000 +0200
-+++ Makefile.in	2008-07-16 08:36:48.000000000 +0200
-@@ -41,11 +41,10 @@
+--- Makefile.in.orig	2009-06-27 18:09:13.000000000 +0200
++++ Makefile.in	2009-07-02 14:33:19.000000000 +0200
+@@ -42,11 +42,10 @@
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -16,16 +16,7 @@
  subdir = .
  DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
  	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-@@ -81,7 +80,7 @@
- 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkglibexecdir)" \
- 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \
- 	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"
--pkglibLTLIBRARIES_INSTALL = $(INSTALL)
-+pkglibLTLIBRARIES_INSTALL = $(INSTALL) -m 0444
- LTLIBRARIES = $(pkglib_LTLIBRARIES)
- am_libauthcustom_la_OBJECTS = authcustom.lo preauthcustom.lo
- libauthcustom_la_OBJECTS = $(am_libauthcustom_la_OBJECTS)
-@@ -133,6 +132,12 @@
+@@ -149,6 +148,12 @@
  libauthuserdb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libauthuserdb_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -38,7 +29,7 @@
  libcourierauth_la_DEPENDENCIES = libhmac/libhmac.la md5/libmd5.la \
  	sha1/libsha1.la numlib/libnumlib.la random128/librandom128.la \
  	rfc822/libencode.la
-@@ -221,7 +226,8 @@
+@@ -234,7 +239,8 @@
  	$(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \
  	$(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \
  	$(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \
@@ -48,7 +39,7 @@
  	$(libcourierauthcommon_la_SOURCES) \
  	$(libcourierauthsasl_la_SOURCES) \
  	$(libcourierauthsaslclient_la_SOURCES) \
-@@ -233,7 +239,8 @@
+@@ -246,7 +252,8 @@
  	$(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \
  	$(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \
  	$(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \
@@ -58,7 +49,7 @@
  	$(libcourierauthcommon_la_SOURCES) \
  	$(libcourierauthsasl_la_SOURCES) \
  	$(libcourierauthsaslclient_la_SOURCES) \
-@@ -319,6 +326,7 @@
+@@ -363,6 +370,7 @@
  LIBAUTHPWD = @LIBAUTHPWD@
  LIBAUTHSHADOW = @LIBAUTHSHADOW@
  LIBAUTHUSERDB = @LIBAUTHUSERDB@
@@ -66,7 +57,7 @@
  LIBDB = @LIBDB@
  LIBDL = @LIBDL@
  LIBGDBM = @LIBGDBM@
-@@ -422,22 +430,28 @@
+@@ -481,21 +489,27 @@
  top_srcdir = @top_srcdir@
  userdb = @userdb@
  AUTOMAKE_OPTIONS = dist-bzip2
@@ -82,7 +73,6 @@
 -	@LIBAUTHCUSTOM@ @LIBAUTHPIPE@
 +	@LIBAUTHCUSTOM@ @LIBAUTHVCHKPW@ @LIBAUTHPIPE@
  
- pkglibexecdir = $(libexecdir)/courier-authlib
  pkglibexec_SCRIPTS = authsystem.passwd
 -pkglib_LTLIBRARIES = libcourierauth.la \
 -	libcourierauthsasl.la libcourierauthsaslclient.la \
@@ -100,7 +90,7 @@
  	libauthpgsql.la \
  	libauthldap.la \
  	libauthmysql.la \
-@@ -508,6 +522,13 @@
+@@ -566,6 +580,13 @@
  libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t)
  libauthshadow_la_LDFLAGS = $(commonldflags)
  
@@ -114,7 +104,7 @@
  # The authpgsql module
  libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@
  libauthpgsql_la_SOURCES = authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h
-@@ -579,8 +600,8 @@
+@@ -637,8 +658,8 @@
  
  libcourierauthsaslclient_la_LIBADD = libcourierauth.la
  libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version
@@ -125,7 +115,7 @@
  
  courierauthconfig_SOURCES = authinfo.c
  authpasswd_SOURCES = authpasswd.c
-@@ -621,7 +642,7 @@
+@@ -679,7 +700,7 @@
  man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \
  	auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3
  
@@ -134,16 +124,27 @@
  man_MANS = $(man1) $(man3) auth_sasl_ex.3
  BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
  	authdaemonrc.h packageversion.h \
-@@ -756,6 +777,8 @@
+@@ -780,8 +801,8 @@
+ 	  else :; fi; \
+ 	done; \
+ 	test -z "$$list2" || { \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
++	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) -m 0444 $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
++	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) -m 0444 $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+ 	}
+ 
+ uninstall-pkglibLTLIBRARIES:
+@@ -819,6 +840,8 @@
  	$(libauthshadow_la_LINK)  $(libauthshadow_la_OBJECTS) $(libauthshadow_la_LIBADD) $(LIBS)
  libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) 
  	$(libauthuserdb_la_LINK)  $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS)
-+libauthvchkpw.la: $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_DEPENDENCIES) 
++libauthvchkpw.la: $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_DEPENDENCIES)
 +	$(libauthvchkpw_la_LINK)  $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_LIBADD) $(LIBS)
  libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES) 
  	$(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS)
  libcourierauthcommon.la: $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_DEPENDENCIES) 
-@@ -935,6 +958,8 @@
+@@ -1060,6 +1083,8 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authtest.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdb.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdbpwd.Plo@am__quote@
@@ -152,7 +153,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpassword.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordmd5.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordsha1.Plo@am__quote@
-@@ -951,6 +976,7 @@
+@@ -1076,6 +1101,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthshadow.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdb.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdbcommon.Plo@am__quote@
@@ -160,29 +161,29 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -1002,8 +1028,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-+	  echo " install  -o root -g wheel -m 444 '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  install  -o root -g wheel -m 444 "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
- uninstall-man1:
- 	@$(NORMAL_UNINSTALL)
-@@ -1047,8 +1073,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
-+	  echo " install  -o root -g wheel -m 444 '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-+	  install  -o root -g wheel -m 444 "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
- 	done
- uninstall-man3:
- 	@$(NORMAL_UNINSTALL)
-@@ -1431,17 +1457,23 @@
+@@ -1122,8 +1148,8 @@
+ 	sed 'N;N;s,\n, ,g' | { \
+ 	list=; while read file base inst; do \
+ 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
++	    echo " install  -o root -g wheel -m 444 '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
++	    install  -o root -g wheel -m 444 "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+ 	  fi; \
+ 	done; \
+ 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+@@ -1160,8 +1186,8 @@
+ 	sed 'N;N;s,\n, ,g' | { \
+ 	list=; while read file base inst; do \
+ 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
++	    echo " install  -o root -g wheel -m 444 '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
++	    install  -o root -g wheel -m 444 "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
+ 	  fi; \
+ 	done; \
+ 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+@@ -1592,18 +1618,26 @@
  
  info-am:
  
@@ -201,21 +202,23 @@
 +@HAVE_BASE_TRUE@	install-sbinSCRIPTS
 +@HAVE_BASE_TRUE@	@$(NORMAL_INSTALL)
 +@HAVE_BASE_TRUE@	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- 
--install-dvi: install-dvi-recursive
++
 +@HAVE_BASE_FALSE@install-exec-am: install-pkglibLTLIBRARIES
 +@HAVE_BASE_FALSE@	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
++
+ install-dvi: install-dvi-recursive
+ 
+ install-dvi-am:
  
 -install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \
 -	install-pkglibexecSCRIPTS install-sbinPROGRAMS \
 -	install-sbinSCRIPTS
 -	@$(NORMAL_INSTALL)
 -	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-+install-dvi: install-dvi-recursive
- 
  install-html: install-html-recursive
  
-@@ -1514,6 +1546,12 @@
+ install-html-am:
+@@ -1683,6 +1717,12 @@
  	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
  
  
@@ -228,7 +231,7 @@
  authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
  
  @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
-@@ -1553,6 +1591,19 @@
+@@ -1722,6 +1762,19 @@
  @HAVE_LDAP_FALSE@uninstall-authldaprc:
  @HAVE_LDAP_FALSE@	@:
  
@@ -248,7 +251,7 @@
  authldaprc.h:
  	echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
  
-@@ -1582,16 +1633,22 @@
+@@ -1751,16 +1804,22 @@
  authpiperc.h:
  	echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
  
@@ -280,7 +283,7 @@
  
  authdaemonrc.h:
  	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
-@@ -1634,21 +1691,23 @@
+@@ -1803,21 +1862,23 @@
  # automake still a bit stupid...
  
  install-data-hook: install-authdaemonrc install-authpgsqlrc \
@@ -313,8 +316,8 @@
  		$(INSTALL_SCRIPT) userdb/pw2userdb \
  				$(DESTDIR)$(sbindir)/pw2userdb ; \
  		$(INSTALL_SCRIPT) userdb/makeuserdb \
-@@ -1662,9 +1721,10 @@
- 	for f in $(pkglib_LTLIBRARIES); do . $$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0 $(DESTDIR)$(pkglibdir)/$$dlname.0.0; ln -s $$dlname $(DESTDIR)$(pkglibdir)/$$dlname.0; done
+@@ -1831,9 +1892,10 @@
+ 	for f in $(pkglib_LTLIBRARIES); do . ./$$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0 $(DESTDIR)$(pkglibdir)/$$dlname.0.0; ln -s $$dlname $(DESTDIR)$(pkglibdir)/$$dlname.0; done
  
  uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
 -	rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
@@ -325,16 +328,16 @@
  				$(DESTDIR)$(sbindir)/pw2userdb \
  				$(DESTDIR)$(sbindir)/makeuserdb \
  				$(DESTDIR)$(sbindir)/userdb \
-@@ -1676,7 +1736,7 @@
- 	CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
+@@ -1845,7 +1907,7 @@
+ 	$(SHELL) ./config.status --file=authlib.html
  
  authlib.3: authlib.3.in
--	CONFIG_FILES=authlib.3 CONFIG_HEADERS= $(SHELL) ./config.status
-+@HAVE_BASE_TRUE@	CONFIG_FILES=authlib.3 CONFIG_HEADERS= $(SHELL) ./config.status
+-	$(SHELL) ./config.status --file=authlib.3
++@HAVE_BASE_TRUE@	$(SHELL) ./config.status --file=authlib.3
  
  @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml docbook/sgml2html
  @HAVE_SGML_TRUE@	docbook/sgml2html authpasswd.sgml authpasswd.html
-@@ -1750,10 +1810,10 @@
+@@ -1923,10 +1985,10 @@
  	@SHELL@ authmigrate
  
  install-configure:
diff --git a/security/courier-authlib/files/patch-authvchkpw b/security/courier-authlib/files/patch-authvchkpw
index 77130366fe57..6e14e756e643 100644
--- a/security/courier-authlib/files/patch-authvchkpw
+++ b/security/courier-authlib/files/patch-authvchkpw
@@ -1,6 +1,5 @@
-diff -ruN authvchkpw.c authvchkpw.c
---- authvchkpw.c	1970-01-01 01:00:00.000000000 +0100
-+++ authvchkpw.c	2008-06-12 19:15:23.000000000 +0200
+--- authvchkpw.c.orig	2009-07-02 09:56:41.000000000 +0200
++++ authvchkpw.c	2009-07-02 09:56:41.000000000 +0200
 @@ -0,0 +1,242 @@
 +/*
 +** Copyright 1998 - 2007 Double Precision, Inc.  See COPYING for
@@ -244,9 +243,8 @@ diff -ruN authvchkpw.c authvchkpw.c
 +{
 +	return &authvchkpw_info;
 +}
-diff -ruN authvchkpwlib.c authvchkpwlib.c
---- authvchkpwlib.c	1970-01-01 01:00:00.000000000 +0100
-+++ authvchkpwlib.c	2008-06-12 19:15:33.000000000 +0200
+--- authvchkpwlib.c.orig	2009-07-02 09:56:41.000000000 +0200
++++ authvchkpwlib.c	2009-07-02 09:56:41.000000000 +0200
 @@ -0,0 +1,33 @@
 +/*
 +** Copyright 1998 - 2000 Double Precision, Inc.  See COPYING for
@@ -281,12 +279,11 @@ diff -ruN authvchkpwlib.c authvchkpwlib.c
 +	if ((p=strchr(c, ':')) != 0)    return (p);
 +	return (0);
 +}
-diff -ruN courier_auth_config.h courier_auth_config.h
---- courier_auth_config.h	2008-05-08 19:11:34.000000000 +0200
-+++ courier_auth_config.h	2008-06-12 19:26:44.000000000 +0200
-@@ -61,6 +61,9 @@
- /* Whether header installation directory is nontstandard */
- /* #undef HAVE_NOSTDHEADERDIR */
+--- courier_auth_config.h.orig	2009-06-27 17:59:04.000000000 +0200
++++ courier_auth_config.h	2009-07-02 09:56:41.000000000 +0200
+@@ -122,6 +122,9 @@
+ /* Define to 1 if you have the `opendir' function. */
+ #define HAVE_OPENDIR 1
  
 +/* Whether -lvpopmail has the open_smtp_relay() function */
 +/* #undef HAVE_OPEN_SMTP_RELAY */
@@ -294,9 +291,9 @@ diff -ruN courier_auth_config.h courier_auth_config.h
  /* Define to 1 if you have the <Pam/pam_appl.h> header file. */
  /* #undef HAVE_PAM_PAM_APPL_H */
  
-@@ -118,6 +121,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #define HAVE_UNISTD_H 1
+@@ -217,6 +220,9 @@
+    */
+ #define LT_OBJDIR ".libs/"
  
 +/* Whether -lvpopmail has the vset_lastauth() function */
 +/* #undef HAVE_VSET_LASTAUTH */
@@ -304,12 +301,11 @@ diff -ruN courier_auth_config.h courier_auth_config.h
  /* Whether we must a prototype for crypt() */
  #define NEED_CRYPT_PROTOTYPE 0
  
-diff -ruN courier_auth_config.h.in courier_auth_config.h.in
---- courier_auth_config.h.in	2008-05-10 05:13:31.000000000 +0200
-+++ courier_auth_config.h.in	2008-06-12 19:26:46.000000000 +0200
-@@ -60,6 +60,9 @@
- /* Whether header installation directory is nontstandard */
- #undef HAVE_NOSTDHEADERDIR
+--- courier_auth_config.h.in.orig	2009-06-27 18:09:18.000000000 +0200
++++ courier_auth_config.h.in	2009-07-02 09:56:41.000000000 +0200
+@@ -121,6 +121,9 @@
+ /* Define to 1 if you have the `opendir' function. */
+ #undef HAVE_OPENDIR
  
 +/* Whether -lvpopmail has the open_smtp_relay() function */
 +#undef HAVE_OPEN_SMTP_RELAY
@@ -317,9 +313,9 @@ diff -ruN courier_auth_config.h.in courier_auth_config.h.in
  /* Define to 1 if you have the <Pam/pam_appl.h> header file. */
  #undef HAVE_PAM_PAM_APPL_H
  
-@@ -117,6 +120,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
+@@ -216,6 +219,9 @@
+    */
+ #undef LT_OBJDIR
  
 +/* Whether -lvpopmail has the vset_lastauth() function */
 +#undef HAVE_VSET_LASTAUTH
@@ -327,9 +323,8 @@ diff -ruN courier_auth_config.h.in courier_auth_config.h.in
  /* Whether we must a prototype for crypt() */
  #undef NEED_CRYPT_PROTOTYPE
  
-diff -ruN preauthvchkpw.c preauthvchkpw.c
---- preauthvchkpw.c	1970-01-01 01:00:00.000000000 +0100
-+++ preauthvchkpw.c	2008-06-12 19:22:22.000000000 +0200
+--- preauthvchkpw.c.orig	2009-07-02 09:56:41.000000000 +0200
++++ preauthvchkpw.c	2009-07-02 09:56:41.000000000 +0200
 @@ -0,0 +1,159 @@
 +/*
 +** Copyright 1998 - 2001 Double Precision, Inc.  See COPYING for
@@ -490,10 +485,9 @@ diff -ruN preauthvchkpw.c preauthvchkpw.c
 +
 +	return ((*callback)(&auth, arg));
 +}
-diff -ruN userdb/Makefile.in userdb/Makefile.in
---- userdb/Makefile.in	2008-05-08 19:21:19.000000000 +0200
-+++ userdb/Makefile.in	2008-06-12 19:26:47.000000000 +0200
-@@ -48,7 +48,7 @@
+--- userdb/Makefile.in.orig	2009-06-27 17:55:52.000000000 +0200
++++ userdb/Makefile.in	2009-07-02 09:57:06.000000000 +0200
+@@ -50,7 +50,7 @@
  	$(srcdir)/../missing $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/makeuserdb.in \
  	$(srcdir)/pw2userdb.in $(srcdir)/userdb.pl.in \
@@ -502,16 +496,16 @@ diff -ruN userdb/Makefile.in userdb/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-@@ -56,7 +56,7 @@
+@@ -58,7 +58,7 @@
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
   configure.lineno config.status.lineno
  mkinstalldirs = $(install_sh) -d
 -CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb
 +CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb vchkpw2userdb
+ CONFIG_CLEAN_VPATH_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  libuserdb_la_LIBADD =
- am_libuserdb_la_OBJECTS = userdb.lo userdb2.lo userdbmkpw.lo
-@@ -223,7 +223,7 @@
+@@ -252,7 +252,7 @@
  		userdb.html.in userdb.8.in \
  		userdbpw.html.in userdbpw.8.in
  
@@ -520,7 +514,7 @@ diff -ruN userdb/Makefile.in userdb/Makefile.in
  noinst_DATA = makeuserdb.html userdb.html userdbpw.html
  userdbpw_SOURCES = userdbpw.c
  userdbpw_LDADD = libuserdb.la @HMACLIB@ @MD5LIB@ @SHA1LIB@ @CRYPTLIBS@
-@@ -276,6 +276,8 @@
+@@ -306,6 +306,8 @@
  	cd $(top_builddir) && $(SHELL) ./config.status $@
  pw2userdb: $(top_builddir)/config.status $(srcdir)/pw2userdb.in
  	cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -529,10 +523,9 @@ diff -ruN userdb/Makefile.in userdb/Makefile.in
  
  clean-noinstLTLIBRARIES:
  	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-diff -ruN userdb/configure userdb/configure
---- userdb/configure	2008-05-08 19:21:18.000000000 +0200
-+++ userdb/configure	2008-06-12 19:26:49.000000000 +0200
-@@ -20639,7 +20639,7 @@
+--- userdb/configure.orig	2009-06-27 17:55:53.000000000 +0200
++++ userdb/configure	2009-07-02 09:56:41.000000000 +0200
+@@ -12452,7 +12452,7 @@
  fi
  
  
@@ -541,17 +534,16 @@ diff -ruN userdb/configure userdb/configure
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -21252,6 +21252,7 @@
+@@ -13364,6 +13364,7 @@
      "userdb.pl") CONFIG_FILES="$CONFIG_FILES userdb.pl" ;;
      "makeuserdb") CONFIG_FILES="$CONFIG_FILES makeuserdb" ;;
      "pw2userdb") CONFIG_FILES="$CONFIG_FILES pw2userdb" ;;
 +    "vchkpw2userdb") CONFIG_FILES="$CONFIG_FILES vchkpw2userdb" ;;
  
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-diff -ruN userdb/vchkpw2userdb.in userdb/vchkpw2userdb.in
---- userdb/vchkpw2userdb.in	1970-01-01 01:00:00.000000000 +0100
-+++ userdb/vchkpw2userdb.in	2008-06-12 19:26:29.000000000 +0200
+   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+--- userdb/vchkpw2userdb.in.orig	2009-07-02 09:56:41.000000000 +0200
++++ userdb/vchkpw2userdb.in	2009-07-02 09:56:41.000000000 +0200
 @@ -0,0 +1,80 @@
 +#! @PERL@
 +#
diff --git a/security/courier-authlib/files/patch-configure b/security/courier-authlib/files/patch-configure
index 18138b370b50..8a9e19aa1c8f 100644
--- a/security/courier-authlib/files/patch-configure
+++ b/security/courier-authlib/files/patch-configure
@@ -1,29 +1,27 @@
---- configure.orig	2008-07-12 21:41:09.000000000 +0200
-+++ configure	2008-07-16 08:38:29.000000000 +0200
-@@ -898,6 +898,9 @@
- SHADOWLIBS
- LIBAUTHSHADOW
- LIBAUTHPWD
-+vpopmail_home
-+VPOPMAILLIBS
-+LIBAUTHVCHKPW
- authpgsqlrc
- PG_CONFIG
- PGSQL_LIBS
-@@ -928,7 +931,11 @@
- HAVE_SGML_FALSE
- subdirs
- LIBOBJS
--LTLIBOBJS'
-+LTLIBOBJS
+--- configure.orig	2009-06-27 18:09:14.000000000 +0200
++++ configure	2009-07-02 11:24:49.000000000 +0200
+@@ -796,6 +796,10 @@
+ am__EXEEXT_FALSE
+ am__EXEEXT_TRUE
+ LTLIBOBJS
 +HAVE_BASE_TRUE
 +HAVE_BASE_FALSE
 +HAVE_USERDB_TRUE
-+HAVE_USERDB_FALSE'
- ac_subst_files=''
-       ac_precious_vars='build_alias
- host_alias
-@@ -1552,6 +1559,7 @@
++HAVE_USERDB_FALSE
+ LIBOBJS
+ HAVE_SGML_FALSE
+ HAVE_SGML_TRUE
+@@ -825,6 +829,9 @@
+ PGSQL_LIBS
+ PG_CONFIG
+ authpgsqlrc
++vpopmail_home
++VPOPMAILLIBS
++LIBAUTHVCHKPW
+ LIBAUTHPWD
+ LIBAUTHSHADOW
+ SHADOWLIBS
+@@ -1688,6 +1695,7 @@
   --with-authldaprc=filename         Expect to find authldaprc here
   --without-authpwd                  Do not include the authpwd module
   --without-authshadow               Do not include the authshadow module
@@ -31,16 +29,16 @@
   --with-authpgsqlrc=filename        Expect to find authpgsql here
   --without-authpgsql               Do not include the authpgsql module
   --with-pgsql-libs=DIR		Look for pgsql libs in this dir
-@@ -2493,7 +2501,7 @@
+@@ -2498,7 +2506,7 @@
  fi
  
  fi
 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 +INSTALL_STRIP_PROGRAM="${INSTALL_PROGRAM} -s"
  
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
-@@ -21188,8 +21196,12 @@
+ { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+@@ -15118,8 +15126,12 @@
  
  if test "$doauthuserdb" = "no"
  then
@@ -53,7 +51,7 @@
  	AUTHUSERDB="authuserdb"
  	LIBAUTHUSERDB="libauthuserdb.la"
  
-@@ -22867,6 +22879,20 @@
+@@ -16874,6 +16886,20 @@
  fi
  
  
@@ -74,7 +72,7 @@
  
   if test "$HAVE_LDAP" = 1; then
    HAVE_LDAP_TRUE=
-@@ -23515,6 +23541,256 @@
+@@ -17554,6 +17580,256 @@
  
  
  
@@ -331,37 +329,3 @@
  # Check whether --with-authpgsqlrc was given.
  if test "${with_authpgsqlrc+set}" = set; then
    withval=$with_authpgsqlrc; authpgsqlrc="$withval"
-@@ -26486,9 +26762,13 @@
- CXXFLAGS!$CXXFLAGS$ac_delim
- ac_ct_CXX!$ac_ct_CXX$ac_delim
- CXXDEPMODE!$CXXDEPMODE$ac_delim
-+HAVE_BASE_TRUE!$HAVE_BASE_TRUE$ac_delim
-+HAVE_BASE_FALSE!$HAVE_BASE_FALSE$ac_delim
-+HAVE_USERDB_TRUE!$HAVE_USERDB_TRUE$ac_delim
-+HAVE_USERDB_FALSE!$HAVE_USERDB_FALSE$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 101; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -26559,6 +26839,9 @@
- SHADOWLIBS!$SHADOWLIBS$ac_delim
- LIBAUTHSHADOW!$LIBAUTHSHADOW$ac_delim
- LIBAUTHPWD!$LIBAUTHPWD$ac_delim
-+vpopmail_home!$vpopmail_home$ac_delim
-+VPOPMAILLIBS!$VPOPMAILLIBS$ac_delim
-+LIBAUTHVCHKPW!$LIBAUTHVCHKPW$ac_delim
- authpgsqlrc!$authpgsqlrc$ac_delim
- PG_CONFIG!$PG_CONFIG$ac_delim
- PGSQL_LIBS!$PGSQL_LIBS$ac_delim
-@@ -26592,7 +26875,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5