Accepting request 159427 from home:vitezslav_cizek:branches:network

- fixed a bug in the logrotate script (bnc#797292)

OBS-URL: https://build.opensuse.org/request/show/159427
OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=47

freeradius-server-2.1.1-logrotate_su.patch

@@ -1,14 +1,50 @@
-Index: freeradius-server-2.1.1/suse/radiusd-logrotate
+Index: freeradius-server-2.1.12/suse/radiusd-logrotate
 ===================================================================
---- freeradius-server-2.1.1.orig/suse/radiusd-logrotate	2008-09-25 10:41:26.000000000 +0200
-+++ freeradius-server-2.1.1/suse/radiusd-logrotate	2012-05-28 14:04:33.755496027 +0200
-@@ -5,6 +5,9 @@
- # (or similar) in radiusd.conf, without rotation.  If you go with the
+--- freeradius-server-2.1.12.orig/suse/radiusd-logrotate	2013-01-08 18:25:29.358157621 +0100
++++ freeradius-server-2.1.12/suse/radiusd-logrotate	2013-01-08 18:28:38.487684634 +0100
+@@ -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.
-+
-+su radiusd radiusd
-+
  /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,10 +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
+@@ -40,6 +44,7 @@
+ }
+ 
+ /var/log/radius/radwtmp {
++    su radiusd radiusd
+     compress
+     dateext
+     maxage 365
+@@ -54,6 +59,7 @@
+ }
+ 
+ /var/log/radius/sqltrace.sql {
++    su radiusd radiusd
+     compress
+     dateext
+     maxage 365

freeradius-server.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 14 15:17:37 UTC 2013 - vcizek@suse.com
+
+- fixed a bug in the logrotate script (bnc#797292)
+
 -------------------------------------------------------------------
 Mon Oct  1 11:34:31 UTC 2012 - vcizek@suse.com
 

freeradius-server.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package freeradius-server
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -409,6 +409,7 @@ rm -rf %{buildroot}
 %{_datadir}/dialup_admin/sql/
 %dir %{_datadir}/dialup_admin/conf/
 %config(noreplace) %{_datadir}/dialup_admin/conf/*
+%dir %{apache2_sysconfdir}/conf.d
 %config(noreplace) %{apache2_sysconfdir}/conf.d/radius.conf
 %{_datadir}/dialup_admin/Changelog
 %{_datadir}/dialup_admin/README