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 new file mode 100644 index 0000000000..a00706c184 --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch @@ -0,0 +1,98 @@ +From a6eb65162db5bcc5ec26cff7361885c0a44cbbfa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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_2.5.2.bb b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb index 5565ce51cf..aed4a9a770 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.5.2.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.5.2.bb @@ -24,13 +24,14 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz \ 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 \ " SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" inherit autotools pkgconfig systemd -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl multilink" +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl" PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam" PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl" PACKAGECONFIG[multilink] = "--enable-multilink,--disable-multilink"