wok-next rev 3069
Up: glibmm, pangomm and gtkmm
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Wed May 13 22:51:40 2009 +0200 (2009-05-13) |
parents | 948f0b6a41c4 |
children | 084f8487f96f |
files | glib/stuff/glib-CVE-2008-4316.diff glibmm-dev/receipt glibmm/receipt gtkmm-dev/receipt gtkmm/receipt libgiomm-dev/receipt libgiomm/receipt pangomm-dev/receipt pangomm/receipt |
line diff
1.1 --- a/glib/stuff/glib-CVE-2008-4316.diff Wed May 13 22:48:36 2009 +0200 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,62 +0,0 @@ 1.4 ---- glib/gbase64.c 2009/02/23 04:30:06 7897 1.5 -+++ glib/gbase64.c 2009/03/12 13:30:55 7973 1.6 -@@ -54,8 +54,9 @@ 1.7 - * 1.8 - * The output buffer must be large enough to fit all the data that will 1.9 - * be written to it. Due to the way base64 encodes you will need 1.10 -- * at least: @len * 4 / 3 + 6 bytes. If you enable line-breaking you will 1.11 -- * need at least: @len * 4 / 3 + @len * 4 / (3 * 72) + 7 bytes. 1.12 -+ * at least: (@len / 3 + 1) * 4 + 4 bytes (+ 4 may be needed in case of 1.13 -+ * non-zero state). If you enable line-breaking you will need at least: 1.14 -+ * ((@len / 3 + 1) * 4 + 4) / 72 + 1 bytes of extra space. 1.15 - * 1.16 - * @break_lines is typically used when putting base64-encoded data in emails. 1.17 - * It breaks the lines at 72 columns instead of putting all of the text on 1.18 -@@ -233,8 +234,14 @@ 1.19 - g_return_val_if_fail (data != NULL, NULL); 1.20 - g_return_val_if_fail (len > 0, NULL); 1.21 - 1.22 -- /* We can use a smaller limit here, since we know the saved state is 0 */ 1.23 -- out = g_malloc (len * 4 / 3 + 4); 1.24 -+ /* We can use a smaller limit here, since we know the saved state is 0, 1.25 -+ +1 is needed for trailing \0, also check for unlikely integer overflow */ 1.26 -+ if (len >= ((G_MAXSIZE - 1) / 4 - 1) * 3) 1.27 -+ g_error("%s: input too large for Base64 encoding (%"G_GSIZE_FORMAT" chars)", 1.28 -+ G_STRLOC, len); 1.29 -+ 1.30 -+ out = g_malloc ((len / 3 + 1) * 4 + 1); 1.31 -+ 1.32 - outlen = g_base64_encode_step (data, len, FALSE, out, &state, &save); 1.33 - outlen += g_base64_encode_close (FALSE, out + outlen, &state, &save); 1.34 - out[outlen] = '\0'; 1.35 -@@ -275,7 +282,8 @@ 1.36 - * 1.37 - * The output buffer must be large enough to fit all the data that will 1.38 - * be written to it. Since base64 encodes 3 bytes in 4 chars you need 1.39 -- * at least: @len * 3 / 4 bytes. 1.40 -+ * at least: (@len / 4) * 3 + 3 bytes (+ 3 may be needed in case of non-zero 1.41 -+ * state). 1.42 - * 1.43 - * Return value: The number of bytes of output that was written 1.44 - * 1.45 -@@ -358,7 +366,8 @@ 1.46 - gsize *out_len) 1.47 - { 1.48 - guchar *ret; 1.49 -- gint input_length, state = 0; 1.50 -+ gsize input_length; 1.51 -+ gint state = 0; 1.52 - guint save = 0; 1.53 - 1.54 - g_return_val_if_fail (text != NULL, NULL); 1.55 -@@ -368,7 +377,9 @@ 1.56 - 1.57 - g_return_val_if_fail (input_length > 1, NULL); 1.58 - 1.59 -- ret = g_malloc0 (input_length * 3 / 4); 1.60 -+ /* We can use a smaller limit here, since we know the saved state is 0, 1.61 -+ +1 used to avoid calling g_malloc0(0), and hence retruning NULL */ 1.62 -+ ret = g_malloc0 ((input_length / 4) * 3 + 1); 1.63 - 1.64 - *out_len = g_base64_decode_step (text, input_length, ret, &state, &save); 1.65 -
2.1 --- a/glibmm-dev/receipt Wed May 13 22:48:36 2009 +0200 2.2 +++ b/glibmm-dev/receipt Wed May 13 22:51:40 2009 +0200 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="glibmm-dev" 2.7 -VERSION="2.18.1" 2.8 +VERSION="2.20.0" 2.9 CATEGORY="development" 2.10 SHORT_DESC="Callback Framework for C++ devel files." 2.11 MAINTAINER="pankso@slitaz.org"
3.1 --- a/glibmm/receipt Wed May 13 22:48:36 2009 +0200 3.2 +++ b/glibmm/receipt Wed May 13 22:51:40 2009 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="glibmm" 3.7 -VERSION="2.18.1" 3.8 +VERSION="2.20.0" 3.9 CATEGORY="x-window" 3.10 SHORT_DESC="C++ interface for the popular GUI library GTK+." 3.11 MAINTAINER="pankso@slitaz.org" 3.12 @@ -9,7 +9,7 @@ 3.13 BUILD_DEPENDS="libsigc++ libsigc++-dev libgio libgio-dev" 3.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.15 WEB_SITE="http://www.gtkmm.org/" 3.16 -WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/$TARBALL" 3.17 +WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.20/$TARBALL" 3.18 3.19 # Rules to configure and make the package. 3.20 compile_rules()
4.1 --- a/gtkmm-dev/receipt Wed May 13 22:48:36 2009 +0200 4.2 +++ b/gtkmm-dev/receipt Wed May 13 22:51:40 2009 +0200 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="gtkmm-dev" 4.7 -VERSION="2.14.3" 4.8 +VERSION="2.16.0" 4.9 CATEGORY="development" 4.10 SHORT_DESC="Callback Framework for C++ devel files." 4.11 MAINTAINER="pankso@slitaz.org"
5.1 --- a/gtkmm/receipt Wed May 13 22:48:36 2009 +0200 5.2 +++ b/gtkmm/receipt Wed May 13 22:51:40 2009 +0200 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="gtkmm" 5.7 -VERSION="2.14.3" 5.8 +VERSION="2.16.0" 5.9 CATEGORY="x-window" 5.10 SHORT_DESC="C++ interface for the popular GUI library GTK+." 5.11 MAINTAINER="pankso@slitaz.org" 5.12 @@ -10,7 +10,7 @@ 5.13 doxygen libgiomm-dev" 5.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 5.15 WEB_SITE="http://www.gtkmm.org/" 5.16 -WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.14/$TARBALL" 5.17 +WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.16/$TARBALL" 5.18 5.19 # Rules to configure and make the package. 5.20 compile_rules()
6.1 --- a/libgiomm-dev/receipt Wed May 13 22:48:36 2009 +0200 6.2 +++ b/libgiomm-dev/receipt Wed May 13 22:51:40 2009 +0200 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="libgiomm-dev" 6.7 -VERSION="2.18.1" 6.8 +VERSION="2.20.0" 6.9 CATEGORY="development" 6.10 SHORT_DESC="GIO Framework for C++ devel files." 6.11 MAINTAINER="pankso@slitaz.org"
7.1 --- a/libgiomm/receipt Wed May 13 22:48:36 2009 +0200 7.2 +++ b/libgiomm/receipt Wed May 13 22:51:40 2009 +0200 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="libgiomm" 7.7 -VERSION="2.18.1" 7.8 +VERSION="2.20.0" 7.9 CATEGORY="x-window" 7.10 SHORT_DESC="GIO Framework for C++." 7.11 MAINTAINER="pankso@slitaz.org"
8.1 --- a/pangomm-dev/receipt Wed May 13 22:48:36 2009 +0200 8.2 +++ b/pangomm-dev/receipt Wed May 13 22:51:40 2009 +0200 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="pangomm-dev" 8.7 -VERSION="2.14.1" 8.8 +VERSION="2.24.0" 8.9 CATEGORY="development" 8.10 SHORT_DESC="Pangomm library devel files." 8.11 MAINTAINER="pankso@slitaz.org"
9.1 --- a/pangomm/receipt Wed May 13 22:48:36 2009 +0200 9.2 +++ b/pangomm/receipt Wed May 13 22:51:40 2009 +0200 9.3 @@ -1,7 +1,7 @@ 9.4 # SliTaz package receipt. 9.5 9.6 PACKAGE="pangomm" 9.7 -VERSION="2.14.1" 9.8 +VERSION="2.24.0" 9.9 CATEGORY="x-window" 9.10 SHORT_DESC="Pango binding for GTKmm." 9.11 MAINTAINER="pankso@slitaz.org" 9.12 @@ -9,7 +9,7 @@ 9.13 BUILD_DEPENDS="pixman-dev cairomm-dev glibmm-dev libgiomm-dev" 9.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 9.15 WEB_SITE="http://ftp.gnome.org/pub/gnome/sources/pangomm/" 9.16 -WGET_URL="http://ftp.gnome.org/pub/gnome/sources/pangomm/2.14/$TARBALL" 9.17 +WGET_URL="http://ftp.gnome.org/pub/gnome/sources/pangomm/2.24/$TARBALL" 9.18 9.19 # Rules to configure and make the package. 9.20 compile_rules() 9.21 @@ -18,7 +18,6 @@ 9.22 ./configure \ 9.23 --prefix=/usr \ 9.24 --mandir=/usr/share/man \ 9.25 - --with-html-dir=/usr/share/doc \ 9.26 $CONFIGURE_ARGS && 9.27 make && 9.28 make DESTDIR=$PWD/_pkg install