From owner-svn-ports-all@freebsd.org Tue Aug 20 16:22:08 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D810D57AB; Tue, 20 Aug 2019 16:22:08 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46CbfS2bKFz4WYW; Tue, 20 Aug 2019 16:22:08 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A7405EB1; Tue, 20 Aug 2019 16:22:08 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7KGM8qB009809; Tue, 20 Aug 2019 16:22:08 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7KGM6nZ009800; Tue, 20 Aug 2019 16:22:06 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201908201622.x7KGM6nZ009800@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 20 Aug 2019 16:22:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509431 - in head: databases/courier-authlib-pgsql security/courier-authlib security/courier-authlib/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head: databases/courier-authlib-pgsql security/courier-authlib security/courier-authlib/files X-SVN-Commit-Revision: 509431 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2019 16:22:08 -0000 Author: madpilot Date: Tue Aug 20 16:22:06 2019 New Revision: 509431 URL: https://svnweb.freebsd.org/changeset/ports/509431 Log: - Update courier-authlib to 0.69.1 - Avoid uninstalllation leftovers by fixing plists - Perform a small whitespace fix Modified: head/databases/courier-authlib-pgsql/Makefile head/security/courier-authlib/Makefile head/security/courier-authlib/Makefile.opt head/security/courier-authlib/distinfo head/security/courier-authlib/files/patch-Makefile.in head/security/courier-authlib/pkg-plist-base head/security/courier-authlib/pkg-plist-ldap head/security/courier-authlib/pkg-plist-mysql head/security/courier-authlib/pkg-plist-pgsql Modified: head/databases/courier-authlib-pgsql/Makefile ============================================================================== --- head/databases/courier-authlib-pgsql/Makefile Tue Aug 20 15:49:07 2019 (r509430) +++ head/databases/courier-authlib-pgsql/Makefile Tue Aug 20 16:22:06 2019 (r509431) @@ -1,7 +1,7 @@ # Created by: Yarema # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -pgsql COMMENT= PostgreSQL support for the Courier authentication library Modified: head/security/courier-authlib/Makefile ============================================================================== --- head/security/courier-authlib/Makefile Tue Aug 20 15:49:07 2019 (r509430) +++ head/security/courier-authlib/Makefile Tue Aug 20 16:22:06 2019 (r509431) @@ -2,8 +2,7 @@ # $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} Modified: head/security/courier-authlib/Makefile.opt ============================================================================== --- head/security/courier-authlib/Makefile.opt Tue Aug 20 15:49:07 2019 (r509430) +++ head/security/courier-authlib/Makefile.opt Tue Aug 20 16:22:06 2019 (r509431) @@ -11,7 +11,7 @@ #.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 Modified: head/security/courier-authlib/distinfo ============================================================================== --- head/security/courier-authlib/distinfo Tue Aug 20 15:49:07 2019 (r509430) +++ head/security/courier-authlib/distinfo Tue Aug 20 16:22:06 2019 (r509431) @@ -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 Modified: head/security/courier-authlib/files/patch-Makefile.in ============================================================================== --- head/security/courier-authlib/files/patch-Makefile.in Tue Aug 20 15:49:07 2019 (r509430) +++ head/security/courier-authlib/files/patch-Makefile.in Tue Aug 20 16:22:06 2019 (r509431) @@ -1,4 +1,4 @@ ---- 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 = : @@ -16,20 +16,41 @@ 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) \ @@ -37,7 +58,15 @@ $(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@ @@ -45,7 +74,7 @@ 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 @@ -53,7 +82,7 @@ +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@ \ @@ -77,7 +106,7 @@ 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) @@ -91,7 +120,7 @@ # 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 @@ -102,7 +131,7 @@ 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 @@ -111,7 +140,7 @@ 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) @@ -121,24 +150,41 @@ 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: @@ -173,16 +219,16 @@ 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 \ @@ -192,7 +238,7 @@ @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 @@ -201,7 +247,7 @@ @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@ @: @@ -211,7 +257,7 @@ +@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: @@ -220,7 +266,7 @@ 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 @@ -229,7 +275,7 @@ @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 @@ -238,7 +284,7 @@ @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 @@ -259,17 +305,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 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 \ @@ -306,7 +352,7 @@ $(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 @@ -318,7 +364,7 @@ $(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 Modified: head/security/courier-authlib/pkg-plist-base ============================================================================== --- head/security/courier-authlib/pkg-plist-base Tue Aug 20 15:49:07 2019 (r509430) +++ head/security/courier-authlib/pkg-plist-base Tue Aug 20 16:22:06 2019 (r509431) @@ -1,5 +1,5 @@ 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 Modified: head/security/courier-authlib/pkg-plist-ldap ============================================================================== --- head/security/courier-authlib/pkg-plist-ldap Tue Aug 20 15:49:07 2019 (r509430) +++ head/security/courier-authlib/pkg-plist-ldap Tue Aug 20 16:22:06 2019 (r509431) @@ -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 Modified: head/security/courier-authlib/pkg-plist-mysql ============================================================================== --- head/security/courier-authlib/pkg-plist-mysql Tue Aug 20 15:49:07 2019 (r509430) +++ head/security/courier-authlib/pkg-plist-mysql Tue Aug 20 16:22:06 2019 (r509431) @@ -1,4 +1,4 @@ -@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 Modified: head/security/courier-authlib/pkg-plist-pgsql ============================================================================== --- head/security/courier-authlib/pkg-plist-pgsql Tue Aug 20 15:49:07 2019 (r509430) +++ head/security/courier-authlib/pkg-plist-pgsql Tue Aug 20 16:22:06 2019 (r509431) @@ -1,4 +1,4 @@ -@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