update to 0.65.0

Feature safe:	yes

4 files changed, 44 insertions, 31 deletions

diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index f4244da23b6f..cd7627790d6c 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.64.0
+PORTVERSION=	0.65.0
 CATEGORIES?=	security mail
 .if defined(PKGNAMESUFFIX)
 MASTER_SITES=	SF/courier/authlib/${PORTVERSION}
diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo
index 561dfd0aed03..3313c913af13 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (courier-authlib-0.64.0.tar.bz2) = 69497dfe8d4110456cc3126350dbcebd7e41ab78505c57793df96ed3fb795039
-SIZE (courier-authlib-0.64.0.tar.bz2) = 2267236
+SHA256 (courier-authlib-0.65.0.tar.bz2) = db3e34ee2b075897864c44aaae924388c74b32ed40b83f0fcf8626a060c1ea47
+SIZE (courier-authlib-0.65.0.tar.bz2) = 2303751
diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in
index b5668376f21d..6c3ff7ad9fe8 100644
--- a/security/courier-authlib/files/patch-Makefile.in
+++ b/security/courier-authlib/files/patch-Makefile.in
@@ -29,23 +29,23 @@
  libcourierauth_la_DEPENDENCIES = libhmac/libhmac.la md5/libmd5.la \
  	sha1/libsha1.la numlib/libnumlib.la random128/librandom128.la \
  	rfc822/libencode.la
-@@ -235,7 +240,8 @@
+@@ -235,8 +240,9 @@
  	$(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \
  	$(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \
  	$(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \
--	$(libauthuserdb_la_SOURCES) $(libcourierauth_la_SOURCES) \
-+	$(libauthuserdb_la_SOURCES) $(libauthvchkpw_la_SOURCES) \
-+	$(libcourierauth_la_SOURCES) \
+	$(libauthsqlite_la_SOURCES) $(libauthuserdb_la_SOURCES) \
++	$(libauthvchkpw_la_SOURCES) \
+	$(libcourierauth_la_SOURCES) \
  	$(libcourierauthcommon_la_SOURCES) \
  	$(libcourierauthsasl_la_SOURCES) \
  	$(libcourierauthsaslclient_la_SOURCES) \
-@@ -247,7 +253,8 @@
+@@ -247,8 +253,9 @@
  	$(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \
  	$(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \
  	$(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \
--	$(libauthuserdb_la_SOURCES) $(libcourierauth_la_SOURCES) \
-+	$(libauthuserdb_la_SOURCES) $(libauthvchkpw_la_SOURCES) \
-+	$(libcourierauth_la_SOURCES) \
+	$(libauthsqlite_la_SOURCES) $(libauthuserdb_la_SOURCES) \
++	$(libauthvchkpw_la_SOURCES) \
+	$(libcourierauth_la_SOURCES) \
  	$(libcourierauthcommon_la_SOURCES) \
  	$(libcourierauthsasl_la_SOURCES) \
  	$(libcourierauthsaslclient_la_SOURCES) \
@@ -69,7 +69,7 @@
  AM_CPPFLAGS = -I liblock
  modules = @LIBAUTHUSERDB@ \
  	@LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \
- 	@LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ \
+ 	@LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ @LIBAUTHSQLITE@ \
 -	@LIBAUTHCUSTOM@ @LIBAUTHPIPE@
 +	@LIBAUTHCUSTOM@ @LIBAUTHVCHKPW@ @LIBAUTHPIPE@
  
@@ -124,10 +124,12 @@
  man_MANS = $(man1) $(man3) auth_sasl_ex.3
  BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
  	authdaemonrc.h packageversion.h \
-@@ -789,8 +811,8 @@
+@@ -789,10 +811,10 @@
  	  else :; fi; \
  	done; \
  	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
 -	  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)'"; \
@@ -135,15 +137,17 @@
  	}
  
  uninstall-pkglibLTLIBRARIES:
-@@ -828,6 +850,8 @@
+@@ -828,8 +850,10 @@
  	$(libauthshadow_la_LINK)  $(libauthshadow_la_OBJECTS) $(libauthshadow_la_LIBADD) $(LIBS)
- libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) 
+ libauthsqlite.la: $(libauthsqlite_la_OBJECTS) $(libauthsqlite_la_DEPENDENCIES) $(EXTRA_libauthsqlite_la_DEPENDENCIES) 
+ 	$(libauthsqlite_la_LINK)  $(libauthsqlite_la_OBJECTS) $(libauthsqlite_la_LIBADD) $(LIBS)
+ libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) $(EXTRA_libauthuserdb_la_DEPENDENCIES) 
  	$(libauthuserdb_la_LINK)  $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS)
 +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: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES) $(EXTRA_libcourierauth_la_DEPENDENCIES) 
  	$(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS)
