Attachment #66082 for bug #97782

View | Details | Raw Unified | Return to bug 97782
Collapse All | Expand All

Lines 8-57 Link Here

(-)cups-base/Makefile (-19 / +121 lines)
8	#	8	#
9		9
10	PORTNAME= cups-base	10	PORTNAME= cups-base
11	PORTVERSION= ${CUPS_PORTVER}	11	PORTVERSION= 1.2.0
12	PORTREVISION= 9
13	PORTEPOCH= ${CUPS_PORTEPOCH}
14	CATEGORIES= print	12	CATEGORIES= print
15	MASTER_SITES= ${CUPS_MASTER_SITES}	13	MASTER_SITES= ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
		14	ftp://ftp.ntua.gr/pub/gnu/cups/${CUPS_VERSION}/ \
		15	ftp://ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
		16	ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \
		17	ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/
		18	DISTNAME= cups-${PORTVERSION}-source
16		19
17	MAINTAINER= asa@agava.com	20	MAINTAINER= asa@agava.com
18	COMMENT= The Common UNIX Printing System: headers, libs, & daemons	21	COMMENT= The Common UNIX Printing System
19		22
20	INSTALLS_SHLIB= yes	23	INSTALLS_SHLIB= yes
		24	USE_BZIP2= yes
		25	USE_GMAKE= yes
		26	USE_PERL5_RUN= yes
		27	GNU_CONFIGURE= yes
21	USE_RC_SUBR= cupsd	28	USE_RC_SUBR= cupsd
22		29
23	MANLANG= "" es fr	30	OPTIONS= GNUTLS "Build with GNUTLS library" on \
		31	PHP "Build PHP support" off \
		32	PYTHON "Build PYTHON support" off \
		33	LIBPAPER "Build with libpaper support" off
		34
		35	CUPS_FILESDIR= ${.CURDIR}/../../print/cups/files
		36	CUPS_ETCDIR= ${PREFIX}/etc/cups
		37	CUPS_RCDIR= ${PREFIX}/etc/rc.d
		38	CUPS_DOCSDIR= ${PREFIX}/share/doc/cups
		39	CUPS_SPOOLDIR= /var/spool/cups
		40	CUPS_SOCKET?= /var/run/cups.sock
		41	WRKSRC= ${WRKDIR}/cups-${PORTVERSION}
		42
		43	# file, dir ownership
		44	CUPSGRP= cups
		45	CUPSOWN= cups
		46	CUPSSYSGRP= wheel
		47
		48	LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
		49	png.5:${PORTSDIR}/graphics/png \
		50	tiff.4:${PORTSDIR}/graphics/tiff
		51
		52	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
		53
		54	CONFIGURE_ARGS+= --localstatedir=/var \
		55	--disable-pam \
		56	--disable-slp \
		57	--with-cups-user=${CUPSOWN} \
		58	--with-cups-group=${CUPSGRP} \
		59	--with-system-groups=${CUPSSYSGRP} \
		60	--with-docdir=${CUPS_DOCSDIR} \
		61	--with-rcdir=${CUPS_RCDIR} \
		62	--with-domainsocket=${CUPS_SOCKET}
		63
		64	.if !defined(WITHOUT_GNUTLS)
		65	CONFIGURE_ARGS+= --enable-gnutls --disable-openssl
		66	LIB_DEPENDS+= gnutls-openssl.15:${PORTSDIR}/security/gnutls
		67	.endif
		68
		69	.if defined(WITH_PHP)
		70	CONFIGURE_ARGS+= --with-php
		71	RUN_DEPENDS+= php:${PORTSDIR}/lang/php4
		72	.endif
		73
		74	.if defined(WITH_PYTHON)
		75	CONFIGURE_ARGS+= --with-python
		76	USE_PYTHON= yes
		77	.endif
		78
		79	.if defined(WITH_LIBPAPER)
		80	CONFIGURE_ARGS+= --enable-libpaper
		81	LIB_DEPENDS+= paper.2:${PORTSDIR}/print/libpaper
		82	.endif
		83
		84	CONFIGURE_ARGS+= CPPFLAGS="-I.. -I${LOCALBASE}/include"
		85	CONFIGURE_ARGS+= DSOFLAGS="-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib"
		86	CONFIGURE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib"
		87
		88	MAN1EXT= 1
		89	MAN5EXT= 5
		90	MAN7EXT= 7
		91	MAN8EXT= 8
		92
		93	MAN1= cancel.$(MAN1EXT) \
		94	cups-config.$(MAN1EXT) \
