Date: Thu, 6 Jul 2017 11:56:27 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445136 - in head: databases/courier-authlib-mysql databases/courier-authlib-pgsql databases/courier-authlib-userdb databases/courier-authlib-usergdbm devel/courier-unicode mail/cone ma... Message-ID: <201707061156.v66BuR9k075052@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Thu Jul 6 11:56:27 2017 New Revision: 445136 URL: https://svnweb.freebsd.org/changeset/ports/445136 Log: - Update devel/courier-unicode to 2.0 - Update mail/cone to 0.96 - Update mail/courier-imap to 4.18.0 [1] - Update mail/maildrop to 2.9.0 - Update mail/sqwebmail to 5.9.0 [1] - Update security/courier-authlib (and slaves) to 0.68.0 [1] On request from oliver@, take maintainership of the courier-authlib ports and the courier-imap port. Approved by: oliver@ (maintainer) [1] Differential Revision: https://reviews.freebsd.org/D11467 Deleted: head/mail/courier-imap/files/patch-libs_tcpd_libcouriertls.c Modified: head/databases/courier-authlib-mysql/Makefile head/databases/courier-authlib-pgsql/Makefile head/databases/courier-authlib-userdb/Makefile head/databases/courier-authlib-usergdbm/Makefile head/devel/courier-unicode/Makefile head/devel/courier-unicode/distinfo head/devel/courier-unicode/pkg-plist head/mail/cone/Makefile head/mail/cone/distinfo head/mail/courier-authlib-vchkpw/Makefile head/mail/courier-imap/Makefile head/mail/courier-imap/distinfo head/mail/maildrop/Makefile head/mail/maildrop/distinfo head/mail/sqwebmail/Makefile head/mail/sqwebmail/distinfo head/net/courier-authlib-ldap/Makefile head/security/courier-authlib-base/Makefile head/security/courier-authlib/Makefile head/security/courier-authlib/distinfo head/security/courier-authlib/files/patch-Makefile.in head/security/courier-authlib/files/patch-authdaemond.in head/security/courier-authlib/files/patch-authdaemonrc.in head/security/courier-authlib/files/patch-authvchkpw head/security/courier-authlib/files/patch-configure Modified: head/databases/courier-authlib-mysql/Makefile ============================================================================== --- head/databases/courier-authlib-mysql/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/databases/courier-authlib-mysql/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -1,7 +1,7 @@ # Created by: Yarema <yds@CoolRat.org> # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -mysql COMMENT= MySQL support for the Courier authentication library Modified: head/databases/courier-authlib-pgsql/Makefile ============================================================================== --- head/databases/courier-authlib-pgsql/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/databases/courier-authlib-pgsql/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -1,7 +1,7 @@ # Created by: Yarema <yds@CoolRat.org> # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -pgsql COMMENT= PostgreSQL support for the Courier authentication library Modified: head/databases/courier-authlib-userdb/Makefile ============================================================================== --- head/databases/courier-authlib-userdb/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/databases/courier-authlib-userdb/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -1,7 +1,7 @@ # Created by: Yarema <yds@CoolRat.org> # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -userdb COMMENT= Userdb support for the Courier authentication library Modified: head/databases/courier-authlib-usergdbm/Makefile ============================================================================== --- head/databases/courier-authlib-usergdbm/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/databases/courier-authlib-usergdbm/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -1,7 +1,7 @@ # Created by: Yarema <yds@CoolRat.org> # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -usergdbm COMMENT= Userdb support for the Courier authentication library Modified: head/devel/courier-unicode/Makefile ============================================================================== --- head/devel/courier-unicode/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/devel/courier-unicode/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= courier-unicode -PORTVERSION= 1.4 +PORTVERSION= 2.0 CATEGORIES= devel mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} Modified: head/devel/courier-unicode/distinfo ============================================================================== --- head/devel/courier-unicode/distinfo Thu Jul 6 10:22:05 2017 (r445135) +++ head/devel/courier-unicode/distinfo Thu Jul 6 11:56:27 2017 (r445136) @@ -1,2 +1,3 @@ -SHA256 (courier-unicode-1.4.tar.bz2) = 2174f4cdd2cd3fe554d4cbbd9557abac0e54c0226084f368bcb2e66b0e78cf96 -SIZE (courier-unicode-1.4.tar.bz2) = 434338 +TIMESTAMP = 1499009098 +SHA256 (courier-unicode-2.0.tar.bz2) = 6b46011d465918af7d0ed41fbf21d918449820bd3ef7e651dbc56eb2933a8711 +SIZE (courier-unicode-2.0.tar.bz2) = 446215 Modified: head/devel/courier-unicode/pkg-plist ============================================================================== --- head/devel/courier-unicode/pkg-plist Thu Jul 6 10:22:05 2017 (r445135) +++ head/devel/courier-unicode/pkg-plist Thu Jul 6 11:56:27 2017 (r445136) @@ -3,8 +3,8 @@ include/courier-unicode-script-tab.h include/courier-unicode.h lib/libcourier-unicode.a lib/libcourier-unicode.so -lib/libcourier-unicode.so.3 -lib/libcourier-unicode.so.3.0.0 +lib/libcourier-unicode.so.4 +lib/libcourier-unicode.so.4.0.0 man/man3/unicode::iconvert::convert.3.gz man/man3/unicode::iconvert::convert_tocase.3.gz man/man3/unicode::iconvert::fromu.3.gz @@ -74,3 +74,4 @@ man/man3/unicode_wbscan_end.3.gz man/man3/unicode_wbscan_init.3.gz man/man3/unicode_wbscan_next.3.gz man/man7/courier-unicode.7.gz +share/aclocal/courier-unicode.m4 Modified: head/mail/cone/Makefile ============================================================================== --- head/mail/cone/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/mail/cone/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cone -PORTVERSION= 0.94 +PORTVERSION= 0.96 CATEGORIES= mail # This is for beta versions, leave it in please: #MASTER_SITES= http://www.courier-mta.org/beta/${PORTNAME}/ \ Modified: head/mail/cone/distinfo ============================================================================== --- head/mail/cone/distinfo Thu Jul 6 10:22:05 2017 (r445135) +++ head/mail/cone/distinfo Thu Jul 6 11:56:27 2017 (r445136) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483020625 -SHA256 (cone-0.94.tar.bz2) = c52be25ca3547baf1d7ed6fdfdb2aaec3224ea6183b8fc8eeb53f3e615694f49 -SIZE (cone-0.94.tar.bz2) = 3749999 +TIMESTAMP = 1499031560 +SHA256 (cone-0.96.tar.bz2) = 657b16002deae701d5a9ca5572bfe9c05ba40c0da523ecebb8171f48863f6a8e +SIZE (cone-0.96.tar.bz2) = 3752115 Modified: head/mail/courier-authlib-vchkpw/Makefile ============================================================================== --- head/mail/courier-authlib-vchkpw/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/mail/courier-authlib-vchkpw/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -1,7 +1,7 @@ # Created by: Yarema <yds@CoolRat.org> # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 0 PKGNAMESUFFIX= -vchkpw COMMENT= Vpopmail/vchkpw support for the Courier authentication library Modified: head/mail/courier-imap/Makefile ============================================================================== --- head/mail/courier-imap/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/mail/courier-imap/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= courier-imap -PORTVERSION= 4.16.2 -PORTREVISION= 2 +PORTVERSION= 4.18.0 PORTEPOCH= 2 CATEGORIES= mail ipv6 MASTER_SITES= SF/courier/imap/${PORTVERSION} -MAINTAINER= oliver@FreeBSD.org +MAINTAINER= madpilot@FreeBSD.org COMMENT= IMAP (and POP3) server that provides access to Maildir mailboxes BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base Modified: head/mail/courier-imap/distinfo ============================================================================== --- head/mail/courier-imap/distinfo Thu Jul 6 10:22:05 2017 (r445135) +++ head/mail/courier-imap/distinfo Thu Jul 6 11:56:27 2017 (r445136) @@ -1,2 +1,3 @@ -SHA256 (courier-imap-4.16.2.tar.bz2) = 3be244b3c4d3d5c5e33efb37e4cf712ae83cbe21e43c31725e0d996ab4acc387 -SIZE (courier-imap-4.16.2.tar.bz2) = 3028445 +TIMESTAMP = 1499031625 +SHA256 (courier-imap-4.18.0.tar.bz2) = fa8c2e3b71295c9fa124dfad350f688263ddf7f2b15709f2d44d0f9722de7c52 +SIZE (courier-imap-4.18.0.tar.bz2) = 3202389 Modified: head/mail/maildrop/Makefile ============================================================================== --- head/mail/maildrop/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/mail/maildrop/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -16,7 +16,7 @@ # MAILDROP_MBOX_DIR=<dir> Specify DEFAULT mailbox location PORTNAME= maildrop -PORTVERSION= 2.8.5 +PORTVERSION= 2.9.0 CATEGORIES= mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} Modified: head/mail/maildrop/distinfo ============================================================================== --- head/mail/maildrop/distinfo Thu Jul 6 10:22:05 2017 (r445135) +++ head/mail/maildrop/distinfo Thu Jul 6 11:56:27 2017 (r445136) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484728651 -SHA256 (maildrop-2.8.5.tar.bz2) = c21174ef882aeb169031bb5886b55959687074415153232f4c60695405fcddb1 -SIZE (maildrop-2.8.5.tar.bz2) = 2072987 +TIMESTAMP = 1499009130 +SHA256 (maildrop-2.9.0.tar.bz2) = 6f1b2db822a34d8256d9cc2a011e5a2c6b7e6dd01ed66881cd6fce6f4eb5981c +SIZE (maildrop-2.9.0.tar.bz2) = 2075698 Modified: head/mail/sqwebmail/Makefile ============================================================================== --- head/mail/sqwebmail/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/mail/sqwebmail/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -2,16 +2,17 @@ # $FreeBSD$ PORTNAME= sqwebmail -PORTVERSION= 5.8.3 -PORTREVISION= 1 +PORTVERSION= 5.9.0 CATEGORIES= mail www MASTER_SITES= SF/courier/webmail/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= CGI Webmail client for Maildirs -BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base -RUN_DEPENDS= courierauthconfig:security/courier-authlib-base +BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base \ + gpg:security/gnupg +RUN_DEPENDS= courierauthconfig:security/courier-authlib-base \ + gpg:security/gnupg LIB_DEPENDS= libpcre.so:devel/pcre \ libcourier-unicode.so:devel/courier-unicode Modified: head/mail/sqwebmail/distinfo ============================================================================== --- head/mail/sqwebmail/distinfo Thu Jul 6 10:22:05 2017 (r445135) +++ head/mail/sqwebmail/distinfo Thu Jul 6 11:56:27 2017 (r445136) @@ -1,2 +1,3 @@ -SHA256 (sqwebmail-5.8.3.tar.bz2) = 92b30599dc52ca815357f9c540d9ab69d1d975bb7a41c787c3a4a1066d12855c -SIZE (sqwebmail-5.8.3.tar.bz2) = 3520773 +TIMESTAMP = 1499031751 +SHA256 (sqwebmail-5.9.0.tar.bz2) = 2729440716c5c39babe061dc45c5acd47fcf5e559858cc932c59c9c93b5d47ca +SIZE (sqwebmail-5.9.0.tar.bz2) = 3648976 Modified: head/net/courier-authlib-ldap/Makefile ============================================================================== --- head/net/courier-authlib-ldap/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/net/courier-authlib-ldap/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -1,7 +1,7 @@ # Created by: Yarema <yds@CoolRat.org> # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -ldap COMMENT= LDAP support for the Courier authentication library Modified: head/security/courier-authlib-base/Makefile ============================================================================== --- head/security/courier-authlib-base/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/security/courier-authlib-base/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -1,7 +1,7 @@ # Created by: Oliver Lehmann <oliver@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -base COMMENT= Courier authentication library base Modified: head/security/courier-authlib/Makefile ============================================================================== --- head/security/courier-authlib/Makefile Thu Jul 6 10:22:05 2017 (r445135) +++ head/security/courier-authlib/Makefile Thu Jul 6 11:56:27 2017 (r445136) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= courier-authlib -PORTVERSION= 0.66.3 +PORTVERSION= 0.68.0 PORTREVISION?= 0 CATEGORIES?= security mail .if defined(PKGNAMESUFFIX) @@ -13,7 +13,7 @@ DISTFILES= # empty EXTRACT_ONLY= # empty .endif -MAINTAINER= oliver@FreeBSD.org +MAINTAINER= madpilot@FreeBSD.org COMMENT?= Meta-port for the courier authentication library CONFLICTS= courier-0.45* Modified: head/security/courier-authlib/distinfo ============================================================================== --- head/security/courier-authlib/distinfo Thu Jul 6 10:22:05 2017 (r445135) +++ head/security/courier-authlib/distinfo Thu Jul 6 11:56:27 2017 (r445136) @@ -1,2 +1,3 @@ -SHA256 (courier-authlib-0.66.3.tar.bz2) = 033402a86e334999eaf17c1b722d6f6cc1961fccb5d2ee88342dfd6c5d534961 -SIZE (courier-authlib-0.66.3.tar.bz2) = 2085083 +TIMESTAMP = 1499032525 +SHA256 (courier-authlib-0.68.0.tar.bz2) = 9096118823ababfac8f46a1a7393765a414ea3628c9413bfba39af5d70fd3e2e +SIZE (courier-authlib-0.68.0.tar.bz2) = 2194982 Modified: head/security/courier-authlib/files/patch-Makefile.in ============================================================================== --- head/security/courier-authlib/files/patch-Makefile.in Thu Jul 6 10:22:05 2017 (r445135) +++ head/security/courier-authlib/files/patch-Makefile.in Thu Jul 6 11:56:27 2017 (r445136) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2015-04-25 14:07:07 UTC +--- Makefile.in.orig 2017-07-02 14:41:39 UTC +++ Makefile.in -@@ -85,11 +85,10 @@ PRE_UNINSTALL = : +@@ -95,11 +95,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @@ -13,13 +13,13 @@ +@HAVE_BASE_TRUE@bin_PROGRAMS = courierauthconfig$(EXEEXT) +@HAVE_BASE_TRUE@noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \ +@HAVE_BASE_TRUE@ authdaemondprog$(EXEEXT) - @HAVE_SGML_TRUE@am__append_1 = $(GITFILES) subdir = . - DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ -@@ -220,6 +219,13 @@ libauthuserdb_la_LINK = $(LIBTOOL) $(AM_ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libauthuserdb_la_LDFLAGS) $(LDFLAGS) \ - -o $@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -219,6 +218,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) @@ -27,19 +27,18 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) -o $@ + - libcourierauth_la_DEPENDENCIES = libs/libhmac/libhmac.la \ - libs/md5/libmd5.la libs/sha1/libsha1.la \ - libs/numlib/libnumlib.la libs/random128/librandom128.la \ -@@ -336,6 +342,8 @@ SOURCES = $(libauthcustom_la_SOURCES) $( + am_libcourierauth_la_OBJECTS = authdaemon.lo authdaemonlib.lo \ + preauthdaemon.lo authmoduser2.lo authmoduser3.lo debug.lo \ + authoption.lo +@@ -350,6 +356,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) \ -+ $(libauthvchkpw_la_SOURCES) \ $(libcourierauth_la_SOURCES) \ $(libcourierauthcommon_la_SOURCES) \ $(libcourierauthsasl_la_SOURCES) \ -@@ -503,6 +511,7 @@ LIBAUTHPWD = @LIBAUTHPWD@ +@@ -532,6 +539,7 @@ LIBAUTHPWD = @LIBAUTHPWD@ LIBAUTHSHADOW = @LIBAUTHSHADOW@ LIBAUTHSQLITE = @LIBAUTHSQLITE@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ @@ -47,7 +46,7 @@ LIBDB = @LIBDB@ LIBDL = @LIBDL@ LIBGDBM = @LIBGDBM@ -@@ -625,21 +634,27 @@ top_builddir = @top_builddir@ +@@ -657,21 +665,27 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ userdb = @userdb@ AUTOMAKE_OPTIONS = dist-bzip2 @@ -70,9 +69,9 @@ +@HAVE_BASE_TRUE@pkglib_LTLIBRARIES = libcourierauth.la \ +@HAVE_BASE_TRUE@ libcourierauthsasl.la libcourierauthsaslclient.la \ +@HAVE_BASE_TRUE@ libcourierauthcommon.la $(modules) -+ -+@HAVE_BASE_FALSE@pkglib_LTLIBRARIES = $(modules) ++@HAVE_BASE_FALSE@pkglib_LTLIBRARIES = $(modules) ++ sbin_SCRIPTS = authdaemond EXTRA_LTLIBRARIES = libauthuserdb.la \ libauthpam.la libauthpwd.la libauthshadow.la \ @@ -80,7 +79,7 @@ libauthpgsql.la \ libauthldap.la \ libauthmysql.la \ -@@ -713,6 +728,13 @@ libauthshadow_la_DEPENDENCIES = $(common +@@ -746,6 +760,13 @@ libauthshadow_la_DEPENDENCIES = $(commonlibdep) libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t) libauthshadow_la_LDFLAGS = $(commonldflags) @@ -93,8 +92,8 @@ + # The authpgsql module libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@ - libauthpgsql_la_SOURCES = authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h -@@ -792,8 +814,8 @@ libcourierauthsaslclient_la_SOURCES = co + libauthpgsql_la_SOURCES = authpgsql.c authpgsqllib.cpp authpgsql.h +@@ -827,8 +848,8 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc libcourierauthsaslclient_la_LIBADD = libcourierauth.la libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version @@ -105,8 +104,8 @@ courierauthconfig_SOURCES = authinfo.c authpasswd_SOURCES = authpasswd.c -@@ -834,7 +856,7 @@ authmksock_LDADD = @NETLIBS@ - man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \ +@@ -869,7 +890,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 @@ -114,7 +113,7 @@ man_MANS = $(man1) $(man3) auth_sasl_ex.3 BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \ authdaemonrc.h packageversion.h \ -@@ -993,6 +1015,9 @@ libauthsqlite.la: $(libauthsqlite_la_OBJ +@@ -1027,6 +1048,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) @@ -124,7 +123,7 @@ 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) -@@ -1262,6 +1287,8 @@ distclean-compile: +@@ -1297,6 +1321,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@ @@ -133,15 +132,15 @@ @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@ -@@ -1279,6 +1306,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthsqlite.Plo@am__quote@ +@@ -1312,6 +1338,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@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -1782,18 +1810,26 @@ info: info-recursive +@@ -1836,18 +1863,26 @@ info: info-recursive info-am: @@ -176,8 +175,8 @@ install-html: install-html-recursive install-html-am: -@@ -1873,14 +1909,18 @@ uninstall-man: uninstall-man1 uninstall- - uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS +@@ -1929,12 +1964,16 @@ uninstall-man: uninstall-man1 uninstall-man3 + .PRECIOUS: Makefile +authvchkpw.lo: authvchkpw.c vpopmail_config.h @@ -186,8 +185,6 @@ +vpopmail_config.h: + echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h + - authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h - @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc: @HAVE_AUTHPGSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@` || : @HAVE_AUTHPGSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \ @@ -198,7 +195,7 @@ @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc: @HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist -@@ -1899,9 +1939,7 @@ authldaplib.lo: authldaplib.c authldaprc +@@ -1951,9 +1990,7 @@ authpgsqlrc.h: @HAVE_LDAP_TRUE@install-authldaprc: @HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || : @HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \ @@ -209,7 +206,7 @@ @HAVE_LDAP_TRUE@uninstall-authldaprc: @HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist -@@ -1912,6 +1950,18 @@ authldaplib.lo: authldaplib.c authldaprc +@@ -1964,15 +2001,25 @@ authpgsqlrc.h: @HAVE_LDAP_FALSE@uninstall-authldaprc: @HAVE_LDAP_FALSE@ @: @@ -228,7 +225,6 @@ authldaprc.h: echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h -@@ -1920,9 +1970,7 @@ authmysqllib.lo: authmysqllib.c authmysq @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc: @HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || : @HAVE_AUTHMYSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \ @@ -239,7 +235,7 @@ @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc: @HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist -@@ -1941,9 +1989,7 @@ authsqlitelib.lo: authsqlitelib.c authsq +@@ -1989,9 +2036,7 @@ authmysqlrc.h: @HAVE_AUTHSQLITE_TRUE@install-authsqliterc: @HAVE_AUTHSQLITE_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || : @HAVE_AUTHSQLITE_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \ @@ -250,7 +246,7 @@ @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc: @HAVE_AUTHSQLITE_TRUE@ rm -f $(DESTDIR)@authsqliterc@.dist -@@ -1962,16 +2008,20 @@ authpipelib.lo: authpipelib.c authpipeli +@@ -2010,17 +2055,21 @@ authpipelib.lo: authpipelib.c authpipelib.h authpiperc authpiperc.h: echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h @@ -271,16 +267,17 @@ - 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 -@@ -2014,24 +2064,24 @@ dist-hook: + echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h +@@ -2066,24 +2115,24 @@ dist-hook: # automake still a bit stupid... install-data-hook: install-authdaemonrc install-authpgsqlrc \ @@ -317,7 +314,7 @@ $(INSTALL_SCRIPT) userdb/pw2userdb \ $(DESTDIR)$(sbindir)/pw2userdb ; \ $(INSTALL_SCRIPT) userdb/makeuserdb \ -@@ -2044,9 +2094,10 @@ install-exec-hook: +@@ -2096,9 +2145,10 @@ install-exec-hook: $(DESTDIR)$(sbindir)/userdb-test-cram-md5 uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc uninstall-authsqliterc @@ -329,12 +326,12 @@ $(DESTDIR)$(sbindir)/pw2userdb \ $(DESTDIR)$(sbindir)/makeuserdb \ $(DESTDIR)$(sbindir)/userdb \ -@@ -2057,7 +2108,7 @@ authlib.html: authlib.html.in +@@ -2109,7 +2159,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@$(GITFILES): %: %.git - @HAVE_SGML_TRUE@ perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp + @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml libs/docbook/sgml2html + @HAVE_SGML_TRUE@ libs/docbook/sgml2html authpasswd.sgml authpasswd.html Modified: head/security/courier-authlib/files/patch-authdaemond.in ============================================================================== --- head/security/courier-authlib/files/patch-authdaemond.in Thu Jul 6 10:22:05 2017 (r445135) +++ head/security/courier-authlib/files/patch-authdaemond.in Thu Jul 6 11:56:27 2017 (r445136) @@ -1,8 +1,8 @@ ---- authdaemond.in.orig Wed Oct 20 20:10:49 2004 -+++ authdaemond.in Wed Oct 20 20:10:49 2004 -@@ -15,4 +15,4 @@ +--- authdaemond.in.orig 2013-08-25 18:57:37 UTC ++++ authdaemond.in +@@ -14,4 +14,4 @@ localstatedir=@localstatedir@ set -a . @authdaemonrc@ --exec ${sbindir}/courierlogger -pid=@authdaemonvar@/pid -$1 @libexecdir@/courier-authlib/authdaemond +-exec ${sbindir}/courierlogger -pid=@authdaemonvar@/pid $LOGGEROPTS -$1 @libexecdir@/courier-authlib/authdaemond +exec ${sbindir}/courierlogger -facility=${subsystem:-mail} -pid=@authdaemonvar@/pid -$1 @libexecdir@/courier-authlib/authdaemond Modified: head/security/courier-authlib/files/patch-authdaemonrc.in ============================================================================== --- head/security/courier-authlib/files/patch-authdaemonrc.in Thu Jul 6 10:22:05 2017 (r445135) +++ head/security/courier-authlib/files/patch-authdaemonrc.in Thu Jul 6 11:56:27 2017 (r445136) @@ -1,6 +1,6 @@ ---- authdaemonrc.in.orig Tue Nov 9 19:42:04 2004 -+++ authdaemonrc.in Tue Nov 9 19:42:04 2004 -@@ -59,6 +59,42 @@ +--- authdaemonrc.in.orig 2016-01-05 01:20:05 UTC ++++ authdaemonrc.in +@@ -59,6 +59,42 @@ daemons=5 authdaemonvar=@authdaemonvar@ Modified: head/security/courier-authlib/files/patch-authvchkpw ============================================================================== --- head/security/courier-authlib/files/patch-authvchkpw Thu Jul 6 10:22:05 2017 (r445135) +++ head/security/courier-authlib/files/patch-authvchkpw Thu Jul 6 11:56:27 2017 (r445136) @@ -1,5 +1,5 @@ ---- authvchkpw.c.orig 2009-07-02 09:56:41.000000000 +0200 -+++ authvchkpw.c 2009-07-02 09:56:41.000000000 +0200 +--- authvchkpw.c.orig 2017-07-03 08:38:16 UTC ++++ authvchkpw.c @@ -0,0 +1,242 @@ +/* +** Copyright 1998 - 2007 Double Precision, Inc. See COPYING for @@ -243,8 +243,8 @@ +{ + return &authvchkpw_info; +} ---- authvchkpwlib.c.orig 2009-07-02 09:56:41.000000000 +0200 -+++ authvchkpwlib.c 2009-07-02 09:56:41.000000000 +0200 +--- authvchkpwlib.c.orig 2017-07-03 08:38:16 UTC ++++ authvchkpwlib.c @@ -0,0 +1,33 @@ +/* +** Copyright 1998 - 2000 Double Precision, Inc. See COPYING for @@ -279,9 +279,9 @@ + if ((p=strchr(c, ':')) != 0) return (p); + return (0); +} ---- courier_auth_config.h.orig 2009-06-27 17:59:04.000000000 +0200 -+++ courier_auth_config.h 2009-07-02 09:56:41.000000000 +0200 -@@ -122,6 +122,9 @@ +--- courier_auth_config.h.orig 2016-09-04 23:37:40 UTC ++++ courier_auth_config.h +@@ -125,6 +125,9 @@ /* Define to 1 if you have the `opendir' function. */ #define HAVE_OPENDIR 1 @@ -291,19 +291,19 @@ /* Define to 1 if you have the <Pam/pam_appl.h> header file. */ /* #undef HAVE_PAM_PAM_APPL_H */ -@@ -217,6 +220,9 @@ - */ - #define LT_OBJDIR ".libs/" +@@ -227,6 +230,9 @@ + /* Define to the shared archive member specification, say "(shr.o)". */ + /* #undef LT_SHARED_LIB_MEMBER */ ++ +/* Whether -lvpopmail has the vset_lastauth() function */ +/* #undef HAVE_VSET_LASTAUTH */ -+ + /* Whether we must a prototype for crypt() */ #define NEED_CRYPT_PROTOTYPE 0 - ---- courier_auth_config.h.in.orig 2009-06-27 18:09:18.000000000 +0200 -+++ courier_auth_config.h.in 2009-07-02 09:56:41.000000000 +0200 -@@ -121,6 +121,9 @@ +--- courier_auth_config.h.in.orig 2017-07-02 14:41:47 UTC ++++ courier_auth_config.h.in +@@ -124,6 +124,9 @@ /* Define to 1 if you have the `opendir' function. */ #undef HAVE_OPENDIR @@ -313,18 +313,18 @@ /* Define to 1 if you have the <Pam/pam_appl.h> header file. */ #undef HAVE_PAM_PAM_APPL_H -@@ -216,6 +219,9 @@ - */ - #undef LT_OBJDIR +@@ -226,6 +229,9 @@ + /* Define to the shared archive member specification, say "(shr.o)". */ + #undef LT_SHARED_LIB_MEMBER ++ +/* Whether -lvpopmail has the vset_lastauth() function */ +#undef HAVE_VSET_LASTAUTH -+ + /* Whether we must a prototype for crypt() */ #undef NEED_CRYPT_PROTOTYPE - ---- preauthvchkpw.c.orig 2009-07-02 09:56:41.000000000 +0200 -+++ preauthvchkpw.c 2009-07-02 09:56:41.000000000 +0200 +--- preauthvchkpw.c.orig 2017-07-03 08:38:16 UTC ++++ preauthvchkpw.c @@ -0,0 +1,159 @@ +/* +** Copyright 1998 - 2001 Double Precision, Inc. See COPYING for @@ -485,9 +485,46 @@ + + return ((*callback)(&auth, arg)); +} ---- userdb/configure.orig 2009-06-27 17:55:53.000000000 +0200 -+++ userdb/configure 2009-07-02 09:56:41.000000000 +0200 -@@ -12452,7 +12452,7 @@ +--- userdb/Makefile.in.orig 2016-06-23 12:29:59 UTC ++++ userdb/Makefile.in +@@ -107,7 +107,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cach + configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb ++CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb vchkpw2userdb + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + libuserdb_la_LIBADD = +@@ -222,6 +222,7 @@ CSCOPE = cscope + AM_RECURSIVE_TARGETS = cscope + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/makeuserdb.in $(srcdir)/pw2userdb.in \ ++ $(srcdir)/vchkpw2userdb.in \ + $(srcdir)/userdb.pl.in $(top_srcdir)/../compile \ + $(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \ + $(top_srcdir)/../depcomp $(top_srcdir)/../install-sh \ +@@ -377,7 +378,7 @@ BUILT_SOURCES = makeuserdb.html.in makeuserdb.8.in \ + userdb.html.in userdb.8.in \ + userdbpw.html.in userdbpw.8.in + +-noinst_SCRIPTS = makeuserdb pw2userdb dummy ++noinst_SCRIPTS = makeuserdb pw2userdb vchkpw2userdb dummy + noinst_DATA = makeuserdb.html userdb.html userdbpw.html + userdbpw_SOURCES = userdbpw.c + userdbpw_LDADD = libuserdb.la @HMACLIB@ @MD5LIB@ @SHA1LIB@ @CRYPTLIBS@ +@@ -444,6 +445,8 @@ userdb.pl: $(top_builddir)/config.status $(srcdir)/use + makeuserdb: $(top_builddir)/config.status $(srcdir)/makeuserdb.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + pw2userdb: $(top_builddir)/config.status $(srcdir)/pw2userdb.in ++ cd $(top_builddir) && $(SHELL) ./config.status $@ ++vchkpw2userdb: $(top_builddir)/config.status $(srcdir)/vchkpw2userdb.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + + clean-noinstLTLIBRARIES: +--- userdb/configure.orig 2016-06-23 12:29:59 UTC ++++ userdb/configure +@@ -12873,7 +12873,7 @@ else fi @@ -496,16 +533,16 @@ cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -@@ -13364,6 +13364,7 @@ +@@ -13894,6 +13894,7 @@ do "userdb.pl") CONFIG_FILES="$CONFIG_FILES userdb.pl" ;; "makeuserdb") CONFIG_FILES="$CONFIG_FILES makeuserdb" ;; "pw2userdb") CONFIG_FILES="$CONFIG_FILES pw2userdb" ;; + "vchkpw2userdb") CONFIG_FILES="$CONFIG_FILES vchkpw2userdb" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ---- userdb/vchkpw2userdb.in.orig 2009-07-02 09:56:41.000000000 +0200 -+++ userdb/vchkpw2userdb.in 2009-07-02 09:56:41.000000000 +0200 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +--- userdb/vchkpw2userdb.in.orig 2017-07-03 08:38:16 UTC ++++ userdb/vchkpw2userdb.in @@ -0,0 +1,80 @@ +#! @PERL@ +# @@ -587,40 +624,3 @@ + close(DIR); +} + ---- userdb/Makefile.in.orig 2015-06-06 14:37:22 UTC -+++ userdb/Makefile.in -@@ -107,7 +107,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat - configure.lineno config.status.lineno - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb -+CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb vchkpw2userdb - CONFIG_CLEAN_VPATH_FILES = - LTLIBRARIES = $(noinst_LTLIBRARIES) - libuserdb_la_LIBADD = -@@ -222,6 +222,7 @@ CSCOPE = cscope - AM_RECURSIVE_TARGETS = cscope - am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/makeuserdb.in $(srcdir)/pw2userdb.in \ -+ $(srcdir)/vchkpw2userdb.in \ - $(srcdir)/userdb.pl.in $(top_srcdir)/../compile \ - $(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \ - $(top_srcdir)/../depcomp $(top_srcdir)/../install-sh \ -@@ -376,7 +377,7 @@ BUILT_SOURCES = makeuserdb.html.in makeu - userdb.html.in userdb.8.in \ - userdbpw.html.in userdbpw.8.in - --noinst_SCRIPTS = makeuserdb pw2userdb dummy -+noinst_SCRIPTS = makeuserdb pw2userdb vchkpw2userdb dummy - noinst_DATA = makeuserdb.html userdb.html userdbpw.html - userdbpw_SOURCES = userdbpw.c - userdbpw_LDADD = libuserdb.la @HMACLIB@ @MD5LIB@ @SHA1LIB@ @CRYPTLIBS@ -@@ -444,6 +445,8 @@ makeuserdb: $(top_builddir)/config.statu - cd $(top_builddir) && $(SHELL) ./config.status $@ - pw2userdb: $(top_builddir)/config.status $(srcdir)/pw2userdb.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -+vchkpw2userdb: $(top_builddir)/config.status $(srcdir)/vchkpw2userdb.in -+ cd $(top_builddir) && $(SHELL) ./config.status $@ - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) Modified: head/security/courier-authlib/files/patch-configure ============================================================================== --- head/security/courier-authlib/files/patch-configure Thu Jul 6 10:22:05 2017 (r445135) +++ head/security/courier-authlib/files/patch-configure Thu Jul 6 11:56:27 2017 (r445136) @@ -1,4 +1,4 @@ ---- configure.orig 2015-04-25 14:07:07 UTC +--- configure.orig 2017-07-02 14:41:39 UTC +++ configure @@ -642,6 +642,10 @@ ltdl_LIBOBJS am__EXEEXT_FALSE @@ -21,7 +21,7 @@ LIBAUTHPWD LIBAUTHSHADOW SHADOWLIBS -@@ -1546,6 +1553,7 @@ Optional Packages: +@@ -1563,6 +1570,7 @@ Optional Packages: --with-authldaprc=filename Expect to find authldaprc here --without-authpwd Do not include the authpwd module --without-authshadow Do not include the authshadow module @@ -29,7 +29,7 @@ --with-authpgsqlrc=filename Expect to find authpgsql here --without-authpgsql Do not include the authpgsql module --with-pgsql-libs=DIR Look for pgsql libs in this dir -@@ -2795,7 +2803,7 @@ else +@@ -2938,7 +2946,7 @@ else fi fi @@ -38,17 +38,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -@@ -13456,7 +13464,7 @@ LIBS="$saveLIBS" +@@ -18097,8 +18105,12 @@ fi - - save_LIBS="$LIBS" --LIBS="-lcourier-unicode" -+LIBS="-L%%LOCALBASE%%/lib -lcourier-unicode" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -13749,8 +13757,12 @@ fi - if test "$doauthuserdb" = "no" then + HAVE_USERDB_TRUE='#' @@ -60,7 +51,7 @@ AUTHUSERDB="authuserdb" LIBAUTHUSERDB="libauthuserdb.la" -@@ -14208,6 +14220,20 @@ else +@@ -18556,7 +18568,21 @@ else fi @@ -70,7 +61,7 @@ +else + dobase="yes" +fi; -+ + +if test "$dobase" = "no"; then + HAVE_BASE_TRUE='#' + HAVE_BASE_FALSE= @@ -78,14 +69,21 @@ + HAVE_BASE_TRUE= + HAVE_BASE_FALSE='#' +fi - ++ if test "$HAVE_LDAP" = 1; then HAVE_LDAP_TRUE= -@@ -14426,6 +14452,256 @@ fi - - - + HAVE_LDAP_FALSE='#' +@@ -18768,6 +18794,256 @@ if test "$HAVE_PWD" = 1 + then + LIBAUTHPWD="libauthpwd.la" + fi + ++ ++ ++ ++ ++ ++ +vpopmail_home=`$PERL -e '@a=getpwnam("vpopmail"); print "$a[7]";'` + + @@ -329,12 +327,6 @@ + LIBS=$_SAVE_LIBS +fi + -+ -+ -+ -+ -+ -+ - # Check whether --with-authpgsqlrc was given. - if test "${with_authpgsqlrc+set}" = set; then : - withval=$with_authpgsqlrc; authpgsqlrc="$withval" + + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707061156.v66BuR9k075052>