callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk+2.0 (2.6.4-1) unstable; urgency=medium

Browse Source 
* New upstream release.
  * debian/patches/004_fs_newdir.patch:
    - fix a crash in the fileselector when creating a directory.
  * debian/patches/003_iconcache.patch:
    - this bug is fixed in the new version.
  * debian/patches/004_mipsbuild.patch:
    - dropped, this change is not required.
  * debian/patches/002_bmp.patch:
     - fix CAN-2005-0891: BMP double free Dos (Closes: #303141).

 -- Sebastien Bacher <seb128@debian.org>  Tue,  5 Apr 2005 21:09:01 +0200
This commit is contained in:
Sebastien Bacher
2005-04-07 15:07:32 +00:00
parent 4b50d7de0f
commit 0492fc07d3
11 changed files with 70 additions and 2313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
debian/changelog vendored
View File

@ -1,3 +1,17 @@
gtk+2.0 (2.6.4-1) unstable; urgency=medium
* New upstream release.
* debian/patches/004_fs_newdir.patch:
- fix a crash in the fileselector when creating a directory.
* debian/patches/003_iconcache.patch:
- this bug is fixed in the new version.
* debian/patches/004_mipsbuild.patch:
- dropped, this change is not required.
* debian/patches/002_bmp.patch:
- fix CAN-2005-0891: BMP double free Dos (Closes: #303141).
-- Sebastien Bacher <seb128@debian.org> Tue, 5 Apr 2005 21:09:01 +0200
gtk+2.0 (2.6.2-4) unstable; urgency=high
* Sjoerd Simons:

2
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: gtk+2.0
Section: libs
Priority: optional
Maintainer: Sebastien Bacher <seb128@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Ed Boraas <ed@debian.org>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Marc HE Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Takuo KITAME <kitame@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Marc HE Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Takuo KITAME <kitame@debian.org>
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.6.0), libpango1.0-dev (>= 1.7.0), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, libxi-dev | xlibs-dev, libxrandr-dev | xlibs-dev, libxt-dev | xlibs-dev, libxrender-dev, libxft-dev, libxcursor-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
Build-Depends-Indep: gtk-doc-tools, docbook-xml
Standards-Version: 3.6.1.0

10
debian/docs vendored
View File

@ -1,5 +1,5 @@
build-tree/gtk+-2.4.3/NEWS
build-tree/gtk+-2.4.3/README
build-tree/gtk+-2.4.3/ChangeLog.pre-1-0
build-tree/gtk+-2.4.3/ChangeLog.pre-1-2
build-tree/gtk+-2.4.3/ChangeLog.pre-2-0
build-tree/gtk+-2.6.4/NEWS
build-tree/gtk+-2.6.4/README
build-tree/gtk+-2.6.4/ChangeLog.pre-1-0
build-tree/gtk+-2.6.4/ChangeLog.pre-1-2
build-tree/gtk+-2.6.4/ChangeLog.pre-2-0

2
debian/gtk2.0-examples.examples vendored
View File

@ -1 +1 @@
build-tree/gtk+-2.4.3/examples/*
build-tree/gtk+-2.6.4/examples/*

36
debian/patches/002_bmp.patch vendored Normal file
View File

@ -0,0 +1,36 @@
Index: io-bmp.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v
retrieving revision 1.47
diff -u -p -r1.47 io-bmp.c
--- io-bmp.c 24 Feb 2005 04:41:35 -0000 1.47
+++ gtk+-2.6.4/gdk-pixbuf/io-bmp.c 26 Mar 2005 08:47:56 -0000
@@ -219,7 +219,19 @@ lsb_16 (guchar *src)
static gboolean grow_buffer (struct bmp_progressive_state *State,
GError **error)
{
- guchar *tmp = g_try_realloc (State->buff, State->BufferSize);
+ guchar *tmp;
+
+ if (State->BufferSize == 0) {
+ g_set_error (error,
+ GDK_PIXBUF_ERROR,
+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
+ _("BMP image has bogus header data"));
+ State->read_state = READ_STATE_ERROR;
+ return FALSE;
+ }
+
+ tmp = g_try_realloc (State->buff, State->BufferSize);
+
if (!tmp) {
g_set_error (error,
GDK_PIXBUF_ERROR,
@@ -228,6 +240,7 @@ static gboolean grow_buffer (struct bmp_
State->read_state = READ_STATE_ERROR;
return FALSE;
}
+
State->buff = tmp;
return TRUE;
}

16
debian/patches/003_iconcache.patch vendored
View File

@ -1,16 +0,0 @@
Index: gtk/updateiconcache.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/updateiconcache.c,v
retrieving revision 1.4
diff -u -r1.4 updateiconcache.c
--- gtk+/gtk/updateiconcache.c 1 Feb 2005 13:55:07 -0000 1.4
+++ gtk+/gtk/updateiconcache.c 22 Feb 2005 12:43:34 -0000
@@ -17,6 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

2277
debian/patches/004_mipsbuild.patch vendored
View File

File diff suppressed because it is too large Load Diff

16
debian/rules vendored
View File

@ -121,7 +121,7 @@ $(STAMP_DIR)/configure-static-stamp:
touch $@
configure: configure-static configure-shared
configure: configure-shared
build-shared: debian/control configure-shared $(STAMP_DIR)/build-shared-stamp
$(STAMP_DIR)/build-shared-stamp:
@ -147,7 +147,7 @@ $(STAMP_DIR)/build-static-stamp:
touch $@
build: build-static build-shared
build: build-shared
clean:: debian/control
dh_testdir
@ -182,7 +182,7 @@ install-static: build-static install-test
RUN_QUERY_IMMODULES_TEST=false \
RUN_QUERY_LOADER_TEST=false
install: install-static install-shared
install: install-shared
# generating debian files from .in
for f in `find debian/ -name "[^c]*.in"`; do \
sed -e "s/@VERSION@/${version}/g" -e "s/@MODVER@/${modver}/g" -e "s/@APIVER@/${apiver}/g" $$f > `echo $$f | sed -e "s/\.in//"`; \
@ -268,13 +268,13 @@ binary-arch: build install
# dh_installdebconf
dh_installdocs -a
rm -rf $(CURDIR)/debian/libgtk$(apiver)-dbg/usr/share/doc/libgtk$(apiver)-dbg
rm -rf $(CURDIR)/debian/libgtk$(apiver)-$(soname)-dbg/usr/share/doc/libgtk$(apiver)-$(soname)-dbg
rm -rf $(CURDIR)/debian/libgtk$(apiver)-dev/usr/share/doc/libgtk$(apiver)-dev
rm -rf $(CURDIR)/debian/libgtk$(apiver)-bin/usr/share/doc/libgtk$(apiver)-bin
dh_link -plibgtk$(apiver)-dbg \
dh_link -plibgtk$(apiver)-$(soname)-dbg \
usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \
usr/share/doc/libgtk$(apiver)-dbg
usr/share/doc/libgtk$(apiver)-$(soname)-dbg
dh_link -plibgtk$(apiver)-dev \
usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \
usr/share/doc/libgtk$(apiver)-dev
@ -292,7 +292,7 @@ binary-arch: build install
dh_strip -a --dbg-package=libgtk$(apiver)-$(soname)
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a -Nlibgtk$(apiver)-dbg
dh_makeshlibs -a -Nlibgtk$(apiver)-$(soname)-dbg
dh_makeshlibs -n -X usr/lib/gtk-$(apiver) -plibgtk$(apiver)-$(soname)$(suffix) -V "libgtk${apiver}-${soname}${suffix} (>= ${shver})"
dh_installdeb -a
dh_shlibdeps -l$(libpath) -a
@ -302,4 +302,4 @@ binary-arch: build install
dh_builddeb -a
binary: binary-indep binary-arch
.PHONY: build build-shared build-static clean binary-indep binary-arch binary install install-shared install-static configure configure-shared configure-static debian/control
.PHONY: build build-shared clean binary-indep binary-arch binary install install-shared configure configure-shared debian/control

2
debian/sources vendored
View File

@ -1 +1 @@
upstream tar ../gtk+-2.6.2.tar.gz
upstream tar ../gtk+-2.6.4.tar.gz

4
debian/update-gdkpixbuf-loaders vendored
View File

@ -2,8 +2,8 @@
set -e
TMPFILE=`mktemp /tmp/gtk+-2.5.6.XXXXXXXXXX`
defaultver=2.5.0
TMPFILE=`mktemp /tmp/gtk+-2.6.4.XXXXXXXXXX`
defaultver=2.6.0
if [ "x$1" != "x" ]; then
VERSION=`echo $1 | sed -e 's/-[A-Za-z0-9\.]*$//' -e 's/+[A-Za-z0-9\.]*$//'`

4
debian/update-gtk-immodules vendored
View File

@ -2,9 +2,9 @@
set -e
TMPFILE=`mktemp /tmp/gtk+-2.5.6.XXXXXXXXXX`
TMPFILE=`mktemp /tmp/gtk+-2.6.4.XXXXXXXXXX`
apiver=2.0
defaultver=2.5.0
defaultver=2.6.0
if [ "x$1" != "x" ]; then
VERSION=`echo $1 | sed -e 's/-[A-Za-z0-9\.]*$//' -e 's/+[A-Za-z0-9\.]*$//'`