X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=freeradius.spec;h=d82c474b1d5f8baa2855d5e7ae4a47116409dda2;hb=e7f77506361366ae73cc2564ccf87db8354cc258;hp=23adffac11a824306f41af5e1f8529da2158b14f;hpb=073a7dbdd27056d75465abf4cfe8f329de21ee8c;p=packages%2Ffreeradius.git

diff --git a/freeradius.spec b/freeradius.spec
index 23adffa..d82c474 100644
--- a/freeradius.spec
+++ b/freeradius.spec
@@ -1,28 +1,30 @@
 #
-# TODO:
-# - SECURITY: http://securitytracker.com/alerts/2004/Sep/1011364.html
-#
 %include	/usr/lib/rpm/macros.perl
 # FIXME: won't be good to include these contrib examples?
 # Source1:	http://www.ping.de/~fdc/radius/radacct-replay
-# Source2:	http://www.ping.de/~fdc/radius/radlast-0.03
 # Source3:	ftp://ftp.freeradius.org/pub/radius/contrib/radwho.cgi
 Summary:	High-performance and highly configurable RADIUS server
 Summary(pl):	Szybki i wysoce konfigurowalny serwer RADIUS
 Name:		freeradius
-Version:	0.9.3
-Release:	2
+Version:	1.0.1
+Release:	4
 License:	GPL
 Group:		Networking/Daemons
 Source0:	ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.gz
-# Source0-md5:	36f33d9dd305a2c9f1089c30a9fff0b8
+# Source0-md5:	abc30cb71367f859ceed4de6477cd59f
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
 Source3:	%{name}.pam
-Patch0:		%{name}-ac.patch
-Patch1:		%{name}-rlm_smb-overflow.patch
-Patch2:		%{name}-netsnmp.patch
+Patch0:		%{name}-autoconf_mysql.patch
+Patch1:		%{name}-makefile.patch
+Patch2:		%{name}-smbencrypt.patch
+Patch3:		%{name}-linking.patch
+Patch4:		%{name}-moduledir.patch
+Patch5:		%{name}-rundir.patch
+Patch6:		%{name}-config.patch
 URL:		http://www.freeradius.org/
+Provides:	user(radius)
+Provides:	group(radius)
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	cyrus-sasl-devel
@@ -40,15 +42,21 @@ BuildRequires:	python-devel
 BuildRequires:	net-snmp-devel
 BuildRequires:	unixODBC-devel
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.202
 PreReq:		rc-scripts
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/bin/id
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/usermod
+Requires(pre):	/usr/sbin/useradd
+Requires(postun):	/usr/sbin/userdel
+Requires(postun):	/usr/sbin/groupdel
 Requires(post,preun):	/sbin/chkconfig
 Requires:	libtool
+Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	cistron-radius
 
-%define		_localstatedir	%{_var}/lib/freeradius
-
 %description
 The FreeRADIUS Server Project is an attempt to create a
 high-performance and highly configurable GPL'd RADIUS server. It is
@@ -58,25 +66,33 @@ more features, and is much more configurable.
 %description -l pl
 Projekt FreeRadius ma na celu stworzenie szybkiego i wysoce
 konfigurowalnego serwera RADIUS na licencji GPL. Ten jest podobny do
-Livingston 2.0 RADIUS server ale ma o wiele wiêcej ficzersów i jest
-bardziej podatny na konfiguracjê.
+Livingston 2.0 RADIUS server ale ma o wiele wiêcej funkcji i posiada
+wiêksze mo¿liwo¶ci konfigurowania.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-tail -n +3614 aclocal.m4 > acinclude.m4
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
+awk 'BEGIN { printit=0; } { if (printit) print $0; } /## end libtool.m4/ { printit=1;}' \
+	< aclocal.m4 > acinclude.m4
+
+find . -type d -name CVS | xargs rm -r
 
 %build
 maindir="$(pwd)"
 for d in rlm_attr_rewrite rlm_checkval rlm_counter rlm_dbm \
-	rlm_eap/types/rlm_eap_{md5,tls} rlm_eap rlm_example \
-	rlm_ippool rlm_krb5 rlm_ldap rlm_pam rlm_perl rlm_python \
+	rlm_eap/types/rlm_eap_{md5,mschapv2,peap,sim,tls,ttls} \
+	rlm_eap rlm_example rlm_ippool rlm_krb5 rlm_ldap rlm_pam rlm_perl rlm_python \
 	rlm_radutmp rlm_smb \
 	rlm_sql/drivers/rlm_sql_{db2,iodbc,mysql,oracle,postgresql,unixodbc} \
-	rlm_sql rlm_sqlcounter \
-	rlm_unix rlm_x99_token ; do
+	rlm_sql rlm_sqlcounter rlm_unix rlm_x99_token ; do
+
 	cd src/modules/${d}
 	%{__aclocal} -I ${maindir}
 	%{__autoconf}
@@ -85,7 +101,6 @@ for d in rlm_attr_rewrite rlm_checkval rlm_counter rlm_dbm \
 	fi
 	cd ${maindir}
 done
-#touch src/modules/rlm_eap/types/rlm_eap_tls/config.h
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -104,15 +119,17 @@ done
 	--disable-ltdl-install \
 	--without-rlm_krb5 \
 	--without-rlm_dbm
-%{__make}
+%{__make} \
+	LIBTOOL="`pwd`/libtool --tag=CC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/raddb \
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/raddb,%{_libdir}/%{name}} \
 	$RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,rc.d/init.d} \
 	$RPM_BUILD_ROOT%{_var}/log/radius
 
 %{__make} install \
+	LIBTOOL="`pwd`/libtool --tag=CC" \
 	R=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT{%{_mandir}/man8/builddbm.8,%{_sbindir}/rc.radiusd}
@@ -125,18 +142,21 @@ install %{SOURCE3}	$RPM_BUILD_ROOT/etc/pam.d/radius
 # remove useless static modules and library
 # rlm*.la are used (lt_dlopen)
 rm -f $RPM_BUILD_ROOT%{_libdir}/{*.a,libradius.la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/{*.a,libradius.la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`id -u radius 2>/dev/null`" ]; then
-	if [ "`id -u radius`" != "29" ]; then
-		echo "Error: user radius doesn't have uid=29. Correct this before installing radius server." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/useradd -u 29 -d %{_localstatedir} -s /bin/false -M -r -c "%{name}" -g nobody radius 1>&2
+%groupadd -g 29 -r -f radius
+%useradd -u 29 -d %{_localstatedir} -s /bin/false -M -r -c "%{name}" -g radius radius
+
+# TODO: should be in trigger instead.
+# upgrade from previous versions of the package, where radius' gid was "nobody"
+if [ "`id -g radius`" = "99" ]; then
+	usermod -g 29 radius
+	chown radius:radius /var/log/%{name}/*.log >/dev/null 2>&1 || :
+	chown radius:radius /var/log/%{name}/radacct/* >/dev/null 2>&1 || :
 fi
 
 %post
@@ -157,7 +177,8 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-	/usr/sbin/userdel %{name}
+	%userremove radius
+	%groupremove radius
 fi
 
 %files
@@ -168,16 +189,20 @@ fi
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/*.so
 %{_libdir}/*.la
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/*.so
+%{_libdir}/%{name}/*.la
 %{_datadir}/freeradius
 
 %dir %{_sysconfdir}/raddb
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/raddb/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/*
 
-%dir %{_var}/log/%{name}
-%dir %{_var}/log/%{name}/radacct
+%attr(771,root,radius) %dir %{_var}/log/%{name}
+%attr(771,root,radius) %dir %{_var}/log/%{name}/radacct
+%attr(775,root,radius) %dir /var/run/%{name}
 
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 
 %{_mandir}/man?/*