- re add libressl patches (lost by last cleanup commit)

- no version bump, libressl is not the default ssl

with hat: apache

PR:			202047
Submitted by:		mcdouga9 _at_ egr.msu.edu
Patch Provided by:	phil.stone _at_ gmx.com

4 files changed, 59 insertions, 0 deletions

diff --git a/www/apache22/files/patch-modules__ssl__ssl_engine_rand.c b/www/apache22/files/patch-modules__ssl__ssl_engine_rand.c
new file mode 100644
index 000000000000..44ad4f7df520
--- /dev/null
+++ b/www/apache22/files/patch-modules__ssl__ssl_engine_rand.c
@@ -0,0 +1,20 @@
+--- modules/ssl/ssl_engine_rand.c.orig	2006-07-12 03:38:44 UTC
++++ modules/ssl/ssl_engine_rand.c
+@@ -83,17 +83,6 @@ int ssl_rand_seed(server_rec *s, apr_poo
+                 nDone += ssl_rand_feedfp(p, fp, pRandSeed->nBytes);
+                 ssl_util_ppclose(s, p, fp);
+             }
+-#ifdef HAVE_SSL_RAND_EGD
+-            else if (pRandSeed->nSrc == SSL_RSSRC_EGD) {
+-                /*
+-                 * seed in contents provided by the external
+-                 * Entropy Gathering Daemon (EGD)
+-                 */
+-                if ((n = RAND_egd(pRandSeed->cpPath)) == -1)
+-                    continue;
+-                nDone += n;
+-            }
+-#endif
+             else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) {
+                 struct {
+                     time_t t;
diff --git a/www/apache22/files/patch-modules__ssl__ssl_engine_vars.c b/www/apache22/files/patch-modules__ssl__ssl_engine_vars.c
new file mode 100644
index 000000000000..673665651e7e
--- /dev/null
+++ b/www/apache22/files/patch-modules__ssl__ssl_engine_vars.c
@@ -0,0 +1,11 @@
+--- modules/ssl/ssl_engine_vars.c.orig	2013-02-12 11:51:17 UTC
++++ modules/ssl/ssl_engine_vars.c
+@@ -832,7 +832,7 @@ static char *ssl_var_lookup_ssl_compress
+ {
+     char *result = "NULL";
+ #ifdef OPENSSL_VERSION_NUMBER
+-#if (OPENSSL_VERSION_NUMBER >= 0x00908000)
++#if (OPENSSL_VERSION_NUMBER >= 0x00908000) && !defined(OPENSSL_NO_COMP)
+     SSL_SESSION *pSession = SSL_get_session(ssl);
+ 
+     if (pSession) {
diff --git a/www/apache22/files/patch-modules__ssl__ssl_util_ssl.c b/www/apache22/files/patch-modules__ssl__ssl_util_ssl.c
new file mode 100644
index 000000000000..b3cdaea0f64e
--- /dev/null
+++ b/www/apache22/files/patch-modules__ssl__ssl_util_ssl.c
@@ -0,0 +1,14 @@
+--- modules/ssl/ssl_util_ssl.c.orig	2012-08-17 17:30:46 UTC
++++ modules/ssl/ssl_util_ssl.c
+@@ -492,7 +492,11 @@ BOOL SSL_X509_INFO_load_path(apr_pool_t 
+  * format, possibly followed by a sequence of CA certificates that
+  * should be sent to the peer in the SSL Certificate message.
+  */
++#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN
+ int SSL_CTX_use_certificate_chain(
++#else
++int _SSL_CTX_use_certificate_chain(
++#endif
+     SSL_CTX *ctx, char *file, int skipfirst, modssl_read_bio_cb_fn *cb)
+ {
+     BIO *bio;
diff --git a/www/apache22/files/patch-modules__ssl__ssl_util_ssl.h b/www/apache22/files/patch-modules__ssl__ssl_util_ssl.h
new file mode 100644
index 000000000000..9a36ee784a6f
--- /dev/null
+++ b/www/apache22/files/patch-modules__ssl__ssl_util_ssl.h
@@ -0,0 +1,14 @@
+--- modules/ssl/ssl_util_ssl.h.orig	2012-08-17 17:30:46 UTC
++++ modules/ssl/ssl_util_ssl.h
+@@ -89,7 +89,11 @@ char       *SSL_X509_NAME_to_string(apr_
+ BOOL        SSL_X509_getCN(apr_pool_t *, X509 *, char **);
+ BOOL        SSL_X509_INFO_load_file(apr_pool_t *, STACK_OF(X509_INFO) *, const char *);
+ BOOL        SSL_X509_INFO_load_path(apr_pool_t *, STACK_OF(X509_INFO) *, const char *);
++#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN
+ int         SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, modssl_read_bio_cb_fn *);
++#else
++int         _SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, modssl_read_bio_cb_fn *);
++#endif
+ char       *SSL_SESSION_id2sz(unsigned char *, int, char *, int);
+ 
+ /** util functions for OpenSSL+sslc compat */