diff options
| author | sibel <lesibel@free.fr> | 2010-09-01 12:27:31 +0200 |
|---|---|---|
| committer | sibel <lesibel@free.fr> | 2010-09-01 12:27:31 +0200 |
| commit | 20c888fc937006c95f54819846e93e1708d58cc1 (patch) | |
| tree | caee8aa9319fd39b331f2e86fda89671bb8c0b0e | |
| parent | 59259dc18231f1ae39c88c15fa2b1d966cc28245 (diff) | |
| download | nutyx-extra-20c888fc937006c95f54819846e93e1708d58cc1.tar.gz nutyx-extra-20c888fc937006c95f54819846e93e1708d58cc1.tar.bz2 nutyx-extra-20c888fc937006c95f54819846e93e1708d58cc1.tar.xz nutyx-extra-20c888fc937006c95f54819846e93e1708d58cc1.zip | |
maj de kde/kdegraphics#4.5.1-1
| -rw-r--r-- | kde/kdegraphics/.md5sum | 2 | ||||
| -rw-r--r-- | kde/kdegraphics/CVE-2010-2575.patch | 28 | ||||
| -rwxr-xr-x | kde/kdegraphics/Pkgfile | 16 |
3 files changed, 34 insertions, 12 deletions
diff --git a/kde/kdegraphics/.md5sum b/kde/kdegraphics/.md5sum index e856afc65..9fbf64985 100644 --- a/kde/kdegraphics/.md5sum +++ b/kde/kdegraphics/.md5sum @@ -1 +1 @@ -e8f623f95d902ff4e62574080bbd4061 kdegraphics-4.5.0.tar.bz2 +11c3da572a6205bf5d898e8958d4aadd kdegraphics-4.5.1.tar.bz2 diff --git a/kde/kdegraphics/CVE-2010-2575.patch b/kde/kdegraphics/CVE-2010-2575.patch new file mode 100644 index 000000000..5d4394b2a --- /dev/null +++ b/kde/kdegraphics/CVE-2010-2575.patch @@ -0,0 +1,28 @@ +--- okular/generators/plucker/unpluck/image.cpp (revision 1162413) ++++ okular/generators/plucker/unpluck/image.cpp (working copy) +@@ -289,8 +289,23 @@ + for (j = 0; j < bytes_per_row;) { + incount = *palm_ptr++; + inval = *palm_ptr++; +- memset (rowbuf + j, inval, incount); +- j += incount; ++ if (incount + j <= bytes_per_row * width) ++ { ++ memset (rowbuf + j, inval, incount); ++ j += incount; ++ } ++ else ++ { ++ free (rowbuf); ++ free (lastrow); ++ free (jpeg_row); ++ ++ jpeg_destroy_compress (&cinfo); ++ ++ fclose( outfile ); ++ ++ return false; ++ } + } + } + else if ((flags & PALM_IS_COMPRESSED_FLAG) diff --git a/kde/kdegraphics/Pkgfile b/kde/kdegraphics/Pkgfile index 427ed6594..a9285e377 100755 --- a/kde/kdegraphics/Pkgfile +++ b/kde/kdegraphics/Pkgfile @@ -2,26 +2,20 @@ # URL: http://www.kde.org # Maintainer: NuTyX packager team # Packager: lesibel at free dot fr -# Depends on: hugin, lcms, kdebase-runtime, shared-mime-info, exiv2, ebook-tools, libspectre, chmlib, libgphoto2, poppler-qt, qca, kdelibs, lcms, soprano, qimageblitz, sane, djvulibre +# Depends on: jdk, soprano, hugin, lcms, kdebase-runtime, shared-mime-info, exiv2, ebook-tools, libspectre, chmlib, libgphoto2, poppler-qt, qca, kdelibs, lcms, soprano, qimageblitz, sane, djvulibre name=kdegraphics -version=4.5.0 -release=2 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +version=4.5.1 +release=1 +source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) build() { - # kdegraphics a besoin que poppler 2.2.6b soit recompile juste avant pour avoir les pdf - # A la rache mais en attendant .... - pkg-get remove poppler - prt-get depinst poppler - # - cd $name-$version mkdir build cd build cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_doc=OFF - make -j3 + make -j5 make DESTDIR=$PKG install } |