de-fuzz fuzzy patch in net-tools & shim-unsigned

It is introduced by CentOS 7.6 upgrade.

Story: 2004660
Task: 28705

Change-Id: I6184b8ab9213eb995eb409cfeef6153f4fb4233a
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>

networking/net-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch

@@ -3,8 +3,6 @@ From: Scott Little <scott.little@windriver.com>
 Date: Mon, 2 Oct 2017 16:42:22 -0400
 Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
 
-Conflicts:
-	SPECS/net-tools.spec
 ---
  SPECS/net-tools.spec | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

networking/net-tools/centos/meta_patches/spec-to-include-TiS-patches.patch

@@ -3,8 +3,6 @@ From: Scott Little <scott.little@windriver.com>
 Date: Mon, 2 Oct 2017 16:42:22 -0400
 Subject: [PATCH 1/2] WRS: spec-to-include-TiS-patches.patch
 
-Conflicts:
-	SPECS/net-tools.spec
 ---
  SPECS/net-tools.spec | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -13,9 +11,9 @@ diff --git a/SPECS/net-tools.spec b/SPECS/net-tools.spec
 index 2ee770e..2f09372 100644
 --- a/SPECS/net-tools.spec
 +++ b/SPECS/net-tools.spec
-@@ -65,6 +65,10 @@ Patch23: net-tools-ifconfig-EiB.patch
- # sctp was not documented in help and manpage
- Patch24: net-tools-netstat-sctp-man.patch
+@@ -68,6 +68,10 @@ Patch24: net-tools-netstat-sctp-man.patch
+ # output of interface names was restricted to 8-10 characters max
+ Patch25: net-tools-interface-name-len.patch
  
 +# WindRiver patches
 +Patch100: net-tools-hostname-ipv6-shortname.patch
@@ -24,9 +22,9 @@ index 2ee770e..2f09372 100644
  BuildRequires: gettext, libselinux
  BuildRequires: libselinux-devel
  BuildRequires: systemd-units
-@@ -103,6 +107,9 @@ cp %SOURCE8 ./man/en_US
- %patch23 -p1 -b .round-EiB
+@@ -107,6 +111,9 @@ cp %SOURCE8 ./man/en_US
  %patch24 -p1 -b .sctp-man
+ %patch25 -p1 -b .interface-name-len
  
 +%patch100 -p1 -b .hostname-ipv6
 +%patch101 -p1 -b .ifconfig-no-ifstate-on-flush

security/shim-unsigned/centos/meta_patches/0002-Add-Ti-certificate.patch

@@ -14,7 +14,7 @@ new mode 100755
 index de216b6..83da6cd
 --- a/SPECS/shim.spec
 +++ b/SPECS/shim.spec
-@@ -14,8 +14,10 @@ Source0:        https://github.com/mjg59/shim/releases/download/%{version}/shim-
+@@ -12,8 +12,10 @@ Source0:        https://github.com/mjg59/shim/releases/download/%{version}/shim-
  #Source3:       dbx-aa64.esl
  Source4:        shim-find-debuginfo.sh
  Source5:	centos.esl
@@ -25,7 +25,7 @@ index de216b6..83da6cd
  
  BuildRequires: git openssl-devel openssl
  BuildRequires: pesign >= 0.106-1
-@@ -106,6 +108,7 @@ git commit -a -q -m "%{version} baseline."
+@@ -104,6 +106,7 @@ git commit -a -q -m "%{version} baseline."
  git am --ignore-whitespace %{patches} </dev/null
  git config --unset user.email
  git config --unset user.name
@@ -33,7 +33,7 @@ index de216b6..83da6cd
  
  %ifarch x86_64
  cd ..
-@@ -120,6 +123,7 @@ git commit -a -q -m "%{version} baseline."
+@@ -118,6 +121,7 @@ git commit -a -q -m "%{version} baseline."
  git am --ignore-whitespace %{patches} </dev/null
  git config --unset user.email
  git config --unset user.name