Hi,

attached is debdiff for a potential stable upload.
Also available at salsa as a MR for the stable branch
https://salsa.debian.org/puppet-team/facter/-/merge_requests/1?commit_id=98e5f769a84d029a6ac39aac27a05c0506547f36

Cheers,
Sven
diff -Nru facter-3.11.0/debian/changelog facter-3.11.0/debian/changelog
--- facter-3.11.0/debian/changelog	2019-07-17 22:04:05.000000000 +0200
+++ facter-3.11.0/debian/changelog	2020-07-27 17:27:11.000000000 +0200
@@ -1,3 +1,11 @@
+facter (3.11.0-2+deb10u2) buster; urgency=medium
+
+  * Change Google GCE Metadata endpoint from "v1beta1" to "v1".
+    Adds patch debian/patches/FACT-2018-update-gce-metadata-endpoint.patch
+    (Closes: #966374)
+
+ -- Sven Hoexter <[email protected]>  Mon, 27 Jul 2020 17:27:11 +0200
+
 facter (3.11.0-2+deb10u1) buster; urgency=medium
 
   * Fix parsing of Linux route non-kv flags (e.g. onlink) (Closes: #918250)
diff -Nru facter-3.11.0/debian/patches/FACT-2018-update-gce-metadata-endpoint.patch facter-3.11.0/debian/patches/FACT-2018-update-gce-metadata-endpoint.patch
--- facter-3.11.0/debian/patches/FACT-2018-update-gce-metadata-endpoint.patch	1970-01-01 01:00:00.000000000 +0100
+++ facter-3.11.0/debian/patches/FACT-2018-update-gce-metadata-endpoint.patch	2020-07-27 17:27:11.000000000 +0200
@@ -0,0 +1,30 @@
+From: Gabriel Nagy <[email protected]>
+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	2019-07-17 22:03:31.000000000 +0200
+++ facter-3.11.0/debian/patches/series	2020-07-27 17:27:11.000000000 +0200
@@ -1,3 +1,4 @@
+FACT-2018-update-gce-metadata-endpoint.patch
 use-shared-cpp-hocon.patch
 ruby-fix-library-name.patch
 disable-facter-smoke.patch

Reply via email to