4 files changed, 171 insertions, 115 deletions

diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 6cd113beff1c..9f1afdcd4f81 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.59.3
+PORTVERSION=	0.60.0
 CATEGORIES?=	security mail
 .if defined(PKGNAMESUFFIX)
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo
index 1a2660814643..d8900512243b 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (courier-authlib-0.59.3.tar.bz2) = 62d038d94cebec00da9455785bdcd620
-SHA256 (courier-authlib-0.59.3.tar.bz2) = e433a3b737d48f9fdec5fea3a35d076cdaea8ac1fa5bacbf67f23315d3d368b5
-SIZE (courier-authlib-0.59.3.tar.bz2) = 2109183
+MD5 (courier-authlib-0.60.0.tar.bz2) = 32e59f202f91e9338a7b85144b89ad1f
+SHA256 (courier-authlib-0.60.0.tar.bz2) = 8609ba3ac44dd39b9e163bfca26c093d9959686a3fbb1c6b16cd4387a1cf28a6
+SIZE (courier-authlib-0.60.0.tar.bz2) = 2158396
diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in
index c5334cc17384..3bc64df0b1bb 100644
--- a/security/courier-authlib/files/patch-Makefile.in
+++ b/security/courier-authlib/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sat Dec 30 06:27:59 2006
-+++ Makefile.in	Mon Jan  1 22:23:31 2007
-@@ -45,11 +45,10 @@
+--- Makefile.in.orig	2007-09-29 16:43:44.000000000 +0200
++++ Makefile.in	2007-10-03 11:59:48.000000000 +0200
+@@ -41,11 +41,10 @@
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -13,19 +13,19 @@
 +@HAVE_BASE_TRUE@bin_PROGRAMS = courierauthconfig$(EXEEXT)
 +@HAVE_BASE_TRUE@noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \
 +@HAVE_BASE_TRUE@	authdaemondprog$(EXEEXT)
+ subdir = .
  DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
  	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(srcdir)/README.authdebug.html.in $(srcdir)/authdaemond.in \
-@@ -85,7 +84,7 @@
+@@ -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__DEPENDENCIES_1 = libcourierauthcommon.la
  am_libauthcustom_la_OBJECTS = authcustom.lo preauthcustom.lo
-@@ -401,8 +400,14 @@
+ libauthcustom_la_OBJECTS = $(am_libauthcustom_la_OBJECTS)
+@@ -443,8 +442,14 @@
  userdb = @userdb@
  vpopmail_home = @vpopmail_home@
  AUTOMAKE_OPTIONS = dist-bzip2
@@ -42,7 +42,7 @@
  INCLUDES = $(LTDLINCL)
  modules = @LIBAUTHUSERDB@ \
  	@LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \
-@@ -411,9 +416,11 @@
+@@ -453,9 +458,11 @@
  
  pkglibexecdir = $(libexecdir)/courier-authlib
  pkglibexec_SCRIPTS = authsystem.passwd
@@ -57,7 +57,7 @@
  
  sbin_SCRIPTS = authdaemond
  EXTRA_LTLIBRARIES = libauthuserdb.la \
-@@ -571,8 +578,8 @@
+@@ -613,8 +620,8 @@
  
  libcourierauthsaslclient_la_LIBADD = libcourierauth.la
  libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$'
@@ -68,7 +68,7 @@
  
  courierauthconfig_SOURCES = authinfo.c
  authpasswd_SOURCES = authpasswd.c
-@@ -613,7 +620,7 @@
+@@ -655,7 +662,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
  
@@ -77,7 +77,7 @@
  man_MANS = $(man1) $(man3)
  BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
  	authdaemonrc.h vpopmail_config.h packageversion.h \
-@@ -997,8 +1004,8 @@
+@@ -1038,8 +1045,8 @@
  	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -88,7 +88,7 @@
  	done
  uninstall-man1:
  	@$(NORMAL_UNINSTALL)
-@@ -1042,8 +1049,8 @@
+@@ -1083,8 +1090,8 @@
  	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -99,7 +99,7 @@
  	done
  uninstall-man3:
  	@$(NORMAL_UNINSTALL)
