blob: 06bb6edf968c9e602141e83ee07290606d628e23 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
--- ppp-2.4.7/pppd/Makefile.linux.old 2019-05-09 20:32:30.959257140 +0000
+++ ppp-2.4.7/pppd/Makefile.linux 2019-05-09 20:34:48.964184093 +0000
@@ -32,7 +32,7 @@
# CC = gcc
#
-COPTS+= -Wall
+COPTS+= -Wall -D_GNU_SOURCE
LIBS =
# Uncomment the next line to include support for Microsoft's
@@ -61,14 +61,14 @@
USE_TDB=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
@@ -102,8 +102,8 @@
# 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
+LIBS += -lsrp `$(PKG_CONFIG) --libs libcrypto`
TARGETS += srp-entry
EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
MANPAGES += srp-entry.8
--- ppp-2.4.7/pppd/plugins/radius/pathnames.h.old 2014-08-09 12:31:39.000000000 +0000
+++ ppp-2.4.7/pppd/plugins/radius/pathnames.h 2019-05-09 20:35:39.258690873 +0000
@@ -22,7 +22,7 @@
/* normally defined in the Makefile */
#ifndef _PATH_ETC_RADIUSCLIENT_CONF
-#define _PATH_ETC_RADIUSCLIENT_CONF "/etc/radiusclient.conf"
+#define _PATH_ETC_RADIUSCLIENT_CONF "/etc/radiusclient/radiusclient.conf"
#endif
#endif /* PATHNAMES_H */
--- ppp-2.4.7/pppd/plugins/radius/etc/radiusclient.conf.old 2014-08-09 12:31:39.000000000 +0000
+++ ppp-2.4.7/pppd/plugins/radius/etc/radiusclient.conf 2019-05-09 20:37:29.676630906 +0000
@@ -22,7 +22,7 @@
# name of the issue file. it's only display when no username is passed
# on the radlogin command line (default /etc/radiusclient/issue)
-issue /usr/local/etc/radiusclient/issue
+issue /etc/radiusclient/issue
# RADIUS settings
@@ -43,22 +43,22 @@
# file holding shared secrets used for the communication
# between the RADIUS client and server
-servers /usr/local/etc/radiusclient/servers
+servers /etc/radiusclient/servers
# dictionary of allowed attributes and values
# just like in the normal RADIUS distributions
-dictionary /usr/local/etc/radiusclient/dictionary
+dictionary /etc/radiusclient/dictionary
# program to call for a RADIUS authenticated login
# (default /usr/sbin/login.radius)
-login_radius /usr/local/sbin/login.radius
+login_radius /usr/sbin/login.radius
# file which holds sequence number for communication with the
# RADIUS server
seqfile /var/run/radius.seq
# file which specifies mapping between ttyname and NAS-Port attribute
-mapfile /usr/local/etc/radiusclient/port-id-map
+mapfile /etc/radiusclient/port-id-map
# default authentication realm to append to all usernames if no
# realm was explicitly specified by the user
|
