Hello community, here is the log from the commit of package freeradius-server for openSUSE:Factory checked in at 2016-09-08 17:38:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freeradius-server (Old) and /work/SRC/openSUSE:Factory/.freeradius-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freeradius-server" Changes: -------- --- /work/SRC/openSUSE:Factory/freeradius-server/freeradius-server.changes 2016-01-28 17:24:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.freeradius-server.new/freeradius-server.changes 2016-09-08 17:38:55.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 2 12:16:56 UTC 2016 - [email protected] + +- use %{with} macro for conditional inclusions instead of hardcoding + version numbers +- improved package descriptions +- fixed builds on SLE12 and SLE11SP4 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeradius-server.spec ++++++ --- /var/tmp/diff_new_pack.RjtyFY/_old 2016-09-08 17:38:56.000000000 +0200 +++ /var/tmp/diff_new_pack.RjtyFY/_new 2016-09-08 17:38:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package freeradius-server # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,26 @@ Name: freeradius-server Version: 3.0.11 Release: 0 -Summary: Very Highly Configurable Radius Server + +%if 0%{?suse_version} > 1140 +%bcond_without systemd +%bcond_without freetds +%bcond_without libjson +%define runpath /run +%else +%bcond_with systemd +%bcond_with freetds +%bcond_with libjson +%define runpath /var/run +%endif + +%if 0%{?is_opensuse} +%bcond_without memcached +%else +%bcond_with memcached +%endif + +Summary: RADIUS Server License: GPL-2.0 and LGPL-2.1 Group: Productivity/Networking/Radius/Servers Url: http://www.freeradius.org/ @@ -38,7 +57,12 @@ BuildRequires: apache2-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-devel +%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1110 +BuildRequires: libdb-5_1-devel +%endif +%if %{with freetds} BuildRequires: freetds-devel +%endif BuildRequires: gcc-c++ BuildRequires: gdbm-devel BuildRequires: gettext-devel @@ -47,8 +71,12 @@ BuildRequires: libcom_err-devel BuildRequires: libcurl-devel BuildRequires: libidn-devel +%if %{with json} BuildRequires: libjson-devel +%endif +%if %{with memcached} BuildRequires: libmemcached-devel +%endif BuildRequires: libmysqlclient-devel BuildRequires: libpcap-devel BuildRequires: libtalloc-devel @@ -63,7 +91,11 @@ BuildRequires: python-devel BuildRequires: sqlite3-devel BuildRequires: unixODBC-devel +%if 0%{?suse_version} > 1110 BuildRequires: pkgconfig(apr-1) +%else +BuildRequires: libapr1-devel +%endif Requires: %fillup_prereq Requires: %insserv_prereq Requires: %{name}-libs = %{version} @@ -79,21 +111,25 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?libperl_requires} Conflicts: radiusd-livingston radiusd-cistron icradius -%if 0%{?suse_version} > 1140 +%if %{with systemd} BuildRequires: systemd %{?systemd_requires} %endif %description -The FreeRADIUS server has a number of features found in other servers -and additional features not found in any other server. +Remote Authentication Dial-In User Service (RADIUS) is a networking +protocol that provides centralized Authentication, Authorization, and +Accounting (AAA or Triple A) management for users who connect and +use a network service. + +FreeRADIUS is a modular, high performance free RADIUS implementation. %package libs Summary: FreeRADIUS shared library Group: Productivity/Networking/Radius/Servers %description libs -The FreeRADIUS shared library +The FreeRADIUS shared libraries %package utils Summary: FreeRADIUS Clients @@ -101,16 +137,15 @@ Requires: %{name}-libs = %{version} %description utils -The FreeRADIUS server has a number of features found in other servers -and additional features not found in any other server. +Collection of FreeRADIUS utilities %package devel -Summary: FreeRADIUS Development Files (static libs) +Summary: FreeRADIUS Development Files Group: Development/Libraries/C and C++ Requires: %{name}-libs = %{version} %description devel -These are the static libraries for the FreeRADIUS package. +FreeRADIUS development header files %package doc Summary: FreeRADIUS Documentation @@ -118,7 +153,7 @@ Requires: %{name} %description doc -This package contains FreeRADIUS Documentation +FreeRADIUS documentation %package ldap Summary: LDAP support for freeradius @@ -127,7 +162,7 @@ Requires: %{name} = %{version} %description ldap -This plugin provides the LDAP support for the FreeRADIUS server project. +FreeRADIUS plugin providing LDAP support. %package krb5 Summary: Kerberos 5 support for freeradius @@ -136,7 +171,7 @@ Requires: %{name} = %{version} %description krb5 -This plugin provides the Kerberos 5 support for the FreeRADIUS server project. +FreeRADIUS plugin providing Kerberos 5 authentication support. %package perl Summary: Perl support for freeradius @@ -147,7 +182,7 @@ Requires: perl %description perl -This plugin provides the Perl support for the FreeRADIUS server project. +FreeRADIUS plugin providing Perl support. %package python Summary: Python support for freeradius @@ -156,7 +191,7 @@ Requires: %{name} = %{version} %description python -This plugin provides the Python support for the FreeRADIUS server project. +FreeRADIUS plugin providing Python support. %package mysql Summary: MySQL support for freeradius @@ -165,7 +200,7 @@ Requires: %{name} = %{version} %description mysql -This plugin provides the MySQL support for the FreeRADIUS server project. +FreeRADIUS plugin providing MySQL support. %package postgresql Summary: Postgresql support for freeradius @@ -174,7 +209,7 @@ Requires: %{name} = %{version} %description postgresql -This plugin provides the postgresql support for the FreeRADIUS server project. +FreeRADIUS plugin providing PostgreSQL support. %package sqlite Summary: SQLite support for freeradius @@ -183,7 +218,7 @@ Requires: %{name} = %{version} %description sqlite -This plugin provides the SQLite support for the FreeRADIUS server project. +FreeRADIUS plugin providing SQLite support. %prep %setup -q @@ -222,6 +257,15 @@ --without-rlm_rediswho \ --without-rlm_sql_oracle \ --without-rlm_securid \ +%if ! %{with memcached} + --without-rlm_cache_memcached \ +%endif +%if ! %{with freetds} + --without-rlm_freetds \ +%endif +%if ! %{with json} + --without-rlm_rest \ +%endif --disable-silent-rules make %{?_smp_mflags} @@ -236,25 +280,24 @@ # logs touch %{buildroot}%{_localstatedir}/log/radius/radutmp touch %{buildroot}%{_localstatedir}/log/radius/radius.log -mkdir -p %{buildroot}%{_tmpfilesdir} -install -m 0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{unitname}.conf -install -D -m 755 %{SOURCE1} %{buildroot}%{_unitdir}/%{unitname}.service # SUSE install -d %{buildroot}%{_sysconfdir}/pam.d install -d %{buildroot}%{_sysconfdir}/logrotate.d install -m 644 suse/radiusd-pam %{buildroot}%{_sysconfdir}/pam.d/radiusd install -m 644 suse/radiusd-logrotate %{buildroot}%{_sysconfdir}/logrotate.d/radiusd -%if 0%{?suse_version} < 1140 -install -d -m 755 %{buildroot}%{_sysconfdir}/init.d -install -m 744 suse/rcradiusd %{buildroot}%{_sysconfdir}/init.d/freeradius -ln -sf %{buildroot}%{_sysconfdir}/init.d/freeradius %{buildroot}%{_sbindir}/rcfreeradius -%else +%if %{with systemd} +mkdir -p %{buildroot}%{_tmpfilesdir} +install -m 0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{unitname}.conf +install -D -m 755 %{SOURCE1} %{buildroot}%{_unitdir}/%{unitname}.service # name the rc script according to the systemd unit ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcradiusd +%else +install -d -m 755 %{buildroot}%{_sysconfdir}/init.d +install -m 744 suse/rcradiusd %{buildroot}%{_sysconfdir}/init.d/freeradius +ln -sf %{_sysconfdir}/init.d/freeradius %{buildroot}%{_sbindir}/rcfreeradius %endif -mkdir -p %{buildroot}/run/ -install -d -m 0710 %{buildroot}/run/radiusd/ cp -al %{buildroot}%{_sbindir}/radiusd %{buildroot}%{_sbindir}/radrelay +install -D -d -m 0710 %{buildroot}%{runpath}/radiusd mv -v doc/README doc/README.doc # remove unneeded stuff rm -f %{buildroot}%{_sysconfdir}/raddb/certs/*.crt @@ -279,6 +322,9 @@ rm -rf %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/ippool/oracle rm -rf %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/ippool-dhcp/oracle rm -rf %{buildroot}%{_sysconfdir}/raddb/mods-config/sql/main/oracle +%if ! %{with json} +rm %{buildroot}%{_sysconfdir}/raddb/mods-available/rest +%endif %pre %{_sbindir}/groupadd -r radiusd 2> /dev/null || : @@ -290,9 +336,13 @@ %{_bindir}/getent group winbind \ || %{_sbindir}/groupadd -r winbind # add radiusd to winbind group +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1140 +%{_sbindir}/groupmod -A radiusd winbind +%else %{_bindir}/gpasswd -a radiusd winbind +%endif -%if 0%{?suse_version} > 1140 +%if %{with systemd} %service_add_pre %{unitname}.service %endif @@ -303,28 +353,27 @@ fi chgrp radiusd %{_sysconfdir}/raddb/certs/* -%if 0%{?suse_version} < 1140 -%fillup_and_insserv freeradius -%endif - -%if 0%{?suse_version} > 1140 +%if %{with systemd} %service_add_post %{unitname}.service systemd-tmpfiles --create %{_tmpfilesdir}/%{unitname}.conf +%else +%fillup_and_insserv freeradius %endif %preun -%if 0%{?suse_version} < 1140 -%stop_on_removal freeradius -%else +%if %{with systemd} %service_del_preun %{unitname}.service +%else +%insserv_cleanup +%restart_on_update freeradius %endif %postun -%if 0%{?suse_version} < 1140 +%if %{with systemd} +%service_del_postun %{unitname}.service +%else %insserv_cleanup %restart_on_update freeradius -%else -%service_del_postun %{unitname}.service %endif %files doc @@ -338,11 +387,11 @@ # SUSE %config %{_sysconfdir}/pam.d/radiusd %config %{_sysconfdir}/logrotate.d/radiusd -%if 0%{?suse_version} < 1140 +%if %{with systemd} +%{_sbindir}/rcradiusd +%else %config %{_sysconfdir}/init.d/freeradius %{_sbindir}/rcfreeradius -%else -%{_sbindir}/rcradiusd %endif %dir %attr(755,radiusd,radiusd) %{_localstatedir}/lib/radiusd # configs @@ -365,8 +414,10 @@ %{_sysconfdir}/raddb/panic.gdb %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/certs/*.cnf %attr(750,root,radiusd) %{_sysconfdir}/raddb/certs/bootstrap +%if %{with systemd} %{_tmpfilesdir}/%{unitname}.conf %{_unitdir}/%{unitname}.service +%endif # mods-config %dir %attr(750,root,radiusd) %{_sysconfdir}/raddb/mods-config @@ -474,7 +525,9 @@ %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/redis %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/rediswho %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/replicate +%if %{with json} %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/rest +%endif %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/smbpasswd %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/smsotp %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/mods-available/soh @@ -541,7 +594,7 @@ %config(noreplace) %{_sysconfdir}/raddb/users %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/templates.conf -%attr(700,radiusd,radiusd) %dir %ghost /run/radiusd/ +%attr(710,radiusd,radiusd) %dir %ghost %{runpath}/radiusd # binaries %defattr(-,root,root) %{_sbindir}/checkrad @@ -602,7 +655,9 @@ %{_libdir}/freeradius/rlm_radutmp.so %{_libdir}/freeradius/rlm_realm.so %{_libdir}/freeradius/rlm_replicate.so +%if %{with json} %{_libdir}/freeradius/rlm_rest.so +%endif %{_libdir}/freeradius/rlm_soh.so %{_libdir}/freeradius/rlm_sometimes.so %{_libdir}/freeradius/rlm_sql.so @@ -616,7 +671,9 @@ %{_libdir}/freeradius/rlm_yubikey.so %{_libdir}/freeradius/rlm_sql_unixodbc.so %{_libdir}/freeradius/rlm_unpack.so +%if %{with memcached} %{_libdir}/freeradius/rlm_cache_memcached.so +%endif %{_libdir}/freeradius/rlm_cache_rbtree.so %files utils
