rpms/gimp/devel .cvsignore, 1.49, 1.50 gimp.spec, 1.184, 1.185 sources, 1.49, 1.50 gimp-2.6.5-define-deprecated.patch, 1.1, NONE

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7927

Modified Files:
	.cvsignore gimp.spec sources 
Removed Files:
	gimp-2.6.5-define-deprecated.patch 
Log Message:
use correct fix from upstream to avoid crashes (#486122)
use -fno-strict-aliasing, PIC/PIE compilation flags



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	15 Feb 2009 21:28:27 -0000	1.49
+++ .cvsignore	10 Mar 2009 17:26:28 -0000	1.50
@@ -1 +1,2 @@
 gimp-2.6.5.tar.bz2
+gimp-2.6.5-gtk-version.patch.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- gimp.spec	9 Mar 2009 10:38:23 -0000	1.184
+++ gimp.spec	10 Mar 2009 17:26:29 -0000	1.185
@@ -24,7 +24,7 @@
 Name:           gimp
 Epoch:          2
 Version:        2.6.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -107,7 +107,7 @@
 Source1:        gimp-plugin-mgr.in
 Patch0:         gimp-2.6.2-xdg-open.patch
 Patch1:         gimp-2.6.2-jpeg-units.patch
-Patch2:         gimp-2.6.5-define-deprecated.patch
+Patch2:         gimp-2.6.5-gtk-version.patch.bz2
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -187,12 +187,17 @@
 %setup -q -n gimp-%{version}
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .jpeg-units
-%patch2 -p1 -b .define-deprecated
+%patch2 -p1 -b .gtk-version
 
 %build
 if [ ! -f configure ]; then
   ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
 fi
+# Use PIC/PIE because gimp is likely to deal with files coming from untrusted
+# sources
+CFLAGS='-fPIC %optflags -fno-strict-aliasing'
+CXXFLAGS='-fPIC %optflags -fno-strict-aliasing'
+LDFLAGS='-pie'
 %configure \
     --disable-perl --enable-gimp-remote \
 %if %{with python}
@@ -465,6 +470,10 @@
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Tue Mar 10 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.5-4
+- use correct fix from upstream to avoid crashes (#486122)
+- use -fno-strict-aliasing, PIC/PIE compilation flags
+
 * Mon Mar 09 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.5-3
 - rebuild against new WebKit
 - define deprecated gtk functions to avoid crashes (#486122)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	15 Feb 2009 21:28:27 -0000	1.49
+++ sources	10 Mar 2009 17:26:29 -0000	1.50
@@ -1 +1,2 @@
 cd13050bc6bde6d8d8fd38eff6276033  gimp-2.6.5.tar.bz2
+9d661944b58b5ac675047b0ba2095ccc  gimp-2.6.5-gtk-version.patch.bz2


--- gimp-2.6.5-define-deprecated.patch DELETED ---