Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (af5c33f0e4dcfd5611ef6eba62458d5958415be0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (af5c33f0e4dcfd5611ef6eba62458d5958415be0)
  • Date: Wed, 15 Jul 2015 04:52:43 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

perl-cpan/list-moreutils/DETAILS
| 14 ++-
perl-cpan/list-moreutils/HISTORY
| 5 +
utils/syslinux/BUILD
| 2
utils/syslinux/HISTORY
| 3
utils/xdelta3/DETAILS
| 12 +--
utils/xdelta3/HISTORY
| 4 +
xorg-lib/libx11/HISTORY
| 6 +
xorg-lib/libx11/PRE_BUILD
| 8 +-
xorg-lib/libx11/patches/omGeneric-Fix-segfault-in-set_fontset_extents.patch
| 35 +++++++++
xorg-lib/libx11/patches/xlibh.patch
| 36 ++++++++++
xorg-lib/libx11/xlibh.patch
| 36 ----------
11 files changed, 110 insertions(+), 51 deletions(-)

New commits:
commit af5c33f0e4dcfd5611ef6eba62458d5958415be0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libx11: Add patch to fix segfault

The segfault is caused by sloppy pointer checking in set_fontset_extents
in omGeneric.

commit ac9d8eddcbbb409cafdf2fb295d2f10c042a60c2
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libx11: Move patches to the patches/ subdir

commit 8d97fa86ceaadea3fc8adf0185c3a7f336e489d5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xdelta3 3.0.9 + fixes

commit 05ef5c31253df17e3fb3bf9c1305c3a4f6f91393
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

syslinux: Add -flto and -fuse-linker-plugin to the LDFLAGS blacklist

commit c7128d3f18a5af98af82bf8c47f9ebc5d8d3caef
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

list-moreutils 0.413

diff --git a/perl-cpan/list-moreutils/DETAILS
b/perl-cpan/list-moreutils/DETAILS
index 098e143..acba85e 100755
--- a/perl-cpan/list-moreutils/DETAILS
+++ b/perl-cpan/list-moreutils/DETAILS
@@ -1,10 +1,12 @@
SPELL=list-moreutils
- VERSION=0.33
- SOURCE="List-MoreUtils-${VERSION}.tar.gz"
- SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/A/AD/ADAMK/${SOURCE}
-
SOURCE_HASH=sha512:e758b995438c5c5322317aab3602e89b9f683c42d403a0ac97ccd8cc20d0db1a75caefc22f34ad088314867c0bdd9c2b8264e8f2f6a43eab1421aa8c482233b5
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/List-MoreUtils-${VERSION}"
- WEB_SITE="http://search.cpan.org/~/List-MoreUtils/";
+ SPELLX=List-MoreUtils
+ VERSION=0.413
+ SOURCE="$SPELLX-$VERSION.tar.gz"
+ AUTHOR=REHSACK
+
SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/${AUTHOR:0:1}/${AUTHOR:0:2}/$AUTHOR/$SOURCE
+
SOURCE_HASH=sha512:178c08995d2eddd75054b29cd68adb77617e92b7e56ac56a890eb7b8e04a1f8eda09f2208288d61352db563bff7da0accf58f7482906a51e03b38465ea655d17
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ WEB_SITE="http://search.cpan.org/~$AUTHOR/$SPELLX/";
LICENSE[0]=Unknown
ENTERED=20090916
SHORT="Provide the stuff missing in List::Util"
diff --git a/perl-cpan/list-moreutils/HISTORY
b/perl-cpan/list-moreutils/HISTORY
index e935779..b7ddbdb 100644
--- a/perl-cpan/list-moreutils/HISTORY
+++ b/perl-cpan/list-moreutils/HISTORY
@@ -1,3 +1,8 @@
+2015-07-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ fixed WEB_SITE
+ updated spell to 0.413
+
2013-05-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.33

diff --git a/utils/syslinux/BUILD b/utils/syslinux/BUILD
index e6cd611..5fbab5c 100755
--- a/utils/syslinux/BUILD
+++ b/utils/syslinux/BUILD
@@ -6,5 +6,7 @@ CFLAGS="" &&
LDFLAGS=${LDFLAGS/-Wl,-O1} &&
LDFLAGS=${LDFLAGS/-Wl,--hash-style=gnu} &&
LDFLAGS=${LDFLAGS/-Wl,--as-needed} &&
+LDFLAGS=${LDFLAGS/-flto} &&
+LDFLAGS=${LDFLAGS/-fuse-linker-plugin} &&

make
diff --git a/utils/syslinux/HISTORY b/utils/syslinux/HISTORY
index bf567fe..b78ad0c 100644
--- a/utils/syslinux/HISTORY
+++ b/utils/syslinux/HISTORY
@@ -1,3 +1,6 @@
+2015-07-14 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Add -flto and -fuse-linker-plugin to the LDFLAGS blacklist
+
2015-06-01 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 6.03
diff --git a/utils/xdelta3/DETAILS b/utils/xdelta3/DETAILS
index 616aa92..0462a2f 100755
--- a/utils/xdelta3/DETAILS
+++ b/utils/xdelta3/DETAILS
@@ -1,9 +1,9 @@
- SPELL=xdelta
- VERSION=3.0.6
- SOURCE=$SPELL${VERSION%%.*}-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL${VERSION%%.*}-$VERSION
- SOURCE_URL[0]=http://$SPELL.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:1b8afc4492129d45e2fecf7bd24616d684eb0ea9b7d5e383a15b6b343459490512697c947561fc854b9454b2c2b831d4396bbc95267813df71211bc0e5f9c0f1
+ SPELL=xdelta3
+ VERSION=3.0.9
+ SOURCE=$SPELL-$VERSION.tar.xz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=http://github.com/jmacd/xdelta-devel/releases/download/v$VERSION/$SOURCE
+
SOURCE_HASH=sha512:dd9e80617208a5efc2e33eaf2a61b23f3486ecb34bcc972209570e93833092ec277cf2addd813c563c1a61cac3d7a6f1830ef15d295798174ba2771760e9fb4f
WEB_SITE=http://xdelta.org
ENTERED=20131130
LICENSE[0]=GPL
diff --git a/utils/xdelta3/HISTORY b/utils/xdelta3/HISTORY
index 1d0db05..025741c 100644
--- a/utils/xdelta3/HISTORY
+++ b/utils/xdelta3/HISTORY
@@ -1,2 +1,6 @@
+2015-07-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 3.0.9
+
2013-11-30 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS: Spell created. Based on xdelta.
diff --git a/xorg-lib/libx11/HISTORY b/xorg-lib/libx11/HISTORY
index 7854388..d10dd51 100644
--- a/xorg-lib/libx11/HISTORY
+++ b/xorg-lib/libx11/HISTORY
@@ -1,3 +1,9 @@
+2015-07-15 Ismael Luceno <ismael AT sourcemage.org>
+ * xlibh.patch: Moved to patches
+ * PRE_BUILD: Apply all patches in patches/
+ * omGeneric-Fix-segfault-in-set_fontset_extents.patch: Added, fixes
+ segfault caused by NULL pointer dereference.
+
2015-03-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.3

diff --git a/xorg-lib/libx11/PRE_BUILD b/xorg-lib/libx11/PRE_BUILD
index ee58e93..ed0aaf4 100755
--- a/xorg-lib/libx11/PRE_BUILD
+++ b/xorg-lib/libx11/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-message "${MESSAGE_COLOR}Applying Xlib.h header fix${DEFAULT_COLOR}" &&
-patch "$SOURCE_DIRECTORY"/include/X11/Xlib.h \
- "$SPELL_DIRECTORY"/xlibh.patch
+cd "$SOURCE_DIRECTORY" &&
+if [ -d "$SPELL_DIRECTORY/patches" ]; then
+ find "$SPELL_DIRECTORY/patches" \( -name \*.patch -o -name \*.diff \) \
+ -exec patch -fp1 -i '{}' \;
+fi
diff --git
a/xorg-lib/libx11/patches/omGeneric-Fix-segfault-in-set_fontset_extents.patch
b/xorg-lib/libx11/patches/omGeneric-Fix-segfault-in-set_fontset_extents.patch
new file mode 100644
index 0000000..ff3f612
--- /dev/null
+++
b/xorg-lib/libx11/patches/omGeneric-Fix-segfault-in-set_fontset_extents.patch
@@ -0,0 +1,35 @@
+From b3a5ece29ffcce6effb6d5765d8ccf8609aa2d1c Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Wed, 15 Jul 2015 00:56:00 -0300
+Subject: [PATCH] omGeneric: Fix NULL pointer dereferences in
+ set_fontset_extents
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ modules/om/generic/omGeneric.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/om/generic/omGeneric.c b/modules/om/generic/omGeneric.c
+index a835f00..f0861e8 100644
+--- a/modules/om/generic/omGeneric.c
++++ b/modules/om/generic/omGeneric.c
+@@ -398,7 +398,7 @@ set_fontset_extents(
+ font_data = font_set->vmap;
+ font_data_count = font_set->vmap_num;
+ for( ; font_data_count-- ; font_data++) {
+- if(font_data->font != NULL) {
++ if(font_data && font_data->font) {
+ check_fontset_extents(&overall, &logical_ascent,
+ &logical_descent,
+ font_data->font);
+@@ -410,7 +410,7 @@ set_fontset_extents(
+ font_data = (FontData) font_set->vrotate;
+ font_data_count = font_set->vrotate_num;
+ for( ; font_data_count-- ; font_data++) {
+- if(font_data->font != NULL) {
++ if(font_data && font_data->font) {
+ check_fontset_extents(&overall, &logical_ascent,
+ &logical_descent,
+ font_data->font);
+--
+2.4.5
diff --git a/xorg-lib/libx11/patches/xlibh.patch
b/xorg-lib/libx11/patches/xlibh.patch
new file mode 100644
index 0000000..d04df5c
--- /dev/null
+++ b/xorg-lib/libx11/patches/xlibh.patch
@@ -0,0 +1,36 @@
+#
+# Rollback this offending patch, see
+# http://bugs.sourcemage.org/show_bug.cgi?id=15921
+#
+commit d0cbf388919364fe6b5b9127f36426eb744090a0
+Author: Jeremy Huddleston <jeremyhu AT apple.com>
+Date: Sun Sep 26 21:21:16 2010 -0700
+
+ Add an "X11_" string to header guards to avoid possible collision
+
+ This addresses a build failure which can result from <X11/Xlocale.h> and
+ <xlocale.h> being included in the same code since they both used the same
+ _XLOCALE_H_ protection.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu AT apple.com>
+
+diff -Naur libX11-1.4.0.orig/include/X11/Xlib.h
libX11-1.4.0/include/X11/Xlib.h
+--- libX11-1.4.0.orig/include/X11/Xlib.h 2010-12-16 14:19:08.398837832
-0800
++++ libX11-1.4.0/include/X11/Xlib.h 2010-12-16 14:20:17.853837890 -0800
+@@ -30,8 +30,8 @@
+ * interface library (Xlib) to the X Window System Protocol (V11).
+ * Structures and symbols starting with "_" are private to the library.
+ */
+-#ifndef _X11_XLIB_H_
+-#define _X11_XLIB_H_
++#ifndef _XLIB_H_
++#define _XLIB_H_
+
+ #define XlibSpecificationRelease 6
+
+@@ -4020,4 +4020,4 @@
+
+ _XFUNCPROTOEND
+
+-#endif /* _X11_XLIB_H_ */
++#endif /* _XLIB_H_ */
diff --git a/xorg-lib/libx11/xlibh.patch b/xorg-lib/libx11/xlibh.patch
deleted file mode 100755
index 237184e..0000000
--- a/xorg-lib/libx11/xlibh.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Rollback this offending patch, see
-# http://bugs.sourcemage.org/show_bug.cgi?id=15921
-#
-commit d0cbf388919364fe6b5b9127f36426eb744090a0
-Author: Jeremy Huddleston <jeremyhu AT apple.com>
-Date: Sun Sep 26 21:21:16 2010 -0700
-
- Add an "X11_" string to header guards to avoid possible collision
-
- This addresses a build failure which can result from <X11/Xlocale.h> and
- <xlocale.h> being included in the same code since they both used the same
- _XLOCALE_H_ protection.
-
- Signed-off-by: Jeremy Huddleston <jeremyhu AT apple.com>
-
-diff -Naur libX11-1.4.0.orig/include/X11/Xlib.h
libX11-1.4.0/include/X11/Xlib.h
---- libX11-1.4.0.orig/include/X11/Xlib.h 2010-12-16 14:19:08.398837832
-0800
-+++ libX11-1.4.0/include/X11/Xlib.h 2010-12-16 14:20:17.853837890 -0800
-@@ -30,8 +30,8 @@
- * interface library (Xlib) to the X Window System Protocol (V11).
- * Structures and symbols starting with "_" are private to the library.
- */
--#ifndef _X11_XLIB_H_
--#define _X11_XLIB_H_
-+#ifndef _XLIB_H_
-+#define _XLIB_H_
-
- #define XlibSpecificationRelease 6
-
-@@ -4020,4 +4020,4 @@
-
- _XFUNCPROTOEND
-
--#endif /* _X11_XLIB_H_ */
-+#endif /* _XLIB_H_ */



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (af5c33f0e4dcfd5611ef6eba62458d5958415be0), Ismael Luceno, 07/15/2015

Archive powered by MHonArc 2.6.24.

Top of Page