update to 0.60.0

1 files changed, 25 insertions, 22 deletions

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: