diff options
| author | Ismael Luceno | 2019-08-28 19:33:00 +0200 |
|---|---|---|
| committer | Ismael Luceno | 2019-08-28 20:22:10 +0200 |
| commit | 80ba26cc74127eacac4cedd64afaa0c3ab5eb7e7 (patch) | |
| tree | 5e300355ababc7780a9c0dcc90ae9ba62289f3c7 /net | |
| parent | a36c86cc19149c2040f498ac11d268529f411d9f (diff) | |
ppp: Move mppe-header.patch into a patches folder
Diffstat (limited to 'net')
| -rw-r--r-- | net/ppp/HISTORY | 1 | ||||
| -rwxr-xr-x | net/ppp/PRE_BUILD | 4 | ||||
| -rw-r--r-- | net/ppp/patches/mppe-header.patch (renamed from net/ppp/mppe-header.patch) | 12 |
3 files changed, 8 insertions, 9 deletions
diff --git a/net/ppp/HISTORY b/net/ppp/HISTORY index 07c8db34e7..88b4fc83ff 100644 --- a/net/ppp/HISTORY +++ b/net/ppp/HISTORY @@ -3,6 +3,7 @@ * l2tp.patch: removed, not needed anymore * PRE_BUILD: Made the build system respect build flags * BUILD: Added LDFLAGS to COPTS + * PRE_BUILD, mppe-header.patch: Move patch to a patches folder 2017-01-13 David C. Haley <khoralin@gmail.com> * DETAILS: updated SOURCE_URL diff --git a/net/ppp/PRE_BUILD b/net/ppp/PRE_BUILD index 4839df3c4d..da441b2245 100755 --- a/net/ppp/PRE_BUILD +++ b/net/ppp/PRE_BUILD @@ -1,5 +1,6 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && +apply_patch_dir patches && # Respect custom build flags find -name Makefile.linux -exec \ @@ -10,9 +11,6 @@ sed -i -e '/(CC) -o [^.]* /s/ -o / $(LDFLAGS)&/' \ pppd/plugins/rp-pppoe/Makefile.linux \ pppdump/Makefile.linux && -# include mppe.h into build -patch -p0 < "$SPELL_DIRECTORY/mppe-header.patch" && - sedit 's:net/bpf.h:pcap-bpf.h:' pppd/demand.c && sedit 's:net/bpf.h:pcap-bpf.h:' pppd/sys-linux.c && sedit 's:/usr/man:/usr/share/man:' linux/Makefile.top && diff --git a/net/ppp/mppe-header.patch b/net/ppp/patches/mppe-header.patch index 4124e3a4da..3eb9c5aff5 100644 --- a/net/ppp/mppe-header.patch +++ b/net/ppp/patches/mppe-header.patch @@ -1,11 +1,11 @@ ---- pppd/Makefile.linux.orig 2009-11-17 01:26:07.000000000 +0300 -+++ pppd/Makefile.linux 2013-05-21 01:50:23.063838264 +0400 +--- a/pppd/Makefile.linux ++++ b/pppd/Makefile.linux @@ -16,7 +16,7 @@ - demand.c utils.c tty.c eap.c chap-md5.c session.c - + demand.c utils.c tty.c eap.c chap-md5.c session.c + HEADERS = ccp.h session.h chap-new.h ecp.h fsm.h ipcp.h \ - ipxcp.h lcp.h magic.h md5.h patchlevel.h pathnames.h pppd.h \ + ipxcp.h lcp.h magic.h md5.h mppe.h patchlevel.h pathnames.h pppd.h \ - upap.h eap.h - + upap.h eap.h + MANPAGES = pppd.8 |