Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (8b55210e667c69630c7540d92b41f10bd2a8ee7a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (8b55210e667c69630c7540d92b41f10bd2a8ee7a)
  • Date: Tue, 15 Nov 2016 20:49:27 +0000

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/apache22/DETAILS | 4 +--
http/apache22/HISTORY | 7 ++++++
http/apache22/PRE_BUILD | 6 +++++
http/apache22/libressl.patch | 49
+++++++++++++++++++++++++++++++++++++++++++
4 files changed, 64 insertions(+), 2 deletions(-)

New commits:
commit 8b55210e667c69630c7540d92b41f10bd2a8ee7a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

apache22: fixed build with libressl

(cherry picked from commit 399d092ec9c9d42d072388d07d263578f8f21766)

commit bcec147ed61d4720bc995ced81a5774ff04dd7f7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

apache22: => 2.2.31 [security]

(cherry picked from commit 426f8abb04016a2dfcd4b24fd1a8bb6cad6475f1)

diff --git a/http/apache22/DETAILS b/http/apache22/DETAILS
index 9d5660f..66a7fe0 100755
--- a/http/apache22/DETAILS
+++ b/http/apache22/DETAILS
@@ -1,6 +1,6 @@
SPELL=apache22
- VERSION=2.2.29
- SECURITY_PATCH=19
+ VERSION=2.2.31
+ SECURITY_PATCH=20
SOURCE=httpd-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 5b78587..834d0ee 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,10 @@
+2016-11-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * libressl.patch: added, to fix build with libressl
+
+2015-08-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.31; SECURITY_PATCH++ (CVE-2015-3183)
+
2014-11-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.29; SECURITY_PATCH++ (CVE-2014-0118,
CVE-2014-0231, CVE-2014-0226, CVE-2013-5704)
diff --git a/http/apache22/PRE_BUILD b/http/apache22/PRE_BUILD
new file mode 100755
index 0000000..bc6dce2
--- /dev/null
+++ b/http/apache22/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) && [[
$(get_spell_provider $SPELL SSL) == "libressl" ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/libressl.patch"
+fi
diff --git a/http/apache22/libressl.patch b/http/apache22/libressl.patch
new file mode 100644
index 0000000..a775354
--- /dev/null
+++ b/http/apache22/libressl.patch
@@ -0,0 +1,49 @@
+--- modules/ssl/ssl_engine_init.c.orig
++++ modules/ssl/ssl_engine_init.c
+@@ -406,9 +406,11 @@ void ssl_init_Engine(server_rec *s, apr_pool_t *p)
+ ssl_die();
+ }
+
++#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK
+ if (strEQ(mc->szCryptoDevice, "chil")) {
+ ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
+ }
++#endif
+
+ if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
+--- support/ab.c.orig
++++ support/ab.c
+@@ -2232,8 +2232,10 @@
+ } else if (strncasecmp(optarg, "SSL2", 4) == 0) {
+ meth = SSLv2_client_method();
+ #endif
++#ifndef OPENSSL_NO_SSL3
+ } else if (strncasecmp(optarg, "SSL3", 4) == 0) {
+ meth = SSLv3_client_method();
++#endif
+ #ifdef HAVE_TLSV1_X
+ } else if (strncasecmp(optarg, "TLS1.1", 6) == 0) {
+ meth = TLSv1_1_client_method();
+--- modules/ssl/ssl_engine_vars.c.orig
++++ modules/ssl/ssl_engine_vars.c
+@@ -836,7 +836,7 @@
+ SSL_SESSION *pSession = SSL_get_session(ssl);
+
+ if (pSession) {
+- switch (pSession->compress_meth) {
++ switch (SSL_SESSION_get_compress_id(pSession)) {
+ case 0:
+ /* default "NULL" already set */
+ break;
+--- modules/ssl/ssl_engine_rand.c.orig
++++ modules/ssl/ssl_engine_rand.c
+@@ -83,7 +83,7 @@
+ nDone += ssl_rand_feedfp(p, fp, pRandSeed->nBytes);
+ ssl_util_ppclose(s, p, fp);
+ }
+-#ifdef HAVE_SSL_RAND_EGD
++#ifdef HAVE_RAND_EGD
+ else if (pRandSeed->nSrc == SSL_RSSRC_EGD) {
+ /*
+ * seed in contents provided by the external



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (8b55210e667c69630c7540d92b41f10bd2a8ee7a), Vlad Glagolev, 11/15/2016

Archive powered by MHonArc 2.6.24.

Top of Page