rpm/freeradius-server
SHA256
1
0
Fork 0
forked from pool/freeradius-server
Code Pull Requests Activity

Accepting request 298812 from network

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/298812
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freeradius-server?expand=0&rev=56
This commit is contained in:
Stephan Kulow 2015-04-25 07:53:16 +00:00 committed by Git OBS Bridge
commit 0cc788860a
14 changed files with 102 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
freeradius-server-2.1.1-logrotate_su.patch
View File

@ -1,50 +0,0 @@
Index: freeradius-server-3.0.0/suse/radiusd-logrotate
===================================================================
--- freeradius-server-3.0.0.orig/suse/radiusd-logrotate 2013-10-15 18:26:37.704603079 +0200
+++ freeradius-server-3.0.0/suse/radiusd-logrotate 2013-10-15 18:27:37.232218844 +0200
@@ -6,6 +6,7 @@
# second technique, you will need another cron job that removes old
# detail files. You do not need to comment out the below for method #2.
/var/log/radius/radacct/*/detail {
+ su radiusd radiusd
compress
dateext
maxage 365
@@ -16,6 +17,7 @@
}
/var/log/radius/radius.log {
+ su radiusd radiusd
compress
dateext
maxage 365
@@ -25,11 +27,12 @@
missingok
create
postrotate
- kill -HUP `cat /var/run/radiusd/radiusd.pid`
+ kill -HUP `cat /var/run/radiusd/radiusd.pid` || :
endscript
}
/var/log/radius/radwatch.log {
+ su radiusd radiusd
compress
dateext
maxage 365
@@ -41,6 +44,7 @@
}
/var/log/radius/radwtmp {
+ su radiusd radiusd
compress
dateext
maxage 365
@@ -55,6 +59,7 @@
}
/var/log/radius/sqllog.sql {
+ su radiusd radiusd
compress
dateext
maxage 365

13
freeradius-server-2.1.6-rcradiusd.patch
View File

@ -1,13 +0,0 @@
Index: suse/rcradiusd
===================================================================
--- suse/rcradiusd.orig 2013-10-15 18:18:25.099506165 +0200
+++ suse/rcradiusd 2013-10-15 18:19:02.741895731 +0200
@@ -14,7 +14,7 @@
# Provides: radiusd
# Required-Start: $network $syslog $remotefs
# Should-Start: $time ypbind smtp
-# Required-Stop: $syslog $remote_fs
+# Required-Stop: $network $syslog $remote_fs
# Should-Stop: ypbind smtp
# Default-Start: 3 5
# Default-Stop: 0 1 2 6

3
freeradius-server-3.0.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f9898b19564e7bf859396a9bdf492f72b918844b4916f1b46c56dfcd9e8dafcd
size 2870327

BIN
freeradius-server-3.0.6.tar.bz2.sig
View File

Binary file not shown.

3
freeradius-server-3.0.8.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b89721c609e5a106936112fe8122e470f02a5197bb614e202d2c386f4821d902
size 2945423

BIN
freeradius-server-3.0.8.tar.bz2.sig Normal file
View File

Binary file not shown.

15
freeradius-server-initscript-pidfile.patch
View File

@ -1,15 +0,0 @@
Index: freeradius-server-2.1.8/suse/rcradiusd
===================================================================
--- freeradius-server-2.1.8.orig/suse/rcradiusd 2010-05-03 15:37:35.000000000 +0200
+++ freeradius-server-2.1.8/suse/rcradiusd 2010-05-03 15:38:08.000000000 +0200
@@ -31,6 +31,10 @@ rc_reset
case "$1" in
start)
echo -n "Starting RADIUS daemon "
+ # /var/run might be on tmpfs, create runtime directory if needed
+ if [ ! -d /var/run/radiusd ]; then
+ install -d -m 0700 -g radiusd -o radiusd /var/run/radiusd
+ fi
startproc $RADIUSD_BIN >/dev/null
rc_status -v
;;

14
freeradius-server-radius-reload-logrotate.patch
View File

@ -1,14 +0,0 @@
Index: freeradius-server-2.1.12/suse/radiusd-logrotate
===================================================================
--- freeradius-server-2.1.12.orig/suse/radiusd-logrotate 2011-09-30 16:12:07.000000000 +0200
+++ freeradius-server-2.1.12/suse/radiusd-logrotate 2011-10-19 16:01:36.781656862 +0200
@@ -47,6 +47,9 @@
size=+2048k
notifempty
missingok
+ postrotate
+ /etc/init.d/freeradius reload >/dev/null
+ endscript
create
}

45
freeradius-server-radiusd-logrotate.patch Normal file
View File

@ -0,0 +1,45 @@
--- freeradius-server-3.0.8.orig/suse/radiusd-logrotate 2015-04-22 19:21:34.000000000 +0200
+++ freeradius-server-3.0.8.suse/suse/radiusd-logrotate 2015-04-23 10:15:52.847179845 +0200
@@ -16,13 +16,18 @@
# The main server log
#
/var/log/radius/radius.log {
+ su radiusd radiusd
copytruncate
+ postrotate
+ kill -HUP `cat /run/radiusd/radiusd.pid` || :
+ endscript
}
#
# Session monitoring utilities
#
/var/log/radius/checkrad.log /var/log/radius/radwatch.log {
+ su radiusd radiusd
nocreate
size=+1024k
}
@@ -31,6 +36,7 @@
# Session database modules
#
/var/log/radius/radutmp /var/log/radius/radwtmp {
+ su radiusd radiusd
nocreate
size=+2048k
}
@@ -39,6 +45,7 @@
# SQL log files
#
/var/log/radius/sqllog.sql {
+ su radiusd radiusd
nocreate
size=+2048k
}
@@ -51,6 +58,7 @@
# second technique, you will need another cron job that removes old
# detail files. You do not need to comment out the below for method #2.
/var/log/radius/radacct/*/detail {
+ su radiusd radiusd
nocreate
}

