diff options
| -rw-r--r-- | meta/recipes-connectivity/ppp/ppp/0001-pppdump-Fixed-building-with-GCC-15-548.patch | 75 | ||||
| -rw-r--r-- | meta/recipes-connectivity/ppp/ppp_2.5.2.bb | 1 |
2 files changed, 76 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppdump-Fixed-building-with-GCC-15-548.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppdump-Fixed-building-with-GCC-15-548.patch new file mode 100644 index 0000000000..2a3b3cc84a --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppdump-Fixed-building-with-GCC-15-548.patch | |||
| @@ -0,0 +1,75 @@ | |||
| 1 | From 44a766a3d086f10cb584a0c423e5bed6af2e3615 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com> | ||
| 3 | Date: Thu, 27 Feb 2025 23:00:16 +0100 | ||
| 4 | Subject: [PATCH] pppdump: Fixed building with GCC 15 (#548) | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | GCC 15 defaults to C23 which does not allow K&R declarations. | ||
| 10 | |||
| 11 | Credit Yaakov Selkowitz in: | ||
| 12 | https://src.fedoraproject.org/rpms/ppp/pull-request/12 | ||
| 13 | |||
| 14 | Upstream-Status: Backport [https://github.com/ppp-project/ppp/pull/548] | ||
| 15 | |||
| 16 | Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com> | ||
| 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 18 | --- | ||
| 19 | pppdump/pppdump.c | 20 +++++++------------- | ||
| 20 | 1 file changed, 7 insertions(+), 13 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c | ||
| 23 | index c24208a..1534036 100644 | ||
| 24 | --- a/pppdump/pppdump.c | ||
| 25 | +++ b/pppdump/pppdump.c | ||
| 26 | @@ -42,14 +42,12 @@ int tot_sent, tot_rcvd; | ||
| 27 | extern int optind; | ||
| 28 | extern char *optarg; | ||
| 29 | |||
| 30 | -void dumplog(); | ||
| 31 | -void dumpppp(); | ||
| 32 | -void show_time(); | ||
| 33 | +void dumplog(FILE *); | ||
| 34 | +void dumpppp(FILE *); | ||
| 35 | +void show_time(FILE *, int); | ||
| 36 | |||
| 37 | int | ||
| 38 | -main(ac, av) | ||
| 39 | - int ac; | ||
| 40 | - char **av; | ||
| 41 | +main(int ac, char **av) | ||
| 42 | { | ||
| 43 | int i; | ||
| 44 | char *p; | ||
| 45 | @@ -97,8 +95,7 @@ main(ac, av) | ||
| 46 | } | ||
| 47 | |||
| 48 | void | ||
| 49 | -dumplog(f) | ||
| 50 | - FILE *f; | ||
| 51 | +dumplog(FILE *f) | ||
| 52 | { | ||
| 53 | int c, n, k, col; | ||
| 54 | int nb, c2; | ||
| 55 | @@ -241,8 +238,7 @@ struct pkt { | ||
| 56 | unsigned char dbuf[8192]; | ||
| 57 | |||
| 58 | void | ||
| 59 | -dumpppp(f) | ||
| 60 | - FILE *f; | ||
| 61 | +dumpppp(FILE *f) | ||
| 62 | { | ||
| 63 | int c, n, k; | ||
| 64 | int nb, nl, dn, proto, rv; | ||
| 65 | @@ -375,9 +371,7 @@ dumpppp(f) | ||
| 66 | } | ||
| 67 | |||
| 68 | void | ||
| 69 | -show_time(f, c) | ||
| 70 | - FILE *f; | ||
| 71 | - int c; | ||
| 72 | +show_time(FILE *f, int c) | ||
| 73 | { | ||
| 74 | time_t t; | ||
| 75 | int n; | ||
diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb index 9ea99cc15a..5565ce51cf 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb | |||
| @@ -23,6 +23,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ | |||
| 23 | file://ppp_on_boot \ | 23 | file://ppp_on_boot \ |
| 24 | file://provider \ | 24 | file://provider \ |
| 25 | file://ppp@.service \ | 25 | file://ppp@.service \ |
| 26 | file://0001-pppdump-Fixed-building-with-GCC-15-548.patch \ | ||
| 26 | " | 27 | " |
| 27 | 28 | ||
| 28 | SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" | 29 | SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" |
