Module Name:    src
Committed By:   maya
Date:           Sun Feb  4 09:00:51 UTC 2018

Modified Files:
        src/external/bsd/pkg_install/dist/lib: license.c pkcs7.c pkg_io.c

Log Message:
Merge pkg_install-20171030

Bump version to 20171030 for netpgpverify fixes.
Add zsh to default_acceptable_licenses.
Undef bootstrap hack.

Fix OpenSSL 1.1.0 build
OpenSSL 1.1.0 makes xkusage and ex_flags opaque.
Use X509_check_ca rather than a custom and nearly identical implementation.
This is available since OpenSSL 0.9.8 (even in RHEL5).
This is also done because we cannot implement it identically under
OpenSSL 1.1.0 due to missing getters.
Test EXFLAG_XKUSAGE rather than zero xkusage test no usage to avoid openssl
1.1.0 getter returning a different code on this case.
Use getter for xkusage in the non-zero test case.
Provide fallback definitions for getters.

PR pkg/52298, PR pkg/52648

To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/pkcs7.c \
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pkg_install/dist/lib/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Reply via email to