[arch-commits] Commit in sops/repos/community-x86_64 (7 files)
Daurnimator
daurnimator at gemini.archlinux.org
Mon Mar 7 12:34:35 UTC 2022
Date: Monday, March 7, 2022 @ 12:34:34
Author: daurnimator
Revision: 1144366
archrelease: copy trunk to community-x86_64
Added:
sops/repos/community-x86_64/PKGBUILD
(from rev 1144365, sops/trunk/PKGBUILD)
sops/repos/community-x86_64/bash_autocomplete
(from rev 1144365, sops/trunk/bash_autocomplete)
sops/repos/community-x86_64/dependency-update.patch
(from rev 1144365, sops/trunk/dependency-update.patch)
sops/repos/community-x86_64/zsh_autocomplete
(from rev 1144365, sops/trunk/zsh_autocomplete)
Deleted:
sops/repos/community-x86_64/PKGBUILD
sops/repos/community-x86_64/bash_autocomplete
sops/repos/community-x86_64/zsh_autocomplete
-------------------------+
PKGBUILD | 113 +++++++++++++++++++++++++---------------------
bash_autocomplete | 36 +++++++-------
dependency-update.patch | 57 +++++++++++++++++++++++
zsh_autocomplete | 50 ++++++++++----------
4 files changed, 163 insertions(+), 93 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-07 12:34:10 UTC (rev 1144365)
+++ PKGBUILD 2022-03-07 12:34:34 UTC (rev 1144366)
@@ -1,50 +0,0 @@
-# Maintainer: Daurnimator <daurnimator at archlinux.org>
-# Contributor: Michael Beaumont <mjboamail at gmail.com>
-
-pkgname=sops
-pkgver=3.7.1
-pkgrel=3
-pkgdesc='Editor of encrypted files that supports YAML, JSON and BINARY formats'
-arch=('x86_64')
-url='https://github.com/mozilla/sops'
-license=('MPL2')
-depends=('glibc')
-makedepends=('go')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
- 'bash_autocomplete'
- 'zsh_autocomplete')
-sha256sums=('536ee140d888b53b71c1e8edd669f4c11bc573428983fbea644fbbfcd7d7079a'
- '761c67ffd48431e60ea5dc48e5656b4480eca7534d4b715eb65bd75680f5e975'
- 'd98d34aeaa7b0f98220bcb21fc9f2bb58efaed45478a7229eb58e5795b57b5a7')
-
-build() {
- cd "${pkgname}-${pkgver}"
-
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- go build \
- -trimpath \
- -buildmode=pie \
- -mod=readonly \
- -modcacherw \
- -ldflags "-linkmode=external -extldflags \"${LDFLAGS}\"" \
- ./cmd/sops
-}
-
-check() {
- cd "${pkgname}-${pkgver}"
-
- go test
-}
-
-package() {
- install -Dm644 bash_autocomplete "${pkgdir}/usr/share/bash-completion/completions/sops"
- install -Dm644 zsh_autocomplete "$pkgdir/usr/share/zsh/site-functions/_sops"
-
- cd "${pkgname}-${pkgver}"
-
- install -Dm755 sops "${pkgdir}/usr/bin/sops"
- install -Dm644 README.rst "${pkgdir}/usr/share/doc/${pkgname}/README.rst"
-}
Copied: sops/repos/community-x86_64/PKGBUILD (from rev 1144365, sops/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-07 12:34:34 UTC (rev 1144366)
@@ -0,0 +1,63 @@
+# Maintainer: Daurnimator <daurnimator at archlinux.org>
+# Contributor: Michael Beaumont <mjboamail at gmail.com>
+
+pkgname=sops
+pkgver=3.7.1
+pkgrel=4
+pkgdesc='Editor of encrypted files that supports YAML, JSON and BINARY formats'
+arch=('x86_64')
+url='https://github.com/mozilla/sops'
+license=('MPL2')
+depends=('glibc')
+makedepends=('go')
+options=('!lto')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+ 'dependency-update.patch'
+ 'bash_autocomplete'
+ 'zsh_autocomplete')
+sha256sums=('536ee140d888b53b71c1e8edd669f4c11bc573428983fbea644fbbfcd7d7079a'
+ 'a03b69d406e8946555309da73d07e6f2ff52c643b74dd9a70d97e8bc4c60fd4d'
+ '761c67ffd48431e60ea5dc48e5656b4480eca7534d4b715eb65bd75680f5e975'
+ 'd98d34aeaa7b0f98220bcb21fc9f2bb58efaed45478a7229eb58e5795b57b5a7')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+
+ # FS#70588
+ patch -p1 -i ../dependency-update.patch
+
+ go mod download
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export GOPROXY=off
+ go build \
+ -trimpath \
+ -buildmode=pie \
+ -mod=readonly \
+ -modcacherw \
+ -ldflags "-linkmode=external -extldflags \"${LDFLAGS}\"" \
+ ./cmd/sops
+}
+
+check() {
+ cd "${pkgname}-${pkgver}"
+
+ go test
+}
+
+package() {
+ install -Dm644 bash_autocomplete "${pkgdir}/usr/share/bash-completion/completions/sops"
+ install -Dm644 zsh_autocomplete "$pkgdir/usr/share/zsh/site-functions/_sops"
+
+ cd "${pkgname}-${pkgver}"
+
+ install -Dm755 sops "${pkgdir}/usr/bin/sops"
+ install -Dm644 README.rst "${pkgdir}/usr/share/doc/${pkgname}/README.rst"
+}
Deleted: bash_autocomplete
===================================================================
--- bash_autocomplete 2022-03-07 12:34:10 UTC (rev 1144365)
+++ bash_autocomplete 2022-03-07 12:34:34 UTC (rev 1144366)
@@ -1,18 +0,0 @@
-## based on https://github.com/urfave/cli/blob/v2.3.0/autocomplete/bash_autocomplete
-
-_cli_bash_autocomplete() {
- if [[ "${COMP_WORDS[0]}" != "source" ]]; then
- local cur opts base
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- if [[ "$cur" == "-"* ]]; then
- opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} ${cur} --generate-bash-completion )
- else
- opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} --generate-bash-completion )
- fi
- COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
- return 0
- fi
-}
-
-complete -o bashdefault -o default -o nospace -F _cli_bash_autocomplete sops
Copied: sops/repos/community-x86_64/bash_autocomplete (from rev 1144365, sops/trunk/bash_autocomplete)
===================================================================
--- bash_autocomplete (rev 0)
+++ bash_autocomplete 2022-03-07 12:34:34 UTC (rev 1144366)
@@ -0,0 +1,18 @@
+## based on https://github.com/urfave/cli/blob/v2.3.0/autocomplete/bash_autocomplete
+
+_cli_bash_autocomplete() {
+ if [[ "${COMP_WORDS[0]}" != "source" ]]; then
+ local cur opts base
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ if [[ "$cur" == "-"* ]]; then
+ opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} ${cur} --generate-bash-completion )
+ else
+ opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} --generate-bash-completion )
+ fi
+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+ return 0
+ fi
+}
+
+complete -o bashdefault -o default -o nospace -F _cli_bash_autocomplete sops
Copied: sops/repos/community-x86_64/dependency-update.patch (from rev 1144365, sops/trunk/dependency-update.patch)
===================================================================
--- dependency-update.patch (rev 0)
+++ dependency-update.patch 2022-03-07 12:34:34 UTC (rev 1144366)
@@ -0,0 +1,57 @@
+diff --git a/go.mod b/go.mod
+index 37784afcd..1837c62f3 100644
+--- a/go.mod
++++ b/go.mod
+@@ -51,3 +51,5 @@ require (
+ gopkg.in/yaml.v3 v3.0.0-20210107172259-749611fa9fcc
+ gotest.tools v2.2.0+incompatible // indirect
+ )
++
++replace gopkg.in/urfave/cli.v1 v1.20.0 => github.com/urfave/cli v1.22.5
+diff --git a/go.sum b/go.sum
+index 976e3519a..47e0129b3 100644
+--- a/go.sum
++++ b/go.sum
+@@ -61,6 +61,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
+ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+ github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc h1:TP+534wVlf61smEIq1nwLLAjQVEK2EADoW3CX9AuT+8=
+ github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
++github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
++github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+@@ -236,11 +238,15 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
+ github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
++github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
++github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+ github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+ github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
+ github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+ github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
+ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
++github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
++github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+ github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+@@ -257,6 +263,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
+ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
++github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU=
++github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+ go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a h1:N7VD+PwpJME2ZfQT8+ejxwA4Ow10IkGbU0MGf94ll8k=
+ go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a/go.mod h1:YDKUvO0b//78PaaEro6CAPH6NqohCmL2Cwju5XI2HoE=
+ go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+@@ -404,8 +412,6 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+ gopkg.in/square/go-jose.v2 v2.3.1 h1:SK5KegNXmKmqE342YYN2qPHEnUYeoMiXXl1poUlI+o4=
+ gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+-gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
+-gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
+ 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/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
Deleted: zsh_autocomplete
===================================================================
--- zsh_autocomplete 2022-03-07 12:34:10 UTC (rev 1144365)
+++ zsh_autocomplete 2022-03-07 12:34:34 UTC (rev 1144366)
@@ -1,25 +0,0 @@
-#compdef sops
-
-## based on https://github.com/urfave/cli/blob/v2.3.0/autocomplete/zsh_autocomplete
-
-_cli_zsh_autocomplete() {
-
- local -a opts
- local cur
- cur=${words[-1]}
- if [[ "$cur" == "-"* ]]; then
- opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
- else
- opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
- fi
-
- if [[ "${opts[1]}" != "" ]]; then
- _describe 'values' opts
- else
- _files
- fi
-
- return
-}
-
-compdef _cli_zsh_autocomplete sops
Copied: sops/repos/community-x86_64/zsh_autocomplete (from rev 1144365, sops/trunk/zsh_autocomplete)
===================================================================
--- zsh_autocomplete (rev 0)
+++ zsh_autocomplete 2022-03-07 12:34:34 UTC (rev 1144366)
@@ -0,0 +1,25 @@
+#compdef sops
+
+## based on https://github.com/urfave/cli/blob/v2.3.0/autocomplete/zsh_autocomplete
+
+_cli_zsh_autocomplete() {
+
+ local -a opts
+ local cur
+ cur=${words[-1]}
+ if [[ "$cur" == "-"* ]]; then
+ opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
+ else
+ opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
+ fi
+
+ if [[ "${opts[1]}" != "" ]]; then
+ _describe 'values' opts
+ else
+ _files
+ fi
+
+ return
+}
+
+compdef _cli_zsh_autocomplete sops
More information about the arch-commits
mailing list