Sun Sep 28 22:15:30 2008 UTC ()
Upgrade courier-authlib to version 0.61.0 in order to fix CVE-2008-2667,
finally. While here, fix PLIST and depkglint a bit. Also, fix the horrid
abuse of libtool.

Changes since 0.60.2:
 * courier-authlib.spec: Dummy provides: for symlinks, to allow upgrade
   with older packages that require <libname>.so.0.
 * Makefile.am: Switch to versionless shared libraries.
   Install all shared libraries just as <libname>.so. make install manually
   removes *.so.0.0 files that were left over from previous versions,
   and installs a temporary *.so.0 symlink to *.so, for temporary
   binary ABI compatibility with 0.60. The symlinks will be removed in
   0.62.
 * Cleanup: always compile md5, sha* and hmac stuff, and remove all
   conditionally-compiled cruft. Move SASL list to an internal header.
   Add client-side support for AUTH EXTERNAL.
 * authsasl.c (auth_sasl_ex): auth_sasl_ex() supercedes auth_sasl(),
   invokes auth_sasl() for non-EXTERNAL SASL methods, implements EXTERNAL
   by going through the motions, then setting up a dummy authentication
   request.
 * authdaemon.c (auth_generic): Check for the dummy EXTERNAL
   authentication request, and handle it by invoking auth_getuserinfo(),
   rather than sending it down the pipe. This avoid having to implement
   a stub in every authentication module.
 * authmysqllib.c: Use mysql_set_character_set() instead of SET NAMES
 * authmysqllib.c: Fix domain-less queries.
 * Makefile: Drop the unmaintained authvchkpw module.
 * authmysqllib.c: Cleanup. Use mysql_real_escape_string instead of
   crude filtering.
 * Makefile.am: Use _LIBADD properly.
 * configure.in: More portability fixes.


(tonnerre)
diff -r1.28 -r1.29 pkgsrc/security/courier-authlib/Makefile
diff -r1.6 -r1.7 pkgsrc/security/courier-authlib/PLIST
diff -r1.11 -r1.12 pkgsrc/security/courier-authlib/distinfo
diff -r1.5 -r1.6 pkgsrc/security/courier-authlib/patches/patch-aa
diff -r1.2 -r0 pkgsrc/security/courier-authlib/patches/patch-ad
cvs diff -r1.28 -r1.29 pkgsrc/security/courier-authlib/Makefile (expand / switch to unified diff)

--- pkgsrc/security/courier-authlib/Makefile 2008/02/18 20:26:33 1.28
+++ pkgsrc/security/courier-authlib/Makefile 2008/09/28 22:15:30 1.29
@@ -1,98 +1,101 @@ @@ -1,98 +1,101 @@
1# $NetBSD: Makefile,v 1.28 2008/02/18 20:26:33 jlam Exp $ 1# $NetBSD: Makefile,v 1.29 2008/09/28 22:15:30 tonnerre Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5DISTNAME= courier-authlib-0.60.2 5DISTNAME= courier-authlib-0.61.0
6PKGREVISION= 1 
7CATEGORIES= security 6CATEGORIES= security
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
9EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
10 9
11MAINTAINER= jlam@pkgsrc.org 10MAINTAINER= jlam@pkgsrc.org
12COMMENT= Courier Authentication Library 11COMMENT= Courier Authentication Library
13HOMEPAGE= http://www.courier-mta.org/authlib/ 12HOMEPAGE= http://www.courier-mta.org/authlib/
14 13
15CONFLICTS+= courier-auth-[0-9]* 14CONFLICTS+= courier-auth-[0-9]*
16CONFLICTS+= courier-authldap-[0-9]* 15CONFLICTS+= courier-authldap-[0-9]*
17CONFLICTS+= courier-authmysql-[0-9]* 16CONFLICTS+= courier-authmysql-[0-9]*
18CONFLICTS+= courier-authpgsql-[0-9]* 17CONFLICTS+= courier-authpgsql-[0-9]*
19 18
20#LICENSE= gnu-gpl-v3 19#LICENSE= gnu-gpl-v3
21 20
22PKG_DESTDIR_SUPPORT= user-destdir 21PKG_DESTDIR_SUPPORT= user-destdir
23 22
24USE_LIBTOOL= yes 23USE_LIBTOOL= yes
 24LIBTOOLIZE_PLIST= yes
25PKG_SYSCONFSUBDIR= authlib 25PKG_SYSCONFSUBDIR= authlib
26 26
27REPLACE_PERL= samplepipe.pl sysconftool 27REPLACE_PERL= samplepipe.pl sysconftool
28 28
29USE_LANGUAGES= c c++ 29USE_LANGUAGES= c c++
30USE_TOOLS+= cat:run gmake perl:run 30USE_TOOLS+= cat:run gmake perl:run
31CONFIGURE_ENV+= CAT=${TOOLS_CAT:Q} # makedat 31CONFIGURE_ENV+= CAT=${TOOLS_CAT} # makedat
32 32
33CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 33BUILD_DEFS+= VARBASE
34CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR:Q} 34CONFIGURE_ARGS+= --localstatedir=${VARBASE}
 35CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR}
