rpms/gimp/FC-5 gimp-2.2.14-sunras-overflow.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 gimp.spec, 1.98, 1.99 sources, 1.28, 1.29
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed May 2 04:25:42 UTC 2007
Author: nphilipp
Update of /cvs/dist/rpms/gimp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13383
Modified Files:
.cvsignore gimp.spec sources
Added Files:
gimp-2.2.14-sunras-overflow.patch
Log Message:
don't let gimp-plugin-mgr --uninstall fail %%pre/%%preun scriptlets (#238337)
don't erroneously delete symlinks to external plugins when updating (#238337)
avoid buffer overflow in sunras plugin (#238422)
version 2.2.14
don't BuildRequire gimp-print/gutenprint anymore
own used directories in gimp-devel (#233794)
s/%%redhat/%%rhel/g
change defaults for use of modular X and lcms (#224156)
Resolves: #238337, #238422, #233794, #224156
gimp-2.2.14-sunras-overflow.patch:
ChangeLog | 7 +++++++
plug-ins/common/sunras.c | 21 +++++++++++----------
2 files changed, 18 insertions(+), 10 deletions(-)
--- NEW FILE gimp-2.2.14-sunras-overflow.patch ---
--- gimp-2.2.14/ChangeLog.sunras-overflow 2007-04-17 23:58:21.000000000 +0200
+++ gimp-2.2.14/ChangeLog 2007-04-30 15:38:06.000000000 +0200
@@ -0,0 +1,7 @@
+2007-04-27 Sven Neumann <sven at gimp.org>
+
+ Merged from trunk:
+
+ * plug-ins/common/sunras.c (set_color_table): guard against a
+ possible stack overflow.
+
--- gimp-2.2.14/plug-ins/common/sunras.c.sunras-overflow 2007-04-17 23:11:23.000000000 +0200
+++ gimp-2.2.14/plug-ins/common/sunras.c 2007-04-30 15:36:33.000000000 +0200
@@ -102,8 +102,7 @@
gint32 image_ID,
gint32 drawable_ID);
-static void set_color_table (gint32, L_SUNFILEHEADER *, unsigned char *);
-
+static void set_color_table (gint32, L_SUNFILEHEADER *, const guchar *);
static gint32 create_new_image (const gchar *filename,
guint width,
guint height,
@@ -865,19 +864,20 @@
static void
set_color_table (gint32 image_ID,
L_SUNFILEHEADER *sunhdr,
- guchar *suncolmap)
+ const guchar *suncolmap)
{
- int ncols, j;
- guchar ColorMap[256*3];
+ guchar ColorMap[256 * 3];
+ gint ncols, j;
ncols = sunhdr->l_ras_maplength / 3;
- if (ncols <= 0) return;
+ if (ncols <= 0)
+ return;
- for (j = 0; j < ncols; j++)
+ for (j = 0; j < MIN (ncols, 256); j++)
{
- ColorMap[j*3] = suncolmap[j];
- ColorMap[j*3+1] = suncolmap[j+ncols];
- ColorMap[j*3+2] = suncolmap[j+2*ncols];
+ ColorMap[j * 3 + 0] = suncolmap[j];
+ ColorMap[j * 3 + 1] = suncolmap[j + ncols];
+ ColorMap[j * 3 + 2] = suncolmap[j + 2 * ncols];
}
#ifdef DEBUG
@@ -886,6 +886,7 @@
printf ("%3d: 0x%02x 0x%02x 0x%02x\n", j,
ColorMap[j*3], ColorMap[j*3+1], ColorMap[j*3+2]);
#endif
+
gimp_image_set_colormap (image_ID, ColorMap, ncols);
}
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 28 Aug 2006 07:13:56 -0000 1.28
+++ .cvsignore 2 May 2007 04:25:39 -0000 1.29
@@ -1 +1 @@
-gimp-2.2.13.tar.bz2
+gimp-2.2.14.tar.bz2
Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/gimp.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gimp.spec 28 Aug 2006 07:13:56 -0000 1.98
+++ gimp.spec 2 May 2007 04:25:39 -0000 1.99
@@ -4,13 +4,14 @@
#
# modular_x: modular X deps
# lcms: lcms support
+# gutenprint: gutenprint support (instead of gimp-print)
# python: python support
# mp: multi processor support
# static: build static libraries
# print: build the print plugin (if you don't build it externally)
# convenience: install convenience symlinks
-%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 5 || 0%{?rhel} >= 5
%define _enable_modularX 0%{!?_without_modular_x:1}
%define _enable_lcms 0%{!?_without_lcms:1}
%else
@@ -18,6 +19,12 @@
%define _enable_lcms 0%{?_with_lcms:1}
%endif
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
+%define _enable_gutenprint 0%{!?_without_gutenprint:1}
+%else
+%define _enable_gutenprint 0%{?_with_gutenprint:1}
+%endif
+
%define _enable_python 0%{!?_without_python:1}
%define _enable_mp 0%{!?_without_mp:1}
%define _enable_static 0%{!?_without_static:1}
@@ -29,14 +36,14 @@
Summary: GNU Image Manipulation Program
Name: gimp
-Version: 2.2.13
+Version: 2.2.14
%define binver 2.2
%define gimp_lang_ver 20
%define interfacever 2.0
%define age 0
%define minorver 200
%define microver %(ver=%{version}; echo ${ver##*.*.})
-Release: 1%{?dist}
+Release: 5%{?dist}
Epoch: 2
License: GPL, LGPL
Group: Applications/Multimedia
@@ -67,7 +74,6 @@
%else
BuildRequires: xorg-x11-devel
%endif
-BuildRequires: gimp-print-devel >= 4.2.0
BuildRequires: automake >= 1.7
BuildRequires: autoconf >= 2.54
BuildRequires: libtool >= 1.5
@@ -84,7 +90,6 @@
Requires: gtk2 >= 2.4.14
Requires: pango >= 1.6.0
Requires: fontconfig >= 2.2.0
-Requires: gimp-print >= 4.2.0
Requires(post): /usr/bin/update-desktop-database
Requires(post): hicolor-icon-theme
Requires(postun): /usr/bin/update-desktop-database
@@ -97,6 +102,7 @@
Patch4: gimp-2.2.4-gifload.patch
Patch5: gimp-2.2.11-htmlview.patch
Patch6: gimp-2.2.11-gimptool.patch
+Patch7: gimp-2.2.14-sunras-overflow.patch
%description
GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -138,7 +144,7 @@
Python support: %_enable_python
MP support: %_enable_mp
build static libs: %_enable_static
-build print plugin: %_enable_print
+build internal print plugin: %_enable_print
include convenience symlinks: %_enable_convenience
@@ -151,6 +157,7 @@
%patch4 -p1 -b .gifload
%patch5 -p1 -b .htmlview
%patch6 -p1 -b .gimptool
+%patch7 -p1 -b .sunras-overflow
%build
libtoolize --copy --force
@@ -262,16 +269,27 @@
%clean
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%pre
+# First, remove old symlinks which are possibly in an old location (before a
+# major version update)
+if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then
+ %{_sbindir}/gimp-plugin-mgr --uninstall '*' || :
+fi
+
%post
/usr/bin/update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi
+# Then re-add the symlinks
%{_sbindir}/gimp-plugin-mgr --install '*'
%preun
-%{_sbindir}/gimp-plugin-mgr --uninstall '*'
+# Only delete symlinks when uninstalling
+if [ "$1" = "0" ]; then
+ %{_sbindir}/gimp-plugin-mgr --uninstall '*' || :
+fi
%postun
if [ "$1" = "0" ]; then
@@ -390,6 +408,9 @@
%{_libdir}/*.so
%{_libdir}/*.a
+%dir %{_libdir}/gimp
+%dir %{_libdir}/gimp/%{interfacever}
+%dir %{_libdir}/gimp/%{interfacever}/modules
%{_libdir}/gimp/%{interfacever}/modules/*.a
%ifnos linux
%{_libdir}/*.la
@@ -400,6 +421,69 @@
%{_libdir}/pkgconfig/*
%changelog
+* Tue May 01 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-5
+- don't let gimp-plugin-mgr --uninstall fail %%pre/%%preun scriptlets (#238337)
+
+* Mon Apr 30 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-4
+- fix plugin symlinks handling better (#238337)
+
+* Mon Apr 30 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-3
+- don't erroneously delete symlinks to external plugins when updating (#238337)
+
+* Mon Apr 30 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-2
+- avoid buffer overflow in sunras plugin (#238422)
+
+* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.14-1
+- version 2.2.14
+
+ Bugs fixed in GIMP 2.2.14
+ =========================
+
+ - avoid crashing on newer versions of the winicon format (bug #352899)
+ - fixed crash in Postscript plug-in (bug #353381)
+ - fixed handling of TABs in the text tool (bug #353132)
+ - fixed bug in Depth Merge plug-in (bug #355219)
+ - fixed bug in GimpDrawablePreview widget (bug #353639)
+ - fixed bug in Line Nove script (bug #357433)
+ - fixed bug in Ripple plug-in (bug #357431)
+ - save locale independent files from Fractal Explorer plug-in (bug #360095)
+ - fixed bug in Super Nova plug-in (bug #340073)
+ - be more robust against broken XCF files (bug #357809)
+ - fixed drawing issues in Image Map plug-in (bug #311621)
+ - fixed smoothing option in Fractal Explorer plug-in (bug #372671)
+ - load channels in the proper order when opening an XCF file (bug #378003)
+ - deal with floating selections in the Burn-In Animation script (bug #384096)
+ - fixed clipping in the GimpPreviewArea widget (bug #392692)
+ - fixed a potential crash in gimp-remote (bug #392111)
+ - work around a file-chooser problem on Windows (bug #398726)
+ - fixed markup of the gimp(1) manual page (bug #401145)
+ - fixed the fix for the right-to-left layout in layers dialog (bug #348347)
+ - fixed PSD save plug-in on 64bit architectures (bug #335130)
+ - added missing dependency in gimpui-2.0.pc file (bug #356394)
+ - fixed a crash in the PSD save plug-in (bug #395385)
+ - improved robustness of transform tool preview code (bug #420595)
+ - improved forward compatibility of XCF loader (bug #316207)
+ - don't crash in the Compressor plug-in if files can't be opened (bug #422444)
+ - fixed sensitivity of input fields in the Lighting plug-in (bug #359833)
+
+- don't BuildRequire gimp-print/gutenprint anymore
+
+* Mon Mar 26 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.13-3
+- use gutenprint per default for current development/future distribution
+ versions (Fedora >= 7, RHEL >= 6)
+
+* Mon Mar 26 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.13-2
+- own used directories in gimp-devel (#233794)
+
+* Wed Feb 21 2007 Nils Philippsen <nphilipp at redhat.com>
+- s/%%redhat/%%rhel/g
+
+* Wed Feb 07 2007 Nils Philippsen <nphilipp at redhat.com>
+- really change defaults for use of modular X and lcms (#224156)
+
+* Thu Feb 01 2007 Nils Philippsen <nphilipp at redhat.com>
+- change defaults for use of modular X and lcms (#224156)
+
* Fri Aug 25 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.13-1
- version 2.2.13
- remove obsolete filename patch
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 28 Aug 2006 07:13:56 -0000 1.28
+++ sources 2 May 2007 04:25:39 -0000 1.29
@@ -1 +1 @@
-d84a4a476a0c4fae24602db67f6fe49a gimp-2.2.13.tar.bz2
+2f47dd66d714a970356e275dd1d3caac gimp-2.2.14.tar.bz2
More information about the fedora-cvs-commits
mailing list