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
|
diff -dur -x '*~' freeradius-server-3.0.17.orig/raddb/radiusd.conf.in freeradius-server-3.0.17/raddb/radiusd.conf.in
--- freeradius-server-3.0.17.orig/raddb/radiusd.conf.in 2018-10-10 10:12:41.000000000 +0200
+++ freeradius-server-3.0.17/raddb/radiusd.conf.in 2018-10-10 10:13:24.000000000 +0200
@@ -105,7 +105,7 @@
# make
# make install
#
-libdir = @libdir@
+libdir = @libdir@/freeradius
# pidfile: Where to place the PID of the RADIUS server.
#
diff -dur -x '*~' freeradius-server-3.0.17.orig/scripts/install.mk freeradius-server-3.0.17/scripts/install.mk
--- freeradius-server-3.0.17.orig/scripts/install.mk 2018-04-17 19:12:27.000000000 +0200
+++ freeradius-server-3.0.17/scripts/install.mk 2018-10-10 10:19:46.000000000 +0200
@@ -141,7 +141,11 @@
endif
else
ifeq "$${TGT_INSTALLDIR}" ".."
- TGT_INSTALLDIR := $${libdir}
+ ifneq (,$(filter lib%,${1}))
+ TGT_INSTALLDIR := $${libdir}
+ else
+ TGT_INSTALLDIR := $${libdir}/freeradius
+ endif
endif
endif
diff -dur -x '*~' freeradius-server-3.0.17.orig/src/main/mainconfig.c freeradius-server-3.0.17/src/main/mainconfig.c
--- freeradius-server-3.0.17.orig/src/main/mainconfig.c 2018-04-17 19:12:27.000000000 +0200
+++ freeradius-server-3.0.17/src/main/mainconfig.c 2018-10-10 10:13:24.000000000 +0200
@@ -183,7 +183,7 @@
{ "sbindir", FR_CONF_POINTER(PW_TYPE_STRING, &sbindir), "${prefix}/sbin"},
{ "logdir", FR_CONF_POINTER(PW_TYPE_STRING, &radlog_dir), "${localstatedir}/log"},
{ "run_dir", FR_CONF_POINTER(PW_TYPE_STRING, &run_dir), "${localstatedir}/run/${name}"},
- { "libdir", FR_CONF_POINTER(PW_TYPE_STRING, &radlib_dir), "${prefix}/lib"},
+ { "libdir", FR_CONF_POINTER(PW_TYPE_STRING, &radlib_dir), "${prefix}/lib/freeradius"},
{ "radacctdir", FR_CONF_POINTER(PW_TYPE_STRING, &radacct_dir), "${logdir}/radacct" },
{ "panic_action", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.panic_action), NULL},
{ "hostname_lookups", FR_CONF_POINTER(PW_TYPE_BOOLEAN, &fr_dns_lookups), "no" },
|
