update to 0.59

4 files changed, 51 insertions, 51 deletions

diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 8ad5444dc74f..58b2522e5535 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.58
-PORTREVISION=	2
+PORTVERSION=	0.59
+PORTREVISION=	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 48e44e7a45f0..74c90eac2910 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,3 +1,3 @@
-MD5 (courier-authlib-0.58.tar.bz2) = fb691558d611cb191ae6a83002f0195b
-SHA256 (courier-authlib-0.58.tar.bz2) = d877cc6c65e90471ec9410c5ce7af467ba5beb3922b9cfbf2bf6aa24f6bdc7ad
-SIZE (courier-authlib-0.58.tar.bz2) = 2006735
+MD5 (courier-authlib-0.59.tar.bz2) = dbfc58a17149fd0f8c0983662ecc8ba8
+SHA256 (courier-authlib-0.59.tar.bz2) = db8cdb00493517094ebebfd131948182ad2f153ec1c2633481dbae1089920b99
+SIZE (courier-authlib-0.59.tar.bz2) = 2102930
diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in
index 0318890c8005..c5334cc17384 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 Jul 23 02:06:37 2005
-+++ Makefile.in	Sat Jul 23 15:35:52 2005
-@@ -47,11 +47,10 @@
+--- Makefile.in.orig	Sat Dec 30 06:27:59 2006
++++ Makefile.in	Mon Jan  1 22:23:31 2007
+@@ -45,11 +45,10 @@
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -16,7 +16,7 @@
  DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
  	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  	$(srcdir)/README.authdebug.html.in $(srcdir)/authdaemond.in \
-@@ -87,7 +86,7 @@
+@@ -85,7 +84,7 @@
  	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkglibexecdir)" \
  	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \
  	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"
@@ -25,11 +25,11 @@
  LTLIBRARIES = $(pkglib_LTLIBRARIES)
  am__DEPENDENCIES_1 = libcourierauthcommon.la
  am_libauthcustom_la_OBJECTS = authcustom.lo preauthcustom.lo
-@@ -400,8 +399,14 @@
+@@ -401,8 +400,14 @@
  userdb = @userdb@
  vpopmail_home = @vpopmail_home@
  AUTOMAKE_OPTIONS = dist-bzip2
--SUBDIRS = libltdl @DBSUBDIR@ md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
+-SUBDIRS = @LIBLTDL_SUBDIR@ @DBSUBDIR@ md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
 -DIST_SUBDIRS = libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
 +SUBDIRS = libltdl @DBSUBDIR@ md5 sha1 libhmac numlib
 +@HAVE_USERDB_TRUE@SUBDIRS += makedat userdb
@@ -42,7 +42,7 @@
  INCLUDES = $(LTDLINCL)
  modules = @LIBAUTHUSERDB@ \
  	@LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \
-@@ -410,9 +415,11 @@
+@@ -411,9 +416,11 @@
  
  pkglibexecdir = $(libexecdir)/courier-authlib
  pkglibexec_SCRIPTS = authsystem.passwd
@@ -57,7 +57,7 @@
  
  sbin_SCRIPTS = authdaemond
  EXTRA_LTLIBRARIES = libauthuserdb.la \
-@@ -570,8 +577,8 @@
+@@ -571,8 +578,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
-@@ -601,7 +608,7 @@
+@@ -613,7 +620,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 \
-@@ -985,8 +992,8 @@
+@@ -997,8 +1004,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)
-@@ -1030,8 +1037,8 @@
+@@ -1042,8 +1049,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)
-@@ -1398,15 +1405,21 @@
+@@ -1422,15 +1429,21 @@
  
  info-am:
  
@@ -129,7 +129,7 @@
  
  install-info: install-info-recursive
  
-@@ -1516,6 +1529,19 @@
+@@ -1540,6 +1553,19 @@
  @HAVE_LDAP_FALSE@uninstall-authldaprc:
  @HAVE_LDAP_FALSE@	@:
  
@@ -149,12 +149,12 @@
  authldaprc.h:
  	echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
  
-@@ -1545,16 +1571,22 @@
+@@ -1569,16 +1595,22 @@
  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
 -	rm -f authdaemonrc.tmp
@@ -181,7 +181,7 @@
  
  authdaemonrc.h:
  	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
-@@ -1597,18 +1629,18 @@
+@@ -1621,18 +1653,18 @@
  # automake still a bit stupid...
  
  install-data-hook: install-authdaemonrc install-authpgsqlrc \
@@ -190,26 +190,26 @@
  	:
  
  install-exec-hook:
--	$(mkinstalldirs) $(DESTDIR)$(bindir)
--	$(mkinstalldirs) $(DESTDIR)$(sbindir)
--	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
+-	$(mkinstalldirs) $(DESTDIR)$(bindir) || :
+-	$(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@
-+@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)$(sbindir)
-+@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
++@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)$(bindir) || :
++@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)$(sbindir) || :
++@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
 +@HAVE_BASE_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