95	cupstestdsc.$(MAN1EXT) \
96	cupstestppd.$(MAN1EXT) \
97	lp.$(MAN1EXT) \
98	lpoptions.$(MAN1EXT) \
99	lppasswd.$(MAN1EXT) \
100	lpq.$(MAN1EXT) \
101	lprm.$(MAN1EXT) \
102	lpr.$(MAN1EXT) \
103	lpstat.$(MAN1EXT)
104	MAN5= classes.conf.$(MAN5EXT) \
105	client.conf.$(MAN5EXT) \
106	cups-snmp.conf.$(MAN5EXT) \
107	cupsd.conf.$(MAN5EXT) \
108	mime.convs.$(MAN5EXT) \
109	mime.types.$(MAN5EXT) \
110	printers.conf.$(MAN5EXT) \
111	subscriptions.conf.$(MAN5EXT)
112	MAN7= backend.$(MAN7EXT) \
113	filter.$(MAN7EXT)
114	MAN8= accept.$(MAN8EXT) \
115	cupsaddsmb.$(MAN8EXT) \
116	cups-deviced.$(MAN8EXT) \
117	cups-driverd.$(MAN8EXT) \
118	cups-lpd.$(MAN8EXT) \
119	cups-polld.$(MAN8EXT) \
120	cupsd.$(MAN8EXT) \
121	cupsenable.$(MAN8EXT) \
122	lpadmin.$(MAN8EXT) \
123	lpinfo.$(MAN8EXT) \
124	lpmove.$(MAN8EXT) \
125	lpc.$(MAN8EXT)
126
127	pre-configure::
128	@${ECHO_MSG} Configuring CUPS with options:
129	@${ECHO_MSG} ${CONFIGURE_ARGS} \| fmt
24		130
25	post-patch:	131	post-patch:
26	@${REINPLACE_CMD} -e '/SILENT/d' \	132	@${REINPLACE_CMD} -e '/SILENT/d' \
27	${WRKSRC}/Makedefs.in	133	${WRKSRC}/Makedefs.in
28	@${REINPLACE_CMD} -e '/LN/d' -e '/cat/d' \
29	${WRKSRC}/man/Makefile ${WRKSRC}/man/es/Makefile
30	@${REINPLACE_CMD} -e '/LN/d' -e '/cat/d' \
31	${WRKSRC}/man/Makefile ${WRKSRC}/man/fr/Makefile
32	@${REINPLACE_CMD} -e 's\|/etc/cups\|/usr/local/etc/cups\|g' \	134	@${REINPLACE_CMD} -e 's\|/etc/cups\|/usr/local/etc/cups\|g' \
33	${WRKSRC}/man/*.man	135	${WRKSRC}/man/.man
34	@${REINPLACE_CMD} -e 's\|CXX="$$CC"\|\|g' \	136	@${REINPLACE_CMD} -e 's\|CXX="$$CC"\|\|g' \
35	${WRKSRC}/${CONFIGURE_SCRIPT}	137	${WRKSRC}/${CONFIGURE_SCRIPT}
36		138
37	pre-install:	139	pre-install:
38	@${ECHO_MSG} "===>" Stopping cupsd ...	140	@${ECHO_MSG} "===>" Stopping cupsd ...
39	-killall cupsd \|\| ${TRUE}	141	-killall cupsd \|\| ${TRUE}
40	${RMDIR} ${PREFIX}/etc/cups/certs/* \|\| ${TRUE}
41		142
42	post-install:	143	post-install:
43	${MKDIR} ${CUPS_ETCDIR}	144	${MKDIR} ${CUPS_ETCDIR}
44	.for f in classes.conf client.conf cupsd.conf printers.conf mime.convs mime.types	145	.for f in cupsd.conf mime.convs mime.types
45	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N	146	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N
46	cd ${CUPS_ETCDIR}; if test ! -f ${f}; then ${CP} -p ${f}.N ${f}; fi	147	cd ${CUPS_ETCDIR}; if test ! -f ${f}; then ${CP} -p ${f}.N ${f}; fi
47	.endfor # classes.conf client.conf cupsd.conf printers.conf	148	.endfor # cupsd.conf mime.convs mime.types
48	${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete	149	# ${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete
49	${MKDIR} ${CUPS_SPOOLDIR} ${CUPS_SPOOLDIR}/tmp	150	${MKDIR} ${CUPS_SPOOLDIR} ${CUPS_SPOOLDIR}/tmp
50	${CHOWN} -R ${CUPSOWN}:${CUPSGRP} ${CUPS_SPOOLDIR}	151	${CHOWN} -R ${CUPSOWN}:${CUPSGRP} ${CUPS_SPOOLDIR}
51	${CHMOD} -R g+w ${CUPS_SPOOLDIR}	152	${CHMOD} -R g+w ${CUPS_SPOOLDIR}
52	@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}	153	@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
		154	.ifdef CUPS_OVERWRITE_BASE
		155	${SH} ${PKGINSTALL} placeholder POST-INSTALL overwrite
		156	.endif
		157	${SH} ${PKGINSTALL} placeholder POST-INSTALL
53		158
54	.include "${.CURDIR}/../../print/cups/Makefile.common"	159	.include <bsd.port.mk>
55	.include <bsd.port.pre.mk>
56	.include "${FILESDIR}/manpages.mk"
57	.include <bsd.port.post.mk>

Line 0 Link Here

(-)cups-base/distinfo (+3 lines)
	1	MD5 (cups-1.2.0-source.tar.bz2) = a168b0b1c8bb946060e659e1df2927c5
	2	SHA256 (cups-1.2.0-source.tar.bz2) = 893a91d96e68de51f767d97d36d2d321320b3611b7178ea9a9d17ad2777f5f9f
	3	SIZE (cups-1.2.0-source.tar.bz2) = 3456476

Lines 1-11 Link Here

(-)cups-base/files/manpages.mk (-11 lines)
1	MAN1+= backend.1
2	MAN1+= cups-config.1
3	MAN1+= filter.1
4	MAN5+= classes.conf.5
5	MAN5+= cupsd.conf.5
6	MAN5+= mime.convs.5
7	MAN5+= mime.types.5
8	MAN5+= printers.conf.5
9	MAN8+= cups-lpd.8
10	MAN8+= cups-polld.8
11	MAN8+= cupsd.8




*** pdftops/XRef.cxx.orig	Wed Jan 12 17:10:53 2005
--- pdftops/XRef.cxx	Wed Jan 12 17:11:22 2005
***************
*** 793,798 ****
--- 793,801 ----
  	} else {
  	  keyLength = 5;
  	}
+ 	if (keyLength > 16) {
+ 	  keyLength = 16;
+ 	}
  	permFlags = permissions.getInt();
  	if (encVersion >= 1 && encVersion <= 2 &&
  	    encRevision >= 2 && encRevision <= 3) {




--- pdftops/FontFile.cxx.orig	Tue Feb  3 09:41:09 2004
+++ pdftops/FontFile.cxx	Tue Sep  6 16:16:04 2005
@@ -3572,6 +3573,9 @@
     } else {
       origLocaTable[i].pos = 2 * getUShort(pos + 2*i);
     }
+
+    if (origLocaTable[i].pos < 0 || origLocaTable[i].pos > len)
+      error(1, 0, "bad loca table pos value");
   }
   qsort(origLocaTable, nGlyphs + 1, sizeof(TrueTypeLoca), &cmpTrueTypeLocaPos);
   for (i = 0; i < nGlyphs; ++i) {




--- Makefile.orig	Thu May 18 13:38:50 2006
+++ Makefile	Thu May 18 13:40:07 2006
@@ -99,56 +99,11 @@
 	echo Installing cups-config script...
 	$(INSTALL_DIR) -m 755 $(BINDIR)
 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
-	echo Installing startup script...
-	if test "x$(INITDIR)" != x; then \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
-		$(INSTALL_SCRIPT) init/cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
-	fi
-	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
-		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
-			$(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
-			$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
-		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
-			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
-		else \
-			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
-		fi \
-	fi
 	if test "x$(DBUSDIR)" != x; then \
 		echo Installing cups.conf in $(DBUSDIR)...;\
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
 		$(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \
 	fi
-	if test "x$(XINETD)" != x; then \
-		echo Installing xinetd configuration file for cups-lpd...; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
-		$(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
-	fi
-	if test -d /usr/share/applications; then \
-		echo Installing desktop icons...; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \
-		$(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)/usr/share/applications; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps; \
-		$(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps; \
-		$(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps; \
-		$(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps; \
-		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png; \
-	fi
-
 
 #
 # Install source and header files...




Index: pdftops/Stream.h
===================================================================
--- pdftops/Stream.h
+++ pdftops/Stream.h
@@ -233,6 +233,8 @@ public:
 
   ~StreamPredictor();
 
+  GBool isOk() { return ok; }
+
   int lookChar();
   int getChar();
 
@@ -250,6 +252,7 @@ private:
   int rowBytes;			// bytes per line
   Guchar *predLine;		// line buffer
   int predIdx;			// current index in predLine
+  GBool ok;
 };
 
 //------------------------------------------------------------------------
Index: pdftops/Stream.cxx
===================================================================
--- pdftops/Stream.cxx
+++ pdftops/Stream.cxx
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
+#include <limits.h>
 #ifndef WIN32
 #include <unistd.h>
 #endif
@@ -412,13 +413,28 @@ StreamPredictor::StreamPredictor(Stream 
   width = widthA;
   nComps = nCompsA;
   nBits = nBitsA;
+  predLine = NULL;
+  ok = gFalse;
 
+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+      nComps >= INT_MAX/nBits ||
+      width >= INT_MAX/nComps/nBits) {
+    return;
+  }
   nVals = width * nComps;
+  if (nVals * nBits + 7 <= 0) {
+    return;
+  }
   pixBytes = (nComps * nBits + 7) >> 3;
   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
+  if (rowBytes < 0) {
+    return;
+  }
   predLine = (Guchar *)gmalloc(rowBytes);
   memset(predLine, 0, rowBytes);
   predIdx = rowBytes;
+
+  ok = gTrue;
 }
 
 StreamPredictor::~StreamPredictor() {
@@ -1012,6 +1028,10 @@ LZWStream::LZWStream(Stream *strA, int p
     FilterStream(strA) {
   if (predictor != 1) {
     pred = new StreamPredictor(this, predictor, columns, colors, bits);
+    if (!pred->isOk()) {
+      delete pred;
+      pred = NULL;
+    }
   } else {
     pred = NULL;
   }
@@ -1260,6 +1280,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
   endOfLine = endOfLineA;
   byteAlign = byteAlignA;
   columns = columnsA;
+  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
+    error(-1, "invalid number of columns: %d", columns);
+    exit(1);
+  }
   rows = rowsA;
   endOfBlock = endOfBlockA;
   black = blackA;
@@ -2897,6 +2921,11 @@ GBool DCTStream::readBaselineSOF() {
   height = read16();
   width = read16();
   numComps = str->getChar();
+  if (numComps <= 0 || numComps > 4) {
+    numComps = 0;
+    error(getPos(), "Bad number of components in DCT stream");
+    return gFalse;
+  }
   if (prec != 8) {
     error(getPos(), "Bad DCT precision %d", prec);
     return gFalse;
@@ -2923,6 +2952,11 @@ GBool DCTStream::readProgressiveSOF() {
   height = read16();
   width = read16();
   numComps = str->getChar();
+  if (numComps <= 0 || numComps > 4) {
+    numComps = 0;
+    error(getPos(), "Bad number of components in DCT stream");
+    return gFalse;
+  }
   if (prec != 8) {
     error(getPos(), "Bad DCT precision %d", prec);
     return gFalse;
@@ -2945,6 +2979,11 @@ GBool DCTStream::readScanInfo() {
 
   length = read16() - 2;
   scanInfo.numComps = str->getChar();
+  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
+    scanInfo.numComps = 0;
+    error(getPos(), "Bad number of components in DCT stream");
+    return gFalse;
+  }
   --length;
   if (length != 2 * scanInfo.numComps + 3) {
     error(getPos(), "Bad DCT scan info block");
@@ -3019,12 +3058,12 @@ GBool DCTStream::readHuffmanTables() {
   while (length > 0) {
     index = str->getChar();
     --length;
-    if ((index & 0x0f) >= 4) {
+    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
       error(getPos(), "Bad DCT Huffman table");
       return gFalse;
     }
     if (index & 0x10) {
-      index &= 0x0f;
+      index &= 0x03;
       if (index >= numACHuffTables)
 	numACHuffTables = index+1;
       tbl = &acHuffTables[index];
@@ -3142,9 +3181,11 @@ int DCTStream::readMarker() {
   do {
     do {
       c = str->getChar();
+      if(c == EOF) return EOF;
     } while (c != 0xff);
     do {
       c = str->getChar();
+      if(c == EOF) return EOF;
     } while (c == 0xff);
   } while (c == 0x00);
   return c;
@@ -3255,6 +3296,10 @@ FlateStream::FlateStream(Stream *strA, i
     FilterStream(strA) {
   if (predictor != 1) {
     pred = new StreamPredictor(this, predictor, columns, colors, bits);
+    if (!pred->isOk()) {
+      delete pred;
+      pred = NULL;
+    }
   } else {
     pred = NULL;
   }
Index: pdftops/JBIG2Stream.cxx
===================================================================
--- pdftops/JBIG2Stream.cxx
+++ pdftops/JBIG2Stream.cxx
@@ -7,6 +7,7 @@
 //========================================================================
 
 #include <config.h>
+#include <limits.h>
 
 #ifdef USE_GCC_PRAGMAS
 #pragma implementation
@@ -681,7 +682,16 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
   w = wA;
   h = hA;
   line = (wA + 7) >> 3;
-  data = (Guchar *)gmalloc(h * line);
+
+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+    error(-1, "invalid width/height");
+    data = NULL;
+    return;
+  }
+
+  // need to allocate one extra guard byte for use in combine()
+  data = (Guchar *)gmalloc(h * line + 1);
+  data[h * line] = 0;
 }
 
 JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap):
@@ -690,8 +700,17 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
   w = bitmap->w;
   h = bitmap->h;
   line = bitmap->line;
-  data = (Guchar *)gmalloc(h * line);
+
+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+    error(-1, "invalid width/height");
+    data = NULL;
+    return;
+  }
+
+  // need to allocate one extra guard byte for use in combine()
+  data = (Guchar *)gmalloc(h * line + 1);
   memcpy(data, bitmap->data, h * line);
+  data[h * line] = 0;
 }
 
 JBIG2Bitmap::~JBIG2Bitmap() {
@@ -716,10 +735,14 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint
 }
 
 void JBIG2Bitmap::expand(int newH, Guint pixel) {
-  if (newH <= h) {
+  if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
+    error(-1, "invalid width/height");
+    gfree(data);
+    data = NULL;
     return;
   }
-  data = (Guchar *)grealloc(data, newH * line);
+  // need to allocate one extra guard byte for use in combine()
+  data = (Guchar *)grealloc(data, newH * line + 1);
   if (pixel) {
     memset(data + h * line, 0xff, (newH - h) * line);
   } else {
@@ -2256,6 +2279,15 @@ void JBIG2Stream::readHalftoneRegionSeg(
     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
     return;
   }
+  if (gridH == 0 || gridW >= INT_MAX / gridH) {
+    error(getPos(), "Bad size in JBIG2 halftone segment");
+    return;
+  }
+  if (w == 0 || h >= INT_MAX / w) {
+     error(getPos(), "Bad size in JBIG2 bitmap segment");
+    return;
+  }
+
   patternDict = (JBIG2PatternDict *)seg;
   bpp = 0;
   i = 1;
@@ -2887,6 +2919,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef
   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
   int x, y, pix;
 
+  if (w < 0 || h <= 0 || w >= INT_MAX / h) {
+    error(-1, "invalid width/height");
+    return NULL;
+  }
+
   bitmap = new JBIG2Bitmap(0, w, h);
   bitmap->clearToZero();
 
# vim: syntax=diff




--- man/Makefile.common.orig	Thu May 27 22:51:30 2004
+++ man/Makefile.common	Mon Jan 24 13:28:43 2005
@@ -28,58 +28,16 @@
 
 MAN1	=	backend.man \
 		cups-config.man \
-		cupstestppd.man \
-		filter.man \
-		lp.man \
-		lpoptions.man \
-		lppasswd.man \
-		lpq.man \
-		lprm.man \
-		lpr.man \
-		lpstat.man
+		filter.man
 MAN5	=	classes.conf.man \
 		cupsd.conf.man \
 		mime.convs.man \
 		mime.types.man \
 		printers.conf.man
-MAN8	=	accept.man \
-		cupsaddsmb.man \
+MAN8	=	\
 		cups-lpd.man \
 		cups-polld.man \
-		cupsd.man \
-		enable.man \
-		lpadmin.man \
-		lpinfo.man \
-		lpmove.man \
-		lpc.man
-
-CAT1	=	backend.$(CAT1EXT) \
-		cups-config.$(CAT1EXT) \
-		cupstestppd.$(CAT1EXT) \
-		filter.$(CAT1EXT) \
-		lp.$(CAT1EXT) \
-		lpoptions.$(CAT1EXT) \
-		lppasswd.$(CAT1EXT) \
-		lpq.$(CAT1EXT) \
-		lprm.$(CAT1EXT) \
-		lpr.$(CAT1EXT) \
-		lpstat.$(CAT1EXT)
-CAT5	=	classes.conf.$(CAT5EXT) \
-		cupsd.conf.$(CAT5EXT) \
-		mime.convs.$(CAT5EXT) \
-		mime.types.$(CAT5EXT) \
-		printers.conf.$(CAT5EXT)
-CAT8	=	accept.$(CAT8EXT) \
-		cupsaddsmb.$(CAT8EXT) \
-		cups-lpd.$(CAT8EXT) \
-		cups-polld.$(CAT8EXT) \
-		cupsd.$(CAT8EXT) \
-		enable.$(CAT8EXT) \
-		lpadmin.$(CAT8EXT) \
-		lpinfo.$(CAT8EXT) \
-		lpmove.$(CAT8EXT) \
-		lpc.$(CAT8EXT)
-
+		cupsd.man
 
 #
 # End of "$Id: Makefile.common,v 1.5 2004/05/27 18:51:30 mike Exp $".

Lines 19-21 Link Here

(-)cups-base/pkg-descr (+1 lines)
19	port.	19	port.
20		20
21	WWW: http://www.cups.org/	21	WWW: http://www.cups.org/
		22	[original text by greid@ukug.uk.freebsd.org]




#!/bin/sh
PATH=/bin:/usr/sbin

REPLACES_BINARIES="/usr/bin/lpr
					/usr/bin/lp
					/usr/bin/lpq
					/usr/bin/lprm
					/usr/bin/lpstat
					/usr/sbin/lpc"

case $2 in
POST-INSTALL)
	# Unshade binaries
	if [ -n "${3}" ]; then
		for FILE in ${REPLACES_BINARIES}; do
			[ -e "${FILE}" ] && chmod 0 "${FILE}"
		done
	fi

	# Create user
	USER=cups
	GROUP=${USER}
	UID=193
	GID=${UID}

	if pw group show "${GROUP}" 2>/dev/null; then
		echo "You already have a group \"${GROUP}\", so I will use it."
	else
		if pw groupadd ${GROUP} -g ${GID}; then
			echo "Added group \"${GROUP}\"."
		else
			echo "Adding group \"${GROUP}\" failed..."
			exit 1
		fi
	fi

	if pw user show "${USER}" 2>/dev/null; then
		echo "You already have a user \"${USER}\", so I will use it."
	else
		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
			-d /nonexistent -s /sbin/nologin -c "CUPS Owner"
		then
			echo "Added user \"${USER}\"."
		else
			echo "Adding user \"${USER}\" failed..."
			exit 1
		fi
	fi
	;;
esac




======================================================================

CUPS is now installed.

Please read the documentation in PREFIX/share/doc/cups/ for information
on how to set up your printer to use CUPS. Basic template configuration files
have been installed in PREFIX/etc/cups/

To install the BSD and System V compatibility binaries look to the port
print/cups-lpr. These are no longer installed as part of the base cups port
because they have conflicting names with the native print binaries, and with
other ports such as lprNG.

NOTE: IF YOU USE A NON-POSTSCRIPT PRINTER:

You will need to install the cups-pstoraster port in order to print to
your printer. If you installed via the "cups" port, it will be installed
automatically. Otherwise, you will need to install the port or the package
yourself.

======================================================================

**********************************************************************
PLEASE NOTE:
============


1) Uncomment application/octet-stream line in mime.types
2) Uncomment application/octet-stream line in mime.convs
3) Restart cupsd
======================================================================
**********************************************************************

The cups-base port now uses a new style rc.d startup
script.  Please remove any old cups.sh* scripts you
might have in /usr/local/etc/rc.d, or your local
PREFIX.  You should also put the following line in
/etc/rc.conf.local, or /etc/rc.conf to start cupsd
automatically at boot time:

cupsd_enable="yes"
**********************************************************************

Lines 1-13 Link Here

(-)cups-base/pkg-plist (-460 / +729 lines)
1	@exec /bin/echo "===>" Stopping cupsd ...	1	@exec /bin/echo "===>" Stopping cupsd ...
2	@exec /usr/bin/killall cupsd \|\| true	2	@exec /usr/bin/killall cupsd \|\| true
3	@exec /bin/rmdir %D/etc/cups/certs/* > /dev/null 2>&1 \|\| true	3	@exec mkdir -p /var/spool/cups/tmp \|\| true
		4	@exec chown -R root:daemon /var/spool/cups
		5	@exec mkdir %D/etc/cups/ppd \|\| true
		6	@exec mkdir %D/etc/cups/interfaces \|\| true
		7	@unexec rm -rf /var/spool/cups 2>&1 >/dev/null \|\| true
4	bin/cups-config	8	bin/cups-config
5	@unexec if cmp -s %D/etc/cups/classes.conf.N %D/etc/cups/classes.conf; then rm -f %D/etc/cups/classes.conf; fi
6	etc/cups/classes.conf.N
7	@exec if test ! -f %D/etc/cups/classes.conf; then cp -p %D/etc/cups/classes.conf.N %D/etc/cups/classes.conf; fi
8	@unexec if cmp -s %D/etc/cups/client.conf.N %D/etc/cups/client.conf; then rm -f %D/etc/cups/client.conf; fi
9	etc/cups/client.conf.N
10	@exec if test ! -f %D/etc/cups/client.conf; then cp -p %D/etc/cups/client.conf.N %D/etc/cups/client.conf; fi
11	@unexec if cmp -s %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; then rm -f %D/etc/cups/cupsd.conf; fi	9	@unexec if cmp -s %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; then rm -f %D/etc/cups/cupsd.conf; fi
12	etc/cups/cupsd.conf.N	10	etc/cups/cupsd.conf.N
13	@exec if test ! -f %D/etc/cups/cupsd.conf; then cp -p %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; fi	11	@exec if test ! -f %D/etc/cups/cupsd.conf; then cp -p %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; fi
Lines 17-75 Link Here
17	@unexec if cmp -s %D/etc/cups/mime.types.N %D/etc/cups/mime.types; then rm -f %D/etc/cups/mime.types; fi	15	@unexec if cmp -s %D/etc/cups/mime.types.N %D/etc/cups/mime.types; then rm -f %D/etc/cups/mime.types; fi
18	etc/cups/mime.types.N	16	etc/cups/mime.types.N
19	@exec if test ! -f %D/etc/cups/mime.types; then cp -p %D/etc/cups/mime.types.N %D/etc/cups/mime.types; fi	17	@exec if test ! -f %D/etc/cups/mime.types; then cp -p %D/etc/cups/mime.types.N %D/etc/cups/mime.types; fi
20	@unexec if cmp -s %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; then rm -f %D/etc/cups/printers.conf; fi	18	bin/cupstestdsc
21	etc/cups/printers.conf.N	19	bin/lp
22	@exec if test ! -f %D/etc/cups/printers.conf; then cp -p %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; fi	20	bin/cancel
		21	bin/cupstestppd
		22	bin/lpoptions
		23	bin/lppasswd
		24	bin/lpq
		25	bin/lpr
		26	bin/lprm
		27	bin/lpstat
		28	bin/cups-config
		29	include/cups/adminutil.h
		30	include/cups/array.h
23	include/cups/cups.h	31	include/cups/cups.h
		32	include/cups/dir.h
		33	include/cups/file.h
24	include/cups/http.h	34	include/cups/http.h
25	include/cups/image.h	35	include/cups/i18n.h
26	include/cups/ipp.h	36	include/cups/ipp.h
27	include/cups/language.h	37	include/cups/language.h
28	include/cups/md5.h	38	include/cups/md5.h
29	include/cups/ppd.h	39	include/cups/ppd.h
		40	include/cups/transcode.h
		41	include/cups/image.h
30	include/cups/raster.h	42	include/cups/raster.h
31	lib/libcups.a
32	lib/libcups.so
33	lib/libcups.so.2	43	lib/libcups.so.2
34	lib/libcupsimage.a
35	lib/libcupsimage.so
36	lib/libcupsimage.so.2	44	lib/libcupsimage.so.2
37	libexec/cups/backend/http	45	share/doc/cups/cups.css
38	libexec/cups/backend/ipp	46	share/doc/cups/cups-printable.css
39	libexec/cups/backend/lpd	47	share/doc/cups/favicon.ico
40	libexec/cups/backend/parallel	48	share/doc/cups/index.html
41	libexec/cups/backend/scsi	49	share/doc/cups/robots.txt
42	libexec/cups/backend/serial	50	share/doc/cups/help/api-array.html
43	libexec/cups/backend/socket	51	share/doc/cups/help/api-cups.html
44	libexec/cups/backend/usb	52	share/doc/cups/help/api-filedir.html
45	libexec/cups/cgi-bin/admin.cgi	53	share/doc/cups/help/api-filter.html
46	libexec/cups/cgi-bin/classes.cgi	54	share/doc/cups/help/api-httpipp.html
47	libexec/cups/cgi-bin/jobs.cgi	55	share/doc/cups/help/api-ppd.html
48	libexec/cups/cgi-bin/printers.cgi	56	share/doc/cups/help/api-raster.html
49	libexec/cups/daemon/cups-lpd	57	share/doc/cups/help/cgi.html
50	libexec/cups/daemon/cups-polld	58	share/doc/cups/help/glossary.html
51	libexec/cups/filter/gziptoany	59	share/doc/cups/help/license.html
52	libexec/cups/filter/hpgltops	60	share/doc/cups/help/man-accept.html
53	libexec/cups/filter/imagetops	61	share/doc/cups/help/man-backend.html
54	libexec/cups/filter/imagetoraster	62	share/doc/cups/help/man-cancel.html
55	libexec/cups/filter/pdftops	63	share/doc/cups/help/man-classes.conf.html
56	libexec/cups/filter/pstops	64	share/doc/cups/help/man-client.conf.html
57	libexec/cups/filter/rastertodymo	65	share/doc/cups/help/man-cups-config.html
58	libexec/cups/filter/rastertoepson	66	share/doc/cups/help/man-cups-lpd.html
59	libexec/cups/filter/rastertohp	67	share/doc/cups/help/man-cups-polld.html
60	libexec/cups/filter/texttops	68	share/doc/cups/help/man-cupsaddsmb.html
61	sbin/cupsd	69	share/doc/cups/help/man-cupsd.conf.html
		70	share/doc/cups/help/man-filter.html
		71	share/doc/cups/help/man-mime.convs.html
		72	share/doc/cups/help/man-mime.types.html
		73	share/doc/cups/help/man-printers.conf.html
		74	share/doc/cups/help/network.html
		75	share/doc/cups/help/options.html
		76	share/doc/cups/help/overview.html
		77	share/doc/cups/help/ref-access_log.html
		78	share/doc/cups/help/ref-classes-conf.html
		79	share/doc/cups/help/ref-client-conf.html
		80	share/doc/cups/help/ref-cupsd-conf.html
		81	share/doc/cups/help/ref-error_log.html
		82	share/doc/cups/help/ref-page_log.html
		83	share/doc/cups/help/ref-printers-conf.html
		84	share/doc/cups/help/ref-snmp-conf.html
		85	share/doc/cups/help/ref-subscriptions-conf.html
		86	share/doc/cups/help/security.html
		87	share/doc/cups/help/spec-cmp.html
		88	share/doc/cups/help/spec-command.html
		89	share/doc/cups/help/spec-design.html
		90	share/doc/cups/help/spec-ipp.html
		91	share/doc/cups/help/spec-ppd.html
		92	share/doc/cups/help/spec-raster.html
		93	share/doc/cups/help/spec-stp.html
		94	share/doc/cups/help/standard.html
		95	share/doc/cups/help/translation.html
		96	share/doc/cups/help/whatsnew.html
		97	share/doc/cups/help/man-cupsd.html
		98	share/doc/cups/help/man-cupsenable.html
		99	share/doc/cups/help/man-cupstestdsc.html
		100	share/doc/cups/help/man-cupstestppd.html
		101	share/doc/cups/help/man-lp.html
		102	share/doc/cups/help/man-lpadmin.html
		103	share/doc/cups/help/man-lpc.html
		104	share/doc/cups/help/man-lpinfo.html
		105	share/doc/cups/help/man-lpmove.html
		106	share/doc/cups/help/man-lpoptions.html
		107	share/doc/cups/help/man-lppasswd.html
		108	share/doc/cups/help/man-lpq.html
		109	share/doc/cups/help/man-lpr.html
		110	share/doc/cups/help/man-lprm.html
		111	share/doc/cups/help/man-lpstat.html
		112	share/doc/cups/images/bottom-left.gif
		113	share/doc/cups/images/bottom-right.gif
		114	share/doc/cups/images/classes.gif
		115	share/doc/cups/images/cups-block-diagram.gif
		116	share/doc/cups/images/esp-logo.gif
		117	share/doc/cups/images/happy.gif
		118	share/doc/cups/images/logo.gif
		119	share/doc/cups/images/printer-idle.gif
		120	share/doc/cups/images/printer-processing.gif
		121	share/doc/cups/images/printer-stopped.gif
		122	share/doc/cups/images/smiley.jpg
		123	share/doc/cups/images/tab-left.gif
		124	share/doc/cups/images/tab-right.gif
		125	share/doc/cups/images/top-left.gif
		126	share/doc/cups/images/top-middle.gif
		127	share/doc/cups/images/top-right.gif
		128	share/doc/cups/images/web-add-this-printer.gif
		129	share/doc/cups/images/web-password.gif
		130	share/doc/cups/images/web-test-page.gif
		131	share/doc/cups/images/web-printer-driver.gif
		132	share/doc/cups/images/web-printer-status.gif
		133	share/doc/cups/images/web-set-printer-options.gif
134	share/doc/cups/images/button-accept-jobs.gif
135	share/doc/cups/images/button-add-class.gif
136	share/doc/cups/images/button-add-printer.gif
137	share/doc/cups/images/button-add-this-printer.gif
138	share/doc/cups/images/button-cancel-all-jobs.gif
139	share/doc/cups/images/button-cancel-job.gif
140	share/doc/cups/images/button-change-settings.gif
141	share/doc/cups/images/button-clean-print-heads.gif
142	share/doc/cups/images/button-clear.gif
143	share/doc/cups/images/button-continue.gif
144	share/doc/cups/images/button-delete-class.gif
145	share/doc/cups/images/button-delete-printer.gif
146	share/doc/cups/images/button-edit-configuration-file.gif
147	share/doc/cups/images/button-export-samba.gif
148	share/doc/cups/images/button-help.gif
149	share/doc/cups/images/button-hold-job.gif
150	share/doc/cups/images/button-manage-classes.gif
151	share/doc/cups/images/button-manage-jobs.gif
152	share/doc/cups/images/button-manage-printers.gif
153	share/doc/cups/images/button-manage-server.gif
154	share/doc/cups/images/button-modify-class.gif
155	share/doc/cups/images/button-modify-printer.gif
156	share/doc/cups/images/button-move-job.gif
157	share/doc/cups/images/button-move-jobs.gif
158	share/doc/cups/images/button-print-self-test-page.gif
159	share/doc/cups/images/button-print-test-page.gif
160	share/doc/cups/images/button-publish-printer.gif
161	share/doc/cups/images/button-reject-jobs.gif
162	share/doc/cups/images/button-release-job.gif
163	share/doc/cups/images/button-restart-job.gif
164	share/doc/cups/images/button-save-changes.gif
165	share/doc/cups/images/button-search.gif
166	share/doc/cups/images/button-set-allowed-users.gif
167	share/doc/cups/images/button-set-as-default.gif
168	share/doc/cups/images/button-set-printer-options.gif
169	share/doc/cups/images/button-show-active.gif
170	share/doc/cups/images/button-show-all.gif
171	share/doc/cups/images/button-show-completed.gif
172	share/doc/cups/images/button-show-next.gif
173	share/doc/cups/images/button-show-previous.gif
174	share/doc/cups/images/button-sort-ascending.gif
175	share/doc/cups/images/button-sort-descending.gif
176	share/doc/cups/images/button-start-class.gif
177	share/doc/cups/images/button-start-printer.gif
178	share/doc/cups/images/button-stop-class.gif
179	share/doc/cups/images/button-stop-printer.gif
180	share/doc/cups/images/button-unpublish-printer.gif
181	share/doc/cups/images/button-use-default-config.gif
182	share/doc/cups/images/button-view-access-log.gif
183	share/doc/cups/images/button-view-error-log.gif
184	share/doc/cups/images/button-view-page-log.gif
185	share/doc/cups/images/button-view-printable-version.gif
186	share/doc/cups/es/images/button-accept-jobs.gif
187	share/doc/cups/es/images/button-add-class.gif
188	share/doc/cups/es/images/button-add-printer.gif
189	share/doc/cups/es/images/button-add-this-printer.gif
190	share/doc/cups/es/images/button-cancel-all-jobs.gif
191	share/doc/cups/es/images/button-cancel-job.gif
192	share/doc/cups/es/images/button-change-settings.gif
193	share/doc/cups/es/images/button-clean-print-heads.gif
194	share/doc/cups/es/images/button-clear.gif
195	share/doc/cups/es/images/button-continue.gif
196	share/doc/cups/es/images/button-delete-class.gif
197	share/doc/cups/es/images/button-delete-printer.gif
198	share/doc/cups/es/images/button-edit-configuration-file.gif
199	share/doc/cups/es/images/button-export-samba.gif
200	share/doc/cups/es/images/button-help.gif
201	share/doc/cups/es/images/button-hold-job.gif
202	share/doc/cups/es/images/button-manage-classes.gif
203	share/doc/cups/es/images/button-manage-jobs.gif
204	share/doc/cups/es/images/button-manage-printers.gif
205	share/doc/cups/es/images/button-manage-server.gif
206	share/doc/cups/es/images/button-modify-class.gif
207	share/doc/cups/es/images/button-modify-printer.gif
208	share/doc/cups/es/images/button-move-job.gif
209	share/doc/cups/es/images/button-move-jobs.gif
210	share/doc/cups/es/images/button-print-self-test-page.gif
211	share/doc/cups/es/images/button-print-test-page.gif
212	share/doc/cups/es/images/button-publish-printer.gif
213	share/doc/cups/es/images/button-reject-jobs.gif
214	share/doc/cups/es/images/button-release-job.gif
215	share/doc/cups/es/images/button-restart-job.gif
216	share/doc/cups/es/images/button-save-changes.gif
217	share/doc/cups/es/images/button-search.gif
218	share/doc/cups/es/images/button-set-allowed-users.gif
219	share/doc/cups/es/images/button-set-as-default.gif
220	share/doc/cups/es/images/button-set-printer-options.gif
221	share/doc/cups/es/images/button-show-active.gif
222	share/doc/cups/es/images/button-show-all.gif
223	share/doc/cups/es/images/button-show-completed.gif
224	share/doc/cups/es/images/button-show-next.gif
225	share/doc/cups/es/images/button-show-previous.gif
226	share/doc/cups/es/images/button-sort-ascending.gif
227	share/doc/cups/es/images/button-sort-descending.gif
228	share/doc/cups/es/images/button-start-class.gif
229	share/doc/cups/es/images/button-start-printer.gif
230	share/doc/cups/es/images/button-stop-class.gif
231	share/doc/cups/es/images/button-stop-printer.gif
232	share/doc/cups/es/images/button-unpublish-printer.gif
233	share/doc/cups/es/images/button-use-default-config.gif
234	share/doc/cups/es/images/button-view-access-log.gif
235	share/doc/cups/es/images/button-view-error-log.gif
236	share/doc/cups/es/images/button-view-page-log.gif
237	share/doc/cups/es/images/button-view-printable-version.gif
238	share/doc/cups/es/index.html
239	share/doc/cups/ja/images/button-accept-jobs.gif
240	share/doc/cups/ja/images/button-add-class.gif
241	share/doc/cups/ja/images/button-add-printer.gif
242	share/doc/cups/ja/images/button-add-this-printer.gif
243	share/doc/cups/ja/images/button-cancel-all-jobs.gif
244	share/doc/cups/ja/images/button-cancel-job.gif
245	share/doc/cups/ja/images/button-change-settings.gif
246	share/doc/cups/ja/images/button-continue.gif
247	share/doc/cups/ja/images/button-delete-class.gif
248	share/doc/cups/ja/images/button-delete-printer.gif
249	share/doc/cups/ja/images/button-edit-configuration-file.gif
250	share/doc/cups/ja/images/button-export-samba.gif
251	share/doc/cups/ja/images/button-help.gif
252	share/doc/cups/ja/images/button-hold-job.gif
253	share/doc/cups/ja/images/button-move-job.gif
254	share/doc/cups/ja/images/button-manage-classes.gif
255	share/doc/cups/ja/images/button-manage-jobs.gif
256	share/doc/cups/ja/images/button-manage-printers.gif
257	share/doc/cups/ja/images/button-manage-server.gif
258	share/doc/cups/ja/images/button-modify-class.gif
259	share/doc/cups/ja/images/button-modify-printer.gif
260	share/doc/cups/ja/images/button-move-jobs.gif
261	share/doc/cups/ja/images/button-print-test-page.gif
262	share/doc/cups/ja/images/button-publish-printer.gif
263	share/doc/cups/ja/images/button-reject-jobs.gif
264	share/doc/cups/ja/images/button-release-job.gif
265	share/doc/cups/ja/images/button-restart-job.gif
266	share/doc/cups/ja/images/button-save-changes.gif
267	share/doc/cups/ja/images/button-search.gif
268	share/doc/cups/ja/images/button-set-allowed-users.gif
269	share/doc/cups/ja/images/button-set-as-default.gif
270	share/doc/cups/ja/images/button-set-printer-options.gif
271	share/doc/cups/ja/images/button-show-active.gif
272	share/doc/cups/ja/images/button-show-all.gif
273	share/doc/cups/ja/images/button-show-completed.gif
274	share/doc/cups/ja/images/button-show-next.gif
275	share/doc/cups/ja/images/button-show-previous.gif
276	share/doc/cups/ja/images/button-sort-ascending.gif
277	share/doc/cups/ja/images/button-sort-descending.gif
278	share/doc/cups/ja/images/button-start-class.gif
279	share/doc/cups/ja/images/button-start-printer.gif
280	share/doc/cups/ja/images/button-stop-class.gif
281	share/doc/cups/ja/images/button-stop-printer.gif
282	share/doc/cups/ja/images/button-unpublish-printer.gif
283	share/doc/cups/ja/images/button-use-default-config.gif
284	share/doc/cups/ja/images/button-view-access-log.gif
285	share/doc/cups/ja/images/button-view-error-log.gif
286	share/doc/cups/ja/images/button-view-page-log.gif
287	share/doc/cups/ja/index.html
288	share/doc/cups/pl/images/button-accept-jobs.gif
289	share/doc/cups/pl/images/button-add-class.gif
290	share/doc/cups/pl/images/button-add-printer.gif
291	share/doc/cups/pl/images/button-add-this-printer.gif
292	share/doc/cups/pl/images/button-cancel-all-jobs.gif
293	share/doc/cups/pl/images/button-cancel-job.gif
294	share/doc/cups/pl/images/button-change-settings.gif
295	share/doc/cups/pl/images/button-clean-print-heads.gif
296	share/doc/cups/pl/images/button-clear.gif
297	share/doc/cups/pl/images/button-continue.gif
298	share/doc/cups/pl/images/button-delete-class.gif
299	share/doc/cups/pl/images/button-delete-printer.gif
300	share/doc/cups/pl/images/button-edit-configuration-file.gif
301	share/doc/cups/pl/images/button-export-samba.gif
302	share/doc/cups/pl/images/button-help.gif
303	share/doc/cups/pl/images/button-hold-job.gif
304	share/doc/cups/pl/images/button-manage-classes.gif
305	share/doc/cups/pl/images/button-manage-jobs.gif
306	share/doc/cups/pl/images/button-manage-printers.gif
307	share/doc/cups/pl/images/button-manage-server.gif
308	share/doc/cups/pl/images/button-modify-class.gif
309	share/doc/cups/pl/images/button-modify-printer.gif
310	share/doc/cups/pl/images/button-move-job.gif
311	share/doc/cups/pl/images/button-move-jobs.gif
312	share/doc/cups/pl/images/button-print-self-test-page.gif
313	share/doc/cups/pl/images/button-print-test-page.gif
314	share/doc/cups/pl/images/button-publish-printer.gif
315	share/doc/cups/pl/images/button-reject-jobs.gif
316	share/doc/cups/pl/images/button-release-job.gif
317	share/doc/cups/pl/images/button-restart-job.gif
318	share/doc/cups/pl/images/button-save-changes.gif
319	share/doc/cups/pl/images/button-search.gif
320	share/doc/cups/pl/images/button-set-allowed-users.gif
321	share/doc/cups/pl/images/button-set-as-default.gif
322	share/doc/cups/pl/images/button-set-printer-options.gif
323	share/doc/cups/pl/images/button-show-active.gif
324	share/doc/cups/pl/images/button-show-all.gif
325	share/doc/cups/pl/images/button-show-completed.gif
326	share/doc/cups/pl/images/button-show-next.gif
327	share/doc/cups/pl/images/button-show-previous.gif
328	share/doc/cups/pl/images/button-sort-ascending.gif
329	share/doc/cups/pl/images/button-sort-descending.gif
330	share/doc/cups/pl/images/button-start-class.gif
331	share/doc/cups/pl/images/button-start-printer.gif
332	share/doc/cups/pl/images/button-stop-class.gif
333	share/doc/cups/pl/images/button-stop-printer.gif
334	share/doc/cups/pl/images/button-unpublish-printer.gif
335	share/doc/cups/pl/images/button-use-default-config.gif
336	share/doc/cups/pl/images/button-view-access-log.gif
337	share/doc/cups/pl/images/button-view-error-log.gif
338	share/doc/cups/pl/images/button-view-page-log.gif
339	share/doc/cups/pl/images/button-view-printable-version.gif
340	share/doc/cups/pl/index.html
341	share/doc/cups/sv/images/button-accept-jobs.gif
342	share/doc/cups/sv/images/button-add-class.gif
343	share/doc/cups/sv/images/button-add-printer.gif
344	share/doc/cups/sv/images/button-add-this-printer.gif
345	share/doc/cups/sv/images/button-cancel-all-jobs.gif
346	share/doc/cups/sv/images/button-cancel-job.gif
347	share/doc/cups/sv/images/button-change-settings.gif
348	share/doc/cups/sv/images/button-clean-print-heads.gif
349	share/doc/cups/sv/images/button-clear.gif
350	share/doc/cups/sv/images/button-continue.gif
351	share/doc/cups/sv/images/button-delete-class.gif
352	share/doc/cups/sv/images/button-delete-printer.gif
353	share/doc/cups/sv/images/button-edit-configuration-file.gif
354	share/doc/cups/sv/images/button-export-samba.gif
355	share/doc/cups/sv/images/button-help.gif
356	share/doc/cups/sv/images/button-hold-job.gif
357	share/doc/cups/sv/images/button-manage-classes.gif
358	share/doc/cups/sv/images/button-manage-jobs.gif
359	share/doc/cups/sv/images/button-manage-printers.gif
360	share/doc/cups/sv/images/button-manage-server.gif
361	share/doc/cups/sv/images/button-modify-class.gif
362	share/doc/cups/sv/images/button-modify-printer.gif
363	share/doc/cups/sv/images/button-move-job.gif
364	share/doc/cups/sv/images/button-move-jobs.gif
365	share/doc/cups/sv/images/button-print-self-test-page.gif
366	share/doc/cups/sv/images/button-print-test-page.gif
367	share/doc/cups/sv/images/button-publish-printer.gif
368	share/doc/cups/sv/images/button-reject-jobs.gif
369	share/doc/cups/sv/images/button-release-job.gif
370	share/doc/cups/sv/images/button-restart-job.gif
371	share/doc/cups/sv/images/button-save-changes.gif
372	share/doc/cups/sv/images/button-search.gif
373	share/doc/cups/sv/images/button-set-allowed-users.gif
374	share/doc/cups/sv/images/button-set-as-default.gif
375	share/doc/cups/sv/images/button-set-printer-options.gif
376	share/doc/cups/sv/images/button-show-active.gif
377	share/doc/cups/sv/images/button-show-all.gif
378	share/doc/cups/sv/images/button-show-completed.gif
379	share/doc/cups/sv/images/button-show-next.gif
380	share/doc/cups/sv/images/button-show-previous.gif
381	share/doc/cups/sv/images/button-sort-ascending.gif
382	share/doc/cups/sv/images/button-sort-descending.gif
383	share/doc/cups/sv/images/button-start-class.gif
384	share/doc/cups/sv/images/button-start-printer.gif
385	share/doc/cups/sv/images/button-stop-class.gif
386	share/doc/cups/sv/images/button-stop-printer.gif
387	share/doc/cups/sv/images/button-unpublish-printer.gif
388	share/doc/cups/sv/images/button-use-default-config.gif
389	share/doc/cups/sv/images/button-view-access-log.gif
390	share/doc/cups/sv/images/button-view-error-log.gif
391	share/doc/cups/sv/images/button-view-page-log.gif
392	share/doc/cups/sv/images/button-view-printable-version.gif
393	share/doc/cups/sv/index.html
394	share/locale/es/cups_es.po
395	share/locale/ja/cups_ja.po
396	share/locale/sv/cups_sv.po
62	share/cups/banners/classified	397	share/cups/banners/classified
63	share/cups/banners/confidential	398	share/cups/banners/confidential
64	share/cups/banners/secret	399	share/cups/banners/secret
65	share/cups/banners/standard	400	share/cups/banners/standard
66	share/cups/banners/topsecret	401	share/cups/banners/topsecret
67	share/cups/banners/unclassified	402	share/cups/banners/unclassified
		403	share/cups/charmaps/euc-cn.txt
		404	share/cups/charmaps/euc-jp.txt
		405	share/cups/charmaps/euc-kr.txt
		406	share/cups/charmaps/euc-tw.txt
		407	share/cups/charmaps/iso-8859-10.txt
		408	share/cups/charmaps/iso-8859-11.txt
		409	share/cups/charmaps/iso-8859-13.txt
		410	share/cups/charmaps/iso-8859-14.txt
		411	share/cups/charmaps/iso-8859-15.txt
		412	share/cups/charmaps/iso-8859-16.txt
		413	share/cups/charmaps/iso-8859-1.txt
		414	share/cups/charmaps/iso-8859-2.txt
		415	share/cups/charmaps/iso-8859-3.txt
		416	share/cups/charmaps/iso-8859-4.txt
		417	share/cups/charmaps/iso-8859-5.txt
		418	share/cups/charmaps/iso-8859-6.txt
		419	share/cups/charmaps/iso-8859-7.txt
		420	share/cups/charmaps/iso-8859-8.txt
		421	share/cups/charmaps/iso-8859-9.txt
		422	share/cups/charmaps/koi8-r.txt
		423	share/cups/charmaps/koi8-u.txt
		424	share/cups/charmaps/mac-roman.txt
		425	share/cups/charmaps/windows-1250.txt
		426	share/cups/charmaps/windows-1251.txt
		427	share/cups/charmaps/windows-1252.txt
		428	share/cups/charmaps/windows-1253.txt
		429	share/cups/charmaps/windows-1254.txt
		430	share/cups/charmaps/windows-1255.txt
		431	share/cups/charmaps/windows-1256.txt
		432	share/cups/charmaps/windows-1257.txt
		433	share/cups/charmaps/windows-1258.txt
		434	share/cups/charmaps/windows-1361.txt
		435	share/cups/charmaps/windows-874.txt
		436	share/cups/charmaps/windows-932.txt
		437	share/cups/charmaps/windows-936.txt
		438	share/cups/charmaps/windows-949.txt
		439	share/cups/charmaps/windows-950.txt
		440	share/cups/charsets/windows-874
		441	share/cups/charsets/windows-1250
		442	share/cups/charsets/windows-1251
		443	share/cups/charsets/windows-1252
		444	share/cups/charsets/windows-1253
		445	share/cups/charsets/windows-1254
		446	share/cups/charsets/windows-1255
		447	share/cups/charsets/windows-1256
		448	share/cups/charsets/windows-1257
		449	share/cups/charsets/windows-1258
		450	share/cups/charsets/koi8-r
		451	share/cups/charsets/koi8-u
68	share/cups/charsets/iso-8859-1	452	share/cups/charsets/iso-8859-1
69	share/cups/charsets/iso-8859-10
70	share/cups/charsets/iso-8859-13
71	share/cups/charsets/iso-8859-14
72	share/cups/charsets/iso-8859-15
73	share/cups/charsets/iso-8859-2	453	share/cups/charsets/iso-8859-2
74	share/cups/charsets/iso-8859-3	454	share/cups/charsets/iso-8859-3
75	share/cups/charsets/iso-8859-4	455	share/cups/charsets/iso-8859-4
Lines 78-206 Link Here
78	share/cups/charsets/iso-8859-7	458	share/cups/charsets/iso-8859-7
79	share/cups/charsets/iso-8859-8	459	share/cups/charsets/iso-8859-8
80	share/cups/charsets/iso-8859-9	460	share/cups/charsets/iso-8859-9
81	share/cups/charsets/koi8-r	461	share/cups/charsets/iso-8859-10
82	share/cups/charsets/koi8-u	462	share/cups/charsets/iso-8859-13
		463	share/cups/charsets/iso-8859-14
		464	share/cups/charsets/iso-8859-15
83	share/cups/charsets/utf-8	465	share/cups/charsets/utf-8
84	share/cups/charsets/windows-1250
85	share/cups/charsets/windows-1251
86	share/cups/charsets/windows-1252
87	share/cups/charsets/windows-1253
88	share/cups/charsets/windows-1254
89	share/cups/charsets/windows-1255
90	share/cups/charsets/windows-1256
91	share/cups/charsets/windows-1257
92	share/cups/charsets/windows-1258
93	share/cups/charsets/windows-874
94	share/cups/data/HPGLprolog
95	share/cups/data/psglyphs
96	share/cups/data/testprint.ps
97	share/cups/fonts/Courier
98	share/cups/fonts/Courier-Bold
99	share/cups/fonts/Courier-BoldOblique
100	share/cups/fonts/Courier-Oblique
101	share/cups/fonts/Symbol
102	share/cups/model/deskjet.ppd	466	share/cups/model/deskjet.ppd
103	share/cups/model/deskjet2.ppd	467	share/cups/model/deskjet2.ppd
104	share/cups/model/dymo.ppd	468	share/cups/model/dymo.ppd
105	share/cups/model/epson24.ppd
106	share/cups/model/epson9.ppd	469	share/cups/model/epson9.ppd
		470	share/cups/model/epson24.ppd
107	share/cups/model/laserjet.ppd	471	share/cups/model/laserjet.ppd
108	share/cups/model/okidat24.ppd
109	share/cups/model/okidata9.ppd	472	share/cups/model/okidata9.ppd
		473	share/cups/model/okidat24.ppd
110	share/cups/model/stcolor.ppd	474	share/cups/model/stcolor.ppd
111	share/cups/model/stcolor2.ppd	475	share/cups/model/stcolor2.ppd
112	share/cups/model/stphoto.ppd	476	share/cups/model/stphoto.ppd
113	share/cups/model/stphoto2.ppd	477	share/cups/model/stphoto2.ppd
114	share/cups/model/zebra.ppd	478	share/cups/model/zebra.ppd
		479	share/cups/model/zebraep1.ppd
		480	share/cups/model/zebraep2.ppd
		481	share/cups/data/HPGLprolog
		482	share/cups/data/psglyphs
		483	share/cups/data/testprint.ps
		484	share/cups/fonts/Courier
		485	share/cups/fonts/Courier-Bold
		486	share/cups/fonts/Courier-BoldOblique
		487	share/cups/fonts/Courier-Oblique
		488	share/cups/fonts/Symbol
115	share/cups/templates/add-class.tmpl	489	share/cups/templates/add-class.tmpl
116	share/cups/templates/add-printer.tmpl	490	share/cups/templates/add-printer.tmpl
117	share/cups/templates/admin-op.tmpl
118	share/cups/templates/admin.tmpl	491	share/cups/templates/admin.tmpl
119	share/cups/templates/choose-device.tmpl	492	share/cups/templates/choose-device.tmpl
120	share/cups/templates/choose-make.tmpl	493	share/cups/templates/choose-make.tmpl
121	share/cups/templates/choose-members.tmpl
122	share/cups/templates/choose-model.tmpl	494	share/cups/templates/choose-model.tmpl
123	share/cups/templates/choose-serial.tmpl	495	share/cups/templates/choose-serial.tmpl
124	share/cups/templates/choose-uri.tmpl	496	share/cups/templates/choose-uri.tmpl
125	share/cups/templates/class-added.tmpl	497	share/cups/templates/class-added.tmpl
126	share/cups/templates/class-confirm.tmpl	498	share/cups/templates/class-confirm.tmpl
127	share/cups/templates/class-deleted.tmpl	499	share/cups/templates/class-deleted.tmpl
		500	share/cups/templates/class-jobs-header.tmpl
128	share/cups/templates/class-modified.tmpl	501	share/cups/templates/class-modified.tmpl
129	share/cups/templates/classes.tmpl	502	share/cups/templates/classes.tmpl
130	share/cups/templates/config-printer.tmpl	503	share/cups/templates/classes-header.tmpl
131	share/cups/templates/config-printer2.tmpl	504	share/cups/templates/edit-config.tmpl
132	share/cups/templates/printer-default.tmpl	505	share/cups/templates/error.tmpl
133	share/cups/templates/be/add-class.tmpl	506	share/cups/templates/error-op.tmpl
134	share/cups/templates/be/add-printer.tmpl
135	share/cups/templates/be/admin-op.tmpl
136	share/cups/templates/be/admin.tmpl
137	share/cups/templates/be/choose-device.tmpl
138	share/cups/templates/be/choose-make.tmpl
139	share/cups/templates/be/choose-members.tmpl
140	share/cups/templates/be/choose-model.tmpl
141	share/cups/templates/be/choose-serial.tmpl
142	share/cups/templates/be/choose-uri.tmpl
143	share/cups/templates/be/class-added.tmpl
144	share/cups/templates/be/class-confirm.tmpl
145	share/cups/templates/be/class-deleted.tmpl
146	share/cups/templates/be/class-modified.tmpl
147	share/cups/templates/be/classes.tmpl
148	share/cups/templates/be/config-printer.tmpl
149	share/cups/templates/be/config-printer2.tmpl
150	share/cups/templates/be/error.tmpl
151	share/cups/templates/be/header.tmpl
152	share/cups/templates/be/jobs.tmpl
153	share/cups/templates/be/job-cancel.tmpl
154	share/cups/templates/be/job-hold.tmpl
155	share/cups/templates/be/job-op.tmpl
156	share/cups/templates/be/job-release.tmpl
157	share/cups/templates/be/job-restart.tmpl
158	share/cups/templates/be/modify-class.tmpl
159	share/cups/templates/be/modify-printer.tmpl
160	share/cups/templates/be/option-boolean.tmpl
161	share/cups/templates/be/option-conflict.tmpl
162	share/cups/templates/be/option-header.tmpl
163	share/cups/templates/be/option-pickmany.tmpl
164	share/cups/templates/be/option-pickone.tmpl
165	share/cups/templates/be/option-trailer.tmpl
166	share/cups/templates/be/printers.tmpl
167	share/cups/templates/be/printer-accept.tmpl
168	share/cups/templates/be/printer-added.tmpl
169	share/cups/templates/be/printer-configured.tmpl
170	share/cups/templates/be/printer-confirm.tmpl
171	share/cups/templates/be/printer-deleted.tmpl
172	share/cups/templates/be/printer-modified.tmpl
173	share/cups/templates/be/printer-purge.tmpl
174	share/cups/templates/be/printer-reject.tmpl
175	share/cups/templates/be/printer-start.tmpl
176	share/cups/templates/be/printer-stop.tmpl
177	share/cups/templates/be/test-page.tmpl
178	share/cups/templates/be/trailer.tmpl
179	share/cups/templates/es/add-class.tmpl	507	share/cups/templates/es/add-class.tmpl
180	share/cups/templates/es/add-printer.tmpl	508	share/cups/templates/es/add-printer.tmpl
181	share/cups/templates/es/admin-op.tmpl
182	share/cups/templates/es/admin.tmpl	509	share/cups/templates/es/admin.tmpl
183	share/cups/templates/es/choose-device.tmpl	510	share/cups/templates/es/choose-device.tmpl
184	share/cups/templates/es/choose-make.tmpl	511	share/cups/templates/es/choose-make.tmpl
185	share/cups/templates/es/choose-members.tmpl
186	share/cups/templates/es/choose-model.tmpl	512	share/cups/templates/es/choose-model.tmpl
187	share/cups/templates/es/choose-serial.tmpl	513	share/cups/templates/es/choose-serial.tmpl
188	share/cups/templates/es/choose-uri.tmpl	514	share/cups/templates/es/choose-uri.tmpl
189	share/cups/templates/es/class-added.tmpl	515	share/cups/templates/es/class-added.tmpl
190	share/cups/templates/es/class-confirm.tmpl	516	share/cups/templates/es/class-confirm.tmpl
191	share/cups/templates/es/class-deleted.tmpl	517	share/cups/templates/es/class-deleted.tmpl
		518	share/cups/templates/es/class-jobs-header.tmpl
192	share/cups/templates/es/class-modified.tmpl	519	share/cups/templates/es/class-modified.tmpl
193	share/cups/templates/es/classes.tmpl	520	share/cups/templates/es/classes.tmpl
194	share/cups/templates/es/config-printer.tmpl	521	share/cups/templates/es/classes-header.tmpl
195	share/cups/templates/es/config-printer2.tmpl	522	share/cups/templates/es/edit-config.tmpl
196	share/cups/templates/es/error.tmpl	523	share/cups/templates/es/error.tmpl
		524	share/cups/templates/es/error-op.tmpl
197	share/cups/templates/es/header.tmpl	525	share/cups/templates/es/header.tmpl
198	share/cups/templates/es/jobs.tmpl	526	share/cups/templates/es/help-header.tmpl
		527	share/cups/templates/es/help-printable.tmpl
199	share/cups/templates/es/job-cancel.tmpl	528	share/cups/templates/es/job-cancel.tmpl
200	share/cups/templates/es/job-hold.tmpl	529	share/cups/templates/es/job-hold.tmpl
201	share/cups/templates/es/job-op.tmpl	530	share/cups/templates/es/job-move.tmpl
		531	share/cups/templates/es/job-moved.tmpl
202	share/cups/templates/es/job-release.tmpl	532	share/cups/templates/es/job-release.tmpl
203	share/cups/templates/es/job-restart.tmpl	533	share/cups/templates/es/job-restart.tmpl
		534	share/cups/templates/es/jobs.tmpl
		535	share/cups/templates/es/jobs-header.tmpl
		536	share/cups/templates/es/maintenance.tmpl
204	share/cups/templates/es/modify-class.tmpl	537	share/cups/templates/es/modify-class.tmpl
205	share/cups/templates/es/modify-printer.tmpl	538	share/cups/templates/es/modify-printer.tmpl
206	share/cups/templates/es/option-boolean.tmpl	539	share/cups/templates/es/option-boolean.tmpl
Lines 209-327 Link Here
209	share/cups/templates/es/option-pickmany.tmpl	542	share/cups/templates/es/option-pickmany.tmpl
210	share/cups/templates/es/option-pickone.tmpl	543	share/cups/templates/es/option-pickone.tmpl
211	share/cups/templates/es/option-trailer.tmpl	544	share/cups/templates/es/option-trailer.tmpl
212	share/cups/templates/es/printers.tmpl	545	share/cups/templates/es/pager.tmpl
213	share/cups/templates/es/printer-accept.tmpl	546	share/cups/templates/es/printer-accept.tmpl
214	share/cups/templates/es/printer-added.tmpl	547	share/cups/templates/es/printer-added.tmpl
215	share/cups/templates/es/printer-configured.tmpl	548	share/cups/templates/es/printer-configured.tmpl
216	share/cups/templates/es/printer-confirm.tmpl	549	share/cups/templates/es/printer-confirm.tmpl
		550	share/cups/templates/es/printer-default.tmpl
217	share/cups/templates/es/printer-deleted.tmpl	551	share/cups/templates/es/printer-deleted.tmpl
		552	share/cups/templates/es/printer-jobs-header.tmpl
218	share/cups/templates/es/printer-modified.tmpl	553	share/cups/templates/es/printer-modified.tmpl
219	share/cups/templates/es/printer-purge.tmpl	554	share/cups/templates/es/printer-purge.tmpl
220	share/cups/templates/es/printer-reject.tmpl	555	share/cups/templates/es/printer-reject.tmpl
221	share/cups/templates/es/printer-start.tmpl	556	share/cups/templates/es/printer-start.tmpl
222	share/cups/templates/es/printer-stop.tmpl	557	share/cups/templates/es/printer-stop.tmpl
		558	share/cups/templates/es/printers.tmpl
		559	share/cups/templates/es/printers-header.tmpl
		560	share/cups/templates/es/restart.tmpl
		561	share/cups/templates/es/search.tmpl
		562	share/cups/templates/es/samba-export.tmpl
		563	share/cups/templates/es/samba-exported.tmpl
		564	share/cups/templates/es/set-printer-options-header.tmpl
		565	share/cups/templates/es/set-printer-options-trailer.tmpl
223	share/cups/templates/es/test-page.tmpl	566	share/cups/templates/es/test-page.tmpl
224	share/cups/templates/es/trailer.tmpl	567	share/cups/templates/es/trailer.tmpl
225	share/cups/templates/de/add-class.tmpl	568	share/cups/templates/es/users.tmpl
226	share/cups/templates/de/add-printer.tmpl
227	share/cups/templates/de/admin-op.tmpl
228	share/cups/templates/de/admin.tmpl
229	share/cups/templates/de/choose-device.tmpl
230	share/cups/templates/de/choose-make.tmpl
231	share/cups/templates/de/choose-members.tmpl
232	share/cups/templates/de/choose-model.tmpl
233	share/cups/templates/de/choose-serial.tmpl
234	share/cups/templates/de/choose-uri.tmpl
235	share/cups/templates/de/class-added.tmpl
236	share/cups/templates/de/class-confirm.tmpl
237	share/cups/templates/de/class-deleted.tmpl
238	share/cups/templates/de/class-modified.tmpl
239	share/cups/templates/de/classes.tmpl
240	share/cups/templates/de/config-printer.tmpl
241	share/cups/templates/de/config-printer2.tmpl
242	share/cups/templates/de/error.tmpl
243	share/cups/templates/de/header.tmpl
244	share/cups/templates/de/job-cancel.tmpl
245	share/cups/templates/de/job-hold.tmpl
246	share/cups/templates/de/job-op.tmpl
247	share/cups/templates/de/job-release.tmpl
248	share/cups/templates/de/job-restart.tmpl
249	share/cups/templates/de/jobs.tmpl
250	share/cups/templates/de/modify-class.tmpl
251	share/cups/templates/de/modify-printer.tmpl
252	share/cups/templates/de/option-boolean.tmpl
253	share/cups/templates/de/option-conflict.tmpl
254	share/cups/templates/de/option-header.tmpl
255	share/cups/templates/de/option-pickmany.tmpl
256	share/cups/templates/de/option-pickone.tmpl
257	share/cups/templates/de/option-trailer.tmpl
258	share/cups/templates/de/printer-accept.tmpl
259	share/cups/templates/de/printer-added.tmpl
260	share/cups/templates/de/printer-configured.tmpl
261	share/cups/templates/de/printer-confirm.tmpl
262	share/cups/templates/de/printer-deleted.tmpl
263	share/cups/templates/de/printer-modified.tmpl
264	share/cups/templates/de/printer-purge.tmpl
265	share/cups/templates/de/printer-reject.tmpl
266	share/cups/templates/de/printer-start.tmpl
267	share/cups/templates/de/printer-stop.tmpl
268	share/cups/templates/de/printers.tmpl
269	share/cups/templates/de/test-page.tmpl
270	share/cups/templates/de/trailer.tmpl
271	share/cups/templates/error.tmpl
272	share/cups/templates/fr/add-class.tmpl
273	share/cups/templates/fr/add-printer.tmpl
274	share/cups/templates/fr/admin-op.tmpl
275	share/cups/templates/fr/admin.tmpl
276	share/cups/templates/fr/choose-device.tmpl
277	share/cups/templates/fr/choose-make.tmpl
278	share/cups/templates/fr/choose-members.tmpl
279	share/cups/templates/fr/choose-model.tmpl
280	share/cups/templates/fr/choose-serial.tmpl
281	share/cups/templates/fr/choose-uri.tmpl
282	share/cups/templates/fr/class-added.tmpl
283	share/cups/templates/fr/class-confirm.tmpl
284	share/cups/templates/fr/class-deleted.tmpl
285	share/cups/templates/fr/class-modified.tmpl
286	share/cups/templates/fr/classes.tmpl
287	share/cups/templates/fr/config-printer.tmpl
288	share/cups/templates/fr/config-printer2.tmpl
289	share/cups/templates/fr/error.tmpl
290	share/cups/templates/fr/header.tmpl
291	share/cups/templates/fr/job-cancel.tmpl
292	share/cups/templates/fr/job-hold.tmpl
293	share/cups/templates/fr/job-op.tmpl
294	share/cups/templates/fr/job-release.tmpl
295	share/cups/templates/fr/job-restart.tmpl
296	share/cups/templates/fr/jobs.tmpl
297	share/cups/templates/fr/modify-class.tmpl
298	share/cups/templates/fr/modify-printer.tmpl
299	share/cups/templates/fr/option-boolean.tmpl
300	share/cups/templates/fr/option-conflict.tmpl
301	share/cups/templates/fr/option-header.tmpl
302	share/cups/templates/fr/option-pickmany.tmpl
303	share/cups/templates/fr/option-pickone.tmpl
304	share/cups/templates/fr/option-trailer.tmpl
305	share/cups/templates/fr/printer-accept.tmpl
306	share/cups/templates/fr/printer-added.tmpl
307	share/cups/templates/fr/printer-configured.tmpl
308	share/cups/templates/fr/printer-confirm.tmpl
309	share/cups/templates/fr/printer-deleted.tmpl
310	share/cups/templates/fr/printer-modified.tmpl
311	share/cups/templates/fr/printer-purge.tmpl
312	share/cups/templates/fr/printer-reject.tmpl
313	share/cups/templates/fr/printer-start.tmpl
314	share/cups/templates/fr/printer-stop.tmpl
315	share/cups/templates/fr/printers.tmpl
316	share/cups/templates/fr/test-page.tmpl
317	share/cups/templates/fr/trailer.tmpl
318	share/cups/templates/header.tmpl	569	share/cups/templates/header.tmpl
		570	share/cups/templates/help-header.tmpl
		571	share/cups/templates/help-printable.tmpl
319	share/cups/templates/job-cancel.tmpl	572	share/cups/templates/job-cancel.tmpl
320	share/cups/templates/job-hold.tmpl	573	share/cups/templates/job-hold.tmpl
321	share/cups/templates/job-op.tmpl	574	share/cups/templates/job-move.tmpl
		575	share/cups/templates/job-moved.tmpl
322	share/cups/templates/job-release.tmpl	576	share/cups/templates/job-release.tmpl
323	share/cups/templates/job-restart.tmpl	577	share/cups/templates/job-restart.tmpl
324	share/cups/templates/jobs.tmpl	578	share/cups/templates/jobs.tmpl
		579	share/cups/templates/jobs-header.tmpl
		580	share/cups/templates/maintenance.tmpl
325	share/cups/templates/modify-class.tmpl	581	share/cups/templates/modify-class.tmpl
326	share/cups/templates/modify-printer.tmpl	582	share/cups/templates/modify-printer.tmpl
327	share/cups/templates/option-boolean.tmpl	583	share/cups/templates/option-boolean.tmpl
Lines 330-606 Link Here
330	share/cups/templates/option-pickmany.tmpl	586	share/cups/templates/option-pickmany.tmpl
331	share/cups/templates/option-pickone.tmpl	587	share/cups/templates/option-pickone.tmpl
332	share/cups/templates/option-trailer.tmpl	588	share/cups/templates/option-trailer.tmpl
		589	share/cups/templates/pager.tmpl
333	share/cups/templates/printer-accept.tmpl	590	share/cups/templates/printer-accept.tmpl
334	share/cups/templates/printer-added.tmpl	591	share/cups/templates/printer-added.tmpl
335	share/cups/templates/printer-configured.tmpl	592	share/cups/templates/printer-configured.tmpl
336	share/cups/templates/printer-confirm.tmpl	593	share/cups/templates/printer-confirm.tmpl
		594	share/cups/templates/printer-default.tmpl
337	share/cups/templates/printer-deleted.tmpl	595	share/cups/templates/printer-deleted.tmpl
		596	share/cups/templates/printer-jobs-header.tmpl
338	share/cups/templates/printer-modified.tmpl	597	share/cups/templates/printer-modified.tmpl
339	share/cups/templates/printer-purge.tmpl	598	share/cups/templates/printer-purge.tmpl
340	share/cups/templates/printer-reject.tmpl	599	share/cups/templates/printer-reject.tmpl
341	share/cups/templates/printer-start.tmpl	600	share/cups/templates/printer-start.tmpl
342	share/cups/templates/printer-stop.tmpl	601	share/cups/templates/printer-stop.tmpl
343	share/cups/templates/printers.tmpl	602	share/cups/templates/printers.tmpl
		603	share/cups/templates/printers-header.tmpl
		604	share/cups/templates/restart.tmpl
		605	share/cups/templates/search.tmpl
		606	share/cups/templates/samba-export.tmpl
		607	share/cups/templates/samba-exported.tmpl
		608	share/cups/templates/set-printer-options-header.tmpl
		609	share/cups/templates/set-printer-options-trailer.tmpl
344	share/cups/templates/test-page.tmpl	610	share/cups/templates/test-page.tmpl
345	share/cups/templates/trailer.tmpl	611	share/cups/templates/trailer.tmpl
346	share/doc/cups/cmp.html	612	share/cups/templates/users.tmpl
347	share/doc/cups/cmp.pdf	613	share/cups/templates/ja/add-class.tmpl
348	share/doc/cups/cups.css	614	share/cups/templates/ja/add-printer.tmpl
349	share/doc/cups/cupsdoc.css	615	share/cups/templates/ja/admin.tmpl
350	share/doc/cups/be/index.html	616	share/cups/templates/ja/choose-device.tmpl
351	share/doc/cups/be/documentation.html	617	share/cups/templates/ja/choose-make.tmpl
352	share/doc/cups/be/images/accept-jobs.gif	618	share/cups/templates/ja/choose-model.tmpl
353	share/doc/cups/be/images/add-class.gif	619	share/cups/templates/ja/choose-serial.tmpl
354	share/doc/cups/be/images/add-printer.gif	620	share/cups/templates/ja/choose-uri.tmpl
355	share/doc/cups/be/images/cancel-job.gif	621	share/cups/templates/ja/class-added.tmpl
356	share/doc/cups/be/images/config-printer.gif	622	share/cups/templates/ja/class-confirm.tmpl
357	share/doc/cups/be/images/continue.gif	623	share/cups/templates/ja/class-deleted.tmpl
358	share/doc/cups/be/images/delete-class.gif	624	share/cups/templates/ja/class-jobs-header.tmpl
359	share/doc/cups/be/images/delete-printer.gif	625	share/cups/templates/ja/class-modified.tmpl
360	share/doc/cups/be/images/hold-job.gif	626	share/cups/templates/ja/classes.tmpl
361	share/doc/cups/be/images/manage-classes.gif	627	share/cups/templates/ja/classes-header.tmpl
362	share/doc/cups/be/images/manage-jobs.gif	628	share/cups/templates/ja/edit-config.tmpl
363	share/doc/cups/be/images/manage-printers.gif	629	share/cups/templates/ja/error.tmpl
364	share/doc/cups/be/images/modify-class.gif	630	share/cups/templates/ja/error-op.tmpl
365	share/doc/cups/be/images/modify-printer.gif	631	share/cups/templates/ja/header.tmpl
366	share/doc/cups/be/images/navbar.gif	632	share/cups/templates/ja/help-header.tmpl
367	share/doc/cups/be/images/print-test-page.gif	633	share/cups/templates/ja/job-cancel.tmpl
368	share/doc/cups/be/images/reject-jobs.gif	634	share/cups/templates/ja/job-hold.tmpl
369	share/doc/cups/be/images/release-job.gif	635	share/cups/templates/ja/job-move.tmpl
370	share/doc/cups/be/images/restart-job.gif	636	share/cups/templates/ja/job-moved.tmpl
371	share/doc/cups/be/images/show-active.gif	637	share/cups/templates/ja/job-release.tmpl
372	share/doc/cups/be/images/show-completed.gif	638	share/cups/templates/ja/job-restart.tmpl
373	share/doc/cups/be/images/start-class.gif	639	share/cups/templates/ja/jobs.tmpl
374	share/doc/cups/be/images/start-printer.gif	640	share/cups/templates/ja/jobs-header.tmpl
375	share/doc/cups/be/images/stop-class.gif	641	share/cups/templates/ja/maintenance.tmpl
376	share/doc/cups/be/images/stop-printer.gif	642	share/cups/templates/ja/modify-class.tmpl
377	share/doc/cups/es/index.html	643	share/cups/templates/ja/modify-printer.tmpl
378	share/doc/cups/es/documentation.html	644	share/cups/templates/ja/option-conflict.tmpl
379	share/doc/cups/es/images/accept-jobs.gif	645	share/cups/templates/ja/option-trailer.tmpl
380	share/doc/cups/es/images/add-class.gif	646	share/cups/templates/ja/pager.tmpl
381	share/doc/cups/es/images/add-printer.gif	647	share/cups/templates/ja/printer-accept.tmpl
382	share/doc/cups/es/images/cancel-job.gif	648	share/cups/templates/ja/printer-added.tmpl
383	share/doc/cups/es/images/config-printer.gif	649	share/cups/templates/ja/printer-configured.tmpl
384	share/doc/cups/es/images/continue.gif	650	share/cups/templates/ja/printer-confirm.tmpl
385	share/doc/cups/es/images/delete-class.gif	651	share/cups/templates/ja/printer-default.tmpl
386	share/doc/cups/es/images/delete-printer.gif	652	share/cups/templates/ja/printer-deleted.tmpl
387	share/doc/cups/es/images/hold-job.gif	653	share/cups/templates/ja/printer-jobs-header.tmpl
388	share/doc/cups/es/images/manage-classes.gif	654	share/cups/templates/ja/printer-modified.tmpl
389	share/doc/cups/es/images/manage-jobs.gif	655	share/cups/templates/ja/printer-purge.tmpl
390	share/doc/cups/es/images/manage-printers.gif	656	share/cups/templates/ja/printer-reject.tmpl
391	share/doc/cups/es/images/modify-class.gif	657	share/cups/templates/ja/printer-start.tmpl
392	share/doc/cups/es/images/modify-printer.gif	658	share/cups/templates/ja/printer-stop.tmpl
393	share/doc/cups/es/images/navbar.gif	659	share/cups/templates/ja/printers.tmpl
394	share/doc/cups/es/images/print-test-page.gif	660	share/cups/templates/ja/printers-header.tmpl
395	share/doc/cups/es/images/reject-jobs.gif	661	share/cups/templates/ja/restart.tmpl
396	share/doc/cups/es/images/release-job.gif	662	share/cups/templates/ja/samba-export.tmpl
397	share/doc/cups/es/images/restart-job.gif	663	share/cups/templates/ja/samba-exported.tmpl
398	share/doc/cups/es/images/set-as-default.gif	664	share/cups/templates/ja/search.tmpl
399	share/doc/cups/es/images/show-active.gif	665	share/cups/templates/ja/test-page.tmpl
400	share/doc/cups/es/images/show-completed.gif	666	share/cups/templates/ja/users.tmpl
401	share/doc/cups/es/images/start-class.gif	667	share/cups/templates/pl/add-class.tmpl
402	share/doc/cups/es/images/start-printer.gif	668	share/cups/templates/pl/add-printer.tmpl
403	share/doc/cups/es/images/stop-class.gif	669	share/cups/templates/pl/admin.tmpl
404	share/doc/cups/es/images/stop-printer.gif	670	share/cups/templates/pl/choose-device.tmpl
405	share/doc/cups/de/documentation.html	671	share/cups/templates/pl/choose-make.tmpl
406	share/doc/cups/de/images/accept-jobs.gif	672	share/cups/templates/pl/choose-model.tmpl
407	share/doc/cups/de/images/add-class.gif	673	share/cups/templates/pl/choose-serial.tmpl
408	share/doc/cups/de/images/add-printer.gif	674	share/cups/templates/pl/choose-uri.tmpl
409	share/doc/cups/de/images/cancel-job.gif	675	share/cups/templates/pl/class-added.tmpl
410	share/doc/cups/de/images/config-printer.gif	676	share/cups/templates/pl/class-confirm.tmpl
411	share/doc/cups/de/images/continue.gif	677	share/cups/templates/pl/class-deleted.tmpl
412	share/doc/cups/de/images/delete-class.gif	678	share/cups/templates/pl/class-jobs-header.tmpl
413	share/doc/cups/de/images/delete-printer.gif	679	share/cups/templates/pl/class-modified.tmpl
414	share/doc/cups/de/images/hold-job.gif	680	share/cups/templates/pl/classes.tmpl
415	share/doc/cups/de/images/manage-classes.gif	681	share/cups/templates/pl/classes-header.tmpl
416	share/doc/cups/de/images/manage-jobs.gif	682	share/cups/templates/pl/edit-config.tmpl
417	share/doc/cups/de/images/manage-printers.gif	683	share/cups/templates/pl/error.tmpl
418	share/doc/cups/de/images/modify-class.gif	684	share/cups/templates/pl/error-op.tmpl
419	share/doc/cups/de/images/modify-printer.gif	685	share/cups/templates/pl/header.tmpl
420	share/doc/cups/de/images/navbar.gif	686	share/cups/templates/pl/help-header.tmpl
421	share/doc/cups/de/images/print-test-page.gif	687	share/cups/templates/pl/help-printable.tmpl
422	share/doc/cups/de/images/reject-jobs.gif	688	share/cups/templates/pl/job-cancel.tmpl
423	share/doc/cups/de/images/release-job.gif	689	share/cups/templates/pl/job-hold.tmpl
424	share/doc/cups/de/images/restart-job.gif	690	share/cups/templates/pl/job-move.tmpl
425	share/doc/cups/de/images/show-active.gif	691	share/cups/templates/pl/job-moved.tmpl
426	share/doc/cups/de/images/show-completed.gif	692	share/cups/templates/pl/job-release.tmpl
427	share/doc/cups/de/images/start-class.gif	693	share/cups/templates/pl/job-restart.tmpl
428	share/doc/cups/de/images/start-printer.gif	694	share/cups/templates/pl/jobs.tmpl
429	share/doc/cups/de/images/stop-class.gif	695	share/cups/templates/pl/jobs-header.tmpl
430	share/doc/cups/de/images/stop-printer.gif	696	share/cups/templates/pl/maintenance.tmpl
431	share/doc/cups/de/index.html	697	share/cups/templates/pl/modify-class.tmpl
432	share/doc/cups/documentation.html	698	share/cups/templates/pl/modify-printer.tmpl
433	share/doc/cups/fr/cups.css	699	share/cups/templates/pl/option-boolean.tmpl
434	share/doc/cups/fr/cupsdoc.css	700	share/cups/templates/pl/option-conflict.tmpl
435	share/doc/cups/fr/documentation.html	701	share/cups/templates/pl/option-header.tmpl
436	share/doc/cups/fr/images/accept-jobs.gif	702	share/cups/templates/pl/option-pickmany.tmpl
437	share/doc/cups/fr/images/add-class.gif	703	share/cups/templates/pl/option-pickone.tmpl
438	share/doc/cups/fr/images/add-printer.gif	704	share/cups/templates/pl/option-trailer.tmpl
439	share/doc/cups/fr/images/cancel-job.gif	705	share/cups/templates/pl/pager.tmpl
440	share/doc/cups/fr/images/config-printer.gif	706	share/cups/templates/pl/printer-accept.tmpl
441	share/doc/cups/fr/images/continue.gif	707	share/cups/templates/pl/printer-added.tmpl
442	share/doc/cups/fr/images/delete-class.gif	708	share/cups/templates/pl/printer-configured.tmpl
443	share/doc/cups/fr/images/delete-printer.gif	709	share/cups/templates/pl/printer-confirm.tmpl
444	share/doc/cups/fr/images/hold-job.gif	710	share/cups/templates/pl/printer-default.tmpl
445	share/doc/cups/fr/images/manage-classes.gif	711	share/cups/templates/pl/printer-deleted.tmpl
446	share/doc/cups/fr/images/manage-jobs.gif	712	share/cups/templates/pl/printer-jobs-header.tmpl
447	share/doc/cups/fr/images/manage-printers.gif	713	share/cups/templates/pl/printer-modified.tmpl
448	share/doc/cups/fr/images/modify-class.gif	714	share/cups/templates/pl/printer-purge.tmpl
449	share/doc/cups/fr/images/modify-printer.gif	715	share/cups/templates/pl/printer-reject.tmpl
450	share/doc/cups/fr/images/navbar.gif	716	share/cups/templates/pl/printer-start.tmpl
451	share/doc/cups/fr/images/print-test-page.gif	717	share/cups/templates/pl/printer-stop.tmpl
452	share/doc/cups/fr/images/reject-jobs.gif	718	share/cups/templates/pl/printers.tmpl
453	share/doc/cups/fr/images/release-job.gif	719	share/cups/templates/pl/printers-header.tmpl
454	share/doc/cups/fr/images/restart-job.gif	720	share/cups/templates/pl/restart.tmpl
455	share/doc/cups/fr/images/show-active.gif	721	share/cups/templates/pl/search.tmpl
456	share/doc/cups/fr/images/show-completed.gif	722	share/cups/templates/pl/samba-export.tmpl
457	share/doc/cups/fr/images/start-class.gif	723	share/cups/templates/pl/samba-exported.tmpl
458	share/doc/cups/fr/images/start-printer.gif	724	share/cups/templates/pl/set-printer-options-header.tmpl
459	share/doc/cups/fr/images/stop-class.gif	725	share/cups/templates/pl/set-printer-options-trailer.tmpl
460	share/doc/cups/fr/images/stop-printer.gif	726	share/cups/templates/pl/test-page.tmpl
461	share/doc/cups/fr/index.html	727	share/cups/templates/pl/trailer.tmpl
462	share/doc/cups/fr/overview.html	728	share/cups/templates/pl/users.tmpl
463	share/doc/cups/fr/overview.pdf	729	share/cups/templates/sv/add-class.tmpl
464	share/doc/cups/fr/sam.html	730	share/cups/templates/sv/add-printer.tmpl
465	share/doc/cups/fr/sam.pdf	731	share/cups/templates/sv/admin.tmpl
466	share/doc/cups/fr/sum.html	732	share/cups/templates/sv/choose-device.tmpl
467	share/doc/cups/fr/sum.pdf	733	share/cups/templates/sv/choose-make.tmpl
468	share/doc/cups/idd.html	734	share/cups/templates/sv/choose-model.tmpl
469	share/doc/cups/idd.pdf	735	share/cups/templates/sv/choose-serial.tmpl
470	share/doc/cups/images/accept-jobs.gif	736	share/cups/templates/sv/choose-uri.tmpl
471	share/doc/cups/images/add-class.gif	737	share/cups/templates/sv/class-added.tmpl
472	share/doc/cups/images/add-printer.gif	738	share/cups/templates/sv/class-confirm.tmpl
473	share/doc/cups/images/cancel-job.gif	739	share/cups/templates/sv/class-deleted.tmpl
474	share/doc/cups/images/classes.gif	740	share/cups/templates/sv/class-jobs-header.tmpl
475	share/doc/cups/images/config-printer.gif	741	share/cups/templates/sv/class-modified.tmpl
476	share/doc/cups/images/continue.gif	742	share/cups/templates/sv/classes.tmpl
477	share/doc/cups/images/cups-block-diagram.gif	743	share/cups/templates/sv/classes-header.tmpl
478	share/doc/cups/images/cups-large.gif	744	share/cups/templates/sv/edit-config.tmpl
479	share/doc/cups/images/cups-medium.gif	745	share/cups/templates/sv/error.tmpl
480	share/doc/cups/images/cups-small.gif	746	share/cups/templates/sv/error-op.tmpl
481	share/doc/cups/images/delete-class.gif	747	share/cups/templates/sv/header.tmpl
482	share/doc/cups/images/delete-printer.gif	748	share/cups/templates/sv/help-header.tmpl
483	share/doc/cups/images/hold-job.gif	749	share/cups/templates/sv/help-printable.tmpl
484	share/doc/cups/images/left.gif	750	share/cups/templates/sv/job-cancel.tmpl
485	share/doc/cups/images/logo.gif	751	share/cups/templates/sv/job-hold.tmpl
486	share/doc/cups/images/manage-classes.gif	752	share/cups/templates/sv/job-move.tmpl
487	share/doc/cups/images/manage-jobs.gif	753	share/cups/templates/sv/job-moved.tmpl
488	share/doc/cups/images/manage-printers.gif	754	share/cups/templates/sv/job-release.tmpl
489	share/doc/cups/images/modify-class.gif	755	share/cups/templates/sv/job-restart.tmpl
490	share/doc/cups/images/modify-printer.gif	756	share/cups/templates/sv/jobs.tmpl
491	share/doc/cups/images/navbar.gif	757	share/cups/templates/sv/jobs-header.tmpl
492	share/doc/cups/images/print-test-page.gif	758	share/cups/templates/sv/maintenance.tmpl
493	share/doc/cups/images/printer-idle.gif	759	share/cups/templates/sv/modify-class.tmpl
494	share/doc/cups/images/printer-processing.gif	760	share/cups/templates/sv/modify-printer.tmpl
495	share/doc/cups/images/printer-stopped.gif	761	share/cups/templates/sv/option-boolean.tmpl
496	share/doc/cups/images/reject-jobs.gif	762	share/cups/templates/sv/option-conflict.tmpl
497	share/doc/cups/images/release-job.gif	763	share/cups/templates/sv/option-header.tmpl
498	share/doc/cups/images/restart-job.gif	764	share/cups/templates/sv/option-pickmany.tmpl
499	share/doc/cups/images/right.gif	765	share/cups/templates/sv/option-pickone.tmpl
500	share/doc/cups/images/set-as-default.gif	766	share/cups/templates/sv/option-trailer.tmpl
501	share/doc/cups/images/show-active.gif	767	share/cups/templates/sv/pager.tmpl
502	share/doc/cups/images/show-completed.gif	768	share/cups/templates/sv/printer-accept.tmpl
503	share/doc/cups/images/start-class.gif	769	share/cups/templates/sv/printer-added.tmpl
504	share/doc/cups/images/start-printer.gif	770	share/cups/templates/sv/printer-configured.tmpl
505	share/doc/cups/images/stop-class.gif	771	share/cups/templates/sv/printer-confirm.tmpl
506	share/doc/cups/images/stop-printer.gif	772	share/cups/templates/sv/printer-default.tmpl
507	share/doc/cups/index.html	773	share/cups/templates/sv/printer-deleted.tmpl
508	share/doc/cups/ipp.html	774	share/cups/templates/sv/printer-jobs-header.tmpl
509	share/doc/cups/ipp.pdf	775	share/cups/templates/sv/printer-modified.tmpl
510	share/doc/cups/overview.html	776	share/cups/templates/sv/printer-purge.tmpl
511	share/doc/cups/overview.pdf	777	share/cups/templates/sv/printer-reject.tmpl
512	share/doc/cups/robots.txt	778	share/cups/templates/sv/printer-start.tmpl
513	share/doc/cups/sam.html	779	share/cups/templates/sv/printer-stop.tmpl
514	share/doc/cups/sam.pdf	780	share/cups/templates/sv/printers.tmpl
515	share/doc/cups/sdd.html	781	share/cups/templates/sv/printers-header.tmpl
516	share/doc/cups/sdd.pdf	782	share/cups/templates/sv/restart.tmpl
517	share/doc/cups/spm.html	783	share/cups/templates/sv/search.tmpl
518	share/doc/cups/spm.pdf	784	share/cups/templates/sv/samba-export.tmpl
519	share/doc/cups/sps.html	785	share/cups/templates/sv/samba-exported.tmpl
520	share/doc/cups/sps.pdf	786	share/cups/templates/sv/set-printer-options-header.tmpl
521	share/doc/cups/ssr.html	787	share/cups/templates/sv/set-printer-options-trailer.tmpl
522	share/doc/cups/ssr.pdf	788	share/cups/templates/sv/test-page.tmpl
523	share/doc/cups/stp.html	789	share/cups/templates/sv/trailer.tmpl
524	share/doc/cups/stp.pdf	790	share/cups/templates/sv/users.tmpl
525	share/doc/cups/sum.html	791	etc/cups/cupsd.conf.default
526	share/doc/cups/sum.pdf	792	libexec/cups/backend/ipp
527	share/doc/cups/svd.html	793	libexec/cups/backend/lpd
528	share/doc/cups/svd.pdf	794	libexec/cups/backend/http
529	share/doc/cups/translation.html	795	libexec/cups/backend/parallel
530	share/doc/cups/translation.pdf	796	libexec/cups/backend/scsi
531	share/locale/C/cups_C	797	libexec/cups/backend/serial
532	share/locale/be/cups_be	798	libexec/cups/backend/snmp
533	share/locale/cs/cups_cs	799	libexec/cups/backend/socket
534	share/locale/de/cups_de	800	libexec/cups/backend/usb
535	share/locale/en/cups_en	801	libexec/cups/cgi-bin/admin.cgi
536	share/locale/en_US/cups_en_US	802	libexec/cups/cgi-bin/classes.cgi
537	share/locale/es/cups_es	803	libexec/cups/cgi-bin/help.cgi
538	share/locale/fr/cups_fr	804	libexec/cups/cgi-bin/jobs.cgi
539	share/locale/he/cups_he	805	libexec/cups/cgi-bin/printers.cgi
540	share/locale/it/cups_it	806	libexec/cups/monitor/bcp
541	share/locale/ru_RU/cups_ru_RU	807	libexec/cups/monitor/tbcp
542	share/locale/sv/cups_sv	808	libexec/cups/filter/gziptoany
543	share/locale/uk/cups_uk	809	libexec/cups/filter/hpgltops
544	share/locale/uk_UA/cups_uk_UA	810	libexec/cups/filter/texttops
545	share/locale/zh_CN/cups_zh_CN	811	libexec/cups/filter/pstops
546	@dirrmtry man/fr/man8	812	libexec/cups/filter/imagetops
547	@dirrmtry man/fr/man5	813	libexec/cups/filter/imagetoraster
548	@dirrmtry man/fr/man1	814	libexec/cups/filter/rastertodymo
549	@dirrmtry man/fr	815	libexec/cups/filter/rastertolabel
550	@dirrmtry man/es/man8	816	libexec/cups/filter/rastertoepson
551	@dirrmtry man/es/man5	817	libexec/cups/filter/rastertohp
552	@dirrmtry man/es/man1	818	libexec/cups/filter/pdftops
553	@dirrmtry man/es	819	libexec/cups/notifier/mailto
554	@dirrmtry share/locale/zh_CN	820	libexec/cups/notifier/testnotify
555	@dirrmtry share/locale/uk_UA	821	libexec/cups/daemon/cups-deviced
556	@dirrmtry share/locale/uk	822	libexec/cups/daemon/cups-driverd
		823	libexec/cups/daemon/cups-lpd
		824	libexec/cups/daemon/cups-polld
		825	sbin/cupsd
		826	sbin/lpc
		827	sbin/accept
		828	sbin/cupsaddsmb
		829	sbin/lpadmin
		830	sbin/lpinfo
		831	sbin/lpmove
		832	@dirrmtry share/nls
557	@dirrmtry share/locale/sv	833	@dirrmtry share/locale/sv
558	@dirrmtry share/locale/ru_RU	834	@dirrmtry share/locale/ja
559	@dirrmtry share/locale/it
560	@dirrmtry share/locale/he
561	@dirrmtry share/locale/fr
562	@dirrmtry share/locale/es	835	@dirrmtry share/locale/es
563	@dirrmtry share/locale/en	836	@dirrm share/doc/cups/sv/images
564	@dirrmtry share/locale/en_US	837	@dirrm share/doc/cups/sv
565	@dirrmtry share/locale/de	838	@dirrm share/doc/cups/pl/images
566	@dirrmtry share/locale/cs	839	@dirrm share/doc/cups/pl
567	@dirrmtry share/locale/be	840	@dirrm share/doc/cups/ja/images
568	@dirrmtry share/locale/C	841	@dirrm share/doc/cups/ja
569	@dirrmtry share/locale
570	@dirrm share/doc/cups/images	842	@dirrm share/doc/cups/images
571	@dirrm share/doc/cups/be/images	843	@dirrm share/doc/cups/help
572	@dirrm share/doc/cups/be
573	@dirrm share/doc/cups/es/images	844	@dirrm share/doc/cups/es/images
574	@dirrm share/doc/cups/es	845	@dirrm share/doc/cups/es
575	@dirrm share/doc/cups/fr/images
576	@dirrm share/doc/cups/fr
577	@dirrm share/doc/cups/de/images
578	@dirrm share/doc/cups/de
579	@dirrm share/doc/cups	846	@dirrm share/doc/cups
580	@dirrm share/cups/templates/be	847	@dirrmtry share/doc
		848	@dirrm share/cups/templates/sv
		849	@dirrm share/cups/templates/pl
		850	@dirrm share/cups/templates/ja
581	@dirrm share/cups/templates/es	851	@dirrm share/cups/templates/es
582	@dirrm share/cups/templates/fr
583	@dirrm share/cups/templates/de
584	@dirrm share/cups/templates	852	@dirrm share/cups/templates
585	@dirrm share/cups/model	853	@dirrm share/cups/model
586	@dirrm share/cups/fonts	854	@dirrm share/cups/fonts
587	@dirrm share/cups/data	855	@dirrm share/cups/data
588	@dirrm share/cups/charsets	856	@dirrm share/cups/charsets
		857	@dirrm share/cups/charmaps
589	@dirrm share/cups/banners	858	@dirrm share/cups/banners
590	@dirrm share/cups	859	@dirrmtry share/cups
		860	@dirrmtry sbin
		861	@dirrmtry man/man8
		862	@dirrmtry man/man7
		863	@dirrmtry man/man5
		864	@dirrmtry man/man1
		865	@dirrm libexec/cups/notifier
		866	@dirrm libexec/cups/monitor
591	@dirrm libexec/cups/filter	867	@dirrm libexec/cups/filter
592	@dirrm libexec/cups/daemon	868	@dirrm libexec/cups/daemon
593	@dirrm libexec/cups/cgi-bin	869	@dirrm libexec/cups/cgi-bin
594	@dirrm libexec/cups/backend	870	@dirrm libexec/cups/backend
595	@dirrm libexec/cups	871	@dirrmtry lib
596	@dirrm include/cups	872	@dirrm include/cups
597	@dirrm etc/cups/ppd	873	@dirrmtry etc/rc.d
598	@dirrm etc/cups/interfaces
599	@dirrm etc/cups/certs
600	@exec mkdir -p /var/spool/cups/tmp \|\| true
601	@exec chown -R root:daemon /var/spool/cups
602	@exec mkdir %D/etc/cups/certs \|\| true
603	@exec mkdir %D/etc/cups/ppd \|\| true
604	@exec mkdir %D/etc/cups/interfaces \|\| true
605	@unexec rm -rf /var/spool/cups
606	@dirrmtry etc/cups	874	@dirrmtry etc/cups
		875	@dirrmtry bin

Return to bug 97782

Lines 1-14 Link Here

(-)cups-base/files/patch-CAN-2005-0064 (-14 lines)
1	*** pdftops/XRef.cxx.orig Wed Jan 12 17:10:53 2005
2	--- pdftops/XRef.cxx Wed Jan 12 17:11:22 2005
3	***************
4	* 793,798 **
5	--- 793,801 ----
6	} else {
7	keyLength = 5;
8	}
9	+ if (keyLength > 16) {
10	+ keyLength = 16;
11	+ }
12	permFlags = permissions.getInt();
13	if (encVersion >= 1 && encVersion <= 2 &&
14	encRevision >= 2 && encRevision <= 3) {

Lines 1-12 Link Here

(-)cups-base/files/patch-CAN-2005-2097 (-12 lines)
1	--- pdftops/FontFile.cxx.orig Tue Feb 3 09:41:09 2004
2	+++ pdftops/FontFile.cxx Tue Sep 6 16:16:04 2005
3	@@ -3572,6 +3573,9 @@
4	} else {
5	origLocaTable[i].pos = 2 * getUShort(pos + 2*i);
6	}
7	+
8	+ if (origLocaTable[i].pos < 0 \|\| origLocaTable[i].pos > len)
9	+ error(1, 0, "bad loca table pos value");
10	}
11	qsort(origLocaTable, nGlyphs + 1, sizeof(TrueTypeLoca), &cmpTrueTypeLocaPos);
12	for (i = 0; i < nGlyphs; ++i) {

Lines 1-31 Link Here

(-)cups-base/files/patch-Makefile (-28 / +56 lines)
1	--- Makefile.orig Mon Jan 3 11:29:44 2005	1	--- Makefile.orig Thu May 18 13:38:50 2006
2	+++ Makefile Fri Jan 27 00:04:20 2006	2	+++ Makefile Thu May 18 13:40:07 2006
3	@@ -28,8 +28,8 @@	3	@@ -99,56 +99,11 @@
4	# Directories to make...	4	echo Installing cups-config script...
5	#	5	$(INSTALL_DIR) -m 755 $(BINDIR)
6		6	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
7	-DIRS = cups backend berkeley cgi-bin filter man pdftops \	7	- echo Installing startup script...
8	- scheduler systemv	8	- if test "x$(INITDIR)" != x; then \
9	+DIRS = cups backend cgi-bin filter man pdftops \	9	- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
10	+ scheduler	10	- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
11		11	- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
12	#	12	- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
13	# Make all targets...	13	- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
14	@@ -72,8 +72,6 @@	14	- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
15	echo Installing in $$dir... ;\	15	- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
16	(cd $$dir; $(MAKE) $(MFLAGS) install) \|\| exit 1;\	16	- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
17	done	17	- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
18	- echo Installing in conf...	18	- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
19	- (cd conf; $(MAKE) $(MFLAGS) install)	19	- fi
20	echo Installing in data...	20	- if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
21	(cd data; $(MAKE) $(MFLAGS) install)	21	- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
22	echo Installing in doc...	22	- if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
23	@@ -109,8 +107,6 @@	23	- $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
24	$(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \	24	- $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
25	$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \	25	- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
26	$(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \	26	- $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
		27	- elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
		28	- $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
27	- else \	29	- else \
28	- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \	30	- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
29	fi \	31	- fi \
		32	- fi
		33	if test "x$(DBUSDIR)" != x; then \
		34	echo Installing cups.conf in $(DBUSDIR)...;\
		35	$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
		36	$(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \
30	fi	37	fi
		38	- if test "x$(XINETD)" != x; then \
		39	- echo Installing xinetd configuration file for cups-lpd...; \
		40	- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
		41	- $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
		42	- fi
		43	- if test -d /usr/share/applications; then \
		44	- echo Installing desktop icons...; \
		45	- $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \
		46	- $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)/usr/share/applications; \
		47	- $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps; \
		48	- $(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png; \
		49	- $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps; \
		50	- $(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png; \
		51	- $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps; \
		52	- $(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png; \
		53	- $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps; \
		54	- $(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png; \
		55	- fi
		56	-
31		57
		58	#
		59	# Install source and header files...

Lines 1-253 Link Here

(-)cups-base/files/patch-SA18303 (-253 lines)
1	Index: pdftops/Stream.h
2	===================================================================
3	--- pdftops/Stream.h
4	+++ pdftops/Stream.h
5	@@ -233,6 +233,8 @@ public:
6
7	~StreamPredictor();
8
9	+ GBool isOk() { return ok; }
10	+
11	int lookChar();
12	int getChar();
13
14	@@ -250,6 +252,7 @@ private:
15	int rowBytes; // bytes per line
16	Guchar *predLine; // line buffer
17	int predIdx; // current index in predLine
18	+ GBool ok;
19	};
20
21	//------------------------------------------------------------------------
22	Index: pdftops/Stream.cxx
23	===================================================================
24	--- pdftops/Stream.cxx
25	+++ pdftops/Stream.cxx
26	@@ -15,6 +15,7 @@
27	#include <stdio.h>
28	#include <stdlib.h>
29	#include <stddef.h>
30	+#include <limits.h>
31	#ifndef WIN32
32	#include <unistd.h>
33	#endif
34	@@ -412,13 +413,28 @@ StreamPredictor::StreamPredictor(Stream
35	width = widthA;
36	nComps = nCompsA;
37	nBits = nBitsA;
38	+ predLine = NULL;
39	+ ok = gFalse;
40
41	+ if (width <= 0 \|\| nComps <= 0 \|\| nBits <= 0 \|\|
42	+ nComps >= INT_MAX/nBits \|\|
43	+ width >= INT_MAX/nComps/nBits) {
44	+ return;
45	+ }
46	nVals = width * nComps;
47	+ if (nVals * nBits + 7 <= 0) {
48	+ return;
49	+ }
50	pixBytes = (nComps * nBits + 7) >> 3;
51	rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
52	+ if (rowBytes < 0) {
53	+ return;
54	+ }
55	predLine = (Guchar *)gmalloc(rowBytes);
56	memset(predLine, 0, rowBytes);
57	predIdx = rowBytes;
58	+
59	+ ok = gTrue;
60	}
61
62	StreamPredictor::~StreamPredictor() {
63	@@ -1012,6 +1028,10 @@ LZWStream::LZWStream(Stream *strA, int p
64	FilterStream(strA) {
65	if (predictor != 1) {
66	pred = new StreamPredictor(this, predictor, columns, colors, bits);
67	+ if (!pred->isOk()) {
68	+ delete pred;
69	+ pred = NULL;
70	+ }
71	} else {
72	pred = NULL;
73	}
74	@@ -1260,6 +1280,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
75	endOfLine = endOfLineA;
76	byteAlign = byteAlignA;
77	columns = columnsA;
78	+ if (columns < 1 \|\| columns >= INT_MAX / sizeof(short)) {
79	+ error(-1, "invalid number of columns: %d", columns);
80	+ exit(1);
81	+ }
82	rows = rowsA;
83	endOfBlock = endOfBlockA;
84	black = blackA;
85	@@ -2897,6 +2921,11 @@ GBool DCTStream::readBaselineSOF() {
86	height = read16();
87	width = read16();
88	numComps = str->getChar();
89	+ if (numComps <= 0 \|\| numComps > 4) {
90	+ numComps = 0;
91	+ error(getPos(), "Bad number of components in DCT stream");
92	+ return gFalse;
93	+ }
94	if (prec != 8) {
95	error(getPos(), "Bad DCT precision %d", prec);
96	return gFalse;
97	@@ -2923,6 +2952,11 @@ GBool DCTStream::readProgressiveSOF() {
98	height = read16();
99	width = read16();
100	numComps = str->getChar();
101	+ if (numComps <= 0 \|\| numComps > 4) {
102	+ numComps = 0;
103	+ error(getPos(), "Bad number of components in DCT stream");
104	+ return gFalse;
105	+ }
106	if (prec != 8) {
107	error(getPos(), "Bad DCT precision %d", prec);
108	return gFalse;
109	@@ -2945,6 +2979,11 @@ GBool DCTStream::readScanInfo() {
110
111	length = read16() - 2;
112	scanInfo.numComps = str->getChar();
113	+ if (scanInfo.numComps <= 0 \|\| scanInfo.numComps > 4) {
114	+ scanInfo.numComps = 0;
115	+ error(getPos(), "Bad number of components in DCT stream");
116	+ return gFalse;
117	+ }
118	--length;
119	if (length != 2 * scanInfo.numComps + 3) {
120	error(getPos(), "Bad DCT scan info block");
121	@@ -3019,12 +3058,12 @@ GBool DCTStream::readHuffmanTables() {
122	while (length > 0) {
123	index = str->getChar();
124	--length;
125	- if ((index & 0x0f) >= 4) {
126	+ if ((index & ~0x10) >= 4 \|\| (index & ~0x10) < 0) {
127	error(getPos(), "Bad DCT Huffman table");
128	return gFalse;
129	}
130	if (index & 0x10) {
131	- index &= 0x0f;
132	+ index &= 0x03;
133	if (index >= numACHuffTables)
134	numACHuffTables = index+1;
135	tbl = &acHuffTables[index];
136	@@ -3142,9 +3181,11 @@ int DCTStream::readMarker() {
137	do {
138	do {
139	c = str->getChar();
140	+ if(c == EOF) return EOF;
141	} while (c != 0xff);
142	do {
143	c = str->getChar();
144	+ if(c == EOF) return EOF;
145	} while (c == 0xff);
146	} while (c == 0x00);
147	return c;
148	@@ -3255,6 +3296,10 @@ FlateStream::FlateStream(Stream *strA, i
149	FilterStream(strA) {
150	if (predictor != 1) {
151	pred = new StreamPredictor(this, predictor, columns, colors, bits);
152	+ if (!pred->isOk()) {
153	+ delete pred;
154	+ pred = NULL;
155	+ }
156	} else {
157	pred = NULL;
158	}
159	Index: pdftops/JBIG2Stream.cxx
160	===================================================================
161	--- pdftops/JBIG2Stream.cxx
162	+++ pdftops/JBIG2Stream.cxx
163	@@ -7,6 +7,7 @@
164	//========================================================================
165
166	#include <config.h>
167	+#include <limits.h>
168
169	#ifdef USE_GCC_PRAGMAS
170	#pragma implementation
171	@@ -681,7 +682,16 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA,
172	w = wA;
173	h = hA;
174	line = (wA + 7) >> 3;
175	- data = (Guchar )gmalloc(h line);
176	+
177	+ if (h < 0 \|\| line <= 0 \|\| h >= (INT_MAX - 1) / line) {
178	+ error(-1, "invalid width/height");
179	+ data = NULL;
180	+ return;
181	+ }
182	+
183	+ // need to allocate one extra guard byte for use in combine()
184	+ data = (Guchar )gmalloc(h line + 1);
185	+ data[h * line] = 0;
186	}
187
188	JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap):
189	@@ -690,8 +700,17 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA,
190	w = bitmap->w;
191	h = bitmap->h;
192	line = bitmap->line;
193	- data = (Guchar )gmalloc(h line);
194	+
195	+ if (h < 0 \|\| line <= 0 \|\| h >= (INT_MAX - 1) / line) {
196	+ error(-1, "invalid width/height");
197	+ data = NULL;
198	+ return;
199	+ }
200	+
201	+ // need to allocate one extra guard byte for use in combine()
202	+ data = (Guchar )gmalloc(h line + 1);
203	memcpy(data, bitmap->data, h * line);
204	+ data[h * line] = 0;
205	}
206
207	JBIG2Bitmap::~JBIG2Bitmap() {
208	@@ -716,10 +735,14 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint
209	}
210
211	void JBIG2Bitmap::expand(int newH, Guint pixel) {
212	- if (newH <= h) {
213	+ if (newH <= h \|\| line <= 0 \|\| newH >= (INT_MAX - 1) / line) {
214	+ error(-1, "invalid width/height");
215	+ gfree(data);
216	+ data = NULL;
217	return;
218	}
219	- data = (Guchar )grealloc(data, newH line);
220	+ // need to allocate one extra guard byte for use in combine()
221	+ data = (Guchar )grealloc(data, newH line + 1);
222	if (pixel) {
223	memset(data + h * line, 0xff, (newH - h) * line);
224	} else {
225	@@ -2256,6 +2279,15 @@ void JBIG2Stream::readHalftoneRegionSeg(
226	error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
227	return;
228	}
229	+ if (gridH == 0 \|\| gridW >= INT_MAX / gridH) {
230	+ error(getPos(), "Bad size in JBIG2 halftone segment");
231	+ return;
232	+ }
233	+ if (w == 0 \|\| h >= INT_MAX / w) {
234	+ error(getPos(), "Bad size in JBIG2 bitmap segment");
235	+ return;
236	+ }
237	+
238	patternDict = (JBIG2PatternDict *)seg;
239	bpp = 0;
240	i = 1;
241	@@ -2887,6 +2919,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef
242	JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
243	int x, y, pix;
244
245	+ if (w < 0 \|\| h <= 0 \|\| w >= INT_MAX / h) {
246	+ error(-1, "invalid width/height");
247	+ return NULL;
248	+ }
249	+
250	bitmap = new JBIG2Bitmap(0, w, h);
251	bitmap->clearToZero();
252
253	# vim: syntax=diff

Lines 1-64 Link Here

(-)cups-base/files/patch-man-Makefile.common (-64 lines)
1	--- man/Makefile.common.orig Thu May 27 22:51:30 2004
2	+++ man/Makefile.common Mon Jan 24 13:28:43 2005
3	@@ -28,58 +28,16 @@
4
5	MAN1 = backend.man \
6	cups-config.man \
7	- cupstestppd.man \
8	- filter.man \
9	- lp.man \
10	- lpoptions.man \
11	- lppasswd.man \
12	- lpq.man \
13	- lprm.man \
14	- lpr.man \
15	- lpstat.man
16	+ filter.man
17	MAN5 = classes.conf.man \
18	cupsd.conf.man \
19	mime.convs.man \
20	mime.types.man \
21	printers.conf.man
22	-MAN8 = accept.man \
23	- cupsaddsmb.man \
24	+MAN8 = \
25	cups-lpd.man \
26	cups-polld.man \
27	- cupsd.man \
28	- enable.man \
29	- lpadmin.man \
30	- lpinfo.man \
31	- lpmove.man \
32	- lpc.man
33	-
34	-CAT1 = backend.$(CAT1EXT) \
35	- cups-config.$(CAT1EXT) \
36	- cupstestppd.$(CAT1EXT) \
37	- filter.$(CAT1EXT) \
38	- lp.$(CAT1EXT) \
39	- lpoptions.$(CAT1EXT) \
40	- lppasswd.$(CAT1EXT) \
41	- lpq.$(CAT1EXT) \
42	- lprm.$(CAT1EXT) \
43	- lpr.$(CAT1EXT) \
44	- lpstat.$(CAT1EXT)
45	-CAT5 = classes.conf.$(CAT5EXT) \
46	- cupsd.conf.$(CAT5EXT) \
47	- mime.convs.$(CAT5EXT) \
48	- mime.types.$(CAT5EXT) \
49	- printers.conf.$(CAT5EXT)
50	-CAT8 = accept.$(CAT8EXT) \
51	- cupsaddsmb.$(CAT8EXT) \
52	- cups-lpd.$(CAT8EXT) \
53	- cups-polld.$(CAT8EXT) \
54	- cupsd.$(CAT8EXT) \
55	- enable.$(CAT8EXT) \
56	- lpadmin.$(CAT8EXT) \
57	- lpinfo.$(CAT8EXT) \
58	- lpmove.$(CAT8EXT) \
59	- lpc.$(CAT8EXT)
60	-
61	+ cupsd.man
62
63	#
64	# End of "$Id: Makefile.common,v 1.5 2004/05/27 18:51:30 mike Exp $".

Line 0 Link Here

(-)cups-base/pkg-install (+50 lines)
	1	#!/bin/sh
	2	PATH=/bin:/usr/sbin
	3
	4	REPLACES_BINARIES="/usr/bin/lpr
	5	/usr/bin/lp
	6	/usr/bin/lpq
	7	/usr/bin/lprm
	8	/usr/bin/lpstat
	9	/usr/sbin/lpc"
	10
	11	case $2 in
	12	POST-INSTALL)
	13	# Unshade binaries
	14	if [ -n "${3}" ]; then
	15	for FILE in ${REPLACES_BINARIES}; do
	16	[ -e "${FILE}" ] && chmod 0 "${FILE}"
	17	done
	18	fi
	19
	20	# Create user
	21	USER=cups
	22	GROUP=${USER}
	23	UID=193
	24	GID=${UID}
	25
	26	if pw group show "${GROUP}" 2>/dev/null; then
	27	echo "You already have a group \"${GROUP}\", so I will use it."
	28	else
	29	if pw groupadd ${GROUP} -g ${GID}; then
	30	echo "Added group \"${GROUP}\"."
	31	else
	32	echo "Adding group \"${GROUP}\" failed..."
	33	exit 1
	34	fi
	35	fi
	36
	37	if pw user show "${USER}" 2>/dev/null; then
	38	echo "You already have a user \"${USER}\", so I will use it."
	39	else
	40	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
	41	-d /nonexistent -s /sbin/nologin -c "CUPS Owner"
	42	then
	43	echo "Added user \"${USER}\"."
	44	else
	45	echo "Adding user \"${USER}\" failed..."
	46	exit 1
	47	fi
	48	fi
	49	;;
	50	esac

Lines 1-26 Link Here

(-)cups-base/pkg-message (-34 / +1 lines)
1	======================================================================	1	======================================================================
2
3	CUPS is now installed.
4
5	Please read the documentation in PREFIX/share/doc/cups/ for information
6	on how to set up your printer to use CUPS. Basic template configuration files
7	have been installed in PREFIX/etc/cups/
8
9	To install the BSD and System V compatibility binaries look to the port
10	print/cups-lpr. These are no longer installed as part of the base cups port
11	because they have conflicting names with the native print binaries, and with
12	other ports such as lprNG.
13
14	NOTE: IF YOU USE A NON-POSTSCRIPT PRINTER:
15
16	You will need to install the cups-pstoraster port in order to print to
17	your printer. If you installed via the "cups" port, it will be installed
18	automatically. Otherwise, you will need to install the port or the package
19	yourself.
20
21	======================================================================
22
23	**********************************************************************
24	PLEASE NOTE:	2	PLEASE NOTE:
25	============	3	============
26		4
Lines 28-42 Link Here
28	1) Uncomment application/octet-stream line in mime.types	6	1) Uncomment application/octet-stream line in mime.types
29	2) Uncomment application/octet-stream line in mime.convs	7	2) Uncomment application/octet-stream line in mime.convs
30	3) Restart cupsd	8	3) Restart cupsd
31		9	======================================================================
32	**********************************************************************
33
34	The cups-base port now uses a new style rc.d startup
35	script. Please remove any old cups.sh* scripts you
36	might have in /usr/local/etc/rc.d, or your local
37	PREFIX. You should also put the following line in
38	/etc/rc.conf.local, or /etc/rc.conf to start cupsd
39	automatically at boot time:
40
41	cupsd_enable="yes"
42	**********************************************************************