cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major update to pango-1.24.5 (needed for upcoming pangomm update)

Browse Source 
ok jasper@ landry@ wilfried@
This commit is contained in:
ajacoutot 2009-09-18 10:21:53 +00:00
parent a6b3d3a70b
commit fa1e85ba3b
7 changed files with 33 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devel/pango/Makefile
View File

@ -1,14 +1,15 @@
# $OpenBSD: Makefile,v 1.36 2009/08/10 06:31:08 kili Exp $
# $OpenBSD: Makefile,v 1.37 2009/09/18 10:21:53 ajacoutot Exp $
COMMENT= library for layout and rendering of text
DISTNAME= pango-1.22.4
PKGNAME= ${DISTNAME}p1
SHARED_LIBS += pango-1.0 1800.0 # .2203.0
SHARED_LIBS += pangox-1.0 1800.0 # .2203.0
SHARED_LIBS += pangoft2-1.0 1800.0 # .2203.0
SHARED_LIBS += pangoxft-1.0 1800.0 # .2203.0
SHARED_LIBS += pangocairo-1.0 1800.0 # .2203.0
V= 1.24.5
DISTNAME= pango-${V}
SHARED_LIBS += pango-1.0 1801.0 # .2400.5
SHARED_LIBS += pangox-1.0 1801.0 # .2400.5
SHARED_LIBS += pangoft2-1.0 1801.0 # .2400.5
SHARED_LIBS += pangoxft-1.0 1801.0 # .2400.5
SHARED_LIBS += pangocairo-1.0 1801.0 # .2400.5
CATEGORIES= devel x11
@ -23,7 +24,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xau Xdmcp Xft Xrender c expat fontconfig freetype \
glitz m pcre pixman-1 png pthread-stubs xcb z
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.22/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext

10
devel/pango/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pango-1.22.4.tar.bz2) = fD83SAUnmXRtc8bToMwSBQ==
RMD160 (pango-1.22.4.tar.bz2) = EYmG6kGdIpN91eKwM/RvNKRfJOM=
SHA1 (pango-1.22.4.tar.bz2) = 05qM6e191XQHoErTmWucwRBs/X0=
SHA256 (pango-1.22.4.tar.bz2) = /0fX7YNg6+9fpLjTzPReAUvIeTdDvKKpZjWjw07qpTQ=
SIZE (pango-1.22.4.tar.bz2) = 1496168
MD5 (pango-1.24.5.tar.bz2) = gVQWpFLpzMwXL+2YYkAfNw==
RMD160 (pango-1.24.5.tar.bz2) = fkNnUnNMVZUK1f7O18fVw/BAobQ=
SHA1 (pango-1.24.5.tar.bz2) = papAt4VGp+5Z8hgEsXLl1H73dq0=
SHA256 (pango-1.24.5.tar.bz2) = D3M9HsPo2vyuFS16xY8QkL7h/YVhdsj+4OgbDkI5L04=
SIZE (pango-1.24.5.tar.bz2) = 1519944

21
devel/pango/patches/patch-configure
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-configure,v 1.17 2008/12/04 15:05:38 jasper Exp $
--- configure.orig Sun Nov 23 15:07:08 2008
+++ configure Thu Dec 4 15:32:23 2008
@@ -22447,7 +22447,7 @@ if test -n "$FONTCONFIG_LIBS"; then
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 1.0.1" 2>/dev/null`
+ pkg_cv_FONTCONFIG_LIBS="`$PKG_CONFIG --libs "fontconfig >= 1.0.1" 2>/dev/null ` -lexpat"
else
pkg_failed=yes
fi
@@ -22616,7 +22616,7 @@ if test -n "$XFT_LIBS"; then
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft >= 2.0.0 xrender" 2>/dev/null`
+ pkg_cv_XFT_LIBS="`$PKG_CONFIG --libs "xft >= 2.0.0 xrender" 2>/dev/null` -lexpat"
else
pkg_failed=yes
fi

8
devel/pango/patches/patch-modules_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_Makefile_in,v 1.15 2008/12/04 15:05:38 jasper Exp $
--- modules/Makefile.in.orig Sun Nov 23 15:07:01 2008
+++ modules/Makefile.in Thu Dec 4 15:32:23 2008
@@ -557,21 +557,11 @@ uninstall-am: uninstall-local
$OpenBSD: patch-modules_Makefile_in,v 1.16 2009/09/18 10:21:53 ajacoutot Exp $
--- modules/Makefile.in.orig Mon Jul 20 22:59:47 2009
+++ modules/Makefile.in Sun Sep 13 14:30:28 2009
@@ -634,21 +634,11 @@ uninstall-am: uninstall-local
@CROSS_COMPILING_FALSE@all-local: pango.modules
install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)

12
devel/pango/patches/patch-pango-view_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-pango-view_Makefile_in,v 1.1 2009/09/18 10:21:53 ajacoutot Exp $
--- pango-view/Makefile.in.orig Sun Sep 13 14:34:18 2009
+++ pango-view/Makefile.in Sun Sep 13 14:34:36 2009
@@ -794,7 +794,7 @@ $(srcdir)/pango-view.1: ../configure.in $(pango_view_S
(test -f "$@" || echo help2man is required to generate this file. >> "$@"));
install-data-hook:
- @cd "$(DESTDIR)$(man1dir)" && gzip -c pango-view.1 > pango-view.1.gz && $(RM) pango-view.1
+ @cd "$(DESTDIR)$(man1dir)"
uninstall-hook:
$(RM) "$(DESTDIR)$(man1dir)/pango-view.1.gz"

43
devel/pango/patches/patch-pango_glyphstring_c
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-pango_glyphstring_c,v 1.1 2009/05/11 12:43:21 jasper Exp $
Security fix for CVE-2009-1194, "Pango integer overflow in heap allocation
size calculations"
Patch from upstream git, commit id: 4de30e5500eaeb49f4bf0b7a07f718e149a2ed5e
--- pango/glyphstring.c.orig Tue Dec 16 07:14:00 2008
+++ pango/glyphstring.c Mon May 11 14:31:25 2009
@@ -61,14 +61,28 @@ pango_glyph_string_set_size (PangoGlyphString *string,
while (new_len > string->space)
{
if (string->space == 0)
- string->space = 1;
+ {
+ string->space = 4;
+ }
else
- string->space *= 2;
-
- if (string->space < 0)
{
- g_warning ("glyph string length overflows maximum integer size, truncated");
- new_len = string->space = G_MAXINT - 8;
+ const guint max_space =
+ MIN (G_MAXINT, G_MAXSIZE / MAX (sizeof(PangoGlyphInfo), sizeof(gint)));
+
+ guint more_space = (guint)string->space * 2;
+
+ if (more_space > max_space)
+ {
+ more_space = max_space;
+
+ if ((guint)new_len > max_space)
+ {
+ g_error ("%s: failed to allocate glyph string of length %i\n",
+ G_STRLOC, new_len);
+ }
+ }
+
+ string->space = more_space;
}
}

3
devel/pango/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2008/12/04 15:05:38 jasper Exp $
@comment $OpenBSD: PLIST,v 1.20 2009/09/18 10:21:53 ajacoutot Exp $
%%SHARED%%
@bin bin/pango-querymodules
@bin bin/pango-view
@ -82,6 +82,7 @@ lib/pkgconfig/pangoft2.pc
lib/pkgconfig/pangox.pc
lib/pkgconfig/pangoxft.pc
@man man/man1/pango-querymodules.1
@man man/man1/pango-view.1
share/examples/pango/
@sample ${SYSCONFDIR}/pango/
share/examples/pango/pango.modules