Skip to Content.
Sympa Menu

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

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 (ecb81862411b5f48624741dd03881b402aff4ead)
  • Date: Tue, 25 Oct 2016 16:53:27 +0000

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

chat-irc/znc/HISTORY | 4 ++++
chat-irc/znc/PRE_BUILD | 6 ++++++
chat-irc/znc/libressl.patch | 19 +++++++++++++++++++
3 files changed, 29 insertions(+)

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

znc: fixed build with LibreSSL

(cherry picked from commit 19f433a4724784b207290e45579b6f737772b8ff)

diff --git a/chat-irc/znc/HISTORY b/chat-irc/znc/HISTORY
index 9d40809..d498a82 100644
--- a/chat-irc/znc/HISTORY
+++ b/chat-irc/znc/HISTORY
@@ -1,3 +1,7 @@
+2016-10-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * libressl.patch: added, fixed build with LibreSSL
+
2015-12-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH++ (1.4 was a security update)
* DEPENDS: openssl -> SSL
diff --git a/chat-irc/znc/PRE_BUILD b/chat-irc/znc/PRE_BUILD
new file mode 100755
index 0000000..e6ff380
--- /dev/null
+++ b/chat-irc/znc/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/chat-irc/znc/libressl.patch b/chat-irc/znc/libressl.patch
new file mode 100644
index 0000000..8bbe9cf
--- /dev/null
+++ b/chat-irc/znc/libressl.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-src_Csocket_cpp,v 1.1 2014/07/12 14:42:37 pascal Exp $
+--- src/Csocket.cpp.orig Sat Jul 12 16:03:48 2014
++++ src/Csocket.cpp Sat Jul 12 16:04:36 2014
+@@ -555,6 +555,7 @@ bool InitSSL( ECompType eCompressionType )
+ }
+ #endif /* _WIN32 */
+
++#ifndef OPENSSL_NO_COMP
+ COMP_METHOD *cm = NULL;
+
+ if( CT_ZLIB & eCompressionType )
+@@ -570,6 +571,7 @@ bool InitSSL( ECompType eCompressionType )
+ if( cm )
+ SSL_COMP_add_compression_method( CT_RLE, cm );
+ }
++#endif
+
+ // setting this up once in the begining
+ g_iCsockSSLIdx = SSL_get_ex_new_index( 0, ( void *
)"CsockGlobalIndex", NULL, NULL, NULL );



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (ecb81862411b5f48624741dd03881b402aff4ead), Vlad Glagolev, 10/25/2016

Archive powered by MHonArc 2.6.24.

Top of Page