Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

Chronological Thread  
    < 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 (b99817f5dd0ad7da429c4be29d246730ff9bf345)
  • Date: Sat, 2 Jul 2016 01:36:22 +0000
GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

archive-libs/libarchive/DETAILS | 6 +-
archive-libs/libarchive/HISTORY | 7 +++
archive-libs/libarchive/UP_TRIGGERS | 4 +
audio-libs/liblrdf/DEPENDS | 1
audio-libs/liblrdf/HISTORY | 3 +
libs/ldns/HISTORY | 3 +
libs/ldns/PRE_BUILD | 6 ++
libs/ldns/libressl.patch | 18 ++++++++
libs/neon/HISTORY | 3 +
libs/neon/UP_TRIGGERS | 3 +
net/wpa_supplicant/HISTORY | 5 ++
net/wpa_supplicant/PRE_BUILD | 6 ++
net/wpa_supplicant/libressl.patch | 69
++++++++++++++++++++++++++++++++
python-pypi/python-cryptography/DEPENDS | 1
python-pypi/python-cryptography/HISTORY | 3 +
python-pypi/requests/DETAILS | 6 +-
python-pypi/requests/HISTORY | 6 ++
17 files changed, 144 insertions(+), 6 deletions(-)

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

liblrdf: added missing SSL dependency

(cherry picked from commit 949a9f55df622cdad907bb074fa68c1eb8b15395)

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

libarchive: added gvfs to up_trigger

(cherry picked from commit ce34b227b28eae8904fd8c9c86807fbc8fe649bf)

commit bedad517353e5642e441a8ef4723135a263cb7d7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ibarchive-3.2.1 SECURITY FIX

(cherry picked from commit afdf291b1b23387fed1d59df1708f5a555e7dbd8)

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

neon: added davfs check

(cherry picked from commit 38cbd97a47b737e5e96299ec1b6bd00d698fe3c3)

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

requests: => 2.10.0

(cherry picked from commit f20fb7f4105105f0f611fa8c381133f00072c6e2)

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

requests: => 2.7.0

(cherry picked from commit 2448a9c7b0b23f24919e7943739231346b47886b)

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

python-cryptography: added missing SSL dependency

(cherry picked from commit 4546b821b43fdb4f4caa35ce467ca60be2e3b37c)

Conflicts:
python-pypi/python-cryptography/HISTORY

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

wpa_supplicant: fixed build with libressl

(cherry picked from commit d3c80a173787675070bc71bc15571a0192ca733f)

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

ldns: fixed build with libressl

(cherry picked from commit 6bf14a06b476cf125000b470238024eac623e925)

Conflicts:
libs/ldns/HISTORY

diff --git a/archive-libs/libarchive/DETAILS b/archive-libs/libarchive/DETAILS
index 964f245..0b1c83d 100755
--- a/archive-libs/libarchive/DETAILS
+++ b/archive-libs/libarchive/DETAILS
@@ -1,7 +1,7 @@
SPELL=libarchive
- VERSION=3.2.0
-
SOURCE_HASH=sha512:e6a0ada8102c1b738115ccd0ffd8e64d2b9c2fa2eda813fddaa5b7e5021d6c063e868263292d9cae5f571482db332c9d49a42827b8ae71ffe14c182d6d214bfc
- SECURITY_PATCH=2
+ VERSION=3.2.1
+
SOURCE_HASH=sha512:a5d43cb0bf36b687fabfbc874e7adc1fa94c563e7f073e107db8d4e79e8d0d8146cb985809f8115fbb882fc2d8a2a477d0a7364e93e6df62f292bb5e9865ec5c
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.libarchive.org
diff --git a/archive-libs/libarchive/HISTORY b/archive-libs/libarchive/HISTORY
index 80e989e..c1c90ae 100644
--- a/archive-libs/libarchive/HISTORY
+++ b/archive-libs/libarchive/HISTORY
@@ -1,3 +1,10 @@
+2016-07-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: added gvfs
+
+2016-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.2.1
+ SECURITY_PATCH++
+
2016-05-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.2.0
SECURITY_PATCH++ fixes CVE-2016-1541
diff --git a/archive-libs/libarchive/UP_TRIGGERS
b/archive-libs/libarchive/UP_TRIGGERS
index 9d6c1e6..15c0379 100755
--- a/archive-libs/libarchive/UP_TRIGGERS
+++ b/archive-libs/libarchive/UP_TRIGGERS
@@ -6,4 +6,8 @@ if [ "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}" ]; then
for each in $(show_up_depends $SPELL 1); do
up_trigger $each cast_self
done
+fi &&
+
+if spell_ok gvfs; then
+ up_trigger gvfs check_self
fi
diff --git a/audio-libs/liblrdf/DEPENDS b/audio-libs/liblrdf/DEPENDS
index 20b3c9b..98d07ec 100755
--- a/audio-libs/liblrdf/DEPENDS
+++ b/audio-libs/liblrdf/DEPENDS
@@ -1,2 +1,3 @@
+depends SSL &&
depends raptor &&
depends ladspa
diff --git a/audio-libs/liblrdf/HISTORY b/audio-libs/liblrdf/HISTORY
index dbaeaed..a79b6f6 100644
--- a/audio-libs/liblrdf/HISTORY
+++ b/audio-libs/liblrdf/HISTORY
@@ -1,3 +1,6 @@
+2016-07-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing dependency - SSL
+
2016-03-02 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: include raptor2/raptor2.h instead of raptor.h
* DETAILS: PATCHLEVEL++
diff --git a/libs/ldns/HISTORY b/libs/ldns/HISTORY
index 86d00d2..10832e1 100644
--- a/libs/ldns/HISTORY
+++ b/libs/ldns/HISTORY
@@ -1,3 +1,6 @@
+2016-07-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD, libressl.patch: added, to fix build with libressl
+
2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS, CONFIGURE: added libressl build support

