From nobody Sat Jun 10 07:12:28 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 4QdTfj1XYqz4cHy9; Sat, 10 Jun 2023 07:12:29 +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 4QdTfh4Z9gz3rP3; Sat, 10 Jun 2023 07:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686381148; 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=sddQ5n88AyaAo+Scjcm/6+Ao2v0svr0QFxQu+yDbArw=; b=lwAkLyHb+5wm9GWhCD7hFqF5Kzd05Fa0Pyzasw/ACtM6Q6jLNqCj941bs1xhtXW4Gy5d5m gPGAx54Ur5X4QbGGUUAFAVpBhpZTqtB4Pjql24OOQ51OyRDqVf32UwVwej+EX5zhlDc1NU 7wHJPceTqCcn5tNKzuHhfBA2Wi0hxKCbVSmZs1MKB75zp6rpKBfvpR4pW+RBHjDWFbzUCc P7SrtFTgqilFraLC8R7Ywt2BCqiMxhUmVNnHKvnkvGiXmsrw7ZN+vcTfLtI1YvWB4xaztj HHwaItHskYfSv38t3fKdmwkzrR4X/EySncL8PivKIM57k0s/oZIRIgp2Dw7GUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686381148; 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=sddQ5n88AyaAo+Scjcm/6+Ao2v0svr0QFxQu+yDbArw=; b=CDdyoGsTiotcccdFfGfUvOMikeP5GtWXdVV8KMw2NsdQ9GuGUcnDggchCZ0rmfdIpFrfgF T8TZw2whUS5pvWwq32iiVey4UzKCirAaoLCA1C8gWnOULsl+atLE12pAwAPj+d/l4dPK7l pT0c4H1KgfccWRbqll927KGUKSLLGGUcW7Ie0X4OWR/S6WjD96/JcOPsacoEdvA75W25T+ X9DDxIvcvZs5DDWL/uJtf8aghR8QHYQtKnc1oX0FWzdI2QpmBY9SVgH9Wxypw9Ve2VhCWN gfDKihKafgmYjRoQX5o82m5eDc643Z89foa3hxNwDoq6yHXSKTpkquoSQutdGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686381148; a=rsa-sha256; cv=none; b=SVTaiLWfLH0rSxUjv06Stt94NMb2mxrWzB70DLceGvUTY8ryLvXDEJZ7aF+qhfDxR61ITM Ei3L8u0bkbYbozvd7JdsNgSEnTJgX801Yw7THfmsWGT5YPCSHu3tqR7ojhxqgvQCxhUowR nXRaMNiVlAAEQuYzjw6hI2ekcRVWCAFTFr/hC1+B9IIBysl7W8HSZm0CyQoW/uf3FsF9pK 6ef+Fd3iz+msVXtysM6aYGtiIavA1u7cUu2K2zxQIfesgaOPjH698j04EuyGosyQ5XuMi1 6M7CpH2I7+yGPui1liVJvD5z/r4/VzLz2KccgoqqMzvpjeujf7xhuv1ayd7o+g== 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 4QdTfh28LFz16wn; Sat, 10 Jun 2023 07:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35A7CSxi094036; Sat, 10 Jun 2023 07:12:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35A7CSEh094035; Sat, 10 Jun 2023 07:12:28 GMT (envelope-from git) Date: Sat, 10 Jun 2023 07:12:28 GMT Message-Id: <202306100712.35A7CSEh094035@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: cc5b590ab296 - main - security/archlinux-keyring: update to 20230504 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: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc5b590ab296644da3ad80c687227f7282be31f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc5b590ab296644da3ad80c687227f7282be31f2 commit cc5b590ab296644da3ad80c687227f7282be31f2 Author: Charlie Li AuthorDate: 2023-06-10 07:07:19 +0000 Commit: Charlie Li CommitDate: 2023-06-10 07:07:19 +0000 security/archlinux-keyring: update to 20230504 Now uses sequoia-sq to generate the keyring. Also run-depend on archlinux-pacman to initialise/populate/update the keyring on the target such that the official Arch Linux pacman repositories verify PGP signatures properly. Event: SouthEast LinuxFest 2023 --- security/archlinux-keyring/Makefile | 29 ++++++++++++++++++---- security/archlinux-keyring/distinfo | 6 ++--- .../files/archlinux-keyring.ucl.in | 29 ++++++++++++++++++++++ security/archlinux-keyring/files/patch-Makefile | 26 +++++++++++++++++++ 4 files changed, 82 insertions(+), 8 deletions(-) diff --git a/security/archlinux-keyring/Makefile b/security/archlinux-keyring/Makefile index 223b2066b3c1..061fa418ac7d 100644 --- a/security/archlinux-keyring/Makefile +++ b/security/archlinux-keyring/Makefile @@ -1,19 +1,38 @@ PORTNAME= archlinux-keyring -DISTVERSION= 20211028 +DISTVERSION= 20230504 CATEGORIES= security -MASTER_SITES= https://sources.archlinux.org/other/${PORTNAME}/ -MAINTAINER= vishwin@vishwin.info +MAINTAINER= vishwin@FreeBSD.org COMMENT= Arch Linux PGP keyring WWW= https://gitlab.archlinux.org/archlinux/archlinux-keyring/ -LICENSE= GPLv2+ +LICENSE= GPLv3+ + +BUILD_DEPENDS= sq:security/sequoia-sq \ + ginstall:sysutils/coreutils \ + bash:shells/bash +RUN_DEPENDS= bash:shells/bash \ + pacman-key:sysutils/pacman@archlinux + +USES= gmake pkgconfig python shebangfix trigger +SHEBANG_FILES= keyringctl wkd_sync +BINARY_ALIAS= install=ginstall + +USE_GITLAB= yes +GL_SITE= https://gitlab.archlinux.org +GL_ACCOUNT= archlinux +GL_COMMIT= f7749fd39c019922d504a43b7e94ceef6ae9e0ff -NO_BUILD= yes NO_ARCH= yes PLIST_FILES= share/pacman/keyrings/archlinux-revoked \ share/pacman/keyrings/archlinux-trusted \ share/pacman/keyrings/archlinux.gpg +post-patch: + @${REINPLACE_CMD} -e 's|/bin|$(PREFIX)/bin|' ${WRKSRC}/Makefile + +pre-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/pacman/keyrings + .include diff --git a/security/archlinux-keyring/distinfo b/security/archlinux-keyring/distinfo index 3249d47e2277..ea86297a5d2d 100644 --- a/security/archlinux-keyring/distinfo +++ b/security/archlinux-keyring/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640127917 -SHA256 (archlinux-keyring-20211028.tar.gz) = 3d7fba47441173dfab6eec1cebf9fce4151277f6e06513e2150ccd9d71691cbc -SIZE (archlinux-keyring-20211028.tar.gz) = 1041081 +TIMESTAMP = 1685311318 +SHA256 (archlinux-archlinux-keyring-f7749fd39c019922d504a43b7e94ceef6ae9e0ff_GL0.tar.gz) = 292b16790c66f858a475862656bd1e9a1d6b474e0d2178dd86a8863186f0c165 +SIZE (archlinux-archlinux-keyring-f7749fd39c019922d504a43b7e94ceef6ae9e0ff_GL0.tar.gz) = 1566790 diff --git a/security/archlinux-keyring/files/archlinux-keyring.ucl.in b/security/archlinux-keyring/files/archlinux-keyring.ucl.in new file mode 100644 index 000000000000..ce622abb06c5 --- /dev/null +++ b/security/archlinux-keyring/files/archlinux-keyring.ucl.in @@ -0,0 +1,29 @@ +path_glob: %%LOCALBASE%%/share/pacman/keyrings +cleanup: { + type: lua + sandbox: false + script: <