[Pkg-cups-devel] r429 -
cupsys/branches/cups-1.2-ubuntu/debian/patches
Martin Pitt
mpitt at alioth.debian.org
Tue Feb 6 14:58:00 CET 2007
Author: mpitt
Date: Tue Feb 6 14:58:00 2007
New Revision: 429
Added:
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_00str2111.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_01str2137.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_02str2144.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_03str2106.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_04str2117.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_05str2133.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_06str2121.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_07str2123.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_08str2135.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/67_printcap.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/68_edit-config.dpatch (contents, props changed)
Log:
svn add some missing files
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/00_00str2111.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00_00str2111.dpatch Tue Feb 6 14:58:00 2007
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_00str2111.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/filter/pstops.c cupsys-1.2.7/filter/pstops.c
+--- cupsys-1.2.7~/filter/pstops.c 2006-12-28 12:00:51.000000000 +0000
++++ cupsys-1.2.7/filter/pstops.c 2006-12-28 12:50:15.000000000 +0000
+@@ -909,23 +909,26 @@
+ * for the JCL options...
+ */
+
+- if (!doc->saw_eof)
+- puts("%%EOF");
+-
+- if (doc->emit_jcl)
++ if (number)
+ {
+- if (ppd && ppd->jcl_end)
+- ppdEmitJCLEnd(ppd, stdout);
+- else
+- putchar(0x04);
++ if (!doc->saw_eof)
++ puts("%%EOF");
+
+- ppdEmitJCL(ppd, stdout, doc->job_id, doc->user, doc->title);
+- }
++ if (doc->emit_jcl)
++ {
++ if (ppd && ppd->jcl_end)
++ ppdEmitJCLEnd(ppd, stdout);
++ else
++ putchar(0x04);
+
+- puts("%!PS-Adobe-3.0");
+- puts("%%Pages: (atend)");
+- puts("%%BoundingBox: (atend)");
+- puts("%%EndComments");
++ ppdEmitJCL(ppd, stdout, doc->job_id, doc->user, doc->title);
++ }
++
++ puts("%!PS-Adobe-3.0");
++ puts("%%Pages: (atend)");
++ puts("%%BoundingBox: (atend)");
++ puts("%%EndComments");
++ }
+
+ /*
+ * Then copy all of the pages...
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/00_01str2137.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00_01str2137.dpatch Tue Feb 6 14:58:00 2007
@@ -0,0 +1,504 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_01str2137.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/filter/pstops.c cupsys-1.2.7/filter/pstops.c
+--- cupsys-1.2.7~/filter/pstops.c 2006-12-28 12:58:22.000000000 +0000
++++ cupsys-1.2.7/filter/pstops.c 2006-12-28 12:58:34.000000000 +0000
+@@ -205,6 +205,9 @@
+ size_t linesize);
+ static void start_nup(pstops_doc_t *doc, int number,
+ int show_border, const int *bounding_box);
++static void write_label_prolog(pstops_doc_t *doc, const char *label,
++ float bottom, float top,
++ float width);
+ static void write_labels(pstops_doc_t *doc, int orient);
+
+
+@@ -665,12 +668,12 @@
+ else if (!strncmp(line, "%%For:", 6))
+ {
+ saw_for = 1;
+- printf("%s\n", line);
++ doc_printf(doc, "%s\n", line);
+ }
+ else if (!strncmp(line, "%%Title:", 8))
+ {
+ saw_title = 1;
+- printf("%s\n", line);
++ doc_printf(doc, "%s\n", line);
+ }
+ else if (!strncmp(line, "%cupsRotation:", 14))
+ {
+@@ -697,7 +700,7 @@
+ break;
+ }
+ else if (strncmp(line, "%!", 2) && strncmp(line, "%cups", 5))
+- printf("%s\n", line);
++ doc_printf(doc, "%s\n", line);
+
+ if ((linelen = cupsFileGetLine(fp, line, linesize)) == 0)
+ break;
+@@ -722,15 +725,15 @@
+ * that are required...
+ */
+
+- printf("%%%%Requirements: numcopies(%d)%s%s\n", doc->copies,
+- doc->collate ? " collate" : "",
+- Duplex ? " duplex" : "");
++ doc_printf(doc, "%%%%Requirements: numcopies(%d)%s%s\n", doc->copies,
++ doc->collate ? " collate" : "",
++ Duplex ? " duplex" : "");
+
+ /*
+ * Apple uses RBI comments for various non-PPD options...
+ */
+
+- printf("%%RBINumCopies: %d\n", doc->copies);
++ doc_printf(doc, "%%RBINumCopies: %d\n", doc->copies);
+ }
+ else
+ {
+@@ -739,18 +742,18 @@
+ */
+
+ if (Duplex)
+- puts("%%Requirements: duplex");
++ doc_puts(doc, "%%Requirements: duplex\n");
+
+ /*
+ * Apple uses RBI comments for various non-PPD options...
+ */
+
+- puts("%RBINumCopies: 1");
++ doc_puts(doc, "%RBINumCopies: 1\n");
+ }
+
+- puts("%%Pages: (atend)");
+- puts("%%BoundingBox: (atend)");
+- puts("%%EndComments");
++ doc_puts(doc, "%%Pages: (atend)\n");
++ doc_puts(doc, "%%BoundingBox: (atend)\n");
++ doc_puts(doc, "%%EndComments\n");
+
+ return (linelen);
+ }
+@@ -811,7 +814,7 @@
+
+ while (strncmp(line, "%%Page:", 7) && strncmp(line, "%%Trailer", 9))
+ {
+- fwrite(line, 1, linelen, stdout);
++ doc_write(doc, line, linelen);
+
+ if ((linelen = cupsFileGetLine(fp, line, linesize)) == 0)
+ break;
+@@ -909,25 +912,36 @@
+ * for the JCL options...
+ */
+
+- if (number)
++ if (number && doc->emit_jcl && ppd && ppd->jcl_end)
+ {
+- if (!doc->saw_eof)
+- puts("%%EOF");
++ /*
++ * Send the trailer...
++ */
+
+- if (doc->emit_jcl)
+- {
+- if (ppd && ppd->jcl_end)
+- ppdEmitJCLEnd(ppd, stdout);
+- else
+- putchar(0x04);
++ puts("%%Trailer");
++ printf("%%%%Pages: %d\n", cupsArrayCount(doc->pages));
++ if (doc->number_up > 1 || doc->fitplot)
++ printf("%%%%BoundingBox: %.0f %.0f %.0f %.0f\n",
++ PageLeft, PageBottom, PageRight, PageTop);
++ else
++ printf("%%%%BoundingBox: %d %d %d %d\n",
++ doc->new_bounding_box[0], doc->new_bounding_box[1],
++ doc->new_bounding_box[2], doc->new_bounding_box[3]);
++ puts("%%EOF");
+
+- ppdEmitJCL(ppd, stdout, doc->job_id, doc->user, doc->title);
+- }
++ /*
++ * Start a new document...
++ */
++
++ ppdEmitJCLEnd(ppd, stdout);
++ ppdEmitJCL(ppd, stdout, doc->job_id, doc->user, doc->title);
+
+ puts("%!PS-Adobe-3.0");
+- puts("%%Pages: (atend)");
+- puts("%%BoundingBox: (atend)");
+- puts("%%EndComments");
++
++ pageinfo = (pstops_page_t *)cupsArrayFirst(doc->pages);
++ copy_bytes(doc->temp, 0, pageinfo->offset);
++
++ number = 0;
+ }
+
+ /*
+@@ -1639,13 +1653,13 @@
+ if (!strncmp(line, "%%BeginSetup", 12) || !strncmp(line, "%%Page:", 7))
+ break;
+
+- fwrite(line, 1, linelen, stdout);
++ doc_write(doc, line, linelen);
+
+ if ((linelen = cupsFileGetLine(fp, line, linesize)) == 0)
+ break;
+ }
+
+- puts("%%BeginProlog");
++ doc_puts(doc, "%%BeginProlog\n");
+
+ do_prolog(doc, ppd);
+
+@@ -1658,7 +1672,7 @@
+ !strncmp(line, "%%Page:", 7))
+ break;
+
+- fwrite(line, 1, linelen, stdout);
++ doc_write(doc, line, linelen);
+ }
+
+ if (!strncmp(line, "%%EndProlog", 11))
+@@ -1667,7 +1681,7 @@
+ fputs("ERROR: Missing %%EndProlog!\n", stderr);
+ }
+
+- puts("%%EndProlog");
++ doc_puts(doc, "%%EndProlog\n");
+
+ return (linelen);
+ }
+@@ -1693,13 +1707,13 @@
+ if (!strncmp(line, "%%Page:", 7))
+ break;
+
+- fwrite(line, 1, linelen, stdout);
++ doc_write(doc, line, linelen);
+
+ if ((linelen = cupsFileGetLine(fp, line, linesize)) == 0)
+ break;
+ }
+
+- puts("%%BeginSetup");
++ doc_puts(doc, "%%BeginSetup\n");
+
+ do_setup(doc, ppd);
+
+@@ -1720,7 +1734,7 @@
+ &(doc->options));
+ }
+ else if (strncmp(line, "%%BeginSetup", 12))
+- fwrite(line, 1, linelen, stdout);
++ doc_write(doc, line, linelen);
+
+ if ((linelen = cupsFileGetLine(fp, line, linesize)) == 0)
+ break;
+@@ -1732,7 +1746,7 @@
+ fputs("ERROR: Missing %%EndSetup!\n", stderr);
+ }
+
+- puts("%%EndSetup");
++ doc_puts(doc, "%%EndSetup\n");
+
+ return (linelen);
+ }
+@@ -1795,18 +1809,25 @@
+ do_prolog(pstops_doc_t *doc, /* I - Document information */
+ ppd_file_t *ppd) /* I - PPD file */
+ {
++ char *ps; /* PS commands */
++
++
+ /*
+ * Send the document prolog commands...
+ */
+
+ if (ppd && ppd->patches)
+ {
+- puts("%%BeginFeature: *JobPatchFile 1");
+- puts(ppd->patches);
+- puts("%%EndFeature");
++ doc_puts(doc, "%%BeginFeature: *JobPatchFile 1\n");
++ doc_puts(doc, ppd->patches);
++ doc_puts(doc, "\n%%EndFeature\n");
+ }
+
+- ppdEmit(ppd, stdout, PPD_ORDER_PROLOG);
++ if ((ps = ppdEmitString(ppd, PPD_ORDER_PROLOG, 0.0)) != NULL)
++ {
++ doc_puts(doc, ps);
++ free(ps);
++ }
+
+ /*
+ * Define ESPshowpage here so that applications that define their
+@@ -1814,9 +1835,8 @@
+ */
+
+ if (doc->use_ESPshowpage)
+- puts("userdict/ESPshowpage/showpage load put\n"
+- "userdict/showpage{}put");
+-
++ doc_puts(doc, "userdict/ESPshowpage/showpage load put\n"
++ "userdict/showpage{}put\n");
+ }
+
+
+@@ -1828,13 +1848,16 @@
+ do_setup(pstops_doc_t *doc, /* I - Document information */
+ ppd_file_t *ppd) /* I - PPD file */
+ {
++ char *ps; /* PS commands */
++
++
+ /*
+ * Disable CTRL-D so that embedded files don't cause printing
+ * errors...
+ */
+
+- puts("% Disable CTRL-D as an end-of-file marker...");
+- puts("userdict dup(\\004)cvn{}put (\\004\\004)cvn{}put");
++ doc_puts(doc, "% Disable CTRL-D as an end-of-file marker...\n");
++ doc_puts(doc, "userdict dup(\\004)cvn{}put (\\004\\004)cvn{}put\n");
+
+ /*
+ * Mark any options from %%IncludeFeature: comments...
+@@ -1846,8 +1869,17 @@
+ * Send all the printer-specific setup commands...
+ */
+
+- ppdEmit(ppd, stdout, PPD_ORDER_DOCUMENT);
+- ppdEmit(ppd, stdout, PPD_ORDER_ANY);
++ if ((ps = ppdEmitString(ppd, PPD_ORDER_DOCUMENT, 0.0)) != NULL)
++ {
++ doc_puts(doc, ps);
++ free(ps);
++ }
++
++ if ((ps = ppdEmitString(ppd, PPD_ORDER_ANY, 0.0)) != NULL)
++ {
++ doc_puts(doc, ps);
++ free(ps);
++ }
+
+ /*
+ * Set the number of copies for the job...
+@@ -1855,11 +1887,13 @@
+
+ if (doc->copies != 1 && (!doc->collate || !doc->slow_collate))
+ {
+- printf("%%RBIBeginNonPPDFeature: *NumCopies %d\n", doc->copies);
+- printf("%d/languagelevel where{pop languagelevel 2 ge}{false}ifelse\n"
+- "{1 dict begin/NumCopies exch def currentdict end setpagedevice}\n"
+- "{userdict/#copies 3 -1 roll put}ifelse\n", doc->copies);
+- puts("%RBIEndNonPPDFeature");
++ doc_printf(doc, "%%RBIBeginNonPPDFeature: *NumCopies %d\n", doc->copies);
++ doc_printf(doc,
++ "%d/languagelevel where{pop languagelevel 2 ge}{false}ifelse\n"
++ "{1 dict begin/NumCopies exch def currentdict end "
++ "setpagedevice}\n"
++ "{userdict/#copies 3 -1 roll put}ifelse\n", doc->copies);
++ doc_puts(doc, "%RBIEndNonPPDFeature\n");
+ }
+
+ /*
+@@ -1867,7 +1901,7 @@
+ */
+
+ if (doc->number_up > 1)
+- puts("userdict/setpagedevice{pop}bind put");
++ doc_puts(doc, "userdict/setpagedevice{pop}bind put\n");
+
+ /*
+ * Changes to the transfer function must be made AFTER any
+@@ -1875,15 +1909,31 @@
+ */
+
+ if (doc->gamma != 1.0f || doc->brightness != 1.0f)
+- printf("{ neg 1 add dup 0 lt { pop 1 } { %.3f exp neg 1 add } "
+- "ifelse %.3f mul } bind settransfer\n", doc->gamma,
+- doc->brightness);
++ doc_printf(doc, "{ neg 1 add dup 0 lt { pop 1 } { %.3f exp neg 1 add } "
++ "ifelse %.3f mul } bind settransfer\n",
++ doc->gamma, doc->brightness);
+
+ /*
+ * Make sure we have rectclip and rectstroke procedures of some sort...
+ */
+
+- WriteCommon();
++ doc_puts(doc,
++ "% x y w h ESPrc - Clip to a rectangle.\n"
++ "userdict/ESPrc/rectclip where{pop/rectclip load}\n"
++ "{{newpath 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto\n"
++ "neg 0 rlineto closepath clip newpath}bind}ifelse put\n");
++
++ doc_puts(doc,
++ "% x y w h ESPrf - Fill a rectangle.\n"
++ "userdict/ESPrf/rectfill where{pop/rectfill load}\n"
++ "{{gsave newpath 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto\n"
++ "neg 0 rlineto closepath fill grestore}bind}ifelse put\n");
++
++ doc_puts(doc,
++ "% x y w h ESPrs - Stroke a rectangle.\n"
++ "userdict/ESPrs/rectstroke where{pop/rectstroke load}\n"
++ "{{gsave newpath 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto\n"
++ "neg 0 rlineto closepath stroke grestore}bind}ifelse put\n");
+
+ /*
+ * Write the page and label prologs...
+@@ -1897,13 +1947,14 @@
+ */
+
+ if (Orientation & 1)
+- WriteLabelProlog(doc->page_label, PageBottom,
+- PageWidth - PageLength + PageTop, PageLength);
++ write_label_prolog(doc, doc->page_label, PageBottom,
++ PageWidth - PageLength + PageTop, PageLength);
+ else
+- WriteLabelProlog(doc->page_label, PageLeft, PageRight, PageLength);
++ write_label_prolog(doc, doc->page_label, PageLeft, PageRight,
++ PageLength);
+ }
+ else
+- WriteLabelProlog(doc->page_label, PageBottom, PageTop, PageWidth);
++ write_label_prolog(doc, doc->page_label, PageBottom, PageTop, PageWidth);
+ }
+
+
+@@ -3063,6 +3114,123 @@
+
+
+ /*
++ * 'write_label_prolog()' - Write the prolog with the classification
++ * and page label.
++ */
++
++static void
++write_label_prolog(pstops_doc_t *doc, /* I - Document info */
++ const char *label, /* I - Page label */
++ float bottom, /* I - Bottom position in points */
++ float top, /* I - Top position in points */
++ float width) /* I - Width in points */
++{
++ const char *classification; /* CLASSIFICATION environment variable */
++ const char *ptr; /* Temporary string pointer */
++
++
++ /*
++ * First get the current classification...
++ */
++
++ if ((classification = getenv("CLASSIFICATION")) == NULL)
++ classification = "";
++ if (strcmp(classification, "none") == 0)
++ classification = "";
++
++ /*
++ * If there is nothing to show, bind an empty 'write labels' procedure
++ * and return...
++ */
++
++ if (!classification[0] && (label == NULL || !label[0]))
++ {
++ doc_puts(doc, "userdict/ESPwl{}bind put\n");
++ return;
++ }
++
++ /*
++ * Set the classification + page label string...
++ */
++
++ doc_puts(doc, "userdict");
++ if (!strcmp(classification, "confidential"))
++ doc_puts(doc, "/ESPpl(CONFIDENTIAL");
++ else if (!strcmp(classification, "classified"))
++ doc_puts(doc, "/ESPpl(CLASSIFIED");
++ else if (!strcmp(classification, "secret"))
++ doc_puts(doc, "/ESPpl(SECRET");
++ else if (!strcmp(classification, "topsecret"))
++ doc_puts(doc, "/ESPpl(TOP SECRET");
++ else if (!strcmp(classification, "unclassified"))
++ doc_puts(doc, "/ESPpl(UNCLASSIFIED");
++ else
++ {
++ doc_puts(doc, "/ESPpl(");
++
++ for (ptr = classification; *ptr; ptr ++)
++ {
++ if (*ptr < 32 || *ptr > 126)
++ doc_printf(doc, "\\%03o", *ptr);
++ else if (*ptr == '_')
++ doc_puts(doc, " ");
++ else if (*ptr == '(' || *ptr == ')' || *ptr == '\\')
++ doc_printf(doc, "\\%c", *ptr);
++ else
++ doc_printf(doc, "%c", *ptr);
++ }
++ }
++
++ if (label)
++ {
++ if (classification[0])
++ doc_puts(doc, " - ");
++
++ /*
++ * Quote the label string as needed...
++ */
++
++ for (ptr = label; *ptr; ptr ++)
++ {
++ if (*ptr < 32 || *ptr > 126)
++ doc_printf(doc, "\\%03o", *ptr);
++ else if (*ptr == '(' || *ptr == ')' || *ptr == '\\')
++ doc_printf(doc, "\\%c", *ptr);
++ else
++ doc_printf(doc, "%c", *ptr);
++ }
++ }
++
++ doc_puts(doc, ")put\n");
++
++ /*
++ * Then get a 14 point Helvetica-Bold font...
++ */
++
++ doc_puts(doc, "userdict/ESPpf /Helvetica-Bold findfont 14 scalefont put\n");
++
++ /*
++ * Finally, the procedure to write the labels on the page...
++ */
++
++ doc_puts(doc, "userdict/ESPwl{\n");
++ doc_puts(doc, " ESPpf setfont\n");
++ doc_printf(doc, " ESPpl stringwidth pop dup 12 add exch -0.5 mul %.0f add\n",
++ width * 0.5f);
++ doc_puts(doc, " 1 setgray\n");
++ doc_printf(doc, " dup 6 sub %.0f 3 index 20 ESPrf\n", bottom - 2.0);
++ doc_printf(doc, " dup 6 sub %.0f 3 index 20 ESPrf\n", top - 18.0);
++ doc_puts(doc, " 0 setgray\n");
++ doc_printf(doc, " dup 6 sub %.0f 3 index 20 ESPrs\n", bottom - 2.0);
++ doc_printf(doc, " dup 6 sub %.0f 3 index 20 ESPrs\n", top - 18.0);
++ doc_printf(doc, " dup %.0f moveto ESPpl show\n", bottom + 2.0);
++ doc_printf(doc, " %.0f moveto ESPpl show\n", top - 14.0);
++ doc_puts(doc, "pop\n");
++ doc_puts(doc, "}bind put\n");
++}
++
++
++/*
+ * 'write_labels()' - Write the actual page labels.
+ *
+ * This function is a copy of the one in common.c since we need to
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/00_02str2144.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00_02str2144.dpatch Tue Feb 6 14:58:00 2007
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_02str2144.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/scheduler/job.c cupsys-1.2.7/scheduler/job.c
+--- cupsys-1.2.7~/scheduler/job.c 2006-10-23 00:26:52.000000000 +0000
++++ cupsys-1.2.7/scheduler/job.c 2006-12-28 13:00:34.000000000 +0000
+@@ -1497,7 +1497,7 @@
+ */
+
+ if (job->hold_until < curtime)
+- job->hold_until += 24 * 60 * 60 * 60;
++ job->hold_until += 24 * 60 * 60;
+ }
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSetJobHoldUntil: hold_until = %d",
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/00_03str2106.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00_03str2106.dpatch Tue Feb 6 14:58:00 2007
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_03str2106.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/filter/image-pnm.c cupsys-1.2.7/filter/image-pnm.c
+--- cupsys-1.2.7~/filter/image-pnm.c 2006-12-28 12:00:51.000000000 +0000
++++ cupsys-1.2.7/filter/image-pnm.c 2006-12-28 13:02:55.000000000 +0000
+@@ -202,7 +202,7 @@
+ else
+ {
+ bit = 128;
+- inptr ++;
++ outptr ++;
+ }
+ }
+ break;
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/00_04str2117.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00_04str2117.dpatch Tue Feb 6 14:58:00 2007
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_04str2117.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/scheduler/conf.c cupsys-1.2.7/scheduler/conf.c
+--- cupsys-1.2.7~/scheduler/conf.c 2006-12-28 12:00:51.000000000 +0000
++++ cupsys-1.2.7/scheduler/conf.c 2006-12-28 13:06:05.000000000 +0000
+@@ -1316,7 +1316,7 @@
+ * Get the address...
+ */
+
+- ip[0] = ip[1] = ip[2] = ip[2] = 0x00000000;
++ ip[0] = ip[1] = ip[2] = ip[3] = 0x00000000;
+ mask[0] = mask[1] = mask[2] = mask[3] = 0xffffffff;
+
+ if ((maskval = strchr(value, '/')) != NULL)
+@@ -1501,7 +1501,7 @@
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "get_addr_and_mask(value=\"%s\", "
+- "ip=[%08x:%08x:%08x:%08x], mask=[%08x:%08x:%08x:%08x]",
++ "ip=[%08x:%08x:%08x:%08x], mask=[%08x:%08x:%08x:%08x])",
+ value, ip[0], ip[1], ip[2], ip[3], mask[0], mask[1], mask[2],
+ mask[3]);
+
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/00_05str2133.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00_05str2133.dpatch Tue Feb 6 14:58:00 2007
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_05str2133.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/cups/http.c cupsys-1.2.7/cups/http.c
+--- cupsys-1.2.7~/cups/http.c 2006-11-15 20:28:39.000000000 +0000
++++ cupsys-1.2.7/cups/http.c 2006-12-28 14:35:38.000000000 +0000
+@@ -694,8 +694,18 @@
+ * after the transfer is complete...
+ */
+
+- if (http->fields[HTTP_FIELD_CONTENT_LENGTH][0] == '\0')
+- http->data_remaining = 2147483647;
++ if (!http->fields[HTTP_FIELD_CONTENT_LENGTH][0])
++ {
++ /*
++ * Default content length is 0 for errors and 2^31-1 for other
++ * successful requests...
++ */
++
++ if (http->status >= HTTP_MULTIPLE_CHOICES)
++ http->data_remaining = 0;
++ else
++ http->data_remaining = 2147483647;
++ }
+ else
+ http->data_remaining = strtoll(http->fields[HTTP_FIELD_CONTENT_LENGTH],
+ NULL, 10);
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/00_06str2121.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00_06str2121.dpatch Tue Feb 6 14:58:00 2007
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_06str2121.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/cups/auth.c cupsys-1.2.7/cups/auth.c
+--- cupsys-1.2.7~/cups/auth.c 2006-12-28 12:00:51.000000000 +0000
++++ cupsys-1.2.7/cups/auth.c 2006-12-28 13:13:54.000000000 +0000
+@@ -75,6 +75,7 @@
+ realm[HTTP_MAX_VALUE], /* realm="xyz" string */
+ nonce[HTTP_MAX_VALUE], /* nonce="xyz" string */
+ encode[512]; /* Encoded username:password */
++ _cups_globals_t *cg; /* Global data */
+
+
+ DEBUG_printf(("cupsDoAuthentication(http=%p, method=\"%s\", resource=\"%s\")\n",
+@@ -114,7 +115,12 @@
+ * Nope - get a new password from the user...
+ */
+
+- snprintf(prompt, sizeof(prompt), _("Password for %s on %s? "), cupsUser(),
++ cg = _cupsGlobals();
++
++ if (!cg->lang_default)
++ cg->lang_default = cupsLangDefault();
++
++ snprintf(prompt, sizeof(prompt), _cupsLangString(cg->lang_default, _("Password for %s on %s? ")), cupsUser(),
+ http->hostname[0] == '/' ? "localhost" : http->hostname);
+
+ http->digest_tries = strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE],
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/00_07str2123.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00_07str2123.dpatch Tue Feb 6 14:58:00 2007
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_07str2123.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/backend/runloop.c cupsys-1.2.7/backend/runloop.c
+--- cupsys-1.2.7~/backend/runloop.c 2006-12-28 12:00:51.000000000 +0000
++++ cupsys-1.2.7/backend/runloop.c 2006-12-28 13:18:23.000000000 +0000
+@@ -206,7 +206,7 @@
+ if (!paperout)
+ {
+ fputs("ERROR: Out of paper!\n", stderr);
+- fputs("STATUS: +media-tray-empty-error\n", stderr);
++ fputs("STATE: +media-empty-error\n", stderr);
+ paperout = 1;
+ }
+ }
+@@ -229,7 +229,7 @@
+ {
+ if (paperout)
+ {
+- fputs("STATUS: -media-tray-empty-error\n", stderr);
++ fputs("STATE: -media-empty-error\n", stderr);
+ paperout = 0;
+ }
+
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/00_08str2135.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00_08str2135.dpatch Tue Feb 6 14:58:00 2007
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_08str2135.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/cups/options.c cupsys-1.2.7/cups/options.c
+--- cupsys-1.2.7~/cups/options.c 2006-02-22 22:43:17.000000000 +0000
++++ cupsys-1.2.7/cups/options.c 2006-12-28 13:22:09.000000000 +0000
+@@ -366,10 +366,27 @@
+ }
+ else if (!strcasecmp(optptr->name, "output-bin"))
+ {
+- if (cupsGetOption("OutputBin", num_options, options) == NULL)
++ if (!cupsGetOption("OutputBin", num_options, options))
+ if (ppdMarkOption(ppd, "OutputBin", optptr->value))
+ conflict = 1;
+ }
++ else if (!strcasecmp(optptr->name, "multiple-document-handling"))
++ {
++ if (!cupsGetOption("Collate", num_options, options) &&
++ ppdFindOption(ppd, "Collate"))
++ {
++ if (strcasecmp(optptr->value, "separate-documents-uncollated-copies"))
++ {
++ if (ppdMarkOption(ppd, "Collate", "True"))
++ conflict = 1;
++ }
++ else
++ {
++ if (ppdMarkOption(ppd, "Collate", "False"))
++ conflict = 1;
++ }
++ }
++ }
+ else if (ppdMarkOption(ppd, optptr->name, optptr->value))
+ conflict = 1;
+
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/67_printcap.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/67_printcap.dpatch Tue Feb 6 14:58:00 2007
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 67_printcap.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/conf/cupsd.conf.in cupsys-1.2.7/conf/cupsd.conf.in
+--- cupsys-1.2.7~/conf/cupsd.conf.in 2006-12-09 14:31:45.000000000 +0000
++++ cupsys-1.2.7/conf/cupsd.conf.in 2006-12-09 14:33:59.000000000 +0000
+@@ -75,3 +75,30 @@
+ #
+ # End of "$Id: cupsd.conf.in 5454 2006-04-23 21:46:38Z mike $".
+ #
++
++#
++# Printcap: the name of the printcap file. Default is /etc/printcap.
++# Leave blank to disable printcap file generation.
++#
++
++Printcap /var/run/cups/printcap
++
++#
++# PrintcapFormat: the format of the printcap file, currently either
++# BSD or Solaris. The default is "BSD".
++#
++
++#PrintcapFormat BSD
++#PrintcapFormat Solaris
++
++#
++# PrintcapGUI: the name of the GUI options panel program to associate
++# with print queues under IRIX. The default is "/usr/bin/glpoptions"
++# from ESP Print Pro.
++#
++# This option is only used under IRIX; the options panel program
++# must accept the "-d printer" and "-o options" options and write
++# the selected printer options back to stdout on completion.
++#
++
++#PrintcapGUI /usr/bin/glpoptions
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/68_edit-config.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/68_edit-config.dpatch Tue Feb 6 14:58:00 2007
@@ -0,0 +1,431 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 68_edit-config.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.7~/templates/de/edit-config.tmpl.in cupsys-1.2.7/templates/de/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/de/edit-config.tmpl.in 2006-07-18 13:45:56.000000000 +0000
++++ cupsys-1.2.7/templates/de/edit-config.tmpl.in 2006-12-28 14:33:14.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/edit-config.tmpl.in cupsys-1.2.7/templates/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/edit-config.tmpl.in 2006-04-30 15:29:40.000000000 +0000
++++ cupsys-1.2.7/templates/edit-config.tmpl.in 2006-12-28 14:32:32.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/es/edit-config.tmpl.in cupsys-1.2.7/templates/es/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/es/edit-config.tmpl.in 2006-04-30 15:29:40.000000000 +0000
++++ cupsys-1.2.7/templates/es/edit-config.tmpl.in 2006-12-28 14:33:18.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/et/edit-config.tmpl.in cupsys-1.2.7/templates/et/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/et/edit-config.tmpl.in 2006-10-02 16:26:04.000000000 +0000
++++ cupsys-1.2.7/templates/et/edit-config.tmpl.in 2006-12-28 14:33:22.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/it/edit-config.tmpl.in cupsys-1.2.7/templates/it/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/it/edit-config.tmpl.in 2006-11-16 13:34:44.000000000 +0000
++++ cupsys-1.2.7/templates/it/edit-config.tmpl.in 2006-12-28 14:33:25.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/ja/edit-config.tmpl.in cupsys-1.2.7/templates/ja/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/ja/edit-config.tmpl.in 2006-04-30 15:29:40.000000000 +0000
++++ cupsys-1.2.7/templates/ja/edit-config.tmpl.in 2006-12-28 14:33:04.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/pl/edit-config.tmpl.in cupsys-1.2.7/templates/pl/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/pl/edit-config.tmpl.in 2006-04-30 15:29:40.000000000 +0000
++++ cupsys-1.2.7/templates/pl/edit-config.tmpl.in 2006-12-28 14:33:29.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
+diff -urNad cupsys-1.2.7~/templates/sv/edit-config.tmpl.in cupsys-1.2.7/templates/sv/edit-config.tmpl.in
+--- cupsys-1.2.7~/templates/sv/edit-config.tmpl.in 2006-04-30 15:29:40.000000000 +0000
++++ cupsys-1.2.7/templates/sv/edit-config.tmpl.in 2006-12-28 14:33:32.000000000 +0000
+@@ -4,7 +4,7 @@
+ document.cups.CUPSDCONF.value =
+ "# Log general information in error_log - change \\"info\\" to \\"debug\\" for\\n" +
+ "# troubleshooting...\\n" +
+-"LogLevel info\\n" +
++"LogLevel warning\\n" +
+ "\\n" +
+ "\\n" +
+ "# Administrator user group...\\n" +
+@@ -12,7 +12,7 @@
+ "\\n" +
+ "\\n" +
+ "# Only listen for connections from the local machine.\\n" +
+-"Listen 127.0.0.1:@DEFAULT_IPP_PORT@\\n" +
++"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+ "@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+ "\\n" +
+ "\\n" +
+@@ -70,7 +70,30 @@
+ " <Limit All>\\n" +
+ " Order deny,allow\\n" +
+ " </Limit>\\n" +
+-"</Policy>\\n";
++"</Policy>\\n" +
++"\\n" +
++"#\\n" +
++"# Printcap: the name of the printcap file. Default is /etc/printcap.\\n" +
++"# Leave blank to disable printcap file generation.\\n" +
++"#\\n" +
++"\\n" +
++"Printcap /var/run/cups/printcap\\n" +
++"\\n" +
++"#\\n" +
++"#PrintcapFormat BSD\\n" +
++"#PrintcapFormat Solaris\\n" +
++"\\n" +
++"#\\n" +
++"# PrintcapGUI: the name of the GUI options panel program to associate\\n" +
++"# with print queues under IRIX. The default is \\"/usr/bin/glpoptions\\"\\n" +
++"# from ESP Print Pro.\\n" +
++"#\\n" +
++"# This option is only used under IRIX; the options panel program\\n" +
++"# must accept the \\"-d printer\\" and \\"-o options\\" options and write\\n" +
++"# the selected printer options back to stdout on completion.\\n" +
++"#\\n" +
++"\\n" +
++"#PrintcapGUI /usr/bin/glpoptions\\n";
+ }
+ </SCRIPT>
+
More information about the Pkg-cups-devel
mailing list