diff --git a/.gitignore b/.gitignore index 55d7742..5a47264 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,8 @@ /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 index a64ad8f..3dda84b 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -11,9 +11,25 @@ jobs: - job: pull_from_upstream trigger: release dist_git_branches: - - fedora-rawhide + - rawhide - job: koji_build trigger: commit dist_git_branches: - - fedora-rawhide + - 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 27b8a06..b6dd710 100644 --- a/age.spec +++ b/age.spec @@ -1,94 +1,75 @@ -# Generated by go2rpm 1.14.0 +# Generated by go2rpm 1.18.0 %bcond check 1 -%bcond bootstrap 0 - -%if %{with bootstrap} -%global debug_package %{nil} -%endif - -%if %{with bootstrap} -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$ -%endif # https://github.com/FiloSottile/age %global goipath filippo.io/age %global forgeurl https://github.com/FiloSottile/age -Version: 1.2.1 +Version: 1.3.1 %gometa -L -f -%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 AUTHORS README.md Name: age Release: %autorelease Summary: Simple, modern and secure encryption tool -License: BSD-3-Clause +# 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} -Source: %{gosource} +Source0: %{gosource} +# Generated by go-vendor-tools +Source1: %{archivename}-vendor.tar.bz2 +Source2: go-vendor-tools.toml -%description %{common_description} +BuildRequires: go-vendor-tools -%gopkg +%description +A simple, modern and secure encryption tool (and Go library) with small +explicit keys, no config options, and UNIX-style composability. %prep %goprep -A +%setup -q -T -D -a1 %{forgesetupargs} %autopatch -p1 -# To avoid extra dep on c2sp.org/CCTV/age -rm -rfv testkit_test.go - -%if %{without bootstrap} %generate_buildrequires -%go_generate_buildrequires -%endif +%go_vendor_license_buildrequires -c %{S:2} -%if %{without bootstrap} %build -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 -%endif %install -%gopkginstall -%if %{without bootstrap} +%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/ -%endif +install -m 644 doc/age-inspect.1 %{buildroot}%{_mandir}/man1/ -%if %{without bootstrap} -%if %{with check} %check -%ifarch s390x -for test in "TestScript" \ -; do -awk -i inplace '/^func.*'"$test"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' $(grep -rl $test) -done -%endif -%gocheck -%endif +%go_vendor_license_check -c %{S:2} +%if %{with check} +%gotest ./... %endif -%if %{without bootstrap} -%files -%license LICENSE -%doc doc AUTHORS README.md +%files -f %{go_vendor_license_filelist} +%license vendor/modules.txt +%doc doc README.md %{_bindir}/age +%{_bindir}/age-inspect %{_bindir}/age-keygen -%{_mandir}/man1/* -%endif +%{_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 58730d2..65f5af2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (age-1.2.1.tar.gz) = 685914db0bf398e20ee599627d131004f85ab5f37dcbc6752b1379c07702a1896d48163a8e9c71a25a44858ec648f3cb404f7c92360657f935342cd766a13a3a +SHA512 (age-1.3.1-vendor.tar.bz2) = c0863d04a2206e4f18ffb4d3b0429fc33685e4e7be1ffac7eca2218af590218ad62776fe11f60258092921f3aafffd6962d720eeeb6dd0ea68a14b39730c3908 +SHA512 (age-1.3.1.tar.gz) = 95bb8049de36630f0b128c9626427646e5d4d76e35b6bd6790e29cf3f69fb2a0266ac7786616f56fe9bf378a81c1f3edc17fd9eba197286041b970944898504c