@@ -1,6 +1,6 @@

 Summary:        A fast, reliable HA, load balancing, and proxy solution.

 Name:           haproxy

-Version:        1.6.10

+Version:        1.6.12

 Release:        1%{?dist}

 License:        GPL

 URL:            http://www.haproxy.org

@@ -8,7 +8,7 @@ Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://www.haproxy.org/download/1.6/src/%{name}-%{version}.tar.gz

-%define sha1 haproxy=633a0391314388ebfbbaa4742840f09a27e71afe

+%define sha1 haproxy=7a8b05adbb405d8ca280b25b82f6a6b2da6e2622

 BuildRequires:  openssl-devel

 BuildRequires:  pcre-devel

 BuildRequires:  lua-devel

@@ -58,6 +58,8 @@ install -vDm644 examples/transparent_proxy.cfg  %{buildroot}/%{_sysconfdir}/hapr

 %{_mandir}/*

 %changelog

+*   Tue Apr 04 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.6.12-1

+-   Updated to version 1.6.12

 *   Sun Nov 27 2016 Vinay Kulkarni <kulkarniv@vmware.com> 1.6.10-1

 -   Upgrade to 1.6.10 to address CVE-2016-5360

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.6.3-3

@@ -1,12 +1,12 @@

 Summary:	Scripts to bring up network interfaces and legacy utilities

 Name:		initscripts

-Version:	9.65

+Version:	9.70

 License:	GPLv2

 Group:		System Environment/Base

-Release:	2%{?dist}

-URL:		http://fedorahosted.org/releases/i/n/initscripts/

-Source0:	https://fedorahosted.org/releases/i/n/initscripts/initscripts-9.65.tar.bz2

-%define sha1 initscripts=0a231ab94ce7ef050a7c2c35a5183450abe58a39

+Release:	1%{?dist}

+URL:		https://github.com/fedora-sysv/initscripts

+Source0:	https://github.com/fedora-sysv/initscripts/archive/%{name}-%{version}.tar.gz

+%define sha1 initscripts=6e2ba0946fa2f175f576614d9374ad00266aec66

 Patch0:     service.patch

 Vendor:     	VMware, Inc.

 Distribution:   Photon

@@ -160,6 +160,8 @@ rm -rf %{buildroot}%{_prefix}/lib/systemd

 %{_sysconfdir}/profile.d/debug*

 %changelog

+*   Mon Apr 3 2017 Dheeraj Shetty <dheerajs@vmware.com> 9.70-1

+-   Updated to version 9.70

 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.65-2

 -	GA - Bump release of all rpms

 * Fri Feb 12 2016 Divya Thaluru <dthaluru@vmware.com> 9.65-2

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

-+++ b/service	2016-02-12 18:09:12.617492818 -0800

-@@ -70,7 +70,9 @@

+diff -dupr a/service b/service

+--- a/service	2017-02-27 06:56:05.000000000 -0800

+@@ -70,7 +70,9 @@ while [ $# -gt 0 ]; do

     esac

  done

@@ -11,13 +12,14 @@

     # LSB daemons that dies abnormally in systemd looks alive in systemd's eyes due to RemainAfterExit=yes

     # lets reap them before next start

     if [ "${ACTION}" = "start" ] && \

-@@ -81,9 +83,6 @@

+@@ -81,10 +83,6 @@ if [ -f "${SERVICEDIR}/${SERVICE}" ]; th

     env -i PATH="$PATH" TERM="$TERM" SYSTEMCTL_IGNORE_DEPENDENCIES=${SYSTEMCTL_IGNORE_DEPENDENCIES} SYSTEMCTL_SKIP_REDIRECT=${SYSTEMCTL_SKIP_REDIRECT} "${SERVICEDIR}/${SERVICE}" ${ACTION} ${OPTIONS}

  elif [ -x "${ACTIONDIR}/${SERVICE}/${ACTION}" -a -n "${ACTION}" ]; then

     env -i PATH="$PATH" TERM="$TERM" SYSTEMCTL_IGNORE_DEPENDENCIES=${SYSTEMCTL_IGNORE_DEPENDENCIES} SYSTEMCTL_SKIP_REDIRECT=${SYSTEMCTL_SKIP_REDIRECT} "${ACTIONDIR}/${SERVICE}/${ACTION}" ${OPTIONS}

 -elif `echo $ACTION | egrep -qw "start|stop|restart|try-restart|reload|force-reload|status|condrestart"` ; then

--   echo $"Redirecting to /bin/systemctl ${ACTION} ${OPTIONS} ${SERVICE}.service" >&2

--   exec /bin/systemctl ${ACTION} ${OPTIONS} ${SERVICE}.service

+-   SERVICE_MANGLED=$(/usr/bin/systemd-escape --mangle ${SERVICE})

+-   echo $"Redirecting to /bin/systemctl ${ACTION}${OPTIONS:+ }${OPTIONS} ${SERVICE_MANGLED}" >&2

+-   exec /bin/systemctl ${ACTION} ${OPTIONS} ${SERVICE_MANGLED}

  else

     echo $"The service command supports only basic LSB actions (start, stop, restart, try-restart, reload, force-reload, status). For other actions, please try to use systemctl." >&2

     exit 2