de-fuzz haproxy patches

Problem:
- Centos 7.5 upgraded haproxys.
- Porting of haproxys patches did not resolve and 'fuzz' in the line
  numbers of the patches.
- If haproxy is built by rpm 4.11, or default version of rpm
  until 4.14 is compiled, a fuzzy patch results in the creating
  of an .orig file.
- Packaging of haproxys failes due to the unexpected, and
  unpackaged .orig file

Solution:
  Safest solution is to de-fuzz our haproxys patches.

Story: 2003389
Task: 26755

Change-Id: Ice3ebac4e6b7997e87dfeda72353f2bd8ca39447
Signed-off-by: Sun Austin <austin.sun@intel.com>
This commit is contained in:
Sun Austin 2018-09-27 19:26:43 +08:00
parent c22442cf09
commit f4b64998e0
1 changed files with 6 additions and 6 deletions

View File

@ -1,14 +1,14 @@
From 419d06285552bc31dce214d37edb925b4a82c68b Mon Sep 17 00:00:00 2001
From 0b326ac9fcee3fbac7e41e3bc269cc7251dcf9dd Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:12:36 -0400
Subject: [PATCH 1/7] WRS: spec-include-TiS-config.patch
Subject: WRS: spec-include-TiS-config.patch
---
SPECS/haproxy.spec | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec
index b4dde9e..42ddeb0 100644
index 30dca25..988e7cf 100644
--- a/SPECS/haproxy.spec
+++ b/SPECS/haproxy.spec
@@ -22,6 +22,9 @@ Source3: %{name}.logrotate
@ -51,8 +51,8 @@ index b4dde9e..42ddeb0 100644
+/etc/haproxy/errors/*
+
%changelog
* Mon May 01 2017 Ryan O'Hara <rohara@redhat.com> - 1.5.18-6
- Use KillMode=mixed in systemd service file (#1444709)
* Thu Nov 30 2017 Ryan O'Hara <rohara@redhat.com> - 1.5.18-7
- Rebuild with openssl-1.0.2k (#1509139)
--
1.9.1
2.7.4