13
freeradius-server-rcradiusd.patch Normal file
View File

@ -0,0 +1,13 @@
--- freeradius-server-3.0.8.orig/suse/rcradiusd 2015-04-22 19:21:34.000000000 +0200
+++ freeradius-server-3.0.8.suse/suse/rcradiusd 2015-04-23 10:02:01.393574445 +0200
@@ -50,6 +50,10 @@
start)
configtest || { rc_failed 150; rc_exit; }
echo -n "Starting RADIUS daemon "
+ # /var/run might be on tmpfs, create runtime directory if needed
+ if [ ! -d /run/radiusd ]; then
+ install -d -m 0700 -g radiusd -o radiusd /run/radiusd
+ fi
startproc $exec >/dev/null
rc_status -v
;;

6
freeradius-server-tmpfiles.patch Normal file
View File

@ -0,0 +1,6 @@
--- freeradius-server-3.0.8.orig/suse/freeradius-server-tmpfiles.conf 2015-04-22 19:21:34.000000000 +0200
+++ freeradius-server-3.0.8.suse/suse/freeradius-server-tmpfiles.conf 2015-04-23 09:56:08.342988185 +0200
@@ -1 +1,2 @@
-D /var/run/radiusd 0710 radiusd radiusd -
+D /run/radiusd 0710 radiusd radiusd -
+

37
freeradius-server-var_run.patch
View File

@ -1,37 +0,0 @@
Index: freeradius-server-3.0.3/suse/freeradius-server-tmpfiles.conf
===================================================================
--- freeradius-server-3.0.3.orig/suse/freeradius-server-tmpfiles.conf 2014-05-12 21:22:09.000000000 +0200
+++ freeradius-server-3.0.3/suse/freeradius-server-tmpfiles.conf 2014-06-17 15:14:40.946735087 +0200
@@ -1 +1 @@
-D /var/run/radiusd 0710 radiusd radiusd -
+D /run/radiusd 0710 radiusd radiusd -
Index: freeradius-server-3.0.3/suse/radiusd-logrotate
===================================================================
--- freeradius-server-3.0.3.orig/suse/radiusd-logrotate 2014-06-17 14:02:57.377277502 +0200
+++ freeradius-server-3.0.3/suse/radiusd-logrotate 2014-06-17 15:13:43.402836043 +0200
@@ -27,7 +27,7 @@
missingok
create
postrotate
- kill -HUP `cat /var/run/radiusd/radiusd.pid` || :
+ kill -HUP `cat /run/radiusd/radiusd.pid` || :
endscript
}
Index: freeradius-server-3.0.3/suse/rcradiusd
===================================================================
--- freeradius-server-3.0.3.orig/suse/rcradiusd 2014-06-17 14:02:57.365277322 +0200
+++ freeradius-server-3.0.3/suse/rcradiusd 2014-06-17 15:14:16.394352021 +0200
@@ -34,9 +34,9 @@ rc_reset
case "$1" in
start)
echo -n "Starting RADIUS daemon "
- # /var/run might be on tmpfs, create runtime directory if needed
- if [ ! -d /var/run/radiusd ]; then
- install -d -m 0700 -g radiusd -o radiusd /var/run/radiusd
+ # /run might be on tmpfs, create runtime directory if needed
+ if [ ! -d /run/radiusd ]; then
+ install -d -m 0700 -g radiusd -o radiusd /run/radiusd
fi
startproc $RADIUSD_BIN >/dev/null
rc_status -v

