Update courier-authlib to 0.69.1. Changes unknown, but necessary for

maildrop.

6 files changed, 90 insertions, 264 deletions

diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index ec5ec827337..f11c2bbb082 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2020/01/26 17:32:02 rillig Exp $
+# $NetBSD: Makefile,v 1.57 2020/04/13 19:11:07 joerg Exp $
 
 .include "Makefile.common"
 
-DISTNAME=	courier-authlib-0.64.0
-PKGREVISION=	14
+DISTNAME=	courier-authlib-0.69.1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -71,7 +70,7 @@ INSTALL_AM_MAKEFLAGS=	authdaemonrc=${EGDIR}/authdaemonrc		\
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS}					\
 			AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
 
-POST_INSTALL_TARGETS=	post-install-common post-install-authdaemon
+POST_INSTALL_TARGETS=	post-install-common
 
 .include "options.mk"
 
@@ -86,23 +85,17 @@ GENERATE_PLIST+=	${TEST} -f ${DESTDIR}${PREFIX}/${file} &&	\
 .endfor
 GENERATE_PLIST+=	${TRUE};
 
-INSTALLATION_DIRS+=	bin sbin
+INSTALLATION_DIRS+=	bin sbin ${EGDIR} ${DOCDIR}
 
-post-install: ${POST_INSTALL_TARGETS}
-
-post-install-common:
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${DESTDIR}${PREFIX}/sbin
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.authdebug.html ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.html ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README_authlib.html ${DESTDIR}${DOCDIR}
-
-post-install-authdaemon:
-	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${EGDIR}/authdaemonrc.dist
-	${CHMOD} ${SHAREMODE} ${DESTDIR}${EGDIR}/authdaemonrc.dist
+	${INSTALL_DATA} ${WRKSRC}/authdaemonrc ${DESTDIR}/${EGDIR}/authdaemonrc.dist
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.include "../../mail/courier-unicode/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/courier-authlib/PLIST b/security/courier-authlib/PLIST
index 46a247af81b..6999ab0874e 100644
--- a/security/courier-authlib/PLIST
+++ b/security/courier-authlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2014/03/11 14:05:13 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.12 2020/04/13 19:11:07 joerg Exp $
 bin/courierauthconfig
 include/courier_auth_config.h
 include/courierauth.h
@@ -6,12 +6,16 @@ include/courierauthdebug.h
 include/courierauthsasl.h
 include/courierauthsaslclient.h
 include/courierauthstaticlist.h
+lib/courier-authlib/libauthpipe.la
+lib/courier-authlib/libauthpwd.la
+lib/courier-authlib/libauthuserdb.la
 lib/courier-authlib/libcourierauth.la
 lib/courier-authlib/libcourierauthcommon.la
 lib/courier-authlib/libcourierauthsasl.la
 lib/courier-authlib/libcourierauthsaslclient.la
 libexec/courier-authlib/authdaemond
 libexec/courier-authlib/authsystem.passwd
+libexec/courier-authlib/makedatprog
 man/man1/authpasswd.1
 man/man1/authtest.1
 man/man1/courierlogger.1
@@ -20,11 +24,13 @@ man/man3/auth_generic.3
 man/man3/auth_getoption.3
 man/man3/auth_getuserinfo.3
 man/man3/auth_login.3
+man/man3/auth_mkhomedir.3
 man/man3/auth_passwd.3
 man/man3/auth_sasl.3
 man/man3/auth_sasl_ex.3
 man/man3/authlib.3
 man/man8/makeuserdb.8
+man/man8/pw2userdb.8
 man/man8/userdb.8
 man/man8/userdbpw.8
 sbin/authdaemond
@@ -32,8 +38,14 @@ sbin/authenumerate
 sbin/authpasswd
 sbin/authtest
 sbin/courierlogger
+sbin/makeuserdb
+sbin/pw2userdb
 sbin/sysconftool
+sbin/userdb
+sbin/userdb-test-cram-md5
+sbin/userdbpw
 share/doc/courier-authlib/INSTALL.html
 share/doc/courier-authlib/README.authdebug.html
 share/doc/courier-authlib/README.html
 share/doc/courier-authlib/README_authlib.html
+share/examples/courier-authlib/authdaemonrc.dist
diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo
index 9be46e84d64..d0272b223b6 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2015/11/04 01:17:42 agc Exp $
+$NetBSD: distinfo,v 1.17 2020/04/13 19:11:07 joerg Exp $
 