-@@ -1422,15 +1429,21 @@
+@@ -1462,17 +1469,23 @@
  
  info-am:
  
@@ -119,17 +119,20 @@
 +@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-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \
 -	install-pkglibexecSCRIPTS install-sbinPROGRAMS \
 -	install-sbinSCRIPTS
 -	@$(NORMAL_INSTALL)
 -	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-+@HAVE_BASE_FALSE@install-exec-am: install-pkglibLTLIBRARIES
-+@HAVE_BASE_FALSE@	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
++install-dvi: install-dvi-recursive
  
- install-info: install-info-recursive
+ install-html: install-html-recursive
  
-@@ -1540,6 +1553,19 @@
+@@ -1590,6 +1603,19 @@
  @HAVE_LDAP_FALSE@uninstall-authldaprc:
  @HAVE_LDAP_FALSE@	@:
  
@@ -149,7 +152,7 @@
  authldaprc.h:
  	echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
  
-@@ -1569,16 +1595,22 @@
+@@ -1619,16 +1645,22 @@
  authpiperc.h:
  	echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
  
@@ -181,7 +184,7 @@
  
  authdaemonrc.h:
  	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
-@@ -1621,18 +1653,18 @@
+@@ -1671,18 +1703,18 @@
  # automake still a bit stupid...
  
  install-data-hook: install-authdaemonrc install-authpgsqlrc \
@@ -209,7 +212,7 @@
  	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
  		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
  				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
-@@ -1650,7 +1682,7 @@
+@@ -1700,7 +1732,7 @@
  				$(DESTDIR)$(sbindir)/userdb-test-cram-md5
  
  uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
@@ -218,7 +221,7 @@
  	test "@AUTHUSERDB@" = "" && exit 0 ;\
  		rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \
  				$(DESTDIR)$(sbindir)/vchkpw2userdb \
-@@ -1664,7 +1696,7 @@
+@@ -1714,7 +1746,7 @@
  	CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
  
  authlib.3: authlib.3.in
@@ -227,7 +230,7 @@
  
  @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml docbook/sgml2html
  @HAVE_SGML_TRUE@	docbook/sgml2html authpasswd.sgml authpasswd.html
-@@ -1738,10 +1770,10 @@
+@@ -1788,10 +1820,10 @@
  	@SHELL@ authmigrate
  
  install-configure:
diff --git a/security/courier-authlib/files/patch-configure b/security/courier-authlib/files/patch-configure
index b749ece0f85d..8e376bfedb8a 100644
--- a/security/courier-authlib/files/patch-configure
+++ b/security/courier-authlib/files/patch-configure
@@ -1,54 +1,93 @@
---- configure.orig	Sat Dec 30 06:27:58 2006
-+++ configure	Mon Jan  1 22:27:57 2007
-@@ -20585,8 +20585,12 @@
+--- configure.orig	2007-09-29 16:43:43.000000000 +0200
++++ configure	2007-10-03 13:14:36.000000000 +0200
+@@ -942,7 +942,11 @@
+ HAVE_SGML_FALSE
+ subdirs
+ LIBOBJS
+-LTLIBOBJS'
++LTLIBOBJS
++HAVE_BASE_TRUE
++HAVE_BASE_FALSE
++HAVE_USERDB_TRUE
++HAVE_USERDB_FALSE'
+ ac_subst_files=''
+       ac_precious_vars='build_alias
+ host_alias
+@@ -959,7 +963,7 @@
+ CXXCPP
+ F77
+ FFLAGS'
+-ac_subdirs_all='libltdl bdbobj gdbmobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog'
++ac_subdirs_all='libltdl bdbobj gdbmobj md5 sha1 libhmac numlib   rfc822 random128 liblock liblog'
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+@@ -2508,7 +2512,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.
+@@ -21215,8 +21219,12 @@
  
  if test "$doauthuserdb" = "no"
  then
 +	HAVE_USERDB_TRUE='#'
-+	HAVE_USERDB_FALSE=''
++	HAVE_USERDB_FALSE=
  	AUTHUSERDB=""
  else
