continuing 3.0 update

[packages/freeradius-server.git] / freeradius-server-libdir.patch

diff --git a/freeradius-server-libdir.patch b/freeradius-server-libdir.patch
index 53159a96131beb43a045cc0642c75760d0a7dee9..3f9b8856aaad5c1962f205e37e386c160d3eb7fa 100644 (file)
--- a/freeradius-server-libdir.patch
+++ b/freeradius-server-libdir.patch
@@ -1,7 +1,7 @@
-diff -urN freeradius-server-2.0.3.orig/raddb/radiusd.conf.in freeradius-server-2.0.3/raddb/radiusd.conf.in
---- freeradius-server-2.0.3.orig/raddb/radiusd.conf.in 2008-03-04 17:53:02.000000000 +0100
-+++ freeradius-server-2.0.3/raddb/radiusd.conf.in      2008-04-09 17:00:51.000000000 +0200
-@@ -99,7 +99,7 @@
+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
  #
@@ -10,74 +10,31 @@ diff -urN freeradius-server-2.0.3.orig/raddb/radiusd.conf.in freeradius-server-2
  
  #  pidfile: Where to place the PID of the RADIUS server.
  #
-diff -urN freeradius-server-2.0.3.orig/src/main/mainconfig.c freeradius-server-2.0.3/src/main/mainconfig.c
---- freeradius-server-2.0.3.orig/src/main/mainconfig.c 2008-03-06 11:28:36.000000000 +0100
-+++ freeradius-server-2.0.3/src/main/mainconfig.c      2008-04-09 17:00:51.000000000 +0200
-@@ -219,7 +219,7 @@
-       { "sbindir",            PW_TYPE_STRING_PTR, 0, &sbindir,            "${prefix}/sbin"},
-       { "logdir",             PW_TYPE_STRING_PTR, 0, &radlog_dir,        "${localstatedir}/log"},
-       { "run_dir",            PW_TYPE_STRING_PTR, 0, &run_dir,           "${localstatedir}/run/${name}"},
--      { "libdir",             PW_TYPE_STRING_PTR, 0, &radlib_dir,        "${prefix}/lib"},
-+      { "libdir",             PW_TYPE_STRING_PTR, 0, &radlib_dir,        "${prefix}/lib/freeradius"},
-       { "radacctdir",         PW_TYPE_STRING_PTR, 0, &radacct_dir,       "${logdir}/radacct" },
-       { "hostname_lookups",   PW_TYPE_BOOLEAN,    0, &fr_dns_lookups,      "no" },
-       { "max_request_time", PW_TYPE_INTEGER, 0, &mainconfig.max_request_time, Stringify(MAX_REQUEST_TIME) },
-diff -urN freeradius-server-2.0.3.orig/src/modules/rlm_sql/drivers/rules.mak freeradius-server-2.0.3/src/modules/rlm_sql/drivers/rules.mak
---- freeradius-server-2.0.3.orig/src/modules/rlm_sql/drivers/rules.mak 2007-06-28 07:11:36.000000000 +0200
-+++ freeradius-server-2.0.3/src/modules/rlm_sql/drivers/rules.mak      2008-04-09 17:02:24.000000000 +0200
-@@ -101,7 +101,7 @@
- $(TARGET).la: $(LT_OBJS)
-       $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
-       -module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \
--      -rpath $(libdir) $^ $(RLM_SQL_LIBS)
-+      -rpath $(libdir)/freeradius $^ $(RLM_SQL_LIBS)
+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
  
- #######################################################################
- #
-@@ -139,12 +139,12 @@
- #  Do any module-specific installation.
- #
- #  If there isn't a TARGET defined, then don't do anything.
--#  Otherwise, install the libraries into $(libdir)
-+#  Otherwise, install the libraries into $(libdir)/freeradius
- #
- install:
-       if [ "x$(TARGET)" != "x" ]; then \
-           $(LIBTOOL) --mode=install $(INSTALL) -c \
--              $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
--          rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--          ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
-+              $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \
-+          rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \
-+          ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
-       fi
-diff -urN freeradius-server-2.0.3.orig/src/modules/rules.mak freeradius-server-2.0.3/src/modules/rules.mak
---- freeradius-server-2.0.3.orig/src/modules/rules.mak 2008-01-10 11:12:01.000000000 +0100
-+++ freeradius-server-2.0.3/src/modules/rules.mak      2008-04-09 17:01:23.000000000 +0200
-@@ -115,7 +115,7 @@
- $(TARGET).la: $(LT_OBJS)
-       $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
-       -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
--      -rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
-+      -rpath $(libdir)/freeradius $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
- 
- #######################################################################
- #
-@@ -156,13 +156,13 @@
- #  Do any module-specific installation.
- #
- #  If there isn't a TARGET defined, then don't do anything.
--#  Otherwise, install the libraries into $(libdir)
-+#  Otherwise, install the libraries into $(libdir)/freeradius
- #
- install:
-       @[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
-       if [ "x$(TARGET)" != "x" ]; then \
-           $(LIBTOOL) --mode=install $(INSTALL) -c \
--              $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
--          rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--          ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
-+              $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \
-+          rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \
-+          ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
-       fi
+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" },