Control: tags 966374 + patch Control: tags 966374 + pending
Hi, I've prepared an NMU for facter (versioned as 3.11.0-4.3) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it further. Cheers, Sven
diff -Nru facter-3.11.0/debian/changelog facter-3.11.0/debian/changelog --- facter-3.11.0/debian/changelog 2020-06-17 23:21:32.000000000 +0200 +++ facter-3.11.0/debian/changelog 2020-07-28 09:17:17.000000000 +0200 @@ -1,3 +1,12 @@ +facter (3.11.0-4.3) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: add 0008-FACT-2018-update-gce-metadata-endpoint.patch + Switch Google GCE metadata endpoint from v1beta1 to final v1, the beta + endpoint will be shutdown end of September 2020. (Closes: #966374) + + -- Sven Hoexter <hoex...@debian.org> Tue, 28 Jul 2020 09:17:17 +0200 + facter (3.11.0-4.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru facter-3.11.0/debian/patches/0008-FACT-2018-update-gce-metadata-endpoint.patch facter-3.11.0/debian/patches/0008-FACT-2018-update-gce-metadata-endpoint.patch --- facter-3.11.0/debian/patches/0008-FACT-2018-update-gce-metadata-endpoint.patch 1970-01-01 01:00:00.000000000 +0100 +++ facter-3.11.0/debian/patches/0008-FACT-2018-update-gce-metadata-endpoint.patch 2020-07-28 09:15:21.000000000 +0200 @@ -0,0 +1,30 @@ +From: Gabriel Nagy <gabriel.n...@puppet.com> +Subject: (FACT-2018) Update GCE metadata endpoint + + Google Compute Engine's internal metadata service will be deprecating + the 'v1beta1' endpoint sometime before end of calendar year 2019. This + commit updates the GCE resolver to use the 'v1' endpoint instead. + + Using the 'v1' endpoint also requires setting a custom User-Agent + header that was not necessary in the old 'v1beta1' endpoint. + + For more details about GCE metadata, please see + https://cloud.google.com/compute/docs/storing-retrieving-metadata + + +Origin: upstream, https://github.com/puppetlabs/facter/commit/1a0bc4e984716dc5145e5bb8fbf14b1ac0fd8c04 +Bug-Debian: http://bugs.debian.org/966374 +Index: facter/lib/src/facts/resolvers/gce_resolver.cc +=================================================================== +--- facter.orig/lib/src/facts/resolvers/gce_resolver.cc ++++ facter/lib/src/facts/resolvers/gce_resolver.cc +@@ -240,7 +240,8 @@ namespace facter { namespace facts { nam + + try + { +- lth_curl::request req("http://metadata.google.internal/computeMetadata/v1beta1/?recursive=true&alt=json";); ++ lth_curl::request req("http://metadata.google.internal/computeMetadata/v1/?recursive=true&alt=json";); ++ req.add_header("Metadata-Flavor", "Google"); + req.connection_timeout(GCE_CONNECTION_TIMEOUT); + req.timeout(GCE_SESSION_TIMEOUT); + if (!http_langs().empty()) diff -Nru facter-3.11.0/debian/patches/series facter-3.11.0/debian/patches/series --- facter-3.11.0/debian/patches/series 2020-06-17 22:44:37.000000000 +0200 +++ facter-3.11.0/debian/patches/series 2020-07-28 09:15:35.000000000 +0200 @@ -6,3 +6,4 @@ 0006-FACT-1916-fix-route-parsing-on-Linux.patch 0007-Don-t-run-rspec-via-bundler.patch fix-double-tests.patch +0008-FACT-2018-update-gce-metadata-endpoint.patch
