]>
Commit | Line | Data |
---|---|---|
692899dc MK |
1 | diff -ur freeradius-server-2.2.5.orig/raddb/radiusd.conf.in freeradius-server-2.2.5/raddb/radiusd.conf.in |
2 | --- freeradius-server-2.2.5.orig/raddb/radiusd.conf.in 2014-04-28 19:13:08.000000000 +0000 | |
3 | +++ freeradius-server-2.2.5/raddb/radiusd.conf.in 2014-06-11 16:01:09.900016369 +0000 | |
4 | @@ -103,7 +103,7 @@ | |
4e0fee8e | 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 | # | |
692899dc MK |
13 | diff -ur freeradius-server-2.2.5.orig/src/main/mainconfig.c freeradius-server-2.2.5/src/main/mainconfig.c |
14 | --- freeradius-server-2.2.5.orig/src/main/mainconfig.c 2014-04-28 19:13:08.000000000 +0000 | |
15 | +++ freeradius-server-2.2.5/src/main/mainconfig.c 2014-06-11 16:01:09.901016378 +0000 | |
16 | @@ -235,7 +235,7 @@ | |
cdb340f5 | 17 | { "sbindir", PW_TYPE_STRING_PTR, 0, &sbindir, "${prefix}/sbin"}, |
4e0fee8e | 18 | { "logdir", PW_TYPE_STRING_PTR, 0, &radlog_dir, "${localstatedir}/log"}, |
cdb340f5 | 19 | { "run_dir", PW_TYPE_STRING_PTR, 0, &run_dir, "${localstatedir}/run/${name}"}, |
4e0fee8e | 20 | - { "libdir", PW_TYPE_STRING_PTR, 0, &radlib_dir, "${prefix}/lib"}, |
21 | + { "libdir", PW_TYPE_STRING_PTR, 0, &radlib_dir, "${prefix}/lib/freeradius"}, | |
22 | { "radacctdir", PW_TYPE_STRING_PTR, 0, &radacct_dir, "${logdir}/radacct" }, | |
692899dc | 23 | { "panic_action", PW_TYPE_STRING_PTR, 0, &mainconfig.panic_action, NULL}, |
cdb340f5 | 24 | { "hostname_lookups", PW_TYPE_BOOLEAN, 0, &fr_dns_lookups, "no" }, |
692899dc MK |
25 | diff -ur freeradius-server-2.2.5.orig/src/modules/rlm_sql/drivers/rules.mak freeradius-server-2.2.5/src/modules/rlm_sql/drivers/rules.mak |
26 | --- freeradius-server-2.2.5.orig/src/modules/rlm_sql/drivers/rules.mak 2014-04-28 19:13:08.000000000 +0000 | |
27 | +++ freeradius-server-2.2.5/src/modules/rlm_sql/drivers/rules.mak 2014-06-11 16:07:19.716021082 +0000 | |
28 | @@ -103,7 +103,7 @@ | |
4e0fee8e | 29 | $(TARGET).la: $(LT_OBJS) |
692899dc | 30 | $(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION_STRING) \ |
4e0fee8e | 31 | -module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \ |
32 | - -rpath $(libdir) $^ $(RLM_SQL_LIBS) | |
33 | + -rpath $(libdir)/freeradius $^ $(RLM_SQL_LIBS) | |
34 | ||
35 | ####################################################################### | |
36 | # | |
692899dc | 37 | @@ -141,12 +141,12 @@ |
4e0fee8e | 38 | # Do any module-specific installation. |
39 | # | |
40 | # If there isn't a TARGET defined, then don't do anything. | |
41 | -# Otherwise, install the libraries into $(libdir) | |
42 | +# Otherwise, install the libraries into $(libdir)/freeradius | |
43 | # | |
44 | install: | |
45 | if [ "x$(TARGET)" != "x" ]; then \ | |
46 | $(LIBTOOL) --mode=install $(INSTALL) -c \ | |
47 | - $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \ | |
692899dc MK |
48 | - rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \ |
49 | - ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \ | |
4e0fee8e | 50 | + $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \ |
692899dc MK |
51 | + rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \ |
52 | + ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \ | |
4e0fee8e | 53 | fi |
692899dc MK |
54 | diff -ur freeradius-server-2.2.5.orig/src/modules/rules.mak freeradius-server-2.2.5/src/modules/rules.mak |
55 | --- freeradius-server-2.2.5.orig/src/modules/rules.mak 2014-04-28 19:13:08.000000000 +0000 | |
56 | +++ freeradius-server-2.2.5/src/modules/rules.mak 2014-06-11 16:06:32.670020429 +0000 | |
57 | @@ -122,7 +122,7 @@ | |
58 | $(TARGET).la: $(RLM_SUBDIRS) $(LT_OBJS) | |
59 | $(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION_STRING) \ | |
4e0fee8e | 60 | -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@ \ |
61 | - -rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS) | |
62 | + -rpath $(libdir)/freeradius $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS) | |
63 | ||
64 | ####################################################################### | |
65 | # | |
692899dc | 66 | @@ -163,13 +163,13 @@ |
4e0fee8e | 67 | # Do any module-specific installation. |
68 | # | |
69 | # If there isn't a TARGET defined, then don't do anything. | |
70 | -# Otherwise, install the libraries into $(libdir) | |
71 | +# Otherwise, install the libraries into $(libdir)/freeradius | |
72 | # | |
73 | install: | |
74 | @[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL) | |
75 | if [ "x$(TARGET)" != "x" ]; then \ | |
76 | $(LIBTOOL) --mode=install $(INSTALL) -c \ | |
77 | - $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \ | |
692899dc MK |
78 | - rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \ |
79 | - ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \ | |
4e0fee8e | 80 | + $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \ |
692899dc MK |
81 | + rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \ |
82 | + ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \ | |
4e0fee8e | 83 | fi |