From nobody Wed Jan 5 14:46:49 2022 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 3EA7F193BAAE; Wed, 5 Jan 2022 14:46:50 +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 4JTXPP73pkz3vWZ; Wed, 5 Jan 2022 14:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D27756425; Wed, 5 Jan 2022 14:46:49 +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 205EknZO081989; Wed, 5 Jan 2022 14:46:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205Ekn8J081988; Wed, 5 Jan 2022 14:46:49 GMT (envelope-from git) Date: Wed, 5 Jan 2022 14:46:49 GMT Message-Id: <202201051446.205Ekn8J081988@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: b71b26b5bb4d - 2022Q1 - net/routinator: Update to 0.10.2 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: b71b26b5bb4dabc3144cf3ad9af95ecacfbe2d6e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641394010; 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=X8OPLQDeGGjhX+uV0BcbPi4ftfs1/yihid93U9VPVzo=; b=LfAImCem145BqbCwOIKv9O5mksD/z08/4JiH7OQzJo943JseEsVevamR4fg6ro5iWHkcam oWcUwl+3uoYOMA6azzIfqhF5BD4Ceo07tUeTDcLL2VJ2ai8/2jwwUZpPBo7CKQO3VRH9CR 3jZ+zMsGhgWdZbfVZZmdYAGMo7l+yNh9Bj9Oc0EXOKMY1xWjeMeK8iMTq/S7bjyeATqDXy P9kn7e84FmyoYtQ2MNf3suBzikCV7mHFWVDEQweiHcXrGZSSwzVZoVEoyJHH0saT94hjjH /ANkaB4wf4aEjiUKsuMnVUS8B+SvtuxtMmKnXu4jptBgtAjri16iIeX64PPjDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641394010; a=rsa-sha256; cv=none; b=True1VC5fapNyswPxZLKtZ9jP2+krAkVUxibi9nAt9WTmck56OPFxv8XIAPIjLB0307cwi if2jkD+rXuopGuLVKm3k6BnY2iKvQGk7Ux3QjgUuLU0lccvg9TNUFy/zBoDAvjpKLYmKoK jdeR7cZjhTbmS3kSTt1vq2170958zzMw7/XN9YWX9ZjNXtLeEIOkTIPGY17HhfnzugE1mN xMERMETiFhYhrJv0sDLZuDfzhYsck/R8Alwu92WUgEPVVC7k4lk/Th24H/9+AVbP44+zW/ B0GCAXKFU6X9NtJ8Am5kIDB4xLjpGJCBELXnH9xvFL/caf0QkJn27gkWg0MbUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=b71b26b5bb4dabc3144cf3ad9af95ecacfbe2d6e commit b71b26b5bb4dabc3144cf3ad9af95ecacfbe2d6e Author: Jaap Akkerhuis AuthorDate: 2022-01-04 11:57:18 +0000 Commit: Fernando Apesteguía CommitDate: 2022-01-05 14:45:11 +0000 net/routinator: Update to 0.10.2 ChangeLog: https://www.nlnetlabs.nl/news/2021/Nov/09/routinator-0.10.2-released/ This version updates several vulnerabilities. * vuxml entry to follow * Remove stale comment PR: 260908 Reported by: jaap@NLnetLabs.nl (maintainer) MFH: 2022Q1 (cherry picked from commit 5217a52cf745c410eeb160c43c3ea66e6335debc) --- net/routinator/Makefile | 22 ++++++++++++++++------ net/routinator/distinfo | 18 +++++++++++++----- ...patch-cargo-crates_routinator-ui-0.3.4_build.rs | 11 +++++++++++ net/routinator/files/routinator.in | 13 +++++++------ 4 files changed, 47 insertions(+), 17 deletions(-) diff --git a/net/routinator/Makefile b/net/routinator/Makefile index f4f70ff173f7..6e39a60e0a06 100644 --- a/net/routinator/Makefile +++ b/net/routinator/Makefile @@ -1,8 +1,9 @@ PORTNAME= routinator DISTVERSIONPREFIX= v -DISTVERSION= 0.10.0 -PORTREVISION= 4 +DISTVERSION= 0.10.2 CATEGORIES= net +MASTER_SITES= ${ROUTINATOR_UI_URL}/v${ROUTINATOR_UI_VERSION}/:0 +DISTFILES+= routinator-ui-build.tar.gz:0 MAINTAINER= jaap@NLnetLabs.nl COMMENT= RPKI signed route collector and validator @@ -22,8 +23,6 @@ CPE_VENDOR= nlnetlabs USE_RC_SUBR= routinator -# PORTDOCS= openxapi krill.conf - SUB_FILES= pkg-message SUB_LIST+= GROUPS=${GROUPS} \ USERS=${USERS} @@ -31,13 +30,15 @@ SUB_LIST+= GROUPS=${GROUPS} \ USERS= ${PORTNAME} GROUPS= ${PORTNAME} +ROUTINATOR_UI_VERSION= 0.3.4 +ROUTINATOR_UI_URL= https://github.com/NLnetLabs/routinator-ui/releases/download/ + OPTIONS_SUB= yes CARGO_CRATES= addr2line-0.15.2 \ adler-1.0.2 \ ansi_term-0.11.0 \ arc-swap-1.3.0 \ - async-compression-0.3.8 \ atty-0.2.14 \ autocfg-1.0.1 \ backtrace-0.3.60 \ @@ -61,6 +62,7 @@ CARGO_CRATES= addr2line-0.15.2 \ encoding_rs-0.8.28 \ error-chain-0.12.4 \ fern-0.6.0 \ + filetime-0.2.14 \ flate2-1.0.20 \ fnv-1.0.7 \ foreign-types-0.3.2 \ @@ -133,6 +135,7 @@ CARGO_CRATES= addr2line-0.15.2 \ remove_dir_all-0.5.3 \ reqwest-0.11.4 \ ring-0.16.20 \ + routinator-ui-0.3.4 \ rpki-0.12.2 \ rustc-demangle-0.1.20 \ rustc_version-0.4.0 \ @@ -155,6 +158,7 @@ CARGO_CRATES= addr2line-0.15.2 \ strsim-0.8.0 \ syn-1.0.74 \ syslog-5.0.0 \ + tar-0.4.35 \ tempfile-3.2.0 \ term_size-0.3.2 \ textwrap-0.11.0 \ @@ -199,7 +203,13 @@ CARGO_CRATES= addr2line-0.15.2 \ winapi-0.3.9 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ - winreg-0.7.0 + winreg-0.7.0 \ + xattr-0.2.2 + +post-patch: + ${REINPLACE_CMD} \ + -e "s|DISTDIR|${DISTDIR}|" \ + ${WRKSRC}/cargo-crates/routinator-ui-${ROUTINATOR_UI_VERSION}/build.rs post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/routinator diff --git a/net/routinator/distinfo b/net/routinator/distinfo index 96a16666c9eb..76ebfb09667a 100644 --- a/net/routinator/distinfo +++ b/net/routinator/distinfo @@ -1,4 +1,6 @@ -TIMESTAMP = 1629811075 +TIMESTAMP = 1640881719 +SHA256 (routinator-ui-build.tar.gz) = 7079096b3fd986aa01b03cf3e743cf74d37b8441d312844c25e2b065deed8290 +SIZE (routinator-ui-build.tar.gz) = 756828 SHA256 (rust/crates/addr2line-0.15.2.crate) = e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a SIZE (rust/crates/addr2line-0.15.2.crate) = 32966 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe @@ -7,8 +9,6 @@ SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383 SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087 SHA256 (rust/crates/arc-swap-1.3.0.crate) = e906254e445520903e7fc9da4f709886c84ae4bc4ddaf0e093188d66df4dc820 SIZE (rust/crates/arc-swap-1.3.0.crate) = 63680 -SHA256 (rust/crates/async-compression-0.3.8.crate) = 5443ccbb270374a2b1055fc72da40e1f237809cd6bb0e97e66d264cd138473a6 -SIZE (rust/crates/async-compression-0.3.8.crate) = 57977 SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 SIZE (rust/crates/atty-0.2.14.crate) = 5470 SHA256 (rust/crates/autocfg-1.0.1.crate) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a @@ -55,6 +55,8 @@ SHA256 (rust/crates/error-chain-0.12.4.crate) = 2d2f06b9cac1506ece98fe3231e3cc9c SIZE (rust/crates/error-chain-0.12.4.crate) = 29274 SHA256 (rust/crates/fern-0.6.0.crate) = 8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065 SIZE (rust/crates/fern-0.6.0.crate) = 299856 +SHA256 (rust/crates/filetime-0.2.14.crate) = 1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8 +SIZE (rust/crates/filetime-0.2.14.crate) = 14358 SHA256 (rust/crates/flate2-1.0.20.crate) = cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0 SIZE (rust/crates/flate2-1.0.20.crate) = 74036 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1 @@ -199,6 +201,8 @@ SHA256 (rust/crates/reqwest-0.11.4.crate) = 246e9f61b9bb77df069a947682be06e31ac4 SIZE (rust/crates/reqwest-0.11.4.crate) = 132776 SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc SIZE (rust/crates/ring-0.16.20.crate) = 5082615 +SHA256 (rust/crates/routinator-ui-0.3.4.crate) = f2b93eb434f0d58c19ab098008bda682fc2e8f2918f3b6f64dcb8c34c3fc8fba +SIZE (rust/crates/routinator-ui-0.3.4.crate) = 12050 SHA256 (rust/crates/rpki-0.12.2.crate) = 718f0d99ad56874728162d2f082e43c2cb378ab62b87202cdf806b9fd13b2d0a SIZE (rust/crates/rpki-0.12.2.crate) = 499131 SHA256 (rust/crates/rustc-demangle-0.1.20.crate) = dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49 @@ -243,6 +247,8 @@ SHA256 (rust/crates/syn-1.0.74.crate) = 1873d832550d4588c3dbc20f01361ab00bfe7410 SIZE (rust/crates/syn-1.0.74.crate) = 232974 SHA256 (rust/crates/syslog-5.0.0.crate) = 9a5d8ef1b679c07976f3ee336a436453760c470f54b5e7237556728b8589515d SIZE (rust/crates/syslog-5.0.0.crate) = 9014 +SHA256 (rust/crates/tar-0.4.35.crate) = 7d779dc6aeff029314570f666ec83f19df7280bb36ef338442cfa8c604021b80 +SIZE (rust/crates/tar-0.4.35.crate) = 46219 SHA256 (rust/crates/tempfile-3.2.0.crate) = dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22 SIZE (rust/crates/tempfile-3.2.0.crate) = 25892 SHA256 (rust/crates/term_size-0.3.2.crate) = 1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9 @@ -333,5 +339,7 @@ SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 SHA256 (rust/crates/winreg-0.7.0.crate) = 0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69 SIZE (rust/crates/winreg-0.7.0.crate) = 21225 -SHA256 (NLnetLabs-routinator-v0.10.0_GH0.tar.gz) = 31dbedfbf70a47821ddd9e185c1fc37269d9c15b503c073b6319f0a3b1cc5cb4 -SIZE (NLnetLabs-routinator-v0.10.0_GH0.tar.gz) = 2439942 +SHA256 (rust/crates/xattr-0.2.2.crate) = 244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c +SIZE (rust/crates/xattr-0.2.2.crate) = 11750 +SHA256 (NLnetLabs-routinator-v0.10.2_GH0.tar.gz) = b85e03447eaffc3ec0df78eeeb5ad87aaaeabc0974d87ea5d516e04c3e1bbbb3 +SIZE (NLnetLabs-routinator-v0.10.2_GH0.tar.gz) = 206629 diff --git a/net/routinator/files/patch-cargo-crates_routinator-ui-0.3.4_build.rs b/net/routinator/files/patch-cargo-crates_routinator-ui-0.3.4_build.rs new file mode 100644 index 000000000000..5d1278067c48 --- /dev/null +++ b/net/routinator/files/patch-cargo-crates_routinator-ui-0.3.4_build.rs @@ -0,0 +1,11 @@ +--- cargo-crates/routinator-ui-0.3.4/build.rs.orig 2021-11-10 10:32:39 UTC ++++ cargo-crates/routinator-ui-0.3.4/build.rs +@@ -110,6 +110,8 @@ impl Assets { + } + + fn _download_ui_release_build() -> Result, reqwest::Error> { ++ let fname = format!("{}/routinator-ui-build.tar.gz", "DISTDIR"); ++ return Ok(std::fs::read(&fname).expect("could not read routinator ui file")); + let version = env!("CARGO_PKG_VERSION"); + let mut headers = header::HeaderMap::new(); + diff --git a/net/routinator/files/routinator.in b/net/routinator/files/routinator.in index 05175e223a85..11378a223f24 100644 --- a/net/routinator/files/routinator.in +++ b/net/routinator/files/routinator.in @@ -7,23 +7,24 @@ . /etc/rc.subr -name=routinator desc="RPKI signed route collector and validator" +name=routinator rcvar=routinator_enable -start_precmd=check_init -command="%%PREFIX%%/bin/${name}" load_rc_config ${name} -: ${name_enable=:"NO"} -: ${wrkdir:="/var/routinator"} +: ${name_enable:=NO} +: ${wrkdir:=/var/routinator} pidfile=${wrkdir}/${name}.pid routinator_config=${routinator_conf:-"%%ETCDIR%%/routinator.conf"} required_file=${routinator_config} +start_precmd=check_init +command="%%PREFIX%%/bin/${name}" command_args="-c ${routinator_config} --rsync-command=%%PREFIX%%/bin/rsync server -d --user %%USERS%% --group %%GROUPS%% --pid-file=${pidfile} --working-dir=${wrkdir}" -check_init() { +check_init() +{ if [ ! -d ${wrkdir}/tals ]; then echo echo -n "Need to initialize routinator with tals, "