diff options
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp/0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch | 98 | ||||
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp_2.5.2.bb | 3 |
2 files changed, 100 insertions, 1 deletions
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 @@ | |||
1 | From a6eb65162db5bcc5ec26cff7361885c0a44cbbfa Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 17 Mar 2025 11:12:07 +0100 | ||
4 | Subject: [PATCH] pppd/pppdconf.h: remove erroneous generated header | ||
5 | |||
6 | Upstream-Status: Inappropriate [tarball generation issue tracked at https://github.com/ppp-project/ppp/issues/541] | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | pppd/pppdconf.h | 80 ------------------------------------------------- | ||
10 | 1 file changed, 80 deletions(-) | ||
11 | delete mode 100644 pppd/pppdconf.h | ||
12 | |||
13 | diff --git a/pppd/pppdconf.h b/pppd/pppdconf.h | ||
14 | deleted file mode 100644 | ||
15 | index 51a8f02..0000000 | ||
16 | --- a/pppd/pppdconf.h | ||
17 | +++ /dev/null | ||
18 | @@ -1,80 +0,0 @@ | ||
19 | -/* pppd/pppdconf.h. Generated from pppdconf.h.in by configure. */ | ||
20 | -/* | ||
21 | - * Copyright (c) 2022 Eivind Næss. All rights reserved. | ||
22 | - * | ||
23 | - * Redistribution and use in source and binary forms, with or without | ||
24 | - * modification, are permitted provided that the following conditions | ||
25 | - * are met: | ||
26 | - * | ||
27 | - * 1. Redistributions of source code must retain the above copyright | ||
28 | - * notice, this list of conditions and the following disclaimer. | ||
29 | - * | ||
30 | - * 2. Redistributions in binary form must reproduce the above copyright | ||
31 | - * notice, this list of conditions and the following disclaimer in | ||
32 | - * the documentation and/or other materials provided with the | ||
33 | - * distribution. | ||
34 | - * | ||
35 | - * 3. The name(s) of the authors of this software must not be used to | ||
36 | - * endorse or promote products derived from this software without | ||
37 | - * prior written permission. | ||
38 | - * | ||
39 | - * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO | ||
40 | - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY | ||
41 | - * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY | ||
42 | - * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
43 | - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN | ||
44 | - * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING | ||
45 | - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
46 | - */ | ||
47 | - | ||
48 | -/* | ||
49 | - * This file is generated by configure and sets the features enabled | ||
50 | - * in pppd when configured. | ||
51 | - */ | ||
52 | - | ||
53 | -#ifndef PPP_PPPDCONF_H | ||
54 | -#define PPP_PPPDCONF_H | ||
55 | - | ||
56 | -/* Have Microsoft CHAP support */ | ||
57 | -#define PPP_WITH_CHAPMS 1 | ||
58 | - | ||
59 | -/* Have Microsoft LAN Manager support */ | ||
60 | -/* #undef PPP_WITH_MSLANMAN */ | ||
61 | - | ||
62 | -/* Have Microsoft MPPE support */ | ||
63 | -#define PPP_WITH_MPPE 1 | ||
64 | - | ||
65 | -/* Have multilink support */ | ||
66 | -#define PPP_WITH_MULTILINK 1 | ||
67 | - | ||
68 | -/* Have packet activity filter support */ | ||
69 | -#define PPP_WITH_FILTER 1 | ||
70 | - | ||
71 | -/* Have support for loadable plugins */ | ||
72 | -#define PPP_WITH_PLUGINS 1 | ||
73 | - | ||
74 | -/* Have Callback Protocol support */ | ||
75 | -/* #undef PPP_WITH_CBCP */ | ||
76 | - | ||
77 | -/* Include TDB support */ | ||
78 | -#define PPP_WITH_TDB 1 | ||
79 | - | ||
80 | -/* Have IPv6 Control Protocol */ | ||
81 | -#define PPP_WITH_IPV6CP 1 | ||
82 | - | ||
83 | -/* Support for Pluggable Authentication Modules */ | ||
84 | -/* #undef PPP_WITH_PAM */ | ||
85 | - | ||
86 | -/* Have EAP-SRP authentication support */ | ||
87 | -/* #undef PPP_WITH_SRP */ | ||
88 | - | ||
89 | -/* Have EAP-TLS authentication support */ | ||
90 | -#define PPP_WITH_EAPTLS 1 | ||
91 | - | ||
92 | -/* Have PEAP authentication support */ | ||
93 | -#define PPP_WITH_PEAP 1 | ||
94 | - | ||
95 | -/* The pppd version */ | ||
96 | -#define PPPD_VERSION "2.5.2" | ||
97 | - | ||
98 | -#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 \ | |||
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 | file://0001-pppdump-Fixed-building-with-GCC-15-548.patch \ |
27 | file://0001-pppd-pppdconf.h-remove-erroneous-generated-header.patch \ | ||
27 | " | 28 | " |
28 | 29 | ||
29 | SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" | 30 | SRC_URI[sha256sum] = "47da358de54a10cb10bf6ff2cf9b1c03c0d3555518f6182e8f701b8e55733cb2" |
30 | 31 | ||
31 | inherit autotools pkgconfig systemd | 32 | inherit autotools pkgconfig systemd |
32 | 33 | ||
33 | PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl multilink" | 34 | PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl" |
34 | PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam" | 35 | PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam" |
35 | PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl" | 36 | PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl" |
36 | PACKAGECONFIG[multilink] = "--enable-multilink,--disable-multilink" | 37 | PACKAGECONFIG[multilink] = "--enable-multilink,--disable-multilink" |