-+	HAVE_USERDB_TRUE=''
++	HAVE_USERDB_TRUE=
 +	HAVE_USERDB_FALSE='#'
  	AUTHUSERDB="authuserdb"
  	LIBAUTHUSERDB="libauthuserdb.la"
  
-@@ -22351,7 +22355,21 @@
+@@ -22894,6 +22902,20 @@
  fi
  
  
 +if test "${with_base+set}" = set; then
-+  withval="$with_base"
-+  dobase="$withval"
++	withval="$with_base"
++	dobase="$withval"
 +else
-+  dobase="yes"
++	dobase="yes"
 +fi;
- 
++
 +if test "$dobase" = "no"; then
-+  HAVE_BASE_TRUE='#'
-+  HAVE_BASE_FALSE=''
++	HAVE_BASE_TRUE='#'
++	HAVE_BASE_FALSE=
 +else
-+  HAVE_BASE_TRUE=''
-+  HAVE_BASE_FALSE='#'
++	HAVE_BASE_TRUE=
++	HAVE_BASE_FALSE='#'
 +fi
-+  
+ 
+  if test "$HAVE_LDAP" = 1; then
+   HAVE_LDAP_TRUE=
+@@ -23604,7 +23626,7 @@
  
  
- if test "$HAVE_LDAP" = 1; then
-@@ -23711,9 +23729,9 @@
+ 	_SAVE_LIBS=$LIBS
+-	LIBS="$VPOPMAILLIBS $CRYPTLIBS $LIBS"
++	LIBS="$VPOPMAILLIBS -lcrypt -lcrypt -lcrypt $CRYPTLIBS $LIBS"
+ 	{ echo "$as_me:$LINENO: checking for open_smtp_relay" >&5
+ echo $ECHO_N "checking for open_smtp_relay... $ECHO_C" >&6; }
+ if test "${ac_cv_func_open_smtp_relay+set}" = set; then
+@@ -24180,9 +24202,9 @@
  if test "$doauthmysql" = ""
  then
  	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
+-	{ echo "$as_me:$LINENO: checking for mysql_connect" >&5
+-echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6; }
 -if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
++echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6; }
 +if test "${ac_cv_func_mysql_real_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -23722,12 +23740,12 @@
+@@ -24191,12 +24213,12 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -64,81 +103,77 @@
      Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
      <limits.h> exists even on freestanding compilers.  */
  
-@@ -23737,7 +23755,7 @@
+@@ -24206,7 +24228,7 @@
  # include <assert.h>
  #endif
  
 -#undef mysql_connect
 +#undef mysql_real_connect
  
- /* Override any gcc2 internal prototype to avoid an error.  */
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -24214,18 +24236,18 @@
  #ifdef __cplusplus
-@@ -23746,14 +23764,14 @@
+ extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
 -char mysql_connect ();
 +char mysql_real_connect ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
+-#if defined __stub_mysql_connect || defined __stub___mysql_connect
++#if defined __stub_mysql_real_connect || defined __stub___mysql_real_connect
  choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
  #endif
- #ifdef __cplusplus
- }
-@@ -23762,7 +23780,7 @@
+ 
  int
  main ()
  {
--return f != mysql_connect;
-+return f != mysql_real_connect;
+-return mysql_connect ();
++return mysql_real_connect ();
    ;
    return 0;
  }
-@@ -23789,19 +23807,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+@@ -24248,20 +24270,20 @@
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
 -  ac_cv_func_mysql_connect=yes
 +  ac_cv_func_mysql_real_connect=yes
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
+-	ac_cv_func_mysql_connect=no
++	ac_cv_func_mysql_real_connect=no
  fi
- rm -f conftest.err conftest.$ac_objext \
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
+-echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6; }
 -if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
++echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6; }
 +if test $ac_cv_func_mysql_real_connect = yes; then
    doauthmysql="yes"
  
  fi
-@@ -23911,9 +23929,9 @@
+@@ -24362,9 +24384,9 @@
  else
  	saveLIBS="$LIBS"
  	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
+-	{ echo "$as_me:$LINENO: checking for mysql_connect" >&5
+-echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6; }
 -if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
++echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6; }
 +if test "${ac_cv_func_mysql_real_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -23922,12 +23940,12 @@
