diff --git a/0001-Fix-tests-against-newer-Go.patch b/0001-Fix-tests-against-newer-Go.patch new file mode 100644 index 0000000..d1aeb41 --- /dev/null +++ b/0001-Fix-tests-against-newer-Go.patch @@ -0,0 +1,41 @@ +From d3fcbee8e1810ecee4bdbf415f42f84cfd0e3361 Mon Sep 17 00:00:00 2001 +From: Jeff Mitchell +Date: Sat, 6 Apr 2019 12:20:18 -0400 +Subject: [PATCH] Fix tests against newer Go + +Fixes #14 +--- + handlers_test.go | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/handlers_test.go b/handlers_test.go +index 95ef812..a22e84a 100644 +--- a/handlers_test.go ++++ b/handlers_test.go +@@ -30,22 +30,22 @@ func TestPrintablePathCheckHandler(t *testing.T) { + }, + + "invalid newline": { +- path: "/invalid\n", ++ path: "/invalid%0A", + expectCode: http.StatusBadRequest, + }, + + "invalid carriage return": { +- path: "/invalid\r", ++ path: "/invalid%0D", + expectCode: http.StatusBadRequest, + }, + + "invalid null": { +- path: "/invalid\x00", ++ path: "/invalid%00", + expectCode: http.StatusBadRequest, + }, + + "invalid alternate status": { +- path: "/invalid\n", ++ path: "/invalid%0A", + expectCode: http.StatusInternalServerError, + input: &HandlerInput{ + ErrStatus: http.StatusInternalServerError, diff --git a/golang-github-hashicorp-cleanhttp.spec b/golang-github-hashicorp-cleanhttp.spec new file mode 100644 index 0000000..941f724 --- /dev/null +++ b/golang-github-hashicorp-cleanhttp.spec @@ -0,0 +1,107 @@ +# Generated by go2rpm +%bcond_without check + +# https://github.com/hashicorp/go-cleanhttp +%global goipath github.com/hashicorp/go-cleanhttp +Version: 0.5.1 + +%gometa + +%global common_description %{expand: +Convenience utilities for acquiring "clean" http.Transport and http.Client +structs} + +%global golicenses LICENSE +%global godocs README.md + +%global gosupfiles glide.lock glide.yaml + +Name: %{goname} +Release: 2%{?dist} +Summary: Convenience utilities for "clean" http.Transport and http.Client structs + +# Upstream license specification: MPL-2.0 +License: MPLv2.0 +URL: %{gourl} +Source0: %{gosource} +Source1: glide.yaml +Source2: glide.lock +# https://github.com/hashicorp/go-cleanhttp/issues/14 +Patch0: https://github.com/hashicorp/go-cleanhttp/commit/d3fcbee8e1810ecee4bdbf415f42f84cfd0e3361.patch#/0001-Fix-tests-against-newer-Go.patch + +%description +%{common_description} + +%gopkg + +%prep +%goprep +%patch0 -p1 +cp %{S:1} %{S:2} . + +%install +%gopkginstall + +# Remove in F33 +# Remove erroneous glide.lock folder +%pretrans devel -p +path = "%{gopath}/src/%{goipath}/glide.lock" +st = posix.stat(path) +if st and st.type == "directory" then + os.remove(path) +end + +%if %{with check} +%check +%gocheck +%endif + +%gopkgfiles + +%changelog +* Wed Apr 17 2019 Robert-André Mauchin - 0.5.1-2 +- Update to new macros + +* Sun Mar 24 2019 Robert-André Mauchin - 0.5.1-1 +- Release 0.5.1 (#1690719) + +* Fri Feb 01 2019 Fedora Release Engineering - 0-0.13.git5df5ddc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Oct 23 2018 Nicolas Mailhot - 0-0.12.git5df5ddc +- redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias +- https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/ + +* Fri Jul 13 2018 Fedora Release Engineering - 0-0.11.git5df5ddc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 12 2018 Jan Chaloupka - 0-0.10.git5df5ddc +- Upload glide files + +* Wed Feb 28 2018 Jan Chaloupka - 0-0.9.20151022git5df5ddc +- Autogenerate some parts using the new macros + +* Wed Feb 07 2018 Fedora Release Engineering - 0-0.8.git5df5ddc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 0-0.7.git5df5ddc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0-0.6.git5df5ddc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0-0.5.git5df5ddc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jul 21 2016 Fedora Release Engineering - 0-0.4.git5df5ddc +- https://fedoraproject.org/wiki/Changes/golang1.7 + +* Mon Feb 22 2016 Fedora Release Engineering - 0-0.3.git5df5ddc +- https://fedoraproject.org/wiki/Changes/golang1.6 + +* Wed Feb 03 2016 Fedora Release Engineering - 0-0.2.git5df5ddc +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jan 06 2016 jchaloup - 0-0.1.git5df5ddc +- First package for Fedora + diff --git a/golang-github-hashicorp-go-cleanhttp.spec b/golang-github-hashicorp-go-cleanhttp.spec deleted file mode 100644 index 485afd4..0000000 --- a/golang-github-hashicorp-go-cleanhttp.spec +++ /dev/null @@ -1,105 +0,0 @@ -# https://github.com/hashicorp/go-cleanhttp -%global goipath github.com/hashicorp/go-cleanhttp -Version: 0.5.1 - -%global common_description %{expand: -Functions for accessing "clean" Go http.Client values.} - -%gometa - -Name: golang-github-hashicorp-go-cleanhttp -Release: 1%{?dist} -Summary: Functions for accessing "clean" Go http.Client values -License: MPLv2.0 -URL: %{gourl} -Source0: %{gosource} -Source1: glide.yaml -Source2: glide.lock - -%description -%{common_description} - - -%package devel -Summary: %{summary} -BuildArch: noarch - -%description devel -%{common_description} - -This package contains library source intended for -building other packages which use import path with -%{goipath} prefix. - -%prep -%forgesetup -cp %{SOURCE1} %{SOURCE2} . - - -%install -%goinstall glide.lock glide.yaml - - -# Remove in F33 -# Remove erroneous glide.lock folder -%pretrans devel -p -path = "%{gopath}/src/%{goipath}/glide.lock" -st = posix.stat(path) -if st and st.type == "directory" then - os.remove(path) -end - - -%check -%gochecks - - -%files devel -f devel.file-list -%license LICENSE -%doc README.md - - -%changelog -* Sun Mar 24 22:32:06 CET 2019 Robert-André Mauchin - 0.5.1-1 -- Release 0.5.1 (#1690719) - -* Fri Feb 01 2019 Fedora Release Engineering - 0-0.13.git5df5ddc -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Oct 23 2018 Nicolas Mailhot - 0-0.12.git5df5ddc -- redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias -- https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/ - -* Fri Jul 13 2018 Fedora Release Engineering - 0-0.11.git5df5ddc -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 12 2018 Jan Chaloupka - 0-0.10.git5df5ddc -- Upload glide files - -* Wed Feb 28 2018 Jan Chaloupka - 0-0.9.20151022git5df5ddc -- Autogenerate some parts using the new macros - -* Wed Feb 07 2018 Fedora Release Engineering - 0-0.8.git5df5ddc -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 0-0.7.git5df5ddc -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0-0.6.git5df5ddc -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0-0.5.git5df5ddc -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jul 21 2016 Fedora Release Engineering - 0-0.4.git5df5ddc -- https://fedoraproject.org/wiki/Changes/golang1.7 - -* Mon Feb 22 2016 Fedora Release Engineering - 0-0.3.git5df5ddc -- https://fedoraproject.org/wiki/Changes/golang1.6 - -* Wed Feb 03 2016 Fedora Release Engineering - 0-0.2.git5df5ddc -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jan 06 2016 jchaloup - 0-0.1.git5df5ddc -- First package for Fedora -