X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=freeradius.spec;h=78328d54ce5e7de42e848154e78fb01d6d99faba;hb=395dab3fdf19c3384b4b9368e9820755a23bedb5;hp=d847644e0dccac2121d941651f2acce6c996b4e3;hpb=cd385e80409c98a01fd3ee3e0e1de4d5664c5323;p=packages%2Ffreeradius.git

diff --git a/freeradius.spec b/freeradius.spec
index d847644..78328d5 100644
--- a/freeradius.spec
+++ b/freeradius.spec
@@ -4,38 +4,35 @@
 # - won't be good to include these contrib examples?
 #   Source1:	http://www.ping.de/~fdc/radius/radacct-replay
 #   Source3:	ftp://ftp.freeradius.org/pub/radius/contrib/radwho.cgi
-# - SECURITY: http://www.gentoo.org/security/en/glsa/glsa-200505-13.xml
 Summary:	High-performance and highly configurable RADIUS server
-Summary(pl):	Szybki i wysoce konfigurowalny serwer RADIUS
+Summary(pl.UTF-8):	Szybki i wysoce konfigurowalny serwer RADIUS
 Name:		freeradius
-Version:	1.0.2
-Release:	2
+Version:	1.1.7
+Release:	5
 License:	GPL
 Group:		Networking/Daemons
 Source0:	ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.gz
-# Source0-md5:	f5dfce4efbb03bbc47ceae08270a875e
+# Source0-md5:	5c126cb2122b8e2ba9784b511fbefd96
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
 Source3:	%{name}.pam
-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
-Patch7:		%{name}-eap_install_order.patch
+Patch0:		%{name}-makefile.patch
+Patch1:		%{name}-linking.patch
+Patch2:		%{name}-moduledir.patch
+Patch3:		%{name}-rundir.patch
+Patch4:		%{name}-config.patch
 URL:		http://www.freeradius.org/
-Provides:	user(radius)
-Provides:	group(radius)
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	gdbm-devel
+BuildRequires:	krb5-devel
+BuildRequires:	libcom_err-devel
 BuildRequires:	libltdl-devel
 BuildRequires:	libtool
 BuildRequires:	mysql-devel
-BuildRequires:	openldap-devel
+BuildRequires:	net-snmp-devel
+BuildRequires:	openldap-devel >= 2.4.6
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
 BuildRequires:	perl-devel
@@ -43,23 +40,24 @@ BuildRequires:	postgresql-backend-devel
 BuildRequires:	postgresql-devel
 BuildRequires:	python
 BuildRequires:	python-devel
-BuildRequires:	net-snmp-devel
-BuildRequires:	unixODBC-devel
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.202
-PreReq:		rc-scripts
-Requires(pre):	/usr/bin/getgid
+BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	unixODBC-devel
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
 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(pre):	/usr/sbin/usermod
 Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:	rc-scripts
+Provides:	group(radius)
+Provides:	user(radius)
 Obsoletes:	cistron-radius
+Conflicts:	logrotate < 3.7-4
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The FreeRADIUS Server Project is an attempt to create a
@@ -67,11 +65,11 @@ high-performance and highly configurable GPL'd RADIUS server. It is
 generally similar to the Livingston 2.0 RADIUS server, but has a lot
 more features, and is much more configurable.
 
-%description -l pl
+%description -l pl.UTF-8
 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 funkcji i posiada
-wiêksze mo¿liwo¶ci konfigurowania.
+Livingston 2.0 RADIUS server ale ma o wiele więcej funkcji i posiada
+większe możliwości konfigurowania.
 
 %prep
 %setup -q
@@ -80,31 +78,29 @@ wi
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
-awk 'BEGIN { printit=0; } { if (printit) print $0; } /## end libtool.m4/ { printit=1;}' \
-	< aclocal.m4 > acinclude.m4
+sed -e '/m4_include..libtool/d' < aclocal.m4 > acinclude.m4
 
 %build
 maindir="$(pwd)"
 for d in rlm_attr_rewrite rlm_checkval rlm_counter rlm_dbm \
 	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_eap rlm_example rlm_ippool rlm_krb5 rlm_ldap rlm_otp \
+	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_sql_log rlm_unix ; do
 
 	cd src/modules/${d}
-	%{__aclocal} -I ${maindir}
-	%{__autoconf}
+	if [ -f configure.in ]; then
+		%{__aclocal} -I ${maindir}
+		%{__autoconf}
+	fi
 	if [ -f config.h.in ]; then
 		%{__autoheader}
 	fi
 	cd ${maindir}
 done
-%{__libtoolize}
+%{__libtoolize} --install
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
@@ -120,18 +116,17 @@ done
 	--with-ltdl-include=%{_includedir}/none \
 	--with-ltdl-lib=%{_libdir} \
 	--disable-ltdl-install \
-	--without-rlm_krb5 \
-	--without-rlm_dbm
-%{__make} \
+	--with-rlm_krb5
+%{__make} -j1 \
 	LIBTOOL="`pwd`/libtool --tag=CC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 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
+	$RPM_BUILD_ROOT%{_var}/log/{,archive}/freeradius/radacct
 
-%{__make} install \
+%{__make} -j1 install \
 	LIBTOOL="`pwd`/libtool --tag=CC" \
 	R=$RPM_BUILD_ROOT
 
@@ -144,8 +139,9 @@ 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}
+rm -f $RPM_BUILD_ROOT%{_libdir}/{*.a,*.la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
+rm -rf $RPM_BUILD_ROOT%{_docdir}/freeradius
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -164,17 +160,11 @@ fi
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
-fi
+%service %{name} restart "%{name} daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop 1>&2
-	fi
+	%service %{name} stop
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -187,11 +177,9 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc doc/*
-%doc src/modules/rlm_sql/drivers/*/*.sql
 %attr(755,root,root) %{_bindir}/*
 %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
@@ -202,6 +190,8 @@ fi
 
 %attr(771,root,radius) %dir %{_var}/log/%{name}
 %attr(771,root,radius) %dir %{_var}/log/%{name}/radacct
+%attr(771,root,radius) %dir %{_var}/log/archive/%{name}
+%attr(771,root,radius) %dir %{_var}/log/archive/%{name}/radacct
 %attr(775,root,radius) %dir /var/run/%{name}
 
 %attr(754,root,root) /etc/rc.d/init.d/%{name}