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

 Summary:	Rocket-fast system for log processing

 Name:		rsyslog

 Version:	8.15.0

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	GPLv3+ and ASL 2.0

 URL:		http://www.rsyslog.com/

 Source0:	http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz

@@ -54,11 +54,14 @@ find %{buildroot} -name '*.la' -delete

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

 %post

 /sbin/ldconfig

-/bin/systemctl enable  rsyslog.service

+%systemd_post rsyslog.service

+

+%preun

+%systemd_preun rsyslog.service

 %postun

 /sbin/ldconfig

-/bin/systemctl disable rsyslog.service

+

 %files

 %defattr(-,root,root)

@@ -69,6 +72,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %{_libdir}/systemd/system/rsyslog.service

 %{_sysconfdir}/systemd/journald.conf.d/*

 %changelog

+*   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com>  8.15.0-3

+-   	Use systemd macros for post, preun and postun to respect upgrades

 *   	Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com>  8.15.0-2

 -   	Add journald conf and new service file.

 *   	Mon Jan 11  2016 Xiaolin Li <xiaolinl@vmware.com> 8.15.0-1

@@ -1,17 +1,19 @@

 Summary:        Commonly used Mail transport agent (MTA)

 Name:           sendmail

 Version:        8.15.2

-Release:        2%{?dist}

+Release:        3%{?dist}

 URL:            http://www.sendmail.org/

 License:        GPLv2+ and GPLv3+ and LGPLv2+

 Group:          Email/Server/Library

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://ftp.vim.org/pub/mail/sendmail/sendmail-r8/sendmail.8.15.2.tar.gz

+BuildRequires:	systemd

 BuildRequires:  openldap

 BuildRequires:  openssl-devel

 BuildRequires:  db-devel

 BuildRequires:  shadow

+Requires:       systemd

 %define sha1 sendmail=5801d4b06f4e38ef228a5954a44d17636eaa5a16

@@ -121,32 +123,35 @@ install -v -m700 -d /var/spool/mqueue

 %post

+if [ $1 -eq 1 ] ; then

+  echo $(hostname) > /etc/mail/local-host-names

+  cat > /etc/mail/aliases << "EOF"

+  postmaster: root

+  MAILER-DAEMON: root

-echo $(hostname) > /etc/mail/local-host-names

-cat > /etc/mail/aliases << "EOF"

-postmaster: root

-MAILER-DAEMON: root

+  EOF

+  /bin/newaliases

-EOF

-/bin/newaliases

-

-cd /etc/mail

-m4 m4/cf.m4 sendmail.mc > sendmail.cf

+  cd /etc/mail

+  m4 m4/cf.m4 sendmail.mc > sendmail.cf

-chmod 700 /var/spool/clientmqueue

-chown smmsp:smmsp /var/spool/clientmqueue

+  chmod 700 /var/spool/clientmqueue

+  chown smmsp:smmsp /var/spool/clientmqueue

+fi

-/bin/systemctl enable sendmail

+%systemd_post sendmail.service

 %preun

-/bin/systemctl disable sendmail

+%systemd_preun sendmail.service

 %postun

-userdel smmsp

-groupdel smmsp

+if [ $1 -eq 0 ] ; then

+  userdel smmsp

+  groupdel smmsp

-rm -rf /etc/mail

+  rm -rf /etc/mail

+fi

 %files

 %{_sysconfdir}/*

@@ -161,6 +166,8 @@ rm -rf /etc/mail

 %changelog

+*   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.2-3

+-   	Fix for upgrade issues

 *       Wed Feb 17 2016 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-2

 -       Changing permission and owner of clientmqueue.

 *       Tue Jan 05 2016 Kumar Kaushik <kaushikk@vmware.com> 8.15.2-1

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

 Summary:	Sudo

 Name:		sudo

 Version:	1.8.15

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	ISC

 URL:		https://www.kernel.org/pub/linux/libs/pam/

 Group:		System Environment/Security

@@ -59,7 +59,9 @@ EOF

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

 %post

 /sbin/ldconfig

-groupadd wheel

+if [ $1 -eq 1 ] ; then

+  groupadd wheel

+fi

 %postun	-p /sbin/ldconfig

 %clean

 rm -rf %{buildroot}/*

@@ -78,6 +80,8 @@ rm -rf %{buildroot}/*

 %{_docdir}/%{name}-%{version}/*

 %{_datarootdir}/locale/*

 %changelog

+*   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.15-2

+-   	Fix for upgrade issues

 *	Wed Jan 20 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.15-1

 -	Update to 1.8.15-1.

 *	Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 1.8.11p1-5

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

 Summary:	Next generation system logger facilty

 Name:		syslog-ng

 Version:	3.6.4

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	GPL + LGPL

 URL:		https://www.balabit.com/network-security/syslog-ng/opensource-logging-system

 Group:		System Environment/Daemons

@@ -13,10 +13,12 @@ Source1:        60-syslog-ng-journald.conf

 Requires:	glib

 Requires:   	eventlog

 Requires:	python2

+Requires:	systemd

 BuildRequires:	eventlog

 BuildRequires:	glib-devel

 BuildRequires:	python2-libs

 BuildRequires:	python2-devel

+BuildRequires:	systemd

 %description

  The syslog-ng application is a flexible and highly scalable

@@ -73,11 +75,13 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/

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

 %post

-mkdir -p /usr/var/

-/bin/systemctl enable syslog-ng

+if [ $1 -eq 1 ] ; then

+  mkdir -p /usr/var/

+fi

+%systemd_post syslog-ng.service

 %preun

-/bin/systemctl disable syslog-ng

+%systemd_preun syslog-ng.service

 %clean

 rm -rf %{buildroot}/*

@@ -113,6 +117,8 @@ rm -rf %{buildroot}/*

 /usr/lib/pkgconfig/syslog-ng.pc

 %changelog

+*   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com>  3.6.4-3

+-   	Fix for upgrade issues

 *   	Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com>  3.6.4-2

 -   	Add journald conf file.

 *   	Wed Jan 20 2016 Anish Swaminathan <anishs@vmware.com> 3.6.4-1

@@ -8,7 +8,7 @@

 Name:          systemtap

 Version:       2.9

-Release:       1%{?dist}

+Release:       2%{?dist}

 Summary:       Programmable system-wide instrumentation system

 Group:         Development/System

 Vendor:	       VMware, Inc.

@@ -188,20 +188,22 @@ test -e ~stap-server && chmod 755 ~stap-server

 exit 0

 %post server

-test -e %{_localstatedir}/log/stap-server/log || {

-touch %{_localstatedir}/log/stap-server/log

-chmod 664 %{_localstatedir}/log/stap-server/log

-chown stap-server:stap-server %{_localstatedir}/log/stap-server/log

-}

-

-if test ! -e ~stap-server/.systemtap/ssl/server/stap.cert; then

+if [ $1 -eq 1 ] ; then

+  test -e %{_localstatedir}/log/stap-server/log || {

+  touch %{_localstatedir}/log/stap-server/log

+  chmod 664 %{_localstatedir}/log/stap-server/log

+  chown stap-server:stap-server %{_localstatedir}/log/stap-server/log

+  }

+

+  if test ! -e ~stap-server/.systemtap/ssl/server/stap.cert; then

 	runuser -s /bin/sh - stap-server -c %{_libexecdir}/%{name}/stap-gen-cert >/dev/null

 	%{_bindir}/stap-authorize-server-cert ~stap-server/.systemtap/ssl/server/stap.cert

 	%{_bindir}/stap-authorize-signing-cert ~stap-server/.systemtap/ssl/server/stap.cert

+  fi

+  /sbin/chkconfig --add stap-server

+  exit 0

 fi

-/sbin/chkconfig --add stap-server

-exit 0

 %preun server

 if [ $1 = 0 ] ; then

@@ -217,8 +219,10 @@ fi

 exit 0

 %post initscript

-/sbin/chkconfig --add systemtap

-exit 0

+if [ $1 -eq 1 ] ; then

+	/sbin/chkconfig --add systemtap

+	exit 0

+fi

 %preun initscript

 if [ $1 = 0 ] ; then

@@ -234,12 +238,16 @@ fi

 exit 0

 %post

-(make -C %{_datadir}/systemtap/runtime/linux/uprobes clean) >/dev/null 3>&1 || true

-(/sbin/rmmod uprobes) >/dev/null 2>&1 || true

+if [ $1 -eq 1 ] ; then

+	(make -C %{_datadir}/systemtap/runtime/linux/uprobes clean) >/dev/null 3>&1 || true

+	(/sbin/rmmod uprobes) >/dev/null 2>&1 || true

+fi

 %preun

-(make -C %{_datadir}/systemtap/runtime/linux/uprobes clean) >/dev/null 3>&1 || true

-(/sbin/rmmod uprobes) >/dev/null 2>&1 || true

+if [ $1 -eq 0 ] ; then

+	(make -C %{_datadir}/systemtap/runtime/linux/uprobes clean) >/dev/null 3>&1 || true

+	(/sbin/rmmod uprobes) >/dev/null 2>&1 || true

+fi

 %files -f %{name}.lang

 %defattr(-,root,root)

@@ -318,6 +326,8 @@ exit 0

 %{_mandir}/man8/stap-server.8*

 %changelog

+*   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.9-2

+-   	Fix for upgrade issues

 * 	Wed Dec 16 2015 Harish Udaiya Kumar <hudaiyakumar> 2.9-1 

 -	Updated version to 2.9

 *	Fri Dec 11 2015 Xiaolin Li <xiaolinl@vmware.com> 2.7-2

@@ -2,7 +2,7 @@

 Summary:	An enhanced version of csh, the C shell

 Name:		tcsh

 Version:	6.19.00

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	BSD

 Group:		System Environment/Shells

 Source:		http://www.sfr-fresh.com/unix/misc/%{name}-%{version}.tar.gz

@@ -71,21 +71,25 @@ make check

 rm -rf %{buildroot}

 %post

-if [ ! -f /etc/shells ]; then

- echo "%{_bindir}/tcsh" >> /etc/shells

- echo "%{_bindir}/csh"	>> /etc/shells

-else

- grep -q '^%{_bindir}/tcsh$' /etc/shells || \

- echo "%{_bindir}/tcsh" >> /etc/shells

- grep -q '^%{_bindir}/csh$'  /etc/shells || \

- echo "%{_bindir}/csh"	>> /etc/shells

+if [ $1 -eq 1 ] ; then

+  if [ ! -f /etc/shells ]; then

+   echo "%{_bindir}/tcsh" >> /etc/shells

+   echo "%{_bindir}/csh"	>> /etc/shells

+  else

+   grep -q '^%{_bindir}/tcsh$' /etc/shells || \

+   echo "%{_bindir}/tcsh" >> /etc/shells

+   grep -q '^%{_bindir}/csh$'  /etc/shells || \

+   echo "%{_bindir}/csh"	>> /etc/shells

+  fi

 fi

 %postun

-if [ ! -x %{_bindir}/tcsh ]; then

- grep -v '^%{_bindir}/tcsh$'  /etc/shells | \

- grep -v '^%{_bindir}/csh$' > /etc/shells.rpm && \

- mv /etc/shells.rpm /etc/shells

+if [ $1 -eq 0 ] ; then

+  if [ ! -x %{_bindir}/tcsh ]; then

+   grep -v '^%{_bindir}/tcsh$'  /etc/shells | \

+   grep -v '^%{_bindir}/csh$' > /etc/shells.rpm && \

+   mv /etc/shells.rpm /etc/shells

+  fi

 fi

 %files -f tcsh.lang

@@ -95,6 +99,8 @@ fi

 %{_mandir}/man1/*.1*

 %changelog

+*   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.19.00-2

+-   	Fix for upgrade issues

 *	Thu Jan 21 2016 Anish Swaminathan <anishs@vmware.com> 6.19.00-1

 -	Upgrade version

 *	Wed Apr 1 2015 Divya Thaluru <dthaluru@vmware.com> 6.18.01-1

@@ -4,7 +4,7 @@

 Summary:	dnf/yum equivalent using C libs

 Name:		tdnf

 Version:	1.0.8

-Release:	2%{?dist}

+Release:	3%{?dist}

 Vendor:		VMware, Inc.

 Distribution:	Photon

 License:	VMware

@@ -44,6 +44,9 @@ make %{?_smp_mflags}

 %install

 make DESTDIR=%{buildroot} install

 mkdir -p %{buildroot}/var/cache/tdnf

+ln -sf %{_bindir}/tdnf %{buildroot}%{_bindir}/tyum

+mkdir -p %{buildroot}%{_includedir}/tdnf

+mv %{buildroot}%{_includedir}/*.h %{buildroot}%{_includedir}/tdnf

 # Pre-install

 %pre

@@ -58,7 +61,6 @@ mkdir -p %{buildroot}/var/cache/tdnf

     # First argument is 2 => Upgrade

     /sbin/ldconfig

-    ln -sf %{_bindir}/tdnf %{_bindir}/tyum

 # Pre-uninstall

 %preun

@@ -70,7 +72,6 @@ mkdir -p %{buildroot}/var/cache/tdnf

 %postun

     /sbin/ldconfig

-    rm -f %{_bindir}/tyum

     # First argument is 0 => Uninstall

     # First argument is 1 => Upgrade

@@ -78,18 +79,21 @@ mkdir -p %{buildroot}/var/cache/tdnf

 %files

     %defattr(-,root,root,0755)

     %{_bindir}/tdnf

+    %{_bindir}/tyum

     %{_libdir}/*.so*

     %config(noreplace) %{_sysconfdir}/tdnf/tdnf.conf

     %dir /var/cache/tdnf

 %files devel

     %defattr(-,root,root)

-    %{_includedir}/*

+    %{_includedir}/tdnf/*.h

     %{_libdir}/*.a

     %{_libdir}/*.la

     %exclude %{_libdir}/debug

 %changelog

+*       Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.8-3

+-       Fix link installs, fix devel header dir

 *       Fri Apr 1 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.8-2

 -       Update version which was missed with 1.0.8-1, apply string limits

 *       Fri Apr 1 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.8-1

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

 Summary:	The client for the Trivial File Transfer Protocol (TFTP)

 Name:		tftp

 Version:	5.2

-Release:	3%{?dist}

+Release:	4%{?dist}

 License:	BSD

 URL:		http://www.kernel.org

 Group:		Applications/Internet

@@ -72,9 +72,10 @@ ListenDatagram=69

 WantedBy=sockets.target

 EOF

 %preun

-/bin/systemctl disable tftpd.socket

+%systemd_preun tftpd.socket

+

 %post

-/bin/systemctl enable tftpd.socket

+%systemd_preun tftpd.socket

 %clean

 rm -rf %{buildroot}

@@ -94,6 +95,8 @@ rm -rf %{buildroot}

 /lib/systemd/system/tftpd.socket

 %changelog

+*   Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.2-4

+-   Fix for upgrade issues

 *   Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com>  5.2-3

 -   Add systemd to Requires and BuildRequires

 -   Use systemctl to enable/disable service.

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

 Summary:	Very secure and very small FTP daemon.

 Name:		vsftpd

 Version:	3.0.2

-Release:	1

+Release:	2%{?dist}

 License:	GPLv2 with exceptions

 URL:		https://security.appspot.com/vsftpd.html

 Group:		System Environment/Daemons

@@ -41,30 +41,34 @@ pasv_max_port=40100

 EOF

 %post

-install -v -d -m 0755 %{_datadir}/vsftpd/empty

-install -v -d -m 0755 /home/ftp

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

-    groupadd -g 47 vsftpd

-fi

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

-    groupadd -g 45 ftp

-fi

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

-    useradd -c "vsftpd User"  -d /dev/null -g vsftpd -s /bin/false -u 47 vsftpd

-fi

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

-    useradd -c anonymous_user -d /home/ftp -g ftp    -s /bin/false -u 45 ftp

+if [ $1 -eq 1 ] ; then

+  install -v -d -m 0755 %{_datadir}/vsftpd/empty

+  install -v -d -m 0755 /home/ftp

+  if ! getent group vsftpd >/dev/null; then

+      groupadd -g 47 vsftpd

+  fi

+  if ! getent group ftp >/dev/null; then

+      groupadd -g 45 ftp

+  fi

+  if ! getent passwd vsftpd >/dev/null; then

+      useradd -c "vsftpd User"  -d /dev/null -g vsftpd -s /bin/false -u 47 vsftpd

+  fi

+  if ! getent passwd ftp >/dev/null; then

+      useradd -c anonymous_user -d /home/ftp -g ftp    -s /bin/false -u 45 ftp

+  fi

 fi

 %postun

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

-    userdel vsftpd

-fi

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

-    userdel ftp

-fi

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

-    groupdel vsftpd

+if [ $1 -eq 0 ] ; then

+  if getent passwd vsftpd >/dev/null; then

+      userdel vsftpd

+  fi

+  if getent passwd ftp >/dev/null; then

+      userdel ftp

+  fi

+  if getent group vsftpd >/dev/null; then

+      groupdel vsftpd

+  fi

 fi

 %files

@@ -74,5 +78,7 @@ fi

 %{_datadir}/*

 %exclude %{_libdir}/debug

 %changelog

+*   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.0.2-2

+-   	Fix for upgrade issues

 *	Mon Jul 6 2015 Alexey Makhalov <amakhalov@vmware.com> 3.0.2-1

 -	initial version

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

 Summary:  	xinetd -- A better inetd.

 Name:		xinetd

 Version:	2.3.15

-Release:	3%{?dist}

+Release:	4%{?dist}

 License:	BSD

 Group:		System Environment/Daemons

 Vendor:     	VMware, Inc.

@@ -54,7 +54,7 @@ if [ $1 -eq 1 ] ; then

 fi

 %preun

-/bin/systemctl disable xinetd.service

+%systemd_preun xinetd.service

 %files

 %defattr(-, root, root)

@@ -66,6 +66,8 @@ fi

 /lib/systemd/system/xinetd.service

 %changelog

+*   Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.3.15-4

+-   Fix upgrade issues

 *   Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com>  2.3.15-3

 -   Add systemd to Requires and BuildRequires.

 *   Thu Dec 03 2015 Xiaolin Li  <xiaolinl@vmware.com> 2.3.15-2