- libcourierauthcommon.la: $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_DEPENDENCIES) 
+ libcourierauthcommon.la: $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_DEPENDENCIES) $(EXTRA_libcourierauthcommon_la_DEPENDENCIES) 
 @@ -1070,6 +1094,8 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authtest.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdb.Plo@am__quote@
@@ -287,8 +291,8 @@
  # automake still a bit stupid...
  
  install-data-hook: install-authdaemonrc install-authpgsqlrc \
--	install-authldaprc install-authmysqlrc
-+	install-authldaprc install-ldapschema install-authmysqlrc
+-	install-authldaprc install-authmysqlrc install-authsqliterc
++	install-authldaprc install-ldapschema install-authmysqlrc install-authsqliterc
  	:
  
  install-exec-hook:
@@ -319,7 +323,7 @@
 @@ -1842,9 +1904,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
+ uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc uninstall-authsqliterc
 -	rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
 +@HAVE_BASE_TRUE@	rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
  	test "@AUTHUSERDB@" = "" && exit 0 ;\
diff --git a/security/courier-authlib/files/patch-configure b/security/courier-authlib/files/patch-configure
index 8a9e19aa1c8f..487e70daec5d 100644
--- a/security/courier-authlib/files/patch-configure
+++ b/security/courier-authlib/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2009-06-27 18:09:14.000000000 +0200
-+++ configure	2009-07-02 11:24:49.000000000 +0200
-@@ -796,6 +796,10 @@
+--- configure.orig	2012-10-14 12:45:02.000000000 +0200
++++ configure	2012-10-14 12:46:15.000000000 +0200
+@@ -622,6 +622,10 @@
  am__EXEEXT_FALSE
  am__EXEEXT_TRUE
  LTLIBOBJS
@@ -11,7 +11,7 @@
  LIBOBJS
  HAVE_SGML_FALSE
  HAVE_SGML_TRUE
-@@ -825,6 +829,9 @@
+@@ -656,6 +660,9 @@
  PGSQL_LIBS
  PG_CONFIG
  authpgsqlrc
@@ -21,7 +21,7 @@
  LIBAUTHPWD
  LIBAUTHSHADOW
  SHADOWLIBS
-@@ -1688,6 +1695,7 @@
+@@ -1519,6 +1526,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
@@ -29,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
-@@ -2498,7 +2506,7 @@
+@@ -2755,7 +2763,7 @@
  fi
  
  fi
 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 +INSTALL_STRIP_PROGRAM="${INSTALL_PROGRAM} -s"
  
- { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
  $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-@@ -15118,8 +15126,12 @@
+@@ -13532,8 +13540,12 @@
  
  if test "$doauthuserdb" = "no"
  then
@@ -51,7 +51,7 @@
  	AUTHUSERDB="authuserdb"
  	LIBAUTHUSERDB="libauthuserdb.la"
  
-@@ -16874,6 +16886,20 @@
+@@ -13991,6 +14003,20 @@
  fi
  
  
@@ -72,7 +72,7 @@
  
   if test "$HAVE_LDAP" = 1; then
    HAVE_LDAP_TRUE=
-@@ -17554,6 +17580,256 @@
+@@ -14209,6 +14235,256 @@
  
  
  
@@ -327,5 +327,14 @@
 +
 +
  # Check whether --with-authpgsqlrc was given.
- if test "${with_authpgsqlrc+set}" = set; then
+ if test "${with_authpgsqlrc+set}" = set; then :
    withval=$with_authpgsqlrc; authpgsqlrc="$withval"
+@@ -14541,7 +14817,7 @@
+ 	LIBS="$saveLIBS"
+ fi
+ 
+-if test "$doauthmysql" != "yes"
++if test "$doauthsqlite" != "yes"
+ then
+ 	SQLITE_LIBS=""
+ 	SQLITE_CFLAGS=""