From 25846cf9f2ef908cd2555892f445d5696d411b579bd0b36b563515639b8d6414 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 3 May 2010 21:30:26 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/freeradius-server revision 25.0 OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=4aee7d9a96c1fe0261f3a80df671d7e8 --- freeradius-server-initscript-pidfile.patch | 30 ++++++++++++++++++++++ freeradius-server.changes | 11 ++++++++ freeradius-server.spec | 21 +++++++-------- 3 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 freeradius-server-initscript-pidfile.patch diff --git a/freeradius-server-initscript-pidfile.patch b/freeradius-server-initscript-pidfile.patch new file mode 100644 index 0000000..c5be197 --- /dev/null +++ b/freeradius-server-initscript-pidfile.patch @@ -0,0 +1,30 @@ +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 + ;; +Index: freeradius-server-2.1.8/suse/rcradius-relayd +=================================================================== +--- freeradius-server-2.1.8.orig/suse/rcradius-relayd 2010-05-03 15:37:35.000000000 +0200 ++++ freeradius-server-2.1.8/suse/rcradius-relayd 2010-05-03 15:38:58.000000000 +0200 +@@ -31,6 +31,10 @@ rc_reset + case "$1" in + start) + echo -n "Starting RADIUS Relay 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 -s -n radrelay >/dev/null + rc_status -v + ;; diff --git a/freeradius-server.changes b/freeradius-server.changes index 6b1c570..2914305 100644 --- a/freeradius-server.changes +++ b/freeradius-server.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon May 3 13:50:08 UTC 2010 - puzel@novell.com + +- add freeradius-server-initscript-pidfile.patch + - handle /var/run on tmpfs + +------------------------------------------------------------------- +Sun Mar 21 08:43:58 UTC 2010 - puzel@novell.com + +- specfile cleanup + ------------------------------------------------------------------- Thu Mar 11 12:44:18 UTC 2010 - puzel@novell.com diff --git a/freeradius-server.spec b/freeradius-server.spec index 954d794..2e202e9 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -19,7 +19,7 @@ Name: freeradius-server Version: 2.1.8 -Release: 2 +Release: 3 License: GPLv2 ; LGPLv2.1 Group: Productivity/Networking/Radius/Servers Provides: radiusd @@ -36,6 +36,7 @@ Patch4: %{name}-2.1.6-edir-64bit.patch Patch5: %{name}-2.1.6-overflow.patch Patch6: freeradius-server-sha1-default.patch Patch7: freeradius-server-fix-cert-bootstrap.patch +Patch8: freeradius-server-initscript-pidfile.patch PreReq: perl openssl pwdutils coreutils PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,7 +47,6 @@ Requires: %{name}-libs = %{version} Requires: python Recommends: logrotate BuildRequires: apache2-devel -#BuildRequires: bind-libs BuildRequires: cyrus-sasl-devel BuildRequires: db-devel BuildRequires: gcc-c++ @@ -70,7 +70,6 @@ BuildRequires: python-devel BuildRequires: sed BuildRequires: sqlite3-devel BuildRequires: unixODBC-devel -#BuildRequires: zlib-devel %description The FreeRADIUS server has a number of features found in other servers @@ -139,7 +138,7 @@ Authors: %package utils License: GPLv2 ; LGPLv2.1 -Group: Productivity/Networking/Radius/Servers +Group: Productivity/Networking/Radius/Clients Summary: FreeRADIUS Clients Requires: %{name}-libs = %{version} @@ -237,6 +236,7 @@ Authors: %patch5 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build # This package failed when testing with -Wl,-as-needed being default. @@ -248,7 +248,8 @@ export CFLAGS="$CFLAGS -fPIC -DPIC" %endif export LDFLAGS="-pie" %configure \ - --disable-static --with-pic\ + --disable-static \ + --with-pic \ --libdir=%{_libdir}/freeradius \ --disable-ltdl-install \ --enable-strict-dependencies \ @@ -333,7 +334,7 @@ chgrp radiusd /etc/raddb/certs/* %postun %restart_on_update freeradius -%insserv_cleanup +%{insserv_cleanup} %clean rm -rf $RPM_BUILD_ROOT @@ -385,7 +386,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/raddb/sql/ndb/README %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sql/*/*.conf %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sql/*/*.sql -%{_sysconfdir}/raddb/sql/*/*.txt +%{_sysconfdir}/raddb/sql/oracle/msqlippool.txt %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/users %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/experimental.conf %dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/certs @@ -403,10 +404,9 @@ rm -rf $RPM_BUILD_ROOT %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/policy.conf %{_sysconfdir}/raddb/policy.txt %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/templates.conf -%attr(700,radiusd,radiusd) %dir %{_localstatedir}/run/radiusd/ +%attr(700,radiusd,radiusd) %dir %ghost %{_localstatedir}/run/radiusd/ # binaries %defattr(-,root,root) -# %{_sbindir}/check-radiusd-config %{_sbindir}/checkrad %{_sbindir}/radiusd %{_sbindir}/radmin @@ -434,13 +434,14 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %files libs +%defattr(-,root,root) # RADIUS shared libs %attr(755,root,root) %dir %{_libdir}/freeradius %attr(755,root,root) %{_libdir}/freeradius/lib*.so* %if %{_oracle_support} == 1 %files oracle -%defattr(-,root,root) +%defattr(-,radiusd,radiusd) %attr(755,root,root) %dir %{_libdir}/freeradius %attr(755,root,root) %{_libdir}/freeradius/rlm_sql_oracle*.so* %endif