- fix paths (/usr/local/etc -> /etc)

diff --git a/radsecproxy-paths.patch b/radsecproxy-paths.patch
new file mode 100644 (file)
index 0000000..2c82df1
--- /dev/null
+++ b/radsecproxy-paths.patch
@@ -0,0 +1,75 @@
+diff -ruN radsecproxy-1.7.1.orig/README radsecproxy-1.7.1/README
+--- radsecproxy-1.7.1.orig/README      2018-07-04 19:05:45.000000000 +0200
++++ radsecproxy-1.7.1/README   2018-07-18 13:06:57.878727205 +0200
+@@ -14,7 +14,7 @@
+ "./configure --help" for how to change this.
+ 
+ To use radsecproxy you need to create a config file which is normally
+-found in /usr/local/etc/radsecproxy.conf.  You can also specify the
++found in /etc/radsecproxy.conf.  You can also specify the
+ location with the "-c" command line option (see below).  For further
+ instructions, please see the enclosed example file and the manpages
+ radsecproxy(1) and radsecproxy.conf(5)
+diff -ruN radsecproxy-1.7.1.orig/radsecproxy.1 radsecproxy-1.7.1/radsecproxy.1
+--- radsecproxy-1.7.1.orig/radsecproxy.1       2018-07-04 19:05:45.000000000 +0200
++++ radsecproxy-1.7.1/radsecproxy.1    2018-07-18 13:06:31.014772944 +0200
+@@ -84,7 +84,7 @@
+ 
+ .SH "FILES"
+ .TP
+-.B /usr/local/etc/radsecproxy.conf
++.B /etc/radsecproxy.conf
+ .sp
+ The default configuration file.
+ 
+diff -ruN radsecproxy-1.7.1.orig/radsecproxy.conf-example radsecproxy-1.7.1/radsecproxy.conf-example
+--- radsecproxy-1.7.1.orig/radsecproxy.conf-example    2018-07-04 19:05:45.000000000 +0200
++++ radsecproxy-1.7.1/radsecproxy.conf-example 2018-07-18 13:05:29.092878424 +0200
+@@ -1,4 +1,4 @@
+-# Master config file, must be in /usr/local/etc/radsecproxy or specified with -c option
++# Master config file, must be in /etc/radsecproxy.conf or specified with -c option
+ #     All possible config options are listed below
+ 
+ # First you may define any global options, these are:
+diff -ruN radsecproxy-1.7.1.orig/radsecproxy.conf.5 radsecproxy-1.7.1/radsecproxy.conf.5
+--- radsecproxy-1.7.1.orig/radsecproxy.conf.5  2018-07-09 17:41:52.000000000 +0200
++++ radsecproxy-1.7.1/radsecproxy.conf.5       2018-07-18 13:06:44.908749286 +0200
+@@ -13,7 +13,7 @@
+ When the proxy server starts, it will first check the command
+ line arguments, and then read the configuration file. Normally
+ radsecproxy will read the configuration file
+-\*(T<\fI/usr/local/etc/radsecproxy.conf\fR\*(T>. The command line
++\*(T<\fI/etc/radsecproxy.conf\fR\*(T>. The command line
+ \*(T<\fB\-c\fR\*(T> option can be used to instead read an
+ alternate file (see
+ \fBradsecproxy\fR(1)
+@@ -90,7 +90,7 @@
+ included. The value can be a single file, or it can use normal
+ shell globbing to specify multiple files, e.g.:
+ .RS 
+-include /usr/local/etc/radsecproxy.conf.d/*.conf
++include /etc/radsecproxy.conf.d/*.conf
+ .RE
+ 
+ The files are sorted alphabetically. Included files are read in
+diff -ruN radsecproxy-1.7.1.orig/radsecproxy.conf.5.xml radsecproxy-1.7.1/radsecproxy.conf.5.xml
+--- radsecproxy-1.7.1.orig/radsecproxy.conf.5.xml      2018-07-04 19:05:45.000000000 +0200
++++ radsecproxy-1.7.1/radsecproxy.conf.5.xml   2018-07-18 13:06:20.739790441 +0200
+@@ -21,7 +21,7 @@
+       When the proxy server starts, it will first check the command
+       line arguments, and then read the configuration file. Normally
+       radsecproxy will read the configuration file
+-      <filename>/usr/local/etc/radsecproxy.conf</filename>. The command line
++      <filename>/etc/radsecproxy.conf</filename>. The command line
+       <option>-c</option> option can be used to instead read an
+       alternate file (see
+       <citerefentry>
+@@ -101,7 +101,7 @@
+       shell globbing to specify multiple files, e.g.:
+       <blockquote>
+         <para>
+-        include /usr/local/etc/radsecproxy.conf.d/*.conf
++        include /etc/radsecproxy.conf.d/*.conf
+         </para>
+       </blockquote>
+       The files are sorted alphabetically. Included files are read in

diff --git a/radsecproxy.spec b/radsecproxy.spec
index 7b01b31f1e2b28a0b5086ae829863b46e6377b95..1bea6dd6ad7cc767322ac3b067bbff2f99d80242 100644 (file)
--- a/radsecproxy.spec
+++ b/radsecproxy.spec
@@ -10,6 +10,7 @@ Source0:      https://github.com/radsecproxy/radsecproxy/releases/download/%{version}
 # Source0-md5: 070ec707aa2f351bdc5387b474b58e7a
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
+Patch0:                %{name}-paths.patch
 URL:           http://software.uninett.no/radsecproxy/
 # For manual creation:
 BuildRequires: autoconf
@@ -44,6 +45,7 @@ Opis zadania Upstart dla %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal}