From 358010cef31ce922db6cda1141bd9a83e4941b53 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 8 Jan 2025 09:42:07 +0100 Subject: [PATCH] ppp: update 2.5.1 -> 2.5.2 License-Update: BSD items clarified to be 2-clause: https://github.com/ppp-project/ppp/commit/d4ec06ec5839350bd728da0e92a8cb2e1c37d880 passprompt plugin removed upstream. Add an enable a multilink option, as the build breaks without it at the linking step (upstream presumably didn't test that it works): https://github.com/ppp-project/ppp/issues/541 (From OE-Core rev: 5d62401d3273e2f4d95272bce6a5ac1e41a99cc2) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../ppp/{ppp_2.5.1.bb => ppp_2.5.2.bb} | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) rename meta/recipes-connectivity/ppp/{ppp_2.5.1.bb => ppp_2.5.2.bb} (88%) diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.1.bb b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb similarity index 88% rename from meta/recipes-connectivity/ppp/ppp_2.5.1.bb rename to meta/recipes-connectivity/ppp/ppp_2.5.2.bb index 89c9789b870..9ea99cc15a3 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.5.1.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb @@ -5,11 +5,11 @@ SECTION = "console/network" HOMEPAGE = "http://samba.org/ppp/" BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" DEPENDS = "libpcap virtual/crypt" -LICENSE = "BSD-3-Clause & BSD-3-Clause-Attribution & GPL-2.0-or-later & LGPL-2.0-or-later & PD & RSA-MD & MIT" -LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=1bea10e81fc6f2df105b1f8b733cb149 \ - file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ +LICENSE = "BSD-2-Clause & GPL-2.0-or-later & LGPL-2.0-or-later & PD & RSA-MD & MIT" +LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=25;md5=f0463bd67ae70535c709fca554089bd8 \ file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ - file://chat/chat.c;beginline=1;endline=1;md5=234d7d4edd08962c0144e4604050e0b6" + file://chat/chat.c;beginline=1;endline=1;md5=234d7d4edd08962c0144e4604050e0b6 \ + " SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://pon \ @@ -25,13 +25,14 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ file://ppp@.service \ " -SRC_URI[sha256sum] = "733b7f5840b613da4eab0429a5081293275f06ba8b528e1b8eea6964faf0243a" +SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" inherit autotools pkgconfig systemd -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl" +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl multilink" PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam" PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl" +PACKAGECONFIG[multilink] = "--enable-multilink,--disable-multilink" do_install:append () { mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d