Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 ftp/curl/patches/0001-openssl-fix-build-with-LibreSSL-2.7.patch              
    |   73 ----------
 
ftp/curl/patches/0002-openssl-provide-defines-for-argument-typecasts-to-bu.patch
 |   42 -----
 haskell/haskell-lifted-async/DETAILS                                         
    |    4 
 haskell/haskell-lifted-async/HISTORY                                         
    |    3 
 python-pypi/python-pbr/DETAILS                                               
    |    4 
 python-pypi/python-pbr/HISTORY                                               
    |    3 
 utils/youtube-dl/DETAILS                                                     
    |    2 
 utils/youtube-dl/HISTORY                                                     
    |    3 
 8 files changed, 14 insertions(+), 120 deletions(-)

New commits:
commit 2eaf20eb0c72cf32534e13685f9ea39b0176be01
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    ftp/curl: remove leftover files from previous commit

commit af5f685ef34c5a89ef7a0e3b528519094625ab02
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-lifted-async: version 0.10.0.2

commit b3bf01672f3fc9bde6a2a391ad983c510922de80
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    python-pypi/python-pbr: version 4.0.3

commit b73540c4cafb2f7d386a98950c86866aa2e950f5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/youtube-dl: version 2018.05.18

diff --git a/ftp/curl/patches/0001-openssl-fix-build-with-LibreSSL-2.7.patch 
b/ftp/curl/patches/0001-openssl-fix-build-with-LibreSSL-2.7.patch
deleted file mode 100644
index d1277e7..0000000
--- a/ftp/curl/patches/0001-openssl-fix-build-with-LibreSSL-2.7.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 7c90c93c0b061da81f69fabdd57125b2783c15fb Mon Sep 17 00:00:00 2001
-From: Bernard Spil <brnrd AT FreeBSD.org>
-Date: Mon, 2 Apr 2018 19:04:06 +0200
-Subject: [PATCH 1/3] openssl: fix build with LibreSSL 2.7
-
- - LibreSSL 2.7 implements (most of) OpenSSL 1.1 API
-
-Fixes #2319
-Closes #2447
-Closes #2448
-
-Signed-off-by: Bernard Spil <brnrd AT FreeBSD.org>
----
- lib/vtls/openssl.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
-index 2a6b3cf..bbb8ec7 100644
---- a/lib/vtls/openssl.c
-+++ b/lib/vtls/openssl.c
-@@ -104,7 +104,8 @@
- #endif
- 
- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \
--  !defined(LIBRESSL_VERSION_NUMBER)
-+    !(defined(LIBRESSL_VERSION_NUMBER) && \
-+      LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
- #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */
- #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */
-@@ -128,7 +129,8 @@ static unsigned long OpenSSL_version_num(void)
- #endif
- 
- #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \
--  !defined(LIBRESSL_VERSION_NUMBER)
-+    !(defined(LIBRESSL_VERSION_NUMBER) && \
-+      LIBRESSL_VERSION_NUMBER < 0x20700000L)
- #define HAVE_X509_GET0_SIGNATURE 1
- #endif
- 
-@@ -147,7 +149,7 @@ static unsigned long OpenSSL_version_num(void)
-  * Whether SSL_CTX_set_keylog_callback is available.
-  * OpenSSL: supported since 1.1.1 
https://github.com/openssl/openssl/pull/2287
-  * BoringSSL: supported since d28f59c27bac (committed 2015-11-19)
-- * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it
-+ * LibreSSL: unsupported in at least 2.7.2 (explicitly check for it since it
-  *           lies and pretends to be OpenSSL 2.0.0).
-  */
- #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \
-@@ -259,7 +261,9 @@ static void tap_ssl_key(const SSL *ssl, ssl_tap_state_t 
*state)
-   if(!session || !keylog_file_fp)
-     return;
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && 
!defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
-+    !(defined(LIBRESSL_VERSION_NUMBER) && \
-+      LIBRESSL_VERSION_NUMBER < 0x20700000L)
-   /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that
-    * we have a valid SSL context if we have a non-NULL session. */
-   SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE);
-@@ -2082,8 +2086,7 @@ static CURLcode ossl_connect_step1(struct connectdata 
*conn, int sockindex)
-   case CURL_SSLVERSION_TLSv1_2:
-   case CURL_SSLVERSION_TLSv1_3:
-     /* it will be handled later with the context options */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
--    !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-     req_method = TLS_client_method();
- #else
-     req_method = SSLv23_client_method();
--- 
-2.17.0
-
diff --git 
a/ftp/curl/patches/0002-openssl-provide-defines-for-argument-typecasts-to-bu.patch
 
