Skip to Content.
Sympa Menu

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

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 (606538658a6378c86e091be9d4fccfbcb1e96423)
  • Date: Mon, 10 Oct 2016 10:35:17 +0000

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

audio-players/moc/0001-use-channel_layout.h-instead-of-audioconvert.h.patch
| 25 ----------
audio-players/moc/HISTORY
| 4 +
audio-players/moc/PRE_BUILD
| 2
crypto/gnutls/DETAILS
| 8 +--
crypto/gnutls/HISTORY
| 4 +
doc/man-pages/DETAILS
| 4 -
doc/man-pages/HISTORY
| 3 +
7 files changed, 18 insertions(+), 32 deletions(-)

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

crypto/gnutls: versions 3.3.26, 3.4.16, 3.5.5, security update

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

doc/man-pages: version 4.08

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

audio-players/moc: remove obsolete patch

diff --git
a/audio-players/moc/0001-use-channel_layout.h-instead-of-audioconvert.h.patch
b/audio-players/moc/0001-use-channel_layout.h-instead-of-audioconvert.h.patch
deleted file mode 100644
index 3f822a9..0000000
---
a/audio-players/moc/0001-use-channel_layout.h-instead-of-audioconvert.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fff2e19c6afb85edfd74284aafdd4365014e848a Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.net>
-Date: Sun, 20 Mar 2016 12:23:42 +0100
-Subject: [PATCH] use channel_layout.h instead of audioconvert.h
-
----
- decoder_plugins/ffmpeg/ffmpeg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/decoder_plugins/ffmpeg/ffmpeg.c
b/decoder_plugins/ffmpeg/ffmpeg.c
-index 206b2b1..66538db 100644
---- a/decoder_plugins/ffmpeg/ffmpeg.c
-+++ b/decoder_plugins/ffmpeg/ffmpeg.c
-@@ -67,7 +67,7 @@ GCC_DIAG_OFF(deprecated-declarations)
- GCC_DIAG_ON(deprecated-declarations)
- #include <libavutil/mathematics.h>
- #ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS
--#include <libavutil/audioconvert.h>
-+#include <libavutil/channel_layout.h>
- #endif
- #else
- #include <ffmpeg/avformat.h>
---
-2.7.4
-
diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY
index bf34a6d..ae80092 100644
--- a/audio-players/moc/HISTORY
+++ b/audio-players/moc/HISTORY
@@ -1,3 +1,7 @@
+2016-10-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD,
0001-use-channel_layout.h-instead-of-audioconvert.h.patch:
+ remove obsolete patch
+
2016-09-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.5.1

diff --git a/audio-players/moc/PRE_BUILD b/audio-players/moc/PRE_BUILD
index 00a09a1..98788ad 100755
--- a/audio-players/moc/PRE_BUILD
+++ b/audio-players/moc/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 <
"$SPELL_DIRECTORY/0001-use-channel_layout.h-instead-of-audioconvert.h.patch"
&&
+
autoreconf -fi
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index d1f863e..b792a9d 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -6,15 +6,15 @@ fi

case $GNUTLS_BRANCH in
stable)
- VERSION=3.4.15
+ VERSION=3.4.16
SECURITY_PATCH=18
;;
stable-old)
- VERSION=3.3.24
- SECURITY_PATCH=15
+ VERSION=3.3.26
+ SECURITY_PATCH=16
;;
stable-next)
- VERSION=3.5.4
+ VERSION=3.5.5
SECURITY_PATCH=2
;;
esac
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 1e58077..d1a516a 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,7 @@
+2016-10-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable-old 3.3.26, security update, fixes GNUTLS-SA-2016-3,
+ stable 3.4.16, stable-next 3.5.5
+
2016-09-08 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated stable/stable-next branches to 3.4.15/3.5.4
respectively, SECURITY_PATCH++, GNUTLS-SA-2016-3
diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS
index fe3c519..190f788 100755
--- a/doc/man-pages/DETAILS
+++ b/doc/man-pages/DETAILS
@@ -1,6 +1,6 @@
SPELL=man-pages
- VERSION=4.07
-
SOURCE_HASH=sha512:76b6cf7c2ae8b10652b5419e5e0141a515b02da8b83aa1bc3a7c4bb9ad0647af80b60603f8253f2f562752a970701b752d7101f83cade74019a8b0d61ecde7df
+ VERSION=4.08
+
SOURCE_HASH=sha512:e00fcf1573f1d6b1e3ec3f59e888ce1a24f6a77c89dcb29225e3d828345c34de5628fa0aeb5d58d2c5fd86ec77544d909054e2b1b0c807e98d82813bce7b3521
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY
index 4111021..d251f07 100644
--- a/doc/man-pages/HISTORY
+++ b/doc/man-pages/HISTORY
@@ -1,3 +1,6 @@
+2016-10-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.08
+
2016-0806 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.07




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (606538658a6378c86e091be9d4fccfbcb1e96423), Florian Franzmann, 10/10/2016

Archive powered by MHonArc 2.6.24.

Top of Page