-%include /usr/lib/rpm/macros.python
+#
%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
+# FIXME:
+# - 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
+# TODO
+# - (CVE-2006-1354) http://security.gentoo.org/glsa/glsa-200604-03.xml
+# - finish update to 1.1.1
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: 0.9.3
-Release: 2
+Version: 1.1.1
+Release: 0.2
License: GPL
Group: Networking/Daemons
Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.gz
-# Source0-md5: 36f33d9dd305a2c9f1089c30a9fff0b8
+# Source0-md5: b38b24f6352090fdb571b9e8da52e12e
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}-makefile.patch
+Patch1: %{name}-smbencrypt.patch
+Patch2: %{name}-linking.patch
+Patch3: %{name}-moduledir.patch
+Patch4: %{name}-rundir.patch
+Patch5: %{name}-config.patch
+Patch6: %{name}-eap_install_order.patch
URL: http://www.freeradius.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cyrus-sasl-devel
BuildRequires: gdbm-devel
+BuildRequires: krb5-devel
BuildRequires: libltdl-devel
BuildRequires: libtool
BuildRequires: mysql-devel
-BuildRequires: openldap-devel
+BuildRequires: net-snmp-devel
+BuildRequires: openldap-devel >= 2.3.0
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: pam-devel
BuildRequires: perl-devel
BuildRequires: postgresql-backend-devel
BuildRequires: postgresql-devel
+BuildRequires: python
BuildRequires: python-devel
-BuildRequires: net-snmp-devel
-BuildRequires: unixODBC-devel
BuildRequires: rpm-perlprov
-BuildRequires: rpm-pythonprov
-PreReq: rc-scripts
+BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: unixODBC-devel
Requires(post,preun): /sbin/chkconfig
-Requires: libtool
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+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/useradd
+Requires(pre): /usr/sbin/usermod
+Requires: perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
+Requires: rc-scripts
+Provides: group(radius)
+Provides: user(radius)
Obsoletes: cistron-radius
-
-%define _localstatedir %{_var}/lib/freeradius
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
The FreeRADIUS Server Project is an attempt to create a
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 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
+#%patch1 -p1
+#%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
%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_radutmp rlm_smb \
+ rlm_eap/types/rlm_eap_{md5,mschapv2,peap,sim,tls,ttls} \
+ 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_sql_log rlm_sqlcounter rlm_unix ; do
+
cd src/modules/${d}
%{__aclocal} -I ${maindir}
%{__autoconf}
fi
cd ${maindir}
done
-#touch src/modules/rlm_eap/types/rlm_eap_tls/config.h
%{__libtoolize}
%{__aclocal}
%{__autoconf}
--with-ltdl-include=%{_includedir}/none \
--with-ltdl-lib=%{_libdir} \
--disable-ltdl-install \
- --without-rlm_krb5 \
+ --with-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
+ $RPM_BUILD_ROOT%{_var}/log/{,archiv}/freeradius/radacct
%{__make} install \
+ LIBTOOL="`pwd`/libtool --tag=CC" \
R=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT{%{_mandir}/man8/builddbm.8,%{_sbindir}/rc.radiusd}
# 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}/{*.a,*.la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
%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
/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
%postun
if [ "$1" = "0" ]; then
- /usr/sbin/userdel %{name}
+ %userremove radius
+ %groupremove radius
fi
%files
%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
%{_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(771,root,radius) %dir %{_var}/log/archiv/%{name}
+%attr(771,root,radius) %dir %{_var}/log/archiv/%{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) /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?/*
projects / packages / freeradius.git / blobdiff