Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e8206da1ed4a2e155430e6c2a9466c61a536e79f)

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 master grimoire by Vlad Glagolev (e8206da1ed4a2e155430e6c2a9466c61a536e79f)
  • Date: Sat, 7 May 2016 14:39:13 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/links-twibright/HISTORY | 4 ----
http/links-twibright/PRE_BUILD | 7 -------
http/links-twibright/libressl.patch | 17 -----------------
3 files changed, 28 deletions(-)

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

Revert "links-twibright: fixed build with libressl"

Reason: fixed by upstream

This reverts commit c0c0ea86a07ab9ee4689f252d3e2d75e9939e0c8.

Conflicts:
http/links-twibright/HISTORY

diff --git a/http/links-twibright/HISTORY b/http/links-twibright/HISTORY
index 944585f..2b39d75 100644
--- a/http/links-twibright/HISTORY
+++ b/http/links-twibright/HISTORY
@@ -4,10 +4,6 @@
2015-07-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.10

-2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
- * PRE_BUILD: optionally apply a patch
- * libressl.patch: added, to fix build with libressl
-
2014-12-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.9

diff --git a/http/links-twibright/PRE_BUILD b/http/links-twibright/PRE_BUILD
deleted file mode 100755
index 6efb37b..0000000
--- a/http/links-twibright/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-# the patch drops EGD support for LibreSSL, so make it optional
-if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) && [[
$(get_spell_provider $SPELL SSL) == "libressl" ]]; then
- patch -p1 < "$SPELL_DIRECTORY/libressl.patch"
-fi
diff --git a/http/links-twibright/libressl.patch
b/http/links-twibright/libressl.patch
deleted file mode 100644
index 2b89393..0000000
--- a/http/links-twibright/libressl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur links-2.8/https.c links-2.8-1/https.c
---- links-2.8/https.c 2013-09-20 23:17:00.000000000 +0200
-+++ links-2.8-1/https.c 2014-07-17 10:24:34.338197062 +0200
-@@ -36,11 +36,8 @@
- unsigned os_pool_size;
-
- const unsigned char *f = (const unsigned char
*)RAND_file_name(cast_char f_randfile, sizeof(f_randfile));
-- if (f && RAND_egd(cast_const_char f) < 0) {
-- /* Not an EGD, so read and write to it */
-- if (RAND_load_file(cast_const_char f_randfile, -1))
-- RAND_write_file(cast_const_char f_randfile);
-- }
-+ if (RAND_load_file(cast_const_char f_randfile, -1))
-+ RAND_write_file(cast_const_char f_randfile);
-
- os_seed_random(&os_pool, &os_pool_size);
- if (os_pool_size) RAND_add(os_pool, os_pool_size,
os_pool_size);



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e8206da1ed4a2e155430e6c2a9466c61a536e79f), Vlad Glagolev, 05/07/2016

Archive powered by MHonArc 2.6.24.

Top of Page