From nobody Sun Dec 31 11:31:41 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 4T2xlf1M5Bz55YFg; Sun, 31 Dec 2023 11:31:42 +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 4T2xlf0sC6z3X5k; Sun, 31 Dec 2023 11:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704022302; 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=YJZhrBQa34eVBR5XDjMmPlvvjUuI/zD1t8Qn67ln51I=; b=bO6XNEN+2OlgJyZbY04mehavz/GpAHuh5654TGyON+0PU3kqcLLKCDWJzQrooazLM3WI74 B9N/tkBIBUzKtk6Gp0q0O4nMfdEzWznviQAo2fQxA1QgPqpaDsEYFB0MN6sPdeHX3S4rJe zpyb4DRtdPK4lojTYGtcetXMU+Q8+urB8G23OSGhozRFZpOFrx3HtZri7wJ5ZFH/S9nL33 Da3BM7JT0Fj2BDG1FVDeLw9dgtO2O3TBXtL2hduHfj0tSzGH3xppYGeHBo7sLLzjBjiI/a wwvBov6XmaNIRIqLqWx9qzAyjGVieqsWxI61lZRfrb2N7v28+hLbN4ep58uc/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704022302; a=rsa-sha256; cv=none; b=dxPlR0fMbtUCbK3AVVdtE8jki8mzocrBDpCHmSxzJd1UD/YfZonJbT+CR9LFa2BG+OgnIE RQ91KGGgZt/NgNQcembpbJroZMQufmXQIlQNanyxct2hCgsIdObulZCh9ghlnK5Y1nP/NV n6UPixqSDVykcjv3E13wdKvt/GiTqk+j2T5AsNr4eUXiwuvYWdKfn4VD95t/3Ls1+d8Ze2 T8wXpw9Znkz03WGuVg2R+x5V+lGa2Op+w/wbLFFNSTvNXcOA44T15MY1LDeCJTgYm0R4en lheOdsaqSGnLtm5J7JPJtZDvJ5CZUGnbqqfgIoh6TAilzo1qYHSpl2eDFuVolQ== 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=1704022302; 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=YJZhrBQa34eVBR5XDjMmPlvvjUuI/zD1t8Qn67ln51I=; b=uTRSg8Ui0RXcHDXKnKyu3SRLIYDxX3mNC/5KsDz84dX65l9lhcQe8aqoGYa2kVxivmW4f6 myA2nrJ8n/EBPQ3Q5r0uIuH7Vuc3CZwN7x4qGUzWu9kxh0/tUghRjPFclMLDO5X38sw3xM lk8WNuZs9PV2xIiT0qSNshY9OtGSEZdqIKcHhb2cYAqWf7gSkhbSovoYvI5ttVgBqlMa7+ 4J6vcCkvXBI0OY45Mi8lI0GCF+V0sLE4iMQkJUrmW598G+Ht7L2HI2l9ouE27xxhENhbAa 6a8hpc5RykiUH+ibRKKWxokFjaTcZ3CsJxDGpSvPINP7Jvb9GTGuFSbvpcJxcA== 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 4T2xld74HyzXlK; Sun, 31 Dec 2023 11:31:41 +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 3BVBVfss051054; Sun, 31 Dec 2023 11:31:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BVBVfN1051051; Sun, 31 Dec 2023 11:31:41 GMT (envelope-from git) Date: Sun, 31 Dec 2023 11:31:41 GMT Message-Id: <202312311131.3BVBVfN1051051@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 3d6a5f7cb0c4 - main - security/stoken: unbreak build with LLVM >= 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d6a5f7cb0c444e93af61a57e2b2f3379f10e938 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d6a5f7cb0c444e93af61a57e2b2f3379f10e938 commit 3d6a5f7cb0c444e93af61a57e2b2f3379f10e938 Author: Dima Panov AuthorDate: 2023-12-31 11:26:25 +0000 Commit: Dima Panov CommitDate: 2023-12-31 11:26:25 +0000 security/stoken: unbreak build with LLVM >= 17 (+) FreeBSD already have strcasestr() and mkstemps() functions and compat stubs are always skipped so declare local functions in map file is false positive. LLVM >= 17 is more restrictive with declared but missed functions which lead to linker error. Drop local stubs stoken__strcasestr() and stoken__mkstemps() from library map file to unbreak. Reported by: poudriere failure Approved by: portmgr blanket (trivial build fix) --- security/stoken/Makefile | 2 +- security/stoken/files/patch-libstoken.map | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/security/stoken/Makefile b/security/stoken/Makefile index d23f5739f4c9..960b878441fa 100644 --- a/security/stoken/Makefile +++ b/security/stoken/Makefile @@ -1,6 +1,6 @@ PORTNAME= stoken DISTVERSION= 0.93 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= samm@FreeBSD.org diff --git a/security/stoken/files/patch-libstoken.map b/security/stoken/files/patch-libstoken.map new file mode 100644 index 000000000000..f8026b48156b --- /dev/null +++ b/security/stoken/files/patch-libstoken.map @@ -0,0 +1,11 @@ +--- libstoken.map.orig 2023-03-09 18:40:27 UTC ++++ libstoken.map +@@ -58,8 +58,6 @@ global: + __stoken_read_rcfile; + __stoken_write_rcfile; + __stoken_zap_rcfile_data; +- stoken__strcasestr; +- stoken__mkstemps; + /* NOTE: this can break non-GNU toolchains */ + Java_*; + local: