From nobody Sun Nov 10 11:51:08 2024 X-Original-To: dev-commits-ports-main@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 4XmWGh2yh7z5cfPw; Sun, 10 Nov 2024 11:51:08 +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 4XmWGh2WqMz4k07; Sun, 10 Nov 2024 11:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731239468; 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=xiMnFZlCZA0sbOJsMKIbKjCXTzKo9VcjU0/irw8olaQ=; b=sGN/KWoDNu/h1pKTbNEHeRk8p/RwZYomgDkor8w5DAqr4XFoBl+/ON+KxKP27VEXy4GwSr dcodsmFWuki6DfmOb/f5Tmg+6aWbKyYOfDSRfLeVgwK5gcdgeSgernhq9KncdMtNyjB+DB hJIatg3HLW5ZG74usFsqdGKxgqzc+7XFzxlo2LXPuVIe/H5r9x4nXGqSXpn8aLkR3jDwLJ eACIgjUfBhIadtOzFm2lixzkOfKSZqL6GJ2Anisg7EgpnzgZKbAD+/VRRUgwCZZ+c/kWr0 U4GkA9asnF05ZfnTFN5uv4RU3vLJKCqm/lxUslOwQ8EpQyjQWK5Gor9Vb/atTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731239468; 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=xiMnFZlCZA0sbOJsMKIbKjCXTzKo9VcjU0/irw8olaQ=; b=Idfj8qoXt4NHfI/1rcyiTAHCBbl88ahOUvf+Hc/xl8PJH7RBEuhxY+O1eSAGDMLtfROQ31 2D71mzkrTY3bqQUF00CI9kMUUbpIA+xAjp91170HutQQP421Wfhw91fii/OyQj6kpIPfLT 9KTR9u+3CyTcugpNkOgfpZXpWEcUDSH4sj7G4HbOL72B97dU2Gm+IAfR9xYmhTo2ZmTJvo /ohTT5D6wXibZZGO0HX0KEiGwdnltrweA+2v0ud0Td3p3bgGYqo8nBGcUqKVr8LMpRM7+z gyz/ewIHmCIlYR0EMrxK1VJdtObEFSoNbmth6IptzkkWBd2NGLVHBuBljvROWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731239468; a=rsa-sha256; cv=none; b=gBPtmyKPPJDakk52UePw+eyg9le7DCHJdpBDX27pu4BfYOEN3SMde/U8q/VqfQGPcPC2yW JNftTyxgqUJy0nNcb4G2K3vut3BpH/b1KgoM842FHYUvPAQqaO+h70agPlY07jOqaarwAs Kg2jH9qKa7raMyp0k5HHEBKU3O6xHdtdEyK27dMV31Hkl7UeuP0f0rcd/sV8owGKijF2WU 3r0xIr5I7/K1xlH4pRbLZTynMcTZ4GmBtTFu1cyWLx4zyPixpveaEEnhwT1JLvoW2OOS8d c60aPDDe4eXyWT5tuWCJSgqTStFXX1H5vRXRw4kDLyDNh1nWQ6RYr0MQhFeCsg== 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 4XmWGh1qM7zhNS; Sun, 10 Nov 2024 11:51:08 +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 4AABp898069615; Sun, 10 Nov 2024 11:51:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AABp8qr069612; Sun, 10 Nov 2024 11:51:08 GMT (envelope-from git) Date: Sun, 10 Nov 2024 11:51:08 GMT Message-Id: <202411101151.4AABp8qr069612@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: cff251c080e4 - main - devel/apr1: Switch to bdb from base List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cff251c080e400ccc5919f208240267531a00ffa Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=cff251c080e400ccc5919f208240267531a00ffa commit cff251c080e400ccc5919f208240267531a00ffa Author: Bernard Spil AuthorDate: 2024-11-10 11:47:26 +0000 Commit: Bernard Spil CommitDate: 2024-11-10 11:47:26 +0000 devel/apr1: Switch to bdb from base * Requires rebuilding bdb databases (if any) Reported by: ngie, rfyu28uyeg_snkmail.com Differential Revision: https://reviews.freebsd.org/D40366 --- UPDATING | 11 ++++++++ devel/apr1/Makefile | 33 ++++++++++++++-------- devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4 | 9 ++++++ devel/apr1/pkg-message | 20 ++++++++++++- devel/apr1/pkg-plist | 6 ++-- 5 files changed, 63 insertions(+), 16 deletions(-) diff --git a/UPDATING b/UPDATING index 5a5daad9ddeb..3f1dd379d4ca 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20241110 + AFFECTS: users of devel/apr1 and www/apache24 + AUTHOR: brnrd@FreeBSD.org + + The default BerkeleyDB provider for apr-util was changed from BerkeleyDB + 5 (deprecated) to BerkeleyDB 1 from base libc. The change of version + results in a non-compatible database format. + + After upgrading, you must rebuild all BerkeleyDB databases used by + apr-util (example: Apache databases created with `httxt2dbm -F db` + 20241109: AFFECTS: all users of i386 AUTHOR: asomers@FreeBSD.org diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 96f45de7427c..ddc270e103df 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -1,5 +1,6 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= APACHE/apr DISTFILES= apr-${APR_VERSION}.tar.gz \ @@ -11,10 +12,9 @@ WWW= https://apr.apache.org/ LICENSE= APACHE20 -BUILD_DEPENDS+= automake>=1.16.1:devel/automake LIB_DEPENDS= libexpat.so:textproc/expat2 -USES= iconv pathfix libtool cpe +USES= autoreconf iconv pathfix libtool cpe USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -30,13 +30,14 @@ OPTIONS_GROUP= APU OPTIONS_DEFINE= IPV6 OPTIONS_GROUP_APU= GDBM LDAP MYSQL NDBM ODBC PGSQL SQLITE OPTIONS_RADIO= BERKELEYDB CRYPTO -OPTIONS_RADIO_BERKELEYDB= BDB BDB5 +OPTIONS_RADIO_BERKELEYDB= BDB1 BDB5 BDB18 OPTIONS_RADIO_CRYPTO= SSL NSS -OPTIONS_DEFAULT= BDB GDBM SSL +OPTIONS_DEFAULT= BDB1 GDBM SSL APU_DESC= Database support -BDB_DESC= Berkeley DB support (AGPLv3) +BDB1_DESC= Berkeley DB 1.85 support (BSD 4-clause) BDB5_DESC= Berkeley DB v5 support (deprecated) +BDB18_DESC= Berkeley DB 18.x support (AGPLv3) BERKELEYDB_DESC= Berkeley DB provider CRYPTO_DESC= Cryptography provider NDBM_DESC= NDBM support @@ -44,15 +45,15 @@ NSS_DESC= NSS crypto driver SSL_DESC= OpenSSL crypto driver # APR-Util Options -BDB_USES= bdb:18 BDB5_USES= bdb:5 +BDB18_USES= bdb:18 GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm LDAP_USES= ldap MYSQL_USES= mysql NSS_LIB_DEPENDS= libnss3.so:security/nss ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -PGSQL_USES= pgsql -SQLITE_USES= sqlite + +QLITE_USES= sqlite SSL_USES= ssl APR_WRKDIR= ${WRKDIR}/apr-${APR_VERSION} @@ -84,9 +85,14 @@ IPV6_VARS_OFF= APR_CONF_ARGS+=--disable-ipv6 # to avoid failures if previous apr_version.h is present APU_CPPFLAGS= -I${APR_WRKDIR}/include -BDB_VARS= ${BDB5_VARS} \ - LICENSE_COMB=dual LICENSE+=AGPLv3 -BDB5_VARS= APU_CONF_ARGS+=--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} +BDB1_VARS= LICENSE_COMB=dual LICENSE+=BSD4CLAUSE \ + APU_CONF_ARGS+="--with-berkeley-db=/usr/include:/usr/lib \ + --with-dbm=db1" +BDB5_VARS= APU_CONF_ARGS+="--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} \ + --with-dbm=db185" +BDB18_VARS= LICENSE_COMB=dual LICENSE+=AGPLv3 \ + APU_CONF_ARGS+="--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} \ + --with-dbm=db185" GDBM_VARS= APU_CONF_ARGS+=--with-gdbm=${LOCALBASE} LDAP_VARS= APU_CONF_ARGS+="--with-ldap-include=${LOCALBASE}/include \ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap" @@ -118,8 +124,11 @@ APU_CONF_ENV+= ${CONFIGURE_ENV:O:u} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${AP .include -.if !${PORT_OPTIONS:MBDB} && !${PORT_OPTIONS:MBDB5} +.if !${PORT_OPTIONS:MBDB1} && !${PORT_OPTIONS:MBDB18} && !${PORT_OPTIONS:MBDB5} APU_CONF_ARGS+= --without-berkeley-db +PLIST_SUB+= BERKELEYDB="@comment " +.else +PLIST_SUB+= BERKELEYDB="" .endif .if ${PORT_OPTIONS:MSSL} || ${PORT_OPTIONS:MNSS} diff --git a/devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4 b/devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4 index 6bb9ed5e8343..7f8a6b221a91 100644 --- a/devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4 +++ b/devel/apr1/files/patch-apr-util-1.6.3_build_dbm.m4 @@ -11,6 +11,15 @@ index 57bd131f..5cbee4b3 100644 # We generate a separate cache variable for each prefix and libname # we search under. That way, we avoid caching information that # changes if the user runs `configure' with a different set of +@@ -293,7 +293,7 @@ AC_DEFUN([APU_CHECK_DB1], [ + APU_CHECK_BERKELEY_DB(1, 0, 0, + "$places", + "db1/db.h db.h", +- "db1" ++ "c db1" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=1 @@ -432,7 +432,15 @@ AC_DEFUN([APU_CHECK_DB], [ AC_MSG_ERROR(Berkeley db$db_major not found) fi diff --git a/devel/apr1/pkg-message b/devel/apr1/pkg-message index ccf5adca9f44..e99ab3e48f04 100644 --- a/devel/apr1/pkg-message +++ b/devel/apr1/pkg-message @@ -1,9 +1,27 @@ [ -{ type: install +{ + type: install message: <