[neon/forks/ofono/Neon/unstable] debian/patches: update to 1.34

[Carlos De Maine]

Git commit 61f10b476c138d0b9872b7e3b09152768f66f670 by Carlos De Maine.
Committed on 22/05/2022 at 10:19.
Pushed by jriddell into branch 'Neon/unstable'.

update to 1.34

M  +1    -24   debian/patches/0003-qmimodem-Allow-UMTS-and-LTE-to-fallback-to-a-lower-c.patch
M  +0    -1    debian/patches/series
D  +0    -43   debian/patches/sim-change-notification-for-pin-valies.patch

https://invent.kde.org/neon/forks/ofono/commit/61f10b476c138d0b9872b7e3b09152768f66f670

diff --git a/debian/patches/0003-qmimodem-Allow-UMTS-and-LTE-to-fallback-to-a-lower-c.patch b/debian/patches/0003-qmimodem-Allow-UMTS-and-LTE-to-fallback-to-a-lower-c.patch
index c5e94df..6e89580 100644
--- a/debian/patches/0003-qmimodem-Allow-UMTS-and-LTE-to-fallback-to-a-lower-c.patch
+++ b/debian/patches/0003-qmimodem-Allow-UMTS-and-LTE-to-fallback-to-a-lower-c.patch
@@ -6,8 +6,7 @@ Subject: [PATCH 3/4] [qmimodem] Allow UMTS and LTE to fallback to a lower
 
 ---
  drivers/qmimodem/nas.h            | 4 ++--
- drivers/qmimodem/radio-settings.c | 4 +---
- 2 files changed, 3 insertions(+), 5 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 Index: ofono-1.33/drivers/qmimodem/nas.h
 ===================================================================
@@ -23,25 +22,3 @@ Index: ofono-1.33/drivers/qmimodem/nas.h
 +#define QMI_NAS_RAT_MODE_PREF_LTE		(1 << 4) | (1 << 3) | (1 << 2)
  
  #define QMI_NAS_PARAM_SYSTEM_SELECTION_PREF_MODE	0x11
- 
-Index: ofono-1.33/drivers/qmimodem/radio-settings.c
-===================================================================
---- ofono-1.33.orig/drivers/qmimodem/radio-settings.c
-+++ ofono-1.33/drivers/qmimodem/radio-settings.c
-@@ -121,15 +121,13 @@ static void qmi_set_rat_mode(struct ofon
- 	DBG("");
- 
- 	switch (mode) {
--	case OFONO_RADIO_ACCESS_MODE_ANY:
--		pref = QMI_NAS_RAT_MODE_PREF_ANY;
--		break;
- 	case OFONO_RADIO_ACCESS_MODE_GSM:
- 		pref = QMI_NAS_RAT_MODE_PREF_GSM;
- 		break;
- 	case OFONO_RADIO_ACCESS_MODE_UMTS:
- 		pref = QMI_NAS_RAT_MODE_PREF_UMTS;
- 		break;
-+	case OFONO_RADIO_ACCESS_MODE_ANY:
- 	case OFONO_RADIO_ACCESS_MODE_LTE:
- 		pref = QMI_NAS_RAT_MODE_PREF_LTE;
- 		break;
diff --git a/debian/patches/series b/debian/patches/series
index 7a8915b..8e6b3ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ support-smdpkt.patch
 0002-Remove-After-syslog.target-from-systemd-.service-fil.patch
 
 qmimodem-correct-state-for-incoming-call.patch
-sim-change-notification-for-pin-valies.patch
 
 0001-gprs-Add-Preferred-property-to-contexts.patch
 #0002-qmimodem-Implement-data-capability-bearer-notify.patch
diff --git a/debian/patches/sim-change-notification-for-pin-valies.patch b/debian/patches/sim-change-notification-for-pin-valies.patch
deleted file mode 100644
index 1b8dfcf..0000000
--- a/debian/patches/sim-change-notification-for-pin-valies.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b102d027a00d93add88595d486172a50ba182a33 Mon Sep 17 00:00:00 2001
-From: Marius Gripsgard <marius at ubports.com>
-Date: Wed, 25 Mar 2020 03:34:36 +0100
-Subject: [PATCH] [sim] Make sure we send change notifacation for pin values
-
-This makes sure we send change notifcations if the pin values get set to
-none after sim_inserted_nofify has been called.
----
- src/sim.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-Index: ofono-1.33/src/sim.c
-===================================================================
---- ofono-1.33.orig/src/sim.c
-+++ ofono-1.33/src/sim.c
-@@ -81,6 +81,7 @@ struct ofono_sim {
- 	gboolean locked_pins[OFONO_SIM_PASSWORD_SIM_PUK]; /* Number of PINs */
- 
- 	int pin_retries[OFONO_SIM_PASSWORD_INVALID];
-+	bool pin_values_dirty;
- 
- 	enum ofono_sim_phase phase;
- 	unsigned char mnc_length;
-@@ -2927,6 +2928,8 @@ void ofono_sim_inserted_notify(struct of
- 		sim->pin_retries[OFONO_SIM_PASSWORD_SIM_PIN2] = -1;
- 		sim->pin_retries[OFONO_SIM_PASSWORD_SIM_PUK2] = -1;
- 
-+		sim->pin_values_dirty = 1;
-+
- 		pin_cache_remove(sim->iccid);
- 
- 		sim_free_state(sim);
-@@ -3216,8 +3219,9 @@ static void sim_pin_query_cb(const struc
- 
- 	pin_name = sim_passwd_name(pin_type);
- 
--	if (sim->pin_type != pin_type) {
-+	if (sim->pin_type != pin_type || sim->pin_values_dirty) {
- 		sim->pin_type = pin_type;
-+		sim->pin_values_dirty = 0;
- 
- 		if (pin_type != OFONO_SIM_PASSWORD_NONE &&
- 				password_is_pin(pin_type) == FALSE)