Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #16734: Update agent to CFEngine 3.15.0 #2199

Merged
merged 1 commit into from Mar 30, 2020
Merged

Fixes #16734: Update agent to CFEngine 3.15.0 #2199

merged 1 commit into from Mar 30, 2020

Conversation

amousset
Copy link
Member

peckpeck
peckpeck requested changes Mar 30, 2020
View reviewed changes
rudder-agent/SOURCES/patches/cfengine/13310-disable-openssl-engine.patch Outdated

#include <string.h>
-#include <openssl/engine.h>
+//#include <openssl/engine.h>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has this been removed by cfengine ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact thfile still exists, it has just changed its location into libntech/libutils/libcrypto-compat.c

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

engine.h is not included anymore

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still there indeed.

@amousset amousset force-pushed the bug_16734/update_agent_to_cfengine_3_15_0 branch from 50150cd to dd05942 Compare March 30, 2020 09:37
@amousset
Copy link
Member Author

Commit modified

@amousset
Copy link
Member Author

Rebased for 3.15.1

@amousset
Copy link
Member Author

PR updated with a new commit

@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/rudder-packages/pull/2199
-- Your faithful QA
Kant merge: "All our knowledge begins with the senses, proceeds then to the understanding, and ends with reason. There is nothing higher than reason."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/22150/console)

@amousset
Copy link
Member Author

OK, squash merging this PR

@amousset amousset force-pushed the bug_16734/update_agent_to_cfengine_3_15_0 branch from 45dc91d to e311453 Compare March 30, 2020 13:06
@amousset amousset merged commit e311453 into Normation:master Mar 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peckpeck peckpeck peckpeck approved these changes

Assignees
No one assigned
Labels
qa: Can't merge
Projects
None yet
Milestone
No milestone
3 participants
@amousset @Normation-Quality-Assistant @peckpeck