Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/ppp.git#23f594e00896a75b4cf3690aa4a32e0d11917cf7
This commit is contained in:
DistroBaker
parent
997d17bce6
commit
0c47ac0794
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ ppp-2.4.5.tar.gz
|
|||||||
/ppp-watch.tar.xz
|
/ppp-watch.tar.xz
|
||||||
/ppp-2.4.7.tar.gz
|
/ppp-2.4.7.tar.gz
|
||||||
/ppp-2.4.8.tar.gz
|
/ppp-2.4.8.tar.gz
|
||||||
|
/ppp-2.4.9.tar.gz
|
||||||
|
|||||||
@ -1,25 +0,0 @@
|
|||||||
From 486e36d184cbaee7e34bb582ea6fdf3bfa9ca531 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Fri, 4 Apr 2014 11:23:42 +0200
|
|
||||||
Subject: [PATCH 01/27] build-sys: use gcc as our compiler of choice
|
|
||||||
|
|
||||||
---
|
|
||||||
pppd/Makefile.linux | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
|
||||||
index a74c914..1d9ea78 100644
|
|
||||||
--- a/pppd/Makefile.linux
|
|
||||||
+++ b/pppd/Makefile.linux
|
|
||||||
@@ -30,7 +30,7 @@ ifeq (.depend,$(wildcard .depend))
|
|
||||||
include .depend
|
|
||||||
endif
|
|
||||||
|
|
||||||
-# CC = gcc
|
|
||||||
+CC = gcc
|
|
||||||
#
|
|
||||||
COPTS = -O2 -pipe -Wall -g
|
|
||||||
LIBS =
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,111 +0,0 @@
|
|||||||
From b9fb631a493c5f1b490c8e9645eb6ebab4b25cc8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Fri, 4 Apr 2014 18:37:00 +0200
|
|
||||||
Subject: [PATCH 07/27] build-sys: don't strip binaries during installation
|
|
||||||
|
|
||||||
We don't want that when building rpms. rpmbuild does final stripping of binaries
|
|
||||||
for us and generetes debuginfo rpm.
|
|
||||||
---
|
|
||||||
chat/Makefile.linux | 2 +-
|
|
||||||
pppd/Makefile.linux | 4 ++--
|
|
||||||
pppd/plugins/radius/Makefile.linux | 6 +++---
|
|
||||||
pppd/plugins/rp-pppoe/Makefile.linux | 4 ++--
|
|
||||||
pppdump/Makefile.linux | 2 +-
|
|
||||||
pppstats/Makefile.linux | 2 +-
|
|
||||||
6 files changed, 10 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/chat/Makefile.linux b/chat/Makefile.linux
|
|
||||||
index 848cd8d..2445637 100644
|
|
||||||
--- a/chat/Makefile.linux
|
|
||||||
+++ b/chat/Makefile.linux
|
|
||||||
@@ -25,7 +25,7 @@ chat.o: chat.c
|
|
||||||
|
|
||||||
install: chat
|
|
||||||
mkdir -p $(BINDIR) $(MANDIR)
|
|
||||||
- $(INSTALL) -s -c chat $(BINDIR)
|
|
||||||
+ $(INSTALL) -c chat $(BINDIR)
|
|
||||||
$(INSTALL) -c -m 644 chat.8 $(MANDIR)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
|
||||||
index 8ed56c1..4f27100 100644
|
|
||||||
--- a/pppd/Makefile.linux
|
|
||||||
+++ b/pppd/Makefile.linux
|
|
||||||
@@ -102,7 +102,7 @@ ifdef USE_SRP
|
|
||||||
CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
|
|
||||||
LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto
|
|
||||||
TARGETS += srp-entry
|
|
||||||
-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
|
|
||||||
+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
|
|
||||||
MANPAGES += srp-entry.8
|
|
||||||
EXTRACLEAN += srp-entry.o
|
|
||||||
NEEDDES=y
|
|
||||||
@@ -208,7 +208,7 @@ all: $(TARGETS)
|
|
||||||
install: pppd
|
|
||||||
mkdir -p $(BINDIR) $(MANDIR)
|
|
||||||
$(EXTRAINSTALL)
|
|
||||||
- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
|
|
||||||
+ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
|
|
||||||
if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
|
|
||||||
chmod o-rx,u+s $(BINDIR)/pppd; fi
|
|
||||||
$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
|
|
||||||
diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
|
|
||||||
index 179d0b7..707326b 100644
|
|
||||||
--- a/pppd/plugins/radius/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/radius/Makefile.linux
|
|
||||||
@@ -36,9 +36,9 @@ all: $(PLUGIN)
|
|
||||||
|
|
||||||
install: all
|
|
||||||
$(INSTALL) -d -m 755 $(LIBDIR)
|
|
||||||
- $(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
|
|
||||||
- $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
|
|
||||||
- $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
|
|
||||||
+ $(INSTALL) -c -m 755 radius.so $(LIBDIR)
|
|
||||||
+ $(INSTALL) -c -m 755 radattr.so $(LIBDIR)
|
|
||||||
+ $(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
|
|
||||||
$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
|
|
||||||
$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
|
|
||||||
|
|
||||||
diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
index 1305ed8..3cd9101 100644
|
|
||||||
--- a/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
@@ -43,9 +43,9 @@ rp-pppoe.so: plugin.o discovery.o if.o common.o
|
|
||||||
|
|
||||||
install: all
|
|
||||||
$(INSTALL) -d -m 755 $(LIBDIR)
|
|
||||||
- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
|
|
||||||
+ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
|
|
||||||
$(INSTALL) -d -m 755 $(BINDIR)
|
|
||||||
- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
|
|
||||||
+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o *.so pppoe-discovery
|
|
||||||
diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
|
|
||||||
index d0a5032..95c6805 100644
|
|
||||||
--- a/pppdump/Makefile.linux
|
|
||||||
+++ b/pppdump/Makefile.linux
|
|
||||||
@@ -17,5 +17,5 @@ clean:
|
|
||||||
|
|
||||||
install:
|
|
||||||
mkdir -p $(BINDIR) $(MANDIR)
|
|
||||||
- $(INSTALL) -s -c pppdump $(BINDIR)
|
|
||||||
+ $(INSTALL) -c pppdump $(BINDIR)
|
|
||||||
$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
|
|
||||||
diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
|
|
||||||
index 42aba73..c5ba3b1 100644
|
|
||||||
--- a/pppstats/Makefile.linux
|
|
||||||
+++ b/pppstats/Makefile.linux
|
|
||||||
@@ -22,7 +22,7 @@ all: pppstats
|
|
||||||
|
|
||||||
install: pppstats
|
|
||||||
-mkdir -p $(MANDIR)
|
|
||||||
- $(INSTALL) -s -c pppstats $(BINDIR)
|
|
||||||
+ $(INSTALL) -c pppstats $(BINDIR)
|
|
||||||
$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
|
|
||||||
|
|
||||||
pppstats: $(PPPSTATSRCS)
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
From 343728d5de6e44bd67923503e62eefaad50760a4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Fri, 4 Apr 2014 18:47:01 +0200
|
|
||||||
Subject: [PATCH 08/27] build-sys: use prefix /usr instead of /usr/local
|
|
||||||
|
|
||||||
---
|
|
||||||
configure | 2 +-
|
|
||||||
pppd/Makefile.linux | 4 ++--
|
|
||||||
scripts/ppp-on-rsh | 2 +-
|
|
||||||
scripts/ppp-on-ssh | 4 ++--
|
|
||||||
scripts/secure-card | 2 +-
|
|
||||||
5 files changed, 7 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
|
||||||
index 6a55e0f..db54d77 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
# $Id: configure,v 1.38 2008/06/15 07:08:49 paulus Exp $
|
|
||||||
|
|
||||||
# Where to install stuff by default
|
|
||||||
-DESTDIR=/usr/local
|
|
||||||
+DESTDIR=/usr
|
|
||||||
SYSCONF=/etc
|
|
||||||
|
|
||||||
# if [ -d /NextApps ]; then
|
|
||||||
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
|
||||||
index 4f27100..95c2598 100644
|
|
||||||
--- a/pppd/Makefile.linux
|
|
||||||
+++ b/pppd/Makefile.linux
|
|
||||||
@@ -99,8 +99,8 @@ endif
|
|
||||||
|
|
||||||
# EAP SRP-SHA1
|
|
||||||
ifdef USE_SRP
|
|
||||||
-CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
|
|
||||||
-LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto
|
|
||||||
+CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/include/openssl
|
|
||||||
+LIBS += -lsrp -L/usr/lib -lcrypto
|
|
||||||
TARGETS += srp-entry
|
|
||||||
EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
|
|
||||||
MANPAGES += srp-entry.8
|
|
||||||
diff --git a/scripts/ppp-on-rsh b/scripts/ppp-on-rsh
|
|
||||||
index 30a50db..a80616a 100755
|
|
||||||
--- a/scripts/ppp-on-rsh
|
|
||||||
+++ b/scripts/ppp-on-rsh
|
|
||||||
@@ -26,7 +26,7 @@ PPPD_RHOST=myremotehost
|
|
||||||
# For this example, we assume that pppd on both local and remote
|
|
||||||
# machines reside in the same place, /usr/local/bin/pppd
|
|
||||||
#
|
|
||||||
-PPPD_LOC=/usr/local/bin/pppd
|
|
||||||
+PPPD_LOC=/usr/sbin/pppd
|
|
||||||
|
|
||||||
#
|
|
||||||
# The location of local options file (where rsh client is running).
|
|
||||||
diff --git a/scripts/ppp-on-ssh b/scripts/ppp-on-ssh
|
|
||||||
index 0e41aca..c27e80a 100755
|
|
||||||
--- a/scripts/ppp-on-ssh
|
|
||||||
+++ b/scripts/ppp-on-ssh
|
|
||||||
@@ -26,7 +26,7 @@ PPPD_RHOST=myremotehost
|
|
||||||
# For this example, we assume that pppd on both local and remote
|
|
||||||
# machines reside in the same place, /usr/local/bin/pppd
|
|
||||||
#
|
|
||||||
-PPPD_LOC=/usr/local/bin/pppd
|
|
||||||
+PPPD_LOC=/usr/sbin/pppd
|
|
||||||
|
|
||||||
#
|
|
||||||
# The location of local options file (where ssh client is running).
|
|
||||||
@@ -52,7 +52,7 @@ PPPD_REM_OPT=/etc/ppp/options-ssh-rem
|
|
||||||
#
|
|
||||||
# The location of ssh client on the local machine
|
|
||||||
#
|
|
||||||
-SSH_LOC=/usr/local/bin/ssh
|
|
||||||
+SSH_LOC=/usr/bin/ssh
|
|
||||||
|
|
||||||
export PPPD_LOC PPPD_LOC_OPT PPPD_REM_OPT PPPD_RHOST SSH_LOC
|
|
||||||
|
|
||||||
diff --git a/scripts/secure-card b/scripts/secure-card
|
|
||||||
index 0002365..ae3ae50 100755
|
|
||||||
--- a/scripts/secure-card
|
|
||||||
+++ b/scripts/secure-card
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/local/bin/expect -f
|
|
||||||
+#!/usr/bin/expect -f
|
|
||||||
#
|
|
||||||
# This script was written by Jim Isaacson <jcisaac@crl.com>. It is
|
|
||||||
# designed to work as a script to use the SecureCARD(tm) device. This
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
From 8015a0ef23a874f288d5e77ffafe1d7f4281725d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Fri, 4 Apr 2014 18:59:24 +0200
|
|
||||||
Subject: [PATCH 10/27] build-sys: enable CBCP
|
|
||||||
|
|
||||||
Resolves: #199278
|
|
||||||
---
|
|
||||||
pppd/Makefile.linux | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
|
||||||
index 95c2598..65700fa 100644
|
|
||||||
--- a/pppd/Makefile.linux
|
|
||||||
+++ b/pppd/Makefile.linux
|
|
||||||
@@ -68,7 +68,7 @@ HAVE_INET6=y
|
|
||||||
PLUGIN=y
|
|
||||||
|
|
||||||
# Enable Microsoft proprietary Callback Control Protocol
|
|
||||||
-#CBCP=y
|
|
||||||
+CBCP=y
|
|
||||||
|
|
||||||
# Enable EAP SRP-SHA1 authentication (requires libsrp)
|
|
||||||
#USE_SRP=y
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,19 +1,3 @@
|
|||||||
From 2a97ab28ee00586e5f06b3ef3a0e43ea0c7c6499 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Mon, 7 Apr 2014 14:21:41 +0200
|
|
||||||
Subject: [PATCH 14/27] everywhere: use SOCK_CLOEXEC when creating socket
|
|
||||||
|
|
||||||
---
|
|
||||||
pppd/plugins/pppoatm/pppoatm.c | 2 +-
|
|
||||||
pppd/plugins/pppol2tp/openl2tp.c | 2 +-
|
|
||||||
pppd/plugins/pppol2tp/pppol2tp.c | 2 +-
|
|
||||||
pppd/plugins/rp-pppoe/if.c | 2 +-
|
|
||||||
pppd/plugins/rp-pppoe/plugin.c | 6 +++---
|
|
||||||
pppd/plugins/rp-pppoe/pppoe-discovery.c | 2 +-
|
|
||||||
pppd/sys-linux.c | 10 +++++-----
|
|
||||||
pppd/tty.c | 2 +-
|
|
||||||
8 files changed, 14 insertions(+), 14 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pppd/plugins/pppoatm/pppoatm.c b/pppd/plugins/pppoatm/pppoatm.c
|
diff --git a/pppd/plugins/pppoatm/pppoatm.c b/pppd/plugins/pppoatm/pppoatm.c
|
||||||
index d693350..c31bb34 100644
|
index d693350..c31bb34 100644
|
||||||
--- a/pppd/plugins/pppoatm/pppoatm.c
|
--- a/pppd/plugins/pppoatm/pppoatm.c
|
||||||
@ -53,10 +37,10 @@ index a7e3400..e64a778 100644
|
|||||||
if (fd >= 0) {
|
if (fd >= 0) {
|
||||||
memset (&ifr, '\0', sizeof (ifr));
|
memset (&ifr, '\0', sizeof (ifr));
|
||||||
strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
|
strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
|
||||||
diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c
|
diff --git a/pppd/plugins/pppoe/if.c b/pppd/plugins/pppoe/if.c
|
||||||
index 91e9a57..72aba41 100644
|
index 91e9a57..72aba41 100644
|
||||||
--- a/pppd/plugins/rp-pppoe/if.c
|
--- a/pppd/plugins/pppoe/if.c
|
||||||
+++ b/pppd/plugins/rp-pppoe/if.c
|
+++ b/pppd/plugins/pppoe/if.c
|
||||||
@@ -116,7 +116,7 @@ openInterface(char const *ifname, UINT16_t type, unsigned char *hwaddr)
|
@@ -116,7 +116,7 @@ openInterface(char const *ifname, UINT16_t type, unsigned char *hwaddr)
|
||||||
stype = SOCK_PACKET;
|
stype = SOCK_PACKET;
|
||||||
#endif
|
#endif
|
||||||
@ -66,10 +50,10 @@ index 91e9a57..72aba41 100644
|
|||||||
/* Give a more helpful message for the common error case */
|
/* Give a more helpful message for the common error case */
|
||||||
if (errno == EPERM) {
|
if (errno == EPERM) {
|
||||||
fatal("Cannot create raw socket -- pppoe must be run as root.");
|
fatal("Cannot create raw socket -- pppoe must be run as root.");
|
||||||
diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
|
diff --git a/pppd/plugins/pppoe/plugin.c b/pppd/plugins/pppoe/plugin.c
|
||||||
index a8c2bb4..24bdf8f 100644
|
index a8c2bb4..24bdf8f 100644
|
||||||
--- a/pppd/plugins/rp-pppoe/plugin.c
|
--- a/pppd/plugins/pppoe/plugin.c
|
||||||
+++ b/pppd/plugins/rp-pppoe/plugin.c
|
+++ b/pppd/plugins/pppoe/plugin.c
|
||||||
@@ -137,7 +137,7 @@ PPPOEConnectDevice(void)
|
@@ -137,7 +137,7 @@ PPPOEConnectDevice(void)
|
||||||
/* server equipment). */
|
/* server equipment). */
|
||||||
/* Opening this socket just before waitForPADS in the discovery() */
|
/* Opening this socket just before waitForPADS in the discovery() */
|
||||||
@ -97,10 +81,10 @@ index a8c2bb4..24bdf8f 100644
|
|||||||
r = 0;
|
r = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
diff --git a/pppd/plugins/pppoe/pppoe-discovery.c b/pppd/plugins/pppoe/pppoe-discovery.c
|
||||||
index 3d3bf4e..c0d927d 100644
|
index 3d3bf4e..c0d927d 100644
|
||||||
--- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
--- a/pppd/plugins/pppoe/pppoe-discovery.c
|
||||||
+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
+++ b/pppd/plugins/pppoe/pppoe-discovery.c
|
||||||
@@ -121,7 +121,7 @@ openInterface(char const *ifname, UINT16_t type, unsigned char *hwaddr)
|
@@ -121,7 +121,7 @@ openInterface(char const *ifname, UINT16_t type, unsigned char *hwaddr)
|
||||||
stype = SOCK_PACKET;
|
stype = SOCK_PACKET;
|
||||||
#endif
|
#endif
|
||||||
@ -109,7 +93,7 @@ index 3d3bf4e..c0d927d 100644
|
|||||||
+ if ((fd = socket(domain, stype | SOCK_CLOEXEC, htons(type))) < 0) {
|
+ if ((fd = socket(domain, stype | SOCK_CLOEXEC, htons(type))) < 0) {
|
||||||
/* Give a more helpful message for the common error case */
|
/* Give a more helpful message for the common error case */
|
||||||
if (errno == EPERM) {
|
if (errno == EPERM) {
|
||||||
rp_fatal("Cannot create raw socket -- pppoe must be run as root.");
|
fatal("Cannot create raw socket -- pppoe must be run as root.");
|
||||||
diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
|
diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
|
||||||
index 00a2cf5..0690019 100644
|
index 00a2cf5..0690019 100644
|
||||||
--- a/pppd/sys-linux.c
|
--- a/pppd/sys-linux.c
|
||||||
@ -136,7 +120,7 @@ index 00a2cf5..0690019 100644
|
|||||||
- sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
|
- sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
|
||||||
+ sock_fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
|
+ sock_fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
|
||||||
if (sock_fd < 0)
|
if (sock_fd < 0)
|
||||||
return 0;
|
return -1;
|
||||||
memset(&ifreq.ifr_hwaddr, 0, sizeof(struct sockaddr));
|
memset(&ifreq.ifr_hwaddr, 0, sizeof(struct sockaddr));
|
||||||
@@ -2067,7 +2067,7 @@ int ppp_available(void)
|
@@ -2067,7 +2067,7 @@ int ppp_available(void)
|
||||||
/*
|
/*
|
||||||
@ -147,15 +131,6 @@ index 00a2cf5..0690019 100644
|
|||||||
if (s < 0)
|
if (s < 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@@ -2860,7 +2860,7 @@ ether_to_eui64(eui64_t *p_eui64)
|
|
||||||
int skfd;
|
|
||||||
const unsigned char *ptr;
|
|
||||||
|
|
||||||
- skfd = socket(PF_INET6, SOCK_DGRAM, 0);
|
|
||||||
+ skfd = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
|
|
||||||
if(skfd == -1)
|
|
||||||
{
|
|
||||||
warn("could not open IPv6 socket");
|
|
||||||
diff --git a/pppd/tty.c b/pppd/tty.c
|
diff --git a/pppd/tty.c b/pppd/tty.c
|
||||||
index bc96695..8e76a5d 100644
|
index bc96695..8e76a5d 100644
|
||||||
--- a/pppd/tty.c
|
--- a/pppd/tty.c
|
||||||
|
|||||||
@ -1,18 +1,7 @@
|
|||||||
From a30efa2cc99a5b6ab220de04cbcc7db38888a17a Mon Sep 17 00:00:00 2001
|
diff --git a/pppd/plugins/pppoe/Makefile.linux b/pppd/plugins/pppoe/Makefile.linux
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Mon, 7 Apr 2014 14:29:45 +0200
|
|
||||||
Subject: [PATCH 16/27] rp-pppoe: add manpage for pppoe-discovery
|
|
||||||
|
|
||||||
---
|
|
||||||
pppd/plugins/rp-pppoe/Makefile.linux | 2 +
|
|
||||||
pppd/plugins/rp-pppoe/pppoe-discovery.8 | 86 +++++++++++++++++++++++++++++++++
|
|
||||||
2 files changed, 88 insertions(+)
|
|
||||||
create mode 100644 pppd/plugins/rp-pppoe/pppoe-discovery.8
|
|
||||||
|
|
||||||
diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
index 3cd9101..9918091 100644
|
index 3cd9101..9918091 100644
|
||||||
--- a/pppd/plugins/rp-pppoe/Makefile.linux
|
--- a/pppd/plugins/pppoe/Makefile.linux
|
||||||
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
|
+++ b/pppd/plugins/pppoe/Makefile.linux
|
||||||
@@ -16,6 +16,7 @@
|
@@ -16,6 +16,7 @@
|
||||||
|
|
||||||
DESTDIR = $(INSTROOT)@DESTDIR@
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
||||||
@ -22,18 +11,18 @@ index 3cd9101..9918091 100644
|
|||||||
|
|
||||||
PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
||||||
@@ -46,6 +47,7 @@ install: all
|
@@ -46,6 +47,7 @@ install: all
|
||||||
$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
|
$(LN_S) pppoe.so $(LIBDIR)/rp-pppoe.so
|
||||||
$(INSTALL) -d -m 755 $(BINDIR)
|
$(INSTALL) -d -m 755 $(BINDIR)
|
||||||
$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
|
$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
|
||||||
+ $(INSTALL) -c -m 444 pppoe-discovery.8 $(MANDIR)
|
+ $(INSTALL) -c -m 444 pppoe-discovery.8 $(MANDIR)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o *.so pppoe-discovery
|
rm -f *.o *.so pppoe-discovery
|
||||||
diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.8 b/pppd/plugins/rp-pppoe/pppoe-discovery.8
|
diff --git a/pppd/plugins/pppoe/pppoe-discovery.8 b/pppd/plugins/pppoe/pppoe-discovery.8
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..d0a93db
|
index 0000000..d0a93db
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.8
|
+++ b/pppd/plugins/pppoe/pppoe-discovery.8
|
||||||
@@ -0,0 +1,86 @@
|
@@ -0,0 +1,86 @@
|
||||||
+.\" pppoe-discovery.8 written by
|
+.\" pppoe-discovery.8 written by
|
||||||
+.\" Ben Hutchings <ben@decadentplace.org.uk>, based on pppoe.8.
|
+.\" Ben Hutchings <ben@decadentplace.org.uk>, based on pppoe.8.
|
||||||
|
|||||||
@ -1,24 +1,15 @@
|
|||||||
From 769521a3798fd554ddc7333cb1255cd1b40790e8 Mon Sep 17 00:00:00 2001
|
diff --git a/pppd/plugins/pppoe/Makefile.linux b/pppd/plugins/pppoe/Makefile.linux
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
index 2df887b..6cb8397 100644
|
||||||
Date: Thu, 10 Apr 2014 10:00:55 +0200
|
--- a/pppd/plugins/pppoe/Makefile.linux
|
||||||
Subject: [PATCH 23/27] build-sys: install rp-pppoe plugin files with standard
|
+++ b/pppd/plugins/pppoe/Makefile.linux
|
||||||
perms
|
@@ -43,12 +43,12 @@ pppoe.so: plugin.o discovery.o if.o common.o
|
||||||
|
|
||||||
This is needed to properly generate debuginfo package.
|
|
||||||
---
|
|
||||||
pppd/plugins/rp-pppoe/Makefile.linux | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
index b949716..fa49efb 100644
|
|
||||||
--- a/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
@@ -44,10 +44,10 @@ rp-pppoe.so: plugin.o discovery.o if.o common.o
|
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
$(INSTALL) -d -m 755 $(LIBDIR)
|
$(INSTALL) -d -m 755 $(LIBDIR)
|
||||||
- $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
|
- $(INSTALL) -c -m 4550 pppoe.so $(LIBDIR)
|
||||||
+ $(INSTALL) -c -m 755 rp-pppoe.so $(LIBDIR)
|
+ $(INSTALL) -c -m 755 pppoe.so $(LIBDIR)
|
||||||
|
# Symlink for backward compatibility
|
||||||
|
$(LN_S) pppoe.so $(LIBDIR)/rp-pppoe.so
|
||||||
$(INSTALL) -d -m 755 $(BINDIR)
|
$(INSTALL) -d -m 755 $(BINDIR)
|
||||||
- $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
|
- $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
|
||||||
- $(INSTALL) -c -m 444 pppoe-discovery.8 $(MANDIR)
|
- $(INSTALL) -c -m 444 pppoe-discovery.8 $(MANDIR)
|
||||||
@ -27,6 +18,3 @@ index b949716..fa49efb 100644
|
|||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o *.so pppoe-discovery
|
rm -f *.o *.so pppoe-discovery
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
|
|||||||
@ -1,37 +0,0 @@
|
|||||||
From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Mackerras <paulus@ozlabs.org>
|
|
||||||
Date: Mon, 3 Feb 2020 15:53:28 +1100
|
|
||||||
Subject: [PATCH] pppd: Fix bounds check in EAP code
|
|
||||||
|
|
||||||
Given that we have just checked vallen < len, it can never be the case
|
|
||||||
that vallen >= len + sizeof(rhostname). This fixes the check so we
|
|
||||||
actually avoid overflowing the rhostname array.
|
|
||||||
|
|
||||||
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
|
|
||||||
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
|
|
||||||
---
|
|
||||||
pppd/eap.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pppd/eap.c b/pppd/eap.c
|
|
||||||
index 94407f56..1b93db01 100644
|
|
||||||
--- a/pppd/eap.c
|
|
||||||
+++ b/pppd/eap.c
|
|
||||||
@@ -1420,7 +1420,7 @@ int len;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Not so likely to happen. */
|
|
||||||
- if (vallen >= len + sizeof (rhostname)) {
|
|
||||||
+ if (len - vallen >= sizeof (rhostname)) {
|
|
||||||
dbglog("EAP: trimming really long peer name down");
|
|
||||||
BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
|
|
||||||
rhostname[sizeof (rhostname) - 1] = '\0';
|
|
||||||
@@ -1846,7 +1846,7 @@ int len;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Not so likely to happen. */
|
|
||||||
- if (vallen >= len + sizeof (rhostname)) {
|
|
||||||
+ if (len - vallen >= sizeof (rhostname)) {
|
|
||||||
dbglog("EAP: trimming really long peer name down");
|
|
||||||
BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
|
|
||||||
rhostname[sizeof (rhostname) - 1] = '\0';
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
From d69eb9a8aa284014dd7dd282813989eda9d84d74 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Wed, 9 Apr 2014 09:56:09 +0200
|
|
||||||
Subject: [PATCH 21/27] build-sys: compile pppol2tp plugin with RPM_OPT_FLAGS
|
|
||||||
|
|
||||||
---
|
|
||||||
pppd/plugins/pppol2tp/Makefile.linux | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
|
|
||||||
index 4339566..9a635b8 100644
|
|
||||||
--- a/pppd/plugins/pppol2tp/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/pppol2tp/Makefile.linux
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
#CC = gcc
|
|
||||||
-COPTS = -O2 -g
|
|
||||||
+COPTS = $(RPM_OPT_FLAGS)
|
|
||||||
CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
|
|
||||||
LDFLAGS_SHARED = -shared
|
|
||||||
INSTALL = install
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
From a0060c5d48ef742bff4fe9ba9c276a5c21795ce8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Wed, 9 Apr 2014 09:58:38 +0200
|
|
||||||
Subject: [PATCH 22/27] build-sys: compile pppol2tp with multilink support
|
|
||||||
|
|
||||||
Resolves: #817013
|
|
||||||
---
|
|
||||||
pppd/plugins/pppol2tp/Makefile.linux | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
|
|
||||||
index 9a635b8..9cb316d 100644
|
|
||||||
--- a/pppd/plugins/pppol2tp/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/pppol2tp/Makefile.linux
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
#CC = gcc
|
|
||||||
-COPTS = $(RPM_OPT_FLAGS)
|
|
||||||
+COPTS = $(RPM_OPT_FLAGS) -DHAVE_MULTILINK
|
|
||||||
CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
|
|
||||||
LDFLAGS_SHARED = -shared
|
|
||||||
INSTALL = install
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
From 0d71a32b73b71c9793d0b304320858062faf00d1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Fri, 4 Apr 2014 11:25:43 +0200
|
|
||||||
Subject: [PATCH 02/27] build-sys: enable PAM support
|
|
||||||
|
|
||||||
---
|
|
||||||
pppd/Makefile.linux | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
|
||||||
index 1d9ea78..5a44d30 100644
|
|
||||||
--- a/pppd/Makefile.linux
|
|
||||||
+++ b/pppd/Makefile.linux
|
|
||||||
@@ -61,7 +61,7 @@ HAVE_MULTILINK=y
|
|
||||||
#SYSTEMD=y
|
|
||||||
|
|
||||||
HAS_SHADOW=y
|
|
||||||
-#USE_PAM=y
|
|
||||||
+USE_PAM=y
|
|
||||||
HAVE_INET6=y
|
|
||||||
|
|
||||||
# Enable plugins
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,121 +0,0 @@
|
|||||||
From d729b06f0ac7a5ebd3648ef60bef0499b59bf82d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Fri, 4 Apr 2014 11:29:39 +0200
|
|
||||||
Subject: [PATCH 03/27] build-sys: utilize compiler flags handed to us by
|
|
||||||
rpmbuild
|
|
||||||
|
|
||||||
---
|
|
||||||
chat/Makefile.linux | 2 +-
|
|
||||||
pppd/Makefile.linux | 3 +--
|
|
||||||
pppd/plugins/Makefile.linux | 2 +-
|
|
||||||
pppd/plugins/pppoatm/Makefile.linux | 2 +-
|
|
||||||
pppd/plugins/radius/Makefile.linux | 2 +-
|
|
||||||
pppd/plugins/rp-pppoe/Makefile.linux | 2 +-
|
|
||||||
pppdump/Makefile.linux | 2 +-
|
|
||||||
pppstats/Makefile.linux | 2 +-
|
|
||||||
8 files changed, 8 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/chat/Makefile.linux b/chat/Makefile.linux
|
|
||||||
index 1065ac5..848cd8d 100644
|
|
||||||
--- a/chat/Makefile.linux
|
|
||||||
+++ b/chat/Makefile.linux
|
|
||||||
@@ -10,7 +10,7 @@ CDEF3= -UNO_SLEEP # Use the usleep function
|
|
||||||
CDEF4= -DFNDELAY=O_NDELAY # Old name value
|
|
||||||
CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
|
|
||||||
|
|
||||||
-COPTS= -O2 -g -pipe
|
|
||||||
+COPTS= $(RPM_OPT_FLAGS)
|
|
||||||
CFLAGS= $(COPTS) $(CDEFS)
|
|
||||||
|
|
||||||
INSTALL= install
|
|
||||||
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
|
||||||
index 5a44d30..63872eb 100644
|
|
||||||
--- a/pppd/Makefile.linux
|
|
||||||
+++ b/pppd/Makefile.linux
|
|
||||||
@@ -32,8 +32,7 @@ endif
|
|
||||||
|
|
||||||
CC = gcc
|
|
||||||
#
|
|
||||||
-COPTS = -O2 -pipe -Wall -g
|
|
||||||
-LIBS =
|
|
||||||
+COPTS = -Wall $(RPM_OPT_FLAGS)
|
|
||||||
|
|
||||||
# Uncomment the next line to include support for Microsoft's
|
|
||||||
# MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
|
|
||||||
diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
|
|
||||||
index 0a7ec7b..e09a369 100644
|
|
||||||
--- a/pppd/plugins/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/Makefile.linux
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
#CC = gcc
|
|
||||||
-COPTS = -O2 -g
|
|
||||||
+COPTS = $(RPM_OPT_FLAGS)
|
|
||||||
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
|
||||||
LDFLAGS_SHARED = -shared
|
|
||||||
INSTALL = install
|
|
||||||
diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
|
|
||||||
index 20f62e6..5a81447 100644
|
|
||||||
--- a/pppd/plugins/pppoatm/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/pppoatm/Makefile.linux
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
#CC = gcc
|
|
||||||
-COPTS = -O2 -g
|
|
||||||
+COPTS = $(RPM_OPT_FLAGS)
|
|
||||||
CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC
|
|
||||||
LDFLAGS_SHARED = -shared
|
|
||||||
INSTALL = install
|
|
||||||
diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
|
|
||||||
index 24ed3e5..45b3b8d 100644
|
|
||||||
--- a/pppd/plugins/radius/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/radius/Makefile.linux
|
|
||||||
@@ -12,7 +12,7 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
|
||||||
INSTALL = install
|
|
||||||
|
|
||||||
PLUGIN=radius.so radattr.so radrealms.so
|
|
||||||
-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
|
|
||||||
+CFLAGS=-I. -I../.. -I../../../include $(RPM_OPT_FLAGS) -DRC_LOG_FACILITY=LOG_DAEMON
|
|
||||||
|
|
||||||
# Uncomment the next line to include support for Microsoft's
|
|
||||||
# MS-CHAP authentication protocol.
|
|
||||||
diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
index 5d7a271..352991a 100644
|
|
||||||
--- a/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
@@ -25,7 +25,7 @@ INSTALL = install
|
|
||||||
# Version is set ONLY IN THE MAKEFILE! Don't delete this!
|
|
||||||
RP_VERSION=3.8p
|
|
||||||
|
|
||||||
-COPTS=-O2 -g
|
|
||||||
+COPTS=$(RPM_OPT_FLAGS)
|
|
||||||
CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
|
|
||||||
all: rp-pppoe.so pppoe-discovery
|
|
||||||
|
|
||||||
diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
|
|
||||||
index ac028f6..d0a5032 100644
|
|
||||||
--- a/pppdump/Makefile.linux
|
|
||||||
+++ b/pppdump/Makefile.linux
|
|
||||||
@@ -2,7 +2,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@
|
|
||||||
BINDIR = $(DESTDIR)/sbin
|
|
||||||
MANDIR = $(DESTDIR)/share/man/man8
|
|
||||||
|
|
||||||
-CFLAGS= -O -I../include/net
|
|
||||||
+CFLAGS= $(RPM_OPT_FLAGS) -I../include/net
|
|
||||||
OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
|
|
||||||
|
|
||||||
INSTALL= install
|
|
||||||
diff --git a/pppstats/Makefile.linux b/pppstats/Makefile.linux
|
|
||||||
index cca6f0f..42aba73 100644
|
|
||||||
--- a/pppstats/Makefile.linux
|
|
||||||
+++ b/pppstats/Makefile.linux
|
|
||||||
@@ -10,7 +10,7 @@ PPPSTATSRCS = pppstats.c
|
|
||||||
PPPSTATOBJS = pppstats.o
|
|
||||||
|
|
||||||
#CC = gcc
|
|
||||||
-COPTS = -O
|
|
||||||
+COPTS = $(RPM_OPT_FLAGS)
|
|
||||||
COMPILE_FLAGS = -I../include
|
|
||||||
LIBS =
|
|
||||||
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,46 +0,0 @@
|
|||||||
diff --git a/pppdump/pppdump.8 b/pppdump/pppdump.8
|
|
||||||
index 4072e68..1116b85 100644
|
|
||||||
--- a/pppdump/pppdump.8
|
|
||||||
+++ b/pppdump/pppdump.8
|
|
||||||
@@ -13,6 +13,8 @@ pppdump \- convert PPP record file to readable format
|
|
||||||
]] [
|
|
||||||
.B \-r
|
|
||||||
] [
|
|
||||||
+.B \-a
|
|
||||||
+] [
|
|
||||||
.B \-m \fImru
|
|
||||||
] [
|
|
||||||
.I file \fR...
|
|
||||||
@@ -54,6 +56,9 @@ Reverses the direction indicators, so that `sent' is printed for
|
|
||||||
bytes or packets received, and `rcvd' is printed for bytes or packets
|
|
||||||
sent.
|
|
||||||
.TP
|
|
||||||
+.B \-a
|
|
||||||
+Prints absolute times.
|
|
||||||
+.TP
|
|
||||||
.B \-m \fImru
|
|
||||||
Use \fImru\fR as the MRU (maximum receive unit) for both directions of
|
|
||||||
the link when checking for over-length PPP packets (with the \fB\-p\fR
|
|
||||||
diff --git a/pppstats/pppstats.8 b/pppstats/pppstats.8
|
|
||||||
index 4ac101e..cabf4d7 100644
|
|
||||||
--- a/pppstats/pppstats.8
|
|
||||||
+++ b/pppstats/pppstats.8
|
|
||||||
@@ -7,6 +7,8 @@ pppstats \- print PPP statistics
|
|
||||||
[
|
|
||||||
.B \-a
|
|
||||||
] [
|
|
||||||
+.B \-d
|
|
||||||
+] [
|
|
||||||
.B \-v
|
|
||||||
] [
|
|
||||||
.B \-r
|
|
||||||
@@ -41,6 +43,9 @@ reports show statistics for the time since the link was initiated.
|
|
||||||
Without this option, the second and subsequent reports show statistics
|
|
||||||
for the time since the last report.
|
|
||||||
.TP
|
|
||||||
+.B \-d
|
|
||||||
+Show data rate (kB/s) instead of bytes.
|
|
||||||
+.TP
|
|
||||||
.B \-c \fIcount
|
|
||||||
Repeat the display
|
|
||||||
.I count
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
From abef895f9d144f05a83045136b77277352dc450f Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Woodhouse <dwmw2@fedoraproject.org>
|
|
||||||
Date: Fri, 4 Apr 2014 18:53:33 +0200
|
|
||||||
Subject: [PATCH 09/27] pppd: introduce ipv6-accept-remote
|
|
||||||
|
|
||||||
---
|
|
||||||
pppd/ipv6cp.c | 5 ++++-
|
|
||||||
pppd/ipv6cp.h | 3 ++-
|
|
||||||
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c
|
|
||||||
index caa2b26..5a56c95 100644
|
|
||||||
--- a/pppd/ipv6cp.c
|
|
||||||
+++ b/pppd/ipv6cp.c
|
|
||||||
@@ -245,6 +245,8 @@ static option_t ipv6cp_option_list[] = {
|
|
||||||
|
|
||||||
{ "ipv6cp-accept-local", o_bool, &ipv6cp_allowoptions[0].accept_local,
|
|
||||||
"Accept peer's interface identifier for us", 1 },
|
|
||||||
+ { "ipv6cp-accept-remote", o_bool, &ipv6cp_allowoptions[0].accept_remote,
|
|
||||||
+ "Accept peer's interface identifier for itself", 1 },
|
|
||||||
|
|
||||||
{ "defaultroute6", o_bool, &ipv6cp_wantoptions[0].default_route,
|
|
||||||
"Add default IPv6 route", OPT_ENABLE|1, &ipv6cp_allowoptions[0].default_route },
|
|
||||||
@@ -437,6 +439,7 @@ ipv6cp_init(unit)
|
|
||||||
memset(ao, 0, sizeof(*ao));
|
|
||||||
|
|
||||||
wo->accept_local = 1;
|
|
||||||
+ wo->accept_remote = 1;
|
|
||||||
wo->neg_ifaceid = 1;
|
|
||||||
ao->neg_ifaceid = 1;
|
|
||||||
|
|
||||||
@@ -962,7 +965,7 @@ ipv6cp_reqci(f, inp, len, reject_if_disagree)
|
|
||||||
orc = CONFREJ; /* Reject CI */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
- if (!eui64_iszero(wo->hisid) &&
|
|
||||||
+ if (!eui64_iszero(wo->hisid) && !wo->accept_remote &&
|
|
||||||
!eui64_equals(ifaceid, wo->hisid) &&
|
|
||||||
eui64_iszero(go->hisid)) {
|
|
||||||
|
|
||||||
diff --git a/pppd/ipv6cp.h b/pppd/ipv6cp.h
|
|
||||||
index cc4568d..8c7552e 100644
|
|
||||||
--- a/pppd/ipv6cp.h
|
|
||||||
+++ b/pppd/ipv6cp.h
|
|
||||||
@@ -150,7 +150,8 @@
|
|
||||||
int neg_ifaceid; /* Negotiate interface identifier? */
|
|
||||||
int req_ifaceid; /* Ask peer to send interface identifier? */
|
|
||||||
int default_route; /* Assign default route through interface? */
|
|
||||||
- int accept_local; /* accept peer's value for iface id? */
|
|
||||||
+ int accept_local; /* accept peer's value for our iface id? */
|
|
||||||
+ int accept_remote; /* accept peer's value for his iface id? */
|
|
||||||
int opt_local; /* ourtoken set by option */
|
|
||||||
int opt_remote; /* histoken set by option */
|
|
||||||
int use_ip; /* use IP as interface identifier */
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,383 +0,0 @@
|
|||||||
From 6edc865bd02ab591b9121d4a5f6dc3cdbe5af809 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Wed, 9 Apr 2014 09:18:24 +0200
|
|
||||||
Subject: [PATCH 19/27] sys-linux: rework get_first_ethernet()
|
|
||||||
|
|
||||||
We can't assume that host has ethernet NIC named "eth0". Rather than guessing we
|
|
||||||
better ask udev. We iterate over symlinks symlinks in /sys/class/net and
|
|
||||||
for each device we determine if it is ethernet device and additionally we query
|
|
||||||
udev database for sub-type of the device. If we find PCI or USB device which has
|
|
||||||
ethernet datalink type and appropriate sub-type we return its name. If we don't
|
|
||||||
succeed in determining more information about device we will return "good
|
|
||||||
enough" device which in turn is first device with ethernet datalink type.
|
|
||||||
|
|
||||||
Note that we now have two copies of get_first_ethernet() in the source code. This
|
|
||||||
is bad and should be fixed in the future.
|
|
||||||
|
|
||||||
This commit replaces ppp-2.4.5-eth.patch.
|
|
||||||
|
|
||||||
Resolves: #682381
|
|
||||||
---
|
|
||||||
pppd/Makefile.linux | 3 +
|
|
||||||
pppd/multilink.c | 4 +-
|
|
||||||
pppd/plugins/rp-pppoe/Makefile.linux | 4 +-
|
|
||||||
pppd/plugins/rp-pppoe/pppoe-discovery.c | 117 +++++++++++++++++++++++++++++++-
|
|
||||||
pppd/pppd.h | 2 +-
|
|
||||||
pppd/sys-linux.c | 115 +++++++++++++++++++++++++++++--
|
|
||||||
6 files changed, 232 insertions(+), 13 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
|
||||||
index 53df4d2..0e8107f 100644
|
|
||||||
--- a/pppd/Makefile.linux
|
|
||||||
+++ b/pppd/Makefile.linux
|
|
||||||
@@ -32,6 +32,9 @@ include .depend
|
|
||||||
endif
|
|
||||||
|
|
||||||
CC = gcc
|
|
||||||
+
|
|
||||||
+LIBS = -ludev
|
|
||||||
+
|
|
||||||
#
|
|
||||||
COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\"
|
|
||||||
|
|
||||||
diff --git a/pppd/multilink.c b/pppd/multilink.c
|
|
||||||
index 135cab0..2f0ed50 100644
|
|
||||||
--- a/pppd/multilink.c
|
|
||||||
+++ b/pppd/multilink.c
|
|
||||||
@@ -436,12 +436,12 @@ static int
|
|
||||||
get_default_epdisc(ep)
|
|
||||||
struct epdisc *ep;
|
|
||||||
{
|
|
||||||
- char *p;
|
|
||||||
+ char *p = NULL;
|
|
||||||
struct hostent *hp;
|
|
||||||
u_int32_t addr;
|
|
||||||
|
|
||||||
/* First try for an ethernet MAC address */
|
|
||||||
- p = get_first_ethernet();
|
|
||||||
+ get_first_ethernet(&p);
|
|
||||||
if (p != 0 && get_if_hwaddr(ep->value, p) >= 0) {
|
|
||||||
ep->class = EPD_MAC;
|
|
||||||
ep->length = 6;
|
|
||||||
diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
index 9918091..b949716 100644
|
|
||||||
--- a/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
@@ -30,8 +30,8 @@ COPTS=$(RPM_OPT_FLAGS)
|
|
||||||
CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
|
|
||||||
all: rp-pppoe.so pppoe-discovery
|
|
||||||
|
|
||||||
-pppoe-discovery: pppoe-discovery.o debug.o
|
|
||||||
- $(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o
|
|
||||||
+pppoe-discovery: pppoe-discovery.o debug.o common.o
|
|
||||||
+ $(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o -ludev
|
|
||||||
|
|
||||||
pppoe-discovery.o: pppoe-discovery.c
|
|
||||||
$(CC) $(CFLAGS) -I../../.. -c -o pppoe-discovery.o pppoe-discovery.c
|
|
||||||
diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
|
||||||
index c0d927d..2bd910f 100644
|
|
||||||
--- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
|
||||||
+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
|
|
||||||
@@ -47,8 +47,13 @@
|
|
||||||
#include <net/if_arp.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <dirent.h>
|
|
||||||
+#include <sys/types.h>
|
|
||||||
+#include <libudev.h>
|
|
||||||
+
|
|
||||||
char *xstrdup(const char *s);
|
|
||||||
void usage(void);
|
|
||||||
+int get_first_ethernet(char **_r);
|
|
||||||
|
|
||||||
void die(int status)
|
|
||||||
{
|
|
||||||
@@ -681,8 +686,15 @@ int main(int argc, char *argv[])
|
|
||||||
}
|
|
||||||
|
|
||||||
/* default interface name */
|
|
||||||
- if (!conn->ifName)
|
|
||||||
- conn->ifName = strdup("eth0");
|
|
||||||
+ if (!conn->ifName) {
|
|
||||||
+ char *eth_dev;
|
|
||||||
+ if (get_first_ethernet(ð_dev) < 0) {
|
|
||||||
+ fprintf(stderr, "No ethernet device on the host.\n");
|
|
||||||
+ exit(1);
|
|
||||||
+ }
|
|
||||||
+ conn->ifName = eth_dev;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
|
|
||||||
conn->discoverySocket = -1;
|
|
||||||
conn->sessionSocket = -1;
|
|
||||||
@@ -722,3 +734,104 @@ void usage(void)
|
|
||||||
" -h -- Print usage information.\n");
|
|
||||||
fprintf(stderr, "\nVersion " RP_VERSION "\n");
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * get_first_ethernet - return the name of the first ethernet-style
|
|
||||||
+ * interface on this system.
|
|
||||||
+ */
|
|
||||||
+int
|
|
||||||
+get_first_ethernet(char **_r)
|
|
||||||
+{
|
|
||||||
+ int r = 0;
|
|
||||||
+ DIR *d = NULL;
|
|
||||||
+ struct dirent *entry = NULL;
|
|
||||||
+ struct udev *udev = NULL;
|
|
||||||
+ struct udev_device *dev = NULL;
|
|
||||||
+ char *eth_dev = NULL;
|
|
||||||
+
|
|
||||||
+ d = opendir("/sys/class/net");
|
|
||||||
+ if (!d) {
|
|
||||||
+ fprintf(stderr, "Failed to open dir /sys/class/net : %m\n");
|
|
||||||
+ r = -errno;
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ udev = udev_new();
|
|
||||||
+ if (!udev) {
|
|
||||||
+ fprintf(stderr, "Failed to talk to systemd-udevd\n");
|
|
||||||
+ r = -EIO;
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ while ((entry = readdir(d)) != NULL) {
|
|
||||||
+ char syspath[PATH_MAX] = {};
|
|
||||||
+ const char *type = NULL;
|
|
||||||
+
|
|
||||||
+ if ((strcmp(entry->d_name, ".") == 0) || (strcmp(entry->d_name, "..") == 0))
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ sprintf(syspath, "/sys/class/net/%s", entry->d_name);
|
|
||||||
+
|
|
||||||
+ dev = udev_device_new_from_syspath(udev, syspath);
|
|
||||||
+ if (!dev)
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ type = udev_device_get_sysattr_value(dev, "type");
|
|
||||||
+ if (strcmp(type, "1") == 0) {
|
|
||||||
+ const char *pci_dev_subclass = NULL, *usb_dev_subclass = NULL;
|
|
||||||
+
|
|
||||||
+ pci_dev_subclass = udev_device_get_property_value(dev,
|
|
||||||
+ "ID_PCI_SUBCLASS_FROM_DATABASE");
|
|
||||||
+ usb_dev_subclass = udev_device_get_property_value(dev,
|
|
||||||
+ "ID_USB_SUBCLASS_FROM_DATABASE");
|
|
||||||
+
|
|
||||||
+ if ((pci_dev_subclass && strcmp(pci_dev_subclass, "Ethernet controller") == 0) ||
|
|
||||||
+ (usb_dev_subclass && (strcmp(usb_dev_subclass, "Ethernet Networking") == 0 ||
|
|
||||||
+ strcmp(usb_dev_subclass, "Ethernet Emulation") == 0))) {
|
|
||||||
+ char *d = NULL;
|
|
||||||
+
|
|
||||||
+ d = strdup(entry->d_name);
|
|
||||||
+ if (!d) {
|
|
||||||
+ r = -ENOMEM;
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ free(eth_dev);
|
|
||||||
+ eth_dev = d;
|
|
||||||
+ break;
|
|
||||||
+ } else if (!eth_dev) {
|
|
||||||
+ eth_dev = strdup(entry->d_name);
|
|
||||||
+ if (!eth_dev) {
|
|
||||||
+ r = -ENOMEM;
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ udev_device_unref(dev);
|
|
||||||
+ dev = NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (dev)
|
|
||||||
+ udev_device_unref(dev);
|
|
||||||
+ udev_unref(udev);
|
|
||||||
+ closedir(d);
|
|
||||||
+
|
|
||||||
+ *_r = eth_dev;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+fail:
|
|
||||||
+ if (dev)
|
|
||||||
+ udev_device_unref(dev);
|
|
||||||
+
|
|
||||||
+ if (udev)
|
|
||||||
+ udev_unref(udev);
|
|
||||||
+
|
|
||||||
+ if (d)
|
|
||||||
+ closedir(d);
|
|
||||||
+
|
|
||||||
+ free(eth_dev);
|
|
||||||
+
|
|
||||||
+ return r;
|
|
||||||
+}
|
|
||||||
diff --git a/pppd/pppd.h b/pppd/pppd.h
|
|
||||||
index de271c1..aaddba1 100644
|
|
||||||
--- a/pppd/pppd.h
|
|
||||||
+++ b/pppd/pppd.h
|
|
||||||
@@ -691,7 +691,7 @@ int sipxfaddr __P((int, unsigned long, unsigned char *));
|
|
||||||
int cipxfaddr __P((int));
|
|
||||||
#endif
|
|
||||||
int get_if_hwaddr __P((u_char *addr, char *name));
|
|
||||||
-char *get_first_ethernet __P((void));
|
|
||||||
+int get_first_ethernet __P((char **_r));
|
|
||||||
|
|
||||||
/* Procedures exported from options.c */
|
|
||||||
int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */
|
|
||||||
diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
|
|
||||||
index 0690019..ec09c50 100644
|
|
||||||
--- a/pppd/sys-linux.c
|
|
||||||
+++ b/pppd/sys-linux.c
|
|
||||||
@@ -92,6 +92,9 @@
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <termios.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
+#include <dirent.h>
|
|
||||||
+
|
|
||||||
+#include <libudev.h>
|
|
||||||
|
|
||||||
/* This is in netdevice.h. However, this compile will fail miserably if
|
|
||||||
you attempt to include netdevice.h because it has so many references
|
|
||||||
@@ -1873,10 +1876,101 @@ get_if_hwaddr(u_char *addr, char *name)
|
|
||||||
* get_first_ethernet - return the name of the first ethernet-style
|
|
||||||
* interface on this system.
|
|
||||||
*/
|
|
||||||
-char *
|
|
||||||
-get_first_ethernet()
|
|
||||||
-{
|
|
||||||
- return "eth0";
|
|
||||||
+int
|
|
||||||
+get_first_ethernet(char **_r)
|
|
||||||
+{
|
|
||||||
+ int r = 0;
|
|
||||||
+ DIR *d = NULL;
|
|
||||||
+ struct dirent *entry = NULL;
|
|
||||||
+ struct udev *udev = NULL;
|
|
||||||
+ struct udev_device *dev = NULL;
|
|
||||||
+ char *eth_dev = NULL;
|
|
||||||
+
|
|
||||||
+ d = opendir("/sys/class/net");
|
|
||||||
+ if (!d) {
|
|
||||||
+ fprintf(stderr, "Failed to open dir /sys/class/net : %m\n");
|
|
||||||
+ r = -errno;
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ udev = udev_new();
|
|
||||||
+ if (!udev) {
|
|
||||||
+ fprintf(stderr, "Failed to talk to systemd-udevd\n");
|
|
||||||
+ r = -EIO;
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ while ((entry = readdir(d)) != NULL) {
|
|
||||||
+ char syspath[PATH_MAX] = {};
|
|
||||||
+ const char *type = NULL;
|
|
||||||
+
|
|
||||||
+ if ((strcmp(entry->d_name, ".") == 0) || (strcmp(entry->d_name, "..") == 0))
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ sprintf(syspath, "/sys/class/net/%s", entry->d_name);
|
|
||||||
+
|
|
||||||
+ dev = udev_device_new_from_syspath(udev, syspath);
|
|
||||||
+ if (!dev)
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ type = udev_device_get_sysattr_value(dev, "type");
|
|
||||||
+ if (strcmp(type, "1") == 0) {
|
|
||||||
+ const char *pci_dev_subclass = NULL, *usb_dev_subclass = NULL;
|
|
||||||
+
|
|
||||||
+ pci_dev_subclass = udev_device_get_property_value(dev,
|
|
||||||
+ "ID_PCI_SUBCLASS_FROM_DATABASE");
|
|
||||||
+ usb_dev_subclass = udev_device_get_property_value(dev,
|
|
||||||
+ "ID_USB_SUBCLASS_FROM_DATABASE");
|
|
||||||
+
|
|
||||||
+ if ((pci_dev_subclass && strcmp(pci_dev_subclass, "Ethernet controller") == 0) ||
|
|
||||||
+ (usb_dev_subclass && (strcmp(usb_dev_subclass, "Ethernet Networking") == 0 ||
|
|
||||||
+ strcmp(usb_dev_subclass, "Ethernet Emulation") == 0))) {
|
|
||||||
+ char *d = NULL;
|
|
||||||
+
|
|
||||||
+ d = strdup(entry->d_name);
|
|
||||||
+ if (!d) {
|
|
||||||
+ r = -ENOMEM;
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ free(eth_dev);
|
|
||||||
+ eth_dev = d;
|
|
||||||
+ break;
|
|
||||||
+ } else if (!eth_dev) {
|
|
||||||
+ eth_dev = strdup(entry->d_name);
|
|
||||||
+ if (!eth_dev) {
|
|
||||||
+ r = -ENOMEM;
|
|
||||||
+ goto fail;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ udev_device_unref(dev);
|
|
||||||
+ dev = NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (dev)
|
|
||||||
+ udev_device_unref(dev);
|
|
||||||
+ udev_unref(udev);
|
|
||||||
+ closedir(d);
|
|
||||||
+
|
|
||||||
+ *_r = eth_dev;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+fail:
|
|
||||||
+ if (dev)
|
|
||||||
+ udev_device_unref(dev);
|
|
||||||
+
|
|
||||||
+ if (udev)
|
|
||||||
+ udev_unref(udev);
|
|
||||||
+
|
|
||||||
+ if (d)
|
|
||||||
+ closedir(d);
|
|
||||||
+
|
|
||||||
+ free(eth_dev);
|
|
||||||
+
|
|
||||||
+ return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
/********************************************************************
|
|
||||||
@@ -2859,6 +2953,7 @@ ether_to_eui64(eui64_t *p_eui64)
|
|
||||||
struct ifreq ifr;
|
|
||||||
int skfd;
|
|
||||||
const unsigned char *ptr;
|
|
||||||
+ char *eth_dev = NULL;
|
|
||||||
|
|
||||||
skfd = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0);
|
|
||||||
if(skfd == -1)
|
|
||||||
@@ -2867,11 +2962,19 @@ ether_to_eui64(eui64_t *p_eui64)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
- strcpy(ifr.ifr_name, "eth0");
|
|
||||||
+ if (get_first_ethernet(ð_dev) < 0)
|
|
||||||
+ {
|
|
||||||
+ warn("no ethernet device present on the host");
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ strcpy(ifr.ifr_name, eth_dev);
|
|
||||||
+ free(eth_dev);
|
|
||||||
+
|
|
||||||
if(ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0)
|
|
||||||
{
|
|
||||||
close(skfd);
|
|
||||||
- warn("could not obtain hardware address for eth0");
|
|
||||||
+ warn("could not obtain hardware address for %s", ifr.ifr_name);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
close(skfd);
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
From 3cd95baf3f1de1d5a9bc89be0f4c3215ceb5aefe Mon Sep 17 00:00:00 2001
|
|
||||||
From: yannayl <yannayl@users.noreply.github.com>
|
|
||||||
Date: Sun, 12 Jul 2020 12:12:08 +0300
|
|
||||||
Subject: [PATCH] Accept Malformed Windows Success Message
|
|
||||||
|
|
||||||
Windows Server 2019 skip a space when sending a success message.
|
|
||||||
This commit accepts such a malformed message and continues normally.
|
|
||||||
|
|
||||||
Signed-off-by: Yannay Linveh <yannayl@gmail.com>
|
|
||||||
Signed-off-by: yannayl <yannayl@users.noreply.github.com>
|
|
||||||
---
|
|
||||||
pppd/chap_ms.c | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pppd/chap_ms.c b/pppd/chap_ms.c
|
|
||||||
index 1de50428..ffb6bd13 100644
|
|
||||||
--- a/pppd/chap_ms.c
|
|
||||||
+++ b/pppd/chap_ms.c
|
|
||||||
@@ -423,6 +423,8 @@ chapms2_check_success(int id, unsigned char *msg, int len)
|
|
||||||
len -= MS_AUTH_RESPONSE_LENGTH;
|
|
||||||
if ((len >= 3) && !strncmp((char *)msg, " M=", 3)) {
|
|
||||||
msg += 3; /* Eat the delimiter */
|
|
||||||
+ } else if ((len >= 2) && !strncmp((char *)msg, "M=", 2)) {
|
|
||||||
+ msg += 2; /* Eat the delimiter */
|
|
||||||
} else if (len) {
|
|
||||||
/* Packet has extra text which does not begin " M=" */
|
|
||||||
error("MS-CHAPv2 Success packet is badly formed.");
|
|
||||||
@ -1,24 +1,8 @@
|
|||||||
From 69711944745af0078da77e108d30f89fd7e06108 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Fri, 4 Apr 2014 12:01:33 +0200
|
|
||||||
Subject: [PATCH 05/27] build-sys: don't hardcode LIBDIR, but set it according
|
|
||||||
to the target platform
|
|
||||||
|
|
||||||
---
|
|
||||||
pppd/Makefile.linux | 3 ++-
|
|
||||||
pppd/pathnames.h | 2 +-
|
|
||||||
pppd/plugins/Makefile.linux | 2 +-
|
|
||||||
pppd/plugins/pppoatm/Makefile.linux | 2 +-
|
|
||||||
pppd/plugins/pppol2tp/Makefile.linux | 4 ++--
|
|
||||||
pppd/plugins/radius/Makefile.linux | 2 +-
|
|
||||||
pppd/plugins/rp-pppoe/Makefile.linux | 2 +-
|
|
||||||
7 files changed, 9 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
||||||
index 63872eb..8ed56c1 100644
|
index 6a4b897..8f29c1f 100644
|
||||||
--- a/pppd/Makefile.linux
|
--- a/pppd/Makefile.linux
|
||||||
+++ b/pppd/Makefile.linux
|
+++ b/pppd/Makefile.linux
|
||||||
@@ -8,6 +8,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@
|
@@ -12,6 +12,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@
|
||||||
BINDIR = $(DESTDIR)/sbin
|
BINDIR = $(DESTDIR)/sbin
|
||||||
MANDIR = $(DESTDIR)/share/man/man8
|
MANDIR = $(DESTDIR)/share/man/man8
|
||||||
INCDIR = $(DESTDIR)/include
|
INCDIR = $(DESTDIR)/include
|
||||||
@ -26,20 +10,20 @@ index 63872eb..8ed56c1 100644
|
|||||||
|
|
||||||
TARGETS = pppd
|
TARGETS = pppd
|
||||||
|
|
||||||
@@ -32,7 +33,7 @@ endif
|
@@ -93,7 +94,7 @@ INCLUDE_DIRS= -I../include
|
||||||
|
|
||||||
CC = gcc
|
COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP -pipe
|
||||||
#
|
|
||||||
-COPTS = -Wall $(RPM_OPT_FLAGS)
|
|
||||||
+COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\"
|
|
||||||
|
|
||||||
# Uncomment the next line to include support for Microsoft's
|
-CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"'
|
||||||
# MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
|
+CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) '-DDESTDIR="@DESTDIR@"' -DLIBDIR=\""$(LIBDIR)"\"
|
||||||
|
|
||||||
|
ifdef CHAPMS
|
||||||
|
CFLAGS += -DCHAPMS=1
|
||||||
diff --git a/pppd/pathnames.h b/pppd/pathnames.h
|
diff --git a/pppd/pathnames.h b/pppd/pathnames.h
|
||||||
index a33f046..a427cb8 100644
|
index 524d608..c7eadbb 100644
|
||||||
--- a/pppd/pathnames.h
|
--- a/pppd/pathnames.h
|
||||||
+++ b/pppd/pathnames.h
|
+++ b/pppd/pathnames.h
|
||||||
@@ -57,7 +57,7 @@
|
@@ -62,7 +62,7 @@
|
||||||
|
|
||||||
#ifdef PLUGIN
|
#ifdef PLUGIN
|
||||||
#ifdef __STDC__
|
#ifdef __STDC__
|
||||||
@ -49,24 +33,24 @@ index a33f046..a427cb8 100644
|
|||||||
#define _PATH_PLUGIN "/usr/lib/pppd"
|
#define _PATH_PLUGIN "/usr/lib/pppd"
|
||||||
#endif /* __STDC__ */
|
#endif /* __STDC__ */
|
||||||
diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
|
diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
|
||||||
index e09a369..b474a19 100644
|
index 6403e3d..f42d18c 100644
|
||||||
--- a/pppd/plugins/Makefile.linux
|
--- a/pppd/plugins/Makefile.linux
|
||||||
+++ b/pppd/plugins/Makefile.linux
|
+++ b/pppd/plugins/Makefile.linux
|
||||||
@@ -7,7 +7,7 @@ INSTALL = install
|
@@ -5,7 +5,7 @@ COPTS=@CFLAGS@
|
||||||
DESTDIR = $(INSTROOT)@DESTDIR@
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
||||||
BINDIR = $(DESTDIR)/sbin
|
BINDIR = $(DESTDIR)/sbin
|
||||||
MANDIR = $(DESTDIR)/share/man/man8
|
MANDIR = $(DESTDIR)/share/man/man8
|
||||||
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
||||||
+LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
|
+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
|
||||||
|
|
||||||
SUBDIRS := rp-pppoe pppoatm pppol2tp
|
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
||||||
# Uncomment the next line to include the radius authentication plugin
|
LDFLAGS_SHARED = -shared
|
||||||
diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
|
diff --git a/pppd/plugins/pppoatm/Makefile.linux b/pppd/plugins/pppoatm/Makefile.linux
|
||||||
index 5a81447..769794b 100644
|
index d3a8086..c2aff0c 100644
|
||||||
--- a/pppd/plugins/pppoatm/Makefile.linux
|
--- a/pppd/plugins/pppoatm/Makefile.linux
|
||||||
+++ b/pppd/plugins/pppoatm/Makefile.linux
|
+++ b/pppd/plugins/pppoatm/Makefile.linux
|
||||||
@@ -7,7 +7,7 @@ INSTALL = install
|
@@ -4,7 +4,7 @@ CC=$(CROSS_COMPILE)@CC@
|
||||||
#***********************************************************************
|
COPTS=@CFLAGS@
|
||||||
|
|
||||||
DESTDIR = $(INSTROOT)@DESTDIR@
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
||||||
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
||||||
@ -74,39 +58,11 @@ index 5a81447..769794b 100644
|
|||||||
|
|
||||||
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
||||||
|
|
||||||
diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
|
diff --git a/pppd/plugins/pppoe/Makefile.linux b/pppd/plugins/pppoe/Makefile.linux
|
||||||
index ea3538e..4339566 100644
|
index c415ce3..d3b7392 100644
|
||||||
--- a/pppd/plugins/pppol2tp/Makefile.linux
|
--- a/pppd/plugins/pppoe/Makefile.linux
|
||||||
+++ b/pppd/plugins/pppol2tp/Makefile.linux
|
+++ b/pppd/plugins/pppoe/Makefile.linux
|
||||||
@@ -6,8 +6,8 @@ INSTALL = install
|
@@ -18,7 +18,7 @@ COPTS=@CFLAGS@
|
||||||
|
|
||||||
#***********************************************************************
|
|
||||||
|
|
||||||
-DESTDIR = @DESTDIR@
|
|
||||||
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
|
||||||
+DESTDIR = $(INSTROOT)@DESTDIR@
|
|
||||||
+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
|
|
||||||
|
|
||||||
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
|
||||||
|
|
||||||
diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
|
|
||||||
index 45b3b8d..179d0b7 100644
|
|
||||||
--- a/pppd/plugins/radius/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/radius/Makefile.linux
|
|
||||||
@@ -5,7 +5,7 @@
|
|
||||||
|
|
||||||
DESTDIR = $(INSTROOT)@DESTDIR@
|
|
||||||
MANDIR = $(DESTDIR)/share/man/man8
|
|
||||||
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
|
||||||
+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
|
|
||||||
|
|
||||||
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
|
||||||
|
|
||||||
diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
index 352991a..1305ed8 100644
|
|
||||||
--- a/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
|
|
||||||
@@ -16,7 +16,7 @@
|
|
||||||
|
|
||||||
DESTDIR = $(INSTROOT)@DESTDIR@
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
||||||
BINDIR = $(DESTDIR)/sbin
|
BINDIR = $(DESTDIR)/sbin
|
||||||
@ -115,6 +71,29 @@ index 352991a..1305ed8 100644
|
|||||||
|
|
||||||
PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
||||||
|
|
||||||
--
|
diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
|
||||||
1.8.3.1
|
index 1aa1c0b..e4442f9 100644
|
||||||
|
--- a/pppd/plugins/pppol2tp/Makefile.linux
|
||||||
|
+++ b/pppd/plugins/pppol2tp/Makefile.linux
|
||||||
|
@@ -4,7 +4,7 @@ CC=$(CROSS_COMPILE)@CC@
|
||||||
|
COPTS=@CFLAGS@
|
||||||
|
|
||||||
|
DESTDIR = $(INSTROOT)/@DESTDIR@
|
||||||
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
||||||
|
+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
|
||||||
|
|
||||||
|
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
||||||
|
|
||||||
|
diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
|
||||||
|
index 489aef2..d2ef044 100644
|
||||||
|
--- a/pppd/plugins/radius/Makefile.linux
|
||||||
|
+++ b/pppd/plugins/radius/Makefile.linux
|
||||||
|
@@ -9,7 +9,7 @@ COPTS=@CFLAGS@
|
||||||
|
|
||||||
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
||||||
|
MANDIR = $(DESTDIR)/share/man/man8
|
||||||
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
||||||
|
+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
|
||||||
|
|
||||||
|
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
||||||
|
|
||||||
21
ppp-2.4.9-config.patch
Normal file
21
ppp-2.4.9-config.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
||||||
|
index e77373e..07df6a7 100644
|
||||||
|
--- a/pppd/Makefile.linux
|
||||||
|
+++ b/pppd/Makefile.linux
|
||||||
|
@@ -68,14 +68,14 @@ USE_TDB=y
|
||||||
|
#SYSTEMD=y
|
||||||
|
|
||||||
|
HAS_SHADOW=y
|
||||||
|
-#USE_PAM=y
|
||||||
|
+USE_PAM=y
|
||||||
|
HAVE_INET6=y
|
||||||
|
|
||||||
|
# Enable plugins
|
||||||
|
PLUGIN=y
|
||||||
|
|
||||||
|
# Enable Microsoft proprietary Callback Control Protocol
|
||||||
|
-#CBCP=y
|
||||||
|
+CBCP=y
|
||||||
|
|
||||||
|
# Enable EAP SRP-SHA1 authentication (requires libsrp)
|
||||||
|
#USE_SRP=y
|
||||||
17
ppp-2.4.9-configure-cflags-allow-commas.patch
Normal file
17
ppp-2.4.9-configure-cflags-allow-commas.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
diff --git a/configure b/configure
|
||||||
|
index f977663..c7031c2 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -121,9 +121,9 @@ mkmkf() {
|
||||||
|
rm -f $2
|
||||||
|
if [ -f $1 ]; then
|
||||||
|
echo " $2 <= $1"
|
||||||
|
- sed -e "s,@DESTDIR@,$DESTDIR,g" -e "s,@SYSCONF@,$SYSCONF,g" \
|
||||||
|
- -e "s,@CROSS_COMPILE@,$CROSS_COMPILE,g" -e "s,@CC@,$CC,g" \
|
||||||
|
- -e "s,@CFLAGS@,$CFLAGS,g" $1 >$2
|
||||||
|
+ sed -e "s|@DESTDIR@|$DESTDIR|g" -e "s|@SYSCONF@|$SYSCONF|g" \
|
||||||
|
+ -e "s|@CROSS_COMPILE@|$CROSS_COMPILE|g" -e "s|@CC@|$CC|g" \
|
||||||
|
+ -e "s|@CFLAGS@|$CFLAGS|g" $1 >$2
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
@ -43,8 +43,8 @@ index 6d50d1b..4880377 100644
|
|||||||
if (log_to_fd >= 0)
|
if (log_to_fd >= 0)
|
||||||
errfd = log_to_fd;
|
errfd = log_to_fd;
|
||||||
else
|
else
|
||||||
- errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600);
|
- errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0644);
|
||||||
+ errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0600);
|
+ errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644);
|
||||||
|
|
||||||
++conn_running;
|
++conn_running;
|
||||||
pid = safe_fork(in, out, errfd);
|
pid = safe_fork(in, out, errfd);
|
||||||
64
ppp.spec
64
ppp.spec
@ -1,8 +1,8 @@
|
|||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
|
|
||||||
Name: ppp
|
Name: ppp
|
||||||
Version: 2.4.8
|
Version: 2.4.9
|
||||||
Release: 8%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: The Point-to-Point Protocol daemon
|
Summary: The Point-to-Point Protocol daemon
|
||||||
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
|
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
|
||||||
URL: http://www.samba.org/ppp
|
URL: http://www.samba.org/ppp
|
||||||
@ -22,38 +22,22 @@ Source11: ifdown-ppp
|
|||||||
Source12: ppp-watch.tar.xz
|
Source12: ppp-watch.tar.xz
|
||||||
|
|
||||||
# Fedora-specific
|
# Fedora-specific
|
||||||
Patch0001: 0001-build-sys-use-gcc-as-our-compiler-of-choice.patch
|
Patch0002: ppp-2.4.9-config.patch
|
||||||
Patch0002: ppp-2.4.8-build-sys-enable-PAM-support.patch
|
Patch0004: 0004-doc-add-configuration-samples.patch
|
||||||
Patch0003: ppp-2.4.8-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
|
Patch0005: ppp-2.4.9-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
|
||||||
Patch0004: 0004-doc-add-configuration-samples.patch
|
Patch0006: 0006-scritps-use-change_resolv_conf-function.patch
|
||||||
Patch0005: ppp-2.4.8-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
|
Patch0011: 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
|
||||||
Patch0006: 0006-scritps-use-change_resolv_conf-function.patch
|
Patch0012: ppp-2.4.8-pppd-we-don-t-want-to-accidentally-leak-fds.patch
|
||||||
Patch0007: 0007-build-sys-don-t-strip-binaries-during-installation.patch
|
Patch0013: ppp-2.4.9-everywhere-O_CLOEXEC-harder.patch
|
||||||
Patch0008: 0008-build-sys-use-prefix-usr-instead-of-usr-local.patch
|
Patch0014: 0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
|
||||||
Patch0009: ppp-2.4.8-pppd-introduce-ipv6-accept-remote.patch
|
Patch0015: 0015-pppd-move-pppd-database-to-var-run-ppp.patch
|
||||||
Patch0010: 0010-build-sys-enable-CBCP.patch
|
Patch0016: 0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
|
||||||
Patch0011: 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
|
Patch0018: 0018-scritps-fix-ip-up.local-sample.patch
|
||||||
Patch0012: ppp-2.4.8-pppd-we-don-t-want-to-accidentally-leak-fds.patch
|
Patch0020: 0020-pppd-put-lock-files-in-var-lock-ppp.patch
|
||||||
Patch0013: ppp-2.4.8-everywhere-O_CLOEXEC-harder.patch
|
Patch0023: 0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
|
||||||
Patch0014: 0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
|
Patch0024: 0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
|
||||||
Patch0015: 0015-pppd-move-pppd-database-to-var-run-ppp.patch
|
Patch0025: ppp-2.4.8-pppd-install-pppd-binary-using-standard-perms-755.patch
|
||||||
Patch0016: 0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
|
Patch0026: ppp-2.4.9-configure-cflags-allow-commas.patch
|
||||||
Patch0018: 0018-scritps-fix-ip-up.local-sample.patch
|
|
||||||
Patch0019: ppp-2.4.8-sys-linux-rework-get_first_ethernet.patch
|
|
||||||
Patch0020: 0020-pppd-put-lock-files-in-var-lock-ppp.patch
|
|
||||||
Patch0021: ppp-2.4.8-build-sys-compile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch
|
|
||||||
Patch0022: ppp-2.4.8-build-sys-compile-pppol2tp-with-multilink-support.patch
|
|
||||||
Patch0023: 0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
|
|
||||||
Patch0024: 0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
|
|
||||||
Patch0025: ppp-2.4.8-pppd-install-pppd-binary-using-standard-perms-755.patch
|
|
||||||
# https://www.nikhef.nl/~janjust/ppp/ppp-2.4.8-eaptls-mppe-1.300.patch
|
|
||||||
Patch0026: ppp-2.4.8-eaptls-mppe-1.300.patch
|
|
||||||
|
|
||||||
Patch0032: ppp-2.4.8-CVE-2020-8597.patch
|
|
||||||
# rhbz#1612918, https://github.com/paulusmack/ppp/pull/149
|
|
||||||
Patch0033: ppp-2.4.8-man-fix.patch
|
|
||||||
# rhbz#1867047, https://github.com/paulusmack/ppp/commit/3cd95baf3f1de1d5a9bc89be0f4c3215ceb5aefe.patch
|
|
||||||
Patch0034: ppp-2.4.8-ws-2019-workaround.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: pam-devel, libpcap-devel, systemd, systemd-devel, glib2-devel
|
BuildRequires: pam-devel, libpcap-devel, systemd, systemd-devel, glib2-devel
|
||||||
@ -93,11 +77,9 @@ This package contains the header files for building plugins for ppp.
|
|||||||
tar -xJf %{SOURCE12}
|
tar -xJf %{SOURCE12}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing"
|
%configure --cflags="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing"
|
||||||
export RPM_LD_FLAGS="$LDFLAGS"
|
%{make_build} LDFLAGS="%{?build_ldflags} -pie"
|
||||||
%configure
|
%{make_build} -C ppp-watch LDFLAGS="%{?build_ldflags} -pie"
|
||||||
%{make_build} LDFLAGS="%{?build_ldflags}"
|
|
||||||
%{make_build} -C ppp-watch LDFLAGS="%{?build_ldflags}"
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make INSTROOT=%{buildroot} install install-etcppp
|
make INSTROOT=%{buildroot} install install-etcppp
|
||||||
@ -188,6 +170,10 @@ mkdir -p %{buildroot}%{_rundir}/lock/ppp
|
|||||||
%doc PLUGINS
|
%doc PLUGINS
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 5 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4.9-1
|
||||||
|
- New version
|
||||||
|
Resolves: rhbz#1912617
|
||||||
|
|
||||||
* Mon Aug 10 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4.8-8
|
* Mon Aug 10 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4.8-8
|
||||||
- Added workaround for Windows Server 2019
|
- Added workaround for Windows Server 2019
|
||||||
Resolves: rhbz#1867047
|
Resolves: rhbz#1867047
|
||||||
|
|||||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (ppp-watch.tar.xz) = aee10735facf918b9a1e33408c9f19d8240c2cd265837da87ac9f58e097eece6bbe1abcaf426e2f10369d1368f6e9e68d2e07d005a19857f17d6318708ec438a
|
SHA512 (ppp-watch.tar.xz) = aee10735facf918b9a1e33408c9f19d8240c2cd265837da87ac9f58e097eece6bbe1abcaf426e2f10369d1368f6e9e68d2e07d005a19857f17d6318708ec438a
|
||||||
SHA512 (ppp-2.4.8.tar.gz) = a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478
|
SHA512 (ppp-2.4.9.tar.gz) = c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user