- updated to 1.8.1

- removed obsolete paths patch

diff --git a/radsecproxy-paths.patch b/radsecproxy-paths.patch
deleted file mode 100644 (file)
index 2c82df1..0000000
--- a/radsecproxy-paths.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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 f6ea86137d8b6320597685338cd8c83bb2f96cc7..489e50c34d9872be8be0d61b45c801284f826964 100644 (file)
--- a/radsecproxy.spec
+++ b/radsecproxy.spec
@@ -1,25 +1,25 @@
 # TODO:
 # - own UID/GID
 Summary:       RADIUS proxy that in addition to to usual RADIUS UDP transport, also supports TLS (RadSec)
+Summary(pl.UTF-8):     Proxy RADIUS, poza zwyczajowym transportem UDP, obsługujące także TLS (RadSec)
 Name:          radsecproxy
-Version:       1.7.1
-Release:       3
-License:       GPLv2+ or BSD-like
+Version:       1.8.1
+Release:       1
+License:       BSD
 Group:         Networking/Daemons/Radius
+#Source0Download: https://github.com/radsecproxy/radsecproxy/releases
 Source0:       https://github.com/radsecproxy/radsecproxy/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 070ec707aa2f351bdc5387b474b58e7a
+# Source0-md5: 500643689d9ea37f90fe1dd51f394c6b
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
-Patch0:                %{name}-paths.patch
-URL:           http://software.uninett.no/radsecproxy/
-# For manual creation:
-BuildRequires: autoconf
+URL:           https://github.com/radsecproxy/radsecproxy
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: docbook2X
 BuildRequires: nettle-devel
-Requires:      openssl >= 1.0.0b
 Requires(post,preun):  /sbin/chkconfig
+Requires:      openssl >= 1.0.0b
 Requires:      rc-scripts >= 0.4.3.0
+Obsoletes:     radsecproxy-upstart
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,34 +27,28 @@ radsecproxy is a generic RADIUS proxy that in addition to to usual
 RADIUS UDP transport, also supports TLS (RadSec). The aim is for the
 proxy to have sufficient features to be flexible, while at the same
 time to be small, efficient and easy to configure. Currently the
-executable on Linux is only about 48 Kb, and it uses about 64 Kb
+executable on Linux is only about 48 kB, and it uses about 64 kB
 (depending on the number of peers) while running.
 
-%package upstart
-Summary:       Upstart job description for %{name}
-Summary(pl.UTF-8):     Opis zadania Upstart dla %{name}
-Group:         Daemons
-Requires:      %{name} = %{version}-%{release}
-Requires:      upstart >= 0.6
-
-%description upstart
-Upstart job description for %{name}.
-
-%description upstart -l pl.UTF-8
-Opis zadania Upstart dla %{name}.
+%description -l pl.UTF-8
+radsecproxy to ogólne proxy RADIUS, które, poza zwyczajowym
+transportem UDP RADIUS, obsługuje także TLS (RadSec). Celem projektu
+jest dostarczenie wystarczająco dużej funkcjonalności, aby było
+elastyczne, a jednocześnie małe, wydajne i łatwe do skonfigurowania.
+Obecnie rozmiar binarki pod Linuksem to tylko około 48 kB, a w czasie
+działania zużywa około 64 kB (w zależności od liczby partnerów).
 
 %prep
 %setup -q
-%patch0 -p1
+
+%{__rm} -r autom4te.cache
 
 %build
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure \
-       --enable-fticks
-# Some trash comes with tar:
-%{__make} clean
+%configure
+
 %{__make}
 
 %install
@@ -87,7 +81,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
+%doc AUTHORS ChangeLog LICENSE README THANKS
 %attr(640,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/radsecproxy.conf
 %attr(640,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(750,root,root) %dir %{_sysconfdir}/radsecproxy.conf.d
@@ -95,5 +89,6 @@ fi
 %attr(755,root,root) %{_bindir}/radsecproxy-conf
 %attr(755,root,root) %{_bindir}/radsecproxy-hash
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%{_mandir}/man1/*
-%{_mandir}/man5/*
+%{_mandir}/man1/radsecproxy.1*
+%{_mandir}/man1/radsecproxy-hash.1*
+%{_mandir}/man5/radsecproxy.conf.5*