--- Begin Message ---
Package: ghostscript
We are currently implementing the PDF-based printing workflow:
http://www.linuxfoundation.org/en/OpenPrinting/PDF_as_Standard_Print_Job_Format
For this there was added a Poppler-based pdftoraster CUPS filter to the
"cups" package. As this filter caused problems we removed it again in
cups 1.3.9-4 which will be uploaded soon. See:
https://bugs.edge.launchpad.net/ubuntu/+source/cups/+bug/290395
The filter should be replaced by a Ghostscript-based pdftoraster filter
which I have developed and made upstream part of Ghostscript. It is
available in the SVN repository of Ghostscript.As this filter is part of
Ghostscript it needs to be added to the ghostscript package.
As I have done so with the Ubuntu package already, I add a patch which
adds the filter to the ghostscript package. A second patch (for
debian/patches/) fixes bugs in gdevcups.c ("cups" output device of
Ghostscript). These fixes are needed for the filter to work.
I highly recommend to also bump the Ghostscript version to 8.63 (merge
from Ubuntu).
Till
diff -u ghostscript-8.63.dfsg.1/debian/changelog ghostscript-8.63.dfsg.1/debian/changelog
--- ghostscript-8.63.dfsg.1/debian/changelog
+++ ghostscript-8.63.dfsg.1/debian/changelog
@@ -1,3 +1,14 @@
+ghostscript (8.63.dfsg.1-0ubuntu7) jaunty; urgency=low
+
+ * debian/local/pdftoraster/pdftoraster.c,
+ debian/local/pdftoraster/pdftoraster.convs, debian/rules: Added pdftoraster
+ filter from the Ghostscript SVN repository (LP: #290395).
+
+ * debian/control: Added conflict with cups < 1.3.9-4 because the pdftoraster
+ filter was there before.
+
+ -- Till Kamppeter <[email protected]> Tue, 11 Nov 2008 10:33:22 +0200
+
ghostscript (8.63.dfsg.1-0ubuntu6) intrepid; urgency=low
* debian/patches/42_gs-init-ps-delaybind-fix.dpatch: Make "ps2ascii" working
diff -u ghostscript-8.63.dfsg.1/debian/rules ghostscript-8.63.dfsg.1/debian/rules
--- ghostscript-8.63.dfsg.1/debian/rules
+++ ghostscript-8.63.dfsg.1/debian/rules
@@ -53,10 +53,11 @@
[ ! -f Makefile ] || $(MAKE) soclean
[ ! -f Makefile ] || $(MAKE) distclean
# These are somehow left...
- -rm -rf sobin soobj cups/pstopxl cups/pstoraster
+ -rm -rf sobin soobj cups/pstopxl cups/pstoraster debian/local/pdftoraster/pdftoraster
build/ghostscript::
#/usr/bin/docbook-to-man debian/ghostscript.sgml > ghostscript.1
+ gcc $(CFLAGS) $(LDFLAGS) `cups-config --image --libs` -DBINDIR='"/usr/bin"' -DGS='"gs"' -o debian/local/pdftoraster/pdftoraster debian/local/pdftoraster/pdftoraster.c
build/ghostscript-x::
$(MAKE) obj/X11.so
@@ -74,6 +75,10 @@
$(CURDIR)/debian/ghostscript/usr/share/cups/mime/ 2> /dev/null || :
rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/ghostscript/etc/cups
rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/ghostscript/etc
+ install -m 755 debian/local/pdftoraster/pdftoraster \
+ $(CURDIR)/debian/ghostscript/usr/lib/cups/filter/
+ install -m 644 debian/local/pdftoraster/pdftoraster.convs \
+ $(CURDIR)/debian/ghostscript/usr/share/cups/mime/
# Install DeFoMa script
install -m 644 $(CURDIR)/debian/gs.defoma $(CURDIR)/debian/ghostscript/usr/share/defoma/scripts
diff -u ghostscript-8.63.dfsg.1/debian/control ghostscript-8.63.dfsg.1/debian/control
--- ghostscript-8.63.dfsg.1/debian/control
+++ ghostscript-8.63.dfsg.1/debian/control
@@ -9,7 +9,7 @@
Package: ghostscript
Architecture: any
-Conflicts: gs (<< 8.62), gs-esp (<< 8.62), gs-gpl (<< 8.62), gs-afpl (<< 8.62), gs-aladdin (<< 8.62), gs-cjk-resource (<< 1.20010910-1), gs-pdfencrypt (<< 7.00), gs-common (<< 8.62), ghostscript-fonts
+Conflicts: gs (<< 8.62), gs-esp (<< 8.62), gs-gpl (<< 8.62), gs-afpl (<< 8.62), gs-aladdin (<< 8.62), gs-cjk-resource (<< 1.20010910-1), gs-pdfencrypt (<< 7.00), gs-common (<< 8.62), ghostscript-fonts, cups (<< 1.3.9-4)
Replaces: gs (<< 8.62), gs-esp (<< 8.62), gs-gpl (<< 8.62), gs-afpl (<< 8.62), gs-aladdin (<< 8.62), gs-pdfencrypt (<< 7.00), gs-common (<< 8.62), ghostscript-fonts
Provides: gs-pdfencrypt, postscript-viewer, gs-common
Recommends: psfontmgr
diff -u ghostscript-8.63.dfsg.1/debian/patches/00list ghostscript-8.63.dfsg.1/debian/patches/00list
--- ghostscript-8.63.dfsg.1.orig/debian/local/pdftoraster/pdftoraster.convs
+++ ghostscript-8.63.dfsg.1/debian/local/pdftoraster/pdftoraster.convs
@@ -0,0 +1,29 @@
+# Copyright (c) 2008, Till Kamppeter
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# MIT Open Source License - http://www.opensource.org/
+#
+# $Id: pdftoraster.convs 8803 2008-06-24 14:16:29Z till $
+#
+# CUPS file conversion rules for pdftoraster filter
+
+application/vnd.cups-pdf application/vnd.cups-raster 66 pdftoraster
+
only in patch2:
unchanged:
--- ghostscript-8.63.dfsg.1.orig/debian/local/pdftoraster/pdftoraster.c
+++ ghostscript-8.63.dfsg.1/debian/local/pdftoraster/pdftoraster.c
@@ -0,0 +1,509 @@
+/*
+Copyright (c) 2008, Till Kamppeter
+Copyright (c) 2008, BBR Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+MIT Open Source License - http://www.opensource.org/
+
+*/
+
+/* $Id: pdftoraster.c 9171 2008-10-17 22:58:21Z giles $ */
+
+/* PDF to CUPS Raster filter based on Ghostscript */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <cups/cups.h>
+#include <stdarg.h>
+#include <fcntl.h>
+#include <cups/raster.h>
+
+#define MAX_CHECK_COMMENT_LINES 20
+#ifndef GS
+#define GS "gs"
+#endif
+#ifndef BINDIR
+#define BINDIR "/usr/bin"
+#endif
+#ifndef CUPS_FONTPATH
+#define CUPS_FONTPATH "/usr/share/cups/fonts"
+#endif
+
+int exitCode = 0;
+int deviceCopies = 1;
+cups_bool_t deviceCollate = CUPS_FALSE;
+#ifdef CUPS_RASTER_SYNCv1
+cups_page_header2_t h;
+#else
+cups_page_header_t h;
+#endif /* CUPS_RASTER_SYNCv1 */
+int num_options = 0;
+cups_option_t *options = 0;
+
+void parseOpts(int argc, char **argv)
+{
+ ppd_file_t *ppd = 0;
+
+ if (argc < 6 || argc > 7) {
+ fprintf(stderr, "ERROR: %s job-id user title copies options [file]",
+ argv[0]);
+ exit(1);
+ }
+
+ ppd = ppdOpenFile(getenv("PPD"));
+ ppdMarkDefaults(ppd);
+ options = NULL;
+ num_options = cupsParseOptions(argv[5],0,&options);
+ cupsMarkOptions(ppd,num_options,options);
+ cupsRasterInterpretPPD(&h,ppd,num_options,options,0);
+}
+
+void parsePDFTOPDFComment(FILE *fp)
+{
+ char buf[4096];
+ int i;
+
+ /* skip until PDF start header */
+ while (fgets(buf,sizeof(buf),fp) != 0) {
+ if (strncmp(buf,"%PDF",4) == 0) {
+ break;
+ }
+ }
+ for (i = 0;i < MAX_CHECK_COMMENT_LINES;i++) {
+ if (fgets(buf,sizeof(buf),fp) == 0) break;
+ if (strncmp(buf,"%%PDFTOPDFNumCopies",19) == 0) {
+ char *p;
+
+ p = strchr(buf+19,':');
+ deviceCopies = atoi(p+1);
+ } else if (strncmp(buf,"%%PDFTOPDFCollate",17) == 0) {
+ char *p;
+
+ p = strchr(buf+17,':');
+ while (*p == ' ' || *p == '\t') p++;
+ if (strncasecmp(p,"true",4) == 0) {
+ deviceCollate = CUPS_TRUE;
+ } else {
+ deviceCollate = CUPS_FALSE;
+ }
+ }
+ }
+}
+
+int main(int argc, char *argv[], char *envp[]) {
+ int i;
+ FILE *fp;
+ cups_array_t *gs_args;
+ char tmpstr[1024];
+ const char *t = NULL;
+ int fd;
+ char buf[BUFSIZ];
+ int n;
+ int numargs;
+ char *argument;
+ char **gsargv;
+ const char* apos;
+ int fds[2];
+ int pid;
+
+ parseOpts(argc, argv);
+
+ if (argc == 6) {
+ /* stdin */
+
+ fd = cupsTempFd(buf,BUFSIZ);
+ if (fd < 0) {
+ fprintf(stderr, "ERROR: Can't create temporary file");
+ exit(1);
+ }
+ /* remove name */
+ unlink(buf);
+
+ /* copy stdin to the tmp file */
+ while ((n = read(0,buf,BUFSIZ)) > 0) {
+ if (write(fd,buf,n) != n) {
+ fprintf(stderr, "ERROR: Can't copy stdin to temporary file");
+ close(fd);
+ exit(1);
+ }
+ }
+ if (lseek(fd,0,SEEK_SET) < 0) {
+ fprintf(stderr, "ERROR: Can't rewind temporary file");
+ close(fd);
+ exit(1);
+ }
+
+ if ((fp = fdopen(fd,"rb")) == 0) {
+ fprintf(stderr, "ERROR: Can't fdopen temporary file");
+ close(fd);
+ exit(1);
+ }
+ } else {
+ /* argc == 7 filenmae is specified */
+
+ if ((fp = fopen(argv[6],"rb")) == 0) {
+ fprintf(stderr, "ERROR: Can't open input file %s",argv[6]);
+ exit(1);
+ }
+ }
+ parsePDFTOPDFComment(fp);
+ rewind(fp);
+
+ /* Fix NumCopies and Collate according to PDFTOPDFComments */
+ h.NumCopies = deviceCopies;
+ h.Collate = deviceCollate;
+ /* fixed other values that pdftopdf handles */
+ h.MirrorPrint = CUPS_FALSE;
+ h.Orientation = CUPS_ORIENT_0;
+
+ /* Ghostscript parameters */
+ gs_args = cupsArrayNew(NULL, NULL);
+ if (!gs_args)
+ {
+ fprintf(stderr, "ERROR: Unable to allocate memory for Ghostscript arguments array\n");
+ exit(1);
+ }
+
+ /* Part of Ghostscript command line which is not dependent on the job and/or
+ the driver */
+ snprintf(tmpstr, sizeof(tmpstr), "%s/%s", BINDIR, GS);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ cupsArrayAdd(gs_args, strdup("-dQUIET"));
+ /*cupsArrayAdd(gs_args, strdup("-dDEBUG"));*/
+ cupsArrayAdd(gs_args, strdup("-dPARANOIDSAFER"));
+ cupsArrayAdd(gs_args, strdup("-dNOPAUSE"));
+ cupsArrayAdd(gs_args, strdup("-dBATCH"));
+ /* cupsArrayAdd(gs_args, strdup("-dNOMEDIAATTRS")); */
+ cupsArrayAdd(gs_args, strdup("-sDEVICE=cups"));
+ cupsArrayAdd(gs_args, strdup("-sstdout=%stderr"));
+ cupsArrayAdd(gs_args, strdup("-sOutputFile=%stdout"));
+
+ /* CUPS font path */
+ if ((t = getenv("CUPS_FONTPATH")) == NULL)
+ t = CUPS_FONTPATH;
+ snprintf(tmpstr, sizeof(tmpstr), "-I%s", t);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+
+ /* Simple boolean, enumerated choice, numerical, and string parameters */
+ if (h.MediaClass[0] |= '\0') {
+ snprintf(tmpstr, sizeof(tmpstr), "-sMediaClass=%s", h.MediaClass);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.MediaColor[0] |= '\0') {
+ snprintf(tmpstr, sizeof(tmpstr), "-sMediaColor=%s", h.MediaColor);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.MediaType[0] |= '\0') {
+ snprintf(tmpstr, sizeof(tmpstr), "-sMediaType=%s", h.MediaType);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.OutputType[0] |= '\0') {
+ snprintf(tmpstr, sizeof(tmpstr), "-sOutputType=%s", h.OutputType);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.AdvanceDistance) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dAdvanceDistance=%d",
+ (unsigned)(h.AdvanceDistance));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.AdvanceMedia) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dAdvanceMedia=%d",
+ (unsigned)(h.AdvanceMedia));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.Collate) {
+ cupsArrayAdd(gs_args, strdup("-dCollate"));
+ }
+ if (h.CutMedia) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dCutMedia=%d",
+ (unsigned)(h.CutMedia));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.Duplex) {
+ cupsArrayAdd(gs_args, strdup("-dDuplex"));
+ }
+ if ((h.HWResolution[0] != 100) || (h.HWResolution[1] != 100))
+ snprintf(tmpstr, sizeof(tmpstr), "-r%dx%d",
+ (unsigned)(h.HWResolution[0]), (unsigned)(h.HWResolution[1]));
+ else
+ snprintf(tmpstr, sizeof(tmpstr), "-r100x100");
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ if (h.InsertSheet) {
+ cupsArrayAdd(gs_args, strdup("-dInsertSheet"));
+ }
+ if (h.Jog) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dJog=%d",
+ (unsigned)(h.Jog));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.LeadingEdge) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dLeadingEdge=%d",
+ (unsigned)(h.LeadingEdge));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.ManualFeed) {
+ cupsArrayAdd(gs_args, strdup("-dManualFeed"));
+ }
+ if (h.MediaPosition) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dMediaPosition=%d",
+ (unsigned)(h.MediaPosition));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.MediaWeight) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dMediaWeight=%d",
+ (unsigned)(h.MediaWeight));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.MirrorPrint) {
+ cupsArrayAdd(gs_args, strdup("-dMirrorPrint"));
+ }
+ if (h.NegativePrint) {
+ cupsArrayAdd(gs_args, strdup("-dNegativePrint"));
+ }
+ if (h.NumCopies != 1) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dNumCopies=%d",
+ (unsigned)(h.NumCopies));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.Orientation) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dOrientation=%d",
+ (unsigned)(h.Orientation));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.OutputFaceUp) {
+ cupsArrayAdd(gs_args, strdup("-dOutputFaceUp"));
+ }
+ if (h.PageSize[0] != 612)
+ snprintf(tmpstr, sizeof(tmpstr), "-dDEVICEWIDTHPOINTS=%d",
+ (unsigned)(h.PageSize[0]));
+ else
+ snprintf(tmpstr, sizeof(tmpstr), "-dDEVICEWIDTHPOINTS=612");
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ if (h.PageSize[1] != 792)
+ snprintf(tmpstr, sizeof(tmpstr), "-dDEVICEHEIGHTPOINTS=%d",
+ (unsigned)(h.PageSize[1]));
+ else
+ snprintf(tmpstr, sizeof(tmpstr), "-dDEVICEHEIGHTPOINTS=792");
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ if (h.Separations) {
+ cupsArrayAdd(gs_args, strdup("-dSeparations"));
+ }
+ if (h.TraySwitch) {
+ cupsArrayAdd(gs_args, strdup("-dTraySwitch"));
+ }
+ if (h.Tumble) {
+ cupsArrayAdd(gs_args, strdup("-dTumble"));
+ }
+ if (h.cupsMediaType) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsMediaType=%d",
+ (unsigned)(h.cupsMediaType));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.cupsBitsPerColor != 1)
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsBitsPerColor=%d",
+ (unsigned)(h.cupsBitsPerColor));
+ else
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsBitsPerColor=1");
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ if (h.cupsColorOrder != CUPS_ORDER_CHUNKED)
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsColorOrder=%d",
+ (unsigned)(h.cupsColorOrder));
+ else
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsColorOrder=%d",
+ CUPS_ORDER_CHUNKED);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ if (h.cupsColorSpace != CUPS_CSPACE_K)
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsColorSpace=%d",
+ (unsigned)(h.cupsColorSpace));
+ else
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsColorSpace=%d",
+ CUPS_CSPACE_K);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ if (h.cupsCompression) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsCompression=%d",
+ (unsigned)(h.cupsCompression));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.cupsRowCount) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsRowCount=%d",
+ (unsigned)(h.cupsRowCount));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.cupsRowFeed) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsRowFeed=%d",
+ (unsigned)(h.cupsRowFeed));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.cupsRowStep) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsRowStep=%d",
+ (unsigned)(h.cupsRowStep));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+#ifdef CUPS_RASTER_SYNCv1
+ if (h.cupsBorderlessScalingFactor != 1.0f) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsBorderlessScalingFactor=%.4f",
+ h.cupsBorderlessScalingFactor);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ for (i=0; i <= 15; i ++)
+ if (h.cupsInteger[i]) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsInteger%d=%d",
+ i, (unsigned)(h.cupsInteger[i]));
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ for (i=0; i <= 15; i ++)
+ if (h.cupsReal[i]) {
+ snprintf(tmpstr, sizeof(tmpstr), "-dcupsReal%d=%.4f",
+ i, h.cupsReal[i]);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ for (i=0; i <= 15; i ++)
+ if (h.cupsString[i][0] != '\0') {
+ snprintf(tmpstr, sizeof(tmpstr), "-scupsString%d=%s",
+ i, h.cupsString[i]);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.cupsMarkerType[0] != '\0') {
+ snprintf(tmpstr, sizeof(tmpstr), "-scupsMarkerType=%s",
+ h.cupsMarkerType);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.cupsRenderingIntent[0] != '\0') {
+ snprintf(tmpstr, sizeof(tmpstr), "-scupsRenderingIntent=%s",
+ h.cupsRenderingIntent);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+ if (h.cupsPageSizeName[0] != '\0') {
+ snprintf(tmpstr, sizeof(tmpstr), "-scupsPageSizeName=%s",
+ h.cupsPageSizeName);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+#endif /* CUPS_RASTER_SYNCv1 */
+
+ /* Parameters of array type. They cannot be supplied as "-d" or "-s"
+ command line options. We use "-c" here to supply them as
+ PostScript commands */
+
+ /* Switch to taking PostScript commands on the Ghostscript command line */
+ cupsArrayAdd(gs_args, "-c");
+
+ if ((t = cupsGetOption("profile", num_options, options)) != NULL) {
+ snprintf(tmpstr, sizeof(tmpstr), "<</cupsProfile(%s)>>setpagedevice", t);
+ cupsArrayAdd(gs_args, strdup(tmpstr));
+ }
+
+ /* Mark the end of PostScript commands supplied on the Ghostscript command
+ line (with the "-c" option), so that we can supply the input file name */
+ cupsArrayAdd(gs_args, strdup("-f"));
+
+ /* Let Ghostscript read from STDIN */
+ cupsArrayAdd(gs_args, strdup("-_"));
+
+ /* Put Ghostscript command line argument into an array for the "exec()"
+ call */
+ numargs = cupsArrayCount(gs_args);
+ gsargv = calloc(numargs + 1, sizeof(char *));
+ for (argument = (char *)cupsArrayFirst(gs_args), i = 0; argument;
+ argument = (char *)cupsArrayNext(gs_args), i++) {
+ gsargv[i] = argument;
+ }
+ gsargv[i] = NULL;
+
+ /* Debug output: Full Ghostscript command line and environment variables */
+ fprintf(stderr, "DEBUG: Ghostscript command line:");
+ for (i = 0; gsargv[i]; i ++) {
+ if ((strchr(gsargv[i],' ')) || (strchr(gsargv[i],'\t')))
+ apos = "'";
+ else
+ apos = "";
+ fprintf(stderr, " %s%s%s", apos, gsargv[i], apos);
+ }
+ fprintf(stderr, "\n");
+
+ for (i = 0; envp[i]; i ++)
+ fprintf(stderr, "DEBUG: envp[%d]=\"%s\"\n", i, envp[i]);
+
+ /* Create a pipe for feeding the job into Ghostscript */
+ if (pipe(fds))
+ {
+ fds[0] = -1;
+ fds[1] = -1;
+ fprintf(stderr, "ERROR: Unable to establish pipe for Ghostscript call");
+ exit(1);
+ }
+
+ /* Set the "close on exec" flag on each end of the pipe... */
+ if (fcntl(fds[0], F_SETFD, fcntl(fds[0], F_GETFD) | FD_CLOEXEC))
+ {
+ close(fds[0]);
+ close(fds[1]);
+ fds[0] = -1;
+ fds[1] = -1;
+ fprintf(stderr, "ERROR: Unable to set \"close on exec\" flag on read end of the pipe for Ghostscript call");
+ exit(1);
+ }
+ if (fcntl(fds[1], F_SETFD, fcntl(fds[1], F_GETFD) | FD_CLOEXEC))
+ {
+ close(fds[0]);
+ close(fds[1]);
+ fprintf(stderr, "ERROR: Unable to set \"close on exec\" flag on write end of the pipe for Ghostscript call");
+ exit(1);
+ }
+
+ if ((pid = fork()) == 0)
+ {
+ /* Ghostscript child process */
+
+ /* Couple pipe with STDIN of Ghostscript process */
+ if (fds[0] != 0) {
+ close(0);
+ if (fds[0] > 0)
+ dup(fds[0]);
+ else {
+ fprintf(stderr, "ERROR: Unable to couple pipe with STDIN of Ghostscript process");
+ exit(1);
+ }
+ }
+
+ /* Execute Ghostscript command line ... */
+ snprintf(tmpstr, sizeof(tmpstr), "%s/%s", BINDIR, GS);
+ execve(tmpstr, gsargv, envp);
+
+ perror(tmpstr);
+
+ exit(1);
+ } else {
+ /* Main process */
+
+ /* Feed job data into Ghostscript */
+ while ((n = fread(buf, 1, BUFSIZ, fp)) > 0) {
+ if (write(fds[1], buf, n) != n) {
+ fprintf(stderr, "ERROR: Can't feed job data into Ghostscript");
+ fclose(fp);
+ exit(1);
+ }
+ }
+ fclose(fp);
+ }
+
+ exit(0);
+}
+
#! /bin/sh /usr/share/dpatch/dpatch-run
## 48_cups-output-device-pdf-duplex-uninitialized-memory.patch.dpatch by
<[email protected]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad ghostscript-8.63.dfsg.1~/cups/gdevcups.c
ghostscript-8.63.dfsg.1/cups/gdevcups.c
--- ghostscript-8.63.dfsg.1~/cups/gdevcups.c 2007-05-14 20:22:09.000000000
+0200
+++ ghostscript-8.63.dfsg.1/cups/gdevcups.c 2008-10-19 12:39:50.000000000
+0200
@@ -352,6 +352,21 @@
0, /* cupsRowCount */
0, /* cupsRowFeed */
0 /* cupsRowStep */
+#ifdef CUPS_RASTER_SYNCv1
+ ,
+ 1, /* cupsNumColors */
+ 1.0, /* cupsBorderlessScalingFactor */
+ { 612.0, 792.0 }, /* cupsPageSize */
+ { 0.0, 0.0, 612.0, 792.0 }, /* cupsImagingBBox */
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* cupsInteger */
+ { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
+ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }, /* cupsReal */
+ { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
+ /* cupsString */
+ "", /* cupsMarkerType */
+ "", /* cupsRenderingIntent */
+ "Letter" /* cupsPageSizeName */
+#endif /* CUPS_RASTER_SYNCv1 */
}
};
@@ -738,6 +753,10 @@
(int *)&(cups->header.CutMedia))) < 0)
return (code);
+ b = cups->header.Duplex;
+ if ((code = param_write_bool(plist, "Duplex", &b)) < 0)
+ return (code);
+
b = cups->header.InsertSheet;
if ((code = param_write_bool(plist, "InsertSheet", &b)) < 0)
return (code);
@@ -758,6 +777,10 @@
(int *)&(cups->header.MediaPosition))) < 0)
return (code);
+ if ((code = param_write_int(plist, "MediaWeight",
+ (int *)&(cups->header.MediaWeight))) < 0)
+ return (code);
+
b = cups->header.MirrorPrint;
if ((code = param_write_bool(plist, "MirrorPrint", &b)) < 0)
return (code);
@@ -833,9 +856,11 @@
return (code);
#ifdef CUPS_RASTER_SYNCv1
+#if 0 /* Don't include read-only parameters... */
if ((code = param_write_int(plist, "cupsNumColors",
(int *)&(cups->header.cupsNumColors))) < 0)
return (code);
+#endif /* 0 */
if ((code = param_write_float(plist, "cupsBorderlessScalingFactor",
&(cups->header.cupsBorderlessScalingFactor))) <
0)
@@ -844,7 +869,7 @@
for (i = 0; i < 16; i ++)
{
sprintf(name, "cupsInteger%d", i);
- if ((code = param_write_int(plist, name,
+ if ((code = param_write_int(plist, strdup(name),
(int *)(cups->header.cupsInteger + i))) < 0)
return (code);
}
@@ -852,16 +877,16 @@
for (i = 0; i < 16; i ++)
{
sprintf(name, "cupsReal%d", i);
- if ((code = param_write_float(plist, name,
+ if ((code = param_write_float(plist, strdup(name),
cups->header.cupsReal + i)) < 0)
return (code);
}
for (i = 0; i < 16; i ++)
{
- sprintf(name, "cupsReal%d", i);
+ sprintf(name, "cupsString%d", i);
param_string_from_string(s, cups->header.cupsString[i]);
- if ((code = param_write_string(plist, name, &s)) < 0)
+ if ((code = param_write_string(plist, strdup(name), &s)) < 0)
return (code);
}
@@ -2695,11 +2720,15 @@
#define stringoption(name, sname) \
if ((code = param_read_string(plist, sname, &stringval)) < 0) \
{ \
+ dprintf2("ERROR: Error setting %s to \"%s\"...\n", sname, \
+ (char *)stringval.data); \
param_signal_error(plist, sname, code); \
return (code); \
} \
else if (code == 0) \
{ \
+ dprintf2("DEBUG: Setting %s to \"%s\"...\n", sname, \
+ (char *)stringval.data); \
strncpy(cups->header.name, (const char *)stringval.data, \
stringval.size); \
cups->header.name[stringval.size] = '\0'; \
@@ -2708,29 +2737,35 @@
#define intoption(name, sname, type) \
if ((code = param_read_int(plist, sname, &intval)) < 0) \
{ \
+ dprintf2("ERROR: Error setting %s to %d...\n", sname, (int)intval); \
param_signal_error(plist, sname, code); \
return (code); \
} \
else if (code == 0) \
{ \
- dprintf2("DEBUG: Setting %s to %d...\n", sname, intval); \
+ dprintf2("DEBUG: Setting %s to %d...\n", sname, (int)intval); \
cups->header.name = (type)intval; \
}
#define floatoption(name, sname) \
if ((code = param_read_float(plist, sname, &floatval)) < 0) \
{ \
+ dprintf2("ERROR: Error setting %s to %.4f...\n", sname, (float)floatval); \
param_signal_error(plist, sname, code); \
return (code); \
} \
else if (code == 0) \
- cups->header.name = (unsigned)floatval;
+ { \
+ dprintf2("DEBUG: Setting %s to %.4f...\n", sname, (float)floatval);
\
+ cups->header.name = (float)floatval; \
+ }
#define booloption(name, sname) \
if ((code = param_read_bool(plist, sname, &boolval)) < 0) \
{ \
if ((code = param_read_null(plist, sname)) < 0) \
{ \
+ dprintf2("ERROR: Error setting %s to %d...\n", sname, (int)boolval); \
param_signal_error(plist, sname, code); \
return (code); \
} \
@@ -2738,24 +2773,34 @@
cups->header.name = CUPS_FALSE; \
} \
else if (code == 0) \
- cups->header.name = (cups_bool_t)boolval;
+ { \
+ dprintf2("DEBUG: Setting %s to %d...\n", sname, (int)boolval); \
+ cups->header.name = (cups_bool_t)boolval; \
+ }
#define arrayoption(name, sname, count) \
if ((code = param_read_float_array(plist, sname, &arrayval)) < 0) \
{ \
if ((code = param_read_null(plist, sname)) < 0) \
{ \
+ dprintf1("ERROR: Error setting %s...\n", sname); \
param_signal_error(plist, sname, code); \
return (code); \
} \
if (code == 0) \
+ { \
+ dprintf1("DEBUG: Setting %s to zero\n", sname); \
for (i = 0; i < count; i ++) \
cups->header.name[i] = 0; \
+ } \
} \
else if (code == 0) \
{ \
+ dprintf1("DEBUG: Setting %s to", sname); \
for (i = 0; i < count; i ++) \
+ dprintf1(" %d", (unsigned)(arrayval.data[i])); \
cups->header.name[i] = (unsigned)arrayval.data[i]; \
+ dprintf("...\n"); \
}
size_set = param_read_float_array(plist, ".MediaSize", &arrayval) == 0 ||
@@ -2768,7 +2813,7 @@
stringoption(MediaColor, "MediaColor")
stringoption(MediaType, "MediaType")
stringoption(OutputType, "OutputType")
- floatoption(AdvanceDistance, "AdvanceDistance")
+ intoption(AdvanceDistance, "AdvanceDistance", unsigned)
intoption(AdvanceMedia, "AdvanceMedia", cups_adv_t)
booloption(Collate, "Collate")
intoption(CutMedia, "CutMedia", cups_cut_t)
@@ -2781,7 +2826,7 @@
booloption(ManualFeed, "ManualFeed")
intoption(MediaPosition, "cupsMediaPosition", unsigned) /* Compatibility */
intoption(MediaPosition, "MediaPosition", unsigned)
- floatoption(MediaWeight, "MediaWeight")
+ intoption(MediaWeight, "MediaWeight", unsigned)
booloption(MirrorPrint, "MirrorPrint")
booloption(NegativePrint, "NegativePrint")
intoption(Orientation, "Orientation", cups_orient_t)
@@ -2815,19 +2860,19 @@
for (i = 0; i < 16; i ++)
{
sprintf(name, "cupsInteger%d", i);
- intoption(cupsInteger[i], name, unsigned)
+ intoption(cupsInteger[i],strdup(name), unsigned)
}
for (i = 0; i < 16; i ++)
{
sprintf(name, "cupsReal%d", i);
- floatoption(cupsReal[i], name)
+ floatoption(cupsReal[i], strdup(name))
}
for (i = 0; i < 16; i ++)
{
sprintf(name, "cupsString%d", i);
- stringoption(cupsString[i], name)
+ stringoption(cupsString[i], strdup(name))
}
stringoption(cupsMarkerType, "cupsMarkerType");
--- End Message ---
