Skip to Content.
Sympa Menu

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

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 (6f83b9ecc99d13e554dcdde01c2d9fdc7d51e092)

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 (6f83b9ecc99d13e554dcdde01c2d9fdc7d51e092)
  • Date: Tue, 24 Mar 2015 10:09:02 -0500
GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

devel/valgrind/DETAILS | 4 -
devel/valgrind/HISTORY | 5 +
devel/valgrind/PRE_BUILD | 7 +-
devel/valgrind/glibc.patch | 37 ++++++++++++
gnome2-libs/evolution-data-server/DEPENDS | 2
gnome2-libs/evolution-data-server/HISTORY | 3 +
gnome2-libs/gtkhtml2/DEPENDS | 1
gnome2-libs/gtkhtml2/HISTORY | 3 +
graphics-libs/harfbuzz/HISTORY | 3 +
graphics-libs/harfbuzz/PRE_SUB_DEPENDS | 1
graphics-libs/harfbuzz/SUB_DEPENDS | 1
net/ipsec-tools/DEPENDS | 1
net/ipsec-tools/HISTORY | 10 ++-
net/ipsec-tools/PRE_BUILD | 5 +
net/ipsec-tools/glibc.patch | 11 +++
net/ipsec-tools/no-flex-link.patch | 87
++++++++++++++++++++++++++++++
net/libpcap/DETAILS | 2
net/libpcap/HISTORY | 3 +
net/tcpdump/DETAILS | 3 -
net/tcpdump/HISTORY | 3 +
video/guvcview/DEPENDS | 15 ++++-
video/guvcview/HISTORY | 3 +
xorg-lib/libxfont/DETAILS | 4 -
xorg-lib/libxfont/HISTORY | 5 +
24 files changed, 208 insertions(+), 11 deletions(-)

New commits:
commit 6f83b9ecc99d13e554dcdde01c2d9fdc7d51e092
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

harfbuzz: add ICU sub depends

Conflicts:
graphics-libs/harfbuzz/HISTORY

(cherry picked from commit 65e8067d914f3559234c727d0139a33c8ba2cef1)

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

gtkhtml2: missing depends

(cherry picked from commit 9c17d051ed6a2f4e5162efea230b6d8579e09eb9)

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

evolution-data-server: missing depends

(cherry picked from commit 4405dca0df925aea7a18972c226b86134d095fd1)

commit 3d6296c75a588cf75a720cce591b179634a8e37e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

tcpdump 4.7.3, SECURITY_PATCH=1

CVE-2014-9140, CVE-2015-0261, CVE-2015-2153

(cherry picked from commit 9c57f8ef09368c4110f511bd7adee0a2228b0e98)

commit b596af48c1940a00b7b70d89f00b1acf12918b36
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libpcap 1.7.2

(cherry picked from commit 7d9a69e0afc25685360d8d34078e77521bfa9351)

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

valgrind: => 3.10.1

(cherry picked from commit b4c06e8d2650a136f511acf403a523538dae421d)

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

ipsec-tools: fixed build & added missing dependency

(cherry picked from commit c0fbc7ee73759864dd05732cf4ab3f44c84dbe58)

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

guvcview: added missing dependencies

(cherry picked from commit 7acbfd117c5ef3c7205d3d6f30983cebd609f1ed)

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

libxfont: => 1.4.9 [security]

diff --git a/devel/valgrind/DETAILS b/devel/valgrind/DETAILS
index d7c4349..9708436 100755
--- a/devel/valgrind/DETAILS
+++ b/devel/valgrind/DETAILS
@@ -9,8 +9,8 @@ then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
else
- VERSION=3.9.0
-
SOURCE_HASH=sha512:4b748f9f9a647df50db75fb56f83ee2f25bad9f1f4e4f05c4ac1d1e919e6cd954975c1f325dbedb509c44be1a8516ac2a5f269090946a0d728166ab183016c7b
+ VERSION=3.10.1
+
SOURCE_HASH=sha512:8f3d27637c13b06381b3dd44088244e0cf2f7008f40e46f34322f2a5bfa6373d29ce68ff49f19c48f1a5f139d8be5838b9606206e0ce2599c5f74c0db8ce2642
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://valgrind.org/downloads/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/valgrind/HISTORY b/devel/valgrind/HISTORY
index 0e68c30..d7df2be 100644
--- a/devel/valgrind/HISTORY
+++ b/devel/valgrind/HISTORY
@@ -1,3 +1,8 @@
+2015-03-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.10.1
+ * PRE_BUILD: apply patch
+ * glibc.patch: added, to fix build with recent glibc
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

