freeradius-server-libdir.patch

   1 diff -dur -x '*~' freeradius-server-3.0.17.orig/raddb/radiusd.conf.in freeradius-server-3.0.17/raddb/radiusd.conf.in
   2 --- freeradius-server-3.0.17.orig/raddb/radiusd.conf.in 2018-10-10 10:12:41.000000000 +0200
   3 +++ freeradius-server-3.0.17/raddb/radiusd.conf.in      2018-10-10 10:13:24.000000000 +0200
   4 @@ -105,7 +105,7 @@
   5  #      make
   6  #      make install
   7  #
   8 -libdir = @libdir@
   9 +libdir = @libdir@/freeradius
  10
  11  #  pidfile: Where to place the PID of the RADIUS server.
  12  #
  13 diff -dur -x '*~' freeradius-server-3.0.17.orig/scripts/install.mk freeradius-server-3.0.17/scripts/install.mk
  14 --- freeradius-server-3.0.17.orig/scripts/install.mk    2018-04-17 19:12:27.000000000 +0200
  15 +++ freeradius-server-3.0.17/scripts/install.mk 2018-10-10 10:19:46.000000000 +0200
  16 @@ -141,7 +141,11 @@
  17          endif
  18      else
  19          ifeq "$${TGT_INSTALLDIR}" ".."
  20 -            TGT_INSTALLDIR := $${libdir}
  21 +           ifneq (,$(filter lib%,${1}))
  22 +               TGT_INSTALLDIR := $${libdir}
  23 +           else
  24 +               TGT_INSTALLDIR := $${libdir}/freeradius
  25 +           endif
  26          endif
  27      endif
  28
  29 diff -dur -x '*~' freeradius-server-3.0.17.orig/src/main/mainconfig.c freeradius-server-3.0.17/src/main/mainconfig.c
  30 --- freeradius-server-3.0.17.orig/src/main/mainconfig.c 2018-04-17 19:12:27.000000000 +0200
  31 +++ freeradius-server-3.0.17/src/main/mainconfig.c      2018-10-10 10:13:24.000000000 +0200
  32 @@ -183,7 +183,7 @@
  33         { "sbindir", FR_CONF_POINTER(PW_TYPE_STRING, &sbindir), "${prefix}/sbin"},
  34         { "logdir", FR_CONF_POINTER(PW_TYPE_STRING, &radlog_dir), "${localstatedir}/log"},
  35         { "run_dir", FR_CONF_POINTER(PW_TYPE_STRING, &run_dir), "${localstatedir}/run/${name}"},
  36 -       { "libdir", FR_CONF_POINTER(PW_TYPE_STRING, &radlib_dir), "${prefix}/lib"},
  37 +       { "libdir", FR_CONF_POINTER(PW_TYPE_STRING, &radlib_dir), "${prefix}/lib/freeradius"},
  38         { "radacctdir", FR_CONF_POINTER(PW_TYPE_STRING, &radacct_dir), "${logdir}/radacct" },
  39         { "panic_action", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.panic_action), NULL},
  40         { "hostname_lookups", FR_CONF_POINTER(PW_TYPE_BOOLEAN, &fr_dns_lookups), "no" },