From nobody Sun Jan 21 03:32:23 2024 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 4THf6w1Qb7z588hq; Sun, 21 Jan 2024 03:32:24 +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 4THf6v4w3Rz4QgK; Sun, 21 Jan 2024 03:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705807943; 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=yDbEmfnrbtoy2WHLV9VfvPIerLJ0DG/Ivpn5QjY0n24=; b=lyrd3ItTKgms5PEOWWQIG9sSXu49yVXdXk2qikdIYRuBrZ30fdBA08ARYrp9Q3iAKP5hlo A5Qb+gX1fdQeJZ9g7/RmcvcVmmFGSDm+VuORFbYGU5/BIWC4fx2CFqv/7EoxpQCSjeZyMr aT/tizTlM+LG/ds+5o/VfNtvxrztKD5SfgoRyZ7mOq8XpV21CdgMKn6nPUaOcqZocUhTHB dJKbJ4BG96Ho/k9/kCowin545OQfH6OuUAxBeCRaynC1IdMOSTrlOs066iJ8EP7fecsFuX ZSNl5/fzoYLLdizi/iFGtWmrltKv9ZNqKFAecmUpPMgF36RiuONi1qDMqnhNLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705807943; 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=yDbEmfnrbtoy2WHLV9VfvPIerLJ0DG/Ivpn5QjY0n24=; b=S9hLxSpm2fP/ojbee5BmCKrOHlaMYUsUX2U+sO2gXGZLmRd2UpoN3cZStAHDcjxuAszr48 8MTjJbTBiDux7S2cD1hH8DcSkXnWYWXlbJSkFHoyh0LyLVuia3hhff4o2wWWgeWxsJy5D1 HYFsxwsLtyiBY2EeBOSn5WOURugRJ5rYd028J8a3WxVxCE4EsJVarvbp1hUeBm9l3DfNzy y3Eqc5+3QQJu0g95MDXBz7/Xi3IrxGkvuoh/z7jiusOrwiXWvLwCjjYMiVp4xI+HoIq/af krtc9X1X4GKTWi3LkQuVsVENYinoJZkzsQm/LAqFvYMYaJnijuofhSI9KCtfqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705807943; a=rsa-sha256; cv=none; b=cbkE3UI2+UZUyQg8lueWAW/9GFm7EGbG/isdAJzZclosqj1bFJ2R/DDjwfhrzdFpZ0BB4s r5cWPVROzRnEGPOzZUJ82wAmETJhk0fz/Vfne+XIloEaYZDgESnzZJ4Bq2DOOskWIIS4va 2ZR54e5RReA53UhsUYTzn5T0BHcudn7L2GoIz5bbQrYiOxizMktu8RWWzfEv/uhgn8vRQU lTGgYcigSlOielByBJGh5ADr0ZbZ8RhEd9b6Xibj6BC9jY/nVqr8TJ6QnhDMxYCSt3fBvg pWDOty1nIhrW+qrqYnLhNC4gizQb1Vebfax6gUGLckpc+2+GRPMdLUg+cVc0oA== 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 4THf6v41PDz12ZZ; Sun, 21 Jan 2024 03:32:23 +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 40L3WN3e063659; Sun, 21 Jan 2024 03:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40L3WNwo063656; Sun, 21 Jan 2024 03:32:23 GMT (envelope-from git) Date: Sun, 21 Jan 2024 03:32:23 GMT Message-Id: <202401210332.40L3WNwo063656@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 21c2ec4b2c84 - 2024Q1 - security/libxcrypt: Unbreak on 15 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 21c2ec4b2c84068ccacc01b0d729b44064f95026 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=21c2ec4b2c84068ccacc01b0d729b44064f95026 commit 21c2ec4b2c84068ccacc01b0d729b44064f95026 Author: Yuri Victorovich AuthorDate: 2024-01-21 03:30:51 +0000 Commit: Yuri Victorovich CommitDate: 2024-01-21 03:32:18 +0000 security/libxcrypt: Unbreak on 15 The project uses the *.map file with symbols that don't exist. This was a warning on 14 and earlier systems, but it is an error on 15. Reported by: fallout (cherry picked from commit e787af0475b21b961316a7fb5c61f75e8a1e031b) --- security/libxcrypt/Makefile | 3 ++- security/libxcrypt/files/patch-Makefile.am | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/security/libxcrypt/Makefile b/security/libxcrypt/Makefile index f7703c108e1b..6bb8ff9e9cfe 100644 --- a/security/libxcrypt/Makefile +++ b/security/libxcrypt/Makefile @@ -1,6 +1,7 @@ PORTNAME= libxcrypt DISTVERSIONPREFIX= v DISTVERSION= 4.4.36 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= yuri@FreeBSD.org @@ -9,7 +10,7 @@ WWW= https://github.com/besser82/libxcrypt LICENSE= LGPL21 -USES= autoreconf gmake libtool +USES= autoreconf gmake libtool pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes diff --git a/security/libxcrypt/files/patch-Makefile.am b/security/libxcrypt/files/patch-Makefile.am new file mode 100644 index 000000000000..a68a0d9d1aa6 --- /dev/null +++ b/security/libxcrypt/files/patch-Makefile.am @@ -0,0 +1,22 @@ +- workaround for symbol map containing missing symbols, see https://github.com/besser82/libxcrypt/issues/181 + +--- Makefile.am.orig 2024-01-21 03:27:38 UTC ++++ Makefile.am +@@ -154,12 +154,12 @@ libcrypt_la_LDFLAGS = -version-info $(libcrypt_la_VERS + + libcrypt_la_LDFLAGS = -version-info $(libcrypt_la_VERSION) + +-if HAVE_VSCRIPT +-libcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map +-APPLY_SYMVERS = yes +-else ++#if HAVE_VSCRIPT ++#libcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map ++#APPLY_SYMVERS = yes ++#else + APPLY_SYMVERS = no +-endif ++#endif + + libcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG) $(AM_LDFLAGS) +