Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e9113296282b5efd87165a174f70a6999eb1b332)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e9113296282b5efd87165a174f70a6999eb1b332)
  • Date: Mon, 10 Jul 2017 17:07:19 +0000

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

archive-libs/libarchive/DETAILS | 4 ++--
archive-libs/libarchive/HISTORY | 4 ++++
archive-libs/libarchive/PRE_BUILD | 2 +-
archive-libs/libarchive/libressl.patch | 29 ++++++++++++++++-------------
editors/vim/DETAILS | 4 ++--
editors/vim/HISTORY | 3 +++
utils/youtube-dl/DETAILS | 2 +-
utils/youtube-dl/HISTORY | 3 +++
8 files changed, 32 insertions(+), 19 deletions(-)

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

utils/youtube-dl: version 2017.07.09

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

archive-libs/libarchive: version 3.3.2

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

editors/vim: version 8.0.0704

diff --git a/archive-libs/libarchive/DETAILS b/archive-libs/libarchive/DETAILS
index 6493be8..8ad34e7 100755
--- a/archive-libs/libarchive/DETAILS
+++ b/archive-libs/libarchive/DETAILS
@@ -1,6 +1,6 @@
SPELL=libarchive
- VERSION=3.3.1
-
SOURCE_HASH=sha512:90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
+ VERSION=3.3.2
+
SOURCE_HASH=sha512:1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
SECURITY_PATCH=6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/archive-libs/libarchive/HISTORY b/archive-libs/libarchive/HISTORY
index a712cba..4687acc 100644
--- a/archive-libs/libarchive/HISTORY
+++ b/archive-libs/libarchive/HISTORY
@@ -1,3 +1,7 @@
+2017-07-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.3.2
+ * PRE_BUILD, libressl.patch: patch renewed
+
2017-06-10 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply patch
* libressl.patch: added, to fix build with libressl
diff --git a/archive-libs/libarchive/PRE_BUILD
b/archive-libs/libarchive/PRE_BUILD
index 2c03a54..2af8029 100755
--- a/archive-libs/libarchive/PRE_BUILD
+++ b/archive-libs/libarchive/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-patch -p0 < "${SPELL_DIRECTORY}/libressl.patch"
+patch -p1 < "${SPELL_DIRECTORY}/libressl.patch"
diff --git a/archive-libs/libarchive/libressl.patch
b/archive-libs/libarchive/libressl.patch
index a6f758e..6cc6aba 100644
--- a/archive-libs/libarchive/libressl.patch
+++ b/archive-libs/libarchive/libressl.patch
@@ -1,5 +1,16 @@
---- libarchive/archive_openssl_evp_private.h.orig
-+++ libarchive/archive_openssl_evp_private.h
+From 966f2546cba91e53e1c5afce6969752ad90f8adc Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Mon, 10 Jul 2017 19:02:12 +0200
+Subject: [PATCH] libressl
+
+---
+ libarchive/archive_openssl_evp_private.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libarchive/archive_openssl_evp_private.h
b/libarchive/archive_openssl_evp_private.h
+index 43a3ccc..90b1c8f 100644
+--- a/libarchive/archive_openssl_evp_private.h
++++ b/libarchive/archive_openssl_evp_private.h
@@ -28,7 +28,7 @@
#include <openssl/evp.h>
#include <openssl/opensslv.h>
@@ -9,14 +20,6 @@
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
---- libarchive/archive_openssl_hmac_private.h.orig
-+++ libarchive/archive_openssl_hmac_private.h
-@@ -28,7 +28,7 @@
- #include <openssl/hmac.h>
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #include <stdlib.h> /* malloc, free */
- #include <string.h> /* memset */
- static inline HMAC_CTX *HMAC_CTX_new(void)
+--
+2.13.2
+
diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index b3a0401..0af86da 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -8,12 +8,12 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=hg_http://vim.googlecode.com/hg:${SPELL}-hg
SOURCE_IGNORE=volatile
else
- VERSION=8.0.0702
+ VERSION=8.0.0704
SECURITY_PATCH=4
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=https://github.com/vim/vim/archive/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:6e3c537545d8978a11e2ab4eb4eaf4f3231bd32cf8f9d35d2614d0137753d7d2a508683dd2849a173462ea17ed40b645f2ff04f96952dac25ee137208977bd2d
+
SOURCE_HASH=sha512:3b4bf0c260b915967c0749a0e23f8a806864ca44f68b6f518e51e982edfe6fdfe10f777d9a3b07aaacce36e7af5036cd3286fc2b40dc0b11854e9bfdd482ee10
fi
WEB_SITE=http://www.vim.org
LICENSE[0]=http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index e09cd19..65d9f2c 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,6 @@
+2017-07-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 8.0.0704
+
2017-07-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 8.0.0702

diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index fc9ed28..57d5c5b 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,5 +1,5 @@
SPELL=youtube-dl
- VERSION=2017.07.02
+ VERSION=2017.07.09
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index 246d2cd..1462b72 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,6 @@
+2017-07-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2017.07.09
+
2017-07-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2017.07.03




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e9113296282b5efd87165a174f70a6999eb1b332), Florian Franzmann, 07/10/2017

Archive powered by MHonArc 2.6.24.

Top of Page