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.

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

openssl: replace deprecated thread callback function #1397

Merged
merged 1 commit into from Mar 28, 2017

Conversation

pprindeville
Copy link
Contributor

CRYPTO_set_id_callback (openssl<1.0.0) has been replaced by
CRYPTO_THREADID_set_callback.

Signed-off-by: Philip Prindeville philipp@redfish-solutions.com

@pprindeville
Copy link
Contributor Author

Fixes option #1396.

@kira-syslogng
Copy link
Contributor

This user does not have permission to start the build. Can one of the admins verify this patch and start the build? (admin please type: ok to test)

@bazsi
Copy link
Collaborator

bazsi commented Mar 25, 2017

I have sent you a pull request to improve the conditionals somewhat, if you can add it on top of yours, you get my 👍

@kira-syslogng please test

Copy link
Collaborator

@bazsi bazsi left a comment

Choose a reason for hiding this comment

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

I've submitted a patch against your branch to improve the conditionals in this file. With that, this can go in.

@pprindeville
Copy link
Contributor Author

What about applying the point fix, then doing a broader refactoring of OpenSSL version specific code paths?

@bazsi
Copy link
Collaborator

bazsi commented Mar 25, 2017

Well, I've submitted a separate patch, so yours will remain the low-touch-point one. No need to fold it in. Just merge it in your branch so I can merge both with a single PR.

Or is there any other problems I might be missing?

@pprindeville
Copy link
Contributor Author

Just merge it in your branch so I can merge both with a single PR.

Done.

@presidento
Copy link
Contributor

@kira-syslogng ok to test.

@kira-syslogng
Copy link
Contributor

Build ERROR

@presidento
Copy link
Contributor

@kira-syslogng retest this please.

@kira-syslogng
Copy link
Contributor

Build ERROR

@pprindeville
Copy link
Contributor Author

I can't see the kira results... the link Details doesn't resolve.

@pprindeville
Copy link
Contributor Author

@kira-syslogng retest this please.

@pprindeville
Copy link
Contributor Author

@bazsi I've rebased without your PR merged, so you can commit it separately per above. Thanks.

@kira-syslogng
Copy link
Contributor

Build ERROR

@pprindeville
Copy link
Contributor Author

I'm seeing this message "Kira - 305 tests run, 0 skipped, 2 failed." but I can't figure out how to get a look at what those tests were.

Can someone please explain what I'm doing wrong?

Thanks

CRYPTO_set_id_callback (openssl<1.0.0) has been replaced by
CRYPTO_THREADID_set_callback.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
@kira-syslogng
Copy link
Contributor

Build ERROR

@bazsi
Copy link
Collaborator

bazsi commented Mar 28, 2017 via email

@pprindeville
Copy link
Contributor Author

That's an experimental system, which Balabit would publish, but right now it runs internally on balabit infrastructure.

So, is anything actually failing to build or not?

@bazsi
Copy link
Collaborator

bazsi commented Mar 28, 2017

There's a failing testcase, seems to be unrelated to this PR.

@MrAnno
Copy link
Collaborator

MrAnno commented Mar 28, 2017

Hi,

The failing test case is not related to this patch, we're going to fix the problem ASAP.

@MrAnno
Copy link
Collaborator

MrAnno commented Mar 28, 2017

@kira-syslogng retest this please.

@kira-syslogng
Copy link
Contributor

Build SUCCESS

@pprindeville
Copy link
Contributor Author

@bazsi Can you please close your review? Are we good to merge now?

@lbudai
Copy link
Collaborator

lbudai commented Mar 28, 2017

@pprindeville : thanks for the PR.
It is ready to merge, so here is my 👍
@bazsi: could you approve the changes you've requested? (and merge the PR)

@bazsi bazsi merged commit 4dc1763 into syslog-ng:master Mar 28, 2017
@pprindeville
Copy link
Contributor Author

Thanks!

@pprindeville
Copy link
Contributor Author

BTW, what's the next version of syslog-ng and when is it due out? Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants