diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-05 17:42:23 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-08 10:10:15 +0000 |
commit | 2961717078ccecd2a223c03eed1902024c9cdd15 (patch) | |
tree | a64acb72c714585400734254bbe8ce828f2b6b86 /meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch | |
parent | c5f7310d6fe4bafffc89142e0b3b236d8296a700 (diff) | |
download | poky-2961717078ccecd2a223c03eed1902024c9cdd15.tar.gz |
ppp: Update 2.4.8 -> 2.4.9
This is the first ppp release in a long time. Many patches
were resolved upstream:
* musl fixes were merged
* EAP patch was a backport added upstream
* cflags were fixed upstream
* CVE fix was merged upstream and a backport
* pcap header from the host was fixed upstream
* suid bits during install was removed upstream
The only patch left was the /var/ redirect for resolv.conf which no longer
applied cleanly after upstream changes. For this one the patch will
need to be rewritten (and preferably submitted upstream) by someone
who needs/uses it. It was presumbaly for RO rootfs and may be resolved
by symlinks in modern system usage anyway.
Tweak the files pulled into the pppoe package for a compatibility
symlink and module rename.
Add CC to the OEMAKE command to allow builds correctly.
[Big thanks to Alex Kanavin for a lot of the work with upstream and
pre-release testing of this]
(From OE-Core rev: b524ba3e7941b9112ae4b6ae4aa7795c59ff0d16)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch')
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch b/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch deleted file mode 100644 index a72414ff8a..0000000000 --- a/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | The patch comes from OpenEmbedded | ||
2 | Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com> | ||
3 | |||
4 | Upstream-Status: Inappropriate [embedded specific] | ||
5 | |||
6 | diff -ruN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c | ||
7 | --- ppp-2.4.5-orig/pppd/ipcp.c 2010-06-30 15:51:12.050166398 +0800 | ||
8 | +++ ppp-2.4.5/pppd/ipcp.c 2010-06-30 17:02:33.930393283 +0800 | ||
9 | @@ -55,6 +55,8 @@ | ||
10 | #include <sys/socket.h> | ||
11 | #include <netinet/in.h> | ||
12 | #include <arpa/inet.h> | ||
13 | +#include <sys/stat.h> | ||
14 | +#include <unistd.h> | ||
15 | |||
16 | #include "pppd.h" | ||
17 | #include "fsm.h" | ||
18 | @@ -2095,6 +2097,14 @@ | ||
19 | u_int32_t peerdns1, peerdns2; | ||
20 | { | ||
21 | FILE *f; | ||
22 | + struct stat dirinfo; | ||
23 | + | ||
24 | + if(stat(_PATH_OUTDIR, &dirinfo)) { | ||
25 | + if(mkdir(_PATH_OUTDIR, 0775)) { | ||
26 | + error("Failed to create directory %s: %m", _PATH_OUTDIR); | ||
27 | + return; | ||
28 | + } | ||
29 | + } | ||
30 | |||
31 | f = fopen(_PATH_RESOLV, "w"); | ||
32 | if (f == NULL) { | ||
33 | diff -ruN ppp-2.4.5-orig/pppd/pathnames.h ppp-2.4.5/pppd/pathnames.h | ||
34 | --- ppp-2.4.5-orig/pppd/pathnames.h 2010-06-30 15:51:12.043682063 +0800 | ||
35 | +++ ppp-2.4.5/pppd/pathnames.h 2010-06-30 17:03:20.594371055 +0800 | ||
36 | @@ -30,7 +30,8 @@ | ||
37 | #define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options." | ||
38 | #define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors" | ||
39 | #define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/" | ||
40 | -#define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf" | ||
41 | +#define _PATH_OUTDIR _ROOT_PATH _PATH_VARRUN "/ppp" | ||
42 | +#define _PATH_RESOLV _PATH_OUTDIR "/resolv.conf" | ||
43 | |||
44 | #define _PATH_USEROPT ".ppprc" | ||
45 | #define _PATH_PSEUDONYM ".ppp_pseudonym" | ||