diff --git a/.gitignore b/.gitignore index 5247df6..5a47264 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,12 @@ /age-1.0.0-beta7.tar.gz /age-1.0.0-rc.3.tar.gz /age-1.0.0.tar.gz +/age-1.1.0-rc.1.tar.gz +/age-1.1.1.tar.gz +/age-1.2.0.tar.gz +/age-1.2.1.tar.gz +/age-1.2.1-vendor.tar.bz2 +/age-1.3.0.tar.gz +/age-1.3.0-vendor.tar.bz2 +/age-1.3.1-vendor.tar.bz2 +/age-1.3.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..3dda84b --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,35 @@ +specfile_path: age.spec + +upstream_package_name: age +upstream_project_url: https://github.com/FiloSottile/age +downstream_package_name: age + +upstream_tag_template: v{version} + +jobs: + +- job: pull_from_upstream + trigger: release + dist_git_branches: + - rawhide + +- job: koji_build + trigger: commit + dist_git_branches: + - rawhide + +actions: + post-modifications: + # https://fedora.gitlab.io/sigs/go/go-vendor-tools/scenarios/#manual-update + - | + sh -xeuc " + cd $PACKIT_DOWNSTREAM_REPO + export GOTOOLCHAIN=auto + go_vendor_archive create --config go-vendor-tools.toml age.spec + go_vendor_license \ + --config go-vendor-tools.toml \ + --path age.spec \ + report \ + --verify-spec + " +create_sync_note: false diff --git a/age.spec b/age.spec index 9e24c8a..b6dd710 100644 --- a/age.spec +++ b/age.spec @@ -1,76 +1,75 @@ -# Generated by go2rpm 1.3 -%bcond_without check +# Generated by go2rpm 1.18.0 +%bcond check 1 # https://github.com/FiloSottile/age %global goipath filippo.io/age %global forgeurl https://github.com/FiloSottile/age -Version: 1.0.0 +Version: 1.3.1 -%gometa +%gometa -L -f -%global goname age -%global common_description %{expand: -A simple, modern and secure encryption tool (and Go library) with small -explicit keys, no config options, and UNIX-style composability.} - -%global golicenses LICENSE -%global godocs README.md - -Name: %{goname} +Name: age Release: %autorelease Summary: Simple, modern and secure encryption tool -# Upstream license specification: BSD-3-Clause -License: BSD +# Generated by go-vendor-tools +# https://github.com/C2SP/CCTV/issues/14 +# vendor/c2sp.org/CCTV/age/internal is not packaged +License: BSD-3-Clause AND (0BSD OR CC0-1.0 OR Unlicense) URL: %{gourl} Source0: %{gosource} +# Generated by go-vendor-tools +Source1: %{archivename}-vendor.tar.bz2 +Source2: go-vendor-tools.toml -BuildRequires: golang(filippo.io/edwards25519) -BuildRequires: golang(golang.org/x/crypto/chacha20poly1305) -BuildRequires: golang(golang.org/x/crypto/cryptobyte) -BuildRequires: golang(golang.org/x/crypto/curve25519) -BuildRequires: golang(golang.org/x/crypto/hkdf) -BuildRequires: golang(golang.org/x/crypto/poly1305) -BuildRequires: golang(golang.org/x/crypto/scrypt) -BuildRequires: golang(golang.org/x/crypto/ssh) -BuildRequires: golang(golang.org/x/crypto/ssh/terminal) +BuildRequires: go-vendor-tools %description -%{common_description} - -%gopkg +A simple, modern and secure encryption tool (and Go library) with small +explicit keys, no config options, and UNIX-style composability. %prep -%goprep +%goprep -A +%setup -q -T -D -a1 %{forgesetupargs} +%autopatch -p1 + +%generate_buildrequires +%go_vendor_license_buildrequires -c %{S:2} %build -export LDFLAGS="-X main.Version=%{version} " -for cmd in cmd/* ; do +%global gomodulesmode GO111MODULE=on +GO_LDFLAGS="-X main.Version=%{version}" +for cmd in cmd/{age,age-keygen,age-inspect} ; do %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd done %install -%gopkginstall +%go_vendor_license_install -c %{S:2} install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ mkdir -p %{buildroot}%{_mandir}/man1 install -m 644 doc/%{name}.1 %{buildroot}%{_mandir}/man1/ install -m 644 doc/age-keygen.1 %{buildroot}%{_mandir}/man1/ +install -m 644 doc/age-inspect.1 %{buildroot}%{_mandir}/man1/ -%if %{with check} %check -%gocheck +%go_vendor_license_check -c %{S:2} +%if %{with check} +%gotest ./... %endif -%files -%license LICENSE -%doc README.md -%{_bindir}/* -%{_mandir}/man1/* +%files -f %{go_vendor_license_filelist} +%license vendor/modules.txt +%doc doc README.md +%{_bindir}/age +%{_bindir}/age-inspect +%{_bindir}/age-keygen +%{_mandir}/man1/age.1* +%{_mandir}/man1/age-inspect.1* +%{_mandir}/man1/age-keygen.1* -%gopkgfiles %changelog %autochangelog diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml new file mode 100644 index 0000000..9c9f1d2 --- /dev/null +++ b/go-vendor-tools.toml @@ -0,0 +1,9 @@ + +[archive] + +[licensing] +detector = "askalono" +[[licensing.licenses]] +path = "vendor/c2sp.org/CCTV/age/README.md" +sha256sum = "fdbd4b06044f3803c72bdaf2df7681fdce3a45a326a2898e75640eae906606ad" +expression = "0BSD OR CC0-1.0 OR Unlicense" diff --git a/sources b/sources index accbb7c..65f5af2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (age-1.0.0.tar.gz) = 77ea1af03a76339f4e934222bc9fc6119698080d0e03011c79b25119e0e8a1e6c0772ede5069cd63bde48cfaa4d355c897912741680e8b0c52d4c518182c2f7f +SHA512 (age-1.3.1-vendor.tar.bz2) = c0863d04a2206e4f18ffb4d3b0429fc33685e4e7be1ffac7eca2218af590218ad62776fe11f60258092921f3aafffd6962d720eeeb6dd0ea68a14b39730c3908 +SHA512 (age-1.3.1.tar.gz) = 95bb8049de36630f0b128c9626427646e5d4d76e35b6bd6790e29cf3f69fb2a0266ac7786616f56fe9bf378a81c1f3edc17fd9eba197286041b970944898504c