Skip to content

Commit 508a41c

Browse files
committed
Removed failing patch
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
1 parent 2142cec commit 508a41c

2 files changed

Lines changed: 4 additions & 63 deletions

File tree

deps-packaging/openssl/0008-Define-_XOPEN_SOURCE_EXTENDED-as-1.patch

Lines changed: 0 additions & 62 deletions
This file was deleted.

deps-packaging/openssl/cfbuild-openssl.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ Version: %{version}
66
Release: 1
77
Source0: openssl-%{openssl_version}.tar.gz
88
Patch0: 0006-Add-latomic-on-AIX-7.patch
9+
<<<<<<< Updated upstream
910
Patch1: 0008-Define-_XOPEN_SOURCE_EXTENDED-as-1.patch
11+
=======
12+
Patch1: 0010-Update-sha512-x86_64-pl.patch
13+
>>>>>>> Stashed changes
1014
License: MIT
1115
Group: Other
1216
Url: https://cfengine.com
@@ -179,4 +183,3 @@ CFEngine Build Automation -- openssl -- development files
179183
%{prefix}/lib/pkgconfig
180184

181185
%changelog
182-

0 commit comments

Comments
 (0)