From b52c462cfaab9e55705295ebd689cf03b4ebb2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Tue, 4 Mar 2025 15:03:33 +0100 Subject: [PATCH] Update patches for new versions --- ...aticd-Re-enable-split-config-support.patch | 30 +++++++++++++++++++ ...add-mcast_flood_always-bridge-option.patch | 0 ...-accept-symbolic-names-also-for-show.patch | 0 ...-all-users-of-group-wheel-to-connect.patch | 0 ...rc-main-add-optional-syslog-support.patch} | 29 ++++++++---------- ...0001-src-bundle-enable-tftp-protocol.patch | 29 ------------------ 6 files changed, 43 insertions(+), 45 deletions(-) create mode 100644 patches/frr/9.1.3/0002-staticd-Re-enable-split-config-support.patch rename patches/iproute2/{6.12.0 => 6.13.0}/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch (100%) rename patches/iproute2/{6.12.0 => 6.13.0}/0002-ipaddress-accept-symbolic-names-also-for-show.patch (100%) rename patches/lldpd/{1.0.17 => 1.0.18}/0001-lldpd-allow-all-users-of-group-wheel-to-connect.patch (100%) rename patches/rauc/{1.8/0002-src-main-add-optional-syslog-support.patch => 1.13/0001-src-main-add-optional-syslog-support.patch} (79%) delete mode 100644 patches/rauc/1.8/0001-src-bundle-enable-tftp-protocol.patch diff --git a/patches/frr/9.1.3/0002-staticd-Re-enable-split-config-support.patch b/patches/frr/9.1.3/0002-staticd-Re-enable-split-config-support.patch new file mode 100644 index 00000000..92301623 --- /dev/null +++ b/patches/frr/9.1.3/0002-staticd-Re-enable-split-config-support.patch @@ -0,0 +1,30 @@ +From 5f37809521acda432d77aa4028b74c5713c2d988 Mon Sep 17 00:00:00 2001 +From: Tobias Waldekranz +Date: Wed, 20 Nov 2024 15:53:21 +0100 +Subject: [PATCH 2/2] staticd: Re-enable split config support +Organization: Addiva Elektronik + +Because we can. + +Signed-off-by: Tobias Waldekranz +--- + staticd/static_main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/staticd/static_main.c b/staticd/static_main.c +index 165fb4d65..59e924c83 100644 +--- a/staticd/static_main.c ++++ b/staticd/static_main.c +@@ -128,8 +128,7 @@ FRR_DAEMON_INFO(staticd, STATIC, .vty_port = STATIC_VTY_PORT, + + .privs = &static_privs, .yang_modules = staticd_yang_modules, + .n_yang_modules = array_size(staticd_yang_modules), +- +- .flags = FRR_NO_SPLIT_CONFIG); ++ ); + + int main(int argc, char **argv, char **envp) + { +-- +2.43.0 + diff --git a/patches/iproute2/6.12.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch b/patches/iproute2/6.13.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch similarity index 100% rename from patches/iproute2/6.12.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch rename to patches/iproute2/6.13.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch diff --git a/patches/iproute2/6.12.0/0002-ipaddress-accept-symbolic-names-also-for-show.patch b/patches/iproute2/6.13.0/0002-ipaddress-accept-symbolic-names-also-for-show.patch similarity index 100% rename from patches/iproute2/6.12.0/0002-ipaddress-accept-symbolic-names-also-for-show.patch rename to patches/iproute2/6.13.0/0002-ipaddress-accept-symbolic-names-also-for-show.patch diff --git a/patches/lldpd/1.0.17/0001-lldpd-allow-all-users-of-group-wheel-to-connect.patch b/patches/lldpd/1.0.18/0001-lldpd-allow-all-users-of-group-wheel-to-connect.patch similarity index 100% rename from patches/lldpd/1.0.17/0001-lldpd-allow-all-users-of-group-wheel-to-connect.patch rename to patches/lldpd/1.0.18/0001-lldpd-allow-all-users-of-group-wheel-to-connect.patch diff --git a/patches/rauc/1.8/0002-src-main-add-optional-syslog-support.patch b/patches/rauc/1.13/0001-src-main-add-optional-syslog-support.patch similarity index 79% rename from patches/rauc/1.8/0002-src-main-add-optional-syslog-support.patch rename to patches/rauc/1.13/0001-src-main-add-optional-syslog-support.patch index 7a47ea44..ed85c89d 100644 --- a/patches/rauc/1.8/0002-src-main-add-optional-syslog-support.patch +++ b/patches/rauc/1.13/0001-src-main-add-optional-syslog-support.patch @@ -17,11 +17,11 @@ Signed-off-by: Joachim Wiberg src/main.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) -diff --git a/src/main.c b/src/main.c -index 70bb7b5..cfc8607 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -9,6 +9,7 @@ + +diff -urN rauc-1.13.orig/src/main.c rauc-1.13/src/main.c +--- rauc-1.13.orig/src/main.c 2025-03-04 14:55:59.671534612 +0100 ++++ rauc-1.13/src/main.c 2025-03-04 14:57:13.022772424 +0100 +@@ -10,6 +10,7 @@ #include #include #include @@ -29,7 +29,7 @@ index 70bb7b5..cfc8607 100644 #include #include -@@ -1961,6 +1962,38 @@ static gboolean unknown_start(int argc, char **argv) +@@ -2460,6 +2461,38 @@ return TRUE; } @@ -68,25 +68,25 @@ index 70bb7b5..cfc8607 100644 typedef enum { UNKNOWN = 0, INSTALL, -@@ -2142,7 +2175,7 @@ static void create_option_groups(void) +@@ -2676,7 +2709,7 @@ static void cmdline_handler(int argc, char **argv) { - gboolean help = FALSE, debug = FALSE, version = FALSE; + gboolean help = FALSE, debug = FALSE, use_syslog = FALSE, version = FALSE; - gchar *confpath = NULL, *keyring = NULL, **intermediate = NULL, *mount = NULL; + g_autofree gchar *confpath = NULL, *keyring = NULL, *mount = NULL; char *cmdarg = NULL; g_autoptr(GOptionContext) context = NULL; -@@ -2155,6 +2188,7 @@ static void cmdline_handler(int argc, char **argv) - {"intermediate", '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &intermediate, "intermediate CA file name", "PEMFILE"}, +@@ -2690,6 +2723,7 @@ + {"intermediate", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME_ARRAY, &intermediate, "intermediate CA file or PKCS#11 URL", "PEMFILE|PKCS11-URL"}, {"mount", '\0', 0, G_OPTION_ARG_FILENAME, &mount, "mount prefix", "PATH"}, {"debug", 'd', 0, G_OPTION_ARG_NONE, &debug, "enable debug output", NULL}, + {"syslog", 's', 0, G_OPTION_ARG_NONE, &use_syslog, "use syslog instead of stdout", NULL}, {"version", '\0', 0, G_OPTION_ARG_NONE, &version, "display version", NULL}, - {"help", 'h', 0, G_OPTION_ARG_NONE, &help, NULL, NULL}, + {"help", 'h', 0, G_OPTION_ARG_NONE, &help, "display help and exit", NULL}, {0} -@@ -2269,6 +2303,15 @@ static void cmdline_handler(int argc, char **argv) - g_message("Debug log domains: '%s'", domains); +@@ -2816,6 +2850,15 @@ + ); } + if (use_syslog) { @@ -101,6 +101,3 @@ index 70bb7b5..cfc8607 100644 /* get first parameter without dashes */ for (gint i = 1; i <= argc; i++) { if (argv[i] && !g_str_has_prefix(argv[i], "-")) { --- -2.34.1 - diff --git a/patches/rauc/1.8/0001-src-bundle-enable-tftp-protocol.patch b/patches/rauc/1.8/0001-src-bundle-enable-tftp-protocol.patch deleted file mode 100644 index 30f501bb..00000000 --- a/patches/rauc/1.8/0001-src-bundle-enable-tftp-protocol.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6d1d38458c911b281fa7da59ce01cec590bc1c64 Mon Sep 17 00:00:00 2001 -From: Joachim Wiberg -Date: Thu, 23 Nov 2023 17:16:16 +0100 -Subject: [PATCH 1/2] src/bundle: enable tftp protocol -Organization: Addiva Elektronik - -Despite its age, TFTP still reigns strong in some sectors. Enable it -for KernelKit//Infix. - -Signed-off-by: Joachim Wiberg ---- - src/bundle.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/bundle.c b/src/bundle.c -index 05d4e72..b70e191 100644 ---- a/src/bundle.c -+++ b/src/bundle.c -@@ -1322,6 +1322,7 @@ static gboolean is_remote_scheme(const gchar *scheme) - { - return (g_strcmp0(scheme, "http") == 0) || - (g_strcmp0(scheme, "https") == 0) || -+ (g_strcmp0(scheme, "tftp") == 0) || - (g_strcmp0(scheme, "sftp") == 0) || - (g_strcmp0(scheme, "ftp") == 0); - } --- -2.34.1 -