From 4e890a35c890a7ab59cec7a65d7a64111abef0a62bcd05bff78321cc7a16609b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Dec 2011 17:10:08 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/freeradius-server revision 39.0 OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=37217aae3009dcdb37bf39aed0d35bff --- freeradius-server.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/freeradius-server.spec b/freeradius-server.spec index 1cc8fde..0e7409b 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -20,7 +20,7 @@ Name: freeradius-server Version: 2.1.12 Release: 1 -License: GPLv2 ; LGPLv2.1 +License: GPL-2.0 ; LGPL-2.1 Summary: Very Highly Configurable Radius Server Url: http://www.freeradius.org/ Group: Productivity/Networking/Radius/Servers @@ -114,7 +114,7 @@ attributes Selecting a particular configuration Authentication methods %endif %package libs -License: GPLv2 ; LGPLv2.1 +License: GPL-2.0 ; LGPL-2.1 Summary: FreeRADIUS shared library Group: Productivity/Networking/Radius/Servers @@ -122,7 +122,7 @@ Group: Productivity/Networking/Radius/Servers The FreeRADIUS shared library %package utils -License: GPLv2 ; LGPLv2.1 +License: GPL-2.0 ; LGPL-2.1 Summary: FreeRADIUS Clients Group: Productivity/Networking/Radius/Clients Requires: %{name}-libs = %{version} @@ -143,7 +143,7 @@ features are: * Accounting methods %package dialupadmin -License: GPLv2 ; LGPLv2.1 +License: GPL-2.0 ; LGPL-2.1 Summary: Web management for FreeRADIUS Group: Productivity/Networking/Radius/Servers Requires: http_daemon @@ -161,7 +161,7 @@ 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: GPLv2 ; LGPLv2.1 +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 +170,7 @@ Requires: %{name}-libs = %{version} These are the static libraries for the FreeRADIUS package. %package doc -License: GPLv2 ; LGPLv2.1 +License: GPL-2.0 ; LGPL-2.1 Summary: FreeRADIUS Documentation Group: Productivity/Networking/Radius/Servers Requires: %{name} From 69864838c91251a8d12816223f82e5ae73a252c2e0f88ed58ca19f2103d68b35 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 16 May 2012 22:31:35 +0000 Subject: [PATCH 2/4] Accepting request 120999 from home:worldcitizen:branches:network Enable the same CFLAGS as for other hardware OBS-URL: https://build.opensuse.org/request/show/120999 OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=39 --- freeradius-server.changes | 5 +++++ freeradius-server.spec | 18 ++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/freeradius-server.changes b/freeradius-server.changes index 2a22545..8a10863 100644 --- a/freeradius-server.changes +++ b/freeradius-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/freeradius-server.spec b/freeradius-server.spec index 0e7409b..f590376 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -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 @@ -70,8 +69,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 +113,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 +120,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,7 +140,6 @@ 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 @@ -161,7 +157,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 +165,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} @@ -199,7 +193,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" From 3a12a0265dcff4022b6bdccd229be3049f8d5cacda5dcbae86e2c656111b2d9a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 3 Jun 2012 10:41:40 +0000 Subject: [PATCH 3/4] Accepting request 122585 from home:vitezslav_cizek:branches:network - Use the new 'su' logrotate option (bnc#677335) OBS-URL: https://build.opensuse.org/request/show/122585 OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=40 --- freeradius-server-2.1.1-logrotate_su.patch | 14 ++++++++++++++ freeradius-server.changes | 5 +++++ freeradius-server.spec | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 freeradius-server-2.1.1-logrotate_su.patch diff --git a/freeradius-server-2.1.1-logrotate_su.patch b/freeradius-server-2.1.1-logrotate_su.patch new file mode 100644 index 0000000..1cef2ad --- /dev/null +++ b/freeradius-server-2.1.1-logrotate_su.patch @@ -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 diff --git a/freeradius-server.changes b/freeradius-server.changes index 8a10863..569e7e2 100644 --- a/freeradius-server.changes +++ b/freeradius-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/freeradius-server.spec b/freeradius-server.spec index f590376..40f6e68 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -34,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 @@ -183,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")" From 00222fcdea942448fdff15d408e3741f3ba798f56eff526f1bfdca97660d09d9 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 10 Jun 2012 12:47:18 +0000 Subject: [PATCH 4/4] DateManip / Date-Manip OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=41 --- freeradius-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeradius-server.spec b/freeradius-server.spec index 40f6e68..77d79ce 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -146,7 +146,7 @@ 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