diff --git a/devel/valgrind/PRE_BUILD b/devel/valgrind/PRE_BUILD
index 8c5c7b9..0d326db 100755
--- a/devel/valgrind/PRE_BUILD
+++ b/devel/valgrind/PRE_BUILD
@@ -1,7 +1,10 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $VALGRIND_BRANCH == "scm" ]]
-then
+patch -p1 < "$SPELL_DIRECTORY/glibc.patch" &&
+
+if [[ $VALGRIND_BRANCH == "scm" ]]; then
NOCONFIGURE=Y ./autogen.sh
+else
+ autoreconf -fi
fi
diff --git a/devel/valgrind/glibc.patch b/devel/valgrind/glibc.patch
new file mode 100644
index 0000000..8b902dd
--- /dev/null
+++ b/devel/valgrind/glibc.patch
@@ -0,0 +1,37 @@
+Backport of glibc 2.19 and 2.20 and 2.21 support.
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton AT intel.com>
+
+diff --git a/configure.ac b/configure.ac
+index 229ab98..1c18108 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -918,6 +918,27 @@ case "${GLIBC_VERSION}" in
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
++ 2.19)
++ AC_MSG_RESULT(2.19 family)
++ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp
${DEFAULT_SUPP}"
++ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++ ;;
++ 2.20)
++ AC_MSG_RESULT(2.20 family)
++ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.x])
++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp
${DEFAULT_SUPP}"
++ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++ ;;
++ 2.21)
++ AC_MSG_RESULT(2.21 family)
++ AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.x])
++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp
${DEFAULT_SUPP}"
++ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++ ;;
+ darwin)
+ AC_MSG_RESULT(Darwin)
+ AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/gnome2-libs/evolution-data-server/DEPENDS
b/gnome2-libs/evolution-data-server/DEPENDS
index 6932a20..fbd0a04 100755
--- a/gnome2-libs/evolution-data-server/DEPENDS
+++ b/gnome2-libs/evolution-data-server/DEPENDS
@@ -8,6 +8,8 @@ depends libical &&
depends intltool &&
depends dbus-glib &&
depends libgdata &&
+depends libsecret &&
+depends gcr &&

optional_depends "gtk-doc" \
"--enable-gtk-doc" \
diff --git a/gnome2-libs/evolution-data-server/HISTORY
b/gnome2-libs/evolution-data-server/HISTORY
index 0e99224..eac0fad 100644
--- a/gnome2-libs/evolution-data-server/HISTORY
+++ b/gnome2-libs/evolution-data-server/HISTORY
@@ -1,3 +1,6 @@
+2014-10-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: libsecret, gcr
+
2013-05-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.8.1
* BUILD: --disable-uoa added to disable Ubuntu Online Accounts
diff --git a/gnome2-libs/gtkhtml2/DEPENDS b/gnome2-libs/gtkhtml2/DEPENDS
index d465e07..dc6e0f4 100755
--- a/gnome2-libs/gtkhtml2/DEPENDS
+++ b/gnome2-libs/gtkhtml2/DEPENDS
@@ -7,6 +7,7 @@ depends gconf2 &&
depends enchant &&
depends iso-codes &&
depends gnome-icon-theme &&
+depends gsettings-desktop-schemas &&

optional_depends libsoup "" "" "Enable soup" &&

diff --git a/gnome2-libs/gtkhtml2/HISTORY b/gnome2-libs/gtkhtml2/HISTORY
index dfd3577..4ca6361 100644
--- a/gnome2-libs/gtkhtml2/HISTORY
+++ b/gnome2-libs/gtkhtml2/HISTORY
@@ -1,3 +1,6 @@
+2014-10-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: added gsettings-desktop-schemas
+
2014-02-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.6.6

diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index b16089b..8704c71 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,6 @@
+2015-03-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: added ICU
+
2015-02-12 Eric Sandall <sandalle AT sourcemage.org>
* PRE_SUB_DEPENDS: Fix syntax error and in REPAIR file

diff --git a/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
b/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
index e3e8d55..6fc414a 100755
--- a/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
+++ b/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
@@ -1,6 +1,7 @@
case $THIS_SUB_DEPENDS in
GRAPHITE2) is_depends_enabled $SPELL graphite2 && return 0 ;;
FT) is_depends_enabled $SPELL freetype2 && return 0 ;;
+ ICU) is_depends_enabled $SPELL icu && return 0 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/graphics-libs/harfbuzz/SUB_DEPENDS
b/graphics-libs/harfbuzz/SUB_DEPENDS
index b95ba73..c8f6a96 100755
--- a/graphics-libs/harfbuzz/SUB_DEPENDS
+++ b/graphics-libs/harfbuzz/SUB_DEPENDS
@@ -1,6 +1,7 @@
case $THIS_SUB_DEPENDS in
GRAPHITE2) depends graphite2 "--with-graphite2" ;;
FT) depends freetype2 '--with-freetype=yes' ;;
+ ICU) depends icu "--with-icu" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/net/ipsec-tools/DEPENDS b/net/ipsec-tools/DEPENDS
index 9808176..8c9cf18 100755
--- a/net/ipsec-tools/DEPENDS
+++ b/net/ipsec-tools/DEPENDS
@@ -1,3 +1,4 @@
+depends flex &&
depends SSL &&

optional_depends readline \
diff --git a/net/ipsec-tools/HISTORY b/net/ipsec-tools/HISTORY
index f1268d0..2b0c74c 100644
--- a/net/ipsec-tools/HISTORY
+++ b/net/ipsec-tools/HISTORY
@@ -1,5 +1,11 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2015-03-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing required flex dependency
+ * PRE_BUILD: added, to apply patches
+ * no-flex-link.patch: added official patch, to fix build with recent
flex
+ * glibc.patch: added, to fix build with recent glibc
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL

