From nobody Wed Sep 20 20:13:10 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 4RrV8Q64SHz4v6fM; Wed, 20 Sep 2023 20:13:10 +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 4RrV8Q5NbXz4H9g; Wed, 20 Sep 2023 20:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695240790; 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=Dt/GZzntzNtZgRGurCWGhisUw97CAjEYmYCsuF9nibw=; b=DlG/rjTT++llqIUtJpcaDoWydrCg94o1HgOYqYOaXHeVf8gACIk1qvkUdF7tQrkkjGaDuW 4DnpSZz2duRSP2AO7oTPgEg97a7YTEvCpnfiykLaGCk21odUHg/2YRcVlqqU9D+FACLaDZ scJ+MeIqGOXJqzSXvmZyqLgd7prB/gpKnQUt+pal5tv4aEfvKcIWpvN7JS/4EVxJ+gx52w gx+hgpPwrTjUzRpWT4IoOBhCnQdGZ/YuqTLlMojHS/SzCE/RGolnfOe8Bt0okUCZKhorT4 dJ2yhjnpfZNuJv53WTRfVEn+y4XT5tGa3Lr8+8xX0+flDVdzHiouQF3E62NbNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695240790; a=rsa-sha256; cv=none; b=cYyCK5f91tUcdARijXGddf8JU+H0HekrpjA07EH2EWhMnVKN1xXfX9KQhL2H+WyJXpFhIy pL8zwNA50D4Rqn/RZlzShND7ZLA64I8EP5sjFJFyX/hpCdFVEO7g/YMR+TTHSYUKeW/1mg 0c8/NtkedPmwfHh3/PLTVwQSFg63+yN+XKRnwEe2BPO8DvU8+63tCXGZGIRHJs+4KIonoG zsOsR08JM7IjSrx8T7r5eAHpcPy4NDuCD60+judXyTfM89ETw8ZiwMUyRLyu0cOt+S7Tyv 9dcGPhT419800zykdoWTphz5sMwx7534V1afQh9q3mgOXGEzE1UCbeE3eZAvUg== 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=1695240790; 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=Dt/GZzntzNtZgRGurCWGhisUw97CAjEYmYCsuF9nibw=; b=xSejtSYrxZVquD3e6NyySqhO/UWIoks7Wc6Ig+d8Noo58YKgrSMcmmIDscqssCN6rs0u4a yqh9WY76vbLnenotoW/PODj7I+mmQEDbRTjdXn2ZVZCqSelt5PDI5UIAKrtdTSH8f6WHnr rTYCElyvph3d46+CEWJjQ1KzE7JjQCE7KCddTxarRhJRfeV7IbJCq3e/uKchuPYFvVKxnj KlZtuLGA34vbu485eCMiETtloV6g8m35sD/6WSvdUQjNsLJ45+rbRlh9dMuviSmlnaVeZo fu6wW9JB1A2tKpGekbPozpXweml5BIYZf/eTsNMpoyCv8h0XScEE+vLPuIoeUg== 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 4RrV8Q4SPBz18rh; Wed, 20 Sep 2023 20:13:10 +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 38KKDAp8068723; Wed, 20 Sep 2023 20:13:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KKDA3R068720; Wed, 20 Sep 2023 20:13:10 GMT (envelope-from git) Date: Wed, 20 Sep 2023 20:13:10 GMT Message-Id: <202309202013.38KKDA3R068720@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: e0acbd158ec9 - main - security/rhash: update to 1.4.4 and fix build with lld 17 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0acbd158ec92f50ecbf8932a57b9d7587564138 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0acbd158ec92f50ecbf8932a57b9d7587564138 commit e0acbd158ec92f50ecbf8932a57b9d7587564138 Author: Dimitry Andric AuthorDate: 2023-09-14 08:45:45 +0000 Commit: Dimitry Andric CommitDate: 2023-09-20 20:12:31 +0000 security/rhash: update to 1.4.4 and fix build with lld 17 With lld 17, which has become more strict about undefined symbols in version scripts, security/rhash fails to link its librhash.so: ld: error: version script assignment of 'global' to symbol 'rhash_wfile' failed: symbol not defined This has been fixed in https://github.com/rhash/RHash/commit/e4b8b92, which was included in rhash 1.4.4, so update the port to that version. Unfortunately this also requires a bunch of follow-up build fixes: * https://github.com/rhash/RHash/commit/c804982: fix assignment * https://github.com/rhash/RHash/commit/9ef90b9: build on *BSD * https://github.com/rhash/RHash/commit/b8c91ea: build on Unix PR: 273775 Approved by: danfe (maintainer) MFH: 2023Q3 --- security/rhash/Makefile | 7 ++++++- security/rhash/distinfo | 12 +++++++++--- security/rhash/pkg-plist | 3 ++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/security/rhash/Makefile b/security/rhash/Makefile index 0b598b7921a5..6c5e13d6f33f 100644 --- a/security/rhash/Makefile +++ b/security/rhash/Makefile @@ -1,9 +1,14 @@ PORTNAME= rhash -PORTVERSION= 1.4.3 +PORTVERSION= 1.4.4 CATEGORIES= security MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src +PATCH_SITES= https://github.com/rhash/RHash/commit/ +PATCHFILES+= c804982d1b24c6533118b3068d2cfdca685076f3.patch:-p1 +PATCHFILES+= 9ef90b958b7ae50aeeb5c269468034d73d6e2efe.patch:-p1 +PATCHFILES+= b8c91ea6551e99e10352386cd46ea26973bb4a4d.patch:-p1 + MAINTAINER= danfe@FreeBSD.org COMMENT= Utility and library for computing and checking of file hashes WWW= http://rhash.sourceforge.net/ diff --git a/security/rhash/distinfo b/security/rhash/distinfo index 391dc48921f4..e35781cc9017 100644 --- a/security/rhash/distinfo +++ b/security/rhash/distinfo @@ -1,3 +1,9 @@ -TIMESTAMP = 1655392419 -SHA256 (rhash-1.4.3-src.tar.gz) = 1e40fa66966306920f043866cbe8612f4b939b033ba5e2708c3f41be257c8a3e -SIZE (rhash-1.4.3-src.tar.gz) = 429290 +TIMESTAMP = 1694680883 +SHA256 (rhash-1.4.4-src.tar.gz) = 8e7d1a8ccac0143c8fe9b68ebac67d485df119ea17a613f4038cda52f84ef52a +SIZE (rhash-1.4.4-src.tar.gz) = 435691 +SHA256 (c804982d1b24c6533118b3068d2cfdca685076f3.patch) = 96c7070da5a1eb89a7f241db5198730117fa87a58014a6a49675237da09fc1cb +SIZE (c804982d1b24c6533118b3068d2cfdca685076f3.patch) = 834 +SHA256 (9ef90b958b7ae50aeeb5c269468034d73d6e2efe.patch) = ce8ac2e2b675340a9ad0fd6b49a1c1e537be97047f2840fde557b16b87e8588e +SIZE (9ef90b958b7ae50aeeb5c269468034d73d6e2efe.patch) = 2195 +SHA256 (b8c91ea6551e99e10352386cd46ea26973bb4a4d.patch) = b6df1f7f8648675fb8a1ce31ee1dd017519681c7c2d362a5f0fd7629b237b45d +SIZE (b8c91ea6551e99e10352386cd46ea26973bb4a4d.patch) = 834 diff --git a/security/rhash/pkg-plist b/security/rhash/pkg-plist index 28817970f4fe..0df03372730f 100644 --- a/security/rhash/pkg-plist +++ b/security/rhash/pkg-plist @@ -15,7 +15,8 @@ include/rhash.h include/rhash_torrent.h lib/librhash.a lib/librhash.so -lib/librhash.so.0 +lib/librhash.so.1 +lib/librhash.so.1.4.4 libdata/pkgconfig/librhash.pc man/man1/ed2k-link.1.gz man/man1/edonr256-hash.1.gz