pool/cfengine
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- add 0003-CFE-2629-Openssl-1.1-compatibility.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=169
This commit is contained in:
Klaus Kämpf 2017-12-20 08:03:37 +00:00 committed by Git OBS Bridge
parent 9aa8aa4ec9
commit 8dbdb225ab
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch → 0003-CFE-2629-Openssl-1.1-compatibility.patch
View File

@ -1,9 +1,9 @@
From 15e035116bf2d3ccba251fc7bc39f5e2e5b7eed7 Mon Sep 17 00:00:00 2001 From b1d817e5e65a7db77c1a1b039229b894874f041d Mon Sep 17 00:00:00 2001
From: Dimitrios Apostolou <jimis@northern.tech> From: Dimitrios Apostolou <jimis@northern.tech>
Date: Wed, 25 Oct 2017 17:03:39 +0200 Date: Wed, 25 Oct 2017 17:03:39 +0200
Subject: [PATCH 3/3] Merge pull request #2916 from jimis/openssl_1_1 Subject: [PATCH 3/3] CFE-2629: Openssl 1.1 compatibility
CFE-2629: Openssl 1.1 compatibility Merge pull request #2916 from jimis/openssl_1_1
--- ---
cf-agent/cf-agent.c | 2 + cf-agent/cf-agent.c | 2 +
cf-key/cf-key-functions.c | 6 +- cf-key/cf-key-functions.c | 6 +-
@ -1898,5 +1898,5 @@ index 69579ecbf457..4b98c901c999 100644
#include <sys/socket.h> #include <sys/socket.h>
-- --
2.15.0 2.15.1

2
cfengine.changes
View File

@ -1,7 +1,7 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 4 11:24:38 UTC 2017 - kkaempf@suse.com Mon Dec 4 11:24:38 UTC 2017 - kkaempf@suse.com
- add 0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch - add 0003-CFE-2629-Openssl-1.1-compatibility.patch
for openssl-1.1.0 compatibility for openssl-1.1.0 compatibility
------------------------------------------------------------------- -------------------------------------------------------------------

11
cfengine.spec
View File

@ -70,10 +70,10 @@ Patch1: 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch
# PATCH-FEATURE-UPSTREAM better /etc/SuSE-release parsing, upstream #5423 # PATCH-FEATURE-UPSTREAM better /etc/SuSE-release parsing, upstream #5423
# kkaempf@suse.de # kkaempf@suse.de
Patch2: 0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch Patch2: 0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch
# PATCH-FIX-UPSTREAM https://github.com/cfengine/core/pull/2881
Patch3: reproducible.patch
# PATCH-FIX-UPSTREAM https://github.com/cfengine/core/commit/f4b9c855c0b035c0188fcdf79d2cbddab2f1bdcc # PATCH-FIX-UPSTREAM https://github.com/cfengine/core/commit/f4b9c855c0b035c0188fcdf79d2cbddab2f1bdcc
Patch4: 0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch Patch3: 0003-CFE-2629-Openssl-1.1-compatibility.patch
# PATCH-FIX-UPSTREAM https://github.com/cfengine/core/pull/2881
Patch4: reproducible.patch
# SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de # SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de
Patch10: make_home_dir_for_tests.patch Patch10: make_home_dir_for_tests.patch
Patch99: remove-am_subst_notmake.patch Patch99: remove-am_subst_notmake.patch
@ -170,10 +170,11 @@ Lots of example promises for CFEngine.
%setup -q -n %{srcname} %setup -q -n %{srcname}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%if 0%{?suse_version} >= 1500
# openssl 1.1.0
%patch3 -p1 %patch3 -p1
%if 0%{?suse_version} == 1550
%patch4 -p1
%endif %endif
%patch4 -p1
%if 0%{?suse_version} <= 1110 %if 0%{?suse_version} <= 1110
%patch99 -p1 %patch99 -p1
%endif %endif