From 87b9b235f9dce7bbae047306ab7b40fc83e717af Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 14 Jul 2022 10:02:45 +0000
Subject: [PATCH] Handle overpass shipping patch releases

Overpass has patch releases with an extended version
on the directory inside the tar ball.
---
 cookbooks/overpass/attributes/default.rb | 1 +
 cookbooks/overpass/recipes/default.rb    | 2 +-
 test/data_bags/accounts/overpass.json    | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 test/data_bags/accounts/overpass.json

diff --git a/cookbooks/overpass/attributes/default.rb b/cookbooks/overpass/attributes/default.rb
index ed1d28f97..0cfd5daba 100644
--- a/cookbooks/overpass/attributes/default.rb
+++ b/cookbooks/overpass/attributes/default.rb
@@ -1,5 +1,6 @@
 default[:overpass][:fqdn] = "overpass.openstreetmap.org"
 default[:overpass][:version] = "0.7.57"
+default[:overpass][:full_version] = "0.7.57.2"
 # One of: no, meta, attic
 default[:overpass][:meta_mode] = "attic"
 # One of: no, gz, lz4
diff --git a/cookbooks/overpass/recipes/default.rb b/cookbooks/overpass/recipes/default.rb
index 690a28445..be930135f 100644
--- a/cookbooks/overpass/recipes/default.rb
+++ b/cookbooks/overpass/recipes/default.rb
@@ -37,7 +37,7 @@ end
 
 ## Install overpass from source
 
-srcdir = "#{basedir}/src/osm-3s_v#{node[:overpass][:version]}"
+srcdir = "#{basedir}/src/osm-3s_v#{node[:overpass][:full_version]}"
 
 package %w[
   build-essential
diff --git a/test/data_bags/accounts/overpass.json b/test/data_bags/accounts/overpass.json
new file mode 100644
index 000000000..7aa7c2ba2
--- /dev/null
+++ b/test/data_bags/accounts/overpass.json
@@ -0,0 +1,6 @@
+{
+  "id": "overpass",
+  "uid": "528",
+  "comment": "query.openstreetmap.org",
+  "home": "/srv/query.openstreetmap.org"
+}
-- 
2.39.5