1
0

Accepting request 124362 from network

- Use the new 'su' logrotate option (bnc#677335)

- Enable the same CFLAGS as for other hardware

OBS-URL: https://build.opensuse.org/request/show/124362
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freeradius-server?expand=0&rev=40
This commit is contained in:
Stephan Kulow 2012-06-10 21:19:32 +00:00 committed by Git OBS Bridge
commit 7a3a17c333
3 changed files with 34 additions and 13 deletions

View File

@ -0,0 +1,14 @@
Index: freeradius-server-2.1.1/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
# 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 {
compress
dateext

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon May 28 11:47:32 UTC 2012 - vcizek@suse.com
- Use the new 'su' logrotate option (bnc#677335)
-------------------------------------------------------------------
Mon May 14 21:47:20 UTC 2012 - joop.boonen@opensuse.org
- Enable the same CFLAGS as for other hardware
-------------------------------------------------------------------
Wed Oct 19 13:55:27 UTC 2011 - vcizek@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package freeradius-server
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 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
@ -16,14 +16,13 @@
#
Name: freeradius-server
Version: 2.1.12
Release: 1
License: GPL-2.0 ; LGPL-2.1
Release: 0
Summary: Very Highly Configurable Radius Server
Url: http://www.freeradius.org/
License: GPL-2.0 ; LGPL-2.1
Group: Productivity/Networking/Radius/Servers
Url: http://www.freeradius.org/
Source: %{name}-%{version}.tar.bz2
Patch1: freeradius-server-2.1.6-dialup_admin.patch
Patch2: freeradius-server-2.1.6-rcradiusd.patch
@ -35,6 +34,8 @@ Patch8: freeradius-server-initscript-pidfile.patch
Patch9: freeradius-server-radius-reload-logrotate.patch
# PATCH-FIX-UPSTREAM edirectory ldap extensions (bnc#720620)
Patch11: freeradius-server-2.1.1-edirectory.patch
# PATCH-FIX-SUSE use 'su' logrotate option (bnc#677335)
Patch12: freeradius-server-2.1.1-logrotate_su.patch
BuildRequires: apache2-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: db-devel
@ -70,8 +71,8 @@ PreReq: pwdutils
Requires: %{name}-libs = %{version}
Requires: python
Recommends: logrotate
Provides: radiusd
Provides: freeradius = %{version}
Provides: radiusd
Obsoletes: freeradius < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Conflicts: radiusd-livingston radiusd-cistron icradius
@ -114,7 +115,6 @@ attributes Selecting a particular configuration Authentication methods
%endif
%package libs
License: GPL-2.0 ; LGPL-2.1
Summary: FreeRADIUS shared library
Group: Productivity/Networking/Radius/Servers
@ -122,7 +122,6 @@ Group: Productivity/Networking/Radius/Servers
The FreeRADIUS shared library
%package utils
License: GPL-2.0 ; LGPL-2.1
Summary: FreeRADIUS Clients
Group: Productivity/Networking/Radius/Clients
Requires: %{name}-libs = %{version}
@ -143,12 +142,11 @@ features are:
* Accounting methods
%package dialupadmin
License: GPL-2.0 ; LGPL-2.1
Summary: Web management for FreeRADIUS
Group: Productivity/Networking/Radius/Servers
Requires: http_daemon
Requires: mod_php_any
Requires: perl-DateManip
Requires: perl-Date-Manip
Requires: php
Requires: php-ldap
Requires: php-mysql
@ -161,7 +159,6 @@ supported) or in LDAP. Apart from the web pages, it also includes a
number of scripts to make the administrator's life a lot easier.
%package devel
License: GPL-2.0 ; LGPL-2.1
Summary: FreeRADIUS Development Files (static libs)
Group: Development/Libraries/C and C++
Requires: %{name}-libs = %{version}
@ -170,7 +167,6 @@ Requires: %{name}-libs = %{version}
These are the static libraries for the FreeRADIUS package.
%package doc
License: GPL-2.0 ; LGPL-2.1
Summary: FreeRADIUS Documentation
Group: Productivity/Networking/Radius/Servers
Requires: %{name}
@ -189,6 +185,7 @@ This package contains FreeRADIUS Documentation
%patch8 -p1
%patch9 -p1
%patch11 -p0
%patch12 -p1
%build
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
@ -199,7 +196,7 @@ find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g
# So we disable it here, if you want to retest, just delete this comment and the line below.
export SUSE_ASNEEDED=0
export CFLAGS="%{optflags} -DLDAP_DEPRECATED -fstack-protector"
%ifarch x86_64 ppc ppc64 s390 s390x
%ifarch x86_64 ppc ppc64 s390 s390x %arm
export CFLAGS="$CFLAGS -fPIC -DPIC"
%endif
export LDFLAGS="-pie"