Attachment 231406 Details for Bug 261523 – Updated patch file

[patch] Updated patch file

Mk_bsd.default-versions.mk.bdb.patch (text/plain), 2.21 KB, created by Yasuhiro Kimura on 2022-01-28 08:18:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2022-01-28 08:18:31 UTC

Size: 2.21 KB

patch

obsolete

>From 4e1a510ceddfa956b2d564a8d8544c0f830f18bd Mon Sep 17 00:00:00 2001
>From: Rafael Grether <devnull@apt322.org>
>Date: Fri, 28 Jan 2022 16:34:08 +0900
>Subject: [PATCH] Mk/bsd.default-versions.mk: Change default of BDB to db18
>
>Also remove codes related to WITH_BDB6_PERMITTED from Mk/Uses/bdb.mk.
>
>Currently user needs to set 'WITH_BDB6_PERMITTED=yes' in
>/etc/make.conf to use db18 as default version of BDB. The variable is
>introduced for user who doesn't want to accept AGPLv3 when upstream
>changed license with the release of 6.0. However, after db5 is removed
>it becomes meaningless as db18 is the only available version of BDB.
>Moreover it makes it impossible to change default version BDB to
>18. So remove codes related to it.
>
>PR:		261523
>---
> Mk/Uses/bdb.mk             | 10 +---------
> Mk/bsd.default-versions.mk |  2 +-
> 2 files changed, 2 insertions(+), 10 deletions(-)
>
>diff --git a/Mk/Uses/bdb.mk b/Mk/Uses/bdb.mk
>index c80db16b58a2..1a2d36dfda62 100644
>--- a/Mk/Uses/bdb.mk
>+++ b/Mk/Uses/bdb.mk
>@@ -58,14 +58,6 @@ BDB_UNIQUENAME?=	${PKGNAMEPREFIX}${PORTNAME}
> _BDB_DEFAULT_save:=${BDB_DEFAULT}
> 
> _DB_PORTS=		5 18
>-_DB_DEFAULTS=	5
>-#
>-#   Since 2020-12-02, this name is not fitting too much but
>-#   retained for now for compatibility. The name of this variable
>-#   is subject to change especially once db6 were removed.
>-. if defined(WITH_BDB6_PERMITTED)
>-_DB_DEFAULTS+=	18
>-. endif
> 
> # Dependency lines for different db versions
> db5_DEPENDS=	libdb-5.3.so:databases/db5
>@@ -148,7 +140,7 @@ _ELIGIBLE_BDB_VER:=${_INST_BDB_VER}
> 
> # 3b. if there is no usable version installed, check defaults
> .if empty(_INST_BDB_VER)
>-_DFLT_BDB_VER:=${_DB_DEFAULTS}
>+_DFLT_BDB_VER:=${_DB_PORTS}
> # make sure we use a reasonable version for package builds
> _WITH_BDB_HIGHEST=yes
> . for i in ${_DFLT_BDB_VER}
>diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
>index ce3c5fca1587..6d107a730210 100644
>--- a/Mk/bsd.default-versions.mk
>+++ b/Mk/bsd.default-versions.mk
>@@ -34,7 +34,7 @@ ${_l:tu}_DEFAULT=	${lang:C/.*=//g}
> # Possible values: 2.4
> APACHE_DEFAULT?=	2.4
> # Possible values: 5, 18
>-BDB_DEFAULT?=		5
>+BDB_DEFAULT?=		18
> # Possible values: 2, 3
> COROSYNC_DEFAULT?=	2
> # Possible_values: full canna nox devel_full devel_nox
>-- 
>2.35.0
>

Actions: View | Diff

Attachments on bug 261523: 231394 | 231406 | 231569 | 231617 | 235409 | 235422 | 236499 | 237252