23
freeradius-server.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Thu Apr 23 14:22:17 UTC 2015 - vcizek@suse.com
- minor adjustments/cleanup of spec and changes
-------------------------------------------------------------------
Wed Apr 22 20:31:44 UTC 2015 - michael@stroeder.com
- update to 3.0.8
* for a detailed list of changes look at:
/usr/share/doc/packages/freeradius-server/ChangeLog
- new set of consolidated patch files:
deleted:
* freeradius-server-2.1.1-logrotate_su.patch
* freeradius-server-2.1.6-rcradiusd.patch
* freeradius-server-initscript-pidfile.patch
* freeradius-server-radius-reload-logrotate.patch
* freeradius-server-var_run.patch
added:
* freeradius-server-radiusd-logrotate.patch
* freeradius-server-rcradiusd.patch
* freeradius-server-tmpfiles.patch
-------------------------------------------------------------------
Wed Jan 14 13:10:11 UTC 2015 - tchvatal@suse.com

27
freeradius-server.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package freeradius-server
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%define apxs2 apxs2-prefork
%define apache2_sysconfdir %(%{_sbindir}/%{apxs2} -q SYSCONFDIR)
Name: freeradius-server
Version: 3.0.6
Version: 3.0.8
Release: 0
Summary: Very Highly Configurable Radius Server
License: GPL-2.0 and LGPL-2.1
@ -30,13 +30,10 @@ Source: ftp://ftp.freeradius.org/pub/freeradius/%{name}-%{version}.tar.b
Source99: ftp://ftp.freeradius.org/pub/freeradius/%{name}-%{version}.tar.bz2.sig
Source1: radiusd.service
Source2: freeradius-tmpfiles.conf
Patch2: freeradius-server-2.1.6-rcradiusd.patch
Patch7: freeradius-server-fix-cert-bootstrap.patch
Patch8: freeradius-server-initscript-pidfile.patch
Patch9: freeradius-server-radius-reload-logrotate.patch
# PATCH-FIX-SUSE use 'su' logrotate option (bnc#677335)
Patch12: freeradius-server-2.1.1-logrotate_su.patch
Patch13: freeradius-server-var_run.patch
Patch1: freeradius-server-tmpfiles.patch
Patch2: freeradius-server-radiusd-logrotate.patch
Patch3: freeradius-server-rcradiusd.patch
Patch4: freeradius-server-fix-cert-bootstrap.patch
BuildRequires: apache2-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: db-devel
@ -189,12 +186,10 @@ This plugin provides the SQLite support for the FreeRADIUS server project.
%prep
%setup -q
%patch2
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch12 -p1
%patch13 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
@ -415,6 +410,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sites-available/abfab-tls
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sites-available/abfab-tr-idp
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sites-available/channel_bindings
%attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sites-available/challenge
# sites-enabled
# symlink: %{_sysconfdir}/raddb/sites-enabled/xxx -> ../sites-available/xxx
@ -603,6 +599,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf
%{_libdir}/freeradius/rlm_sqlcounter.so
%{_libdir}/freeradius/rlm_sqlippool.so
%{_libdir}/freeradius/rlm_sql_null.so
%{_libdir}/freeradius/rlm_test.so
%{_libdir}/freeradius/rlm_unix.so
%{_libdir}/freeradius/rlm_utf8.so
%{_libdir}/freeradius/rlm_wimax.so