+@@ -24373,12 +24395,12 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -154,75 +189,93 @@
      Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
      <limits.h> exists even on freestanding compilers.  */
  
-@@ -23937,7 +23955,7 @@
+@@ -24388,7 +24410,7 @@
  # include <assert.h>
  #endif
  
 -#undef mysql_connect
 +#undef mysql_real_connect
  
- /* Override any gcc2 internal prototype to avoid an error.  */
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -24396,18 +24418,18 @@
  #ifdef __cplusplus
-@@ -23946,14 +23964,14 @@
+ extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
 -char mysql_connect ();
 +char mysql_real_connect ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
+-#if defined __stub_mysql_connect || defined __stub___mysql_connect
++#if defined __stub_mysql_real_connect || defined __stub___mysql_real_connect
  choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
  #endif
- #ifdef __cplusplus
- }
-@@ -23962,7 +23980,7 @@
+ 
  int
  main ()
  {
--return f != mysql_connect;
-+return f != mysql_real_connect;
+-return mysql_connect ();
++return mysql_real_connect ();
    ;
    return 0;
  }
-@@ -23989,19 +24007,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+@@ -24430,20 +24452,20 @@
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
 -  ac_cv_func_mysql_connect=yes
 +  ac_cv_func_mysql_real_connect=yes
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
+-	ac_cv_func_mysql_connect=no
++	ac_cv_func_mysql_real_connect=no
  fi
- rm -f conftest.err conftest.$ac_objext \
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
+-echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6; }
 -if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
++echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6; }
 +if test $ac_cv_func_mysql_real_connect = yes; then
    LIBAUTHMYSQL="libauthmysql.la"
  		HAVE_AUTHMYSQL=1
  else
-@@ -26433,6 +26451,10 @@
- s,@subdirs@,$subdirs,;t t
- s,@LIBOBJS@,$LIBOBJS,;t t
- s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-+s,@HAVE_BASE_TRUE@,$HAVE_BASE_TRUE,;t t
-+s,@HAVE_BASE_FALSE@,$HAVE_BASE_FALSE,;t t
-+s,@HAVE_USERDB_TRUE@,$HAVE_USERDB_TRUE,;t t
-+s,@HAVE_USERDB_FALSE@,$HAVE_USERDB_FALSE,;t t
- CEOF
+@@ -25973,7 +25995,7 @@
+   HAVE_SGML_FALSE=
+ fi
+ 
+-subdirs="$subdirs libltdl bdbobj gdbmobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog"
++subdirs="$subdirs libltdl bdbobj gdbmobj md5 sha1 libhmac numlib   rfc822 random128 liblock liblog"
+ 
  
+ ac_config_files="$ac_config_files Makefile authdaemond authdaemonrc authsystem.passwd README.authdebug.html dbobj.h authmigrate courier-authlib.spec courier-authlib.lpspec courier-authlib.sysvinit userdb-test-cram-md5.pl"
+@@ -26881,7 +26903,7 @@
+ LIBAUTHSHADOW!$LIBAUTHSHADOW$ac_delim
+ LIBAUTHPWD!$LIBAUTHPWD$ac_delim
+ vpopmail_home!$vpopmail_home$ac_delim
+-VPOPMAILLIBS!$VPOPMAILLIBS$ac_delim
++VPOPMAILLIBS!$VPOPMAILLIBS -lcrypt -lcrypt -lcrypt$ac_delim
+ LIBAUTHVCHKPW!$LIBAUTHVCHKPW$ac_delim
+ authpgsqlrc!$authpgsqlrc$ac_delim
+ PG_CONFIG!$PG_CONFIG$ac_delim
+@@ -26915,9 +26937,12 @@
+ subdirs!$subdirs$ac_delim
+ LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
++HAVE_BASE_TRUE!$HAVE_BASE_TRUE$ac_delim
++HAVE_BASE_FALSE!$HAVE_BASE_FALSE$ac_delim
++HAVE_AUTHDB_TRUE!$HAVE_AUTHDB_TRUE$ac_delim
++HAVE_AUTHDB_FALSE!$HAVE_AUTHDB_FALSE$ac_delim
  _ACEOF
+-
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5