From nobody Mon Apr 07 11:23:59 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZWRg36V2Vz5t7XP; Mon, 07 Apr 2025 11:23:59 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWRg35FQvz3nNk; Mon, 07 Apr 2025 11:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744025039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q1m5uQhtUoYr6eQfHQE1k2jqXrY8suiYjUmSXCQ5FSQ=; b=Zcjcv+JsSzewNsvNS3gFjoNl31429E8Yyxg48BXvvtQIfWmovcbppDxUDuSJs7ZcXAszKR EmAloC69Ul58K/Xuh66xoxsfO92cGS45SvykCWMEKMZmYefZOVwgzY2Dascq7WE1ZusAs4 eSXSDNmCekkdonWNwdw8zGDR4BE63F/x0sYNnmyW8FzgEAu5983Gc1E+FrXXVDTPEuatv7 hphviCjxVw64u4uZq5wQ7Swp6FYHir5ghHkOoO/brQexjZtqb/xs18N6b6STiMEFahK0La Iw6dg2b7hltQn/DIz+yos0pLuI6C0eZvzjWn3h9/ebGT/TV6DDmoQS+j3KY9Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744025039; a=rsa-sha256; cv=none; b=Pc0C9GhbOLMw+9FrLJbWjE1tS4hM1OWSZxCGi71EQjDDOcJMtC8hqbnOFELY5irTxhDQqf UVhHxafr13vsmGSgRzaX2LNNJGMnqiY4oh1F3jN1llCa6vU5kEOogB/FcKmucA3gtTWjXm fVgueNgtw01b6xC5t1InV3EwJ70Plw7lGWAMOTe3NnqlAZWyq/7h9LUvuxq9JcBiYradqQ OYnJqmQFIVvB98SSGGPVz1ePXu4qO5EuNX/LPrpwC8MyCaX1zT53UqGD1X/ORT7kI7/qQ8 op8IRFG/lL+Vx8DmZFj+GpG4rTTBmQMBgF8eApWhSM3n7EWzEgAKrnNM5HG20w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744025039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q1m5uQhtUoYr6eQfHQE1k2jqXrY8suiYjUmSXCQ5FSQ=; b=Tt7+UsQR7FyXGAPEUWjhkbcXbN6SdScIM/3gsSyq0NX+iM+P1RFq7Xatu8y085tjl7hOx5 wLVQzlDCEXOyFMm2YJlcnUOasKK0GZbrFN9Sh04g7XKTl+pRlr2ilznCF9FMnR5QLYOUvW EOQ9v0oW7fhmLRTQwmPUoFTlcfZuRbI5BCIZVPpMzOi0+dWkmURfCro/j+ZPFEuESOhJwm PWrKFMqC+JkLbGbhHLeHcCw8jltcM0fzeJNEr0+kV1y/lOp5QWZE/0YiPMHeuVSMp42FUV ySK6i7vdsbLclvDVSXAw8hqaXHMpHT4Fc6BfiO+dYqEH2phwmBq1TRlUWBWRmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZWRg34hZKzkxj; Mon, 07 Apr 2025 11:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 537BNxmi081546; Mon, 7 Apr 2025 11:23:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 537BNxgU081543; Mon, 7 Apr 2025 11:23:59 GMT (envelope-from git) Date: Mon, 7 Apr 2025 11:23:59 GMT Message-Id: <202504071123.537BNxgU081543@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 8f5e8f5f2ed7 - main - security/courier-authlib: Update to 0.72.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f5e8f5f2ed70acc22b06bbdf49a2bd159d1bebf Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f5e8f5f2ed70acc22b06bbdf49a2bd159d1bebf commit 8f5e8f5f2ed70acc22b06bbdf49a2bd159d1bebf Author: Guido Falsi AuthorDate: 2025-04-07 11:22:07 +0000 Commit: Guido Falsi CommitDate: 2025-04-07 11:22:07 +0000 security/courier-authlib: Update to 0.72.4 --- security/courier-authlib/Makefile | 2 +- security/courier-authlib/distinfo | 6 +-- security/courier-authlib/files/patch-Makefile.in | 48 ++++++++++++------------ security/courier-authlib/files/patch-configure | 38 ++++++++++--------- 4 files changed, 48 insertions(+), 46 deletions(-) diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index b1b420e133fc..f542e393c400 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -1,5 +1,5 @@ PORTNAME= courier-authlib -PORTVERSION= 0.72.3 +PORTVERSION= 0.72.4 CATEGORIES?= security mail .if defined(PKGNAMESUFFIX) MASTER_SITES= SF/courier/authlib/${PORTVERSION} diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo index 0096a0916464..1b97be6c6ce6 100644 --- a/security/courier-authlib/distinfo +++ b/security/courier-authlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1722950504 -SHA256 (courier-authlib-0.72.3.tar.bz2) = 411b8a3c9b145eba0bdf87b9942a5413ad22646144781046f6c46b17406b050a -SIZE (courier-authlib-0.72.3.tar.bz2) = 2289793 +TIMESTAMP = 1744018659 +SHA256 (courier-authlib-0.72.4.tar.bz2) = 2a9d4e4535f1eeae84cc57589e8fdb9b46ae4f695d40e943413dfd6e949e3137 +SIZE (courier-authlib-0.72.4.tar.bz2) = 2290493 diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in index 30b24b2f1beb..4af934841bf2 100644 --- a/security/courier-authlib/files/patch-Makefile.in +++ b/security/courier-authlib/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2024-01-28 13:22:04 UTC +--- Makefile.in.orig 2025-04-06 14:25:31 UTC +++ Makefile.in @@ -95,11 +95,10 @@ host_triplet = @host@ POST_UNINSTALL = : @@ -123,7 +123,7 @@ $(libcourierauth_la_SOURCES) \ $(libcourierauthcommon_la_SOURCES) \ $(libcourierauthsasl_la_SOURCES) \ -@@ -569,6 +579,7 @@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ +@@ -571,6 +581,7 @@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ LIBAUTHSHADOW = @LIBAUTHSHADOW@ LIBAUTHSQLITE = @LIBAUTHSQLITE@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ @@ -131,7 +131,7 @@ LIBDB = @LIBDB@ LIBDL = @LIBDL@ LIBGDBM = @LIBGDBM@ -@@ -702,7 +713,10 @@ AUTOMAKE_OPTIONS = dist-bzip2 +@@ -704,7 +715,10 @@ AUTOMAKE_OPTIONS = dist-bzip2 userdb = @userdb@ using_systemd = @using_systemd@ AUTOMAKE_OPTIONS = dist-bzip2 @@ -143,7 +143,7 @@ AM_CPPFLAGS = -I liblock $(LTDLINCL) BUILT_SOURCES = authdaemonrc.h $(BUILT1) $(GITFILES) \ $(man3:%.3=%.html) $(man1:%.1=%.html) authsqliterc.h \ -@@ -710,16 +724,18 @@ modules = @LIBAUTHUSERDB@ \ +@@ -712,16 +726,18 @@ modules = @LIBAUTHUSERDB@ \ modules = @LIBAUTHUSERDB@ \ @LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \ @LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ @LIBAUTHSQLITE@ \ @@ -166,7 +166,7 @@ libauthpgsql.la \ libauthldap.la \ libauthmysql.la \ -@@ -792,6 +808,13 @@ libauthshadow_la_LDFLAGS = $(commonldflags) +@@ -794,6 +810,13 @@ libauthshadow_la_LDFLAGS = $(commonldflags) libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t) libauthshadow_la_LDFLAGS = $(commonldflags) @@ -180,7 +180,7 @@ # The authpgsql module libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@ libauthpgsql_la_SOURCES = authpgsql.c authpgsqllib.cpp authpgsql.h -@@ -880,8 +903,8 @@ libcourierauthsaslclient_la_LDFLAGS = -export-symbols- +@@ -883,8 +906,8 @@ libcourierauthsaslclient_la_LDFLAGS = -export-symbols- libcourierauthsaslclient_la_LIBADD = libcourierauth.la libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -version-info @LIBVERSION_INFO@ @@ -191,7 +191,7 @@ courierauthconfig_SOURCES = authinfo.c authpasswd_SOURCES = authpasswd.c -@@ -898,7 +921,7 @@ authenumerate_LDADD = libcourierauth.la \ +@@ -901,7 +924,7 @@ authenumerate_LDADD = libcourierauth.la \ authenumerate_LDADD = libcourierauth.la \ libs/numlib/libnumlib.la @@ -200,7 +200,7 @@ # # The main daemon. -@@ -929,7 +952,7 @@ extraman3 = auth_generic_meta.3 auth_login_meta.3 auth +@@ -932,7 +955,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 @@ -209,7 +209,7 @@ man_MANS = $(man1) $(man3) $(extraman3) BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \ authdaemonrc.h packageversion.h \ -@@ -988,7 +1011,7 @@ stamp-h1: $(srcdir)/courier_auth_config.h.in $(top_bui +@@ -990,7 +1013,7 @@ stamp-h1: $(srcdir)/courier_auth_config.h.in $(top_bui stamp-h1: $(srcdir)/courier_auth_config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status courier_auth_config.h @@ -218,7 +218,7 @@ ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ -@@ -1160,73 +1183,76 @@ clean-pkglibLTLIBRARIES: +@@ -1162,73 +1185,76 @@ clean-pkglibLTLIBRARIES: rm -f $${locs}; \ } @@ -316,7 +316,7 @@ @rm -f courierauthconfig$(EXEEXT) $(AM_V_CCLD)$(LINK) $(courierauthconfig_OBJECTS) $(courierauthconfig_LDADD) $(LIBS) install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS) -@@ -1353,6 +1379,8 @@ distclean-compile: +@@ -1355,6 +1381,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 @@ -325,7 +325,7 @@ @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 -@@ -1368,6 +1396,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 @@ -333,7 +333,7 @@ $(am__depfiles_remade): @$(MKDIR_P) $(@D) -@@ -1937,6 +1966,8 @@ distclean: distclean-recursive +@@ -1939,6 +1968,8 @@ distclean: distclean-recursive -rm -f ./$(DEPDIR)/authtest.Po -rm -f ./$(DEPDIR)/authuserdb.Plo -rm -f ./$(DEPDIR)/authuserdbpwd.Plo @@ -342,7 +342,7 @@ -rm -f ./$(DEPDIR)/checkpassword.Plo -rm -f ./$(DEPDIR)/checkpasswordmd5.Plo -rm -f ./$(DEPDIR)/checkpasswordsha1.Plo -@@ -1952,6 +1983,7 @@ distclean: distclean-recursive +@@ -1954,6 +1985,7 @@ distclean: distclean-recursive -rm -f ./$(DEPDIR)/preauthshadow.Plo -rm -f ./$(DEPDIR)/preauthuserdb.Plo -rm -f ./$(DEPDIR)/preauthuserdbcommon.Plo @@ -350,7 +350,7 @@ -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags -@@ -1968,18 +2000,26 @@ info-am: +@@ -1970,18 +2002,26 @@ info-am: info-am: @@ -385,7 +385,7 @@ install-html: install-html-recursive install-html-am: -@@ -2122,13 +2162,16 @@ uninstall-man: uninstall-man1 uninstall-man3 +@@ -2124,13 +2164,16 @@ uninstall-man: uninstall-man1 uninstall-man3 .PRECIOUS: Makefile @@ -404,7 +404,7 @@ @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc: @HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist -@@ -2146,8 +2189,6 @@ authpgsqlrc.h: +@@ -2148,8 +2191,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 @@ -413,7 +413,7 @@ @HAVE_LDAP_TRUE@uninstall-authldaprc: @HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist -@@ -2158,6 +2199,18 @@ authpgsqlrc.h: +@@ -2160,6 +2201,18 @@ authpgsqlrc.h: @HAVE_LDAP_FALSE@uninstall-authldaprc: @HAVE_LDAP_FALSE@ @: @@ -432,7 +432,7 @@ authldaprc.h: echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h -@@ -2165,8 +2218,6 @@ authldaprc.h: +@@ -2167,8 +2220,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 @@ -441,7 +441,7 @@ @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc: @HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist -@@ -2184,8 +2235,6 @@ authmysqlrc.h: +@@ -2186,8 +2237,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 @@ -450,7 +450,7 @@ @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc: @HAVE_AUTHSQLITE_TRUE@ rm -f $(DESTDIR)@authsqliterc@.dist -@@ -2204,17 +2253,21 @@ authpiperc.h: +@@ -2206,17 +2255,21 @@ authpiperc.h: authpiperc.h: echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h @@ -481,7 +481,7 @@ authdaemonrc.h: echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h -@@ -2270,24 +2323,24 @@ install-data-hook: install-authdaemonrc install-authpg +@@ -2272,24 +2325,24 @@ install-data-hook: install-authdaemonrc install-authpg # automake still a bit stupid... install-data-hook: install-authdaemonrc install-authpgsqlrc \ @@ -518,7 +518,7 @@ $(INSTALL_SCRIPT) userdb/pw2userdb \ $(DESTDIR)$(sbindir)/pw2userdb ; \ $(INSTALL_SCRIPT) userdb/makeuserdb \ -@@ -2298,9 +2351,10 @@ uninstall-hook: uninstall-authldaprc uninstall-authdae +@@ -2300,9 +2353,10 @@ uninstall-hook: uninstall-authldaprc uninstall-authdae $(DESTDIR)$(sbindir)/userdbpw uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc uninstall-authsqliterc @@ -530,7 +530,7 @@ $(DESTDIR)$(sbindir)/pw2userdb \ $(DESTDIR)$(sbindir)/makeuserdb \ $(DESTDIR)$(sbindir)/userdb \ -@@ -2310,7 +2364,7 @@ authlib.3: authlib.3.in +@@ -2312,7 +2366,7 @@ authlib.3: authlib.3.in $(SHELL) ./config.status --file=authlib.html authlib.3: authlib.3.in diff --git a/security/courier-authlib/files/patch-configure b/security/courier-authlib/files/patch-configure index 81a6cb164337..c85d3ef8a200 100644 --- a/security/courier-authlib/files/patch-configure +++ b/security/courier-authlib/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2024-01-28 13:22:04 UTC +--- configure.orig 2025-04-06 14:25:31 UTC +++ configure -@@ -669,6 +669,10 @@ LTLIBOBJS +@@ -662,6 +662,10 @@ LTLIBOBJS am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -9,9 +9,9 @@ +HAVE_USERDB_TRUE +HAVE_USERDB_FALSE LIBOBJS - using_systemd - SOVERSION -@@ -710,6 +714,9 @@ authpgsqlrc + DATEFULL + DATE +@@ -705,6 +709,9 @@ authpgsqlrc PGSQL_LIBS PG_CONFIG authpgsqlrc @@ -21,7 +21,7 @@ LIBAUTHPWD LIBAUTHSHADOW SHADOWLIBS -@@ -1610,6 +1617,7 @@ Optional Packages: +@@ -1605,6 +1612,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 -@@ -3493,7 +3501,7 @@ fi +@@ -3523,7 +3531,7 @@ fi fi fi @@ -38,7 +38,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 -@@ -19387,8 +19395,12 @@ then +@@ -19748,8 +19756,12 @@ then if test "$doauthuserdb" = "no" then @@ -51,7 +51,7 @@ AUTHUSERDB="authuserdb" LIBAUTHUSERDB="libauthuserdb.la" -@@ -19832,7 +19844,21 @@ fi +@@ -20236,7 +20248,21 @@ fi fi @@ -73,7 +73,7 @@ if test "$HAVE_LDAP" = 1; then HAVE_LDAP_TRUE= HAVE_LDAP_FALSE='#' -@@ -20037,6 +20063,256 @@ fi +@@ -20460,6 +20486,256 @@ fi @@ -330,7 +330,7 @@ # Check whether --with-authpgsqlrc was given. if test ${with_authpgsqlrc+y} then : -@@ -20390,8 +20666,8 @@ then +@@ -20823,8 +21099,8 @@ then SQLITE_LIBS="`pkg-config --libs sqlite3 2>/dev/null`" saveLIBS="$LIBS" LIBS="$SQLITE_LIBS $LIBS" @@ -341,7 +341,7 @@ then : doauthsqlite="yes" -@@ -20409,14 +20685,14 @@ else +@@ -20842,15 +21118,15 @@ else else saveLIBS="$LIBS" LIBS="$SQLITE_LIBS $LIBS" @@ -349,17 +349,19 @@ -if test "x$ac_cv_func_sqlite3_version" = xyes -then : - : --else $as_nop -- as_fn_error $? "Cannot link with $SQLITE_LIBS" "$LINENO" 5 -- +-else case e in #( +- e) as_fn_error $? "Cannot link with $SQLITE_LIBS" "$LINENO" 5 +- ;; +-esac -fi +# ac_fn_c_check_func "$LINENO" "sqlite3_version" "ac_cv_func_sqlite3_version" +#if test "x$ac_cv_func_sqlite3_version" = xyes +#then : +# : -+#else $as_nop -+# as_fn_error $? "Cannot link with $SQLITE_LIBS" "$LINENO" 5 -+# ++#else case e in #( ++# e) as_fn_error $? "Cannot link with $SQLITE_LIBS" "$LINENO" 5 ++# ;; ++#esac +#fi LIBS="$saveLIBS"