[packages/freeradius/freeradius-1] - added format patch, updated build process to fill in verbose files (for reference purposes)
qboosh
qboosh at pld-linux.org
Sat Mar 21 09:14:37 CET 2015
commit 7abe9954f71366962f59014443001d50e75ec1e8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Mar 21 09:15:56 2015 +0100
- added format patch, updated build process to fill in verbose files (for reference purposes)
freeradius-format.patch | 11 ++++
freeradius.spec | 150 +++++++++++++++++++++++++++++++++++++-----------
2 files changed, 128 insertions(+), 33 deletions(-)
---
diff --git a/freeradius.spec b/freeradius.spec
index 05a5418..634802c 100644
--- a/freeradius.spec
+++ b/freeradius.spec
@@ -1,15 +1,18 @@
-#
-%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
# Source3: ftp://ftp.freeradius.org/pub/radius/contrib/radwho.cgi
+#
+# Conditional build:
+%bcond_with krb5 # MIT Kerberos instead of heimdal
+#
+%include /usr/lib/rpm/macros.perl
Summary: High-performance and highly configurable RADIUS server
Summary(pl.UTF-8): Szybki i wysoce konfigurowalny serwer RADIUS
Name: freeradius
Version: 1.1.7
Release: 8
-License: GPL
+License: LGPL v2.1+ (libradius), GPL v2+ (the rest)
Group: Networking/Daemons/Radius
Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.gz
# Source0-md5: 5c126cb2122b8e2ba9784b511fbefd96
@@ -21,12 +24,14 @@ Patch1: %{name}-linking.patch
Patch2: %{name}-moduledir.patch
Patch3: %{name}-rundir.patch
Patch4: %{name}-config.patch
+Patch5: %{name}-format.patch
URL: http://www.freeradius.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: cyrus-sasl-devel
BuildRequires: gdbm-devel
-BuildRequires: krb5-devel
+%{!?with_krb5:BuildRequires: heimdal-devel}
+%{?with_krb5:BuildRequires: krb5-devel}
BuildRequires: libcom_err-devel
BuildRequires: libltdl-devel
BuildRequires: libtool >= 2:2.2
@@ -78,8 +83,9 @@ większe możliwości konfigurowania.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
-sed -e '/m4_include..libtool/d' < aclocal.m4 > acinclude.m4
+%{__sed} -e '/m4_include..libtool/d' < aclocal.m4 > acinclude.m4
%build
maindir="$(pwd)"
@@ -107,16 +113,19 @@ done
%configure \
SNMPGET="/usr/bin/snmpget" \
SNMPWALK="/usr/bin/snmpwalk" \
+ ac_cv_lib_nsl_inet_ntoa=no \
+ ac_cv_lib_resolv_inet_aton=no \
+ %{!?with_krb5:--enable-heimdal-krb5} \
+ --disable-ltdl-install \
--enable-strict-dependencies \
- --with-logdir=%{_var}/log/freeradius \
--with-experimental-modules \
- --with-threads \
- --with-thread-pool \
--with-gnu-ld \
+ --with-logdir=%{_var}/log/freeradius \
--with-ltdl-include=%{_includedir}/none \
--with-ltdl-lib=%{_libdir} \
- --disable-ltdl-install \
- --with-rlm_krb5
+ --with-rlm_krb5 \
+ --with-threads \
+ --with-thread-pool
%{__make} -j1 \
LIBTOOL="`pwd`/libtool --tag=CC"
@@ -130,18 +139,23 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/raddb,%{_libdir}/%{name}} \
LIBTOOL="`pwd`/libtool --tag=CC" \
R=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT{%{_mandir}/man8/builddbm.8,%{_sbindir}/rc.radiusd}
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/raddb/{clients,*.pl}
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/rc.radiusd
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/raddb/{clients,*.pl}
install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/radius
+install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
+cat >$RPM_BUILD_ROOT%{systemdtmpfilesdir}/freeradius.conf <<EOF
+d /var/run/freeradius 0775 root radius -
+EOF
+
# remove useless static modules and library
# rlm*.la are used (lt_dlopen)
-rm -f $RPM_BUILD_ROOT%{_libdir}/{*.a,*.la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
-rm -rf $RPM_BUILD_ROOT%{_docdir}/freeradius
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{*.a,*.la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/freeradius
%clean
rm -rf $RPM_BUILD_ROOT
@@ -177,25 +191,95 @@ fi
%files
%defattr(644,root,root,755)
%doc doc/*
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/*.so
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*.so
-%{_libdir}/%{name}/*.la
+%attr(755,root,root) %{_bindir}/radclient
+%attr(755,root,root) %{_bindir}/radeapclient
+%attr(755,root,root) %{_bindir}/radlast
+%attr(755,root,root) %{_bindir}/radrelay
+%attr(755,root,root) %{_bindir}/radsqlrelay
+%attr(755,root,root) %{_bindir}/radtest
+%attr(755,root,root) %{_bindir}/radwho
+%attr(755,root,root) %{_bindir}/radzap
+%attr(755,root,root) %{_bindir}/rlm_dbm_cat
+%attr(755,root,root) %{_bindir}/rlm_dbm_parser
+%attr(755,root,root) %{_bindir}/rlm_ippool_tool
+%attr(755,root,root) %{_bindir}/smbencrypt
+%attr(755,root,root) %{_sbindir}/check-radiusd-config
+%attr(755,root,root) %{_sbindir}/checkrad
+%attr(755,root,root) %{_sbindir}/radiusd
+%attr(755,root,root) %{_sbindir}/radwatch
+%attr(755,root,root) %{_libdir}/libeap-%{version}.so
+%attr(755,root,root) %{_libdir}/libeap.so
+%attr(755,root,root) %{_libdir}/libradius-%{version}.so
+%attr(755,root,root) %{_libdir}/libradius.so
+%dir %{_libdir}/freeradius
+%attr(755,root,root) %{_libdir}/freeradius/rlm_*.so
+%{_libdir}/freeradius/rlm_*.la
%{_datadir}/freeradius
+%attr(754,root,root) /etc/rc.d/init.d/freeradius
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/radius
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/freeradius
%dir %{_sysconfdir}/raddb
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/*
-
-%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}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/acct_users
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/attrs
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/clients.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/dictionary
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/eap.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/experimental.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/hints
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/huntgroups
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/ldap.attrmap
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/mssql.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/naslist
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/naspasswd
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/oraclesql.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/otp.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/postgresql.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/postgresqlippool.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/preproxy_users
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/proxy.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/radiusd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/realms
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/snmp.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/sql.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/sqlippool.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/users
+%dir %{_sysconfdir}/raddb/certs
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/certs/README
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/certs/cert-*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/certs/dh
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/certs/newcert.pem
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/certs/newreq.pem
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/certs/random
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/certs/root.*
+%dir %{_sysconfdir}/raddb/certs/demoCA
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/certs/demoCA/cacert.pem
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/certs/demoCA/index.txt*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/raddb/certs/demoCA/serial*
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%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/*
+%attr(771,root,radius) %dir %{_var}/log/freeradius
+%attr(771,root,radius) %dir %{_var}/log/freeradius/radacct
+%attr(771,root,radius) %dir %{_var}/log/archive/freeradius
+%attr(771,root,radius) %dir %{_var}/log/archive/freeradius/radacct
+%attr(775,root,radius) %dir /var/run/freeradius
+%{systemdtmpfilesdir}/freeradius.conf
-%{_mandir}/man?/*
+%{_mandir}/man1/radclient.1*
+%{_mandir}/man1/radeapclient.1*
+%{_mandir}/man1/radlast.1*
+%{_mandir}/man1/radtest.1*
+%{_mandir}/man1/radwho.1*
+%{_mandir}/man1/radzap.1*
+%{_mandir}/man5/acct_users.5*
+%{_mandir}/man5/clients.5*
+%{_mandir}/man5/clients.conf.5*
+%{_mandir}/man5/dictionary.5*
+%{_mandir}/man5/naslist.5*
+%{_mandir}/man5/radiusd.conf.5*
+%{_mandir}/man5/rlm_*.5*
+%{_mandir}/man5/users.5*
+%{_mandir}/man8/radiusd.8*
+%{_mandir}/man8/radrelay.8*
+%{_mandir}/man8/radsqlrelay.8*
+%{_mandir}/man8/radwatch.8*
+%{_mandir}/man8/rlm_ippool_tool.8*
diff --git a/freeradius-format.patch b/freeradius-format.patch
new file mode 100644
index 0000000..242c3ca
--- /dev/null
+++ b/freeradius-format.patch
@@ -0,0 +1,11 @@
+--- freeradius-1.1.7/src/lib/valuepair.c.orig 2007-01-30 13:58:23.000000000 +0100
++++ freeradius-1.1.7/src/lib/valuepair.c 2015-03-20 22:18:42.194967472 +0100
+@@ -1351,7 +1351,7 @@
+ last_token = userparse(buf, &vp);
+ if (!vp) {
+ if (last_token != T_EOL) {
+- librad_perror(errprefix);
++ librad_perror("%s", errprefix);
+ error = 1;
+ break;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/freeradius.git/commitdiff/7abe9954f71366962f59014443001d50e75ec1e8
More information about the pld-cvs-commit
mailing list