diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index c4a29f7623bb..10512dacbb6f 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -1,216 +1,216 @@ PORTNAME= courier-authlib -PORTVERSION= 0.72.5 +PORTVERSION= 0.72.6 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 WWW= https://www.Courier-MTA.org/authlib/ 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) LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.GPL LIB_DEPENDS+= libidn2.so:dns/libidn2 \ libltdl.so:devel/libltdl \ libcourier-unicode.so:devel/courier-unicode USES= iconv gmake libtool localbase perl5 pkgconfig 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 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share 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 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 USES+= ldap 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 mysql 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} == authsqlite RUN_DEPENDS+= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool OPTIONS_DEFINE+= DOCS DOCS= README.authsqlite.html USES+= pkgconfig sqlite CONFIGURE_ARGS+=--with-authsqlite .else CONFIGURE_ARGS+=--without-authsqlite .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 diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo index 826791c9cc47..9638405fe6cb 100644 --- a/security/courier-authlib/distinfo +++ b/security/courier-authlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1760733071 -SHA256 (courier-authlib-0.72.5.tar.bz2) = a94ff34c560f7b338108fe13ba876f1d15b9700bbc26e249da34d4db79d3aa42 -SIZE (courier-authlib-0.72.5.tar.bz2) = 2801834 +TIMESTAMP = 1762759484 +SHA256 (courier-authlib-0.72.6.tar.bz2) = c801f9da4bb40b5efcd89694ca56de0b10a2b8e275c3afc00f4d9aa378b0f95d +SIZE (courier-authlib-0.72.6.tar.bz2) = 2802137 diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in index f3dc3a55900d..7ad6d2d753a6 100644 --- a/security/courier-authlib/files/patch-Makefile.in +++ b/security/courier-authlib/files/patch-Makefile.in @@ -1,541 +1,453 @@ ---- Makefile.in.orig 2025-10-14 23:04:09 UTC +--- Makefile.in.orig 2025-11-09 20:38:06 UTC +++ Makefile.in @@ -97,11 +97,10 @@ host_triplet = @host@ 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 @@ -155,7 +154,7 @@ am__v_lt_0 = --silent AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent -am__v_lt_1 = +am__v_lt_1 = libauthcustom_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libauthcustom_la_LDFLAGS) $(LDFLAGS) \ @@ -223,6 +222,13 @@ am_libcourierauth_la_OBJECTS = authdaemon.lo authdaemo am_libcourierauth_la_OBJECTS = authdaemon.lo authdaemonlib.lo \ preauthdaemon.lo authmoduser2.lo authmoduser3.lo debug.lo \ authoption.lo +am_libauthvchkpw_la_OBJECTS = authvchkpw.lo authvchkpwlib.lo \ + preauthvchkpw.lo +libauthvchkpw_la_OBJECTS = $(am_libauthvchkpw_la_OBJECTS) +libauthvchkpw_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) \ + -o $@ libcourierauth_la_OBJECTS = $(am_libcourierauth_la_OBJECTS) - libcourierauth_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + libcourierauth_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ @@ -300,11 +306,11 @@ am__v_GEN_0 = @echo " GEN " $@; AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles @@ -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)/checkpasswordsha1.Plo ./$(DEPDIR)/cplusplus1.Plo \ + ./$(DEPDIR)/cplusplus2.Po ./$(DEPDIR)/cplusplus3.Po \ +@@ -346,7 +354,7 @@ am__depfiles_remade = ./$(DEPDIR)/authconfigfile.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) -@@ -355,7 +363,7 @@ am__v_CC_0 = @echo " CC " $@; +@@ -357,7 +365,7 @@ am__v_CC_0 = @echo " CC " $@; AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -363,7 +371,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; +@@ -365,7 +373,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = +am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -@@ -373,7 +381,7 @@ am__v_CXX_0 = @echo " CXX " $@; +@@ -375,7 +383,7 @@ am__v_CXX_0 = @echo " CXX " $@; AM_V_CXX = $(am__v_CXX_@AM_V@) am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) am__v_CXX_0 = @echo " CXX " $@; -am__v_CXX_1 = +am__v_CXX_1 = CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -@@ -381,12 +389,13 @@ am__v_CXXLD_0 = @echo " CXXLD " $@; +@@ -383,12 +391,13 @@ am__v_CXXLD_0 = @echo " CXXLD " $@; AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; -am__v_CXXLD_1 = +am__v_CXXLD_1 = SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la_SOURCES) \ $(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \ $(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \ $(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \ $(libauthsqlite_la_SOURCES) $(libauthuserdb_la_SOURCES) \ + $(libauthvchkpw_la_SOURCES) \ $(libcourierauth_la_SOURCES) \ + $(nodist_EXTRA_libcourierauth_la_SOURCES) \ $(libcourierauthcommon_la_SOURCES) \ - $(libcourierauthsasl_la_SOURCES) \ -@@ -400,6 +409,7 @@ DIST_SOURCES = $(libauthcustom_la_SOURCES) $(libauthld +@@ -405,6 +414,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) \ -@@ -575,6 +585,7 @@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ +@@ -580,6 +590,7 @@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ LIBAUTHSHADOW = @LIBAUTHSHADOW@ LIBAUTHSQLITE = @LIBAUTHSQLITE@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ +LIBAUTHVCHKPW = @LIBAUTHVCHKPW@ LIBDB = @LIBDB@ LIBDL = @LIBDL@ LIBGDBM = @LIBGDBM@ -@@ -710,7 +721,10 @@ AUTOMAKE_OPTIONS = dist-bzip2 +@@ -715,7 +726,10 @@ AUTOMAKE_OPTIONS = dist-bzip2 userdb = @userdb@ using_systemd = @using_systemd@ AUTOMAKE_OPTIONS = dist-bzip2 -SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib libs/makedat userdb libs/rfc822 libs/rfc2045 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/rfc2045 libs/random128 +@HAVE_BASE_TRUE@SUBDIRS += libs/liblock liblog AM_CPPFLAGS = -I liblock $(LTDLINCL) BUILT_SOURCES = authdaemonrc.h $(BUILT1) $(GITFILES) \ $(man3:%.3=%.html) $(man1:%.1=%.html) authsqliterc.h \ -@@ -718,16 +732,18 @@ modules = @LIBAUTHUSERDB@ \ +@@ -723,16 +737,18 @@ modules = @LIBAUTHUSERDB@ \ 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 \ -@@ -800,6 +816,13 @@ libauthshadow_la_LDFLAGS = $(commonldflags) +@@ -806,6 +822,13 @@ libauthshadow_la_LDFLAGS = $(commonldflags) 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 -@@ -889,8 +912,8 @@ libcourierauthsaslclient_la_LDFLAGS = -export-symbols- +@@ -895,8 +918,8 @@ libcourierauthsaslclient_la_LDFLAGS = -export-symbols- libcourierauthsaslclient_la_LIBADD = libcourierauth.la libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -version-info @LIBVERSION_INFO@ -include_HEADERS = courierauth.h courierauthsasl.h \ - courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h +@HAVE_BASE_TRUE@include_HEADERS = courierauth.h courierauthsasl.h \ +@HAVE_BASE_TRUE@ courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h courierauthconfig_SOURCES = authinfo.c authpasswd_SOURCES = authpasswd.c -@@ -907,7 +930,7 @@ authenumerate_LDADD = libcourierauth.la \ +@@ -914,7 +937,7 @@ authenumerate_LDADD = libcourierauth.la \ authenumerate_LDADD = libcourierauth.la \ libs/numlib/libnumlib.la -authenumerate_LDFLAGS = +authenumerate_LDFLAGS = # # The main daemon. -@@ -938,7 +961,7 @@ extraman3 = auth_generic_meta.3 auth_login_meta.3 auth +@@ -946,7 +969,7 @@ extraman3 = auth_generic_meta.3 auth_login_meta.3 auth extraman3 = auth_generic_meta.3 auth_login_meta.3 auth_getuserinfo_meta.3 \ auth_sasl_ex.3 -man1 = authpasswd.1 authtest.1 +man1 = authtest.1 man_MANS = $(man1) $(man3) $(extraman3) BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \ authdaemonrc.h packageversion.h \ -@@ -996,7 +1019,7 @@ stamp-h1: $(srcdir)/courier_auth_config.h.in $(top_bui +@@ -1004,7 +1027,7 @@ stamp-h1: $(srcdir)/courier_auth_config.h.in $(top_bui stamp-h1: $(srcdir)/courier_auth_config.h.in $(top_builddir)/config.status $(AM_V_at)rm -f stamp-h1 $(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status courier_auth_config.h -$(srcdir)/courier_auth_config.h.in: $(am__configure_deps) +$(srcdir)/courier_auth_config.h.in: $(am__configure_deps) $(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER)) $(AM_V_at)rm -f stamp-h1 $(AM_V_at)touch $@ -@@ -1151,73 +1174,76 @@ clean-pkglibLTLIBRARIES: - echo rm -f $${locs}; \ - $(am__rm_f) $${locs} - --libauthcustom.la: $(libauthcustom_la_OBJECTS) $(libauthcustom_la_DEPENDENCIES) $(EXTRA_libauthcustom_la_DEPENDENCIES) -+libauthcustom.la: $(libauthcustom_la_OBJECTS) $(libauthcustom_la_DEPENDENCIES) $(EXTRA_libauthcustom_la_DEPENDENCIES) - $(AM_V_CCLD)$(libauthcustom_la_LINK) $(libauthcustom_la_OBJECTS) $(libauthcustom_la_LIBADD) $(LIBS) - --libauthldap.la: $(libauthldap_la_OBJECTS) $(libauthldap_la_DEPENDENCIES) $(EXTRA_libauthldap_la_DEPENDENCIES) -+libauthldap.la: $(libauthldap_la_OBJECTS) $(libauthldap_la_DEPENDENCIES) $(EXTRA_libauthldap_la_DEPENDENCIES) - $(AM_V_CXXLD)$(libauthldap_la_LINK) $(libauthldap_la_OBJECTS) $(libauthldap_la_LIBADD) $(LIBS) - --libauthmysql.la: $(libauthmysql_la_OBJECTS) $(libauthmysql_la_DEPENDENCIES) $(EXTRA_libauthmysql_la_DEPENDENCIES) -+libauthmysql.la: $(libauthmysql_la_OBJECTS) $(libauthmysql_la_DEPENDENCIES) $(EXTRA_libauthmysql_la_DEPENDENCIES) - $(AM_V_CXXLD)$(libauthmysql_la_LINK) $(libauthmysql_la_OBJECTS) $(libauthmysql_la_LIBADD) $(LIBS) - --libauthpam.la: $(libauthpam_la_OBJECTS) $(libauthpam_la_DEPENDENCIES) $(EXTRA_libauthpam_la_DEPENDENCIES) -+libauthpam.la: $(libauthpam_la_OBJECTS) $(libauthpam_la_DEPENDENCIES) $(EXTRA_libauthpam_la_DEPENDENCIES) - $(AM_V_CCLD)$(libauthpam_la_LINK) $(libauthpam_la_OBJECTS) $(libauthpam_la_LIBADD) $(LIBS) - --libauthpgsql.la: $(libauthpgsql_la_OBJECTS) $(libauthpgsql_la_DEPENDENCIES) $(EXTRA_libauthpgsql_la_DEPENDENCIES) -+libauthpgsql.la: $(libauthpgsql_la_OBJECTS) $(libauthpgsql_la_DEPENDENCIES) $(EXTRA_libauthpgsql_la_DEPENDENCIES) - $(AM_V_CXXLD)$(libauthpgsql_la_LINK) $(libauthpgsql_la_OBJECTS) $(libauthpgsql_la_LIBADD) $(LIBS) - --libauthpipe.la: $(libauthpipe_la_OBJECTS) $(libauthpipe_la_DEPENDENCIES) $(EXTRA_libauthpipe_la_DEPENDENCIES) -+libauthpipe.la: $(libauthpipe_la_OBJECTS) $(libauthpipe_la_DEPENDENCIES) $(EXTRA_libauthpipe_la_DEPENDENCIES) - $(AM_V_CCLD)$(libauthpipe_la_LINK) $(libauthpipe_la_OBJECTS) $(libauthpipe_la_LIBADD) $(LIBS) - --libauthpwd.la: $(libauthpwd_la_OBJECTS) $(libauthpwd_la_DEPENDENCIES) $(EXTRA_libauthpwd_la_DEPENDENCIES) -+libauthpwd.la: $(libauthpwd_la_OBJECTS) $(libauthpwd_la_DEPENDENCIES) $(EXTRA_libauthpwd_la_DEPENDENCIES) - $(AM_V_CCLD)$(libauthpwd_la_LINK) $(libauthpwd_la_OBJECTS) $(libauthpwd_la_LIBADD) $(LIBS) - --libauthshadow.la: $(libauthshadow_la_OBJECTS) $(libauthshadow_la_DEPENDENCIES) $(EXTRA_libauthshadow_la_DEPENDENCIES) -+libauthshadow.la: $(libauthshadow_la_OBJECTS) $(libauthshadow_la_DEPENDENCIES) $(EXTRA_libauthshadow_la_DEPENDENCIES) - $(AM_V_CCLD)$(libauthshadow_la_LINK) $(libauthshadow_la_OBJECTS) $(libauthshadow_la_LIBADD) $(LIBS) - --libauthsqlite.la: $(libauthsqlite_la_OBJECTS) $(libauthsqlite_la_DEPENDENCIES) $(EXTRA_libauthsqlite_la_DEPENDENCIES) -+libauthsqlite.la: $(libauthsqlite_la_OBJECTS) $(libauthsqlite_la_DEPENDENCIES) $(EXTRA_libauthsqlite_la_DEPENDENCIES) - $(AM_V_CXXLD)$(libauthsqlite_la_LINK) $(libauthsqlite_la_OBJECTS) $(libauthsqlite_la_LIBADD) $(LIBS) - --libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) $(EXTRA_libauthuserdb_la_DEPENDENCIES) -+libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) $(EXTRA_libauthuserdb_la_DEPENDENCIES) +@@ -1189,6 +1212,9 @@ libauthuserdb.la: $(libauthuserdb_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) --libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES) $(EXTRA_libcourierauth_la_DEPENDENCIES) +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) - --libcourierauthcommon.la: $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_DEPENDENCIES) $(EXTRA_libcourierauthcommon_la_DEPENDENCIES) -+libcourierauthcommon.la: $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_DEPENDENCIES) $(EXTRA_libcourierauthcommon_la_DEPENDENCIES) - $(AM_V_CXXLD)$(libcourierauthcommon_la_LINK) -rpath $(pkglibdir) $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_LIBADD) $(LIBS) - --libcourierauthsasl.la: $(libcourierauthsasl_la_OBJECTS) $(libcourierauthsasl_la_DEPENDENCIES) $(EXTRA_libcourierauthsasl_la_DEPENDENCIES) -+libcourierauthsasl.la: $(libcourierauthsasl_la_OBJECTS) $(libcourierauthsasl_la_DEPENDENCIES) $(EXTRA_libcourierauthsasl_la_DEPENDENCIES) - $(AM_V_CCLD)$(libcourierauthsasl_la_LINK) -rpath $(pkglibdir) $(libcourierauthsasl_la_OBJECTS) $(libcourierauthsasl_la_LIBADD) $(LIBS) - --libcourierauthsaslclient.la: $(libcourierauthsaslclient_la_OBJECTS) $(libcourierauthsaslclient_la_DEPENDENCIES) $(EXTRA_libcourierauthsaslclient_la_DEPENDENCIES) -+libcourierauthsaslclient.la: $(libcourierauthsaslclient_la_OBJECTS) $(libcourierauthsaslclient_la_DEPENDENCIES) $(EXTRA_libcourierauthsaslclient_la_DEPENDENCIES) - $(AM_V_CCLD)$(libcourierauthsaslclient_la_LINK) -rpath $(pkglibdir) $(libcourierauthsaslclient_la_OBJECTS) $(libcourierauthsaslclient_la_LIBADD) $(LIBS) - --authdaemondprog$(EXEEXT): $(authdaemondprog_OBJECTS) $(authdaemondprog_DEPENDENCIES) $(EXTRA_authdaemondprog_DEPENDENCIES) -+authdaemondprog$(EXEEXT): $(authdaemondprog_OBJECTS) $(authdaemondprog_DEPENDENCIES) $(EXTRA_authdaemondprog_DEPENDENCIES) - @rm -f authdaemondprog$(EXEEXT) - $(AM_V_CXXLD)$(authdaemondprog_LINK) $(authdaemondprog_OBJECTS) $(authdaemondprog_LDADD) $(LIBS) - --authdaemontest$(EXEEXT): $(authdaemontest_OBJECTS) $(authdaemontest_DEPENDENCIES) $(EXTRA_authdaemontest_DEPENDENCIES) -+authdaemontest$(EXEEXT): $(authdaemontest_OBJECTS) $(authdaemontest_DEPENDENCIES) $(EXTRA_authdaemontest_DEPENDENCIES) - @rm -f authdaemontest$(EXEEXT) - $(AM_V_CCLD)$(authdaemontest_LINK) $(authdaemontest_OBJECTS) $(authdaemontest_LDADD) $(LIBS) - --authenumerate$(EXEEXT): $(authenumerate_OBJECTS) $(authenumerate_DEPENDENCIES) $(EXTRA_authenumerate_DEPENDENCIES) -+authenumerate$(EXEEXT): $(authenumerate_OBJECTS) $(authenumerate_DEPENDENCIES) $(EXTRA_authenumerate_DEPENDENCIES) - @rm -f authenumerate$(EXEEXT) - $(AM_V_CCLD)$(authenumerate_LINK) $(authenumerate_OBJECTS) $(authenumerate_LDADD) $(LIBS) - --authmksock$(EXEEXT): $(authmksock_OBJECTS) $(authmksock_DEPENDENCIES) $(EXTRA_authmksock_DEPENDENCIES) -+authmksock$(EXEEXT): $(authmksock_OBJECTS) $(authmksock_DEPENDENCIES) $(EXTRA_authmksock_DEPENDENCIES) - @rm -f authmksock$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(authmksock_OBJECTS) $(authmksock_LDADD) $(LIBS) - --authpasswd$(EXEEXT): $(authpasswd_OBJECTS) $(authpasswd_DEPENDENCIES) $(EXTRA_authpasswd_DEPENDENCIES) -+authpasswd$(EXEEXT): $(authpasswd_OBJECTS) $(authpasswd_DEPENDENCIES) $(EXTRA_authpasswd_DEPENDENCIES) - @rm -f authpasswd$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(authpasswd_OBJECTS) $(authpasswd_LDADD) $(LIBS) - --authtest$(EXEEXT): $(authtest_OBJECTS) $(authtest_DEPENDENCIES) $(EXTRA_authtest_DEPENDENCIES) -+authtest$(EXEEXT): $(authtest_OBJECTS) $(authtest_DEPENDENCIES) $(EXTRA_authtest_DEPENDENCIES) - @rm -f authtest$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(authtest_OBJECTS) $(authtest_LDADD) $(LIBS) - --courierauthconfig$(EXEEXT): $(courierauthconfig_OBJECTS) $(courierauthconfig_DEPENDENCIES) $(EXTRA_courierauthconfig_DEPENDENCIES) -+courierauthconfig$(EXEEXT): $(courierauthconfig_OBJECTS) $(courierauthconfig_DEPENDENCIES) $(EXTRA_courierauthconfig_DEPENDENCIES) - @rm -f courierauthconfig$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(courierauthconfig_OBJECTS) $(courierauthconfig_LDADD) $(LIBS) - install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS) -@@ -1344,6 +1370,8 @@ distclean-compile: + libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES) $(EXTRA_libcourierauth_la_DEPENDENCIES) + $(AM_V_CXXLD)$(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS) + +@@ -1352,6 +1378,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 -@@ -1359,6 +1387,7 @@ distclean-compile: +@@ -1370,6 +1398,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 $(am__depfiles_remade): @$(MKDIR_P) $(@D) -@@ -1928,6 +1957,8 @@ distclean: distclean-recursive +@@ -1967,6 +1996,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 -@@ -1943,6 +1974,7 @@ distclean: distclean-recursive +@@ -1985,6 +2016,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 -@@ -1959,18 +1991,26 @@ info-am: +@@ -2001,18 +2033,26 @@ info-am: 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: -@@ -2113,13 +2153,16 @@ uninstall-man: uninstall-man1 uninstall-man3 +@@ -2158,13 +2198,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 -@@ -2137,8 +2180,6 @@ authpgsqlrc.h: +@@ -2182,8 +2225,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 -@@ -2149,6 +2190,18 @@ authpgsqlrc.h: +@@ -2194,6 +2235,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@ $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.ldif \ ++@HAVE_LDAP_TRUE@ ${DESTDIR}${sysconfdir}/openldap/schema/authldap.ldif.dist ++@HAVE_LDAP_TRUE@# if test ! -f ${sysconfdir}/openldap/schema/authldap.ldif ; then \ ++@HAVE_LDAP_TRUE@# $(INSTALL_DATA) -m 0444 $(srcdir)/authldap.ldif \ ++@HAVE_LDAP_TRUE@# ${sysconfdir}/openldap/schema/authldap.ldif ; \ +@HAVE_LDAP_TRUE@# fi + +@HAVE_LDAP_FALSE@install-ldapschema: +@HAVE_LDAP_FALSE@ @: + authldaprc.h: echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h -@@ -2156,8 +2209,6 @@ authldaprc.h: +@@ -2201,8 +2254,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 -@@ -2175,8 +2226,6 @@ authmysqlrc.h: +@@ -2220,8 +2271,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 -@@ -2195,17 +2244,21 @@ authpiperc.h: +@@ -2240,17 +2289,21 @@ authpiperc.h: 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 -@@ -2261,24 +2314,24 @@ install-data-hook: install-authdaemonrc install-authpg +@@ -2306,24 +2359,24 @@ install-data-hook: install-authdaemonrc install-authpg # 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 \ -@@ -2289,9 +2342,10 @@ uninstall-hook: uninstall-authldaprc uninstall-authdae +@@ -2334,9 +2387,10 @@ uninstall-hook: uninstall-authldaprc uninstall-authdae $(DESTDIR)$(sbindir)/userdbpw 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 \ -@@ -2301,7 +2355,7 @@ authlib.3: authlib.3.in +@@ -2346,7 +2400,7 @@ authlib.3: authlib.3.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 diff --git a/security/courier-authlib/files/patch-libs_rfc2045_rfc2045.h b/security/courier-authlib/files/patch-libs_rfc2045_rfc2045.h deleted file mode 100644 index af387f7e7dd7..000000000000 --- a/security/courier-authlib/files/patch-libs_rfc2045_rfc2045.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/rfc2045/rfc2045.h.orig 2025-10-06 09:00:02 UTC -+++ libs/rfc2045/rfc2045.h -@@ -3224,7 +3224,7 @@ void rfc822::mime_decoder::decode( - - if (decode_header) - { -- typename rfc2045::entity::line_iter::headers< -+ typename rfc2045::entity::line_iter::template headers< - src_type> parser{e, src }; - - parser.name_lc=header_name_lc; diff --git a/security/courier-authlib/files/patch-libs_rfc2045_testsuitecpp.C b/security/courier-authlib/files/patch-libs_rfc2045_testsuitecpp.C deleted file mode 100644 index 649fadc8ea79..000000000000 --- a/security/courier-authlib/files/patch-libs_rfc2045_testsuitecpp.C +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/rfc2045/testsuitecpp.C.orig 2025-10-04 09:00:06 UTC -+++ libs/rfc2045/testsuitecpp.C -@@ -19,7 +19,7 @@ void testrfc2045line_iter_testset(int &testnum, test_t - auto b=s.begin(); - auto e=s.end(); - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::string_view::iterator, - std::string_view::iterator - > diff --git a/security/courier-authlib/files/patch-libs_rfc2045_testsuitecpp2.C b/security/courier-authlib/files/patch-libs_rfc2045_testsuitecpp2.C deleted file mode 100644 index 353465b17a71..000000000000 --- a/security/courier-authlib/files/patch-libs_rfc2045_testsuitecpp2.C +++ /dev/null @@ -1,29 +0,0 @@ ---- libs/rfc2045/testsuitecpp2.C.orig 2025-09-10 09:00:05 UTC -+++ libs/rfc2045/testsuitecpp2.C -@@ -217,7 +217,7 @@ void test3() - auto b=std::istreambuf_iterator{ss}; - auto e=std::istreambuf_iterator{}; - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::istreambuf_iterator, - std::istreambuf_iterator - > iter{b, e}; -@@ -310,7 +310,7 @@ void test4() - auto b=std::istreambuf_iterator{ss}; - auto e=std::istreambuf_iterator{}; - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::istreambuf_iterator, - std::istreambuf_iterator - > iter{b, e}; -@@ -488,7 +488,7 @@ void test5() - auto b=std::istreambuf_iterator{ss}; - auto e=std::istreambuf_iterator{}; - -- typename rfc2045::entity::line_iter::iter< -+ typename rfc2045::entity::line_iter::template iter< - std::istreambuf_iterator, - std::istreambuf_iterator - > iter{b, e}; diff --git a/security/courier-authlib/pkg-plist-ldap b/security/courier-authlib/pkg-plist-ldap index 16ec433462e0..cf4fb290ead7 100644 --- a/security/courier-authlib/pkg-plist-ldap +++ b/security/courier-authlib/pkg-plist-ldap @@ -1,9 +1,9 @@ @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 etc/openldap/schema/authldap.schema +@sample etc/openldap/schema/authldap.ldif.dist etc/openldap/schema/authldap.ldif lib/courier-authlib/libauthldap.so lib/courier-authlib/libauthldap.so.0 lib/courier-authlib/libauthldap.so.0.0.0 %%PORTDOCS%%%%DOCSDIR%%/README.ldap @dir etc/openldap/schema