diff --git a/.gitignore b/.gitignore index 5a47264..50e2e88 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,3 @@ /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 3dda84b..a64ad8f 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -11,25 +11,9 @@ jobs: - job: pull_from_upstream trigger: release dist_git_branches: - - rawhide + - fedora-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 + - fedora-rawhide diff --git a/age.spec b/age.spec index b6dd710..fbc5928 100644 --- a/age.spec +++ b/age.spec @@ -1,22 +1,23 @@ -# Generated by go2rpm 1.18.0 +# Generated by go2rpm 1.16.0 %bcond check 1 # https://github.com/FiloSottile/age %global goipath filippo.io/age %global forgeurl https://github.com/FiloSottile/age -Version: 1.3.1 +Version: 1.2.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.} Name: age Release: %autorelease Summary: Simple, modern and secure encryption tool # 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) +License: 0BSD AND BSD-3-Clause URL: %{gourl} Source0: %{gosource} # Generated by go-vendor-tools @@ -25,9 +26,7 @@ Source2: go-vendor-tools.toml BuildRequires: go-vendor-tools -%description -A simple, modern and secure encryption tool (and Go library) with small -explicit keys, no config options, and UNIX-style composability. +%description %{common_description} %prep %goprep -A @@ -40,7 +39,7 @@ explicit keys, no config options, and UNIX-style composability. %build %global gomodulesmode GO111MODULE=on GO_LDFLAGS="-X main.Version=%{version}" -for cmd in cmd/{age,age-keygen,age-inspect} ; do +for cmd in cmd/* ; do %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd done @@ -52,7 +51,6 @@ 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/ %check %go_vendor_license_check -c %{S:2} @@ -62,12 +60,10 @@ install -m 644 doc/age-inspect.1 %{buildroot}%{_mandir}/man1/ %files -f %{go_vendor_license_filelist} %license vendor/modules.txt -%doc doc README.md +%doc doc AUTHORS README.md %{_bindir}/age -%{_bindir}/age-inspect %{_bindir}/age-keygen %{_mandir}/man1/age.1* -%{_mandir}/man1/age-inspect.1* %{_mandir}/man1/age-keygen.1* diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml index 9c9f1d2..d1661eb 100644 --- a/go-vendor-tools.toml +++ b/go-vendor-tools.toml @@ -1,9 +1,10 @@ - [archive] +[archive.dependency_overrides] +"github.com/rogpeppe/go-internal" = "v1.13.1" [licensing] -detector = "askalono" +detector = "trivy" [[licensing.licenses]] path = "vendor/c2sp.org/CCTV/age/README.md" -sha256sum = "fdbd4b06044f3803c72bdaf2df7681fdce3a45a326a2898e75640eae906606ad" -expression = "0BSD OR CC0-1.0 OR Unlicense" +sha256sum = "5b8b7a5e0ccfd7c70d106e1b5f43104dd30a89fffee3f96ef5afd88184dec927" +expression = "0BSD" diff --git a/sources b/sources index 65f5af2..6ea94d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (age-1.3.1-vendor.tar.bz2) = c0863d04a2206e4f18ffb4d3b0429fc33685e4e7be1ffac7eca2218af590218ad62776fe11f60258092921f3aafffd6962d720eeeb6dd0ea68a14b39730c3908 -SHA512 (age-1.3.1.tar.gz) = 95bb8049de36630f0b128c9626427646e5d4d76e35b6bd6790e29cf3f69fb2a0266ac7786616f56fe9bf378a81c1f3edc17fd9eba197286041b970944898504c +SHA512 (age-1.2.1.tar.gz) = 685914db0bf398e20ee599627d131004f85ab5f37dcbc6752b1379c07702a1896d48163a8e9c71a25a44858ec648f3cb404f7c92360657f935342cd766a13a3a +SHA512 (age-1.2.1-vendor.tar.bz2) = 701e0268253355c227c490e03e263da18af5096ded89b240182e2f902a38eed28480856055a422c8ffa79ab24391861dc49eb0019950ea8dfc61ba75ed62a549