-SHA1 (courier-authlib-0.64.0.tar.bz2) = ea8a38b81135f23ab8084fc89751fb320fe6b7d1
-RMD160 (courier-authlib-0.64.0.tar.bz2) = a2933436eb4ae799c2ef760a12b94dec6c3747a9
-SHA512 (courier-authlib-0.64.0.tar.bz2) = 9a1cb195bfa00c02294f87e5e01254108d5b2bc9ae2e32abbb38d9dc0af108748eec4fa365efcc244ec194751b69ef7e26963a1b0315c386758502938421fd80
-Size (courier-authlib-0.64.0.tar.bz2) = 2267236 bytes
-SHA1 (patch-aa) = bd3f7cc7a809717be7b32e5eb5890f6a8175b439
-SHA1 (patch-ab) = 89ef33fa3dc4aba6aed2b3fed19ccdcf8b1b47fd
+SHA1 (courier-authlib-0.69.1.tar.bz2) = 4f2a26f05b3b4d2d794974804699a6a3c06542b2
+RMD160 (courier-authlib-0.69.1.tar.bz2) = a29a44f6540f46b853c8b2202f0594e8df87e471
+SHA512 (courier-authlib-0.69.1.tar.bz2) = b6eb14b53ac992fb81b4ef1dd98273b92f5ef61f88bad291de82f9dc0cdf33b7cb01b838472c53c40c292165b5b54d2c3d9aa97d26908b0a4d6344d596181abe
+Size (courier-authlib-0.69.1.tar.bz2) = 2204546 bytes
+SHA1 (patch-Makefile.in) = 01435a04cc4f32badd76ab3edffeb5466099d32d
+SHA1 (patch-configure) = d4139c665f2d2178cf5ca7f9a5928961ad74fbdd
diff --git a/security/courier-authlib/patches/patch-Makefile.in b/security/courier-authlib/patches/patch-Makefile.in
new file mode 100644
index 00000000000..8bab6c986f6
--- /dev/null
+++ b/security/courier-authlib/patches/patch-Makefile.in
@@ -0,0 +1,58 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/04/13 19:11:07 joerg Exp $
+
+--- Makefile.in.orig	2019-07-24 23:58:04.000000000 +0000
++++ Makefile.in
+@@ -725,7 +725,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h 
+ 
+ DISTCLEANFILES = dbobj.config README_authlib.html
+ commonlibdep = libcourierauthcommon.la
+-commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init' -avoid-version
++commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init'
+ commonlibadd = libcourierauthcommon.la
+ libcourierauthcommon_t = @CRYPTLIBS@
+ libcourierauthcommon_la_SOURCES = \
+@@ -743,7 +743,7 @@ libcourierauthcommon_la_SOURCES = \
+ 
+ libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
+ libcourierauthcommon_la_LIBADD = libcourierauth.la
+-libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%) -avoid-version
++libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t)
+ libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
+ 	authmoduser2.c authmoduser3.c debug.c \
+ 	courierauthdebug.h \
+@@ -752,7 +752,7 @@ libcourierauth_la_SOURCES = authdaemon.c
+ libcourierauth_la_LIBADD = libs/libhmac/libhmac.la libs/md5/libmd5.la libs/sha1/libsha1.la libs/numlib/libnumlib.la \
+ 	libs/random128/librandom128.la libs/rfc822/libencode.la
+ 
+-libcourierauth_la_LDFLAGS = @NETLIBS@ -avoid-version
++libcourierauth_la_LDFLAGS = @NETLIBS@
+ 
+ # The userdb module
+ libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
+@@ -854,7 +854,7 @@ libcourierauthsasl_la_SOURCES = \
+ 	authsaslfrombase64.c authsasltobase64.c
+ 
+ libcourierauthsasl_la_LIBADD = libcourierauthcommon.la libcourierauth.la
+-libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex|auth_sasl_extract_userid$$' -avoid-version
++libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex|auth_sasl_extract_userid$$'
+ libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
+ 	authsaslclient.c authsaslclient.h authsaslclientcram.c \
+ 	authsaslclientcrammd5.c authsaslclientcramsha1.c \
+@@ -863,7 +863,7 @@ libcourierauthsaslclient_la_SOURCES = co
+ 	authsaslfrombase64.c authsasltobase64.c
+ 
+ libcourierauthsaslclient_la_LIBADD = libcourierauth.la
+-libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version
++libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$'
+ include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
+ 	courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h
+ 
+@@ -2234,7 +2234,7 @@ dist-hook:
+ 
+ # automake still a bit stupid...
+ 
+-install-data-hook: install-authdaemonrc install-authpgsqlrc \
++install-data-hook: install-authpgsqlrc \
+ 	install-authldaprc install-authmysqlrc install-authsqliterc
+ 	:
+ 
diff --git a/security/courier-authlib/patches/patch-aa b/security/courier-authlib/patches/patch-aa
deleted file mode 100644
index 90653115e6a..00000000000
--- a/security/courier-authlib/patches/patch-aa
+++ /dev/null
@@ -1,237 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2012/06/09 11:57:20 adam Exp $
-
---- Makefile.in.orig	2012-04-28 13:21:54.000000000 +0000
-+++ Makefile.in
-@@ -516,7 +516,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h 
- 
- DISTCLEANFILES = dbobj.config README_authlib.html
- commonlibdep = libcourierauthcommon.la
--commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init' -avoid-version
-+commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init'
- commonlibadd = libcourierauthcommon.la
- libcourierauthcommon_t = @CRYPTLIBS@
- libcourierauthcommon_la_SOURCES = \
-@@ -532,7 +532,7 @@ libcourierauthcommon_la_SOURCES = \
- 
- libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
- libcourierauthcommon_la_LIBADD = libcourierauth.la
--libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%) -avoid-version
-+libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t)
- libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
- 	authmoduser2.c authmoduser3.c debug.c \
- 	courierauthdebug.h \
-@@ -541,7 +541,7 @@ libcourierauth_la_SOURCES = authdaemon.c
- libcourierauth_la_LIBADD = libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la numlib/libnumlib.la \
- 	random128/librandom128.la rfc822/libencode.la
- 
--libcourierauth_la_LDFLAGS = @NETLIBS@ -avoid-version
-+libcourierauth_la_LDFLAGS = @NETLIBS@
- 
- # The userdb module
- libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
-@@ -634,7 +634,7 @@ libcourierauthsasl_la_SOURCES = \
- 	authsaslfrombase64.c authsasltobase64.c
- 
- libcourierauthsasl_la_LIBADD = libcourierauth.la
--libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex$$' -avoid-version
-+libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex$$'
- libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
- 	authsaslclient.c authsaslclient.h authsaslclientcram.c \
- 	authsaslclientcrammd5.c authsaslclientcramsha1.c \
-@@ -643,7 +643,7 @@ libcourierauthsaslclient_la_SOURCES = co
- 	authsaslfrombase64.c authsasltobase64.c
- 
- libcourierauthsaslclient_la_LIBADD = libcourierauth.la
--libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version
-+libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$'
- include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
- 	courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h
- 
-@@ -674,9 +674,9 @@ authdaemondprog_DEPENDENCIES = libcourie
- 
- authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \
- 	libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \
--	rfc822/libencode.la numlib/libnumlib.la
-+	rfc822/libencode.la numlib/libnumlib.la $(DL_LIBS)
- 
--authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) @NETLIBS@
-+authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) $(DL_LDFLAGS) @NETLIBS@
- authdaemontest_SOURCES = authdaemontest.c
- authdaemontest_DEPENDENCIES = libcourierauthcommon.la
- authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
-@@ -1697,14 +1697,14 @@ uninstall-man: uninstall-man1 uninstall-
- authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
- 
- @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
--@HAVE_AUTHPGSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :
-+@HAVE_AUTHPGSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname $(authpgsqlrc)` || :
- @HAVE_AUTHPGSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \
--@HAVE_AUTHPGSQL_TRUE@		$(DESTDIR)@authpgsqlrc@.dist
--@HAVE_AUTHPGSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist
--@HAVE_AUTHPGSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist
-+@HAVE_AUTHPGSQL_TRUE@		$(DESTDIR)$(authpgsqlrc).dist
-+@HAVE_AUTHPGSQL_TRUE@	-chown $(mailuser) $(DESTDIR)$(authpgsqlrc).dist
-+@HAVE_AUTHPGSQL_TRUE@	-chgrp $(mailgroup) $(DESTDIR)$(authpgsqlrc).dist
- 
- @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:
--@HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)@authpgsqlrc@.dist
-+@HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)$(authpgsqlrc).dist
- 
- @HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc:
- @HAVE_AUTHPGSQL_FALSE@	@:
-@@ -1713,19 +1713,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
- @HAVE_AUTHPGSQL_FALSE@	@:
- 
- authpgsqlrc.h:
--	echo "#define AUTHPGSQLRC \"@authpgsqlrc@\"" >authpgsqlrc.h
-+	echo "#define AUTHPGSQLRC \"$(authpgsqlrc)\"" >authpgsqlrc.h
- 
- authldaplib.lo: authldaplib.c authldaprc.h
- 
- @HAVE_LDAP_TRUE@install-authldaprc:
--@HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :
-+@HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname $(authldaprc)` || :
- @HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \
--@HAVE_LDAP_TRUE@		$(DESTDIR)@authldaprc@.dist
--@HAVE_LDAP_TRUE@	-chown @mailuser@ $(DESTDIR)@authldaprc@.dist
--@HAVE_LDAP_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist
-+@HAVE_LDAP_TRUE@		$(DESTDIR)$(authldaprc).dist
-+@HAVE_LDAP_TRUE@	-chown $(mailuser) $(DESTDIR)$(authldaprc).dist
-+@HAVE_LDAP_TRUE@	-chgrp $(mailgroup) $(DESTDIR)$(authldaprc).dist
- 
- @HAVE_LDAP_TRUE@uninstall-authldaprc:
--@HAVE_LDAP_TRUE@	rm -f $(DESTDIR)@authldaprc@.dist
-+@HAVE_LDAP_TRUE@	rm -f $(DESTDIR)$(authldaprc).dist
- 
- @HAVE_LDAP_FALSE@install-authldaprc:
- @HAVE_LDAP_FALSE@	@:
-@@ -1734,19 +1734,19 @@ authldaplib.lo: authldaplib.c authldaprc
- @HAVE_LDAP_FALSE@	@:
- 
- authldaprc.h:
--	echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
-+	echo "#define AUTHLDAPRC \"$(authldaprc)\"" >authldaprc.h
- 
- authmysqllib.lo: authmysqllib.c authmysqlrc.h
- 
- @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc:
--@HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
-+@HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname $(authmysqlrc)` || :
- @HAVE_AUTHMYSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \
--@HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)@authmysqlrc@.dist
--@HAVE_AUTHMYSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist
--@HAVE_AUTHMYSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist
-+@HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)$(authmysqlrc).dist
-+@HAVE_AUTHMYSQL_TRUE@	-chown $(mailuser) $(DESTDIR)$(authmysqlrc).dist
-+@HAVE_AUTHMYSQL_TRUE@	-chgrp $(mailgroup) $(DESTDIR)$(authmysqlrc).dist
- 
- @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:
--@HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)@authmysqlrc@.dist
-+@HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)$(authmysqlrc).dist
- 
- @HAVE_AUTHMYSQL_FALSE@install-authmysqlrc:
- @HAVE_AUTHMYSQL_FALSE@	@:
-@@ -1755,27 +1755,27 @@ authmysqllib.lo: authmysqllib.c authmysq
- @HAVE_AUTHMYSQL_FALSE@	@:
- 
- authmysqlrc.h:
--	echo "#define AUTHMYSQLRC \"@authmysqlrc@\"" >authmysqlrc.h
-+	echo "#define AUTHMYSQLRC \"$(authmysqlrc)\"" >authmysqlrc.h
- 
- authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h
- 
- authpiperc.h:
--	echo "#define PIPE_PROGRAM \"@authProg@\"" >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
-+	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)$(authdaemonrc).dist
- 	rm -f authdaemonrc.tmp
--	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist
--	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist
-+	-chown $(mailuser) $(DESTDIR)$(authdaemonrc).dist
-+	-chgrp $(mailgroup) $(DESTDIR)$(authdaemonrc).dist
- 
- uninstall-authdaemonrc:
--	rm -f $(DESTDIR)@authdaemonrc@.dist
-+	rm -f $(DESTDIR)$(authdaemonrc).dist
- 
- authdaemonrc.h:
--	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
--	echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h
-+	echo "#define AUTHDAEMONRC \"$(authdaemonrc)\"" >authdaemonrc.h
-+	echo "#define AUTHDAEMONVAR \"$(authdaemonvar)\"" >>authdaemonrc.h
- 	echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h
- 	echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h
- 	echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h
-@@ -1793,20 +1793,20 @@ authchangepwdir.h: config.status
- 	echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h
- 
- sbindir.h: config.status
--	echo '#define SBINDIR "@sbindir@"' >sbindir.h
-+	echo '#define SBINDIR "$(sbindir)"' >sbindir.h
- 
- pkglibdir.h: config.status
- 	echo '#define PKGLIBDIR "$(pkglibdir)"' >pkglibdir.h
- 
- packageversion.h: config.status
--	echo '#define PKGVERSION "@PACKAGE_VERSION@"' >packageversion.h
-+	echo '#define PKGVERSION "$(PACKAGE_VERSION)"' >packageversion.h
- 
- pkgincludedir.h: config.status
- 	echo '#define PKGINCLUDEDIR "$(includedir)"' >pkgincludedir.h
- 
- mailusergroup.h: config.status
--	echo '#define MAILUSER "@mailuser@"' >mailusergroup.h
--	echo '#define MAILGROUP "@mailgroup@"' >>mailusergroup.h
-+	echo '#define MAILUSER "$(mailuser)"' >mailusergroup.h
-+	echo '#define MAILGROUP "$(mailgroup)"' >>mailusergroup.h
- 
- dist-hook:
- 	for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done
-@@ -1822,10 +1822,10 @@ install-exec-hook:
- 	$(mkinstalldirs) $(DESTDIR)$(sbindir) || :
- 	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
- 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
--	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
--	chmod 750 $(DESTDIR)@authdaemonvar@
--	-chown @mailuser@ $(DESTDIR)@authdaemonvar@
--	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
-+	$(mkinstalldirs) $(DESTDIR)$(authdaemonvar) || :
-+	chmod 750 $(DESTDIR)$(authdaemonvar)
-+	-chown $(mailuser) $(DESTDIR)$(authdaemonvar)
-+	-chgrp $(mailgroup) $(DESTDIR)$(authdaemonvar)
- 	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
- 		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
- 				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
-@@ -1839,7 +1839,6 @@ install-exec-hook:
- 				$(DESTDIR)$(sbindir)/userdbpw ; \
- 		$(INSTALL_SCRIPT) userdb-test-cram-md5.pl \
- 				$(DESTDIR)$(sbindir)/userdb-test-cram-md5
--	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
-@@ -1938,13 +1937,13 @@ README_authlib.html: README_authlib.html
- authdaemond.o: authdaemonrc.h authdaemond.c
- 
- install-migrate: authmigrate
--	@SHELL@ authmigrate
-+	$(SHELL) authmigrate
- 
- install-configure:
--	test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true
--	test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true
--	test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true
--	test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true
-+	test -f $(DESTDIR)$(authdaemonrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authdaemonrc).dist || true
-+	test -f $(DESTDIR)$(authmysqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authmysqlrc).dist || true
-+	test -f $(DESTDIR)$(authpgsqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authpgsqlrc).dist || true
-+	test -f $(DESTDIR)$(authldaprc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authldaprc).dist || true
- 
- # For maintainer's use only
- 
diff --git a/security/courier-authlib/patches/patch-ab b/security/courier-authlib/patches/patch-configure
index cb083d66224..e434a87a88a 100644
--- a/security/courier-authlib/patches/patch-ab
+++ b/security/courier-authlib/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2012/06/09 11:57:20 adam Exp $
+$NetBSD: patch-configure,v 1.1 2020/04/13 19:11:07 joerg Exp $
 
---- configure.orig	2012-04-28 13:21:55.000000000 +0000
+--- configure.orig	2019-07-24 23:58:04.000000000 +0000
 +++ configure
-@@ -14193,7 +14193,7 @@ done
+@@ -18837,7 +18837,7 @@ done
  test -n "$PG_CONFIG" || PG_CONFIG="pg_config"
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.8 2012/06/09 11:57:20 adam Exp $
  
  # Check whether --with-pgsql-libs was given.
  if test "${with_pgsql_libs+set}" = set; then :
-@@ -14913,7 +14913,7 @@ rm -f authdaemonrc.h authldaprc.h authmy
+@@ -19653,7 +19653,7 @@ rm -f authdaemonrc.h authldaprc.h authmy
  
  result=""
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.8 2012/06/09 11:57:20 adam Exp $
  then
  	$COURIERCONFIG >conftest.out || exit 1
  	sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
-@@ -14925,7 +14925,7 @@ then
+@@ -19665,7 +19665,7 @@ then
  	result=" (from courier-config)"
  fi