Accepting request 516898 from network:cluster

- Enable tcpwrappers on all platforms by default.
- Fix systemd-specific conditionals in spec file.
- Remove Provides: group/user(): these are only
  used by conman, there is no intention to provide
  them to other packages.

- conman service configured to start as conman:conman user

- conman-suse-fix-expect-scripts.patch:
  Fixed ssh expect script for SUSE-specific output.

OBS-URL: https://build.opensuse.org/request/show/516898
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/conman?expand=0&rev=3

conman-suse-fix-expect-scripts.patch

@@ -0,0 +1,22 @@
+Index: conman-0.2.7/lib/exec/ssh.exp
+===================================================================
+--- conman-0.2.7.orig/lib/exec/ssh.exp
++++ conman-0.2.7/lib/exec/ssh.exp
+@@ -168,7 +168,7 @@ expect {
+     }
+     exp_continue -continue_timer
+   }
+-  -re "^$user@.* password: \$" {
++  -re "^.assword: \$" {
+     if {$authenticated == 0} {
+       send "$pswd\r"
+       incr authenticated
+@@ -178,7 +178,7 @@ expect {
+       exit 1
+     }
+   }
+-  -re "(:|#|%|\\\$) \$" {
++  -re "(:|#|%|>|\\\$) \$" {
+     ;
+   }
+   -re "\[^\r]*\r+\n" {

conman.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Aug 14 13:42:48 UTC 2017 - eich@suse.com
+
+- Enable tcpwrappers on all platforms by default.
+- Fix systemd-specific conditionals in spec file.
+- Remove Provides: group/user(): these are only
+  used by conman, there is no intention to provide
+  them to other packages.
+
+-------------------------------------------------------------------
+Sat Jun  3 01:50:39 UTC 2017 - jjolly@suse.com
+
+- conman service configured to start as conman:conman user
+
+-------------------------------------------------------------------
+Fri Jun  2 23:01:00 UTC 2017 - jjolly@suse.com
+
+- conman-suse-fix-expect-scripts.patch:
+  Fixed ssh expect script for SUSE-specific output.
+
 -------------------------------------------------------------------
 Mon May  8 10:51:34 UTC 2017 - eich@suse.com
 

conman.service

@@ -4,6 +4,8 @@ After=network.target
 
 [Service]
 Type=forking
+User=conman
+Group=conman
 ExecStart=/usr/sbin/conmand -c /etc/conman.conf
 
 [Install]

conman.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package conman
 #
-# Copyright (c) 2016 SUSE LINUX Products 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
@@ -13,6 +13,9 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
 #
 %if 0%{?suse_version} > 1140
 %define have_systemd 1
@@ -21,14 +24,22 @@
  %endif
 %endif
 
+%if 0%{?have_systemd}
+ %define conman_g %name
+ %define conman_u %name
+%else
+ %define conman_g root
+ %define conman_u daemon
+%endif
+
 Name:           conman
 Version:        0.2.7
 Release:        0
 
 Summary:        The Console Manager
-Group:          System/Console
 License:        GPL-3.0+
-URL:            http://dun.github.io/conman/
+Group:          System/Console
+Url:            http://dun.github.io/conman/
 
 Requires:       expect
 Requires:       logrotate
@@ -38,10 +49,16 @@ BuildRequires:  tcpd-devel
 BuildRequires:  freeipmi-devel
 %endif
 Source0:        https://github.com/dun/conman/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
-%if 0%{?have_systemd}
 Source1:        %{name}.service
+%if 0%{?have_systemd}
+BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
+%{?systemd_requires}
+Requires(pre):  shadow
 %endif
 
+Patch1:         conman-suse-fix-expect-scripts.patch
+
 # 8/15/14 karl.w.schulz@intel.com - include prereq
 %if 0%{?sles_version} || 0%{?suse_version}
 PreReq:         %{fillup_prereq}
@@ -64,6 +81,7 @@ Its features include:
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1
 
 %build
 %configure --with-tcp-wrappers \
@@ -108,7 +126,7 @@ SERVER logfile="/var/log/conman.log"
 SERVER loopback=ON
 SERVER pidfile="/var/run/conman.pid"
 SERVER resetcmd="powerman -0 %N; sleep 3; powerman -1 %N"
-SERVER tcpwrappers=%{?is_opensuse:OFF}%{!?is_opensuse:ON}
+SERVER tcpwrappers=ON
 SERVER timestamp=1h
 GLOBAL seropts="115200,8n1"
 GLOBAL log="console.%N"
@@ -116,9 +134,14 @@ GLOBAL logopts="sanitize,timestamp"
 EOF
 fi
 
-%pre
 %if 0%{?have_systemd}
+%pre
 %service_add_pre conman.service
+%define conman_home "%_localstatedir%_rundir/conman"
+%define conman_descr "Connection Manager service"
+getent group %conman_g >/dev/null || groupadd -r %conman_g
+getent passwd %conman_u >/dev/null || useradd -r -g %conman_g -d %conman_home -s /bin/false -c %conman_descr %conman_u
+exit 0
 %endif
 
 %preun
@@ -151,7 +174,7 @@ fi
 %doc NEWS
 %doc README
 %doc THANKS
-%config(noreplace) %{_sysconfdir}/conman.conf
+%config(noreplace) %attr(-,%conman_u,%conman_g) %{_sysconfdir}/conman.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/conman
 %{_localstatedir}/adm/fillup-templates/sysconfig.conman
 %{_bindir}/*
@@ -163,3 +186,5 @@ fi
 %{_sysconfdir}/init.d/*
 %endif
 %{_mandir}/*/*
+
+%changelog