From nobody Thu Sep 21 07:40:56 2023 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 4RrnQ14Cpxz4tj2m; Thu, 21 Sep 2023 07:40:57 +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 4RrnQ11D7Jz4Fr5; Thu, 21 Sep 2023 07:40:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695282057; 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=h71VAo8ynFj0zYe9Y/rQ0Stlx4NdYTSGiZh2qa37fys=; b=atMW6Exj4jkrWkFwv/RvdqIcESFp/nzbrLKb9Cgh+9Eh/QIcBXRgEGbA21zMr5Ii09vJSr /TaIiL0QmK/36+YDaMlpPPu8WxyJsdLF+HBMMBlVylFOG95TRpc0OmqEUMEQ5dWoR+tFH0 IaXI7qQ6IlGkfhboB112UY6qsnZeI21rE3TdRcqmVEbkVn213v7KlezNd7822S3LcHn5sG jnEo6id9VadW5kQko3dvLubwoCQdTLLmyuDYbM6hmdrCWvVUu20HCmQ4RTXz2R+zDVjet/ 3rx+aoR1ZlWl+RnT33hNr3cu2FPZJhrMXXv0Z8J5CEKCklEckmnH34oOhhKSjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695282057; a=rsa-sha256; cv=none; b=RZKYcygMh2g7pBuE0GC+cipZRYu2INoyV0wstOnqJXH+Yrcwo59NKiLbjTlo9ZstclaVTy AR5rwSvzSHCnJVTxiOH5iM6udqLx34Kr97R0S7yGFHQToY/y/mYbSzzALeDOpubBgzccwx AhLAg91Z0i+fO+TDq6f0cS76eFfwYlN3698R6qpEIva0YbyINePiFethTa+c5lCqPyzevH kDBiRlIySxKNR1sKzaL9+lITWIgBuVVGnp4WtINCYxTForDpwlmK/CJp8wRiU74FfGJ2vd AV2TRn4vUp5gGf0NU7NFg7dnJwLQxg2U/Q0Phys30hol8ZfaZF/6HDnX5l0huA== 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=1695282057; 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=h71VAo8ynFj0zYe9Y/rQ0Stlx4NdYTSGiZh2qa37fys=; b=kMg7JbzU3JBtjeFtliOm4XObJ6HxUpWap3vZrg3XVF/q6cK+ingDmfViskBN85uGAqplzK uDuIeLTnpYsgEaXKyC0TZ6zgKs1u8OkfuNMrOuEL4iePB2hrMJLNZWvqqdZwaIlIrbcbq9 MA/uzWhlemep6ovapZfeqNfKKV7NSSgOqP5wS9EROEiiRq0IPoOLTWG/t3TrmSRNS0voUr sjF59091fPpANf3YL61Ge4QO1CFeti8jV5B6ui2snKH+3JCBND/MRb4meZorThIR8oSVOX psFd/MOs6DCXHRDc5Zt2vbN0ZVQPhrx3vaZtClyqMQf4u2spAOqcAb919+xf7A== 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 4RrnQ100WpzVd0; Thu, 21 Sep 2023 07:40:57 +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 38L7euRM017664; Thu, 21 Sep 2023 07:40:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38L7euvc017661; Thu, 21 Sep 2023 07:40:56 GMT (envelope-from git) Date: Thu, 21 Sep 2023 07:40:56 GMT Message-Id: <202309210740.38L7euvc017661@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 28149de0a616 - main - devel/cmake-core devel/cmake-gui misc/mbuffer: cope with librhash.so bump 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28149de0a616dd364bce3485aafb31dcfba27946 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=28149de0a616dd364bce3485aafb31dcfba27946 commit 28149de0a616dd364bce3485aafb31dcfba27946 Author: Dimitry Andric AuthorDate: 2023-09-21 07:31:51 +0000 Commit: Dimitry Andric CommitDate: 2023-09-21 07:38:37 +0000 devel/cmake-core devel/cmake-gui misc/mbuffer: cope with librhash.so bump Because rhash 1.4.4 updated the librhash.so symlink from .0 to .1, build-time dependents such as cmake-core and cmake-gui need their PORTREVISION bumped. The other case is misc/mbuffer, which uses librhash only at runtime, but hardcodes dlopen("librhash.so.0", RTLD_NOW). I changed this to just "librhash.so", and it seems to work fine with light testing. PR: 273775 Reported by: Tomoaki AOKI Fixes: e0acbd158ec9 security/rhash: update to 1.4.4 and fix build with lld 17 MFH: 2023Q3 --- devel/cmake-core/Makefile | 2 +- devel/cmake-gui/Makefile | 1 + misc/mbuffer/Makefile | 1 + misc/mbuffer/files/patch-hashing.c | 11 +++++++++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile index 018e73febdff..0e5f63ee4bdf 100644 --- a/devel/cmake-core/Makefile +++ b/devel/cmake-core/Makefile @@ -1,7 +1,7 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= ${_CMAKE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel PKGNAMESUFFIX= -core diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile index 8fc18a76114a..bcce5e488d08 100644 --- a/devel/cmake-gui/Makefile +++ b/devel/cmake-gui/Makefile @@ -1,5 +1,6 @@ PORTNAME= cmake DISTVERSION= ${_CMAKE_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= -gui-${FLAVOR} diff --git a/misc/mbuffer/Makefile b/misc/mbuffer/Makefile index 1a2d36f72ac3..e2b5e34d140c 100644 --- a/misc/mbuffer/Makefile +++ b/misc/mbuffer/Makefile @@ -1,5 +1,6 @@ PORTNAME= mbuffer PORTVERSION= 20230301 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= http://www.maier-komor.de/software/mbuffer/ diff --git a/misc/mbuffer/files/patch-hashing.c b/misc/mbuffer/files/patch-hashing.c new file mode 100644 index 000000000000..6b75015ccf37 --- /dev/null +++ b/misc/mbuffer/files/patch-hashing.c @@ -0,0 +1,11 @@ +--- hashing.c.orig 2023-02-27 19:18:52 UTC ++++ hashing.c +@@ -102,7 +102,7 @@ static void initHashLibs() + LibMhash = 0; + } + } +- LibRhash = dlopen("librhash.so.0",RTLD_NOW); ++ LibRhash = dlopen("librhash.so",RTLD_NOW); + if (LibRhash) { + debugmsg("found librhash\n"); + void (*rhash_library_init)() = (void (*)(void)) dlsym(LibRhash,"rhash_library_init");