Skip to Content.
Sympa Menu

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

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 (6bfb5192c631a54e6ac1aff0d82481847e91e07c)
  • Date: Fri, 6 Mar 2015 02:28:18 -0600

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

crypto/libressl/DETAILS | 9 +++++++--
crypto/libressl/HISTORY | 6 ++++++
crypto/libressl/INSTALL | 9 +++++++++
net/stunnel/HISTORY | 4 ++++
net/stunnel/PRE_BUILD | 2 ++
net/stunnel/libressl.patch | 18 ++++++++++++++++++
6 files changed, 46 insertions(+), 2 deletions(-)

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

libressl: post-update fixes

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

stunnel: fixed build with libressl

diff --git a/crypto/libressl/DETAILS b/crypto/libressl/DETAILS
index 6443973..9eb1f12 100755
--- a/crypto/libressl/DETAILS
+++ b/crypto/libressl/DETAILS
@@ -1,6 +1,6 @@
SPELL=libressl
VERSION=2.1.4
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/$SOURCE
@@ -12,9 +12,14 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.libressl.org/
LICENSE[0]=BSD
+ LICENSE[1]=APACHE
+ LICENSE[2]=ISC
+ LICENSE[3]=PD
ENTERED=20140819
KEYWORDS="ssl tls"
SHORT="SSL/TLS protocol"
cat << EOF
-LibreSSL is a FREE version of the SSL/TLS protocol forked from OpenSSL
+LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014,
with
+goals of modernizing the codebase, improving security, and applying best
+practice development processes.
EOF
diff --git a/crypto/libressl/HISTORY b/crypto/libressl/HISTORY
index c78a7ce..ae8b794 100644
--- a/crypto/libressl/HISTORY
+++ b/crypto/libressl/HISTORY
@@ -1,3 +1,9 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++ (CVE-2015-0205, CVE-2014-3570,
+ CVE-2014-8275, CVE-2014-3572); added missing licenses; updated long
+ description
+ * INSTALL: added, to install config file
+
2015-03-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.1.4; added forgotten SECURITY_PATCH for
2.1.3 (CVE-2015-0206); quoting paths; updated KEYWORDS; converted to
diff --git a/crypto/libressl/INSTALL b/crypto/libressl/INSTALL
new file mode 100755
index 0000000..b92c43c
--- /dev/null
+++ b/crypto/libressl/INSTALL
@@ -0,0 +1,9 @@
+default_install &&
+
+local SSL_CONFDIR="$INSTALL_ROOT/etc/ssl" &&
+
+if [[ ! -d "$SSL_CONFDIR" ]]; then
+ install -vm 755 -d "$SSL_CONFDIR"
+fi &&
+
+install_config_file apps/openssl.cnf "$SSL_CONFDIR/openssl.cnf"
diff --git a/net/stunnel/HISTORY b/net/stunnel/HISTORY
index 20e2ca0..50910a1 100644
--- a/net/stunnel/HISTORY
+++ b/net/stunnel/HISTORY
@@ -1,3 +1,7 @@
+2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply a patch
+ * libressl.patch: added, to fix build with libressl
+
2015-02-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.10

diff --git a/net/stunnel/PRE_BUILD b/net/stunnel/PRE_BUILD
index 40fdf4a..c3c2124 100755
--- a/net/stunnel/PRE_BUILD
+++ b/net/stunnel/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p1 < "$SPELL_DIRECTORY/libressl.patch" &&
+
# fixed default paths in configuration file
sedit "s:@prefix@::g" tools/stunnel.conf-sample.in &&

diff --git a/net/stunnel/libressl.patch b/net/stunnel/libressl.patch
new file mode 100644
index 0000000..85b9007
--- /dev/null
+++ b/net/stunnel/libressl.patch
@@ -0,0 +1,18 @@
+--- stunnel-5.02.org/src/ssl.c 2014-07-12 06:13:07.356889656 +0000
++++ stunnel-5.02/src/ssl.c 2014-07-12 06:15:39.032889896 +0000
+@@ -195,6 +195,7 @@
+ }
+ s_log(LOG_DEBUG, "RAND_screen failed to sufficiently seed PRNG");
+ #else
++#ifdef HAVE_RAND_EGD
+ if(global->egd_sock) {
+ if((bytes=RAND_egd(global->egd_sock))==-1) {
+ s_log(LOG_WARNING, "EGD Socket %s failed", global->egd_sock);
+@@ -207,6 +208,7 @@
+ so no need to check if seeded sufficiently */
+ }
+ }
++#endif
+ /* try the good-old default /dev/urandom, if available */
+ totbytes+=add_rand_file(global, "/dev/urandom");
+ if(RAND_status())



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6bfb5192c631a54e6ac1aff0d82481847e91e07c), Vlad Glagolev, 03/06/2015

Archive powered by MHonArc 2.6.24.

Top of Page