Hello community, here is the log from the commit of package freeradius-server for openSUSE:Factory checked in at 2014-08-04 15:14:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-05-21 16:19:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.freeradius-server.new/freeradius-server.changes 2014-08-04 15:14:43.000000000 +0200 @@ -1,0 +2,20 @@ +Sun Aug 3 18:31:49 UTC 2014 - sfalken@opensuse.org + +- added patch to changelog to fix factory-auto failure (Req #242825) + added: + freeradius-server-var_run.patch + +------------------------------------------------------------------- +Mon Jul 28 12:28:44 UTC 2014 - vcizek@suse.com + +- fixed SUSE spelling in a filename (bnc#889034) + * don't install suse/README.SuSE +- remove old tarball and signature file + +------------------------------------------------------------------- +Tue Jul 22 12:17:52 UTC 2014 - vcizek@suse.com + +- spec run through spec-cleaner +- don't install files to /var/run + +------------------------------------------------------------------- Old: ---- freeradius-server-3.0.1.tar.bz2 freeradius-server-3.0.1.tar.bz2.sig New: ---- freeradius-server-var_run.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freeradius-server.spec ++++++ --- /var/tmp/diff_new_pack.mDAFf9/_old 2014-08-04 15:14:44.000000000 +0200 +++ /var/tmp/diff_new_pack.mDAFf9/_new 2014-08-04 15:14:44.000000000 +0200 @@ -17,12 +17,13 @@ %global with_sysvinit 0 +%define unitname radiusd +%define apxs2 apxs2-prefork +%define apache2_sysconfdir %(%{_sbindir}/%{apxs2} -q SYSCONFDIR) %if 0%{?suse_version} < 1310 %global with_sysvinit 1 %endif - Name: freeradius-server -%define unitname radiusd Version: 3.0.3 Release: 0 Summary: Very Highly Configurable Radius Server @@ -40,6 +41,7 @@ Patch9: freeradius-server-radius-reload-logrotate.patch # PATCH-FIX-SUSE use 'su' logrotate option (bnc#677335) Patch12: freeradius-server-2.1.1-logrotate_su.patch +Patch13: freeradius-server-var_run.patch BuildRequires: apache2-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-devel @@ -69,43 +71,29 @@ BuildRequires: sqlite3-devel BuildRequires: unixODBC-devel BuildRequires: pkgconfig(apr-1) -%if 0%{?suse_version} > 1140 -BuildRequires: systemd -%{?systemd_requires} -%endif - -PreReq: %fillup_prereq -PreReq: %insserv_prereq -PreReq: coreutils -PreReq: openssl -PreReq: perl -PreReq: pwdutils -%define apxs2 apxs2-prefork -%define apache2_sysconfdir %(%{_sbindir}/%{apxs2} -q SYSCONFDIR) +Requires: %fillup_prereq +Requires: %insserv_prereq Requires: %{name}-libs = %{version} +Requires: coreutils +Requires: pwdutils Requires: python -%{?libperl_requires} +Requires(pre): openssl +Requires(pre): perl Recommends: logrotate Provides: freeradius = %{version} Provides: radiusd Obsoletes: freeradius < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?libperl_requires} Conflicts: radiusd-livingston radiusd-cistron icradius +%if 0%{?suse_version} > 1140 +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. The server's -features are: - -* Support for RFC and VSA attributes - -* Additional server configuration attributes - -* Selection of a particular configuration - -* Authentication methods - -* Accounting methods +and additional features not found in any other server. %package libs Summary: FreeRADIUS shared library @@ -121,18 +109,7 @@ %description utils The FreeRADIUS server has a number of features found in other servers -and additional features not found in any other server. The server's -features are: - -* Support for RFC and VSA attributes - -* Additional server configuration attributes - -* Selection of a particular configuration - -* Authentication methods - -* Accounting methods +and additional features not found in any other server. %package devel Summary: FreeRADIUS Development Files (static libs) @@ -153,8 +130,8 @@ %package ldap Summary: LDAP support for freeradius Group: System Environment/Daemons -Requires: %{name} = %{version} BuildRequires: openldap2-devel +Requires: %{name} = %{version} %description ldap This plugin provides the LDAP support for the FreeRADIUS server project. @@ -162,8 +139,8 @@ %package krb5 Summary: Kerberos 5 support for freeradius Group: System Environment/Daemons -Requires: %{name} = %{version} BuildRequires: krb5-devel +Requires: %{name} = %{version} %description krb5 This plugin provides the Kerberos 5 support for the FreeRADIUS server project. @@ -171,10 +148,10 @@ %package perl Summary: Perl support for freeradius Group: System Environment/Daemons -Requires: %{name} = %{version} -Requires: perl BuildRequires: perl BuildRequires: perl(ExtUtils::Embed) +Requires: %{name} = %{version} +Requires: perl %description perl This plugin provides the Perl support for the FreeRADIUS server project. @@ -182,8 +159,8 @@ %package python Summary: Python support for freeradius Group: System Environment/Daemons -Requires: %{name} = %{version} BuildRequires: python-devel +Requires: %{name} = %{version} %description python This plugin provides the Python support for the FreeRADIUS server project. @@ -191,8 +168,8 @@ %package mysql Summary: MySQL support for freeradius Group: System Environment/Daemons -Requires: %{name} = %{version} BuildRequires: mysql-devel +Requires: %{name} = %{version} %description mysql This plugin provides the MySQL support for the FreeRADIUS server project. @@ -200,8 +177,8 @@ %package postgresql Summary: Postgresql support for freeradius Group: System Environment/Daemons -Requires: %{name} = %{version} BuildRequires: postgresql-devel +Requires: %{name} = %{version} %description postgresql This plugin provides the postgresql support for the FreeRADIUS server project. @@ -209,21 +186,21 @@ %package sqlite Summary: SQLite support for freeradius Group: System Environment/Daemons -Requires: %{name} = %{version} BuildRequires: sqlite-devel +Requires: %{name} = %{version} %description sqlite This plugin provides the SQLite support for the FreeRADIUS server project. - %prep -%gpg_verify %{S:10} +%gpg_verify %{SOURCE10} %setup -q %patch2 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch12 -p1 +%patch13 -p1 %build modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" @@ -234,7 +211,7 @@ # So we disable it here, if you want to retest, just delete this comment and the line below. export SUSE_ASNEEDED=0 export CFLAGS="%{optflags} -DLDAP_DEPRECATED -fstack-protector" -%ifarch x86_64 ppc ppc64 s390 s390x %arm +%ifarch x86_64 ppc ppc64 s390 s390x %{arm} export CFLAGS="$CFLAGS -fPIC -DPIC" %endif export LDFLAGS="-pie" @@ -276,11 +253,9 @@ touch %{buildroot}%{_localstatedir}/log/radius/radutmp touch %{buildroot}%{_localstatedir}/log/radius/radius.log mkdir -p %{buildroot}%{_tmpfilesdir} -mkdir -p %{buildroot}%{_localstatedir}/run/ -install -d -m 0710 %{buildroot}%{_localstatedir}/run/radiusd/ install -m 0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{unitname}.conf install -D -m 755 %{SOURCE1} %{buildroot}%{_unitdir}/%{unitname}.service -# SuSE +# SUSE install -d %{buildroot}%{_sysconfdir}/pam.d install -d %{buildroot}%{_sysconfdir}/logrotate.d install -m 644 suse/radiusd-pam %{buildroot}%{_sysconfdir}/pam.d/radiusd @@ -293,6 +268,8 @@ # name the rc script according to the systemd unit ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcradiusd %endif +mkdir -p %{buildroot}/run/ +install -d -m 0710 %{buildroot}/run/radiusd/ cp -al %{buildroot}%{_sbindir}/radiusd %{buildroot}%{_sbindir}/radrelay mv -v doc/README doc/README.doc # remove unneeded stuff @@ -361,9 +338,6 @@ %service_del_postun %{unitname}.service %endif -%clean -rm -rf %{buildroot} - %files doc %defattr(-,root,root) %doc doc/* @@ -371,7 +345,6 @@ %files %defattr(-,root,root) # doc -%doc suse/README.SuSE %doc COPYRIGHT CREDITS LICENSE doc/ChangeLog # SUSE %config %{_sysconfdir}/pam.d/radiusd @@ -567,7 +540,7 @@ %config(noreplace) %{_sysconfdir}/raddb/users %attr(640,root,radiusd) %config(noreplace) %{_sysconfdir}/raddb/templates.conf -%attr(700,radiusd,radiusd) %dir %ghost %{_localstatedir}/run/radiusd/ +%attr(700,radiusd,radiusd) %dir %ghost /run/radiusd/ # binaries %defattr(-,root,root) %{_sbindir}/checkrad ++++++ freeradius-server-var_run.patch ++++++ Index: freeradius-server-3.0.3/suse/freeradius-server-tmpfiles.conf =================================================================== --- freeradius-server-3.0.3.orig/suse/freeradius-server-tmpfiles.conf 2014-05-12 21:22:09.000000000 +0200 +++ freeradius-server-3.0.3/suse/freeradius-server-tmpfiles.conf 2014-06-17 15:14:40.946735087 +0200 @@ -1 +1 @@ -D /var/run/radiusd 0710 radiusd radiusd - +D /run/radiusd 0710 radiusd radiusd - Index: freeradius-server-3.0.3/suse/radiusd-logrotate =================================================================== --- freeradius-server-3.0.3.orig/suse/radiusd-logrotate 2014-06-17 14:02:57.377277502 +0200 +++ freeradius-server-3.0.3/suse/radiusd-logrotate 2014-06-17 15:13:43.402836043 +0200 @@ -27,7 +27,7 @@ missingok create postrotate - kill -HUP `cat /var/run/radiusd/radiusd.pid` || : + kill -HUP `cat /run/radiusd/radiusd.pid` || : endscript } Index: freeradius-server-3.0.3/suse/rcradiusd =================================================================== --- freeradius-server-3.0.3.orig/suse/rcradiusd 2014-06-17 14:02:57.365277322 +0200 +++ freeradius-server-3.0.3/suse/rcradiusd 2014-06-17 15:14:16.394352021 +0200 @@ -34,9 +34,9 @@ rc_reset case "$1" in start) echo -n "Starting RADIUS daemon " - # /var/run might be on tmpfs, create runtime directory if needed - if [ ! -d /var/run/radiusd ]; then - install -d -m 0700 -g radiusd -o radiusd /var/run/radiusd + # /run might be on tmpfs, create runtime directory if needed + if [ ! -d /run/radiusd ]; then + install -d -m 0700 -g radiusd -o radiusd /run/radiusd fi startproc $RADIUSD_BIN >/dev/null rc_status -v ++++++ freeradius-tmpfiles.conf ++++++ --- /var/tmp/diff_new_pack.mDAFf9/_old 2014-08-04 15:14:45.000000000 +0200 +++ /var/tmp/diff_new_pack.mDAFf9/_new 2014-08-04 15:14:45.000000000 +0200 @@ -1 +1 @@ -D /var/run/radiusd 0710 radiusd radiusd - +D /run/radiusd 0710 radiusd radiusd - ++++++ radiusd.service ++++++ --- /var/tmp/diff_new_pack.mDAFf9/_old 2014-08-04 15:14:45.000000000 +0200 +++ /var/tmp/diff_new_pack.mDAFf9/_new 2014-08-04 15:14:45.000000000 +0200 @@ -4,8 +4,8 @@ [Service] Type=forking -PIDFile=/var/run/radiusd/radiusd.pid -ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd +PIDFile=/run/radiusd/radiusd.pid +ExecStartPre=-/bin/chown -R radiusd.radiusd /run/radiusd ExecStartPre=/usr/sbin/radiusd -C ExecStart=/usr/sbin/radiusd -d /etc/raddb ExecReload=/usr/sbin/radiusd -C -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org