--- ./gimp2.info.old 2008-04-30 05:23:55.000000000 +0900 +++ ./gimp2.info 2008-04-30 20:30:59.000000000 +0900 @@ -2,27 +2,27 @@ Package: gimp2%type_pkg[-svg]%type_pkg[-noprint] Type: -svg (boolean), -noprint (boolean) -Version: 2.0.6 -Revision: 1007 +Version: 2.4.5 +Revision: 1 # This package has OS X version-specific differences! # Do not blindly copy 10.3 <-> 10.4 -Source: mirror:gimp:v2.0/gimp-%v.tar.bz2 -Source2: mirror:gimp:help/testing/gimp-help-2-0.5.tar.gz -Source3: http://astrange.ithinksw.net/fink/gimp-2.2.13-1etch4-debian.tar.bz2 -Source4: http://paq.osdn.org.ua/~mike/tmp/gimp-2.2.8-ubuntu-CVE-2006-3404.patch +Source: mirror:gimp:v2.4/gimp-%v.tar.bz2 +Source2: mirror:gimp:help/gimp-help-2.4.1.tar.bz2 Depends: %N-shlibs (= %v-%r) Conflicts: gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint Replaces: gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint Recommends: %N-default (= %v-%r) BuildDepends: << -pkgconfig (>= 0.21-1), xft2-dev, glitz, cairo (>= 1.6-1), libpng3, libjpeg, libtiff, glib2-dev (>= 2.14.0-1), netpbm, giflib, aalib (>= 1.4rc5-2), libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, gtk-doc (>= 1.8-1), x11-dev, (%type_raw[-noprint] = nevertrue) gimp-print7-dev, libexif12, gtk+2-dev (>= 2.12.0-1), libart2, libmng2, expat1, fontconfig2-dev (>= 2.4.1-1), lcms, libwmf, pango1-xft2-ft219-dev (>= 1.18.4-4), pixman (>= 0.10.0-1), atk1 (>= 1.20.0-1), intltool (>= 0.36.0-1), freetype219 (>= 2.3.5-1), +pkgconfig (>= 0.21-1), xft2-dev, glitz, cairo (>= 1.6-1), libpng3, libjpeg, libtiff, glib2-dev (>= 2.14.0-1), giflib, aalib (>= 1.4rc5-2), libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, gtk-doc (>= 1.8-1), x11-dev, (%type_raw[-noprint] = nevertrue) gimp-print7-dev, libexif12, gtk+2-dev (>= 2.12.0-1), libart2, libmng2, expat1, fontconfig2-dev (>= 2.4.1-1), lcms, libwmf, pango1-xft2-ft219-dev (>= 1.18.4-4), pixman (>= 0.10.0-1), atk1 (>= 1.20.0-1), intltool (>= 0.36.0-1), freetype219 (>= 2.3.5-1), (%type_raw[-svg] = -svg) librsvg2 (>= 2.18.0-1), (%type_raw[-svg] = -svg) audiofile, (%type_raw[-svg] = -svg) avahi-dev, + (%type_raw[-svg] = -svg) esound, (%type_raw[-svg] = -svg) gail18-dev (>= 1.20.0-1), (%type_raw[-svg] = -svg) gconf2-dev (>= 2.20.0-1), (%type_raw[-svg] = -svg) dbus-dev (>= 1.0-1), (%type_raw[-svg] = -svg) gnome-vfs2-unified-dev (>= 1:2.20.0-1), + (%type_raw[-svg] = -svg) gnome-keyring-dev, (%type_raw[-svg] = -svg) libavahi-glib1-dev, (%type_raw[-svg] = -svg) libbonobo2-dev (>= 2.20.0-1), (%type_raw[-svg] = -svg) libbonoboui2-dev (>= 2.20.0-1), @@ -37,52 +37,21 @@ (%type_raw[-svg] = -svg) popt, libxslt (>= 1.1.22-1), libncurses5, bzip2-dev << -Source-MD5: 632b9ec629ba7c48d292069c37a1a6c1 -Source2-MD5: 4b10833a545842ee4436a75eea68fd42 -Source3-MD5: d855405d3fde6c453fe55fd3b1cab835 -Source4-MD5: c5f49173063c776b7d7a908ec0889b05 +Source-MD5: 162e264dc5f0c7e4de8794e78818381f +Source2-MD5: da505d7532b6e14713e04b6e79a11379 SetCC: gcc -I%p/lib/fontconfig2/include -L%p/lib/fontconfig2/lib -I%p/lib/freetype219/include -L%p/lib/freetype219/lib SetLIBS: -liconv -lintl -lexpat SetLDFLAGS: -Wl,-search_paths_first -DocFiles: COPYING AUTHORS MAINTAINERS NEWS PLUGIN_MAINTAINERS README README.i18n -ConfigureParams: --disable-dependency-tracking --enable-altivec --enable-mp --enable-gtk-doc --with-shm=posix --with-aa --with-sendmail=/usr/sbin/sendmail --mandir=%p/share/man --disable-mmx PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH" FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config +DocFiles: COPYING AUTHORS LICENSE NEWS* README* +ConfigureParams: --disable-python --disable-dependency-tracking --enable-altivec --enable-mp --enable-gtk-doc --with-shm=posix --with-aa --with-sendmail=/usr/sbin/sendmail --mandir=%p/share/man --disable-mmx PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH" FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config PatchScript: << #!/bin/sh -ev -########## Security Fixes ########## -# Fix buffer overflow in XCF parser, imported from Ubuntu. -patch -p1 < ../gimp-2.2.8-ubuntu-CVE-2006-3404.patch - -# Fix stack overflow in sunras plugin -sed s/set_colormap/set_cmap/ ../debian/patches/06_CVE-2007-2356.patch | patch -p1 - -# Avoid conflict with 07_CVE-2006-4519-CVE-2007-2949.patch -perl -pi.bak0 -e "s/\t/ /g" app/xcf/xcf-load.c -sed -i.bak0 -e '/total = count;/d' \ - -e '/gint bytes;/d' \ - -e 's/guint total;/guint total = count;/' app/xcf/xcf-read.c -perl -pi.bak1 -e "s/(bytes =.*)/gint \1\n/" app/xcf/xcf-read.c -perl -pi.bak2 -e "s/break;/break;\n/" app/xcf/xcf-read.c - -# Fix multiple buffer overflows and integer overflows -patch -p1 < ../debian/patches/07_CVE-2006-4519-CVE-2007-2949.patch -########## Security Fixes ########## - if [ "%type_raw[-svg]" != "-svg" ]; then sed 's;SVG = @SVG@;SVG = ;' < plug-ins/common/Makefile.in > tmp mv tmp plug-ins/common/Makefile.in fi -cat <= 2.14.0-1), gtk+2-shlibs (>= 2.12.0-1), netpbm-shlibs, giflib-shlibs, aalib-shlibs, libgettext3-shlibs, libiconv, libexif12-shlibs, libart2-shlibs, libmng2-shlibs, expat1-shlibs, lcms-shlibs, (%type_raw[-svg] = -svg) librsvg2-shlibs (>= 2.18.0-1), (%type_raw[-svg] = -svg) libgtkhtml2-shlibs, atk1-shlibs (>= 1.20.0-1), pango1-xft2-ft219-shlibs (>= 1.18.4-4), libncurses5-shlibs, freetype219-shlibs (>= 2.3.5-1), fontconfig2-shlibs (>= 2.4.1-1) + Depends: (%type_raw[-noprint] = nevertrue) gimp-print7-shlibs, libpng3-shlibs, libjpeg-shlibs, libtiff-shlibs, glib2-shlibs (>= 2.14.0-1), gtk+2-shlibs (>= 2.12.0-1), giflib-shlibs, aalib-shlibs, libgettext3-shlibs, libiconv, libexif12-shlibs, libart2-shlibs, libmng2-shlibs, expat1-shlibs, lcms-shlibs, (%type_raw[-svg] = -svg) librsvg2-shlibs (>= 2.18.0-1), (%type_raw[-svg] = -svg) libgtkhtml2-shlibs, atk1-shlibs (>= 1.20.0-1), pango1-xft2-ft219-shlibs (>= 1.18.4-4), libncurses5-shlibs, freetype219-shlibs (>= 2.3.5-1), fontconfig2-shlibs (>= 2.4.1-1) Conflicts: gimp2-shlibs,gimp2-svg-shlibs,gimp2-noprint-shlibs,gimp2-svg-noprint-shlibs Replaces: << gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint, gimp2-shlibs,gimp2-svg-shlibs,gimp2-noprint-shlibs,gimp2-svg-noprint-shlibs << Files: << - lib/gimp/2.0 - lib/libgimp-2.0.0.0.6.dylib lib/libgimp-2.0.0.dylib - lib/libgimpbase-2.0.0.0.6.dylib lib/libgimpbase-2.0.0.dylib - lib/libgimpcolor-2.0.0.0.6.dylib lib/libgimpcolor-2.0.0.dylib - lib/libgimpmath-2.0.0.0.6.dylib lib/libgimpmath-2.0.0.dylib - lib/libgimpmodule-2.0.0.0.6.dylib lib/libgimpmodule-2.0.0.dylib - lib/libgimpthumb-2.0.0.0.6.dylib lib/libgimpthumb-2.0.0.dylib - lib/libgimpui-2.0.0.0.6.dylib lib/libgimpui-2.0.0.dylib - lib/libgimpwidgets-2.0.0.0.6.dylib lib/libgimpwidgets-2.0.0.dylib - share/gimp/2.0 + lib/gimp + lib/libgimp-2.0.0.400.5.dylib lib/libgimp-2.0.0.dylib + lib/libgimpbase-2.0.0.400.5.dylib lib/libgimpbase-2.0.0.dylib + lib/libgimpcolor-2.0.0.400.5.dylib lib/libgimpcolor-2.0.0.dylib + lib/libgimpconfig-2.0.0.400.5.dylib lib/libgimpconfig-2.0.0.dylib + lib/libgimpmath-2.0.0.400.5.dylib lib/libgimpmath-2.0.0.dylib + lib/libgimpmodule-2.0.0.400.5.dylib lib/libgimpmodule-2.0.0.dylib + lib/libgimpthumb-2.0.0.400.5.dylib lib/libgimpthumb-2.0.0.dylib + lib/libgimpui-2.0.0.400.5.dylib lib/libgimpui-2.0.0.dylib + lib/libgimpwidgets-2.0.0.400.5.dylib lib/libgimpwidgets-2.0.0.dylib + share/gimp share/locale << Shlibs: << - %p/lib/libgimp-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1) - %p/lib/libgimpbase-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1003) - %p/lib/libgimpcolor-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1) - %p/lib/libgimpmath-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1) - %p/lib/libgimpmodule-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1) - %p/lib/libgimpthumb-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1) - %p/lib/libgimpui-2.0.0.dylib 1.0.0 %n (>= 2.0.0-1) - %p/lib/libgimpwidgets-2.0.0.dylib 1.0.0 %n (>= 2.0.6-1) + %p/lib/libgimp-2.0.0.dylib 401.0.0 %n (>= 2.4.5-1) + %p/lib/libgimpbase-2.0.0.dylib 401.0.0 %n (>= 2.4.5-1) + %p/lib/libgimpcolor-2.0.0.dylib 401.0.0 %n (>= 2.4.5-1) + %p/lib/libgimpconfig-2.0.0.dylib 401.0.0 %n (>= 2.4.5-1) + %p/lib/libgimpmath-2.0.0.dylib 401.0.0 %n (>= 2.4.5-1) + %p/lib/libgimpmodule-2.0.0.dylib 401.0.0 %n (>= 2.4.5-1) + %p/lib/libgimpthumb-2.0.0.dylib 401.0.0 %n (>= 2.4.5-1) + %p/lib/libgimpui-2.0.0.dylib 401.0.0 %n (>= 2.4.5-1) + %p/lib/libgimpwidgets-2.0.0.dylib 401.0.0 %n (>= 2.4.5-1) << - DocFiles: COPYING AUTHORS MAINTAINERS NEWS PLUGIN_MAINTAINERS README README.i18n + DocFiles: COPYING AUTHORS LICENSE NEWS* README* DescPackaging: << libgimpbase was previously in %N << @@ -169,8 +140,8 @@ Conflicts: gimp2-dev,gimp2-svg-dev,gimp2-noprint-dev,gimp2-svg-noprint-dev, gimp-dev (<= 2.0.0-5) Replaces: gimp2-dev,gimp2-svg-dev,gimp2-noprint-dev,gimp2-svg-noprint-dev, gimp-dev (<= 2.0.0-5) BuildDependsOnly: true - Files: include lib/*.la lib/libgimp-2.0.dylib lib/libgimpbase-2.0.dylib lib/libgimpcolor-2.0.dylib lib/libgimpmath-2.0.dylib lib/libgimpmodule-2.0.dylib lib/libgimpthumb-2.0.dylib lib/libgimpui-2.0.dylib lib/libgimpwidgets-2.0.dylib lib/pkgconfig share/aclocal share/gtk-doc bin/gimptool-2.0 - DocFiles: COPYING AUTHORS MAINTAINERS NEWS PLUGIN_MAINTAINERS README README.i18n + Files: include lib/*.la lib/libgimp-2.0.dylib lib/libgimpbase-2.0.dylib lib/libgimpcolor-2.0.dylib lib/libgimpconfig-2.0.dylib lib/libgimpmath-2.0.dylib lib/libgimpmodule-2.0.dylib lib/libgimpthumb-2.0.dylib lib/libgimpui-2.0.dylib lib/libgimpwidgets-2.0.dylib lib/pkgconfig share/aclocal share/gtk-doc bin/gimptool-2.0 + DocFiles: COPYING AUTHORS LICENSE NEWS* README* << SplitOff4: << @@ -178,8 +149,8 @@ Depends: %N (= %v-%r) Replaces: gimp-default, gimp2-default, gimp2-noprint-default, gimp2-svg-default, gimp2-svg-noprint-default, gimp (<= 1.2.5-4) Conflicts: gimp-default, gimp2-default, gimp2-noprint-default, gimp2-svg-default, gimp2-svg-noprint-default, gimp (<= 1.2.5-4) - Files: bin/gimp bin/gimp-remote share/man/man1/gimp.1 share/man/man1/gimp-remote.1 share/man/man5/gimprc.5 - DocFiles: COPYING AUTHORS MAINTAINERS NEWS PLUGIN_MAINTAINERS README README.i18n + Files: bin/gimp bin/gimp-console bin/gimp-remote share/man/man1/gimp.1 share/man/man1/gimp-console.1 share/man/man1/gimp-remote.1 share/man/man5/gimprc.5 + DocFiles: COPYING AUTHORS LICENSE NEWS* README* << @@ -189,6 +160,8 @@ %p/etc/gimp/2.0/gtkrc %p/etc/gimp/2.0/templaterc %p/etc/gimp/2.0/ps-menurc %p/etc/gimp/2.0/unitrc + %p/etc/gimp/2.0/controllerrc + %p/etc/gimp/2.0/menurc << # Description: The GNU Image Manipulation Program 2.0