Skip to Content.
Sympa Menu

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

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 (f61a9f94d103aca437e621860982d3fb069e2f69)

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 (f61a9f94d103aca437e621860982d3fb069e2f69)
  • Date: Sat, 24 Sep 2016 22:53:57 +0000
GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
ftp/curl/DETAILS | 4
ftp/curl/HISTORY | 6 +
graphics/graphicsmagick/DETAILS | 6 -
graphics/graphicsmagick/HISTORY | 4
libs/libxml2/0003-Fix-NULL-pointer-deref-in-XPointer-range-to.patch | 53
++++++++++
libs/libxml2/DETAILS | 1
libs/libxml2/HISTORY | 5
libs/libxml2/PRE_BUILD | 5
mail/mpop/BUILD | 2
mail/mpop/DEPENDS | 21
++-
mail/mpop/DETAILS | 13 +-
mail/mpop/HISTORY | 10 +
mail/mpop/mpop.gpg |binary
video-libs/gst-plugins-ugly-1.0/BUILD | 2
video-libs/gst-plugins-ugly-1.0/HISTORY | 4
wm-addons/wmctrl/DEPENDS | 5
wm-addons/wmctrl/HISTORY | 3
18 files changed, 125 insertions(+), 19 deletions(-)

New commits:
commit f61a9f94d103aca437e621860982d3fb069e2f69
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libs/libxml2: fix null-pointer dereference

(cherry picked from commit ab77e079be3e355e2e18c0072d7fbbb9c712727e)

commit 6705f8373bf3e62b3118d21a25ed4a4f1b4d2272
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ftp/curl: version 7.50.3, security update

(cherry picked from commit dc657f0c632027d9653e7db3345c0e03ff12254c)

commit 5549c51c9d328b49a04dacd7ae51c4cbb756aa5e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ftp/curl: version 7.50.2

(cherry picked from commit 38ffc53d90a5ef9b915e7400dddbca34971fc1d4)

commit eab37a2aa8355f1e059bc5f127ebf239f4e5d6c2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

x11/xscreensaver: remove relic signature file

(cherry picked from commit e88c83e4de8bda65a57c56ed70a48c89630398c1)

commit ba05bec79934b93241f2ee3ef6a983e4450d2422
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

graphics/graphicsmagick: version 1.3.25, security update

(cherry picked from commit 64a50796f9450ba8a1f26fd0617fc2b06830e19f)

commit e7f40a04816cb16d84a2251ea564550a86fac404
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gst-plugins-ugly-1.0: do not enforce disabled x264

(cherry picked from commit 28f7844e8aec8c60990fd902e3ca00b640da101e)

Conflicts:
video-libs/gst-plugins-ugly-1.0/HISTORY

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

wmctrl: killed xorg-libs

(cherry picked from commit 18ce5ce548aeacc9060859fd12f554b929ae4239)

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

mpop: post-update fixes

(cherry picked from commit 5eea14133e6aa76dd0542c91db2a2e5cdef9ab5b)

Conflicts:
mail/mpop/DETAILS

commit 8c4b6c4e2da9834fb32e1d493cc0b7697a829149
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mail/mpop: update to 1.2.5

(cherry picked from commit ced71c1074ac975440976266dff22dabacf66041)

Conflicts:
mail/mpop/DETAILS
mail/mpop/HISTORY

diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 623de28..7f52d84 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,6 +1,6 @@
SPELL=curl
- VERSION=7.50.1
- SECURITY_PATCH=17
+ VERSION=7.50.3
+ SECURITY_PATCH=18
SOURCE=$SPELL-$VERSION.tar.lzma
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index a296276..de13329 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,9 @@
+2016-09-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.50.3, SECURITY_PATCH++, fixes CFE-2016-7167
+
+2016-09-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 7.50.2
+
2016-08-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.50.1 SECURITY_PATCH++
fix CVE-2016-5419 CVE-2016-5420 CVE-2016-5421
diff --git a/graphics/graphicsmagick/DETAILS b/graphics/graphicsmagick/DETAILS
index ae420df..4f53dcf 100755
--- a/graphics/graphicsmagick/DETAILS
+++ b/graphics/graphicsmagick/DETAILS
@@ -6,9 +6,9 @@
# SOURCE=GraphicsMagick-${VERSION}.tar.bz2
#
SOURCE_URL[0]=ftp://ftp.${SPELL}.org/pub/GraphicsMagick/snapshots/${SOURCE}
#else
- VERSION=1.3.24
-
SOURCE_HASH=sha512:d55f8b7d96bc746e2b501ec6315f174f2ab5f6b31a1d138196bf17b506e6d0c2b91ee19f5dd0a2877cd47910aebdcf11158303e90b1b267c6082d462f8548684
- SECURITY_PATCH=1
+ VERSION=1.3.25
+
SOURCE_HASH=sha512:d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8
+ SECURITY_PATCH=2
SOURCE=GraphicsMagick-${VERSION}.tar.xz
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
#fi
diff --git a/graphics/graphicsmagick/HISTORY b/graphics/graphicsmagick/HISTORY
index 621a198..e16b816 100644
--- a/graphics/graphicsmagick/HISTORY
+++ b/graphics/graphicsmagick/HISTORY
@@ -1,3 +1,7 @@
+2016-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3.25, SECURITY_PATCH++, fixes another case of
+ CVE-2016-2317
+
2016-08-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.24
SECURITY_PATCH=1 fixes CVE-2016-5118 CVE-2016-2317 CVE-2016-2318
diff --git
a/libs/libxml2/0003-Fix-NULL-pointer-deref-in-XPointer-range-to.patch
b/libs/libxml2/0003-Fix-NULL-pointer-deref-in-XPointer-range-to.patch
new file mode 100644
index 0000000..eed5b2e
--- /dev/null
+++ b/libs/libxml2/0003-Fix-NULL-pointer-deref-in-XPointer-range-to.patch
@@ -0,0 +1,53 @@
+From: Nick Wellnhofer <wellnhofer AT aevum.de>
+Date: Sat, 25 Jun 2016 12:35:50 +0200
+Subject: Fix NULL pointer deref in XPointer range-to
+
+- Check for errors after evaluating first operand.
+- Add sanity check for empty stack.
+
+Found with afl-fuzz.
+---
+ result/XPath/xptr/viderror | 4 ++++
+ test/XPath/xptr/viderror | 1 +
+ xpath.c | 7 ++++++-
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+ create mode 100644 result/XPath/xptr/viderror
+ create mode 100644 test/XPath/xptr/viderror
+
+diff --git a/result/XPath/xptr/viderror b/result/XPath/xptr/viderror
+new file mode 100644
+index 0000000..d589882
+--- /dev/null
++++ b/result/XPath/xptr/viderror
+@@ -0,0 +1,4 @@
++
++========================
++Expression: xpointer(non-existing-fn()/range-to(id('chapter2')))
++Object is empty (NULL)
+diff --git a/test/XPath/xptr/viderror b/test/XPath/xptr/viderror
+new file mode 100644
+index 0000000..da8c53b
+--- /dev/null
++++ b/test/XPath/xptr/viderror
+@@ -0,0 +1 @@
++xpointer(non-existing-fn()/range-to(id('chapter2')))
+diff --git a/xpath.c b/xpath.c
+index 113bce6..751665b 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -14005,9 +14005,14 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
+ xmlNodeSetPtr oldset;
+ int i, j;
+
+- if (op->ch1 != -1)
++ if (op->ch1 != -1) {
+ total +=
+ xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
++ CHECK_ERROR0;
++ }
++ if (ctxt->value == NULL) {
++ XP_ERROR0(XPATH_INVALID_OPERAND);
++ }
+ if (op->ch2 == -1)
+ return (total);
+
diff --git a/libs/libxml2/DETAILS b/libs/libxml2/DETAILS
index c589c69..a00bd2c 100755
--- a/libs/libxml2/DETAILS
+++ b/libs/libxml2/DETAILS
@@ -2,6 +2,7 @@
VERSION=2.9.4

