@@ -1,7 +1,7 @@

 Summary:	'Free version of the SSH connectivity tools

 Name:		openssh

 Version:	6.6p1

-Release:	5%{?dist}

+Release:	6%{?dist}

 License:	BSD

 URL:		http://openssh.org

 Group:		System Environment/Security

@@ -18,9 +18,9 @@ BuildRequires:  krb5

 BuildRequires:  e2fsprogs-devel

 BuildRequires:  systemd

 Requires:       systemd

-Requires:		openssl

-Requires:		Linux-PAM

-Requires: 		shadow

+Requires:	openssl

+Requires:	Linux-PAM

+Requires: 	shadow

 %description

 The OpenSSH package contains ssh clients and the sshd daemon. This is

 useful for encrypting authentication and subsequent traffic over a 

@@ -91,29 +91,22 @@ EOF

 %check

 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

+%pre

+getent group sshd >/dev/null || groupadd -g 50 sshd

+getent passwd sshd >/dev/null || useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd -s /bin/false -u 50 sshd

 %preun

 /bin/systemctl disable sshd-keygen.service

 /bin/systemctl disable sshd.service

 %post

 /sbin/ldconfig

 chown -v root:sys /var/lib/sshd

-if ! getent group sshd >/dev/null; then

-	groupadd -g 50 sshd

-fi

-if ! getent passwd sshd >/dev/null; then

-	useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd -s /bin/false -u 50 sshd

-fi

 /bin/systemctl enable sshd-keygen.service

 /bin/systemctl enable sshd.service

 %postun

 /sbin/ldconfig

-if getent passwd sshd >/dev/null; then

-	userdel sshd

-fi

-if getent group sshd >/dev/null; then

-	groupdel sshd

-fi

+%systemd_postun_with_restart sshd.service sshd-keygen.service

+

 %clean

 rm -rf %{buildroot}/*

 %files

@@ -134,11 +127,13 @@ rm -rf %{buildroot}/*

 %{_mandir}/man8/*

 %attr(700,root,sys)/var/lib/sshd

 %changelog

-*   Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com>  6.6p1-5

--   Change config file attributes.

-*   Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com> 6.6p1-4

--   Add systemd to Requires and BuildRequires.

--   Use systemctl to enable/disable service.

+*	Fri Feb 05 2016 Anish Swaminathan <anishs@vmware.com> 6.6p1-6

+-	Add pre install scripts in the rpm

+*   	Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com>  6.6p1-5

+-   	Change config file attributes.

+*   	Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com> 6.6p1-4

+-   	Add systemd to Requires and BuildRequires.

+-   	Use systemctl to enable/disable service.

 *	Fri Jul 17 2015 Divya Thaluru <dthaluru@vmware.com> 6.6p1-3

 -	Enabling ssh-keygen service by default and fixed service file to execute only once.

 *	Tue May 19 2015 Sharath George <sharathg@vmware.com> 6.6p1-2

@@ -1,7 +1,7 @@

 Summary:	RPC program number mapper

 Name:		rpcbind

 Version:	0.2.3

-Release:	3%{?dist}

+Release:	4%{?dist}

 License:	BSD

 URL:		http://nfsv4.bullopensource.org

 Group:	    Applications/Daemons

@@ -51,36 +51,39 @@ install -m644 %{SOURCE3} %{buildroot}/etc/sysconfig/rpcbind

 %check

 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

+%pre

+rpcid=`getent passwd rpc | cut -d: -f 3`

+if [ -n "$rpcid" -a "$rpcid" != "31" ]; then

+	userdel  rpc 2> /dev/null || :

+	groupdel rpc 2> /dev/null || : 

+fi

+if [ -z "$rpcid" -o "$rpcid" != "31" ]; then

+	groupadd -g 31 rpc > /dev/null 2>&1

+	useradd -d /var/lib/rpcbind -g rpc -s /bin/false -u 31 rpc > /dev/null 2>&1

+fi

 %preun

 %systemd_preun rpcbind.service rpcbind.socket

+if [ $1 -eq 0 ]; then

+	userdel  rpc 2>/dev/null || :

+	groupdel rpc 2>/dev/null || :

+fi

 %post

 /sbin/ldconfig

 chown -v root:sys /var/lib/rpcbind

-if ! getent group rpc >/dev/null; then

-	groupadd -g 31 rpc

-fi

-if ! getent passwd rpc >/dev/null; then

-	useradd -d /var/lib/rpcbind -g rpc -s /bin/false -u 31 rpc

-fi

 systemctl enable rpcbind.socket >/dev/null 2>&1

 systemctl enable rpcbind.service >/dev/null 2>&1

-

 %postun

 /sbin/ldconfig

 %systemd_postun_with_restart rpcbind.service rpcbind.socket

-if getent passwd rpc >/dev/null; then

-	userdel rpc

-fi

-if getent group rpc >/dev/null; then

-	groupdel rpc

-fi

 %clean

 rm -rf %{buildroot}/*

 %changelog

-*	Mon Feb 03 2016 Anish Swaminathan <anishs@vmware.com> 0.2.3-3

+*	Fri Feb 05 2016 Anish Swaminathan <anishs@vmware.com> 0.2.3-4

+-	Add pre install scripts in the rpm

+*	Wed Feb 03 2016 Anish Swaminathan <anishs@vmware.com> 0.2.3-3

 -	Edit scripts in the rpm

 *   	Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com>  0.2.3-2

 -   	Add systemd to Requires and BuildRequires.