Upgraded net/ppp to 2.5.1
Upgraded net/rp-pppoe to 4.0
This commit is contained in:
parent
ce8d84f5b8
commit
974b8a036c
5 changed files with 68 additions and 135 deletions
43
net/ppp/fix-log-dir.patch
Normal file
43
net/ppp/fix-log-dir.patch
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
From b4ef433be936c90e356da7a590b032cdee219a3f Mon Sep 17 00:00:00 2001
|
||||
From: Michal Sekletar <msekleta@redhat.com>
|
||||
Date: Fri, 4 Apr 2014 19:06:05 +0200
|
||||
Subject: [PATCH 11/27] build-sys: don't put connect-errors log to /etc/ppp/
|
||||
|
||||
Resolves: #118837
|
||||
---
|
||||
chat/chat.8 | 2 +-
|
||||
linux/Makefile.top | 8 +++++++-
|
||||
pppd/pathnames.h | 4 ++--
|
||||
3 files changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/chat/chat.8 b/chat/chat.8
|
||||
index 6d10836..78d6939 100644
|
||||
--- a/chat/chat.8
|
||||
+++ b/chat/chat.8
|
||||
@@ -200,7 +200,7 @@ The \fBSAY\fR directive allows the script to send strings to the user
|
||||
at the terminal via standard error. If \fBchat\fR is being run by
|
||||
pppd, and pppd is running as a daemon (detached from its controlling
|
||||
terminal), standard error will normally be redirected to the file
|
||||
-/etc/ppp/connect\-errors.
|
||||
+/var/log/ppp/connect\-errors.
|
||||
.LP
|
||||
\fBSAY\fR strings must be enclosed in single or double quotes. If
|
||||
carriage return and line feed are needed in the string to be output,
|
||||
--- a/pppd/pathnames.h 2024-09-18 04:30:31.000000000 +0000
|
||||
+++ b/pppd/pathnames.h 2024-09-29 11:14:53.504983766 +0000
|
||||
@@ -105,13 +105,13 @@
|
||||
#define PPP_PATH_AUTHDOWN PPP_PATH_CONFDIR "/auth-down"
|
||||
#define PPP_PATH_TTYOPT PPP_PATH_CONFDIR "/options."
|
||||
#define PPP_PATH_PEERFILES PPP_PATH_CONFDIR "/peers/"
|
||||
-#define PPP_PATH_RESOLV PPP_PATH_CONFDIR "/resolv.conf"
|
||||
+#define PPP_PATH_RESOLV "/run/ppp/resolv.conf"
|
||||
|
||||
#define PPP_PATH_NET_INIT PPP_PATH_CONFDIR "/net-init"
|
||||
#define PPP_PATH_NET_PREUP PPP_PATH_CONFDIR "/net-pre-up"
|
||||
#define PPP_PATH_NET_DOWN PPP_PATH_CONFDIR "/net-down"
|
||||
|
||||
-#define PPP_PATH_CONNERRS PPP_PATH_VARLOG "/connect-errors"
|
||||
+#define PPP_PATH_CONNERRS "/var/log/ppp/connect-errors"
|
||||
|
||||
#define PPP_PATH_USEROPT ".ppprc"
|
||||
#define PPP_PATH_PSEUDONYM ".ppp_pseudonym"
|
||||
|
|
@ -1,85 +1,8 @@
|
|||
diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h
|
||||
index b06eda5..dafa36c 100644
|
||||
--- a/include/net/ppp_defs.h
|
||||
+++ b/include/net/ppp_defs.h
|
||||
@@ -38,6 +38,8 @@
|
||||
#ifndef _PPP_DEFS_H_
|
||||
#define _PPP_DEFS_H_
|
||||
|
||||
+#include <sys/time.h>
|
||||
+
|
||||
/*
|
||||
* The basic PPP frame.
|
||||
*/
|
||||
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
||||
index a74c914..7acd2cf 100644
|
||||
--- a/pppd/Makefile.linux
|
||||
+++ b/pppd/Makefile.linux
|
||||
@@ -126,7 +126,7 @@ LIBS += -lcrypt
|
||||
endif
|
||||
|
||||
ifdef USE_LIBUTIL
|
||||
-CFLAGS += -DHAVE_LOGWTMP=1
|
||||
+#CFLAGS += -DHAVE_LOGWTMP=1
|
||||
LIBS += -lutil
|
||||
endif
|
||||
|
||||
diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c
|
||||
index 91e9a57..9c0fac3 100644
|
||||
--- a/pppd/plugins/rp-pppoe/if.c
|
||||
+++ b/pppd/plugins/rp-pppoe/if.c
|
||||
@@ -30,10 +30,6 @@ static char const RCSID[] =
|
||||
#include <linux/if_packet.h>
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_NET_ETHERNET_H
|
||||
-#include <net/ethernet.h>
|
||||
-#endif
|
||||
-
|
||||
#ifdef HAVE_ASM_TYPES_H
|
||||
#include <asm/types.h>
|
||||
#endif
|
||||
diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
|
||||
index a8c2bb4..ca34d79 100644
|
||||
--- a/pppd/plugins/rp-pppoe/plugin.c
|
||||
+++ b/pppd/plugins/rp-pppoe/plugin.c
|
||||
@@ -46,7 +46,6 @@ static char const RCSID[] =
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <signal.h>
|
||||
-#include <net/ethernet.h>
|
||||
#include <net/if_arp.h>
|
||||
#include <linux/ppp_defs.h>
|
||||
#include <linux/if_pppox.h>
|
||||
diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
||||
index 3d3bf4e..b5f82d3 100644
|
||||
--- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
||||
+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
||||
@@ -27,10 +27,6 @@
|
||||
#include <linux/if_packet.h>
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_NET_ETHERNET_H
|
||||
-#include <net/ethernet.h>
|
||||
-#endif
|
||||
-
|
||||
#ifdef HAVE_ASM_TYPES_H
|
||||
#include <asm/types.h>
|
||||
#endif
|
||||
@@ -55,6 +51,8 @@ void die(int status)
|
||||
exit(status);
|
||||
}
|
||||
|
||||
+#define error(x...) fprintf(stderr, x)
|
||||
+
|
||||
/* Initialize frame types to RFC 2516 values. Some broken peers apparently
|
||||
use different frame types... sigh... */
|
||||
|
||||
diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
|
||||
index 6d71530..86d224e 100644
|
||||
index 561b150..c9a8469 100644
|
||||
--- a/pppd/sys-linux.c
|
||||
+++ b/pppd/sys-linux.c
|
||||
@@ -102,19 +102,11 @@
|
||||
@@ -110,19 +110,11 @@
|
||||
#define MAX_ADDR_LEN 7
|
||||
#endif
|
||||
|
||||
|
|
@ -98,4 +21,3 @@ index 6d71530..86d224e 100644
|
|||
-#endif
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Maintainer: PktSurf <smlinux@pktsurf.in>
|
||||
app=ppp
|
||||
version=2.4.8
|
||||
version=2.5.1
|
||||
build=1sml
|
||||
homepage="https://github.com/ppp-project/ppp"
|
||||
download="https://github.com/ppp-project/ppp/archive/refs/tags/ppp-$version.tar.gz"
|
||||
|
|
@ -14,37 +14,27 @@ prepbuilddir() {
|
|||
tar xf $srcdir/$app-$version.tar.?z*
|
||||
cd $app-$version
|
||||
fixbuilddirpermissions
|
||||
|
||||
applypatch $srcdir/musl-fix-headers.patch
|
||||
applypatch $srcdir/fix-log-dir.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
applypatch $srcdir/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
|
||||
applypatch $srcdir/fix-bound-check-eap.patch
|
||||
applypatch $srcdir/fix-paths.patch
|
||||
applypatch $srcdir/fix-pppd-magic.h.patch
|
||||
applypatch $srcdir/fix-pppd-pppoe.h.patch
|
||||
applypatch $srcdir/musl-fix-headers.patch
|
||||
applypatch $srcdir/pppd-Ignore-received-EAP-messages-when-not-doing-EAP.patch
|
||||
applypatch $srcdir/radius-Prevent-buffer-overflow-in-rc_mksid.patch
|
||||
|
||||
export CFLAGS="$CFLAGS -D_GNU_SOURCE"
|
||||
sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux
|
||||
sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux
|
||||
sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux
|
||||
sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux
|
||||
sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux
|
||||
sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux
|
||||
sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux
|
||||
sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux
|
||||
sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux
|
||||
sed -i "s:^#USE_CRYPT=y:USE_CRYPT=y:" pppd/Makefile.linux
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--localstatedir=/var
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--sbindir=/usr/bin \
|
||||
--with-runtime-dir=/var/run/ppp \
|
||||
--with-logfile-dir=/var/log/ppp \
|
||||
--enable-cbcp \
|
||||
--enable-microsoft-extensions \
|
||||
--enable-multilink \
|
||||
--enable-peap \
|
||||
--disable-systemd
|
||||
|
||||
make COPTS="$CFLAGS"
|
||||
make INSTROOT="$pkg" BINDIR="$pkg"/bin install
|
||||
make
|
||||
make install DESTDIR="$pkg"
|
||||
|
||||
cp README* $pkgdocs/
|
||||
|
||||
|
|
@ -59,13 +49,7 @@ build() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
de20c71f9ce25aefc41a0779902a0619690cbec5eaf5f42e8d91d1a56925aec9ece0955e5a8184538f6a33815e1aa46ddc9a7d0fe73db4881e93c57256abf729 ppp-2.4.8.tar.lz
|
||||
b490971d03fef4de66b61123f80a0087270bcb88466ae8ed98ea9a08b35d4c7c46b2dadd304e2970a4206bb5760a14370d7e3873de6240119d88e927ecef840c 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
|
||||
ba0c062f93400008ddf47897ac2ab6a2f5017bc7f4167d1a93dd3a5c04068a922490eb4082b0da80f0c3aea6c87fdfbca3568548724a0abc148588ab86a6df32 fix-bound-check-eap.patch
|
||||
8384afb992a98a7f97b484866e6aa1b1de51e901d7837f84f7ce2beba6815591450fab43957f03b65804424c4940c59640a9cd878979240a171aa77427e9c4ff fix-paths.patch
|
||||
d1067defff79d6c9f67121a9214e41a1bcca1e3b8a345ad905d223fdb8835142bad7cc3b556a3eca509ddf51cf808741773f31f4dca74e834b612a15854a5e6b fix-pppd-magic.h.patch
|
||||
d76237c82af0a3ed7ede9e814d6849b94221f1fd15e4ee68cadd33a308a32d87d635acd14f84508c9e38a10ad0a9e96ce391044da37e217d11b89a4f6631abf7 fix-pppd-pppoe.h.patch
|
||||
55642ce365a7cf7dda05366ac6e74f6badba3cc7bc980760e0a2ee7bfa768ea033c4a3880b3387e0787d719742698f627c624f890d68800344d31c0309c0374d musl-fix-headers.patch
|
||||
ce1bf3298f3f99a7de643bd070cb0e7e7b1dd9621926637ffc93fd2ef552781424ce9a68c88de6eb25dc2593d543e8e329eccc2d00982bde2493e8efb7903051 pppd-Ignore-received-EAP-messages-when-not-doing-EAP.patch
|
||||
d175085eaa93ccf8ade7be4f9818efe353017da7cec41d9312ad2c6685e3763834aff76d673e9d2bb0b44336f926537569ddb86a6035ec33ab8b6a7de2340132 radius-Prevent-buffer-overflow-in-rc_mksid.patch
|
||||
"
|
||||
cd302419a0927c46ca49ad452187b7396391aca6b8550f0e4510415a2124dc27eedfa47b16860eb41b7a1f146e5388deffd6a368ba4d1aa55805ef8a66a9591d ppp-2.5.1.tar.lz
|
||||
3d2c9113ed2350e66192a49d4b3c25268ef542825a2324ddfb65263bb8b2082db18ed9e8d28c1ce65c3ec5805b6a73cba2c4dbae402f02b6123684f527baba97 fix-log-dir.patch
|
||||
98e82ec36650be95febebe3b71175f768b66958855176362e986024adb501af8c511f5ece35692f6de4c9d3bec8fda61b217a5891645e8ac78fc7efbd93fc265 musl-fix-headers.patch
|
||||
"
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- ./src/pppoe.h.orig
|
||||
+++ ./src/pppoe.h
|
||||
@@ -127,10 +127,6 @@
|
||||
#error Could not find a 32-bit integer type
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_LINUX_IF_ETHER_H
|
||||
-#include <linux/if_ether.h>
|
||||
-#endif
|
||||
-
|
||||
#include <netinet/in.h>
|
||||
|
||||
#ifdef HAVE_NETINET_IF_ETHER_H
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Maintainer: PktSurf <smlinux@pktsurf.in>
|
||||
app=rp-pppoe
|
||||
version=3.13
|
||||
version=4.0
|
||||
build=1sml
|
||||
homepage="https://dianne.skoll.ca/projects/rp-pppoe/"
|
||||
desc="Client program for establishing connectivity over PPPoE"
|
||||
|
|
@ -13,8 +13,6 @@ prepbuilddir() {
|
|||
tar xf $srcdir/$app-$version.tar.?z*
|
||||
cd $app-$version
|
||||
fixbuilddirpermissions
|
||||
|
||||
applypatch $srcdir/musl-fix.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -33,6 +31,5 @@ build() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
140e3bf11910cea3c0f04a5b8fe9c72dd607dfdec1a6ef14475c4ff28f1fcb51fb6528d50182d5772e3a7bc3df0f4a795a27de47b0e52b9d3f9443893cc16605 rp-pppoe-3.13.tar.lz
|
||||
5f7e9d50be7c4b007bc2f86cee42b8e5dc4ead6a8def618441c0db0ecb083a6631bd90d6292279c2188986820f7b8f488b41ff6cb186bb541e3e705858a21034 musl-fix.patch
|
||||
"
|
||||
a94d3c27f8d632d083a25d1fb63be50826f436274362d8ada80f74ca2d6d8658aa0898c682962cb939505e2a2ec7014ce7ab16312c47b7c27d793fb66ea79f81 rp-pppoe-4.0.tar.lz
|
||||
"
|
||||
Loading…
Reference in a new issue