2014-04-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.8.2
diff --git a/net/ipsec-tools/PRE_BUILD b/net/ipsec-tools/PRE_BUILD
new file mode 100755
index 0000000..5afd462
--- /dev/null
+++ b/net/ipsec-tools/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/no-flex-link.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/glibc.patch"
diff --git a/net/ipsec-tools/glibc.patch b/net/ipsec-tools/glibc.patch
new file mode 100644
index 0000000..1d2ee01
--- /dev/null
+++ b/net/ipsec-tools/glibc.patch
@@ -0,0 +1,11 @@
+--- src/include-glibc/glibc-bugs.h.orig 2006-09-09 20:22:08.000000000
+0400
++++ src/include-glibc/glibc-bugs.h 2015-03-17 23:00:06.741748063 +0300
+@@ -4,7 +4,7 @@
+ #define __GLIBC_BUGS_H__ 1
+
+ #define _XOPEN_SOURCE 500
+-#define _BSD_SOURCE
++#define _DEFAULT_SOURCE
+
+ #include <features.h>
+ #include <sys/types.h>
diff --git a/net/ipsec-tools/no-flex-link.patch
b/net/ipsec-tools/no-flex-link.patch
new file mode 100644
index 0000000..13e9d73
--- /dev/null
+++ b/net/ipsec-tools/no-flex-link.patch
@@ -0,0 +1,87 @@
+From e48b9097dce7bc2bfbb9e9c542124d3b5cebab39 Mon Sep 17 00:00:00 2001
+From: Paul Barker <paul AT paulbarker.me.uk>
+Date: Wed, 5 Mar 2014 13:39:14 +0000
+Subject: [PATCH] Don't link against libfl
+
+We can remove all references to yywrap by adding "%option noyywrap"
statements
+to each flex source file that doesn't override yywrap. After this, we no
longer
+need to link against libfl and so no longer get errors about undefined
+references to yylex.
+
+Signed-off-by: Paul Barker <paul AT paulbarker.me.uk>
+Upstream-status: Submitted 2014-03-11
+ see
http://sourceforge.net/p/ipsec-tools/mailman/ipsec-tools-devel/thread/CANyK_8ewmxGA3vBVJW6s1APXPmxPR%2BDFWZ61EL8pCt288aKQ6w%40mail.gmail.com/#msg32088797
+---
+ src/libipsec/Makefile.am | 1 -
+ src/racoon/Makefile.am | 2 +-
+ src/racoon/cftoken.l | 2 ++
+ src/setkey/Makefile.am | 1 -
+ src/setkey/token.l | 2 ++
+ 5 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/libipsec/Makefile.am b/src/libipsec/Makefile.am
+index 6a4e3b3..df1e106 100644
+--- a/src/libipsec/Makefile.am
++++ b/src/libipsec/Makefile.am
+@@ -26,7 +26,6 @@ libipsec_la_SOURCES = \
+ # version is current:revision:age.
+ # See:
http://www.gnu.org/manual/libtool-1.4.2/html_chapter/libtool_6.html#SEC32
+ libipsec_la_LDFLAGS = -version-info 0:1:0
+-libipsec_la_LIBADD = $(LEXLIB)
+
+ noinst_HEADERS = ipsec_strerror.h
+
+diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am
+index dbaded9..0662957 100644
+--- a/src/racoon/Makefile.am
++++ b/src/racoon/Makefile.am
+@@ -38,7 +38,7 @@ racoon_SOURCES = \
+ cftoken.l cfparse.y prsa_tok.l prsa_par.y
+ EXTRA_racoon_SOURCES = isakmp_xauth.c isakmp_cfg.c isakmp_unity.c
throttle.c \
+ isakmp_frag.c nattraversal.c security.c $(MISSING_ALGOS)
+-racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS)
$(LEXLIB) \
++racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) \
+ $(SECCTX_OBJS) vmbuf.o sockmisc.o misc.o ../libipsec/libipsec.la
+ racoon_DEPENDENCIES = \
+ $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(SECCTX_OBJS) \
+diff --git a/src/racoon/cftoken.l b/src/racoon/cftoken.l
+index 490242c..1701922 100644
+--- a/src/racoon/cftoken.l
++++ b/src/racoon/cftoken.l
+@@ -106,6 +106,8 @@ static int incstackp = 0;
+ static int yy_first_time = 1;
+ %}
+
++%option noyywrap
++
+ /* common seciton */
+ nl \n
+ ws [ \t]+
+diff --git a/src/setkey/Makefile.am b/src/setkey/Makefile.am
+index 746c1f1..389e6cf 100644
+--- a/src/setkey/Makefile.am
++++ b/src/setkey/Makefile.am
+@@ -13,7 +13,6 @@ setkey_SOURCES = \
+
+ setkey_LDFLAGS = ../libipsec/libipsec.la
+ setkey_DEPENDENCIES = ../libipsec/libipsec.la
+-setkey_LDADD = $(LEXLIB)
+
+ noinst_HEADERS = vchar.h extern.h
+ man8_MANS = setkey.8
+diff --git a/src/setkey/token.l b/src/setkey/token.l
+index ad3d843..eb23b76 100644
+--- a/src/setkey/token.l
++++ b/src/setkey/token.l
+@@ -88,6 +88,8 @@
+ #endif
+ %}
+
++%option noyywrap
++
+ /* common section */
+ nl \n
+ ws [ \t]+
+--
+1.9.0
+
diff --git a/net/libpcap/DETAILS b/net/libpcap/DETAILS
index 2b39d37..bb00eda 100755
--- a/net/libpcap/DETAILS
+++ b/net/libpcap/DETAILS
@@ -1,5 +1,5 @@
SPELL=libpcap
- VERSION=1.6.2
+ VERSION=1.7.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY
index 763cd79..d209542 100644
--- a/net/libpcap/HISTORY
+++ b/net/libpcap/HISTORY
@@ -1,3 +1,6 @@
+2015-03-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.7.2
+
2014-09-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.2