diff --git a/libs/ldns/PRE_BUILD b/libs/ldns/PRE_BUILD
new file mode 100755
index 0000000..9410ba9
--- /dev/null
+++ b/libs/ldns/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $LDNS_OPENSSL == "libressl" ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/libressl.patch"
+fi
diff --git a/libs/ldns/libressl.patch b/libs/ldns/libressl.patch
new file mode 100644
index 0000000..f14a920
--- /dev/null
+++ b/libs/ldns/libressl.patch
@@ -0,0 +1,18 @@
+--- examples/ldns-signzone.c.orig 2014-01-10 21:04:41 UTC
++++ examples/ldns-signzone.c
+@@ -470,6 +470,7 @@ main(int argc, char *argv[])
+ case 'A':
+ signflags |= LDNS_SIGN_DNSKEY_WITH_ZSK;
+ break;
++#ifdef HAVE_ENGINE_LOAD_CRYPTODEV
+ case 'E':
+ ENGINE_load_builtin_engines();
+ ENGINE_load_dynamic();
+@@ -494,6 +495,7 @@ main(int argc, char *argv[])
+ ENGINE_set_default(engine, 0);
+ }
+ break;
++#endif
+ case 'k':
+ eng_key_l = strchr(optarg, ',');
+ if (eng_key_l && strlen(eng_key_l) > 1) {
diff --git a/libs/neon/HISTORY b/libs/neon/HISTORY
index a722e3c..67a1764 100644
--- a/libs/neon/HISTORY
+++ b/libs/neon/HISTORY
@@ -1,3 +1,6 @@
+2016-07-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: added, for davfs check
+
2014-10-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.30.1
* {SUB_,}DEPENDS, CONFIGURE, {REPAIR^all^,}PRE_SUB_DEPENDS: switched
to
diff --git a/libs/neon/UP_TRIGGERS b/libs/neon/UP_TRIGGERS
new file mode 100755
index 0000000..5e6d7ad
--- /dev/null
+++ b/libs/neon/UP_TRIGGERS
@@ -0,0 +1,3 @@
+if spell_ok davfs; then
+ up_trigger davfs check_self
+fi
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 44ddc93..1d23725 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,8 @@
+2016-07-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply libressl.patch
+ * libressl.patch: added, backported from OpenBSD to fix build against
+ libressl
+
2016-01-04 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: update to 2.5, SECURITY_PATCH++
* BUILD: actually enable nl80211 driver
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index 45a1d02..b5a4eed 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -1,4 +1,10 @@
default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $WPA_RELEASE == "stable" ]] && [[ $CONFIG_TLS == "openssl" ]] && [[
$(get_spell_provider $SPELL SSL) == "libressl" ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/libressl.patch"
+fi &&
+
cd "$SOURCE_DIRECTORY/wpa_supplicant" &&

sed -i "s|/usr/local|$INSTALL_ROOT/usr|g" Makefile &&
diff --git a/net/wpa_supplicant/libressl.patch
b/net/wpa_supplicant/libressl.patch
new file mode 100644
index 0000000..45bae24
--- /dev/null
+++ b/net/wpa_supplicant/libressl.patch
@@ -0,0 +1,69 @@
+$OpenBSD: patch-src_crypto_tls_openssl_c,v 1.3 2015/09/29 11:57:54 dcoppa
Exp $
+
+Compatibility fixes for LibreSSL
+
+--- a/src/crypto/tls_openssl.c.orig Sun Sep 27 21:02:05 2015
++++ b/src/crypto/tls_openssl.c Mon Sep 28 13:43:46 2015
+@@ -2229,7 +2229,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
+ }
+
+ if (certs) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ SSL_clear_chain_certs(ssl);
+ while ((cert = sk_X509_pop(certs)) != NULL) {
+ X509_NAME_oneline(X509_get_subject_name(cert), buf,
+@@ -2247,7 +2247,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
+ /* Try to continue anyway */
+ }
+ sk_X509_free(certs);
+-#ifndef OPENSSL_IS_BORINGSSL
++#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER)
+ res = SSL_build_cert_chain(ssl,
+ SSL_BUILD_CHAIN_FLAG_CHECK |
+ SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR);
+@@ -2812,7 +2812,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
+ if (conn == NULL || keys == NULL)
+ return -1;
+ ssl = conn->ssl;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)
+ return -1;
+
+@@ -2841,7 +2841,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
+ #ifndef CONFIG_FIPS
+ static int openssl_get_keyblock_size(SSL *ssl)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ const EVP_CIPHER *c;
+ const EVP_MD *h;
+ int md_size;
+@@ -2911,7 +2911,7 @@ static int openssl_tls_prf(struct tls_connection *conn
+ "mode");
+ return -1;
+ #else /* CONFIG_FIPS */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ SSL *ssl;
+ u8 *rnd;
+ int ret = -1;
+@@ -3394,7 +3394,7 @@ int tls_connection_set_cipher_list(void *tls_ctx, stru
+
+ wpa_printf(MSG_DEBUG, "OpenSSL: cipher suites: %s", buf + 1);
+
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) ||
defined(EAP_SERVER_FAST)
+ if (os_strstr(buf, ":ADH-")) {
+ /*
+@@ -3977,7 +3977,7 @@ static int tls_sess_sec_cb(SSL *s, void *secret, int *
+ struct tls_connection *conn = arg;
+ int ret;
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ if (conn == NULL || conn->session_ticket_cb == NULL)
+ return 0;
+
diff --git a/python-pypi/python-cryptography/DEPENDS
b/python-pypi/python-cryptography/DEPENDS
index 491f748..0075ded 100755
--- a/python-pypi/python-cryptography/DEPENDS
+++ b/python-pypi/python-cryptography/DEPENDS
@@ -1,4 +1,5 @@
depends PYTHON &&
+depends SSL &&
depends SETUPTOOLS &&
depends cffi &&
depends enum34 &&
diff --git a/python-pypi/python-cryptography/HISTORY
b/python-pypi/python-cryptography/HISTORY
index e591eb6..3550a17 100644
--- a/python-pypi/python-cryptography/HISTORY
+++ b/python-pypi/python-cryptography/HISTORY
@@ -1,2 +1,5 @@
+2016-07-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing SSL dependency
+
2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS: created spell, version 0.8
diff --git a/python-pypi/requests/DETAILS b/python-pypi/requests/DETAILS
index 39d7861..5c18258 100755
--- a/python-pypi/requests/DETAILS
+++ b/python-pypi/requests/DETAILS
@@ -1,8 +1,8 @@
SPELL=requests
- VERSION=2.6.0
+ VERSION=2.10.0
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=https://pypi.python.org/packages/source/r/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:703728e04f4ae5f083892e1ad0cb54777ebcc0120fca9cd3c170e33233fccbb64a635e141e6d7b9c1f1f9d62dc00aa7c66ea890ae62cd6581c881c071a707510
+ SOURCE_URL[0]=https://pypi.io/packages/source/r/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:a93223c3fd21c58f7c0c901b17be17c23dba4efeed8c4347da9d4e04d96a6698e08e01482205661cb7757cc7560d9ae2e62b18f2b422af0cb90fd998fe963ff2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=APACHE
WEB_SITE=http://python-requests.org/
diff --git a/python-pypi/requests/HISTORY b/python-pypi/requests/HISTORY
index da98506..072a0a4 100644
--- a/python-pypi/requests/HISTORY
+++ b/python-pypi/requests/HISTORY
@@ -1,2 +1,8 @@
+2016-07-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.10.0; updated source url
+
+2015-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.7.0
+
2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS: created spell


  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (b99817f5dd0ad7da429c4be29d246730ff9bf345), Vlad Glagolev, 07/01/2016

Archive powered by MHonArc 2.6.24.

Top of Page