diff --git a/dev-libs/openssl/openssl-1.0.1g.recipe b/dev-libs/openssl/openssl-1.0.1h.recipe similarity index 87% rename from dev-libs/openssl/openssl-1.0.1g.recipe rename to dev-libs/openssl/openssl-1.0.1h.recipe index fce0a8dc6..859766d91 100644 --- a/dev-libs/openssl/openssl-1.0.1g.recipe +++ b/dev-libs/openssl/openssl-1.0.1h.recipe @@ -14,23 +14,23 @@ commercial and non-commercial purposes subject to some simple license \ conditions. " HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.1g.tar.gz" -CHECKSUM_SHA256="53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028" +SRC_URI="http://www.openssl.org/source/openssl-${portVersion}.tar.gz" +CHECKSUM_SHA256="9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093" LICENSE="OpenSSL" COPYRIGHT=" 1995-1998 Eric Young 1998-2013 The OpenSSL Project. " REVISION="1" -ARCHITECTURES="!x86_gcc2 !x86 !x86_64" -SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" +ARCHITECTURES="?x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" -PATCHES="openssl-1.0.1e.patchset" +PATCHES="openssl-1.0.1h.patchset" PROVIDES=" - openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 - lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0 - lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 + openssl$secondaryArchSuffix = $portVersion compat >= 1.0.1 + lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.1 + lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.1 " if [ -z "$secondaryArchSuffix" ]; then PROVIDES="$PROVIDES @@ -42,6 +42,7 @@ fi REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libz$secondaryArchSuffix >= 1.2.3 + ca_root_certificates " if [ -n "$secondaryArchSuffix" ]; then REQUIRES="$REQUIRES diff --git a/dev-libs/openssl/patches/openssl-1.0.1e.patchset b/dev-libs/openssl/patches/openssl-1.0.1e.patchset deleted file mode 100644 index 2aeb0bca2..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.1e.patchset +++ /dev/null @@ -1,478 +0,0 @@ -From 1e96233956f08910cfc2f288a069c8435c343f06 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 21 Oct 2013 10:01:47 +0200 -Subject: Convert existing patch into patchset format. - - -diff --git a/Configure b/Configure -index 9c803dc..8798a10 100755 ---- a/Configure -+++ b/Configure -@@ -615,6 +615,10 @@ my %table=( - "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:${no_asm}:$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:${no_asm}:$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"haiku-x86_64", "gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff --git a/Makefile.shared b/Makefile.shared -index e753f44..cce510f 100644 ---- a/Makefile.shared -+++ b/Makefile.shared -@@ -594,10 +594,10 @@ symlink.hpux: - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff --git a/config b/config -index 88b9bc6..950f3f4 100755 ---- a/config -+++ b/config -@@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ -+ Haiku:*:*) -+ echo "${MACHINE}-unknown-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -829,6 +837,9 @@ case "$GUESSOS" in - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ x86_64-*-haiku) OUT="haiku-x86_64" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; -diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod -index a09588a..2d19d91 100644 ---- a/doc/apps/cms.pod -+++ b/doc/apps/cms.pod -@@ -450,28 +450,28 @@ remains DER. - - =over 4 - --=item 0 -+=item C<0> - - the operation was completely successfully. - --=item 1 -+=item C<1> - - an error occurred parsing the command options. - --=item 2 -+=item C<2> - - one of the input files could not be read. - --=item 3 -+=item C<3> - - an error occurred creating the CMS file or when reading the MIME - message. - --=item 4 -+=item C<4> - - an error occurred decrypting or verifying the message. - --=item 5 -+=item C<5> - - the message was verified correctly but an error occurred writing out - the signers certificates. -diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod -index e4e89af..72c7b24 100644 ---- a/doc/apps/smime.pod -+++ b/doc/apps/smime.pod -@@ -308,28 +308,28 @@ remains DER. - - =over 4 - --=item 0 -+=item C<0> - - the operation was completely successfully. - --=item 1 -+=item C<1> - - an error occurred parsing the command options. - --=item 2 -+=item C<2> - - one of the input files could not be read. - --=item 3 -+=item C<3> - - an error occurred creating the PKCS#7 file or when reading the MIME - message. - --=item 4 -+=item C<4> - - an error occurred decrypting or verifying the message. - --=item 5 -+=item C<5> - - the message was verified correctly but an error occurred writing out - the signers certificates. -diff --git a/doc/crypto/X509_STORE_CTX_get_error.pod b/doc/crypto/X509_STORE_CTX_get_error.pod -index a883f6c..60e8332 100644 ---- a/doc/crypto/X509_STORE_CTX_get_error.pod -+++ b/doc/crypto/X509_STORE_CTX_get_error.pod -@@ -278,6 +278,8 @@ happen if extended CRL checking is enabled. - an application specific error. This will never be returned unless explicitly - set by an application. - -+=back -+ - =head1 NOTES - - The above functions should be used instead of directly referencing the fields -diff --git a/doc/ssl/SSL_COMP_add_compression_method.pod b/doc/ssl/SSL_COMP_add_compression_method.pod -index 42fa66b..80175a3 100644 ---- a/doc/ssl/SSL_COMP_add_compression_method.pod -+++ b/doc/ssl/SSL_COMP_add_compression_method.pod -@@ -53,11 +53,11 @@ SSL_COMP_add_compression_method() may return the following values: - - =over 4 - --=item 0 -+=item C<0> - - The operation succeeded. - --=item 1 -+=item C<1> - - The operation failed. Check the error queue to find out the reason. - -diff --git a/doc/ssl/SSL_CTX_add_session.pod b/doc/ssl/SSL_CTX_add_session.pod -index 82676b2..fd927f8 100644 ---- a/doc/ssl/SSL_CTX_add_session.pod -+++ b/doc/ssl/SSL_CTX_add_session.pod -@@ -52,13 +52,13 @@ The following values are returned by all functions: - - =over 4 - --=item 0 -+=item C<0> - - The operation failed. In case of the add operation, it was tried to add - the same (identical) session twice. In case of the remove operation, the - session was not found in the cache. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_CTX_load_verify_locations.pod b/doc/ssl/SSL_CTX_load_verify_locations.pod -index 84a799f..de01065 100644 ---- a/doc/ssl/SSL_CTX_load_verify_locations.pod -+++ b/doc/ssl/SSL_CTX_load_verify_locations.pod -@@ -100,13 +100,13 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The operation failed because B and B are NULL or the - processing at one of the locations specified failed. Check the error - stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_CTX_set_client_CA_list.pod b/doc/ssl/SSL_CTX_set_client_CA_list.pod -index 632b556..04d0a3c 100644 ---- a/doc/ssl/SSL_CTX_set_client_CA_list.pod -+++ b/doc/ssl/SSL_CTX_set_client_CA_list.pod -@@ -66,11 +66,11 @@ values: - - =over 4 - --=item 1 -+=item C<1> - - The operation succeeded. - --=item 0 -+=item C<0> - - A failure while manipulating the STACK_OF(X509_NAME) object occurred or - the X509_NAME could not be extracted from B. Check the error stack -diff --git a/doc/ssl/SSL_CTX_set_session_id_context.pod b/doc/ssl/SSL_CTX_set_session_id_context.pod -index 58fc685..ed0a81c 100644 ---- a/doc/ssl/SSL_CTX_set_session_id_context.pod -+++ b/doc/ssl/SSL_CTX_set_session_id_context.pod -@@ -64,13 +64,13 @@ return the following values: - - =over 4 - --=item 0 -+=item C<0> - - The length B of the session id context B exceeded - the maximum allowed length of B. The error - is logged to the error stack. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_CTX_set_ssl_version.pod b/doc/ssl/SSL_CTX_set_ssl_version.pod -index 254f2b4..5ea8f0d 100644 ---- a/doc/ssl/SSL_CTX_set_ssl_version.pod -+++ b/doc/ssl/SSL_CTX_set_ssl_version.pod -@@ -42,11 +42,11 @@ and SSL_set_ssl_method(): - - =over 4 - --=item 0 -+=item C<0> - - The new choice failed, check the error stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -index b80e25b..ba5c23f 100644 ---- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -+++ b/doc/ssl/SSL_CTX_use_psk_identity_hint.pod -@@ -81,6 +81,8 @@ SSL_CTX_use_psk_identity_hint() and SSL_use_psk_identity_hint() return - - Return values from the server callback are interpreted as follows: - -+=over -+ - =item > 0 - - PSK identity was found and the server callback has provided the PSK -@@ -94,9 +96,11 @@ data to B and return the length of the random data, so the - connection will fail with decryption_error before it will be finished - completely. - --=item 0 -+=item C<0> - - PSK identity was not found. An "unknown_psk_identity" alert message - will be sent and the connection setup fails. - -+=back -+ - =cut -diff --git a/doc/ssl/SSL_accept.pod b/doc/ssl/SSL_accept.pod -index cc724c0..44dbee6 100644 ---- a/doc/ssl/SSL_accept.pod -+++ b/doc/ssl/SSL_accept.pod -@@ -44,12 +44,12 @@ The following return values can occur: - - =over 4 - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the -diff --git a/doc/ssl/SSL_clear.pod b/doc/ssl/SSL_clear.pod -index d4df1bf..2da0b02 100644 ---- a/doc/ssl/SSL_clear.pod -+++ b/doc/ssl/SSL_clear.pod -@@ -56,12 +56,12 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The SSL_clear() operation could not be performed. Check the error stack to - find out the reason. - --=item 1 -+=item C<1> - - The SSL_clear() operation was successful. - -diff --git a/doc/ssl/SSL_connect.pod b/doc/ssl/SSL_connect.pod -index cc56ebb..3257f71 100644 ---- a/doc/ssl/SSL_connect.pod -+++ b/doc/ssl/SSL_connect.pod -@@ -41,12 +41,12 @@ The following return values can occur: - - =over 4 - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the -diff --git a/doc/ssl/SSL_do_handshake.pod b/doc/ssl/SSL_do_handshake.pod -index 2435764..a0afc27 100644 ---- a/doc/ssl/SSL_do_handshake.pod -+++ b/doc/ssl/SSL_do_handshake.pod -@@ -45,12 +45,12 @@ The following return values can occur: - - =over 4 - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the -diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod -index 7038cd2..3982b81 100644 ---- a/doc/ssl/SSL_read.pod -+++ b/doc/ssl/SSL_read.pod -@@ -86,7 +86,7 @@ The following return values can occur: - The read operation was successful; the return value is the number of - bytes actually read from the TLS/SSL connection. - --=item 0 -+=item C<0> - - The read operation was not successful. The reason may either be a clean - shutdown due to a "close notify" alert sent by the peer (in which case -diff --git a/doc/ssl/SSL_session_reused.pod b/doc/ssl/SSL_session_reused.pod -index da7d062..033d54c 100644 ---- a/doc/ssl/SSL_session_reused.pod -+++ b/doc/ssl/SSL_session_reused.pod -@@ -27,11 +27,11 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - A new session was negotiated. - --=item 1 -+=item C<1> - - A session was reused. - -diff --git a/doc/ssl/SSL_set_fd.pod b/doc/ssl/SSL_set_fd.pod -index 7029112..59e1b2b 100644 ---- a/doc/ssl/SSL_set_fd.pod -+++ b/doc/ssl/SSL_set_fd.pod -@@ -35,11 +35,11 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The operation failed. Check the error stack to find out why. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_set_session.pod b/doc/ssl/SSL_set_session.pod -index 5f54714..d35e6d3 100644 ---- a/doc/ssl/SSL_set_session.pod -+++ b/doc/ssl/SSL_set_session.pod -@@ -37,11 +37,11 @@ The following return values can occur: - - =over 4 - --=item 0 -+=item C<0> - - The operation failed; check the error stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff --git a/doc/ssl/SSL_shutdown.pod b/doc/ssl/SSL_shutdown.pod -index 89911ac..f863812 100644 ---- a/doc/ssl/SSL_shutdown.pod -+++ b/doc/ssl/SSL_shutdown.pod -@@ -92,12 +92,12 @@ The following return values can occur: - - =over 4 - --=item 1 -+=item C<1> - - The shutdown was successfully completed. The "close notify" alert was sent - and the peer's "close notify" alert was received. - --=item 0 -+=item C<0> - - The shutdown is not yet finished. Call SSL_shutdown() for a second time, - if a bidirectional shutdown shall be performed. -diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod -index e013c12..30f9e2b 100644 ---- a/doc/ssl/SSL_write.pod -+++ b/doc/ssl/SSL_write.pod -@@ -79,7 +79,7 @@ The following return values can occur: - The write operation was successful, the return value is the number of - bytes actually written to the TLS/SSL connection. - --=item 0 -+=item C<0> - - The write operation was not successful. Probably the underlying connection - was closed. Call SSL_get_error() with the return value B to find out, --- -1.8.3.4 - diff --git a/dev-libs/openssl/patches/openssl-1.0.1h.patchset b/dev-libs/openssl/patches/openssl-1.0.1h.patchset new file mode 100644 index 000000000..e2db3e4a1 --- /dev/null +++ b/dev-libs/openssl/patches/openssl-1.0.1h.patchset @@ -0,0 +1,102 @@ +From ce6f8df79f78f6c533f99c44b86850c4f76a84e2 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Wed, 18 Jun 2014 02:37:21 +0000 +Subject: [PATCH 1/2] Haiku: build fixes + +--- + Configure | 4 ++++ + Makefile.shared | 8 ++++---- + config | 11 +++++++++++ + 3 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/Configure b/Configure +index de78469..047ce37 100755 +--- a/Configure ++++ b/Configure +@@ -440,6 +440,10 @@ my %table=( + "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", + "beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so", + ++##### Haiku ++"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"haiku-x86_64", "gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", ++ + #### SCO/Caldera targets. + # + # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. +diff --git a/Makefile.shared b/Makefile.shared +index e753f44..cce510f 100644 +--- a/Makefile.shared ++++ b/Makefile.shared +@@ -594,10 +594,10 @@ symlink.hpux: + symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: + + # Compatibility targets +-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu +-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu +-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu +-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu ++link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu ++link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu ++link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu ++symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu + link_o.bsd-shared: link_o.bsd + link_a.bsd-shared: link_a.bsd + link_app.bsd-shared: link_app.bsd +diff --git a/config b/config +index 41fa2a6..f390fc2 100755 +--- a/config ++++ b/config +@@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in + echo "${MACHINE}-dg-dgux"; exit 0 + ;; + ++ Haiku:*:BePC) ++ echo "i586-pc-haiku"; exit 0 ++ ;; ++ ++ Haiku:*:*) ++ echo "${MACHINE}-unknown-haiku"; exit 0 ++ ;; ++ + HI-UX:*) + echo "${MACHINE}-hi-hiux"; exit 0 + ;; +@@ -829,6 +837,9 @@ case "$GUESSOS" in + options="$options no-asm" + fi + ;; ++ i586-*-haiku) OUT="haiku-x86" ;; ++ x86_64-*-haiku) OUT="haiku-x86_64" ;; ++ + # these are all covered by the catchall below + # *-dgux) OUT="dgux" ;; + mips-sony-newsos4) OUT="newsos4-gcc" ;; +-- +1.8.3.4 + +From df9dd1aa2bf9d40613e95c5ae8fe9e5dc3e8c68f Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Wed, 18 Jun 2014 02:39:12 +0000 +Subject: [PATCH 2/2] Haiku: Modify default Root CA filename + +--- + crypto/cryptlib.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h +index d26f963..96dfd07 100644 +--- a/crypto/cryptlib.h ++++ b/crypto/cryptlib.h +@@ -82,7 +82,7 @@ extern "C" { + #ifndef OPENSSL_SYS_VMS + #define X509_CERT_AREA OPENSSLDIR + #define X509_CERT_DIR OPENSSLDIR "/certs" +-#define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++#define X509_CERT_FILE OPENSSLDIR "/CARootCertificates.pem" + #define X509_PRIVATE_DIR OPENSSLDIR "/private" + #else + #define X509_CERT_AREA "SSLROOT:[000000]" +-- +1.8.3.4 +