diff options
| -rw-r--r-- | meta-networking/recipes-protocols/xl2tpd/xl2tpd/0001-Fix-build-with-GCC-15.patch | 39 | ||||
| -rw-r--r-- | meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb | 4 |
2 files changed, 42 insertions, 1 deletions
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd/0001-Fix-build-with-GCC-15.patch b/meta-networking/recipes-protocols/xl2tpd/xl2tpd/0001-Fix-build-with-GCC-15.patch new file mode 100644 index 0000000000..2ba927bf0e --- /dev/null +++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd/0001-Fix-build-with-GCC-15.patch | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | From 754b0ca247b2d789f9f613f8757b9732494e9489 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yaakov Selkowitz <yselkowi@redhat.com> | ||
| 3 | Date: Thu, 6 Mar 2025 21:03:28 -0500 | ||
| 4 | Subject: [PATCH] Fix build with GCC 15 | ||
| 5 | |||
| 6 | GCC 15 defaults to C23, in which the interpretation of function | ||
| 7 | declarations without parameters changed from unspecified to `void`. This | ||
| 8 | results in `control_handle_lac_status` not being compatible with the | ||
| 9 | expected callback function type. Adding the expected type parameters, | ||
| 10 | albeit unused, fixes the compatibility. | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/xelerance/xl2tpd/pull/272] | ||
| 13 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
| 14 | --- | ||
| 15 | xl2tpd.c | 4 ++-- | ||
| 16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/xl2tpd.c b/xl2tpd.c | ||
| 19 | index 3195988..0d148e9 100644 | ||
| 20 | --- a/xl2tpd.c | ||
| 21 | +++ b/xl2tpd.c | ||
| 22 | @@ -74,7 +74,7 @@ static int control_handle_lac_hangup(FILE* resf, char* bufp); | ||
| 23 | static int control_handle_lac_disconnect(FILE* resf, char* bufp); | ||
| 24 | static int control_handle_lac_add_modify(FILE* resf, char* bufp); | ||
| 25 | static int control_handle_lac_remove(FILE* resf, char* bufp); | ||
| 26 | -static int control_handle_lac_status(); | ||
| 27 | +static int control_handle_lac_status(FILE*, char*); | ||
| 28 | static int control_handle_lns_remove(FILE* resf, char* bufp); | ||
| 29 | |||
| 30 | static struct control_requests_handler control_handlers[] = { | ||
| 31 | @@ -1541,7 +1541,7 @@ static int control_handle_lac_remove(FILE* resf, char* bufp){ | ||
| 32 | return 1; | ||
| 33 | } | ||
| 34 | |||
| 35 | -static int control_handle_lac_status(){ | ||
| 36 | +static int control_handle_lac_status(FILE*, char*){ | ||
| 37 | show_status (); | ||
| 38 | return 1; | ||
| 39 | } | ||
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb index 08bab4a338..0b7887dacb 100644 --- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb +++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb | |||
| @@ -8,7 +8,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
| 8 | LICENSE = "GPL-2.0-only" | 8 | LICENSE = "GPL-2.0-only" |
| 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/xelerance/xl2tpd.git;branch=master;protocol=https" | 11 | SRC_URI = "git://github.com/xelerance/xl2tpd.git;branch=master;protocol=https \ |
| 12 | file://0001-Fix-build-with-GCC-15.patch \ | ||
| 13 | " | ||
| 12 | SRCREV = "1ef2a025981223c1e16fc833bef226c86ff8c295" | 14 | SRCREV = "1ef2a025981223c1e16fc833bef226c86ff8c295" |
| 13 | 15 | ||
| 14 | UPSTREAM_CHECK_URI = "https://github.com/xelerance/xl2tpd/releases" | 16 | UPSTREAM_CHECK_URI = "https://github.com/xelerance/xl2tpd/releases" |
