diff options
Diffstat (limited to 'print/evince')
-rw-r--r-- | print/evince/Makefile | 5 | ||||
-rw-r--r-- | print/evince/Makefile.common | 5 | ||||
-rw-r--r-- | print/evince/PLIST | 16 | ||||
-rw-r--r-- | print/evince/distinfo | 9 | ||||
-rw-r--r-- | print/evince/patches/patch-ac | 27 |
5 files changed, 50 insertions, 12 deletions
diff --git a/print/evince/Makefile b/print/evince/Makefile index 461e071f16e..07e8d43348f 100644 --- a/print/evince/Makefile +++ b/print/evince/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2006/09/19 11:21:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.25.2.1 2006/12/09 08:38:35 salo Exp $ # .include "../../print/evince/Makefile.common" - -PKGREVISION= 2 +PKGREVISION= 1 COMMENT= Document viewer for the GNOME Desktop diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common index c7117864e4b..67ef15693d0 100644 --- a/print/evince/Makefile.common +++ b/print/evince/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.11 2006/09/19 11:21:37 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.11.2.1 2006/12/09 08:38:35 salo Exp $ # -DISTNAME= evince-0.6.0 +DISTNAME= evince-0.6.1 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evince/0.6/} EXTRACT_SUFX= .tar.bz2 @@ -33,6 +33,7 @@ BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.5.3 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../print/poppler-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/print/evince/PLIST b/print/evince/PLIST index 084bfb77431..97e7487b958 100644 --- a/print/evince/PLIST +++ b/print/evince/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2006/09/19 11:21:37 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.12.2.1 2006/12/09 08:38:35 salo Exp $ bin/evince bin/evince-thumbnailer share/applications/evince.desktop @@ -20,6 +20,8 @@ share/gnome/help/evince/el/evince.xml share/gnome/help/evince/el/figures/evince_start_window.png share/gnome/help/evince/es/evince.xml share/gnome/help/evince/es/figures/evince_start_window.png +share/gnome/help/evince/fi/evince.xml +share/gnome/help/evince/fi/figures/evince_start_window.png share/gnome/help/evince/fr/evince.xml share/gnome/help/evince/fr/figures/evince_start_window.png share/gnome/help/evince/it/evince.xml @@ -30,10 +32,12 @@ share/gnome/help/evince/ru/evince.xml share/gnome/help/evince/ru/figures/evince_start_window.png share/gnome/help/evince/sr/evince.xml share/gnome/help/evince/sr/figures/evince_start_window.png +share/gnome/help/evince/sv/evince.xml +share/gnome/help/evince/sv/figures/evince_start_window.png share/gnome/help/evince/uk/evince.xml share/gnome/help/evince/uk/figures/evince_start_window.png -share/icons/hicolor/16x16/apps/evince-16.png -share/icons/hicolor/22x22/apps/evince-22.png +share/icons/hicolor/16x16/apps/evince.png +share/icons/hicolor/22x22/apps/evince.png share/icons/hicolor/48x48/apps/evince.png share/icons/hicolor/scalable/apps/evince.svg share/locale/be/LC_MESSAGES/evince.mo @@ -103,11 +107,13 @@ share/omf/evince/evince-C.omf share/omf/evince/evince-bg.omf share/omf/evince/evince-el.omf share/omf/evince/evince-es.omf +share/omf/evince/evince-fi.omf share/omf/evince/evince-fr.omf share/omf/evince/evince-it.omf share/omf/evince/evince-nl.omf share/omf/evince/evince-ru.omf share/omf/evince/evince-sr.omf +share/omf/evince/evince-sv.omf share/omf/evince/evince-uk.omf @dirrm share/omf/evince @comment in scrollkeeper: @dirrm share/omf @@ -118,6 +124,8 @@ share/omf/evince/evince-uk.omf @comment in hicolor-icon-theme: @dirrm share/icons/hicolor @dirrm share/gnome/help/evince/uk/figures @dirrm share/gnome/help/evince/uk +@dirrm share/gnome/help/evince/sv/figures +@dirrm share/gnome/help/evince/sv @dirrm share/gnome/help/evince/sr/figures @dirrm share/gnome/help/evince/sr @dirrm share/gnome/help/evince/ru/figures @@ -128,6 +136,8 @@ share/omf/evince/evince-uk.omf @dirrm share/gnome/help/evince/it @dirrm share/gnome/help/evince/fr/figures @dirrm share/gnome/help/evince/fr +@dirrm share/gnome/help/evince/fi/figures +@dirrm share/gnome/help/evince/fi @dirrm share/gnome/help/evince/es/figures @dirrm share/gnome/help/evince/es @dirrm share/gnome/help/evince/el/figures diff --git a/print/evince/distinfo b/print/evince/distinfo index 2a543473937..d7f7f8bac37 100644 --- a/print/evince/distinfo +++ b/print/evince/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.8 2006/09/15 15:22:16 jmmv Exp $ +$NetBSD: distinfo,v 1.8.2.1 2006/12/09 08:38:35 salo Exp $ -SHA1 (evince-0.6.0.tar.bz2) = b3a38490b109284d91de3b50a3bb85b2847b39ed -RMD160 (evince-0.6.0.tar.bz2) = 697fe6b5c1ba60d529422c2ea2a145b2e2dc7f3b -Size (evince-0.6.0.tar.bz2) = 1120159 bytes +SHA1 (evince-0.6.1.tar.bz2) = bc314761ecc9c29d10d09294ad8e32bab3a5dbc6 +RMD160 (evince-0.6.1.tar.bz2) = ac94e1964f4f46e505fe945daa9de288c2587898 +Size (evince-0.6.1.tar.bz2) = 1212271 bytes SHA1 (patch-aa) = 65abdde02e6b72743d47e5c5d6156cbb4a74f0a6 SHA1 (patch-ab) = 800d96b612b09976f8573b4caab40da1d5d838f6 +SHA1 (patch-ac) = a2f08a7d977b1e51a811c80c6abc8b8480dd3cda diff --git a/print/evince/patches/patch-ac b/print/evince/patches/patch-ac new file mode 100644 index 00000000000..d64973d8e7d --- /dev/null +++ b/print/evince/patches/patch-ac @@ -0,0 +1,27 @@ +$NetBSD: patch-ac,v 1.1.2.2 2006/12/09 08:38:35 salo Exp $ + +Fix for CVE-2006-5864. From evince CVS +http://cvs.gnome.org/viewcvs/evince/ps/ps.c?r1=1.6&r2=1.6.6.1 + +--- ps/ps.c.orig 2006-01-07 00:03:44.000000000 +0100 ++++ ps/ps.c +@@ -1231,7 +1231,8 @@ get_next_text(line, next_char) + int level = 0; + quoted = 1; + line++; +- while(*line && !(*line == ')' && level == 0)) { ++ while(*line && !(*line == ')' && level == 0) ++ && (cp - text) < PSLINELENGTH - 1) { + if(*line == '\\') { + if(*(line + 1) == 'n') { + *cp++ = '\n'; +@@ -1302,7 +1303,8 @@ get_next_text(line, next_char) + } + } + else { +- while(*line && !(*line == ' ' || *line == '\t' || *line == '\n')) ++ while(*line && !(*line == ' ' || *line == '\t' || *line == '\n') ++ && (cp - text) < PSLINELENGTH - 1) + *cp++ = *line++; + } + *cp = '\0'; |