-+@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@
++@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
 +@HAVE_BASE_TRUE@	chmod 750 $(DESTDIR)@authdaemonvar@
 +@HAVE_BASE_TRUE@	-chown @mailuser@ $(DESTDIR)@authdaemonvar@
 +@HAVE_BASE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
  	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
  		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
  				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
-@@ -1626,7 +1658,7 @@
+@@ -1650,7 +1682,7 @@
  				$(DESTDIR)$(sbindir)/userdb-test-cram-md5
  
  uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
@@ -218,7 +218,7 @@
  	test "@AUTHUSERDB@" = "" && exit 0 ;\
  		rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \
  				$(DESTDIR)$(sbindir)/vchkpw2userdb \
-@@ -1640,7 +1672,7 @@
+@@ -1664,7 +1696,7 @@
  	CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
  
  authlib.3: authlib.3.in
@@ -227,7 +227,7 @@
  
  @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml docbook/sgml2html
  @HAVE_SGML_TRUE@	docbook/sgml2html authpasswd.sgml authpasswd.html
-@@ -1714,10 +1746,10 @@
+@@ -1738,10 +1770,10 @@
  	@SHELL@ authmigrate
  
  install-configure:
diff --git a/security/courier-authlib/files/patch-configure b/security/courier-authlib/files/patch-configure
index 5a5cecf29f35..b749ece0f85d 100644
--- a/security/courier-authlib/files/patch-configure
+++ b/security/courier-authlib/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Mar  1 03:22:02 2005
-+++ configure	Fri Apr 22 19:13:43 2005
-@@ -21084,8 +21084,12 @@
+--- configure.orig	Sat Dec 30 06:27:58 2006
++++ configure	Mon Jan  1 22:27:57 2007
+@@ -20585,8 +20585,12 @@
  
  if test "$doauthuserdb" = "no"
  then
@@ -13,8 +13,8 @@
  	AUTHUSERDB="authuserdb"
  	LIBAUTHUSERDB="libauthuserdb.la"
  
-@@ -22778,7 +22782,21 @@
- 
+@@ -22351,7 +22355,21 @@
+ fi
  
  
 +if test "${with_base+set}" = set; then
@@ -34,8 +34,8 @@
 +  
  
  
- # Check whether --with-authpwd or --without-authpwd was given.
-@@ -24111,9 +24129,9 @@
+ if test "$HAVE_LDAP" = 1; then
+@@ -23711,9 +23729,9 @@
  if test "$doauthmysql" = ""
  then
  	LIBS="$MYSQL_LIBS $LIBS"
@@ -48,7 +48,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -24122,12 +24140,12 @@
+@@ -23722,12 +23740,12 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -64,7 +64,7 @@
      Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
      <limits.h> exists even on freestanding compilers.  */
  
-@@ -24137,7 +24155,7 @@
+@@ -23737,7 +23755,7 @@
  # include <assert.h>
  #endif
  
@@ -73,7 +73,7 @@
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -24146,14 +24164,14 @@
+@@ -23746,14 +23764,14 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -91,7 +91,7 @@
  #endif
  #ifdef __cplusplus
  }
-@@ -24162,7 +24180,7 @@
+@@ -23762,7 +23780,7 @@
  int
  main ()
  {
@@ -100,7 +100,7 @@
    ;
    return 0;
  }
-@@ -24189,19 +24207,19 @@
+@@ -23789,19 +23807,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -125,7 +125,7 @@
    doauthmysql="yes"
  
  fi
-@@ -24311,9 +24329,9 @@
+@@ -23911,9 +23929,9 @@
  else
  	saveLIBS="$LIBS"
  	LIBS="$MYSQL_LIBS $LIBS"
@@ -138,7 +138,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -24322,12 +24340,12 @@
+@@ -23922,12 +23940,12 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -154,7 +154,7 @@
      Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
      <limits.h> exists even on freestanding compilers.  */
  
-@@ -24337,7 +24355,7 @@
+@@ -23937,7 +23955,7 @@
  # include <assert.h>
  #endif
  
@@ -163,7 +163,7 @@
  
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -24346,14 +24364,14 @@
+@@ -23946,14 +23964,14 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -181,7 +181,7 @@
  #endif
  #ifdef __cplusplus
  }
-@@ -24362,7 +24380,7 @@
+@@ -23962,7 +23980,7 @@
  int
  main ()
  {
@@ -190,7 +190,7 @@
    ;
    return 0;
  }
-@@ -24389,19 +24407,19 @@
+@@ -23989,19 +24007,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -215,7 +215,7 @@
    LIBAUTHMYSQL="libauthmysql.la"
  		HAVE_AUTHMYSQL=1
  else
-@@ -26671,6 +26689,10 @@
+@@ -26433,6 +26451,10 @@
  s,@subdirs@,$subdirs,;t t
  s,@LIBOBJS@,$LIBOBJS,;t t
  s,@LTLIBOBJS@,$LTLIBOBJS,;t t