35CONFIGURE_ARGS+= --without-stdheaderdir 36CONFIGURE_ARGS+= --without-stdheaderdir
36 37
 38.include "../../mk/bsd.prefs.mk"
 39
37AUTHDAEMONVAR?= ${VARBASE}/authdaemon 40AUTHDAEMONVAR?= ${VARBASE}/authdaemon
38CONFIGURE_ARGS+= --with-authdaemonvar=${AUTHDAEMONVAR:Q} 41CONFIGURE_ARGS+= --with-authdaemonvar=${AUTHDAEMONVAR:Q}
39OWN_DIRS_PERMS= ${AUTHDAEMONVAR} ${COURIER_USER} ${COURIER_GROUP} 0750 42OWN_DIRS_PERMS= ${AUTHDAEMONVAR} ${COURIER_USER} ${COURIER_GROUP} 0750
40FILES_SUBST+= AUTHDAEMONVAR=${AUTHDAEMONVAR:Q} 43FILES_SUBST+= AUTHDAEMONVAR=${AUTHDAEMONVAR:Q}
41 44
42# Expect is used to change the password from within the courier webmail 45# Expect is used to change the password from within the courier webmail
43# application (sqwebmail). Assume that it's installed in the same prefix 46# application (sqwebmail). Assume that it's installed in the same prefix
44# as courier-authlib. 47# as courier-authlib.
45# 48#
46CONFIGURE_ENV+= EXPECT=${PREFIX:Q}/bin/expect 49CONFIGURE_ENV+= EXPECT=${PREFIX}/bin/expect
47CHECK_INTERPRETER_SKIP= libexec/courier-authlib/authsystem.passwd 50CHECK_INTERPRETER_SKIP= libexec/courier-authlib/authsystem.passwd
48 51
49AUTHLIBDIR= lib/courier-authlib 52AUTHLIBDIR= lib/courier-authlib
50AUTHLIBEXECDIR= libexec/courier-authlib 53AUTHLIBEXECDIR= libexec/courier-authlib
51AUTHEXAMPLEDIR= share/examples/courier-authlib 54AUTHEXAMPLEDIR= share/examples/courier-authlib
52AUTHDOCDIR= share/doc/courier-authlib 55AUTHDOCDIR= share/doc/courier-authlib
53FILES_SUBST+= AUTHLIBEXECDIR=${AUTHLIBEXECDIR:Q} 56FILES_SUBST+= AUTHLIBEXECDIR=${AUTHLIBEXECDIR}
54FILES_SUBST+= AUTHEXAMPLEDIR=${AUTHEXAMPLEDIR:Q} 57FILES_SUBST+= AUTHEXAMPLEDIR=${AUTHEXAMPLEDIR}
55 58
56PKG_SYSCONFSUBDIR?= courier 59PKG_SYSCONFSUBDIR?= courier
57 60
58EGDIR= ${PREFIX}/${AUTHEXAMPLEDIR} 61EGDIR= ${PREFIX}/${AUTHEXAMPLEDIR}
59DOCDIR= ${PREFIX}/${AUTHDOCDIR} 62DOCDIR= ${PREFIX}/${AUTHDOCDIR}
60RCD_SCRIPTS= authdaemond 63RCD_SCRIPTS= authdaemond
61GEN_FILES= authdaemonrc 64GEN_FILES= authdaemonrc
62FILES_SUBST+= GEN_FILES=${GEN_FILES:Q} 65FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
63AUTHLIB_PLIST= ${AUTHEXAMPLEDIR}/authdaemonrc.dist 66AUTHLIB_PLIST= ${AUTHEXAMPLEDIR}/authdaemonrc.dist
64 67
65# Install the example config files into ${EGDIR}. 68# Install the example config files into ${EGDIR}.
66INSTALL_AM_MAKEFLAGS= authdaemonrc=${EGDIR}/authdaemonrc \ 69INSTALL_AM_MAKEFLAGS= authdaemonrc=${EGDIR}/authdaemonrc \
67 authldaprc=${EGDIR}/authldaprc \ 70 authldaprc=${EGDIR}/authldaprc \
68 authmysqlrc=${EGDIR}/authmysqlrc \ 71 authmysqlrc=${EGDIR}/authmysqlrc \
69 authpgsqlrc=${EGDIR}/authpgsqlrc 72 authpgsqlrc=${EGDIR}/authpgsqlrc
70INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} \ 73INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} \
71 AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q} 74 AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
72 75
73POST_INSTALL_TARGETS= post-install-common post-install-authdaemon 76POST_INSTALL_TARGETS= post-install-common post-install-authdaemon
74 77
75.include "options.mk" 78.include "options.mk"
76.include "../../devel/libltdl/buildlink3.mk" 79.include "../../devel/libltdl/buildlink3.mk"
77 80
78.for _file_ in ${GEN_FILES} 81.for file in ${GEN_FILES}
79CONF_FILES_PERMS+= ${EGDIR}/${_file_}.dist ${PKG_SYSCONFDIR}/${_file_} \ 82CONF_FILES_PERMS+= ${EGDIR}/${file}.dist ${PKG_SYSCONFDIR}/${file} \
80 ${COURIER_USER} ${COURIER_GROUP} 0660 83 ${COURIER_USER} ${COURIER_GROUP} 0660
81.endfor 84.endfor
82 85
83.for _file_ in ${AUTHLIB_PLIST} 86.for file in ${AUTHLIB_PLIST}
84GENERATE_PLIST+= ${TEST} -f ${DESTDIR}${PREFIX}/${_file_} && \ 87GENERATE_PLIST+= ${TEST} -f ${DESTDIR}${PREFIX}/${file} && \
85 ${ECHO} "${_file_}"; 88 ${ECHO} "${file}";
86.endfor 89.endfor
87.if !empty(AUTHLIB_PLIST:M${AUTHEXAMPLEDIR}/*) 90.if !empty(AUTHLIB_PLIST:M${AUTHEXAMPLEDIR}/*)
88GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHEXAMPLEDIR}"; 91GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHEXAMPLEDIR}";
89.endif 92.endif
90GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHDOCDIR}"; 93GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHDOCDIR}";
91GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHLIBEXECDIR}"; 94GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHLIBEXECDIR}";
92GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHLIBDIR}"; 95GENERATE_PLIST+= ${ECHO} "@dirrm ${AUTHLIBDIR}";
93 96
94INSTALLATION_DIRS= bin sbin 97INSTALLATION_DIRS= bin sbin
95 98
96post-install: ${POST_INSTALL_TARGETS} 99post-install: ${POST_INSTALL_TARGETS}
97 100
98post-install-common: 101post-install-common:
cvs diff -r1.6 -r1.7 pkgsrc/security/courier-authlib/PLIST (expand / switch to unified diff)

--- pkgsrc/security/courier-authlib/PLIST 2007/08/10 17:57:21 1.6
+++ pkgsrc/security/courier-authlib/PLIST 2008/09/28 22:15:30 1.7
@@ -1,38 +1,54 @@ @@ -1,38 +1,54 @@
1@comment $NetBSD: PLIST,v 1.6 2007/08/10 17:57:21 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.7 2008/09/28 22:15:30 tonnerre Exp $
2bin/courierauthconfig 2bin/courierauthconfig
3include/courier_auth_config.h 3include/courier_auth_config.h
4include/courierauth.h 4include/courierauth.h
5include/courierauthdebug.h 5include/courierauthdebug.h
6include/courierauthsasl.h 6include/courierauthsasl.h
7include/courierauthsaslclient.h 7include/courierauthsaslclient.h
 8lib/courier-authlib/libauthpam.la
 9lib/courier-authlib/libauthpipe.la
 10lib/courier-authlib/libauthpwd.la
 11lib/courier-authlib/libauthuserdb.la
8lib/courier-authlib/libcourierauth.la 12lib/courier-authlib/libcourierauth.la
9lib/courier-authlib/libcourierauthcommon.la 13lib/courier-authlib/libcourierauthcommon.la
10lib/courier-authlib/libcourierauthsasl.la 14lib/courier-authlib/libcourierauthsasl.la
11lib/courier-authlib/libcourierauthsaslclient.la 15lib/courier-authlib/libcourierauthsaslclient.la
12libexec/courier-authlib/authdaemond 16libexec/courier-authlib/authdaemond
13libexec/courier-authlib/authsystem.passwd 17libexec/courier-authlib/authsystem.passwd
 18libexec/courier-authlib/makedatprog
14man/man1/authpasswd.1 19man/man1/authpasswd.1
15man/man1/authtest.1 20man/man1/authtest.1
16man/man1/courierlogger.1 21man/man1/courierlogger.1
17man/man3/auth_enumerate.3 22man/man3/auth_enumerate.3
18man/man3/auth_generic.3 23man/man3/auth_generic.3
19man/man3/auth_getoption.3 24man/man3/auth_getoption.3
20man/man3/auth_getuserinfo.3 25man/man3/auth_getuserinfo.3
21man/man3/auth_login.3 26man/man3/auth_login.3
22man/man3/auth_passwd.3 27man/man3/auth_passwd.3
23man/man3/auth_sasl.3 28man/man3/auth_sasl.3
24man/man3/authlib.3 29man/man3/authlib.3
25man/man8/makeuserdb.8 30man/man8/makeuserdb.8
26man/man8/userdb.8 31man/man8/userdb.8
27man/man8/userdbpw.8 32man/man8/userdbpw.8
28sbin/authdaemond 33sbin/authdaemond
29sbin/authenumerate 34sbin/authenumerate
30sbin/authpasswd 35sbin/authpasswd
31sbin/authtest 36sbin/authtest
32sbin/courierlogger 37sbin/courierlogger
 38sbin/makeuserdb
 39sbin/pw2userdb
33sbin/sysconftool 40sbin/sysconftool
 41sbin/userdb
 42sbin/userdb-test-cram-md5
 43sbin/userdbpw
34share/doc/courier-authlib/INSTALL.html 44share/doc/courier-authlib/INSTALL.html
35share/doc/courier-authlib/README.authdebug.html 45share/doc/courier-authlib/README.authdebug.html
36share/doc/courier-authlib/README.html 46share/doc/courier-authlib/README.html
37share/doc/courier-authlib/README_authlib.html 47share/doc/courier-authlib/README_authlib.html
 48share/examples/courier-authlib/authdaemonrc.dist
 49share/examples/courier-authlib/samplepipe.pl
38share/examples/rc.d/authdaemond 50share/examples/rc.d/authdaemond
 51@dirrm share/examples/courier-authlib
 52@dirrm share/doc/courier-authlib
 53@dirrm libexec/courier-authlib
 54@dirrm lib/courier-authlib
cvs diff -r1.11 -r1.12 pkgsrc/security/courier-authlib/distinfo (expand / switch to unified diff)

--- pkgsrc/security/courier-authlib/distinfo 2007/10/15 15:37:01 1.11
+++ pkgsrc/security/courier-authlib/distinfo 2008/09/28 22:15:30 1.12
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.11 2007/10/15 15:37:01 jlam Exp $ 1$NetBSD: distinfo,v 1.12 2008/09/28 22:15:30 tonnerre Exp $
2 2
3SHA1 (courier-authlib-0.60.2.tar.bz2) = cd5969075de212ecfb406ffb1ac974ea939ddcc0 3SHA1 (courier-authlib-0.61.0.tar.bz2) = 0caf0f435411124b02fe2594b39feceff5b23159
4RMD160 (courier-authlib-0.60.2.tar.bz2) = bdf6d68b7b6a5c6d13079477d83312f98dd7bd31 4RMD160 (courier-authlib-0.61.0.tar.bz2) = 91fb8ac8960659b7cc4ea9574e1af11fa8f7dc86
5Size (courier-authlib-0.60.2.tar.bz2) = 2158473 bytes 5Size (courier-authlib-0.61.0.tar.bz2) = 2174172 bytes
6SHA1 (patch-aa) = d7c863f698886753ac2be31c5ee0c3f56215b2b0 6SHA1 (patch-aa) = ef77c9c240659f2a553735dcc8ec27bfb144f973
7SHA1 (patch-ab) = 7d9ffb781102b998a9bd5c9c7ec3d04aa44770d3 7SHA1 (patch-ab) = 7d9ffb781102b998a9bd5c9c7ec3d04aa44770d3
8SHA1 (patch-ad) = 01207ac33e17771c11ae94bf2d93e628a31ce448 
cvs diff -r1.5 -r1.6 pkgsrc/security/courier-authlib/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/courier-authlib/patches/Attic/patch-aa 2007/10/15 15:37:01 1.5
+++ pkgsrc/security/courier-authlib/patches/Attic/patch-aa 2008/09/28 22:15:30 1.6
@@ -1,117 +1,147 @@ @@ -1,117 +1,147 @@
1$NetBSD: patch-aa,v 1.5 2007/10/15 15:37:01 jlam Exp $ 1$NetBSD: patch-aa,v 1.6 2008/09/28 22:15:30 tonnerre Exp $
2 2
3--- Makefile.in.orig Sat Sep 29 14:43:44 2007 3--- Makefile.in.orig 2008-07-12 21:41:08.000000000 +0200
4+++ Makefile.in 4+++ Makefile.in
5@@ -491,7 +491,7 @@ libcourierauthcommon_la_SOURCES = \ 5@@ -453,7 +453,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h
 6
 7 DISTCLEANFILES = dbobj.config README_authlib.html
 8 commonlibdep = libcourierauthcommon.la
 9-commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init' -avoid-version
 10+commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init'
 11 commonlibadd = libcourierauthcommon.la
 12 libcourierauthcommon_t = @CRYPTLIBS@
 13 libcourierauthcommon_la_SOURCES = \
 14@@ -468,7 +468,7 @@ libcourierauthcommon_la_SOURCES = \
6  15
7 libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la 16 libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
8 libcourierauthcommon_la_LIBADD = libcourierauth.la 17 libcourierauthcommon_la_LIBADD = libcourierauth.la
9-libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%) 18-libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%) -avoid-version
10+libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t) 19+libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t)
11 libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \ 20 libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
12 authmoduser2.c authmoduser3.c debug.c \ 21 authmoduser2.c authmoduser3.c debug.c \
13 courierauthdebug.h \ 22 courierauthdebug.h \
14@@ -643,9 +643,9 @@ authdaemondprog_DEPENDENCIES = libcourie 23@@ -477,7 +477,7 @@ libcourierauth_la_SOURCES = authdaemon.c
 24 libcourierauth_la_LIBADD = libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la numlib/libnumlib.la \
 25 random128/librandom128.la rfc822/libencode.la
 26
 27-libcourierauth_la_LDFLAGS = @NETLIBS@ -avoid-version
 28+libcourierauth_la_LDFLAGS = @NETLIBS@
 29
 30 # The userdb module
 31 libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
 32@@ -569,7 +569,7 @@ libcourierauthsasl_la_SOURCES = \
 33 authsaslfrombase64.c authsasltobase64.c
 34
 35 libcourierauthsasl_la_LIBADD = libcourierauth.la
 36-libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex$$' -avoid-version
 37+libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex$$'
 38 libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
 39 authsaslclient.c authsaslclient.h authsaslclientcram.c \
 40 authsaslclientcrammd5.c authsaslclientcramsha1.c \
 41@@ -578,7 +578,7 @@ libcourierauthsaslclient_la_SOURCES = co
 42 authsaslfrombase64.c authsasltobase64.c
 43
 44 libcourierauthsaslclient_la_LIBADD = libcourierauth.la
 45-libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version
 46+libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$'
 47 include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
 48 courierauthsaslclient.h courierauthdebug.h
 49
 50@@ -609,9 +609,9 @@ authdaemondprog_DEPENDENCIES = libcourie
15  51
16 authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \ 52 authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \
17 libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \ 53 libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \
18- rfc822/libencode.la numlib/libnumlib.la 54- rfc822/libencode.la numlib/libnumlib.la
19+ rfc822/libencode.la numlib/libnumlib.la $(DL_LIBS) 55+ rfc822/libencode.la numlib/libnumlib.la $(DL_LIBS)
20  56
21-authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) @NETLIBS@ 57-authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) @NETLIBS@
22+authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) $(DL_LDFLAGS) @NETLIBS@ 58+authdaemondprog_LDFLAGS = -export-dynamic $(modules:%=-dlopen %) $(DL_LDFLAGS) @NETLIBS@
23 authdaemontest_SOURCES = authdaemontest.c 59 authdaemontest_SOURCES = authdaemontest.c
24 authdaemontest_DEPENDENCIES = libcourierauthcommon.la 60 authdaemontest_DEPENDENCIES = libcourierauthcommon.la
25 authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@ 61 authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
26@@ -1549,19 +1549,19 @@ authvchkpw.lo: authvchkpw.c vpopmail_con 62@@ -1517,14 +1517,14 @@ uninstall-man: uninstall-man1 uninstall-
27 preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h 
28  
29 vpopmail_config.h: 
30- echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h 
31+ echo '#include "$(vpopmail_home)/include/config.h"' >vpopmail_config.h 
32  
33 authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h 63 authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
34  64
35 @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc: 65 @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
36-@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || : 66-@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || :
37+@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authpgsqlrc)` || : 67+@HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authpgsqlrc)` || :
38 @HAVE_AUTHPGSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \ 68 @HAVE_AUTHPGSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \
39-@HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)@authpgsqlrc@.dist 69-@HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)@authpgsqlrc@.dist
40-@HAVE_AUTHPGSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist 70-@HAVE_AUTHPGSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist
41-@HAVE_AUTHPGSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist 71-@HAVE_AUTHPGSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist
42+@HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)$(authpgsqlrc).dist 72+@HAVE_AUTHPGSQL_TRUE@ $(DESTDIR)$(authpgsqlrc).dist
43+@HAVE_AUTHPGSQL_TRUE@ -chown $(mailuser) $(DESTDIR)$(authpgsqlrc).dist 73+@HAVE_AUTHPGSQL_TRUE@ -chown $(mailuser) $(DESTDIR)$(authpgsqlrc).dist
44+@HAVE_AUTHPGSQL_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authpgsqlrc).dist 74+@HAVE_AUTHPGSQL_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authpgsqlrc).dist
45  75
46 @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc: 76 @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:
47-@HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist 77-@HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist
48+@HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)$(authpgsqlrc).dist 78+@HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)$(authpgsqlrc).dist
49  79
50 @HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc: 80 @HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc:
51 @HAVE_AUTHPGSQL_FALSE@ @: 81 @HAVE_AUTHPGSQL_FALSE@ @:
52@@ -1570,19 +1570,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq 82@@ -1533,19 +1533,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
53 @HAVE_AUTHPGSQL_FALSE@ @: 83 @HAVE_AUTHPGSQL_FALSE@ @:
54  84
55 authpgsqlrc.h: 85 authpgsqlrc.h:
56- echo "#define AUTHPGSQLRC \"@authpgsqlrc@\"" >authpgsqlrc.h 86- echo "#define AUTHPGSQLRC \"@authpgsqlrc@\"" >authpgsqlrc.h
57+ echo "#define AUTHPGSQLRC \"$(authpgsqlrc)\"" >authpgsqlrc.h 87+ echo "#define AUTHPGSQLRC \"$(authpgsqlrc)\"" >authpgsqlrc.h
58  88
59 authldaplib.lo: authldaplib.c authldaprc.h 89 authldaplib.lo: authldaplib.c authldaprc.h
60  90
61 @HAVE_LDAP_TRUE@install-authldaprc: 91 @HAVE_LDAP_TRUE@install-authldaprc:
62-@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || : 92-@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :
63+@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authldaprc)` || : 93+@HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authldaprc)` || :
64 @HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \ 94 @HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \
65-@HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc@.dist 95-@HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc@.dist
66-@HAVE_LDAP_TRUE@ -chown @mailuser@ $(DESTDIR)@authldaprc@.dist 96-@HAVE_LDAP_TRUE@ -chown @mailuser@ $(DESTDIR)@authldaprc@.dist
67-@HAVE_LDAP_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist 97-@HAVE_LDAP_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist
68+@HAVE_LDAP_TRUE@ $(DESTDIR)$(authldaprc).dist 98+@HAVE_LDAP_TRUE@ $(DESTDIR)$(authldaprc).dist
69+@HAVE_LDAP_TRUE@ -chown $(mailuser) $(DESTDIR)$(authldaprc).dist 99+@HAVE_LDAP_TRUE@ -chown $(mailuser) $(DESTDIR)$(authldaprc).dist
70+@HAVE_LDAP_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authldaprc).dist 100+@HAVE_LDAP_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authldaprc).dist
71  101
72 @HAVE_LDAP_TRUE@uninstall-authldaprc: 102 @HAVE_LDAP_TRUE@uninstall-authldaprc:
73-@HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist 103-@HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist
74+@HAVE_LDAP_TRUE@ rm -f $(DESTDIR)$(authldaprc).dist 104+@HAVE_LDAP_TRUE@ rm -f $(DESTDIR)$(authldaprc).dist
75  105
76 @HAVE_LDAP_FALSE@install-authldaprc: 106 @HAVE_LDAP_FALSE@install-authldaprc:
77 @HAVE_LDAP_FALSE@ @: 107 @HAVE_LDAP_FALSE@ @:
78@@ -1591,19 +1591,19 @@ authldaplib.lo: authldaplib.c authldaprc 108@@ -1554,19 +1554,19 @@ authldaplib.lo: authldaplib.c authldaprc
79 @HAVE_LDAP_FALSE@ @: 109 @HAVE_LDAP_FALSE@ @:
80  110
81 authldaprc.h: 111 authldaprc.h:
82- echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h 112- echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
83+ echo "#define AUTHLDAPRC \"$(authldaprc)\"" >authldaprc.h 113+ echo "#define AUTHLDAPRC \"$(authldaprc)\"" >authldaprc.h
84  114
85 authmysqllib.lo: authmysqllib.c authmysqlrc.h 115 authmysqllib.lo: authmysqllib.c authmysqlrc.h
86  116
87 @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc: 117 @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc:
88-@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || : 118-@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
89+@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authmysqlrc)` || : 119+@HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname $(authmysqlrc)` || :
90 @HAVE_AUTHMYSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \ 120 @HAVE_AUTHMYSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \
91-@HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc@.dist 121-@HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc@.dist
92-@HAVE_AUTHMYSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist 122-@HAVE_AUTHMYSQL_TRUE@ -chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist
93-@HAVE_AUTHMYSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist 123-@HAVE_AUTHMYSQL_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist
94+@HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)$(authmysqlrc).dist 124+@HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)$(authmysqlrc).dist
95+@HAVE_AUTHMYSQL_TRUE@ -chown $(mailuser) $(DESTDIR)$(authmysqlrc).dist 125+@HAVE_AUTHMYSQL_TRUE@ -chown $(mailuser) $(DESTDIR)$(authmysqlrc).dist
96+@HAVE_AUTHMYSQL_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authmysqlrc).dist 126+@HAVE_AUTHMYSQL_TRUE@ -chgrp $(mailgroup) $(DESTDIR)$(authmysqlrc).dist
97  127
98 @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc: 128 @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:
99-@HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist 129-@HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist
100+@HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)$(authmysqlrc).dist 130+@HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)$(authmysqlrc).dist
101  131
102 @HAVE_AUTHMYSQL_FALSE@install-authmysqlrc: 132 @HAVE_AUTHMYSQL_FALSE@install-authmysqlrc:
103 @HAVE_AUTHMYSQL_FALSE@ @: 133 @HAVE_AUTHMYSQL_FALSE@ @:
104@@ -1612,27 +1612,27 @@ authmysqllib.lo: authmysqllib.c authmysq 134@@ -1575,27 +1575,27 @@ authmysqllib.lo: authmysqllib.c authmysq
105 @HAVE_AUTHMYSQL_FALSE@ @: 135 @HAVE_AUTHMYSQL_FALSE@ @:
106  136
107 authmysqlrc.h: 137 authmysqlrc.h:
108- echo "#define AUTHMYSQLRC \"@authmysqlrc@\"" >authmysqlrc.h 138- echo "#define AUTHMYSQLRC \"@authmysqlrc@\"" >authmysqlrc.h
109+ echo "#define AUTHMYSQLRC \"$(authmysqlrc)\"" >authmysqlrc.h 139+ echo "#define AUTHMYSQLRC \"$(authmysqlrc)\"" >authmysqlrc.h
110  140
111 authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h 141 authpipelib.lo: authpipelib.c authpipelib.h authpiperc.h
112  142
113 authpiperc.h: 143 authpiperc.h:
114- echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h 144- echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
115+ echo "#define PIPE_PROGRAM \"$(authProg)\"" >authpiperc.h 145+ echo "#define PIPE_PROGRAM \"$(authProg)\"" >authpiperc.h
116  146
117 install-authdaemonrc: 147 install-authdaemonrc:
@@ -128,67 +158,75 @@ $NetBSD: patch-aa,v 1.5 2007/10/15 15:37 @@ -128,67 +158,75 @@ $NetBSD: patch-aa,v 1.5 2007/10/15 15:37
128  158
129 uninstall-authdaemonrc: 159 uninstall-authdaemonrc:
130- rm -f $(DESTDIR)@authdaemonrc@.dist 160- rm -f $(DESTDIR)@authdaemonrc@.dist
131+ rm -f $(DESTDIR)$(authdaemonrc).dist 161+ rm -f $(DESTDIR)$(authdaemonrc).dist
132  162
133 authdaemonrc.h: 163 authdaemonrc.h:
134- echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h 164- echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
135- echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h 165- echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h
136+ echo "#define AUTHDAEMONRC \"$(authdaemonrc)\"" >authdaemonrc.h 166+ echo "#define AUTHDAEMONRC \"$(authdaemonrc)\"" >authdaemonrc.h
137+ echo "#define AUTHDAEMONVAR \"$(authdaemonvar)\"" >>authdaemonrc.h 167+ echo "#define AUTHDAEMONVAR \"$(authdaemonvar)\"" >>authdaemonrc.h
138 echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h 168 echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h
139 echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h 169 echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h
140 echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h 170 echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h
141@@ -1650,20 +1650,20 @@ authchangepwdir.h: config.status 171@@ -1613,20 +1613,20 @@ authchangepwdir.h: config.status
142 echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h 172 echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h
143  173
144 sbindir.h: config.status 174 sbindir.h: config.status
145- echo '#define SBINDIR "@sbindir@"' >sbindir.h 175- echo '#define SBINDIR "@sbindir@"' >sbindir.h
146+ echo '#define SBINDIR "$(sbindir)"' >sbindir.h 176+ echo '#define SBINDIR "$(sbindir)"' >sbindir.h
147  177
148 pkglibdir.h: config.status 178 pkglibdir.h: config.status
149 echo '#define PKGLIBDIR "$(pkglibdir)"' >pkglibdir.h 179 echo '#define PKGLIBDIR "$(pkglibdir)"' >pkglibdir.h
150  180
151 packageversion.h: config.status 181 packageversion.h: config.status
152- echo '#define PKGVERSION "@PACKAGE_VERSION@"' >packageversion.h 182- echo '#define PKGVERSION "@PACKAGE_VERSION@"' >packageversion.h
153+ echo '#define PKGVERSION "$(PACKAGE_VERSION)"' >packageversion.h 183+ echo '#define PKGVERSION "$(PACKAGE_VERSION)"' >packageversion.h
154  184
155 pkgincludedir.h: config.status 185 pkgincludedir.h: config.status
156 echo '#define PKGINCLUDEDIR "$(includedir)"' >pkgincludedir.h 186 echo '#define PKGINCLUDEDIR "$(includedir)"' >pkgincludedir.h
157  187
158 mailusergroup.h: config.status 188 mailusergroup.h: config.status
159- echo '#define MAILUSER "@mailuser@"' >mailusergroup.h 189- echo '#define MAILUSER "@mailuser@"' >mailusergroup.h
160- echo '#define MAILGROUP "@mailgroup@"' >>mailusergroup.h 190- echo '#define MAILGROUP "@mailgroup@"' >>mailusergroup.h
161+ echo '#define MAILUSER "$(mailuser)"' >mailusergroup.h 191+ echo '#define MAILUSER "$(mailuser)"' >mailusergroup.h
162+ echo '#define MAILGROUP "$(mailgroup)"' >>mailusergroup.h 192+ echo '#define MAILGROUP "$(mailgroup)"' >>mailusergroup.h
163  193
164 dist-hook: 194 dist-hook:
165 for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done 195 for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done
166@@ -1679,10 +1679,10 @@ install-exec-hook: 196@@ -1642,10 +1642,10 @@ install-exec-hook:
167 $(mkinstalldirs) $(DESTDIR)$(sbindir) || : 197 $(mkinstalldirs) $(DESTDIR)$(sbindir) || :
168 $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : 198 $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
169 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond 199 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
170- $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || : 200- $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
171- chmod 750 $(DESTDIR)@authdaemonvar@ 201- chmod 750 $(DESTDIR)@authdaemonvar@
172- -chown @mailuser@ $(DESTDIR)@authdaemonvar@ 202- -chown @mailuser@ $(DESTDIR)@authdaemonvar@
173- -chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@ 203- -chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
174+ $(mkinstalldirs) $(DESTDIR)$(authdaemonvar) || : 204+ $(mkinstalldirs) $(DESTDIR)$(authdaemonvar) || :
175+ chmod 750 $(DESTDIR)$(authdaemonvar) 205+ chmod 750 $(DESTDIR)$(authdaemonvar)
176+ -chown $(mailuser) $(DESTDIR)$(authdaemonvar) 206+ -chown $(mailuser) $(DESTDIR)$(authdaemonvar)
177+ -chgrp $(mailgroup) $(DESTDIR)$(authdaemonvar) 207+ -chgrp $(mailgroup) $(DESTDIR)$(authdaemonvar)
178 test "@LIBAUTHUSERDB@" = "" && exit 0 ;\ 208 test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
179 $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \ 209 $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
180 $(DESTDIR)$(pkglibexecdir)/makedatprog ; \ 210 $(DESTDIR)$(pkglibexecdir)/makedatprog ; \
181@@ -1785,13 +1785,13 @@ README_authlib.html: README_authlib.html 211@@ -1659,7 +1659,6 @@ install-exec-hook:
 212 $(DESTDIR)$(sbindir)/userdbpw ; \
 213 $(INSTALL_SCRIPT) userdb-test-cram-md5.pl \
 214 $(DESTDIR)$(sbindir)/userdb-test-cram-md5
 215- 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
 216
 217 uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
 218 rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
 219@@ -1747,13 +1746,13 @@ README_authlib.html: README_authlib.html
182 authdaemond.o: authdaemonrc.h authdaemond.c 220 authdaemond.o: authdaemonrc.h authdaemond.c
183  221
184 install-migrate: authmigrate 222 install-migrate: authmigrate
185- @SHELL@ authmigrate 223- @SHELL@ authmigrate
186+ $(SHELL) authmigrate 224+ $(SHELL) authmigrate
187  225
188 install-configure: 226 install-configure:
189- test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true 227- test -f $(DESTDIR)@authdaemonrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authdaemonrc@.dist || true
190- test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true 228- test -f $(DESTDIR)@authmysqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authmysqlrc@.dist || true
191- test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true 229- test -f $(DESTDIR)@authpgsqlrc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authpgsqlrc@.dist || true
192- test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true 230- test -f $(DESTDIR)@authldaprc@.dist && @SYSCONFTOOL@ $(DESTDIR)@authldaprc@.dist || true
193+ test -f $(DESTDIR)$(authdaemonrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authdaemonrc).dist || true 231+ test -f $(DESTDIR)$(authdaemonrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authdaemonrc).dist || true
194+ test -f $(DESTDIR)$(authmysqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authmysqlrc).dist || true 232+ test -f $(DESTDIR)$(authmysqlrc).dist && $(SYSCONFTOOL) $(DESTDIR)$(authmysqlrc).dist || true
File Deleted: pkgsrc/security/courier-authlib/patches/Attic/patch-ad