stddef.patch applied upstream (order is irrelevant)

diff --git a/openssl.spec b/openssl.spec
index a05f8d882fa4221ea9804e275ec5f733bb1c8f41..793d7f1982b694a4d40015bda9b38b13d58bd04f 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -37,7 +37,6 @@ Patch5:               %{name}-ca-certificates.patch
 Patch6:                %{name}-ldflags.patch
 Patch7:                %{name}-find.patch
 Patch8:                pic.patch
 Patch6:                %{name}-ldflags.patch
 Patch7:                %{name}-find.patch
 Patch8:                pic.patch

-Patch9:                stddef.patch

 Patch10:       %{name}_fix_for_x32.patch
 URL:           http://www.openssl.org/
 BuildRequires: bc
 Patch10:       %{name}_fix_for_x32.patch
 URL:           http://www.openssl.org/
 BuildRequires: bc


@@ -256,7 +255,6 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1

-%patch9 -p1

 %patch10 -p1
 
 sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
 %patch10 -p1
 
 sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure

diff --git a/stddef.patch b/stddef.patch
deleted file mode 100644 (file)
index a79d0bb..0000000
--- a/stddef.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN openssl-1.0.2.orig/crypto/sha/sha.h openssl-1.0.2/crypto/sha/sha.h
---- openssl-1.0.2.orig/crypto/sha/sha.h        2015-01-22 15:58:32.000000000 +0100
-+++ openssl-1.0.2/crypto/sha/sha.h     2015-01-27 16:12:51.744113627 +0100
-@@ -59,8 +59,8 @@
- #ifndef HEADER_SHA_H
- # define HEADER_SHA_H
- 
--# include <openssl/e_os2.h>
- # include <stddef.h>
-+# include <openssl/e_os2.h>
- 
- #ifdef  __cplusplus
- extern "C" {