b/ftp/curl/patches/0002-openssl-provide-defines-for-argument-typecasts-to-bu.patch
deleted file mode 100644
index 953bc70..0000000
--- 
a/ftp/curl/patches/0002-openssl-provide-defines-for-argument-typecasts-to-bu.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 256b80fe81ad6de63e7fcffbef5e2ce554319ae8 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel AT haxx.se>
-Date: Wed, 4 Apr 2018 10:55:56 +0200
-Subject: [PATCH 2/3] openssl: provide defines for argument typecasts to build
- warning-free
-
-... as OpenSSL >= 1.1.0 and libressl >= 2.7.0 use different argument types.
----
- lib/vtls/openssl.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
-index bbb8ec7..fc9ad47 100644
---- a/lib/vtls/openssl.c
-+++ b/lib/vtls/openssl.c
-@@ -112,6 +112,14 @@
- #define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */
- #define CONST_EXTS const
- #define HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED 1
-+
-+/* funny typecast define due to difference in API */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define ARG2_X509_signature_print (X509_ALGOR *)
-+#else
-+#define ARG2_X509_signature_print
-+#endif
-+
- #else
- /* For OpenSSL before 1.1.0 */
- #define ASN1_STRING_get0_data(x) ASN1_STRING_data(x)
-@@ -2802,7 +2810,7 @@ static CURLcode get_cert_chain(struct connectdata 
*conn,
-       ASN1_STRING *a = ASN1_STRING_new();
-       if(a) {
-         X509_get0_signature(&psig, &palg, x);
--        X509_signature_print(mem, palg, a);
-+        X509_signature_print(mem, ARG2_X509_signature_print palg, a);
-         ASN1_STRING_free(a);
- 
-         if(palg) {
--- 
-2.17.0
-
diff --git a/haskell/haskell-lifted-async/DETAILS 
b/haskell/haskell-lifted-async/DETAILS
index 0855c4d..03edfbd 100755
--- a/haskell/haskell-lifted-async/DETAILS
+++ b/haskell/haskell-lifted-async/DETAILS
@@ -1,8 +1,8 @@
            SPELL=haskell-lifted-async
-         VERSION=0.10.0.1
+         VERSION=0.10.0.2
           SOURCE="lifted-async-${VERSION}.tar.gz"
    
SOURCE_URL[0]="https://hackage.haskell.org/package/lifted-async-${VERSION}/${SOURCE}";
-     
SOURCE_HASH=sha512:a0bc15915cd42b96cd4ae514564436cbb83af668c9254aa52f88dd66f3a5b637a21e11f6197a6398c5206d54cd404e21d71b0d8f48c66ca64e924f7d672804fb
+     
SOURCE_HASH=sha512:f8d4de4eb0b89bbcc6137f429f6595f4a42cf0761df420abd093bd31b4b7bc0bfc46908c7fd2eb67a4beff02808e0491d575ae27f329727cfdd8e03f0eca67a7
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/lifted-async-${VERSION}"
         WEB_SITE="https://github.com/maoe/lifted-async";
       LICENSE[0]=BSD
diff --git a/haskell/haskell-lifted-async/HISTORY 
b/haskell/haskell-lifted-async/HISTORY
index 2d68d39..dc6cbca 100644
--- a/haskell/haskell-lifted-async/HISTORY
+++ b/haskell/haskell-lifted-async/HISTORY
@@ -1,3 +1,6 @@
+2018-05-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.10.0.2
+
 2018-03-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.10.0.1
 
diff --git a/python-pypi/python-pbr/DETAILS b/python-pypi/python-pbr/DETAILS
index fe88759..55bf096 100755
--- a/python-pypi/python-pbr/DETAILS
+++ b/python-pypi/python-pbr/DETAILS
@@ -1,8 +1,8 @@
            SPELL=python-pbr
-         VERSION=4.0.2
+         VERSION=4.0.3
           SOURCE="pbr-${VERSION}.tar.gz"
    
SOURCE_URL[0]=https://github.com/openstack-dev/pbr/archive/${VERSION}.tar.gz
-     
SOURCE_HASH=sha512:811c55e41f90b0861922eb69ca329abcfde0c335961e41272c9c5087f42c655e0fb951e77d5b0e976a373aa825ebea49151d513abe809f3ced274bb9bd535a34
+     
SOURCE_HASH=sha512:354fef43cc2c4a615df0940a940f78a2c98e9edcbc8f4bc5e7e7743081ab3826cadf78a5a8e67468628d7a856d60c5eab8a713b1058cc511853ed156cacd684d
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/pbr-${VERSION}"
         WEB_SITE="https://github.com/openstack-dev/pbr/";
       LICENSE[0]=APACHE
diff --git a/python-pypi/python-pbr/HISTORY b/python-pypi/python-pbr/HISTORY
index 728c6a6..06e8801 100644
--- a/python-pypi/python-pbr/HISTORY
+++ b/python-pypi/python-pbr/HISTORY
@@ -1,3 +1,6 @@
+2018-05-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.0.3
+
 2018-04-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 4.0.2
 
diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index 44cc6c5..160c30e 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,5 +1,5 @@
            SPELL=youtube-dl
-         VERSION=2018.05.09
+         VERSION=2018.05.18
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index bf4b583..e4a606e 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,6 @@
+2018-05-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2018.05.18
+
 2018-05-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2018.05.09