head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.38 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.36 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.34 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.32 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.30 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.28 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.26 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.24 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.22 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.20 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.18 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.16 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.14 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.12 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.10 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.8 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.6 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.4 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.2; locks; strict; comment @# @; 1.2 date 2005.10.16.12.26.50; author jmmv; state dead; branches; next 1.1; 1.1 date 2005.09.05.14.42.42; author jmmv; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2005.09.05.14.42.42; author salo; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2005.09.08.10.27.34; author salo; state Exp; branches; next ; desc @@ 1.2 log @Remove ggv2 and gpdf: deprecated by evince, starting in GNOME 2.12.0. @ text @$NetBSD: patch-ab,v 1.1 2005/09/05 14:42:42 jmmv Exp $ Patch to fix CAN-2005-2097. The patch in #163920 doesn't apply to gpdf, since gpdf uses the gnome print api for rendering. The crux of that patch is to avoid using the FoFi (font file) classes for fixing up the embedded truetype font, but instead pass the font to freetype directly. This patch does the same thing for the gpdf rendering code. Kristian Høgsberg --- xpdf/GPOutputDev.cc.krh 2005-08-01 11:44:43.000000000 -0400 +++ xpdf/GPOutputDev.cc 2005-08-01 11:45:32.000000000 -0400 @@@@ -258,9 +258,6 @@@@ } case fontTrueType: { FoFiTrueType *ff; - gint fd; - gchar *temp_name; - FILE *f; gushort *code_to_gid; ff = FoFiTrueType::make((char *)contents, length); @@@@ -269,16 +266,7 @@@@ code_to_gid = ((Gfx8BitFont *)font)->getCodeToGIDMap(ff); // this is g(oo)malloc'd - fd = g_file_open_tmp("gpdf-ttf-XXXXXX", &temp_name, NULL); - f = fdopen(fd, "wb"); - ff->writeTTF(&fileWrite, f); delete ff; - g_free(contents); - fclose(f); - - g_file_get_contents(temp_name, (gchar **)&contents, &length, NULL); - unlink(temp_name); - g_free(temp_name); gff = gpdf_font_face_download((const guchar *)font_name, (const guchar *)"", @@@@ -324,28 +312,8 @@@@ break; } case fontCIDType2: { - FoFiTrueType *ff; - gint fd; - gchar *temp_name; - FILE *f; gint n_cids; gushort *code_to_gid; - - ff = FoFiTrueType::make((char *)contents, length); - if (!ff) - return getFontFaceFallback(font); - - fd = g_file_open_tmp("gpdf-ttf-XXXXXX", &temp_name, NULL); - f = fdopen(fd, "wb"); - ff->writeTTF(&fileWrite, f); - delete ff; - g_free(contents); - fclose(f); - - g_file_get_contents(temp_name, (gchar **)&contents, &length, NULL); - unlink(temp_name); - g_free(temp_name); - gff = gpdf_font_face_download((const guchar *)font_name, (const guchar *)"", GNOME_FONT_REGULAR, FALSE, @ 1.1 log @Apply patch to fix CAN-2005-2097; taken from the Gentoo package, which in turn took the patch from Red Hat. Bump PKGREVISION to 1. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ab was added on branch pkgsrc-2005Q2 on 2005-09-05 14:42:42 +0000 @ text @d1 68 @ 1.1.2.2 log @Pullup ticket 744 - requested by Julio M. Merino Vidal security fix for gpdf Revisions pulled up: - pkgsrc/print/gpdf/Makefile 1.29 - pkgsrc/print/gpdf/distinfo 1.12 - pkgsrc/print/gpdf/patches/patch-ab 1.1 Module Name: pkgsrc Committed By: jmmv Date: Mon Sep 5 14:42:43 UTC 2005 Modified Files: pkgsrc/print/gpdf: Makefile distinfo Added Files: pkgsrc/print/gpdf/patches: patch-ab Log Message: Apply patch to fix CAN-2005-2097; taken from the Gentoo package, which in turn took the patch from Red Hat. Bump PKGREVISION to 1. @ text @a0 68 $NetBSD: patch-ab,v 1.1.2.1 2005/09/08 10:27:34 salo Exp $ Patch to fix CAN-2005-2097. The patch in #163920 doesn't apply to gpdf, since gpdf uses the gnome print api for rendering. The crux of that patch is to avoid using the FoFi (font file) classes for fixing up the embedded truetype font, but instead pass the font to freetype directly. This patch does the same thing for the gpdf rendering code. Kristian Høgsberg --- xpdf/GPOutputDev.cc.krh 2005-08-01 11:44:43.000000000 -0400 +++ xpdf/GPOutputDev.cc 2005-08-01 11:45:32.000000000 -0400 @@@@ -258,9 +258,6 @@@@ } case fontTrueType: { FoFiTrueType *ff; - gint fd; - gchar *temp_name; - FILE *f; gushort *code_to_gid; ff = FoFiTrueType::make((char *)contents, length); @@@@ -269,16 +266,7 @@@@ code_to_gid = ((Gfx8BitFont *)font)->getCodeToGIDMap(ff); // this is g(oo)malloc'd - fd = g_file_open_tmp("gpdf-ttf-XXXXXX", &temp_name, NULL); - f = fdopen(fd, "wb"); - ff->writeTTF(&fileWrite, f); delete ff; - g_free(contents); - fclose(f); - - g_file_get_contents(temp_name, (gchar **)&contents, &length, NULL); - unlink(temp_name); - g_free(temp_name); gff = gpdf_font_face_download((const guchar *)font_name, (const guchar *)"", @@@@ -324,28 +312,8 @@@@ break; } case fontCIDType2: { - FoFiTrueType *ff; - gint fd; - gchar *temp_name; - FILE *f; gint n_cids; gushort *code_to_gid; - - ff = FoFiTrueType::make((char *)contents, length); - if (!ff) - return getFontFaceFallback(font); - - fd = g_file_open_tmp("gpdf-ttf-XXXXXX", &temp_name, NULL); - f = fdopen(fd, "wb"); - ff->writeTTF(&fileWrite, f); - delete ff; - g_free(contents); - fclose(f); - - g_file_get_contents(temp_name, (gchar **)&contents, &length, NULL); - unlink(temp_name); - g_free(temp_name); - gff = gpdf_font_face_download((const guchar *)font_name, (const guchar *)"", GNOME_FONT_REGULAR, FALSE, @