From 849b165adf1413d4222c69436a9c0707e7b55ec1a07766dbf35c38f0ccbe75fa Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Sun, 1 Jan 2017 15:34:14 +0000 Subject: [PATCH] Accepting request 448405 from home:jengelh:branches:network - Remove --with-pic which is for static libs only. - Use SUSE RPM group names. Trim filler words from description. - Do not hide errors from groupadd/useradd. OBS-URL: https://build.opensuse.org/request/show/448405 OBS-URL: https://build.opensuse.org/package/show/network/freeradius-server?expand=0&rev=87 --- freeradius-server.changes | 7 +++++++ freeradius-server.spec | 41 +++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/freeradius-server.changes b/freeradius-server.changes index d10eb21..d9f3926 100644 --- a/freeradius-server.changes +++ b/freeradius-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jan 1 13:39:57 UTC 2017 - jengelh@inai.de + +- Remove --with-pic which is for static libs only. +- Use SUSE RPM group names. Trim filler words from description. +- Do not hide errors from groupadd/useradd. + ------------------------------------------------------------------- Thu Sep 29 20:14:34 UTC 2016 - michael@stroeder.com diff --git a/freeradius-server.spec b/freeradius-server.spec index 596cd1e..c7bf57e 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -1,7 +1,7 @@ # # spec file for package freeradius-server # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -122,14 +122,14 @@ 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. +FreeRADIUS is a modular RADIUS implementation. %package libs Summary: FreeRADIUS shared library -Group: Productivity/Networking/Radius/Servers +Group: System/Libraries %description libs -The FreeRADIUS shared libraries +The FreeRADIUS shared libraries. %package utils Summary: FreeRADIUS Clients @@ -137,7 +137,7 @@ Group: Productivity/Networking/Radius/Clients Requires: %{name}-libs = %{version} %description utils -Collection of FreeRADIUS utilities +Collection of FreeRADIUS utilities. %package devel Summary: FreeRADIUS Development Files @@ -145,19 +145,18 @@ Group: Development/Libraries/C and C++ Requires: %{name}-libs = %{version} %description devel -FreeRADIUS development header files +FreeRADIUS header files for development. %package doc Summary: FreeRADIUS Documentation -Group: Productivity/Networking/Radius/Servers -Requires: %{name} +Group: Documentation/HTML %description doc -FreeRADIUS documentation +FreeRADIUS documentation. %package ldap Summary: LDAP support for freeradius -Group: System Environment/Daemons +Group: System/Daemons BuildRequires: openldap2-devel Requires: %{name} = %{version} @@ -166,7 +165,7 @@ FreeRADIUS plugin providing LDAP support. %package krb5 Summary: Kerberos 5 support for freeradius -Group: System Environment/Daemons +Group: System/Daemons BuildRequires: krb5-devel Requires: %{name} = %{version} @@ -175,7 +174,7 @@ FreeRADIUS plugin providing Kerberos 5 authentication support. %package perl Summary: Perl support for freeradius -Group: System Environment/Daemons +Group: System/Daemons BuildRequires: perl BuildRequires: perl(ExtUtils::Embed) Requires: %{name} = %{version} @@ -186,7 +185,7 @@ FreeRADIUS plugin providing Perl support. %package python Summary: Python support for freeradius -Group: System Environment/Daemons +Group: System/Daemons BuildRequires: python-devel Requires: %{name} = %{version} @@ -195,7 +194,7 @@ FreeRADIUS plugin providing Python support. %package mysql Summary: MySQL support for freeradius -Group: System Environment/Daemons +Group: System/Daemons BuildRequires: mysql-devel Requires: %{name} = %{version} @@ -204,7 +203,7 @@ FreeRADIUS plugin providing MySQL support. %package postgresql Summary: Postgresql support for freeradius -Group: System Environment/Daemons +Group: System/Daemons BuildRequires: postgresql-devel Requires: %{name} = %{version} @@ -213,7 +212,7 @@ FreeRADIUS plugin providing PostgreSQL support. %package sqlite Summary: SQLite support for freeradius -Group: System Environment/Daemons +Group: System/Daemons BuildRequires: sqlite3-devel Requires: %{name} = %{version} @@ -237,7 +236,6 @@ export CFLAGS="%{optflags} -DLDAP_DEPRECATED -fstack-protector -fPIC -DPIC" export LDFLAGS="-pie" %configure \ --disable-static \ - --with-pic \ --libdir=%{_libdir}/freeradius \ --disable-ltdl-install \ --enable-strict-dependencies \ @@ -327,13 +325,14 @@ rm %{buildroot}%{_sysconfdir}/raddb/mods-available/rest %endif %pre -%{_sbindir}/groupadd -r radiusd 2> /dev/null || : -%{_sbindir}/useradd -r -g radiusd -s /bin/false -c "Radius daemon" -d \ - %{_localstatedir}/lib/radiusd radiusd 2> /dev/null || : +getent group radiusd >/dev/null || %{_sbindir}/groupadd -r radiusd +getent passwd radiusd >/dev/null || %{_sbindir}/useradd -r -g radiusd \ + -s /bin/false -c "Radius daemon" -d %{_localstatedir}/lib/radiusd \ + radiusd # boo#912714: add radiusd to winbind group for ntlm_auth # add winbind group and fail silently if it already exists -%{_bindir}/getent group winbind \ +%{_bindir}/getent group winbind >/dev/null \ || %{_sbindir}/groupadd -r winbind # add radiusd to winbind group %if 0%{?suse_version} > 0 && 0%{?suse_version} < 1140