rpms/ghostscript/devel .cvsignore, 1.24, 1.25 ghostscript-8.57-ijs-krgb.patch, 1.1, 1.2 ghostscript-multilib.patch, 1.2, 1.3 ghostscript.spec, 1.145, 1.146 sources, 1.28, 1.29 ghostscript-CVE-2007-2721.patch, 1.1, NONE ghostscript-mkstemp64.patch, 1.2, NONE
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Fri Nov 23 10:11:41 UTC 2007
Author: twaugh
Update of /cvs/pkgs/rpms/ghostscript/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13175
Modified Files:
.cvsignore ghostscript-8.57-ijs-krgb.patch
ghostscript-multilib.patch ghostscript.spec sources
Removed Files:
ghostscript-CVE-2007-2721.patch ghostscript-mkstemp64.patch
Log Message:
* Fri Nov 23 2007 Tim Waugh <twaugh at redhat.com> 8.61-1
- 8.61.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 3 Aug 2007 17:27:23 -0000 1.24
+++ .cvsignore 23 Nov 2007 10:11:06 -0000 1.25
@@ -20,3 +20,4 @@
espgs-8.15.4-source.tar.bz2
ghostscript-8.60-r8117.tar.bz2
ghostscript-8.60.tar.bz2
+ghostscript-8.61.tar.bz2
ghostscript-8.57-ijs-krgb.patch:
Index: ghostscript-8.57-ijs-krgb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript-8.57-ijs-krgb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghostscript-8.57-ijs-krgb.patch 11 Jul 2007 11:43:45 -0000 1.1
+++ ghostscript-8.57-ijs-krgb.patch 23 Nov 2007 10:11:06 -0000 1.2
@@ -1,6 +1,6 @@
-diff -uraN gs-orig/src/gdevijs.c gs-krgb/src/gdevijs.c
---- gs-orig/src/gdevijs.c 2007-04-24 13:00:22.000000000 +0100
-+++ gs-krgb/src/gdevijs.c 2007-04-27 14:44:05.000000000 +0100
+diff -up ghostscript-8.61/src/gdevijs.c.ijs-krgb ghostscript-8.61/src/gdevijs.c
+--- ghostscript-8.61/src/gdevijs.c.ijs-krgb 2007-09-25 14:31:24.000000000 +0100
++++ ghostscript-8.61/src/gdevijs.c 2007-11-23 09:23:00.000000000 +0000
@@ -23,15 +23,50 @@
* which is a security risk, since any program can be run.
* You should use -dSAFER which sets .LockSafetyParams to true
@@ -52,22 +52,22 @@
/* This should go into gdevprn.h, or, better yet, gdevprn should
acquire an API for changing resolution. */
int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev,
-@@ -49,6 +84,14 @@
- private dev_proc_put_params(gsijs_put_params);
- private dev_proc_finish_copydevice(gsijs_finish_copydevice);
+@@ -49,6 +84,14 @@ static dev_proc_get_params(gsijs_get_par
+ static dev_proc_put_params(gsijs_put_params);
+ static dev_proc_finish_copydevice(gsijs_finish_copydevice);
+/* Following definitions are for krgb support. */
-+private dev_proc_create_buf_device(gsijs_create_buf_device);
-+private dev_proc_fill_rectangle(gsijs_fill_rectangle);
-+private dev_proc_copy_mono(gsijs_copy_mono);
-+private dev_proc_fill_mask(gsijs_fill_mask);
-+private dev_proc_fill_path(gsijs_fill_path);
-+private dev_proc_stroke_path(gsijs_stroke_path);
++static dev_proc_create_buf_device(gsijs_create_buf_device);
++static dev_proc_fill_rectangle(gsijs_fill_rectangle);
++static dev_proc_copy_mono(gsijs_copy_mono);
++static dev_proc_fill_mask(gsijs_fill_mask);
++static dev_proc_fill_path(gsijs_fill_path);
++static dev_proc_stroke_path(gsijs_stroke_path);
+
- private const gx_device_procs gsijs_procs = {
+ static const gx_device_procs gsijs_procs = {
gsijs_open,
NULL, /* get_initial_matrix */
-@@ -123,6 +166,15 @@
+@@ -123,6 +166,15 @@ struct gx_device_ijs_s {
IjsClientCtx *ctx;
int ijs_version;
@@ -83,7 +83,7 @@
};
#define DEFAULT_DPI 74 /* See gsijs_set_resolution() below. */
-@@ -150,7 +202,13 @@
+@@ -150,7 +202,13 @@ gx_device_ijs gs_ijs_device =
FALSE, /* Tumble_set */
NULL, /* IjsClient *ctx */
@@ -98,7 +98,7 @@
};
-@@ -166,12 +224,299 @@
+@@ -166,12 +224,299 @@ static int gsijs_read_string(gs_param_li
/**************************************************************************/
@@ -117,7 +117,7 @@
+ 0x01 /* 7 */
+};
+
-+private int gsijs_fill_rectangle(gx_device * dev, int x, int y, int w, int h,
++static int gsijs_fill_rectangle(gx_device * dev, int x, int y, int w, int h,
+ gx_color_index color)
+{
+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
@@ -179,7 +179,7 @@
+ return (*ijsdev->prn_procs.fill_rectangle)(dev, x, y, w, h, color);
+}
+
-+private int gsijs_copy_mono(gx_device * dev, const byte * data,
++static int gsijs_copy_mono(gx_device * dev, const byte * data,
+ int dx, int draster, gx_bitmap_id id,
+ int x, int y, int w, int height, gx_color_index zero, gx_color_index one)
+{
@@ -256,7 +256,7 @@
+
+/* ---------------- High-level graphic procedures ---------------- */
+
-+private int gsijs_fill_mask(gx_device * dev,
++static int gsijs_fill_mask(gx_device * dev,
+ const byte * data, int dx, int raster, gx_bitmap_id id,
+ int x, int y, int w, int h,
+ const gx_drawing_color * pdcolor, int depth,
@@ -278,7 +278,7 @@
+ return code;
+}
+
-+private int gsijs_fill_path(gx_device * dev, const gs_imager_state * pis,
++static int gsijs_fill_path(gx_device * dev, const gs_imager_state * pis,
+ gx_path * ppath, const gx_fill_params * params,
+ const gx_drawing_color * pdcolor,
+ const gx_clip_path * pcpath)
@@ -295,7 +295,7 @@
+ return 0;
+}
+
-+private int gsijs_stroke_path(gx_device * dev, const gs_imager_state * pis,
++static int gsijs_stroke_path(gx_device * dev, const gs_imager_state * pis,
+ gx_path * ppath, const gx_stroke_params * params,
+ const gx_drawing_color * pdcolor,
+ const gx_clip_path * pcpath)
@@ -314,7 +314,7 @@
+
+/* ---------------- krgb banding playback procedures ---------------- */
+
-+private int gsijs_get_bits(gx_device_printer * pdev, int y, byte * str, byte ** actual_data)
++static int gsijs_get_bits(gx_device_printer * pdev, int y, byte * str, byte ** actual_data)
+{
+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev;
+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev;
@@ -332,7 +332,7 @@
+ return gdev_prn_get_bits(pdev, y, str, actual_data); /* get raster from regular band */
+}
+
-+private int gsijs_k_get_bits(gx_device_printer * pdev, int y, byte ** actual_data)
++static int gsijs_k_get_bits(gx_device_printer * pdev, int y, byte ** actual_data)
+{
+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev;
+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev;
@@ -346,7 +346,7 @@
+ return 0;
+}
+
-+private int gsijs_create_buf_device(gx_device **pbdev, gx_device *target,
++static int gsijs_create_buf_device(gx_device **pbdev, gx_device *target,
+ const gx_render_plane_t *render_plane, gs_memory_t *mem, gx_band_complexity_t *band_complexity)
+{
+ gx_device_ijs *ijsdev = (gx_device_ijs *)target;
@@ -369,7 +369,7 @@
+}
+
+/* See if IJS server supports krgb. */
-+private int
++static int
+gsijs_set_krgb_mode(gx_device_ijs *ijsdev)
+{
+ char buf[256];
@@ -401,9 +401,9 @@
+
+/* ------ Private definitions ------ */
- private int
+ static int
gsijs_parse_wxh (const char *val, int size, double *pw, double *ph)
-@@ -209,34 +554,6 @@
+@@ -209,34 +554,6 @@ gsijs_parse_wxh (const char *val, int si
}
/**
@@ -412,7 +412,7 @@
- * This version is specialized for hpijs 1.0 through 1.0.2, and
- * accommodates a number of quirks.
- **/
--private int
+-static int
-gsijs_set_generic_params_hpijs(gx_device_ijs *ijsdev)
-{
- char buf[256];
@@ -437,8 +437,8 @@
-/**
* gsijs_set_generic_params: Set generic IJS parameters.
**/
- private int
-@@ -247,9 +564,6 @@
+ static int
+@@ -247,9 +564,6 @@ gsijs_set_generic_params(gx_device_ijs *
int i, j;
char *value;
@@ -448,7 +448,7 @@
/* Split IjsParams into separate parameters and send to ijs server */
value = NULL;
for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
-@@ -290,68 +604,6 @@
+@@ -290,68 +604,6 @@ gsijs_set_generic_params(gx_device_ijs *
}
/**
@@ -457,7 +457,7 @@
- * This version is specialized for hpijs 1.0 through 1.0.2, and
- * accommodates a number of quirks.
- **/
--private int
+-static int
-gsijs_set_margin_params_hpijs(gx_device_ijs *ijsdev)
-{
- char buf[256];
@@ -516,8 +516,8 @@
-/**
* gsijs_set_margin_params: Do margin negotiation with IJS server.
**/
- private int
-@@ -362,9 +614,6 @@
+ static int
+@@ -362,9 +614,6 @@ gsijs_set_margin_params(gx_device_ijs *i
int i, j;
char *value;
@@ -527,7 +527,7 @@
/* Split IjsParams into separate parameters and send to ijs server */
value = NULL;
for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
-@@ -531,12 +780,18 @@
+@@ -531,12 +780,18 @@ gsijs_open(gx_device *dev)
char buf[256];
bool use_outputfd;
int fd = -1;
@@ -546,7 +546,7 @@
/* Decide whether to use OutputFile or OutputFD. Note: how to
determine this is a tricky question, so we just allow the
user to set it.
-@@ -551,6 +806,8 @@
+@@ -551,6 +806,8 @@ gsijs_open(gx_device *dev)
if (code < 0)
return code;
@@ -555,7 +555,7 @@
if (use_outputfd) {
/* Note: dup() may not be portable to all interesting IJS
platforms. In that case, this branch should be #ifdef'ed out.
-@@ -610,6 +867,9 @@
+@@ -610,6 +867,9 @@ gsijs_open(gx_device *dev)
if (code >= 0)
code = gsijs_set_margin_params(ijsdev);
@@ -565,11 +565,11 @@
return code;
}
-@@ -690,21 +950,6 @@
+@@ -690,21 +950,6 @@ gsijs_raster_width(gx_device *pdev)
return min(width, end);
}
--private int ijs_all_white(unsigned char *data, int size)
+-static int ijs_all_white(unsigned char *data, int size)
-{
- int clean = 1;
- int i;
@@ -587,7 +587,7 @@
/* Print a page. Don't use normal printer gdev_prn_output_page
* because it opens the output file.
*/
-@@ -715,8 +960,10 @@
+@@ -715,8 +960,10 @@ gsijs_output_page(gx_device *dev, int nu
gx_device_printer *pdev = (gx_device_printer *)dev;
int raster = gdev_prn_raster(pdev);
int ijs_width, ijs_height;
@@ -599,7 +599,7 @@
unsigned char *data;
char buf[256];
double xres = pdev->HWResolution[0];
-@@ -732,13 +979,23 @@
+@@ -732,13 +979,23 @@ gsijs_output_page(gx_device *dev, int nu
/* Determine bitmap width and height */
ijs_height = gdev_prn_print_scan_lines(dev);
@@ -627,7 +627,7 @@
/* Required page parameters */
sprintf(buf, "%d", n_chan);
gsijs_client_set_param(ijsdev, "NumChan", buf);
-@@ -747,44 +1004,71 @@
+@@ -747,44 +1004,71 @@ gsijs_output_page(gx_device *dev, int nu
/* This needs to become more sophisticated for DeviceN. */
strcpy(buf, (n_chan == 4) ? "DeviceCMYK" :
@@ -719,11 +719,11 @@
gs_free_object(pdev->memory, data, "gsijs_output_page");
endcode = (pdev->buffer_space && !pdev->is_async_renderer ?
-@@ -1090,7 +1374,6 @@
+@@ -1090,7 +1374,6 @@ gsijs_client_set_param(gx_device_ijs *ij
dprintf2("ijs: Can't set parameter %s=%s\n", key, value);
return code;
}
-
- private int
+ static int
gsijs_set_color_format(gx_device_ijs *ijsdev)
ghostscript-multilib.patch:
Index: ghostscript-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ghostscript-multilib.patch 11 Jul 2007 11:43:45 -0000 1.2
+++ ghostscript-multilib.patch 23 Nov 2007 10:11:06 -0000 1.3
@@ -1,6 +1,8 @@
---- ghostscript-8.60-r8112/ijs/ijs-config.in.multilib 2002-01-31 19:09:46.000000000 +0000
-+++ ghostscript-8.60-r8112/ijs/ijs-config.in 2007-07-10 17:46:44.000000000 +0100
-@@ -43,8 +43,7 @@
+diff -up ghostscript-8.61/ijs/Makefile.am.multilib ghostscript-8.61/ijs/Makefile.am
+diff -up ghostscript-8.61/ijs/ijs-config.in.multilib ghostscript-8.61/ijs/ijs-config.in
+--- ghostscript-8.61/ijs/ijs-config.in.multilib 2002-01-31 19:09:46.000000000 +0000
++++ ghostscript-8.61/ijs/ijs-config.in 2007-11-23 09:19:18.000000000 +0000
+@@ -43,8 +43,7 @@ while test $# -gt 0; do
echo $includes
;;
--libs)
@@ -10,14 +12,3 @@
;;
*)
echo "${usage}" 1>&2
---- ghostscript-8.60-r8112/ijs/Makefile.am.multilib 2007-07-10 18:00:36.000000000 +0100
-+++ ghostscript-8.60-r8112/ijs/Makefile.am 2007-07-10 18:00:39.000000000 +0100
-@@ -34,7 +34,7 @@
-
- pkgincludedir=$(includedir)/ijs
- m4datadir = $(datadir)/aclocal
--pkgconfigdatadir = $(prefix)/lib/pkgconfig
-+pkgconfigdatadir = $(libdir)/pkgconfig
-
- lib_LTLIBRARIES = libijs.la
-
Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- ghostscript.spec 23 Oct 2007 13:37:33 -0000 1.145
+++ ghostscript.spec 23 Nov 2007 10:11:06 -0000 1.146
@@ -1,11 +1,11 @@
-%define gs_ver 8.60
-%define gs_dot_ver 8.60
+%define gs_ver 8.61
+%define gs_dot_ver 8.61
%{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
Summary: A PostScript(TM) interpreter and renderer.
Name: ghostscript
Version: %{gs_ver}
-Release: 5%{?dist}
+Release: 1%{?dist}
License: GPLv2
URL: http://www.ghostscript.com/
@@ -20,8 +20,6 @@
Patch3: ghostscript-noopt.patch
Patch4: ghostscript-fPIC.patch
Patch5: http://www.openprinting.org/download/printing/esp-gpl-ghostscript-merge/ghostscript-8.57-ijs-krgb.patch
-Patch6: ghostscript-mkstemp64.patch
-Patch7: ghostscript-CVE-2007-2721.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts
BuildRequires: libjpeg-devel, libXt-devel
@@ -90,12 +88,6 @@
# IJS KRGB patch.
%patch5 -p1 -b .ijs-krgb
-# From upstream.
-%patch6 -p1 -b .mkstemp64
-
-# Applied patch from upstream to fix CVE-2007-2721 (bug #346511).
-%patch7 -p1 -b .CVE-2007-2721
-
# Convert manual pages to UTF-8
from8859_1() {
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -156,14 +148,15 @@
prefix=$RPM_BUILD_ROOT%{_prefix} \
mandir=$RPM_BUILD_ROOT%{_mandir} \
datadir=$RPM_BUILD_ROOT%{_datadir} \
+ gsincludedir=$RPM_BUILD_ROOT%{_includedir}/ghostscript \
bindir=$RPM_BUILD_ROOT%{_bindir} \
libdir=$RPM_BUILD_ROOT%{_libdir} \
docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_dot_ver} \
gsdir=$RPM_BUILD_ROOT%{_datadir}/%{name} \
gsdatadir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver} \
gssharedir=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{gs_dot_ver} \
- CUPSSERVER=$RPM_BUILD_ROOT`cups-config --serverbin` \
- CUPSCONFIG=$RPM_BUILD_ROOT`cups-config --serverroot` \
+ CUPSSERVERROOT=$RPM_BUILD_ROOT`cups-config --serverroot` \
+ CUPSSERVERBIN=$RPM_BUILD_ROOT`cups-config --serverbin` \
CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir`
mv -f $RPM_BUILD_ROOT%{_bindir}/gsc $RPM_BUILD_ROOT%{_bindir}/gs
@@ -274,6 +267,9 @@
%{_libdir}/libgs.so
%changelog
+* Fri Nov 23 2007 Tim Waugh <twaugh at redhat.com> 8.61-1
+- 8.61.
+
* Tue Oct 23 2007 Tim Waugh <twaugh at redhat.com> 8.60-5
- Applied patch from upstream to fix CVE-2007-2721 (bug #346511).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 3 Aug 2007 17:27:23 -0000 1.28
+++ sources 23 Nov 2007 10:11:06 -0000 1.29
@@ -1,3 +1,3 @@
2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz
dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz
-89fc0a90e67caf151a9d6855200c68ca ghostscript-8.60.tar.bz2
+abff0506cd249cba3ad862d8fe4f6474 ghostscript-8.61.tar.bz2
--- ghostscript-CVE-2007-2721.patch DELETED ---
--- ghostscript-mkstemp64.patch DELETED ---
More information about the fedora-extras-commits
mailing list