SOURCE_HASH=sha512:f5174ab1a3a0ec0037a47f47aa47def36674e02bfb42b57f609563f84c6247c585dbbb133c056953a5adb968d328f18cbc102eb0d00d48eb7c95478389e5daf9
SECURITY_PATCH=11
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index 6475425..1f31008 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,8 @@
+2016-09-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD, 0003-Fix-NULL-pointer-deref-in-XPointer-range-to.patch:
+ add patch from Ubuntu to fix null-pointer dereference
+
2016-05-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.9.4
SECURITY_PATCH++, fixes CVE-2016-1762 CVE-2016-1833 CVE-2016-1834
CVE-2016-1835
diff --git a/libs/libxml2/PRE_BUILD b/libs/libxml2/PRE_BUILD
new file mode 100755
index 0000000..6c70496
--- /dev/null
+++ b/libs/libxml2/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 <
"$SPELL_DIRECTORY/0003-Fix-NULL-pointer-deref-in-XPointer-range-to.patch"
+
diff --git a/mail/mpop/BUILD b/mail/mpop/BUILD
index 077f127..7e991f4 100755
--- a/mail/mpop/BUILD
+++ b/mail/mpop/BUILD
@@ -1,5 +1,5 @@
if [[ "$MPOP_TLS" == "none" ]]
then
-OPTS="--with-ssl=no $OPTS"
+OPTS="--with-tls=no $OPTS"
fi &&
default_build
diff --git a/mail/mpop/DEPENDS b/mail/mpop/DEPENDS
index 160bf5d..bcee5c4 100755
--- a/mail/mpop/DEPENDS
+++ b/mail/mpop/DEPENDS
@@ -1,10 +1,19 @@
-if [[ "$MPOP_TLS" == "gnutls" ]]
-then
-depends "gnutls" "--with-ssl=gnutls"
-elif [[ "$MPOP_TLS" == "SSL" ]]
-then
-depends "SSL" "--with-ssl=openssl"
+if [[ "$MPOP_TLS" == "gnutls" ]]; then
+ depends "gnutls" "--with-tls=gnutls"
+elif [[ "$MPOP_TLS" == "openssl" ]]; then
+ depends "SSL" "--with-tls=openssl"
fi &&
+
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support" &&
+
+optional_depends libsecret \
+ "--with-libsecret" \
+ "--without-libsecret" \
+ "for GNOME password management support" &&
+
optional_depends "libidn" \
"--with-libidn" \
"--without-libidn" \
diff --git a/mail/mpop/DETAILS b/mail/mpop/DETAILS
index addb6b3..d18799a 100755
--- a/mail/mpop/DETAILS
+++ b/mail/mpop/DETAILS
@@ -1,9 +1,14 @@
SPELL=mpop
- VERSION=1.0.22
-
SOURCE_HASH=sha512:f77571138d733b99e0de803a68f559d039031369dba7a41bf94cafbf10b7a4a122486fa6cd5229891bd424abb1b365d670797dc2dd9fe8daac44cd6d8cd64eb8
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=1.2.5
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE2=$SOURCE.sig
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE2_URL[0]=$SOURCE_URL.sig
+ SOURCE_GPG=mpop.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ DOCS="doc/mpoprc.example COPYING NEWS README"
+ DOC_DIRS=""
WEB_SITE=http://mpop.sourceforge.net/
ENTERED=20060526
LICENSE[0]=GPL
diff --git a/mail/mpop/HISTORY b/mail/mpop/HISTORY
index 2472be4..fcdc951 100644
--- a/mail/mpop/HISTORY
+++ b/mail/mpop/HISTORY
@@ -1,3 +1,13 @@
+2016-08-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: switched to upstream gpg check; quoting paths
+ * DEPENDS: added missing dependencies (gettext, libsecret); corrected
+ openssl dependency
+ * mpop.gpg: added, 953E5294 public key (Martin Lambers
<marlam AT marlam.de>)
+
+2016-08-29 Jeremy Blosser <jblosser AT sourcemage.org>
+ * DETAILS: 1.2.5
+ * BUILD, DEPENDS: s/--with-ssl/--with-tls/
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/mail/mpop/mpop.gpg b/mail/mpop/mpop.gpg
new file mode 100644
index 0000000..4bd12e6
Binary files /dev/null and b/mail/mpop/mpop.gpg differ
diff --git a/video-libs/gst-plugins-ugly-1.0/BUILD
b/video-libs/gst-plugins-ugly-1.0/BUILD
index b6b3573..c2cd837 100755
--- a/video-libs/gst-plugins-ugly-1.0/BUILD
+++ b/video-libs/gst-plugins-ugly-1.0/BUILD
@@ -3,8 +3,6 @@ if [ "$GST_PLUGINS_UGLY_MP3" = "y" ]; then
else
OPTS="--disable-mad $OPTS"
fi &&
-# disabled x264 plugin as it is not compatible with the current API
-OPTS="$OPTS --disable-x264" &&
if [[ $GST_PLUGINS_UGLY_EXPERIMENTAL == "y" ]]; then
OPTS+=" --enable-experimental"
fi &&
diff --git a/video-libs/gst-plugins-ugly-1.0/HISTORY
b/video-libs/gst-plugins-ugly-1.0/HISTORY
index 5c30f4a..feba2e7 100644
--- a/video-libs/gst-plugins-ugly-1.0/HISTORY
+++ b/video-libs/gst-plugins-ugly-1.0/HISTORY
@@ -1,3 +1,7 @@
+2016-09-05 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: It is time we actually tried building the x264
+ plugin, eh? It builds alright here.
+
2014-12-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.5

diff --git a/wm-addons/wmctrl/DEPENDS b/wm-addons/wmctrl/DEPENDS
index 23b6abf..2fd2eaf 100755
--- a/wm-addons/wmctrl/DEPENDS
+++ b/wm-addons/wmctrl/DEPENDS
@@ -1,2 +1,5 @@
-depends xorg-libs &&
+depends libx11 &&
+depends libice &&
+depends libsm &&
+depends libxmu &&
depends glib2
diff --git a/wm-addons/wmctrl/HISTORY b/wm-addons/wmctrl/HISTORY
index da55d7c..96ed83b 100644
--- a/wm-addons/wmctrl/HISTORY
+++ b/wm-addons/wmctrl/HISTORY
@@ -1,3 +1,6 @@
+2016-08-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: killed xorg-libs
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/x11/xscreensaver/xscreensaver-5.22.tar.gz.sig
b/x11/xscreensaver/xscreensaver-5.22.tar.gz.sig
deleted file mode 100644
index cdb8565..0000000
Binary files a/x11/xscreensaver/xscreensaver-5.22.tar.gz.sig and /dev/null
differ


  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (f61a9f94d103aca437e621860982d3fb069e2f69), Vlad Glagolev, 09/24/2016

Archive powered by MHonArc 2.6.24.

Top of Page