| Message ID | 20260602070344.1163210-1-peng.zhang1.cn@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [master,wrynose] ppp: upgrade 2.5.2 -> 2.5.3 | expand |
This has new features, it has been developed on master branch upstream, and so isn't eligible for wrynose backport. Chen, Daniel: this is why point releases can't be automatically considered 'bugfix only'. Plenty of projects where that isn't the case. Alex On Tue, 2 Jun 2026 at 09:04, Zhang, Peng (Paul) (CN) via lists.openembedded.org <peng.zhang1.cn=windriver.com@lists.openembedded.org> wrote: > > From: Zhang Peng <peng.zhang1.cn@windriver.com> > > ChangeLog: > https://github.com/ppp-project/ppp/releases/tag/v2.5.3 > > Drop backported patches: > - 0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch > - 0001-pppdump-Fixed-building-with-GCC-15-548.patch > - 0001-pppd-session-Fixed-building-with-GCC-15.patch > > Add ppp-dhcpv6relay package for newly added dhcpv6relay plugin. > > Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com> > --- > ....h-remove-erroneous-generated-header.patch | 98 ------------------- > ...d-session-Fixed-building-with-GCC-15.patch | 33 ------- > ...pdump-Fixed-building-with-GCC-15-548.patch | 75 -------------- > .../ppp/{ppp_2.5.2.bb => ppp_2.5.3.bb} | 9 +- > 4 files changed, 4 insertions(+), 211 deletions(-) > delete mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch > delete mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch > delete mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppdump-Fixed-building-with-GCC-15-548.patch > rename meta/recipes-connectivity/ppp/{ppp_2.5.2.bb => ppp_2.5.3.bb} (91%) > > diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch > deleted file mode 100644 > index a00706c184..0000000000 > --- a/meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch > +++ /dev/null > @@ -1,98 +0,0 @@ > -From a6eb65162db5bcc5ec26cff7361885c0a44cbbfa Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin <alex@linutronix.de> > -Date: Mon, 17 Mar 2025 11:12:07 +0100 > -Subject: [PATCH] pppd/pppdconf.h: remove erroneous generated header > - > -Upstream-Status: Inappropriate [tarball generation issue tracked at https://github.com/ppp-project/ppp/issues/541] > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > ---- > - pppd/pppdconf.h | 80 ------------------------------------------------- > - 1 file changed, 80 deletions(-) > - delete mode 100644 pppd/pppdconf.h > - > -diff --git a/pppd/pppdconf.h b/pppd/pppdconf.h > -deleted file mode 100644 > -index 51a8f02..0000000 > ---- a/pppd/pppdconf.h > -+++ /dev/null > -@@ -1,80 +0,0 @@ > --/* pppd/pppdconf.h. Generated from pppdconf.h.in by configure. */ > --/* > -- * Copyright (c) 2022 Eivind Næss. All rights reserved. > -- * > -- * Redistribution and use in source and binary forms, with or without > -- * modification, are permitted provided that the following conditions > -- * are met: > -- * > -- * 1. Redistributions of source code must retain the above copyright > -- * notice, this list of conditions and the following disclaimer. > -- * > -- * 2. Redistributions in binary form must reproduce the above copyright > -- * notice, this list of conditions and the following disclaimer in > -- * the documentation and/or other materials provided with the > -- * distribution. > -- * > -- * 3. The name(s) of the authors of this software must not be used to > -- * endorse or promote products derived from this software without > -- * prior written permission. > -- * > -- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO > -- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY > -- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY > -- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES > -- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN > -- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING > -- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. > -- */ > -- > --/* > -- * This file is generated by configure and sets the features enabled > -- * in pppd when configured. > -- */ > -- > --#ifndef PPP_PPPDCONF_H > --#define PPP_PPPDCONF_H > -- > --/* Have Microsoft CHAP support */ > --#define PPP_WITH_CHAPMS 1 > -- > --/* Have Microsoft LAN Manager support */ > --/* #undef PPP_WITH_MSLANMAN */ > -- > --/* Have Microsoft MPPE support */ > --#define PPP_WITH_MPPE 1 > -- > --/* Have multilink support */ > --#define PPP_WITH_MULTILINK 1 > -- > --/* Have packet activity filter support */ > --#define PPP_WITH_FILTER 1 > -- > --/* Have support for loadable plugins */ > --#define PPP_WITH_PLUGINS 1 > -- > --/* Have Callback Protocol support */ > --/* #undef PPP_WITH_CBCP */ > -- > --/* Include TDB support */ > --#define PPP_WITH_TDB 1 > -- > --/* Have IPv6 Control Protocol */ > --#define PPP_WITH_IPV6CP 1 > -- > --/* Support for Pluggable Authentication Modules */ > --/* #undef PPP_WITH_PAM */ > -- > --/* Have EAP-SRP authentication support */ > --/* #undef PPP_WITH_SRP */ > -- > --/* Have EAP-TLS authentication support */ > --#define PPP_WITH_EAPTLS 1 > -- > --/* Have PEAP authentication support */ > --#define PPP_WITH_PEAP 1 > -- > --/* The pppd version */ > --#define PPPD_VERSION "2.5.2" > -- > --#endif > diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch > deleted file mode 100644 > index d95c72e96b..0000000000 > --- a/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From 5edcb01f1d8d521c819d45df1f1bb87697252130 Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Mon, 17 Mar 2025 14:38:26 -0700 > -Subject: [PATCH] pppd/session: Fixed building with GCC 15 > - > -Fixed building with GCC 15 which defaults to C23 > -and find conflicting declration of getspnam() here > -with the one provided by shadow.h (extern struct spwd *getspnam (const char *__name);) > - > -Fixes > -../../ppp-2.5.2/pppd/session.c: In function 'session_start': > -../../ppp-2.5.2/pppd/session.c:185:18: error: conflicting types for 'getspnam'; have 'struct spwd *(void)' > - 185 | struct spwd *getspnam(); > - | ^~~~~~~~ > - > -Upstream-Status: Submitted [https://github.com/ppp-project/ppp/pull/553] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - pppd/session.c | 1 - > - 1 file changed, 1 deletion(-) > - > -diff --git a/pppd/session.c b/pppd/session.c > -index f08d8e1..9cc7538 100644 > ---- a/pppd/session.c > -+++ b/pppd/session.c > -@@ -182,7 +182,6 @@ session_start(const int flags, const char *user, const char *passwd, const char > - char *cbuf; > - #ifdef HAVE_SHADOW_H > - struct spwd *spwd; > -- struct spwd *getspnam(); > - long now = 0; > - #endif /* #ifdef HAVE_SHADOW_H */ > - #endif /* #ifdef PPP_WITH_PAM */ > 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 > deleted file mode 100644 > index 2a3b3cc84a..0000000000 > --- a/meta/recipes-connectivity/ppp/ppp/0001-pppdump-Fixed-building-with-GCC-15-548.patch > +++ /dev/null > @@ -1,75 +0,0 @@ > -From 44a766a3d086f10cb584a0c423e5bed6af2e3615 Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com> > -Date: Thu, 27 Feb 2025 23:00:16 +0100 > -Subject: [PATCH] pppdump: Fixed building with GCC 15 (#548) > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -GCC 15 defaults to C23 which does not allow K&R declarations. > - > -Credit Yaakov Selkowitz in: > -https://src.fedoraproject.org/rpms/ppp/pull-request/12 > - > -Upstream-Status: Backport [https://github.com/ppp-project/ppp/pull/548] > - > -Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com> > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - pppdump/pppdump.c | 20 +++++++------------- > - 1 file changed, 7 insertions(+), 13 deletions(-) > - > -diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c > -index c24208a..1534036 100644 > ---- a/pppdump/pppdump.c > -+++ b/pppdump/pppdump.c > -@@ -42,14 +42,12 @@ int tot_sent, tot_rcvd; > - extern int optind; > - extern char *optarg; > - > --void dumplog(); > --void dumpppp(); > --void show_time(); > -+void dumplog(FILE *); > -+void dumpppp(FILE *); > -+void show_time(FILE *, int); > - > - int > --main(ac, av) > -- int ac; > -- char **av; > -+main(int ac, char **av) > - { > - int i; > - char *p; > -@@ -97,8 +95,7 @@ main(ac, av) > - } > - > - void > --dumplog(f) > -- FILE *f; > -+dumplog(FILE *f) > - { > - int c, n, k, col; > - int nb, c2; > -@@ -241,8 +238,7 @@ struct pkt { > - unsigned char dbuf[8192]; > - > - void > --dumpppp(f) > -- FILE *f; > -+dumpppp(FILE *f) > - { > - int c, n, k; > - int nb, nl, dn, proto, rv; > -@@ -375,9 +371,7 @@ dumpppp(f) > - } > - > - void > --show_time(f, c) > -- FILE *f; > -- int c; > -+show_time(FILE *f, int c) > - { > - time_t t; > - int n; > diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb b/meta/recipes-connectivity/ppp/ppp_2.5.3.bb > similarity index 91% > rename from meta/recipes-connectivity/ppp/ppp_2.5.2.bb > rename to meta/recipes-connectivity/ppp/ppp_2.5.3.bb > index 607678db8b..435559a815 100644 > --- a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb > +++ b/meta/recipes-connectivity/ppp/ppp_2.5.3.bb > @@ -23,12 +23,9 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ > file://ppp_on_boot \ > file://provider \ > file://ppp@.service \ > - file://0001-pppdump-Fixed-building-with-GCC-15-548.patch \ > - file://0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch \ > - file://0001-pppd-session-Fixed-building-with-GCC-15.patch \ > " > > -SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" > +SRC_URI[sha256sum] = "ddda28dec8aca99a403ab6070d94ffd2b17d63e9a4c5509158e99e148f572d4f" > > inherit autotools pkgconfig systemd > > @@ -60,7 +57,7 @@ do_install:append () { > } > > CONFFILES:${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" > -PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools" > +PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools ${PN}-dhcpv6relay" > FILES:${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_system_unitdir}/ppp@.service" > FILES:${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" > FILES:${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/*pppoe.so" > @@ -70,6 +67,7 @@ FILES:${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so" > FILES:${PN}-password = "${libdir}/pppd/${PV}/pass*.so" > FILES:${PN}-l2tp = "${libdir}/pppd/${PV}/*l2tp.so" > FILES:${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump" > +FILES:${PN}-dhcpv6relay = "${libdir}/pppd/${PV}/dhcpv6relay.so" > SUMMARY:${PN}-oa = "Plugin for PPP for PPP-over-ATM support" > SUMMARY:${PN}-oe = "Plugin for PPP for PPP-over-Ethernet support" > SUMMARY:${PN}-radius = "Plugin for PPP for RADIUS support" > @@ -78,4 +76,5 @@ SUMMARY:${PN}-minconn = "Plugin for PPP to set a delay before the idle timeout > SUMMARY:${PN}-password = "Plugin for PPP to get passwords via a pipe" > SUMMARY:${PN}-l2tp = "Plugin for PPP for l2tp support" > SUMMARY:${PN}-tools = "Additional tools for the PPP package" > +SUMMARY:${PN}-dhcpv6relay = "Plugin for PPP for DHCPv6 relay agent support" > > -- > 2.50.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#238010): https://lists.openembedded.org/g/openembedded-core/message/238010 > Mute This Topic: https://lists.openembedded.org/mt/119607595/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 6/2/26 15:27, Alexander Kanavin wrote: > This has new features, it has been developed on master branch > upstream, and so isn't eligible for wrynose backport. > > Chen, Daniel: this is why point releases can't be automatically > considered 'bugfix only'. Plenty of projects where that isn't the > case. > > Alex Yes. I learnt about this just a few weeks ago. I guess I'm not the only one who did not know about this. Many other YP developers out there are also not aware of the situation. Having recipes carefully checked and setting UPSTREAM_STABLE_RELEASE_REGEX appropriately will make things clear to YP developers. Regards, Qi > > On Tue, 2 Jun 2026 at 09:04, Zhang, Peng (Paul) (CN) via > lists.openembedded.org > <peng.zhang1.cn=windriver.com@lists.openembedded.org> wrote: >> From: Zhang Peng <peng.zhang1.cn@windriver.com> >> >> ChangeLog: >> https://github.com/ppp-project/ppp/releases/tag/v2.5.3 >> >> Drop backported patches: >> - 0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch >> - 0001-pppdump-Fixed-building-with-GCC-15-548.patch >> - 0001-pppd-session-Fixed-building-with-GCC-15.patch >> >> Add ppp-dhcpv6relay package for newly added dhcpv6relay plugin. >> >> Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com> >> --- >> ....h-remove-erroneous-generated-header.patch | 98 ------------------- >> ...d-session-Fixed-building-with-GCC-15.patch | 33 ------- >> ...pdump-Fixed-building-with-GCC-15-548.patch | 75 -------------- >> .../ppp/{ppp_2.5.2.bb => ppp_2.5.3.bb} | 9 +- >> 4 files changed, 4 insertions(+), 211 deletions(-) >> delete mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch >> delete mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch >> delete mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppdump-Fixed-building-with-GCC-15-548.patch >> rename meta/recipes-connectivity/ppp/{ppp_2.5.2.bb => ppp_2.5.3.bb} (91%) >> >> diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch >> deleted file mode 100644 >> index a00706c184..0000000000 >> --- a/meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch >> +++ /dev/null >> @@ -1,98 +0,0 @@ >> -From a6eb65162db5bcc5ec26cff7361885c0a44cbbfa Mon Sep 17 00:00:00 2001 >> -From: Alexander Kanavin <alex@linutronix.de> >> -Date: Mon, 17 Mar 2025 11:12:07 +0100 >> -Subject: [PATCH] pppd/pppdconf.h: remove erroneous generated header >> - >> -Upstream-Status: Inappropriate [tarball generation issue tracked at https://github.com/ppp-project/ppp/issues/541] >> -Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> ---- >> - pppd/pppdconf.h | 80 ------------------------------------------------- >> - 1 file changed, 80 deletions(-) >> - delete mode 100644 pppd/pppdconf.h >> - >> -diff --git a/pppd/pppdconf.h b/pppd/pppdconf.h >> -deleted file mode 100644 >> -index 51a8f02..0000000 >> ---- a/pppd/pppdconf.h >> -+++ /dev/null >> -@@ -1,80 +0,0 @@ >> --/* pppd/pppdconf.h. Generated from pppdconf.h.in by configure. */ >> --/* >> -- * Copyright (c) 2022 Eivind Næss. All rights reserved. >> -- * >> -- * Redistribution and use in source and binary forms, with or without >> -- * modification, are permitted provided that the following conditions >> -- * are met: >> -- * >> -- * 1. Redistributions of source code must retain the above copyright >> -- * notice, this list of conditions and the following disclaimer. >> -- * >> -- * 2. Redistributions in binary form must reproduce the above copyright >> -- * notice, this list of conditions and the following disclaimer in >> -- * the documentation and/or other materials provided with the >> -- * distribution. >> -- * >> -- * 3. The name(s) of the authors of this software must not be used to >> -- * endorse or promote products derived from this software without >> -- * prior written permission. >> -- * >> -- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO >> -- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY >> -- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY >> -- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES >> -- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN >> -- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING >> -- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. >> -- */ >> -- >> --/* >> -- * This file is generated by configure and sets the features enabled >> -- * in pppd when configured. >> -- */ >> -- >> --#ifndef PPP_PPPDCONF_H >> --#define PPP_PPPDCONF_H >> -- >> --/* Have Microsoft CHAP support */ >> --#define PPP_WITH_CHAPMS 1 >> -- >> --/* Have Microsoft LAN Manager support */ >> --/* #undef PPP_WITH_MSLANMAN */ >> -- >> --/* Have Microsoft MPPE support */ >> --#define PPP_WITH_MPPE 1 >> -- >> --/* Have multilink support */ >> --#define PPP_WITH_MULTILINK 1 >> -- >> --/* Have packet activity filter support */ >> --#define PPP_WITH_FILTER 1 >> -- >> --/* Have support for loadable plugins */ >> --#define PPP_WITH_PLUGINS 1 >> -- >> --/* Have Callback Protocol support */ >> --/* #undef PPP_WITH_CBCP */ >> -- >> --/* Include TDB support */ >> --#define PPP_WITH_TDB 1 >> -- >> --/* Have IPv6 Control Protocol */ >> --#define PPP_WITH_IPV6CP 1 >> -- >> --/* Support for Pluggable Authentication Modules */ >> --/* #undef PPP_WITH_PAM */ >> -- >> --/* Have EAP-SRP authentication support */ >> --/* #undef PPP_WITH_SRP */ >> -- >> --/* Have EAP-TLS authentication support */ >> --#define PPP_WITH_EAPTLS 1 >> -- >> --/* Have PEAP authentication support */ >> --#define PPP_WITH_PEAP 1 >> -- >> --/* The pppd version */ >> --#define PPPD_VERSION "2.5.2" >> -- >> --#endif >> diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch >> deleted file mode 100644 >> index d95c72e96b..0000000000 >> --- a/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch >> +++ /dev/null >> @@ -1,33 +0,0 @@ >> -From 5edcb01f1d8d521c819d45df1f1bb87697252130 Mon Sep 17 00:00:00 2001 >> -From: Khem Raj <raj.khem@gmail.com> >> -Date: Mon, 17 Mar 2025 14:38:26 -0700 >> -Subject: [PATCH] pppd/session: Fixed building with GCC 15 >> - >> -Fixed building with GCC 15 which defaults to C23 >> -and find conflicting declration of getspnam() here >> -with the one provided by shadow.h (extern struct spwd *getspnam (const char *__name);) >> - >> -Fixes >> -../../ppp-2.5.2/pppd/session.c: In function 'session_start': >> -../../ppp-2.5.2/pppd/session.c:185:18: error: conflicting types for 'getspnam'; have 'struct spwd *(void)' >> - 185 | struct spwd *getspnam(); >> - | ^~~~~~~~ >> - >> -Upstream-Status: Submitted [https://github.com/ppp-project/ppp/pull/553] >> -Signed-off-by: Khem Raj <raj.khem@gmail.com> >> ---- >> - pppd/session.c | 1 - >> - 1 file changed, 1 deletion(-) >> - >> -diff --git a/pppd/session.c b/pppd/session.c >> -index f08d8e1..9cc7538 100644 >> ---- a/pppd/session.c >> -+++ b/pppd/session.c >> -@@ -182,7 +182,6 @@ session_start(const int flags, const char *user, const char *passwd, const char >> - char *cbuf; >> - #ifdef HAVE_SHADOW_H >> - struct spwd *spwd; >> -- struct spwd *getspnam(); >> - long now = 0; >> - #endif /* #ifdef HAVE_SHADOW_H */ >> - #endif /* #ifdef PPP_WITH_PAM */ >> 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 >> deleted file mode 100644 >> index 2a3b3cc84a..0000000000 >> --- a/meta/recipes-connectivity/ppp/ppp/0001-pppdump-Fixed-building-with-GCC-15-548.patch >> +++ /dev/null >> @@ -1,75 +0,0 @@ >> -From 44a766a3d086f10cb584a0c423e5bed6af2e3615 Mon Sep 17 00:00:00 2001 >> -From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com> >> -Date: Thu, 27 Feb 2025 23:00:16 +0100 >> -Subject: [PATCH] pppdump: Fixed building with GCC 15 (#548) >> -MIME-Version: 1.0 >> -Content-Type: text/plain; charset=UTF-8 >> -Content-Transfer-Encoding: 8bit >> - >> -GCC 15 defaults to C23 which does not allow K&R declarations. >> - >> -Credit Yaakov Selkowitz in: >> -https://src.fedoraproject.org/rpms/ppp/pull-request/12 >> - >> -Upstream-Status: Backport [https://github.com/ppp-project/ppp/pull/548] >> - >> -Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com> >> -Signed-off-by: Khem Raj <raj.khem@gmail.com> >> ---- >> - pppdump/pppdump.c | 20 +++++++------------- >> - 1 file changed, 7 insertions(+), 13 deletions(-) >> - >> -diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c >> -index c24208a..1534036 100644 >> ---- a/pppdump/pppdump.c >> -+++ b/pppdump/pppdump.c >> -@@ -42,14 +42,12 @@ int tot_sent, tot_rcvd; >> - extern int optind; >> - extern char *optarg; >> - >> --void dumplog(); >> --void dumpppp(); >> --void show_time(); >> -+void dumplog(FILE *); >> -+void dumpppp(FILE *); >> -+void show_time(FILE *, int); >> - >> - int >> --main(ac, av) >> -- int ac; >> -- char **av; >> -+main(int ac, char **av) >> - { >> - int i; >> - char *p; >> -@@ -97,8 +95,7 @@ main(ac, av) >> - } >> - >> - void >> --dumplog(f) >> -- FILE *f; >> -+dumplog(FILE *f) >> - { >> - int c, n, k, col; >> - int nb, c2; >> -@@ -241,8 +238,7 @@ struct pkt { >> - unsigned char dbuf[8192]; >> - >> - void >> --dumpppp(f) >> -- FILE *f; >> -+dumpppp(FILE *f) >> - { >> - int c, n, k; >> - int nb, nl, dn, proto, rv; >> -@@ -375,9 +371,7 @@ dumpppp(f) >> - } >> - >> - void >> --show_time(f, c) >> -- FILE *f; >> -- int c; >> -+show_time(FILE *f, int c) >> - { >> - time_t t; >> - int n; >> diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb b/meta/recipes-connectivity/ppp/ppp_2.5.3.bb >> similarity index 91% >> rename from meta/recipes-connectivity/ppp/ppp_2.5.2.bb >> rename to meta/recipes-connectivity/ppp/ppp_2.5.3.bb >> index 607678db8b..435559a815 100644 >> --- a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb >> +++ b/meta/recipes-connectivity/ppp/ppp_2.5.3.bb >> @@ -23,12 +23,9 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ >> file://ppp_on_boot \ >> file://provider \ >> file://ppp@.service \ >> - file://0001-pppdump-Fixed-building-with-GCC-15-548.patch \ >> - file://0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch \ >> - file://0001-pppd-session-Fixed-building-with-GCC-15.patch \ >> " >> >> -SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" >> +SRC_URI[sha256sum] = "ddda28dec8aca99a403ab6070d94ffd2b17d63e9a4c5509158e99e148f572d4f" >> >> inherit autotools pkgconfig systemd >> >> @@ -60,7 +57,7 @@ do_install:append () { >> } >> >> CONFFILES:${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" >> -PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools" >> +PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools ${PN}-dhcpv6relay" >> FILES:${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_system_unitdir}/ppp@.service" >> FILES:${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" >> FILES:${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/*pppoe.so" >> @@ -70,6 +67,7 @@ FILES:${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so" >> FILES:${PN}-password = "${libdir}/pppd/${PV}/pass*.so" >> FILES:${PN}-l2tp = "${libdir}/pppd/${PV}/*l2tp.so" >> FILES:${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump" >> +FILES:${PN}-dhcpv6relay = "${libdir}/pppd/${PV}/dhcpv6relay.so" >> SUMMARY:${PN}-oa = "Plugin for PPP for PPP-over-ATM support" >> SUMMARY:${PN}-oe = "Plugin for PPP for PPP-over-Ethernet support" >> SUMMARY:${PN}-radius = "Plugin for PPP for RADIUS support" >> @@ -78,4 +76,5 @@ SUMMARY:${PN}-minconn = "Plugin for PPP to set a delay before the idle timeout >> SUMMARY:${PN}-password = "Plugin for PPP to get passwords via a pipe" >> SUMMARY:${PN}-l2tp = "Plugin for PPP for l2tp support" >> SUMMARY:${PN}-tools = "Additional tools for the PPP package" >> +SUMMARY:${PN}-dhcpv6relay = "Plugin for PPP for DHCPv6 relay agent support" >> >> -- >> 2.50.0 >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#238010): https://lists.openembedded.org/g/openembedded-core/message/238010 >> Mute This Topic: https://lists.openembedded.org/mt/119607595/1686489 >> Group Owner: openembedded-core+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch deleted file mode 100644 index a00706c184..0000000000 --- a/meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch +++ /dev/null @@ -1,98 +0,0 @@ -From a6eb65162db5bcc5ec26cff7361885c0a44cbbfa Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Mon, 17 Mar 2025 11:12:07 +0100 -Subject: [PATCH] pppd/pppdconf.h: remove erroneous generated header - -Upstream-Status: Inappropriate [tarball generation issue tracked at https://github.com/ppp-project/ppp/issues/541] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - pppd/pppdconf.h | 80 ------------------------------------------------- - 1 file changed, 80 deletions(-) - delete mode 100644 pppd/pppdconf.h - -diff --git a/pppd/pppdconf.h b/pppd/pppdconf.h -deleted file mode 100644 -index 51a8f02..0000000 ---- a/pppd/pppdconf.h -+++ /dev/null -@@ -1,80 +0,0 @@ --/* pppd/pppdconf.h. Generated from pppdconf.h.in by configure. */ --/* -- * Copyright (c) 2022 Eivind Næss. All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in -- * the documentation and/or other materials provided with the -- * distribution. -- * -- * 3. The name(s) of the authors of this software must not be used to -- * endorse or promote products derived from this software without -- * prior written permission. -- * -- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO -- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY -- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- */ -- --/* -- * This file is generated by configure and sets the features enabled -- * in pppd when configured. -- */ -- --#ifndef PPP_PPPDCONF_H --#define PPP_PPPDCONF_H -- --/* Have Microsoft CHAP support */ --#define PPP_WITH_CHAPMS 1 -- --/* Have Microsoft LAN Manager support */ --/* #undef PPP_WITH_MSLANMAN */ -- --/* Have Microsoft MPPE support */ --#define PPP_WITH_MPPE 1 -- --/* Have multilink support */ --#define PPP_WITH_MULTILINK 1 -- --/* Have packet activity filter support */ --#define PPP_WITH_FILTER 1 -- --/* Have support for loadable plugins */ --#define PPP_WITH_PLUGINS 1 -- --/* Have Callback Protocol support */ --/* #undef PPP_WITH_CBCP */ -- --/* Include TDB support */ --#define PPP_WITH_TDB 1 -- --/* Have IPv6 Control Protocol */ --#define PPP_WITH_IPV6CP 1 -- --/* Support for Pluggable Authentication Modules */ --/* #undef PPP_WITH_PAM */ -- --/* Have EAP-SRP authentication support */ --/* #undef PPP_WITH_SRP */ -- --/* Have EAP-TLS authentication support */ --#define PPP_WITH_EAPTLS 1 -- --/* Have PEAP authentication support */ --#define PPP_WITH_PEAP 1 -- --/* The pppd version */ --#define PPPD_VERSION "2.5.2" -- --#endif diff --git a/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch b/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch deleted file mode 100644 index d95c72e96b..0000000000 --- a/meta/recipes-connectivity/ppp/ppp/0001-pppd-session-Fixed-building-with-GCC-15.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5edcb01f1d8d521c819d45df1f1bb87697252130 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 17 Mar 2025 14:38:26 -0700 -Subject: [PATCH] pppd/session: Fixed building with GCC 15 - -Fixed building with GCC 15 which defaults to C23 -and find conflicting declration of getspnam() here -with the one provided by shadow.h (extern struct spwd *getspnam (const char *__name);) - -Fixes -../../ppp-2.5.2/pppd/session.c: In function 'session_start': -../../ppp-2.5.2/pppd/session.c:185:18: error: conflicting types for 'getspnam'; have 'struct spwd *(void)' - 185 | struct spwd *getspnam(); - | ^~~~~~~~ - -Upstream-Status: Submitted [https://github.com/ppp-project/ppp/pull/553] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - pppd/session.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/pppd/session.c b/pppd/session.c -index f08d8e1..9cc7538 100644 ---- a/pppd/session.c -+++ b/pppd/session.c -@@ -182,7 +182,6 @@ session_start(const int flags, const char *user, const char *passwd, const char - char *cbuf; - #ifdef HAVE_SHADOW_H - struct spwd *spwd; -- struct spwd *getspnam(); - long now = 0; - #endif /* #ifdef HAVE_SHADOW_H */ - #endif /* #ifdef PPP_WITH_PAM */ 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 deleted file mode 100644 index 2a3b3cc84a..0000000000 --- a/meta/recipes-connectivity/ppp/ppp/0001-pppdump-Fixed-building-with-GCC-15-548.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 44a766a3d086f10cb584a0c423e5bed6af2e3615 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com> -Date: Thu, 27 Feb 2025 23:00:16 +0100 -Subject: [PATCH] pppdump: Fixed building with GCC 15 (#548) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 15 defaults to C23 which does not allow K&R declarations. - -Credit Yaakov Selkowitz in: -https://src.fedoraproject.org/rpms/ppp/pull-request/12 - -Upstream-Status: Backport [https://github.com/ppp-project/ppp/pull/548] - -Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - pppdump/pppdump.c | 20 +++++++------------- - 1 file changed, 7 insertions(+), 13 deletions(-) - -diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c -index c24208a..1534036 100644 ---- a/pppdump/pppdump.c -+++ b/pppdump/pppdump.c -@@ -42,14 +42,12 @@ int tot_sent, tot_rcvd; - extern int optind; - extern char *optarg; - --void dumplog(); --void dumpppp(); --void show_time(); -+void dumplog(FILE *); -+void dumpppp(FILE *); -+void show_time(FILE *, int); - - int --main(ac, av) -- int ac; -- char **av; -+main(int ac, char **av) - { - int i; - char *p; -@@ -97,8 +95,7 @@ main(ac, av) - } - - void --dumplog(f) -- FILE *f; -+dumplog(FILE *f) - { - int c, n, k, col; - int nb, c2; -@@ -241,8 +238,7 @@ struct pkt { - unsigned char dbuf[8192]; - - void --dumpppp(f) -- FILE *f; -+dumpppp(FILE *f) - { - int c, n, k; - int nb, nl, dn, proto, rv; -@@ -375,9 +371,7 @@ dumpppp(f) - } - - void --show_time(f, c) -- FILE *f; -- int c; -+show_time(FILE *f, int c) - { - time_t t; - int n; diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb b/meta/recipes-connectivity/ppp/ppp_2.5.3.bb similarity index 91% rename from meta/recipes-connectivity/ppp/ppp_2.5.2.bb rename to meta/recipes-connectivity/ppp/ppp_2.5.3.bb index 607678db8b..435559a815 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.5.3.bb @@ -23,12 +23,9 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://ppp_on_boot \ file://provider \ file://ppp@.service \ - file://0001-pppdump-Fixed-building-with-GCC-15-548.patch \ - file://0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch \ - file://0001-pppd-session-Fixed-building-with-GCC-15.patch \ " -SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" +SRC_URI[sha256sum] = "ddda28dec8aca99a403ab6070d94ffd2b17d63e9a4c5509158e99e148f572d4f" inherit autotools pkgconfig systemd @@ -60,7 +57,7 @@ do_install:append () { } CONFFILES:${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" -PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools" +PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools ${PN}-dhcpv6relay" FILES:${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_system_unitdir}/ppp@.service" FILES:${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" FILES:${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/*pppoe.so" @@ -70,6 +67,7 @@ FILES:${PN}-minconn = "${libdir}/pppd/${PV}/minconn.so" FILES:${PN}-password = "${libdir}/pppd/${PV}/pass*.so" FILES:${PN}-l2tp = "${libdir}/pppd/${PV}/*l2tp.so" FILES:${PN}-tools = "${sbindir}/pppstats ${sbindir}/pppdump" +FILES:${PN}-dhcpv6relay = "${libdir}/pppd/${PV}/dhcpv6relay.so" SUMMARY:${PN}-oa = "Plugin for PPP for PPP-over-ATM support" SUMMARY:${PN}-oe = "Plugin for PPP for PPP-over-Ethernet support" SUMMARY:${PN}-radius = "Plugin for PPP for RADIUS support" @@ -78,4 +76,5 @@ SUMMARY:${PN}-minconn = "Plugin for PPP to set a delay before the idle timeout SUMMARY:${PN}-password = "Plugin for PPP to get passwords via a pipe" SUMMARY:${PN}-l2tp = "Plugin for PPP for l2tp support" SUMMARY:${PN}-tools = "Additional tools for the PPP package" +SUMMARY:${PN}-dhcpv6relay = "Plugin for PPP for DHCPv6 relay agent support"