Accepting request 39308 from network

checked in (request 39308)

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

freeradius-server-initscript-pidfile.patch

@@ -1,30 +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	
- 	;;
-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	
- 	;;

freeradius-server.changes

@@ -1,14 +1,3 @@
--------------------------------------------------------------------
-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
 

freeradius-server.spec

@@ -36,7 +36,6 @@ 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
@@ -47,6 +46,7 @@ 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,6 +70,7 @@ 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
@@ -138,7 +139,7 @@ Authors:
 
 %package utils
 License:        GPLv2 ; LGPLv2.1
-Group:        Productivity/Networking/Radius/Clients
+Group:          Productivity/Networking/Radius/Servers
 Summary:        FreeRADIUS Clients
 Requires:       %{name}-libs = %{version}
 
@@ -236,7 +237,6 @@ Authors:
 %patch5
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.
@@ -248,8 +248,7 @@ export CFLAGS="$CFLAGS -fPIC -DPIC"
 %endif
 export LDFLAGS="-pie"
 %configure \
-  --disable-static \
+  --disable-static --with-pic\
-  --with-pic \
   --libdir=%{_libdir}/freeradius \
   --disable-ltdl-install \
   --enable-strict-dependencies \
@@ -334,7 +333,7 @@ chgrp radiusd /etc/raddb/certs/*
 
 %postun
 %restart_on_update freeradius
-%{insserv_cleanup}
+%insserv_cleanup
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -386,7 +385,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/oracle/msqlippool.txt
+%{_sysconfdir}/raddb/sql/*/*.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
@@ -404,9 +403,10 @@ 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 %ghost %{_localstatedir}/run/radiusd/
+%attr(700,radiusd,radiusd) %dir %{_localstatedir}/run/radiusd/
 # binaries
 %defattr(-,root,root)
+# %{_sbindir}/check-radiusd-config
 %{_sbindir}/checkrad
 %{_sbindir}/radiusd
 %{_sbindir}/radmin
@@ -434,14 +434,13 @@ 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(-,radiusd,radiusd)
+%defattr(-,root,root)
 %attr(755,root,root) %dir %{_libdir}/freeradius
 %attr(755,root,root) %{_libdir}/freeradius/rlm_sql_oracle*.so*
 %endif