From nobody Sat Mar 11 08:39:23 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 4PYbtz69jKz3xNGN; Sat, 11 Mar 2023 08:39:23 +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 4PYbtz5WnPz416S; Sat, 11 Mar 2023 08:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678523963; 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=p4ZGVEAbGzCys3zRzxTLXOlvLMYMzbGNlfKWq39/NJk=; b=CBhZ6g+xUswgYeMC0ueNbBOVGxVeyqJXQ8OZTlaDSkK5rrETt20Vflm0PoZ6Z04QGnQoRr awKNkgiFUcRkjFV2jT3FtTqJ4EJpLLj8gtLyVblQIhrJusR60BLhDt1GnlLvghcr+DKWDA Ki6KuoiZKXHwhf8rcg+/gvPRp4bvGFnR7KnyaRNn2aXEs9e/f/UeYjiaZOrkz5w2bN6Gi9 C9KRyp1v4jbj2Z52uDcQvVtN769fVc17yKohxNKPypZSFnGLQ9rJbCifstltTUVIZKmEYX 5qVkyvXO4BKHZoJJuloGi8cKYO0CtevqbEvRd9gtz3RmlAacKcpzmtxJBRyVcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678523963; 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=p4ZGVEAbGzCys3zRzxTLXOlvLMYMzbGNlfKWq39/NJk=; b=LP+OrD4EwanKXaVS89nnsU+tvsuuudu0feguP3tzN8dKSgAGAXNrhZJ+aFQ36Gov/+ig65 6E1TtPwktfyF4orQncdF26XRNcfHccoZCy24pJOxTmdH2iJoKuQfWWS9AN+Tvjx/9OWfLt faYerMvs3n7CAI7tbtig4d8BqYg61o1NokNawLewTg/fbAwkQamebuiOtCwk8vvNaHsKm0 as1EW094k/ks52csG29BOXG3GMLHf5DYoloPz29Mnq3Pf+U5X/lCJUgXnhL8c104GBGv8/ gdbXo0hYbWGZZk8gXE10Ci/tv1R2HZcfssEDkrXb3ousMUVmmuuT8z8IC0xAuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678523963; a=rsa-sha256; cv=none; b=BW9PqDvfOMCqCdYULdia5udw1d0EzjT282eA5dD3JRRJNV2vs+c7nISmJCi2xqOQHsTWDq Pihsmf8lYBwb6wtCwpm1362t15fkFtEFQZAU+SrwPljdzySq+kuQxmR5G6Ih+QclQrRORY kjGJYYsHG1TLyz+SLjwSf9YZ8LQ4IQsWZLYJedMYcOvwEHwFwRqeTY54XoHHUUudS3BosM DLZyPgPq2l0mkX4XRHqqLZe9nrbMbYlWyaStF0TyFXQiqIbOxFsNe3Il8gKqoscevipD3Z gI16e1ee3Ga4WXZIMGcUV90wLCGB9sRcNXW5yDfia5vPkpXW9YbvAKGC8+A7XA== 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 4PYbtz4bKYzNt1; Sat, 11 Mar 2023 08:39:23 +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 32B8dNus081418; Sat, 11 Mar 2023 08:39:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32B8dN58081417; Sat, 11 Mar 2023 08:39:23 GMT (envelope-from git) Date: Sat, 11 Mar 2023 08:39:23 GMT Message-Id: <202303110839.32B8dN58081417@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 7c78e44b6655 - main - deskutils/ultralist: fix build on riscv64 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c78e44b66556d5412fb2cf02250a654d8de62d8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c78e44b66556d5412fb2cf02250a654d8de62d8 commit 7c78e44b66556d5412fb2cf02250a654d8de62d8 Author: Robert Clausecker AuthorDate: 2023-03-08 18:49:52 +0000 Commit: Robert Clausecker CommitDate: 2023-03-11 08:38:08 +0000 deskutils/ultralist: fix build on riscv64 Bump golang.org/x/sys dependency to a version new enough to support riscv64-freebsd. While we are at it, remove useless GH_TUPLE entries. Upstream already vendors these dependencies, so the entries never affected the build in the first place. Sponsored by: Berliner Linux User Group e.V. Approved by: portmgr (build fix blanket) Differential Revision: https://reviews.freebsd.org/D38997 --- deskutils/ultralist/Makefile | 42 +------ deskutils/ultralist/distinfo | 74 +------------ deskutils/ultralist/files/patch-go.mod | 49 +++++++++ deskutils/ultralist/files/patch-go.sum | 97 ++++++++++++++++ deskutils/ultralist/files/patch-vendor_modules.txt | 122 +++++++++++++++++++++ 5 files changed, 275 insertions(+), 109 deletions(-) diff --git a/deskutils/ultralist/Makefile b/deskutils/ultralist/Makefile index 4b56400af4e9..4d9c67450979 100644 --- a/deskutils/ultralist/Makefile +++ b/deskutils/ultralist/Makefile @@ -1,6 +1,6 @@ PORTNAME= ultralist DISTVERSION= 1.7.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= deskutils MAINTAINER= lcook@FreeBSD.org @@ -12,41 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= go:modules USE_GITHUB= yes -GH_TUPLE= cheynewallace:tabby:v1.1.0:cheynewallace_tabby/vendor/github.com/cheynewallace/tabby \ - chzyer:readline:2972be24d48e:chzyer_readline/vendor/github.com/chzyer/readline \ - davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ - fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \ - fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \ - go-ini:ini:v1.51.0:go_ini_ini/vendor/gopkg.in/ini.v1 \ - go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \ - go-yaml:yaml:v2.2.4:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ - golang:sys:33540a1f6037:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \ - hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \ - inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \ - jinzhu:copier:b57f9002281a:jinzhu_copier/vendor/github.com/jinzhu/copier \ - juju:ansiterm:720a0952cc2a:juju_ansiterm/vendor/github.com/juju/ansiterm \ - julienschmidt:httprouter:v1.3.0:julienschmidt_httprouter/vendor/github.com/julienschmidt/httprouter \ - lunixbochs:vtclean:2d01aacdc34a:lunixbochs_vtclean/vendor/github.com/lunixbochs/vtclean \ - magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \ - manifoldco:promptui:v0.7.0:manifoldco_promptui/vendor/github.com/manifoldco/promptui \ - mattn:go-colorable:v0.1.4:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ - mattn:go-isatty:v0.0.11:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ - mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \ - myesui:uuid:v1.0.0:myesui_uuid/vendor/github.com/myesui/uuid \ - pelletier:go-toml:v1.2.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \ - pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ - skratchdot:open-golang:eef842397966:skratchdot_open_golang/vendor/github.com/skratchdot/open-golang \ - spf13:afero:v1.1.2:spf13_afero/vendor/github.com/spf13/afero \ - spf13:cast:v1.3.0:spf13_cast/vendor/github.com/spf13/cast \ - spf13:cobra:v1.0.0:spf13_cobra/vendor/github.com/spf13/cobra \ - spf13:jwalterweatherman:v1.0.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \ - spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag \ - spf13:viper:v1.7.0:spf13_viper/vendor/github.com/spf13/viper \ - stretchr:testify:v1.2.2:stretchr_testify_1/vendor/gopkg.in/stretchr/testify.v1 \ - stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify \ - subosito:gotenv:v1.2.0:subosito_gotenv/vendor/github.com/subosito/gotenv \ - twinj:uuid:v1.0.0:twinj_uuid +GH_TUPLE= golang:sys:v0.5.0:golang_sys/vendor/golang.org/x/sys_ PLIST_FILES= bin/${PORTNAME} PORTDOCS= README.md @@ -54,8 +20,8 @@ PORTDOCS= README.md OPTIONS_DEFINE= DOCS post-extract: - @${MKDIR} ${WRKSRC}/vendor/github.com/twinj - @${RLN} ${WRKSRC_myesui_uuid} ${WRKSRC}/vendor/github.com/twinj/uuid + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${MV} ${WRKSRC}/vendor/golang.org/x/sys_ ${WRKSRC}/vendor/golang.org/x/sys post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/deskutils/ultralist/distinfo b/deskutils/ultralist/distinfo index 789eb14ead22..172950a713f0 100644 --- a/deskutils/ultralist/distinfo +++ b/deskutils/ultralist/distinfo @@ -1,73 +1,5 @@ -TIMESTAMP = 1605267614 +TIMESTAMP = 1678300818 SHA256 (ultralist-ultralist-1.7.0_GH0.tar.gz) = d4a524c94c1ea4a748711a1187246ed1fd00eaaafd5b8153ad23b42d36485f79 SIZE (ultralist-ultralist-1.7.0_GH0.tar.gz) = 2138395 -SHA256 (cheynewallace-tabby-v1.1.0_GH0.tar.gz) = 2e66b4ac938125bb78291385bceb9dc5457d552a721e25e4f3562e72686d75df -SIZE (cheynewallace-tabby-v1.1.0_GH0.tar.gz) = 1693 -SHA256 (chzyer-readline-2972be24d48e_GH0.tar.gz) = 8f425cfb33fce61a137866c0a88117c68f49de79a61a341353fc97339c6b74da -SIZE (chzyer-readline-2972be24d48e_GH0.tar.gz) = 36825 -SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e -SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 -SHA256 (fatih-color-v1.9.0_GH0.tar.gz) = f5a6372ff7c87d22baaa2089e5cdd8a218fb3a9be047195c0ab421d5340f6f3f -SIZE (fatih-color-v1.9.0_GH0.tar.gz) = 1230941 -SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd -SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139 -SHA256 (go-ini-ini-v1.51.0_GH0.tar.gz) = 6c98311d375afbe36a246c5d29acb5cb428634a4186e591ce9b7fe2fa4f2a471 -SIZE (go-ini-ini-v1.51.0_GH0.tar.gz) = 43536 -SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04 -SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898 -SHA256 (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 9004c9709200d52ef6e5c69af3f71f3adb1a2b7e884ea7597f306bf54b1f007c -SIZE (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 72209 -SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5 -SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659 -SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22 -SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069 -SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2 -SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658 -SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6 -SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290 -SHA256 (jinzhu-copier-b57f9002281a_GH0.tar.gz) = c1c303fea291e25c5ec780e270db6a37a0f9c488d0a4e1ff52c746724fda32bd -SIZE (jinzhu-copier-b57f9002281a_GH0.tar.gz) = 5889 -SHA256 (juju-ansiterm-720a0952cc2a_GH0.tar.gz) = 5595c2dc8973aab36a69648d4d94cac75a9ff4a28eb074a7b82b030fc7edbf64 -SIZE (juju-ansiterm-720a0952cc2a_GH0.tar.gz) = 15417 -SHA256 (julienschmidt-httprouter-v1.3.0_GH0.tar.gz) = 2999dffc23f8ac3872ea37d108ddec0ba570d2780a42876300bdcdb0744908e2 -SIZE (julienschmidt-httprouter-v1.3.0_GH0.tar.gz) = 23889 -SHA256 (lunixbochs-vtclean-2d01aacdc34a_GH0.tar.gz) = 54676064363394819c85f04ffd3aa41c86bcd2c9fce3c7e58b6ea41a47e17442 -SIZE (lunixbochs-vtclean-2d01aacdc34a_GH0.tar.gz) = 4183 -SHA256 (magiconair-properties-v1.8.1_GH0.tar.gz) = 4449df3d2be86608bfc997228f66f1cff57bf620cc5bf9ba44339c7e4c5612dd -SIZE (magiconair-properties-v1.8.1_GH0.tar.gz) = 29735 -SHA256 (manifoldco-promptui-v0.7.0_GH0.tar.gz) = 90a38ed9e5d993929b62dd2f1e13c7d3c70d0b57546c7329588f9d493f4c8a47 -SIZE (manifoldco-promptui-v0.7.0_GH0.tar.gz) = 26664 -SHA256 (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 157806ad8125e6bef4d9b58c9125ccb98a8343136f93faf442ab0cc6e7c24c11 -SIZE (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 8981 -SHA256 (mattn-go-isatty-v0.0.11_GH0.tar.gz) = 631fab18253998a4e27e9d260c445e9852bd86cf5a42693623d305c3e59c415a -SIZE (mattn-go-isatty-v0.0.11_GH0.tar.gz) = 4396 -SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b -SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980 -SHA256 (myesui-uuid-v1.0.0_GH0.tar.gz) = 59a83c3ad5f803092ed5d72ea02cd11e4582c04ccac3b17495d8f96ebb32210b -SIZE (myesui-uuid-v1.0.0_GH0.tar.gz) = 27761 -SHA256 (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 1a5a620f680033f17e34148bee8f26d96d8c27ff1d7f56f0fe1c7253595b5244 -SIZE (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 57496 -SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda -SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 -SHA256 (skratchdot-open-golang-eef842397966_GH0.tar.gz) = 2f4768d8cbe725d4ceafc8d34fd9e765aa98a94bfeec30202129634e340899a5 -SIZE (skratchdot-open-golang-eef842397966_GH0.tar.gz) = 7070 -SHA256 (spf13-afero-v1.1.2_GH0.tar.gz) = 66554a6b09b0009340ae77c119d5a14e2460bb3aea56e75e138c87e621f3803b -SIZE (spf13-afero-v1.1.2_GH0.tar.gz) = 45309 -SHA256 (spf13-cast-v1.3.0_GH0.tar.gz) = e685282ea33f89e9354d148ad1886f532bcebe86b0b60a167988f7c6d081085f -SIZE (spf13-cast-v1.3.0_GH0.tar.gz) = 11085 -SHA256 (spf13-cobra-v1.0.0_GH0.tar.gz) = 58dbfe1b4dbc6751575e94d1e62d073098e0b41790bc1c7a7a95ec6b870ac697 -SIZE (spf13-cobra-v1.0.0_GH0.tar.gz) = 128897 -SHA256 (spf13-jwalterweatherman-v1.0.0_GH0.tar.gz) = 2ece12b964e0d230b10851555185d42d3c81b401efda044265ae716eb1d0bc2d -SIZE (spf13-jwalterweatherman-v1.0.0_GH0.tar.gz) = 6392 -SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124 -SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002 -SHA256 (spf13-viper-v1.7.0_GH0.tar.gz) = 95ce28f25d50b0a484479d46ec1576e786b92c70efdc2ad58089505c4ee0850d -SIZE (spf13-viper-v1.7.0_GH0.tar.gz) = 82340 -SHA256 (stretchr-testify-v1.2.2_GH0.tar.gz) = 0728bb470254e8b39deae3e6c1c92a98e737239ae0be484188fb9083250adf5f -SIZE (stretchr-testify-v1.2.2_GH0.tar.gz) = 101698 -SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f -SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215 -SHA256 (subosito-gotenv-v1.2.0_GH0.tar.gz) = 5f6826992c11981018c77377f33dbc56d0be932e0d38a2f51e795c99725e7ba5 -SIZE (subosito-gotenv-v1.2.0_GH0.tar.gz) = 7359 -SHA256 (twinj-uuid-v1.0.0_GH0.tar.gz) = 59a83c3ad5f803092ed5d72ea02cd11e4582c04ccac3b17495d8f96ebb32210b -SIZE (twinj-uuid-v1.0.0_GH0.tar.gz) = 27761 +SHA256 (golang-sys-v0.5.0_GH0.tar.gz) = 810c8f1b7704674971ab6b2b614aba20a5a1765018fd2c639f528dbbcbf88b1f +SIZE (golang-sys-v0.5.0_GH0.tar.gz) = 1429723 diff --git a/deskutils/ultralist/files/patch-go.mod b/deskutils/ultralist/files/patch-go.mod new file mode 100644 index 000000000000..732c2012380b --- /dev/null +++ b/deskutils/ultralist/files/patch-go.mod @@ -0,0 +1,49 @@ +--- go.mod.orig 2023-03-08 18:42:34 UTC ++++ go.mod +@@ -1,6 +1,6 @@ + module github.com/ultralist/ultralist + +-go 1.14 ++go 1.17 + + require ( + github.com/cheynewallace/tabby v1.1.0 +@@ -8,11 +8,37 @@ require ( + github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a + github.com/julienschmidt/httprouter v1.3.0 + github.com/manifoldco/promptui v0.7.0 +- github.com/myesui/uuid v1.0.0 // indirect + github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 + github.com/spf13/cobra v1.0.0 + github.com/spf13/viper v1.7.0 + github.com/stretchr/testify v1.6.1 + github.com/twinj/uuid v1.0.0 ++) ++ ++require ( ++ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect ++ github.com/davecgh/go-spew v1.1.1 // indirect ++ github.com/fsnotify/fsnotify v1.4.7 // indirect ++ github.com/hashicorp/hcl v1.0.0 // indirect ++ github.com/inconshreveable/mousetrap v1.0.0 // indirect ++ github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a // indirect ++ github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a // indirect ++ github.com/magiconair/properties v1.8.1 // indirect ++ github.com/mattn/go-colorable v0.1.4 // indirect ++ github.com/mattn/go-isatty v0.0.11 // indirect ++ github.com/mitchellh/mapstructure v1.1.2 // indirect ++ github.com/myesui/uuid v1.0.0 // indirect ++ github.com/pelletier/go-toml v1.2.0 // indirect ++ github.com/pmezard/go-difflib v1.0.0 // indirect ++ github.com/spf13/afero v1.1.2 // indirect ++ github.com/spf13/cast v1.3.0 // indirect ++ github.com/spf13/jwalterweatherman v1.0.0 // indirect ++ github.com/spf13/pflag v1.0.3 // indirect ++ github.com/subosito/gotenv v1.2.0 // indirect ++ golang.org/x/sys v0.5.0 // indirect ++ golang.org/x/text v0.3.2 // indirect ++ gopkg.in/ini.v1 v1.51.0 // indirect + gopkg.in/stretchr/testify.v1 v1.2.2 // indirect ++ gopkg.in/yaml.v2 v2.2.4 // indirect ++ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect + ) diff --git a/deskutils/ultralist/files/patch-go.sum b/deskutils/ultralist/files/patch-go.sum new file mode 100644 index 000000000000..fe3f5ec76a5b --- /dev/null +++ b/deskutils/ultralist/files/patch-go.sum @@ -0,0 +1,97 @@ +--- go.sum.orig 2023-03-08 18:42:37 UTC ++++ go.sum +@@ -16,7 +16,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5o + github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= + github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= + github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY= + github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= + github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= + github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +@@ -35,7 +34,6 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972b + github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= + github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= + github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +-github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= + github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= + github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= + github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +@@ -50,7 +48,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOw + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= + github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +-github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= + github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= + github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= + github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +@@ -121,7 +118,6 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gb + github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= + github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU= + github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= +-github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g= + github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= + github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= + github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +@@ -136,18 +132,15 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8 + github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= + github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a h1:weJVJJRzAJBFRlAiJQROKQs8oC9vOxvm4rZmBBk0ONw= + github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= +-github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= + github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= + github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= + github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= + github.com/manifoldco/promptui v0.7.0 h1:3l11YT8tm9MnwGFQ4kETwkzpAwY2Jt9lCrumCUW4+z4= + github.com/manifoldco/promptui v0.7.0/go.mod h1:n4zTdgP0vr0S3w7/O/g98U+e0gwLScEXGwov2nIKuGQ= +-github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= + github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= + github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= + github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= + github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +-github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= + github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= + github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= + github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM= +@@ -216,9 +209,7 @@ github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eei + github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= + github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= + github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= + github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= + github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= + github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= + github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +@@ -248,7 +239,6 @@ golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go + golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= + golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= + golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3 h1:x/bBzNauLQAlE3fLku/xy92Y8QwKX5HZymrMz2IiKFc= + golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= + golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= + golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +@@ -289,7 +279,6 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go + golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b h1:MQE+LT/ABUuuvEZ+YQAMSXindAdUh7slEmAkup74op4= + golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +@@ -301,7 +290,8 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go + golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4= + golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= ++golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= ++golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +@@ -360,7 +350,6 @@ gopkg.in/stretchr/testify.v1 v1.2.2 h1:yhQC6Uy5CqibAIl + gopkg.in/stretchr/testify.v1 v1.2.2/go.mod h1:QI5V/q6UbPmuhtm10CaFZxED9NreB8PnFYN9JcR6TxU= + gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= + gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= + gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= + gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= + gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/deskutils/ultralist/files/patch-vendor_modules.txt b/deskutils/ultralist/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..95d3464e5bda --- /dev/null +++ b/deskutils/ultralist/files/patch-vendor_modules.txt @@ -0,0 +1,122 @@ +--- vendor/modules.txt.orig 2023-03-08 18:42:41 UTC ++++ vendor/modules.txt +@@ -2,15 +2,19 @@ + ## explicit + github.com/cheynewallace/tabby + # github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e ++## explicit + github.com/chzyer/readline + # github.com/davecgh/go-spew v1.1.1 ++## explicit + github.com/davecgh/go-spew/spew + # github.com/fatih/color v1.9.0 +-## explicit ++## explicit; go 1.13 + github.com/fatih/color + # github.com/fsnotify/fsnotify v1.4.7 ++## explicit + github.com/fsnotify/fsnotify + # github.com/hashicorp/hcl v1.0.0 ++## explicit + github.com/hashicorp/hcl + github.com/hashicorp/hcl/hcl/ast + github.com/hashicorp/hcl/hcl/parser +@@ -22,73 +26,92 @@ github.com/hashicorp/hcl/json/parser + github.com/hashicorp/hcl/json/scanner + github.com/hashicorp/hcl/json/token + # github.com/inconshreveable/mousetrap v1.0.0 ++## explicit + github.com/inconshreveable/mousetrap + # github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a + ## explicit + github.com/jinzhu/copier + # github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a ++## explicit + github.com/juju/ansiterm + github.com/juju/ansiterm/tabwriter + # github.com/julienschmidt/httprouter v1.3.0 +-## explicit ++## explicit; go 1.7 + github.com/julienschmidt/httprouter + # github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a ++## explicit + github.com/lunixbochs/vtclean + # github.com/magiconair/properties v1.8.1 ++## explicit + github.com/magiconair/properties + # github.com/manifoldco/promptui v0.7.0 +-## explicit ++## explicit; go 1.12 + github.com/manifoldco/promptui + github.com/manifoldco/promptui/list + github.com/manifoldco/promptui/screenbuf + # github.com/mattn/go-colorable v0.1.4 ++## explicit + github.com/mattn/go-colorable + # github.com/mattn/go-isatty v0.0.11 ++## explicit; go 1.12 + github.com/mattn/go-isatty + # github.com/mitchellh/mapstructure v1.1.2 ++## explicit + github.com/mitchellh/mapstructure + # github.com/myesui/uuid v1.0.0 + ## explicit + # github.com/pelletier/go-toml v1.2.0 ++## explicit + github.com/pelletier/go-toml + # github.com/pmezard/go-difflib v1.0.0 ++## explicit + github.com/pmezard/go-difflib/difflib + # github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 + ## explicit + github.com/skratchdot/open-golang/open + # github.com/spf13/afero v1.1.2 ++## explicit + github.com/spf13/afero + github.com/spf13/afero/mem + # github.com/spf13/cast v1.3.0 ++## explicit + github.com/spf13/cast + # github.com/spf13/cobra v1.0.0 +-## explicit ++## explicit; go 1.12 + github.com/spf13/cobra + # github.com/spf13/jwalterweatherman v1.0.0 ++## explicit + github.com/spf13/jwalterweatherman + # github.com/spf13/pflag v1.0.3 ++## explicit + github.com/spf13/pflag + # github.com/spf13/viper v1.7.0 +-## explicit ++## explicit; go 1.12 + github.com/spf13/viper + # github.com/stretchr/testify v1.6.1 +-## explicit ++## explicit; go 1.13 + github.com/stretchr/testify/assert + # github.com/subosito/gotenv v1.2.0 ++## explicit + github.com/subosito/gotenv + # github.com/twinj/uuid v1.0.0 + ## explicit + github.com/twinj/uuid +-# golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 ++# golang.org/x/sys v0.5.0 ++## explicit; go 1.17 + golang.org/x/sys/unix + # golang.org/x/text v0.3.2 ++## explicit + golang.org/x/text/transform + golang.org/x/text/unicode/norm + # gopkg.in/ini.v1 v1.51.0 ++## explicit + gopkg.in/ini.v1 + # gopkg.in/stretchr/testify.v1 v1.2.2 + ## explicit + # gopkg.in/yaml.v2 v2.2.4 ++## explicit + gopkg.in/yaml.v2 + # gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c ++## explicit + gopkg.in/yaml.v3