From nobody Fri Aug 25 03:01:12 2023 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 4RX4Tj1ZtQz4qjYS; Fri, 25 Aug 2023 03:01:13 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RX4Th3r7lz4fMf; Fri, 25 Aug 2023 03:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692932472; 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=NX9I1uwJibt3jZuUSlHeKPSc2FzbBF717E15rrCZHLM=; b=ZkriFPiR5Q8kmd1vjzfanRZwZg9K4aqZzDqAFP3O9Bu+As+Ju7lAFsgKEXgx1Tc+Yhwxjq II0+CifdrpZ3zk3U5BgdkB0pmT+A5EYkZ8O7F2rpU8Cmj3ApESgXoYTSSCpoidTsWbGVwx aSY7OM1gDo39MiVvYsoTL+X3MrgVNZSzyepBtOANQGF+mUpHXwX3ZVlZqIp3Ke/M8tJjHa TyUHQru1ySM3lOB4HSunGUmGT1kSrWoEfQht5kxnfpXt8FWSwCepPP6EkRAHtO5snrVeHe 2ZLn+HsN3fJkCmWQ1pFsk6yH7uQ/ieTW96lZovugYMfrhkIEUVIh2QbCLh4J0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692932472; 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=NX9I1uwJibt3jZuUSlHeKPSc2FzbBF717E15rrCZHLM=; b=hptcc2ud5u43NuN23SJ3hlcvFuTadck5TwxVpyMmREbaJ7FHqB8u7YIGK7C2jHjlk6zaK9 5w9m9wQ/iL5HyBJOA/KKavXrueNNt+0MwmSbemYtfJwKxKy0m7xHHHHH2oqzirCe6MF5Sf gnvd3EtapCKfpW8OyLqENi1MotDFwjKfm+yt2iAiEKtWfSqimluS8YENqujZiXgsZo8kUd FfSPBXZMiUv/gvmcCW0j+gLI3AeCviQi6+BDzUuERZMwAY1EYXSNMKSjOaeJi9swBez/XL 9wMFNBvTySnzMb5lQ4rXV/O+7drFdkpdvSRrpFHQYU7YlRt+zsys35GkFUInAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692932472; a=rsa-sha256; cv=none; b=kAon9ppZXZ2DD26dl1puRBEItKx8YKg1x/q6xxsPgAdpjXQ1IJshvEH2wc/n6B7T60UNc8 vfwFWydJgjT5nbQDiDNRbk1TFlzzMjqN8pET/E5CNuga3gVtpX5dWN94uuVWTKXJm02U/M po0xbgIstj0NnINBkAd7jYTxwhS7kRzlNcjnZlOIwYvllJqbRHbIGXacwMGrYT+/r4hY6g bAgbkQeN3LT3a+chxxWVucpTRdINyV2u75pG8WlZTNheBkOADr+hFI6DGe1NFuymTNqTF4 D+k9uMPCBOJIDkoyBhaHqjuylCywuDIgKslH3k7uBecrIZSs/hrpHahXPaT9Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RX4Th2wtszscc; Fri, 25 Aug 2023 03:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P31CxO052220; Fri, 25 Aug 2023 03:01:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P31CZX052217; Fri, 25 Aug 2023 03:01:12 GMT (envelope-from git) Date: Fri, 25 Aug 2023 03:01:12 GMT Message-Id: <202308250301.37P31CZX052217@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 49b7f1c6cb2e - main - sysutils/libdnf: Fix regex and duplicate rtti 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49b7f1c6cb2e742931b85e49d532b8993c4eeb61 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=49b7f1c6cb2e742931b85e49d532b8993c4eeb61 commit 49b7f1c6cb2e742931b85e49d532b8993c4eeb61 Author: Mark Johnston AuthorDate: 2023-08-25 02:58:46 +0000 Commit: Yuri Victorovich CommitDate: 2023-08-25 03:01:10 +0000 sysutils/libdnf: Fix regex and duplicate rtti PR: 273044 --- sysutils/libdnf/Makefile | 1 + .../files/patch-bindings_python_____init____.py | 21 +++++++++++++++++++++ .../files/patch-libdnf_repo_DependencySplitter.cpp | 14 ++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/sysutils/libdnf/Makefile b/sysutils/libdnf/Makefile index d148cd9f1071..ddd0771ee1ee 100644 --- a/sysutils/libdnf/Makefile +++ b/sysutils/libdnf/Makefile @@ -1,5 +1,6 @@ PORTNAME= libdnf DISTVERSION= 0.70.2 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org diff --git a/sysutils/libdnf/files/patch-bindings_python_____init____.py b/sysutils/libdnf/files/patch-bindings_python_____init____.py new file mode 100644 index 000000000000..bec3b2534377 --- /dev/null +++ b/sysutils/libdnf/files/patch-bindings_python_____init____.py @@ -0,0 +1,21 @@ +- from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273044 +- fix regex and duplicate rtti + +--- bindings/python/__init__.py.orig 2023-07-28 12:49:18 UTC ++++ bindings/python/__init__.py +@@ -6,11 +6,14 @@ from . import error + import sys, os + sys.setdlopenflags(os.RTLD_NOW | os.RTLD_GLOBAL) + from . import error +-sys.setdlopenflags(os.RTLD_NOW) + ++# Other modules also need to be loaded with RTLD_GLOBAL to preserve uniqueness ++# of RTTI. There are code paths where an exception thrown in one module is ++# supposed to be caught in another. + from . import common_types + from . import conf + from . import module + from . import repo + from . import transaction + from . import utils ++sys.setdlopenflags(os.RTLD_NOW) diff --git a/sysutils/libdnf/files/patch-libdnf_repo_DependencySplitter.cpp b/sysutils/libdnf/files/patch-libdnf_repo_DependencySplitter.cpp new file mode 100644 index 000000000000..a6d20c22d23d --- /dev/null +++ b/sysutils/libdnf/files/patch-libdnf_repo_DependencySplitter.cpp @@ -0,0 +1,14 @@ +- from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273044 +- fix regex and duplicate rtti + +--- libdnf/repo/DependencySplitter.cpp.orig 2023-07-28 12:49:18 UTC ++++ libdnf/repo/DependencySplitter.cpp +@@ -29,7 +29,7 @@ static const Regex RELDEP_REGEX = + namespace libdnf { + + static const Regex RELDEP_REGEX = +- Regex("^(\\S*)\\s*(<=|>=|<|>|=|==)?\\s*(\\S*)$", REG_EXTENDED); ++ Regex("^([^[:space:]]*)[[:space:]]*(<=|>=|<|>|=|==)?[[:space:]]*([^[:space:]]*)$", REG_EXTENDED); + + static bool + getCmpFlags(int *cmp_type, std::string matchCmpType)