Index: head/databases/courier-authlib-pgsql/Makefile =================================================================== --- head/databases/courier-authlib-pgsql/Makefile (revision 509430) +++ head/databases/courier-authlib-pgsql/Makefile (revision 509431) @@ -1,12 +1,12 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -pgsql COMMENT= PostgreSQL support for the Courier authentication library CATEGORIES= databases mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib .include "${MASTERDIR}/Makefile" Index: head/security/courier-authlib/Makefile =================================================================== --- head/security/courier-authlib/Makefile (revision 509430) +++ head/security/courier-authlib/Makefile (revision 509431) @@ -1,205 +1,204 @@ # Created by: Oliver Lehmann # $FreeBSD$ PORTNAME= courier-authlib -PORTVERSION= 0.69.0 -PORTREVISION?= 2 +PORTVERSION= 0.69.1 CATEGORIES?= security mail .if defined(PKGNAMESUFFIX) MASTER_SITES= SF/courier/authlib/${PORTVERSION} .else MASTER_SITES= # empty DISTFILES= # empty EXTRACT_ONLY= # empty .endif MAINTAINER= madpilot@FreeBSD.org COMMENT?= Meta-port for the courier authentication library CONFLICTS= courier-0.45* .if !defined(PKGNAMESUFFIX) RUN_DEPENDS= courierauthconfig:security/courier-authlib-base NO_BUILD= yes NO_INSTALL= yes PATCHDIR= /dev/null OPTIONS_DEFINE+= GDBM .include "${.CURDIR}/Makefile.opt" .else # !defined(PKGNAMESUFFIX) LIB_DEPENDS+= libltdl.so:devel/libltdl \ libcourier-unicode.so:devel/courier-unicode USES= iconv gmake libtool localbase perl5 tar:bzip2 GNU_CONFIGURE= yes USE_SUBMAKE= yes MAILOWN= courier MAILGRP= courier LOCALSTATEDIR= /var AUTHDAEMONVAR= ${LOCALSTATEDIR}/run/authdaemond VPOPMAILDIR?= ${LOCALBASE}/vpopmail USERDB?= ${PREFIX}/etc/userdb CONFIGURE_ARGS= --enable-unicode \ --disable-static \ --without-authcustom \ --without-authshadow \ --without-authpwd \ --with-mailuser=${MAILOWN} \ --with-mailgroup=${MAILGRP} \ --localstatedir=${LOCALSTATEDIR} \ --with-authdaemonvar=${AUTHDAEMONVAR} \ --cache-file=${WRKDIR}/courier-authlib.cache \ --without-authsqlite INSTALL_TARGET= install-strip DESCR= ${PKGDIR}/pkg-descr${PKGNAMESUFFIX} PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX:S/gdbm/db/} PLIST_SUB+= MAILOWN=${MAILOWN} MAILGRP=${MAILGRP} AUTHMOD= auth${PKGNAMESUFFIX:S/-//:S/gdbm/db/} .if ${AUTHMOD} == authbase RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool CONFIGURE_ARGS+=--with-base --with-authpam --with-authpipe USERS= ${MAILOWN} GROUPS= ${MAILGRP} OPTIONS_DEFINE+= DOCS DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README \ README.authdebug.html README_authlib.html PLIST_SUB+= AUTHDAEMONVAR=${AUTHDAEMONVAR} SUB_LIST+= AUTHDAEMONVAR=${AUTHDAEMONVAR} .if defined(WITH_AUTHPIPE_PROG) CONFIGURE_ARGS+=--with-pipeprog=${WITH_AUTHPIPE_PROG} .endif .else RUN_DEPENDS+= courierauthconfig:security/courier-authlib-base CONFIGURE_ARGS+=--without-base --without-authpam --without-authpipe REMOVE_SUBDIRS+=liblock liblog .endif .if ${AUTHMOD} == authuserdb .if ${PKGNAMESUFFIX} == -usergdbm CONFLICTS+= ${PORTNAME}-userdb-0.* LIB_DEPENDS+= libgdbm.so:databases/gdbm CONFIGURE_ARGS+=--with-db=gdbm .elif ${PKGNAMESUFFIX} == -userdb CONFLICTS+= ${PORTNAME}-usergdbm-0.* CONFIGURE_ARGS+=--with-db=db .endif CONFIGURE_ARGS+=--with-userdb=${USERDB} .else CONFIGURE_ARGS+=--with-db=db --without-authuserdb REMOVE_SUBDIRS+=makedat userdb .endif .if ${AUTHMOD} == authldap RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool OPTIONS_DEFINE+= DOCS DOCS= README.ldap USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-authldap .else CONFIGURE_ARGS+=--without-authldap .endif .if ${AUTHMOD} == authmysql RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool OPTIONS_DEFINE+= DOCS DOCS= README.authmysql.html README.authmysql.myownquery USES+= compiler:c11 USE_MYSQL= yes CONFIGURE_ARGS+=--with-authmysql \ --with-mysql-libs=${LOCALBASE}/lib/mysql \ --with-mysql-includes=${LOCALBASE}/include/mysql .else CONFIGURE_ARGS+=--without-authmysql .endif .if ${AUTHMOD} == authpgsql RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool OPTIONS_DEFINE+= DOCS DOCS= README.authpostgres.html USES+= pgsql CONFIGURE_ARGS+=--with-authpgsql .else CONFIGURE_ARGS+=--without-authpgsql .endif .if ${AUTHMOD} == authvchkpw BUILD_DEPENDS+= ${VPOPMAILDIR}/lib/libvpopmail.a:mail/vpopmail CONFIGURE_ARGS+=--with-authvchkpw .else CONFIGURE_ARGS+=--without-authvchkpw .endif .endif # !defined(PKGNAMESUFFIX) .include .if !defined(PKGNAMESUFFIX) .include "${.CURDIR}/Makefile.dep" .else # !defined(PKGNAMESUFFIX) .if ${AUTHMOD} == authbase USE_RC_SUBR= courier-authdaemond pre-everything:: @${ECHO_CMD} @${ECHO_CMD} " Set WITH_AUTHPIPE_PROG to a program you want to use instead of" @${ECHO_CMD} " authProg for libauthpipe" @${ECHO_CMD} .endif post-patch: @${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g; \ s|mysql_connect|mysql_real_connect|g; \ s|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/*/configure \ ${WRKSRC}/configure .for subdir in ${REMOVE_SUBDIRS} @${REINPLACE_CMD} -E 's,(^(ac_subdirs_all|subdirs).*)${subdir},\1,g' \ ${WRKSRC}/configure .endfor @${REINPLACE_CMD} -e 's|^\(DEFAULTOPTIONS=\)""$$|\1"wbnodsn=1"|' \ -e 's|@ALLMODULES@|authuserdb authvchkpw authpam authldap authmysql authpgsql|' \ ${WRKSRC}/authdaemonrc.in @${REINPLACE_CMD} -e 's:^#! @EXPECT@:#!${LOCALBASE}/bin/expect:' \ ${WRKSRC}/authsystem.passwd.in pre-configure: @if [ -f "${WRKDIR}/courier-authlib.cache" -a -s "${WRKDIR}/courier-authlib.cache" ] ; then \ ${RM} "${WRKDIR}/courier-authlib.cache" ; \ fi post-install: .if !empty(DOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif .endif # !defined(PKGNAMESUFFIX) .include Index: head/security/courier-authlib/Makefile.opt =================================================================== --- head/security/courier-authlib/Makefile.opt (revision 509430) +++ head/security/courier-authlib/Makefile.opt (revision 509431) @@ -1,18 +1,18 @@ # Created by: Oliver Lehmann # $FreeBSD$ # To depend on courier-authlib you might consider using this file by specifying # #.if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) #.include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" #.endif # # in your Makefile *after* any #.include OPTIONS_DEFINE+= AUTH_LDAP AUTH_MYSQL AUTH_PGSQL AUTH_USERDB AUTH_VCHKPW DOCS -AUTH_LDAP_DESC= LDAP support +AUTH_LDAP_DESC= LDAP support AUTH_MYSQL_DESC= MySQL support AUTH_PGSQL_DESC= PostgreSQL support AUTH_USERDB_DESC= Userdb support AUTH_VCHKPW_DESC= popmail/vchkpw support Index: head/security/courier-authlib/distinfo =================================================================== --- head/security/courier-authlib/distinfo (revision 509430) +++ head/security/courier-authlib/distinfo (revision 509431) @@ -1,3 +1,3 @@ -TIMESTAMP = 1537254940 -SHA256 (courier-authlib-0.69.0.tar.bz2) = fbbec283e620b3e5aab3bdeb0ec781df3c656d511168bfa23ec69f21af44b689 -SIZE (courier-authlib-0.69.0.tar.bz2) = 2197718 +TIMESTAMP = 1564304568 +SHA256 (courier-authlib-0.69.1.tar.bz2) = 50ced152fe849064d493c3cec3e6d78df77e3e39c6eb0e3f021b9fff874d187e +SIZE (courier-authlib-0.69.1.tar.bz2) = 2204546 Index: head/security/courier-authlib/files/patch-Makefile.in =================================================================== --- head/security/courier-authlib/files/patch-Makefile.in (revision 509430) +++ head/security/courier-authlib/files/patch-Makefile.in (revision 509431) @@ -1,329 +1,375 @@ ---- Makefile.in.orig 2018-09-13 23:11:36 UTC +--- Makefile.in.orig 2019-07-24 23:58:04 UTC +++ Makefile.in @@ -95,11 +95,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -sbin_PROGRAMS = authtest$(EXEEXT) authenumerate$(EXEEXT) \ - authpasswd$(EXEEXT) -bin_PROGRAMS = courierauthconfig$(EXEEXT) -noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \ - authdaemondprog$(EXEEXT) +@HAVE_BASE_TRUE@sbin_PROGRAMS = authtest$(EXEEXT) authenumerate$(EXEEXT) +@HAVE_BASE_TRUE@bin_PROGRAMS = courierauthconfig$(EXEEXT) +@HAVE_BASE_TRUE@noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \ +@HAVE_BASE_TRUE@ authdaemondprog$(EXEEXT) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac -@@ -219,6 +218,12 @@ libcourierauth_la_DEPENDENCIES = libs/libhmac/libhmac. +@@ -220,6 +219,13 @@ libcourierauth_la_DEPENDENCIES = libs/libhmac/libhmac. libs/md5/libmd5.la libs/sha1/libsha1.la \ libs/numlib/libnumlib.la libs/random128/librandom128.la \ libs/rfc822/libencode.la +am_libauthvchkpw_la_OBJECTS = authvchkpw.lo authvchkpwlib.lo \ + preauthvchkpw.lo +libauthvchkpw_la_OBJECTS = $(am_libauthvchkpw_la_OBJECTS) -+libauthvchkpw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) -o $@ ++libauthvchkpw_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) \ ++ -o $@ am_libcourierauth_la_OBJECTS = authdaemon.lo authdaemonlib.lo \ preauthdaemon.lo authmoduser2.lo authmoduser3.lo debug.lo \ authoption.lo -@@ -350,6 +355,7 @@ SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la +@@ -336,7 +342,9 @@ am__depfiles_remade = ./$(DEPDIR)/authconfigfile.Plo \ + ./$(DEPDIR)/authsqlite.Plo ./$(DEPDIR)/authsqlitelib.Plo \ + ./$(DEPDIR)/authsyschangepwd.Plo ./$(DEPDIR)/authsyscommon.Plo \ + ./$(DEPDIR)/authtest.Po ./$(DEPDIR)/authuserdb.Plo \ +- ./$(DEPDIR)/authuserdbpwd.Plo ./$(DEPDIR)/checkpassword.Plo \ ++ ./$(DEPDIR)/authuserdbpwd.Plo \ ++ ./$(DEPDIR)/authvchkpw.Plo ./$(DEPDIR)/authvchkpwlib.Plo \ ++ ./$(DEPDIR)/checkpassword.Plo \ + ./$(DEPDIR)/checkpasswordmd5.Plo \ + ./$(DEPDIR)/checkpasswordsha1.Plo ./$(DEPDIR)/cramlib.Plo \ + ./$(DEPDIR)/cryptpassword.Plo ./$(DEPDIR)/debug.Plo \ +@@ -344,7 +352,7 @@ am__depfiles_remade = ./$(DEPDIR)/authconfigfile.Plo \ + ./$(DEPDIR)/preauthldap.Plo ./$(DEPDIR)/preauthmysql.Plo \ + ./$(DEPDIR)/preauthpam.Plo ./$(DEPDIR)/preauthpwd.Plo \ + ./$(DEPDIR)/preauthshadow.Plo ./$(DEPDIR)/preauthuserdb.Plo \ +- ./$(DEPDIR)/preauthuserdbcommon.Plo ++ ./$(DEPDIR)/preauthuserdbcommon.Plo ./$(DEPDIR)/preauthvchkpw.Plo + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -387,6 +395,7 @@ SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la $(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \ $(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \ $(libauthsqlite_la_SOURCES) $(libauthuserdb_la_SOURCES) \ + $(libauthvchkpw_la_SOURCES) \ $(libcourierauth_la_SOURCES) \ $(libcourierauthcommon_la_SOURCES) \ $(libcourierauthsasl_la_SOURCES) \ -@@ -532,6 +538,7 @@ LIBAUTHPWD = @LIBAUTHPWD@ +@@ -400,6 +409,7 @@ DIST_SOURCES = $(libauthcustom_la_SOURCES) $(libauthld + $(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \ + $(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \ + $(libauthsqlite_la_SOURCES) $(libauthuserdb_la_SOURCES) \ ++ $(libauthvchkpw_la_SOURCES) \ + $(libcourierauth_la_SOURCES) \ + $(libcourierauthcommon_la_SOURCES) \ + $(libcourierauthsasl_la_SOURCES) \ +@@ -569,6 +579,7 @@ LIBAUTHPWD = @LIBAUTHPWD@ LIBAUTHSHADOW = @LIBAUTHSHADOW@ LIBAUTHSQLITE = @LIBAUTHSQLITE@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ +LIBAUTHVCHKPW = @LIBAUTHVCHKPW@ LIBDB = @LIBDB@ LIBDL = @LIBDL@ LIBGDBM = @LIBGDBM@ -@@ -657,21 +664,26 @@ top_builddir = @top_builddir@ +@@ -694,21 +705,26 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ userdb = @userdb@ AUTOMAKE_OPTIONS = dist-bzip2 -SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib libs/makedat userdb libs/rfc822 libs/random128 libs/liblock liblog +SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib +@HAVE_USERDB_TRUE@SUBDIRS += libs/makedat userdb +SUBDIRS += libs/rfc822 libs/random128 -+@HAVE_BASE_TRUE@ SUBDIRS += libs/liblock liblog ++@HAVE_BASE_TRUE@SUBDIRS += libs/liblock liblog AM_CPPFLAGS = -I liblock $(LTDLINCL) modules = @LIBAUTHUSERDB@ \ @LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \ @LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ @LIBAUTHSQLITE@ \ - @LIBAUTHCUSTOM@ @LIBAUTHPIPE@ + @LIBAUTHCUSTOM@ @LIBAUTHVCHKPW@ @LIBAUTHPIPE@ pkglibexec_SCRIPTS = authsystem.passwd -pkglib_LTLIBRARIES = libcourierauth.la \ - libcourierauthcommon.la libcourierauthsasl.la libcourierauthsaslclient.la \ - $(modules) +@HAVE_BASE_TRUE@pkglib_LTLIBRARIES = libcourierauth.la \ +@HAVE_BASE_TRUE@ libcourierauthcommon.la libcourierauthsasl.la libcourierauthsaslclient.la \ +@HAVE_BASE_TRUE@ $(modules) +@HAVE_BASE_FALSE@pkglib_LTLIBRARIES = $(modules) sbin_SCRIPTS = authdaemond EXTRA_LTLIBRARIES = libauthuserdb.la \ libauthpam.la libauthpwd.la libauthshadow.la \ + libauthvchkpw.la \ libauthpgsql.la \ libauthldap.la \ libauthmysql.la \ -@@ -746,6 +758,13 @@ libauthshadow_la_DEPENDENCIES = $(commonlibdep) +@@ -783,6 +799,13 @@ libauthshadow_la_DEPENDENCIES = $(commonlibdep) libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t) libauthshadow_la_LDFLAGS = $(commonldflags) +# The authvchkpw module +libauthvchkpw_t = @VPOPMAILLIBS@ @LIBM@ +libauthvchkpw_la_SOURCES = authvchkpw.c authvchkpwlib.c preauthvchkpw.c +libauthvchkpw_la_DEPENDENCIES = $(commonlibdep) +libauthvchkpw_la_LIBADD = $(commonlibadd) $(libauthvchkpw_t) +libauthvchkpw_la_LDFLAGS = $(commonldflags) + # The authpgsql module libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@ libauthpgsql_la_SOURCES = authpgsql.c authpgsqllib.cpp authpgsql.h -@@ -827,8 +846,8 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc +@@ -864,8 +887,8 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc libcourierauthsaslclient_la_LIBADD = libcourierauth.la libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version -include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \ - courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h +@HAVE_BASE_TRUE@include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \ +@HAVE_BASE_TRUE@ courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h courierauthconfig_SOURCES = authinfo.c authpasswd_SOURCES = authpasswd.c -@@ -870,7 +889,7 @@ authmksock_LDADD = @NETLIBS@ +@@ -907,7 +930,7 @@ authmksock_LDADD = @NETLIBS@ man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 auth_mkhomedir.3 \ auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3 -man1 = authpasswd.1 authtest.1 +man1 = authtest.1 man_MANS = $(man1) $(man3) auth_sasl_ex.3 BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \ authdaemonrc.h packageversion.h \ -@@ -1028,6 +1047,9 @@ libauthsqlite.la: $(libauthsqlite_la_OBJECTS) $(libaut +@@ -1172,6 +1195,9 @@ libauthsqlite.la: $(libauthsqlite_la_OBJECTS) $(libaut libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) $(EXTRA_libauthuserdb_la_DEPENDENCIES) $(AM_V_CCLD)$(libauthuserdb_la_LINK) $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS) +libauthvchkpw.la: $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_DEPENDENCIES) + $(AM_V_CCLD)$(libauthvchkpw_la_LINK) $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_LIBADD) $(LIBS) + libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES) $(EXTRA_libcourierauth_la_DEPENDENCIES) $(AM_V_CCLD)$(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS) -@@ -1298,6 +1320,8 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authtest.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdb.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdbpwd.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpw.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpwlib.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpassword.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordmd5.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordsha1.Plo@am__quote@ -@@ -1313,6 +1337,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthshadow.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdb.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdbcommon.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthvchkpw.Plo@am__quote@ +@@ -1335,6 +1361,8 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authtest.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdb.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdbpwd.Plo@am__quote@ # am--include-marker ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpw.Plo@am__quote@ # am--include-marker ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpwlib.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpassword.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordmd5.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordsha1.Plo@am__quote@ # am--include-marker +@@ -1350,6 +1378,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthshadow.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdb.Plo@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdbcommon.Plo@am__quote@ # am--include-marker ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthvchkpw.Plo@am__quote@ # am--include-marker - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -1837,18 +1862,26 @@ info: info-recursive + $(am__depfiles_remade): + @$(MKDIR_P) $(@D) +@@ -1913,6 +1942,8 @@ distclean: distclean-recursive + -rm -f ./$(DEPDIR)/authtest.Po + -rm -f ./$(DEPDIR)/authuserdb.Plo + -rm -f ./$(DEPDIR)/authuserdbpwd.Plo ++ -rm -f ./$(DEPDIR)/authvchkpw.Plo ++ -rm -f ./$(DEPDIR)/authvchkpwlib.Plo + -rm -f ./$(DEPDIR)/checkpassword.Plo + -rm -f ./$(DEPDIR)/checkpasswordmd5.Plo + -rm -f ./$(DEPDIR)/checkpasswordsha1.Plo +@@ -1928,6 +1959,7 @@ distclean: distclean-recursive + -rm -f ./$(DEPDIR)/preauthshadow.Plo + -rm -f ./$(DEPDIR)/preauthuserdb.Plo + -rm -f ./$(DEPDIR)/preauthuserdbcommon.Plo ++ -rm -f ./$(DEPDIR)/preauthvchkpw.Plo + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags +@@ -1944,18 +1976,26 @@ info: info-recursive info-am: -install-data-am: install-includeHEADERS install-man - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook +@HAVE_BASE_TRUE@install-data-am: install-includeHEADERS install-man +@HAVE_BASE_TRUE@ @$(NORMAL_INSTALL) +@HAVE_BASE_TRUE@ $(MAKE) $(AM_MAKEFLAGS) install-data-hook + +@HAVE_BASE_FALSE@install-data-am: +@HAVE_BASE_FALSE@ $(MAKE) $(AM_MAKEFLAGS) install-data-hook + install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \ - install-pkglibexecSCRIPTS install-sbinPROGRAMS \ - install-sbinSCRIPTS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook +@HAVE_BASE_TRUE@install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \ +@HAVE_BASE_TRUE@ install-pkglibexecSCRIPTS install-sbinPROGRAMS \ +@HAVE_BASE_TRUE@ install-sbinSCRIPTS +@HAVE_BASE_TRUE@ @$(NORMAL_INSTALL) +@HAVE_BASE_TRUE@ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + +@HAVE_BASE_FALSE@install-exec-am: install-pkglibLTLIBRARIES +@HAVE_BASE_FALSE@ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + install-html: install-html-recursive install-html-am: -@@ -1929,13 +1962,16 @@ uninstall-man: uninstall-man1 uninstall-man3 +@@ -2097,13 +2137,16 @@ uninstall-man: uninstall-man1 uninstall-man3 .PRECIOUS: Makefile +authvchkpw.lo: authvchkpw.c vpopmail_config.h +preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h - ++ +vpopmail_config.h: + echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h -+ + @HAVE_AUTHPGSQL_TRUE@install-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@uninstall-authpgsqlrc: @HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist -@@ -1953,8 +1989,6 @@ authpgsqlrc.h: +@@ -2121,8 +2164,6 @@ authpgsqlrc.h: @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@uninstall-authldaprc: @HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist -@@ -1965,6 +1999,18 @@ authpgsqlrc.h: +@@ -2133,6 +2174,18 @@ authpgsqlrc.h: @HAVE_LDAP_FALSE@uninstall-authldaprc: @HAVE_LDAP_FALSE@ @: +@HAVE_LDAP_TRUE@install-ldapschema: +@HAVE_LDAP_TRUE@ $(mkinstalldirs) ${DESTDIR}${sysconfdir}/openldap/schema +@HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \ +@HAVE_LDAP_TRUE@ ${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.dist +@HAVE_LDAP_TRUE@# if test ! -f ${sysconfdir}/openldap/schema/authldap.schema ; then \ +@HAVE_LDAP_TRUE@# $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \ -+@HAVE_LDAP_TRUE@# ${sysconfdir}/openldap/schema/authldap.schema ; \ ++@HAVE_LDAP_TRUE@# ${sysconfdir}/openldap/schema/authldap.schema ; \ +@HAVE_LDAP_TRUE@# fi + +@HAVE_LDAP_FALSE@install-ldapschema: +@HAVE_LDAP_FALSE@ @: + authldaprc.h: echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h -@@ -1972,8 +2018,6 @@ authldaprc.h: +@@ -2140,8 +2193,6 @@ authldaprc.h: @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@uninstall-authmysqlrc: @HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist -@@ -1991,8 +2035,6 @@ authmysqlrc.h: +@@ -2159,8 +2210,6 @@ authmysqlrc.h: @HAVE_AUTHSQLITE_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || : @HAVE_AUTHSQLITE_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \ @HAVE_AUTHSQLITE_TRUE@ $(DESTDIR)@authsqliterc@.dist -@HAVE_AUTHSQLITE_TRUE@ -chown @mailuser@ $(DESTDIR)@authsqliterc@.dist -@HAVE_AUTHSQLITE_TRUE@ -chgrp @mailgroup@ $(DESTDIR)@authsqliterc@.dist @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc: @HAVE_AUTHSQLITE_TRUE@ rm -f $(DESTDIR)@authsqliterc@.dist -@@ -2011,17 +2053,21 @@ authpipelib.lo: authpipelib.c authpipelib.h authpiperc +@@ -2179,17 +2228,21 @@ authpipelib.lo: authpipelib.c authpipelib.h authpiperc authpiperc.h: echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h -install-authdaemonrc: - $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || : - sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' authdaemonrc.tmp - $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist - rm -f authdaemonrc.tmp - -chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist - -chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist +@HAVE_BASE_TRUE@install-authdaemonrc: +@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || : +@HAVE_BASE_TRUE@ sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' authdaemonrc.tmp +@HAVE_BASE_TRUE@ $(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist +@HAVE_BASE_TRUE@ rm -f authdaemonrc.tmp -uninstall-authdaemonrc: - rm -f $(DESTDIR)@authdaemonrc@.dist +@HAVE_BASE_FALSE@install-authdaemonrc: +@HAVE_BASE_FALSE@ @: - ++ +@HAVE_BASE_TRUE@uninstall-authdaemonrc: +@HAVE_BASE_TRUE@ rm -f $(DESTDIR)@authdaemonrc@.dist -+ + +@HAVE_BASE_FALSE@uninstall-authdaemonrc: +@HAVE_BASE_FALSE@ @: + authdaemonrc.h: echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h -@@ -2067,24 +2113,24 @@ dist-hook: +@@ -2235,24 +2288,24 @@ dist-hook: # automake still a bit stupid... install-data-hook: install-authdaemonrc install-authpgsqlrc \ - install-authldaprc install-authmysqlrc install-authsqliterc + install-authldaprc install-ldapschema install-authmysqlrc install-authsqliterc : install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(bindir) || : - $(mkinstalldirs) $(DESTDIR)$(sbindir) || : - $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : - chmod 755 $(DESTDIR)$(pkglibexecdir) - -chown @mailuser@ $(DESTDIR)$(pkglibexecdir) - -chgrp @mailgroup@ $(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@ +@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(bindir) || : +@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(sbindir) || : +@HAVE_BASE_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : +@HAVE_BASE_TRUE@ chmod 755 $(DESTDIR)$(pkglibexecdir) +@HAVE_USERDB_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || : +@HAVE_USERDB_TRUE@ chmod 755 $(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@ chmod 750 $(DESTDIR)@authdaemonvar@ test "@LIBAUTHUSERDB@" = "" && exit 0 ;\ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) libs/makedat/makedatprog \ $(DESTDIR)$(pkglibexecdir)/makedatprog ; \ + $(INSTALL_SCRIPT) userdb/vchkpw2userdb \ + $(DESTDIR)$(sbindir)/vchkpw2userdb ; \ $(INSTALL_SCRIPT) userdb/pw2userdb \ $(DESTDIR)$(sbindir)/pw2userdb ; \ $(INSTALL_SCRIPT) userdb/makeuserdb \ -@@ -2097,9 +2143,10 @@ install-exec-hook: +@@ -2265,9 +2318,10 @@ install-exec-hook: $(DESTDIR)$(sbindir)/userdb-test-cram-md5 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 ;\ rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \ + $(DESTDIR)$(sbindir)/vchkpw2userdb \ $(DESTDIR)$(sbindir)/pw2userdb \ $(DESTDIR)$(sbindir)/makeuserdb \ $(DESTDIR)$(sbindir)/userdb \ -@@ -2110,7 +2157,7 @@ authlib.html: authlib.html.in +@@ -2278,7 +2332,7 @@ authlib.html: authlib.html.in $(SHELL) ./config.status --file=authlib.html authlib.3: authlib.3.in - $(SHELL) ./config.status --file=authlib.3 +@HAVE_BASE_TRUE@ $(SHELL) ./config.status --file=authlib.3 @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml libs/docbook/sgml2html @HAVE_SGML_TRUE@ libs/docbook/sgml2html authpasswd.sgml authpasswd.html Index: head/security/courier-authlib/pkg-plist-base =================================================================== --- head/security/courier-authlib/pkg-plist-base (revision 509430) +++ head/security/courier-authlib/pkg-plist-base (revision 509431) @@ -1,44 +1,44 @@ bin/courierauthconfig -@postunexec if cmp -s %D/etc/authlib/authdaemonrc.dist %D/etc/authlib/authdaemonrc; then rm -f %D/etc/authlib/authdaemonrc; fi +@preunexec if cmp -s %D/etc/authlib/authdaemonrc.dist %D/etc/authlib/authdaemonrc; then rm -f %D/etc/authlib/authdaemonrc; fi @(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authdaemonrc.dist @postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authdaemonrc include/courier_auth_config.h include/courierauth.h include/courierauthdebug.h include/courierauthsasl.h include/courierauthsaslclient.h include/courierauthstaticlist.h lib/courier-authlib/libcourierauth.so lib/courier-authlib/libcourierauthcommon.so lib/courier-authlib/libcourierauthsasl.so lib/courier-authlib/libcourierauthsaslclient.so lib/courier-authlib/libauthpam.so lib/courier-authlib/libauthpipe.so libexec/courier-authlib/authdaemond libexec/courier-authlib/authsystem.passwd man/man1/authtest.1.gz man/man1/courierlogger.1.gz man/man3/auth_enumerate.3.gz man/man3/auth_generic.3.gz man/man3/auth_getoption.3.gz man/man3/auth_getuserinfo.3.gz man/man3/auth_login.3.gz man/man3/auth_mkhomedir.3.gz man/man3/auth_passwd.3.gz man/man3/auth_sasl.3.gz man/man3/auth_sasl_ex.3.gz man/man3/authlib.3.gz sbin/authdaemond sbin/authenumerate sbin/authtest sbin/courierlogger %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html %%PORTDOCS%%%%DOCSDIR%%/README_authlib.html @dir(%%MAILOWN%%,%%MAILGRP%%,750) %%AUTHDAEMONVAR%% @dir(%%MAILOWN%%,%%MAILGRP%%,755) libexec/courier-authlib Index: head/security/courier-authlib/pkg-plist-ldap =================================================================== --- head/security/courier-authlib/pkg-plist-ldap (revision 509430) +++ head/security/courier-authlib/pkg-plist-ldap (revision 509431) @@ -1,6 +1,7 @@ -@postunexec if cmp -s %D/etc/authlib/authldaprc.dist %D/etc/authlib/authldaprc; then rm -f %D/etc/authlib/authldaprc; fi +@preunexec if cmp -s %D/etc/authlib/authldaprc.dist %D/etc/authlib/authldaprc; then rm -f %D/etc/authlib/authldaprc; fi @(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authldaprc.dist @postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authldaprc @sample etc/openldap/schema/authldap.schema.dist lib/courier-authlib/libauthldap.so %%PORTDOCS%%%%DOCSDIR%%/README.ldap +@dir etc/openldap/schema Index: head/security/courier-authlib/pkg-plist-mysql =================================================================== --- head/security/courier-authlib/pkg-plist-mysql (revision 509430) +++ head/security/courier-authlib/pkg-plist-mysql (revision 509431) @@ -1,6 +1,6 @@ -@postunexec if cmp -s %D/etc/authlib/authmysqlrc.dist %D/etc/authlib/authmysqlrc; then rm -f %D/etc/authlib/authmysqlrc; fi +@preunexec if cmp -s %D/etc/authlib/authmysqlrc.dist %D/etc/authlib/authmysqlrc; then rm -f %D/etc/authlib/authmysqlrc; fi @(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authmysqlrc.dist @postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authmysqlrc lib/courier-authlib/libauthmysql.so %%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html %%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery Index: head/security/courier-authlib/pkg-plist-pgsql =================================================================== --- head/security/courier-authlib/pkg-plist-pgsql (revision 509430) +++ head/security/courier-authlib/pkg-plist-pgsql (revision 509431) @@ -1,5 +1,5 @@ -@postunexec if cmp -s %D/etc/authlib/authpgsqlrc.dist %D/etc/authlib/authpgsqlrc; then rm -f %D/etc/authlib/authpgsqlrc; fi +@preunexec if cmp -s %D/etc/authlib/authpgsqlrc.dist %D/etc/authlib/authpgsqlrc; then rm -f %D/etc/authlib/authpgsqlrc; fi @(%%MAILOWN%%,%%MAILGRP%%,660) etc/authlib/authpgsqlrc.dist @postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authpgsqlrc lib/courier-authlib/libauthpgsql.so %%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html