diff options
Diffstat (limited to 'graphics/kdegraphics3')
| -rw-r--r-- | graphics/kdegraphics3/Makefile | 3 | ||||
| -rw-r--r-- | graphics/kdegraphics3/distinfo | 6 | ||||
| -rw-r--r-- | graphics/kdegraphics3/files/patch-kpdf-part.cpp | 14 | ||||
| -rw-r--r-- | graphics/kdegraphics3/files/patch-post-3.5.1-kdegraphics-CVE-2006-0301.diff | 50 | ||||
| -rw-r--r-- | graphics/kdegraphics3/pkg-plist | 3 |
5 files changed, 4 insertions, 72 deletions
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 70c891e59a5a..0379481a7c14 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdegraphics PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -33,7 +32,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes WANT_GNOME= yes USE_GHOSTSCRIPT=yes diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index c7412ceee598..7c67619c39d7 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.1.tar.bz2) = 2cd1c5348b7df46cf7f9d91e1dbfebd2 -SHA256 (KDE/kdegraphics-3.5.1.tar.bz2) = d0f1fed464c1d410b66c115a60245e1c639de828eebde181f26cc8185a0c9ad6 -SIZE (KDE/kdegraphics-3.5.1.tar.bz2) = 7315482 +MD5 (KDE/kdegraphics-3.5.2.tar.bz2) = 8e1816a2191ea85b889930159a5d1e46 +SHA256 (KDE/kdegraphics-3.5.2.tar.bz2) = b33e26d99188f0aee2dc0ff95923a1c1bca7f2a2510a1f761b155b8d2781e64f +SIZE (KDE/kdegraphics-3.5.2.tar.bz2) = 7288264 diff --git a/graphics/kdegraphics3/files/patch-kpdf-part.cpp b/graphics/kdegraphics3/files/patch-kpdf-part.cpp deleted file mode 100644 index bf1e59e4f47b..000000000000 --- a/graphics/kdegraphics3/files/patch-kpdf-part.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- kpdf/part.cpp 2006/01/18 21:57:05 499855 -+++ kpdf/part.cpp 2006/01/23 23:11:54 501814 -@@ -697,6 +697,11 @@ - KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() ); - if ( saveURL.isValid() && !saveURL.isEmpty() ) - { -+ if (saveURL == url()) -+ { -+ KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) ); -+ return; -+ } - if ( KIO::NetAccess::exists( saveURL, false, widget() ) ) - { - if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue) diff --git a/graphics/kdegraphics3/files/patch-post-3.5.1-kdegraphics-CVE-2006-0301.diff b/graphics/kdegraphics3/files/patch-post-3.5.1-kdegraphics-CVE-2006-0301.diff deleted file mode 100644 index e2e19b511dd7..000000000000 --- a/graphics/kdegraphics3/files/patch-post-3.5.1-kdegraphics-CVE-2006-0301.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- kpdf/xpdf/splash/SplashXPathScanner.cc (Revision 505052) -+++ kpdf/xpdf/splash/SplashXPathScanner.cc (Arbeitskopie) -@@ -186,7 +186,7 @@ GBool SplashXPathScanner::getNextSpan(in - } - - void SplashXPathScanner::computeIntersections(int y) { -- SplashCoord ySegMin, ySegMax, xx0, xx1; -+ SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1; - SplashXPathSeg *seg; - int i, j; - -@@ -236,19 +236,27 @@ void SplashXPathScanner::computeIntersec - } else if (seg->flags & splashXPathVert) { - xx0 = xx1 = seg->x0; - } else { -- if (ySegMin <= y) { -- // intersection with top edge -- xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy; -+ if (seg->x0 < seg->x1) { -+ xSegMin = seg->x0; -+ xSegMax = seg->x1; - } else { -- // x coord of segment endpoint with min y coord -- xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0; -+ xSegMin = seg->x1; -+ xSegMax = seg->x0; - } -- if (ySegMax >= y + 1) { -- // intersection with bottom edge -- xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy; -- } else { -- // x coord of segment endpoint with max y coord -- xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1; -+ // intersection with top edge -+ xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy; -+ // intersection with bottom edge -+ xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy; -+ // the segment may not actually extend to the top and/or bottom edges -+ if (xx0 < xSegMin) { -+ xx0 = xSegMin; -+ } else if (xx0 > xSegMax) { -+ xx0 = xSegMax; -+ } -+ if (xx1 < xSegMin) { -+ xx1 = xSegMin; -+ } else if (xx1 > xSegMax) { -+ xx1 = xSegMax; - } - } - if (xx0 < xx1) { diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist index 541270c828ba..4f79d043ee0c 100644 --- a/graphics/kdegraphics3/pkg-plist +++ b/graphics/kdegraphics3/pkg-plist @@ -944,7 +944,6 @@ share/config.kcfg/kdvi.kcfg share/config.kcfg/kghostview.kcfg share/config.kcfg/kpdf.kcfg share/config.kcfg/kviewshell.kcfg -share/config/magic/x-image-raw.magic share/doc/HTML/en/kcoloredit/common share/doc/HTML/en/kcoloredit/index.cache.bz2 share/doc/HTML/en/kcoloredit/index.docbook @@ -1159,7 +1158,6 @@ share/icons/hicolor/scalable/apps/kfaxview.svgz share/icons/hicolor/scalable/apps/kolourpaint.svgz share/icons/hicolor/scalable/apps/kpdf.svgz share/icons/hicolor/scalable/apps/ksnapshot.svgz -share/mimelnk/image/x-image-raw.desktop share/mimelnk/text/mrml.desktop share/services/djvumultipage.desktop share/services/emptymultipage.desktop @@ -1225,7 +1223,6 @@ share/servicetypes/ksvgrenderer.desktop @dirrm share/doc/HTML/en/kgamma @dirrm share/doc/HTML/en/kdvi @dirrm share/doc/HTML/en/kcoloredit -@dirrm share/config/magic @dirrm share/apps/kviewviewer/kpartplugins @dirrm share/apps/kviewviewer @dirrm share/apps/kviewshell |