From nobody Sat Jul 06 22:51:03 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 4WGlwl4lVpz5Pf7f; Sat, 06 Jul 2024 22:51:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WGlwl4KdGz4S02; Sat, 6 Jul 2024 22:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720306263; 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=Am2gh5w2y8Zs4BCTH0nSLEdvdpd2nbF5+8/t5CPVYbY=; b=i1w5BeHiXbf1+swgagzDT8hHOftatTVvkMLSDuNLBKR7+5478lpKmN0r2Fkdc1VG3exbaU bWEF6onH+EDrLs6YbsnkihvRzuDa/p3EirG7KbmKDARn0vLftxcFMjv5pSgPhTjjT7I5Vx VLbsMP+y/UjyK9Ma8UXC+JqHbi4nIfzgp4rxTe5H9bulKXM8gYeAHZoZr1YOeS/BKy/jTU kp6QL23g+GmMfKbPiBbFnaOvTMT5qeGfrR3dkETuozsTC3s+MuJwDj0RVTLaNJuVi9S0Fj ZsIpK+JQgRiIL8o9D+5FEVUTHqg6O4gM9IYMntvaZQ/4aWI3QxrZ8c4CrTzEOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720306263; a=rsa-sha256; cv=none; b=iHG2jhxwii6fpVt79PV8ovQ+9Upv2P3tCPGf0pl3F/bQiI2bgZlhAvxVyYH77nGNaBE4Qs ZUNwuuucMc7MiKI/qKBdxLf0/LihqGUWuYEAlvql6O+mQ5GrYOnIZvbv2TeVK3SaDzpsnZ hdKvvL6/HlP+2gLsP4zyVrXYx8y93p/dOLIRLjexK+Dmx80NNFKrXjcg2+nC+w0R/cEAEB jaE8tapvIugXVi5ynEyj2ORYK6EGeONOJ6PXU+xcsdcPKaEI3xfCu3lZZrAM/w/vwwlxXn uVbfSU0CiUtti6JqnLPE9Ore82RhF5eLHWCGSS+kVzs2tmsnhe6oqlX2sHjymQ== 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=1720306263; 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=Am2gh5w2y8Zs4BCTH0nSLEdvdpd2nbF5+8/t5CPVYbY=; b=GUh+7xuHpCB8DWt7DL0re3DzPCgvjwiru/dswXD3BRIj7iUysIi83cQR2TbGWonG49WT/z a8pDIXqBmY0EgBPVcLylcSRPOx9+f1Ql17r6nXrtPXqsPvIwCz6aELN/jCFuZuVHwdRciI Cr8Vv2ufL6lfI8rGFp2eT46mC4KWPYDg9grPEylESzv4o0yAI7Agh7FdcL59NheEloXMSJ f9fr9GDFhKHdUiSlrVDLsAA9rQAlGk9rBpdGGwrTa+1n9uzNJg0SqrvwRTnnHn9rI0wvbs T9YnsQYh+7LHtKKoofXSkgpOX2paGn5DM4KBWRDHgZ7UDjz4FxkW9Rw42oHI/Q== 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 4WGlwl3xppzyn5; Sat, 6 Jul 2024 22:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 466Mp36f043141; Sat, 6 Jul 2024 22:51:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 466Mp38q043138; Sat, 6 Jul 2024 22:51:03 GMT (envelope-from git) Date: Sat, 6 Jul 2024 22:51:03 GMT Message-Id: <202407062251.466Mp38q043138@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 4ecceca208a6 - main - security/rustls-ffi: Allow dynamic linking 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ecceca208a6ab9fcf5d73ce47c0e243e55ddafe Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ecceca208a6ab9fcf5d73ce47c0e243e55ddafe commit 4ecceca208a6ab9fcf5d73ce47c0e243e55ddafe Author: Bernard Spil AuthorDate: 2024-07-06 22:47:44 +0000 Commit: Bernard Spil CommitDate: 2024-07-06 22:47:44 +0000 security/rustls-ffi: Allow dynamic linking Obtained from: https://projects.pyret.net/files/freebsd-patches/rustls-ffi-v2.patch Reported by: diizzy --- security/rustls-ffi/Makefile | 19 ++++++++++------ security/rustls-ffi/patch | 53 +++++++++++++++++++++++++++++++++++++++++++ security/rustls-ffi/pkg-plist | 5 ++++ 3 files changed, 70 insertions(+), 7 deletions(-) diff --git a/security/rustls-ffi/Makefile b/security/rustls-ffi/Makefile index cd09e6272781..4ea9c2641a92 100644 --- a/security/rustls-ffi/Makefile +++ b/security/rustls-ffi/Makefile @@ -1,6 +1,7 @@ PORTNAME= rustls-ffi -PORTVERSION= 0.13.0 DISTVERSIONPREFIX= v +DISTVERSION= 0.13.0 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= brnrd@FreeBSD.org @@ -13,18 +14,22 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_ISCL= ${WRKSRC}/LICENSE-ISC LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT -USES= cargo gmake +BUILD_DEPENDS= cargo-cbuild:devel/cargo-c + +USES= cargo +USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= rustls -PLIST_FILES= include/rustls.h \ - lib/librustls.a - do-build: - ${MAKE_CMD} -C ${WRKSRC} + @${CARGO_CARGO_RUN} cbuild --verbose --verbose ${CARGO_BUILD_ARGS} do-install: - ${MAKE_CMD} -C ${WRKSRC} DESTDIR=${STAGEDIR}/${PREFIX} install + @${CARGO_CARGO_RUN} cinstall --verbose --verbose \ + --destdir "${STAGEDIR}" \ + --prefix "${PREFIX}" \ + ${CARGO_INSTALL_ARGS} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so .include diff --git a/security/rustls-ffi/patch b/security/rustls-ffi/patch new file mode 100644 index 000000000000..c97b74715006 --- /dev/null +++ b/security/rustls-ffi/patch @@ -0,0 +1,53 @@ +diff --git a/security/rustls-ffi/Makefile b/security/rustls-ffi/Makefile +index cd09e6272781..4ea9c2641a92 100644 +--- a/security/rustls-ffi/Makefile ++++ b/security/rustls-ffi/Makefile +@@ -1,6 +1,7 @@ + PORTNAME= rustls-ffi +-PORTVERSION= 0.13.0 + DISTVERSIONPREFIX= v ++DISTVERSION= 0.13.0 ++PORTREVISION= 1 + CATEGORIES= security + + MAINTAINER= brnrd@FreeBSD.org +@@ -13,18 +14,22 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE + LICENSE_FILE_ISCL= ${WRKSRC}/LICENSE-ISC + LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT + +-USES= cargo gmake ++BUILD_DEPENDS= cargo-cbuild:devel/cargo-c ++ ++USES= cargo ++USE_LDCONFIG= yes + + USE_GITHUB= yes + GH_ACCOUNT= rustls + +-PLIST_FILES= include/rustls.h \ +- lib/librustls.a +- + do-build: +- ${MAKE_CMD} -C ${WRKSRC} ++ @${CARGO_CARGO_RUN} cbuild --verbose --verbose ${CARGO_BUILD_ARGS} + + do-install: +- ${MAKE_CMD} -C ${WRKSRC} DESTDIR=${STAGEDIR}/${PREFIX} install ++ @${CARGO_CARGO_RUN} cinstall --verbose --verbose \ ++ --destdir "${STAGEDIR}" \ ++ --prefix "${PREFIX}" \ ++ ${CARGO_INSTALL_ARGS} ++ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + + .include +diff --git a/security/rustls-ffi/pkg-plist b/security/rustls-ffi/pkg-plist +new file mode 100644 +index 000000000000..84d04e86784b +--- /dev/null ++++ b/security/rustls-ffi/pkg-plist +@@ -0,0 +1,5 @@ ++include/rustls.h ++lib/librustls.a ++lib/librustls.so ++lib/librustls.so.0.13.0 ++libdata/pkgconfig/rustls.pc diff --git a/security/rustls-ffi/pkg-plist b/security/rustls-ffi/pkg-plist new file mode 100644 index 000000000000..84d04e86784b --- /dev/null +++ b/security/rustls-ffi/pkg-plist @@ -0,0 +1,5 @@ +include/rustls.h +lib/librustls.a +lib/librustls.so +lib/librustls.so.0.13.0 +libdata/pkgconfig/rustls.pc