From 63230172e442ac55db7bc3ba0bd54f842c210edd Mon Sep 17 00:00:00 2001 From: apt-ghetto Date: Wed, 2 Dec 2020 16:09:17 -0500 Subject: [PATCH] Lubuntu: Fix GeoIP parsing Summary: With the recent switch of the GeoIP service, the format has also changed from JSON to XML. This was not correctly changed in the welcome module for Lubuntu. Test Plan: 1. Start Calamares (e.g. with an IP address from Europe). 2. Check, that the language is set correctly (e.g. French when in France). Reviewers: wxl, tsimonq2, kc2bez Reviewed By: wxl, kc2bez Differential Revision: https://phab.lubuntu.me/D101 --- debian/changelog | 7 +++++++ lubuntu/modules/locale.conf | 2 +- lubuntu/modules/welcome.conf | 4 ++-- ubuntustudio/modules/locale.conf | 2 +- ubuntustudio/modules/welcome.conf | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 96a889b..8e32f0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +calamares-settings-ubuntu (1:21.04.1) hirsute; urgency=medium + + * Fix GeoIP parsing for Lubuntu in welcome module. + * Use https for the GeoIP lookup + + -- apt-ghetto Sat, 24 Oct 2020 10:47:15 +0200 + calamares-settings-ubuntu (1:20.10.11) groovy; urgency=medium * Switch to Canonical's GeoIP service. diff --git a/lubuntu/modules/locale.conf b/lubuntu/modules/locale.conf index 1b72f6a..51e5e15 100644 --- a/lubuntu/modules/locale.conf +++ b/lubuntu/modules/locale.conf @@ -4,5 +4,5 @@ zone: "New_York" localeGenPath: "/etc/locale.gen" geoip: style: "xml" - url: "http://geoip.ubuntu.com/lookup" + url: "https://geoip.ubuntu.com/lookup" selector: "TimeZone" diff --git a/lubuntu/modules/welcome.conf b/lubuntu/modules/welcome.conf index 85bab77..2256a29 100644 --- a/lubuntu/modules/welcome.conf +++ b/lubuntu/modules/welcome.conf @@ -20,6 +20,6 @@ requirements: - storage - ram geoip: - style: "json" - url: "http://geoip.ubuntu.com/lookup" + style: "xml" + url: "https://geoip.ubuntu.com/lookup" selector: "CountryCode" diff --git a/ubuntustudio/modules/locale.conf b/ubuntustudio/modules/locale.conf index 1b72f6a..51e5e15 100644 --- a/ubuntustudio/modules/locale.conf +++ b/ubuntustudio/modules/locale.conf @@ -4,5 +4,5 @@ zone: "New_York" localeGenPath: "/etc/locale.gen" geoip: style: "xml" - url: "http://geoip.ubuntu.com/lookup" + url: "https://geoip.ubuntu.com/lookup" selector: "TimeZone" diff --git a/ubuntustudio/modules/welcome.conf b/ubuntustudio/modules/welcome.conf index 59662e5..7318fdd 100644 --- a/ubuntustudio/modules/welcome.conf +++ b/ubuntustudio/modules/welcome.conf @@ -21,5 +21,5 @@ requirements: - ram geoip: style: "xml" - url: "http://geoip.ubuntu.com/lookup" + url: "https://geoip.ubuntu.com/lookup" selector: "CountryCode"