From f1bd38dc4497f8276be80f7f652dd1ecf8fe3a27 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 30 Mar 2025 13:17:43 +0200
Subject: [PATCH] opkg: do not preserve opkg keys on upgrades by default
Custom keys can still be preserved by listing them in sysupgrade.conf.
This is a temporary solution for the remaining life of opkg; a better,
upstreamable solution will be implemented when switching to apk (if it
is still necessary).
---
...rve-opkg-keys-on-upgrades-by-default.patch | 20 +++++++++++++++++++
...ake-up-calls-Android-bug-workaround.patch} | 0
...arning-for-missing-rate-information.patch} | 0
...e-incompatible-basic-rates-for-mesh.patch} | 0
...ce-backwards-compatible-basic-rates.patch} | 0
...9-mt76-import-MT7915-recovery-fixes.patch} | 0
6 files changed, 20 insertions(+)
create mode 100644 patches/openwrt/0004-HACK-opkg-do-not-preserve-opkg-keys-on-upgrades-by-default.patch
rename patches/openwrt/{0004-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch => 0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch} (100%)
rename patches/openwrt/{0005-mac80211-silence-warning-for-missing-rate-information.patch => 0006-mac80211-silence-warning-for-missing-rate-information.patch} (100%)
rename patches/openwrt/{0006-net-mac80211-override-incompatible-basic-rates-for-mesh.patch => 0007-net-mac80211-override-incompatible-basic-rates-for-mesh.patch} (100%)
rename patches/openwrt/{0007-net-mac80211-force-backwards-compatible-basic-rates.patch => 0008-net-mac80211-force-backwards-compatible-basic-rates.patch} (100%)
rename patches/openwrt/{0008-mt76-import-MT7915-recovery-fixes.patch => 0009-mt76-import-MT7915-recovery-fixes.patch} (100%)
diff --git a/patches/openwrt/0004-HACK-opkg-do-not-preserve-opkg-keys-on-upgrades-by-default.patch b/patches/openwrt/0004-HACK-opkg-do-not-preserve-opkg-keys-on-upgrades-by-default.patch
new file mode 100644
index 000000000..510372956
--- /dev/null
+++ b/patches/openwrt/0004-HACK-opkg-do-not-preserve-opkg-keys-on-upgrades-by-default.patch
@@ -0,0 +1,20 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Sun, 30 Mar 2025 13:16:02 +0200
+Subject: HACK: opkg: do not preserve opkg keys on upgrades by default
+
+Custom keys can still be preserved by listing them in sysupgrade.conf.
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
+index e7c45e3523135a6cc35385a81c65cf2831b842bb..fc5ec6a7ed1eb559a478b00b03102fbccd543c57 100644
+--- a/package/system/opkg/Makefile
++++ b/package/system/opkg/Makefile
+@@ -56,7 +56,6 @@ endef
+
+ define Package/opkg/conffiles
+ /etc/opkg.conf
+-/etc/opkg/keys/
+ /etc/opkg/customfeeds.conf
+ endef
+
diff --git a/patches/openwrt/0004-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch b/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
similarity index 100%
rename from patches/openwrt/0004-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
rename to patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
diff --git a/patches/openwrt/0005-mac80211-silence-warning-for-missing-rate-information.patch b/patches/openwrt/0006-mac80211-silence-warning-for-missing-rate-information.patch
similarity index 100%
rename from patches/openwrt/0005-mac80211-silence-warning-for-missing-rate-information.patch
rename to patches/openwrt/0006-mac80211-silence-warning-for-missing-rate-information.patch
diff --git a/patches/openwrt/0006-net-mac80211-override-incompatible-basic-rates-for-mesh.patch b/patches/openwrt/0007-net-mac80211-override-incompatible-basic-rates-for-mesh.patch
similarity index 100%
rename from patches/openwrt/0006-net-mac80211-override-incompatible-basic-rates-for-mesh.patch
rename to patches/openwrt/0007-net-mac80211-override-incompatible-basic-rates-for-mesh.patch
diff --git a/patches/openwrt/0007-net-mac80211-force-backwards-compatible-basic-rates.patch b/patches/openwrt/0008-net-mac80211-force-backwards-compatible-basic-rates.patch
similarity index 100%
rename from patches/openwrt/0007-net-mac80211-force-backwards-compatible-basic-rates.patch
rename to patches/openwrt/0008-net-mac80211-force-backwards-compatible-basic-rates.patch
diff --git a/patches/openwrt/0008-mt76-import-MT7915-recovery-fixes.patch b/patches/openwrt/0009-mt76-import-MT7915-recovery-fixes.patch
similarity index 100%
rename from patches/openwrt/0008-mt76-import-MT7915-recovery-fixes.patch
rename to patches/openwrt/0009-mt76-import-MT7915-recovery-fixes.patch
--
GitLab