diff --git a/net/tcpdump/DETAILS b/net/tcpdump/DETAILS
index d8af69f..a85d537 100755
--- a/net/tcpdump/DETAILS
+++ b/net/tcpdump/DETAILS
@@ -1,5 +1,6 @@
SPELL=tcpdump
- VERSION=4.6.2
+ VERSION=4.7.3
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/tcpdump/HISTORY b/net/tcpdump/HISTORY
index fea2605..a2632e9 100644
--- a/net/tcpdump/HISTORY
+++ b/net/tcpdump/HISTORY
@@ -1,3 +1,6 @@
+2015-03-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.7.3, SECURITY_PATCH=1
+
2014-09-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.6.2

diff --git a/video/guvcview/DEPENDS b/video/guvcview/DEPENDS
index d0cfbf3..f15c051 100755
--- a/video/guvcview/DEPENDS
+++ b/video/guvcview/DEPENDS
@@ -1,11 +1,24 @@
depends gtk+3 &&
-depends sdl &&
depends DEVICE-MANAGER &&
depends libpng &&
depends v4l-utils &&
depends portaudio19 &&
depends LIBAVCODEC &&

+optional_depends sdl2 \
+ "--enable-sdl2" \
+ "--disable-sdl2" \
+ "for sdl2 support" &&
+
+if ! is_depends_enabled $SPELL sdl2; then
+ depends sdl
+fi &&
+
+optional_depends gsl \
+ "--enable-gsl" \
+ "--disable-gsl" \
+ "for GSL support" &&
+
optional_depends pulseaudio \
"--enable-pulse" \
"--disable-pulse" \
diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index fca3ded..b42cc3d 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,3 +1,6 @@
+2015-03-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing sdl2 and gsl optional dependencies
+
2015-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: UDEV -> DEVICE-MANAGER

diff --git a/xorg-lib/libxfont/DETAILS b/xorg-lib/libxfont/DETAILS
index e450962..f573455 100755
--- a/xorg-lib/libxfont/DETAILS
+++ b/xorg-lib/libxfont/DETAILS
@@ -1,7 +1,8 @@
SPELL=libxfont
PKG=libXfont
VERSION=1.4.3
-
SOURCE_HASH=sha512:64b72cb9bad4a1090808df0cc1adfb1856fa1352f11d316c444f91d99f226856f77b19050e5418b3ece77f2e99cc4d50667a83c97f0a54ffa45b336ae5c54b90
+ SECURITY_PATCH=2
+
SOURCE_HASH=sha512:d541dac1c8639578a122eaa61c3df1cd180f820609a02897baf1f1e45f49109b3a755a7f3b5f284716f5e6f494a829aa86be1c730156eb82db11b1551a320654
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
@@ -9,7 +10,6 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org/wiki
ENTERED=20051125
LICENSE[0]=XCL
- SECURITY_PATCH=1
SHORT="Module libxfont for xorg"
cat << EOF
libXfont provides the core of the legacy X11 font system, handling the
diff --git a/xorg-lib/libxfont/HISTORY b/xorg-lib/libxfont/HISTORY
index e938797..9244376 100644
--- a/xorg-lib/libxfont/HISTORY
+++ b/xorg-lib/libxfont/HISTORY
@@ -1,3 +1,8 @@
+2015-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.9; SECURITY_PATCH++ (CVE-2015-1802,
+ CVE-2015-1803, CVE-2015-1804)
+ * REPAIR^4d0c876f0168ba63683ab81990cdb8ab^PRE_SUB_DEPENDS: chmod +x
+
2010-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.3

diff --git
a/xorg-lib/libxfont/REPAIR^4d0c876f0168ba63683ab81990cdb8ab^PRE_SUB_DEPENDS
b/xorg-lib/libxfont/REPAIR^4d0c876f0168ba63683ab81990cdb8ab^PRE_SUB_DEPENDS
old mode 100644
new mode 100755


  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (6f83b9ecc99d13e554dcdde01c2d9fdc7d51e092), Vlad Glagolev, 03/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page