Imported Upstream version 1.5.0

5 files changed, 75 insertions, 70 deletions

diff --git a/conf/Makefile b/conf/Makefile
index 9cdb3cb12..3376f1982 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 8825 2009-09-22 21:53:31Z mike $"
+# "$Id: Makefile 9771 2011-05-12 05:21:56Z mike $"
 #
-#   Configuration file makefile for the Common UNIX Printing System (CUPS).
+#   Configuration file makefile for CUPS.
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -139,5 +139,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 8825 2009-09-22 21:53:31Z mike $".
+# End of "$Id: Makefile 9771 2011-05-12 05:21:56Z mike $".
 #
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index eb4065d46..7ee57fda3 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cupsd.conf.in 9310 2010-09-21 22:34:57Z mike $"
+# "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $"
 #
 # Sample configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
 # complete description of this file.
@@ -26,6 +26,9 @@ BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
 # Default authentication type, when authentication is required...
 DefaultAuthType Basic
 
+# Web interface setting...
+WebInterface @CUPS_WEBIF@
+
 # Restrict access to the server...
 <Location />
   Order allow,deny
@@ -45,12 +48,18 @@ DefaultAuthType Basic
 
 # Set the default printer/job policies...
 <Policy default>
+  # Job/subscription privacy...
+  JobPrivateAccess default
+  JobPrivateValues default
+  SubscriptionPrivateAccess default
+  SubscriptionPrivateValues default
+
   # Job-related operations must be done by the owner or an administrator...
   <Limit Create-Job Print-Job Print-URI Validate-Job>
     Order deny,allow
   </Limit>
 
-  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job CUPS-Get-Document>
+  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
     Require user @OWNER @SYSTEM
     Order deny,allow
   </Limit>
@@ -63,7 +72,7 @@ DefaultAuthType Basic
   </Limit>
 
   # All printer operations require a printer operator to authenticate...
-  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Accept-Jobs CUPS-Reject-Jobs>
+  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
     AuthType Default
     Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
     Order deny,allow
@@ -82,13 +91,19 @@ DefaultAuthType Basic
 
 # Set the authenticated printer/job policies...
 <Policy authenticated>
+  # Job/subscription privacy...
+  JobPrivateAccess default
+  JobPrivateValues default
+  SubscriptionPrivateAccess default
+  SubscriptionPrivateValues default
+
   # Job-related operations must be done by the owner or an administrator...
   <Limit Create-Job Print-Job Print-URI Validate-Job>
     AuthType Default
     Order deny,allow
   </Limit>
 
-  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job CUPS-Get-Document>
+  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
     AuthType Default
     Require user @OWNER @SYSTEM
     Order deny,allow
@@ -102,7 +117,7 @@ DefaultAuthType Basic
   </Limit>
 
   # All printer operations require a printer operator to authenticate...
-  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Accept-Jobs CUPS-Reject-Jobs>
+  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
     AuthType Default
     Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
     Order deny,allow
@@ -121,5 +136,5 @@ DefaultAuthType Basic
 </Policy>
 
 #
-# End of "$Id: cupsd.conf.in 9310 2010-09-21 22:34:57Z mike $".
+# End of "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $".
 #
diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 36c65a861..7a2333d92 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -1,13 +1,13 @@
 #
-# "$Id: mime.convs.in 8912 2009-12-08 02:13:42Z mike $"
+# "$Id: mime.convs.in 9750 2011-05-06 22:53:53Z mike $"
 #
 #   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 #   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
 #   reflects your local configuration changes.
 #
-#   MIME converts file for the Common UNIX Printing System (CUPS).
+#   Base MIME conversions file for CUPS.
 #
-#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -38,56 +38,53 @@
 # PostScript filters
 #
 
-application/pdf			application/vnd.cups-postscript	66	pdftops
+@DEFAULT_PDFTOPS@application/pdf			application/vnd.cups-postscript	66	pdftops
 application/postscript		application/vnd.cups-postscript	66	pstops
-application/vnd.hp-HPGL		application/postscript		66	hpgltops
-application/x-cshell		application/postscript		33	texttops
-application/x-csource		application/postscript		33	texttops
-application/x-perl		application/postscript		33	texttops
-application/x-shell		application/postscript		33	texttops
-text/plain			application/postscript		33	texttops
-text/css			application/postscript		33	texttops
-text/html			application/postscript		33	texttops
-image/gif			application/vnd.cups-postscript	66	imagetops
-image/png			application/vnd.cups-postscript	66	imagetops
-image/jpeg			application/vnd.cups-postscript	66	imagetops
-image/tiff			application/vnd.cups-postscript	66	imagetops
-image/x-bitmap			application/vnd.cups-postscript	66	imagetops
-image/x-photocd			application/vnd.cups-postscript	66	imagetops
-image/x-portable-anymap		application/vnd.cups-postscript	66	imagetops
-image/x-portable-bitmap		application/vnd.cups-postscript	66	imagetops
-image/x-portable-graymap	application/vnd.cups-postscript	66	imagetops
-image/x-portable-pixmap		application/vnd.cups-postscript	66	imagetops
-image/x-sgi-rgb			application/vnd.cups-postscript	66	imagetops
-image/x-xbitmap			application/vnd.cups-postscript	66	imagetops
-image/x-xpixmap			application/vnd.cups-postscript	66	imagetops
-#image/x-xwindowdump		application/vnd.cups-postscript	66	imagetops
-image/x-sun-raster		application/vnd.cups-postscript	66	imagetops
-application/vnd.cups-banner	application/postscript		33	bannertops
+@DEFAULT_TEXTTOPS@application/x-cshell		application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@application/x-csource		application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@application/x-perl		application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@application/x-shell		application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@text/plain			application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@text/css			application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@text/html			application/postscript		33	texttops
+@DEFAULT_IMAGEFILTERS@image/gif			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/png			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/jpeg			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/tiff			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-bitmap			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-photocd			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-portable-anymap		application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-portable-bitmap		application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-portable-graymap	application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-portable-pixmap		application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-sgi-rgb			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-xbitmap			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-xpixmap			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-sun-raster		application/vnd.cups-postscript	66	imagetops
+@DEFAULT_BANNERTOPS@application/vnd.cups-banner	application/postscript		33	bannertops
 
 ########################################################################
 #
 # Raster filters...
 #
 
-image/gif			application/vnd.cups-raster	100	imagetoraster
-image/png			application/vnd.cups-raster	100	imagetoraster
-image/jpeg			application/vnd.cups-raster	100	imagetoraster
-image/tiff			application/vnd.cups-raster	100	imagetoraster
-image/x-bitmap			application/vnd.cups-raster	100	imagetoraster
-image/x-photocd			application/vnd.cups-raster	100	imagetoraster
-image/x-portable-anymap		application/vnd.cups-raster	100	imagetoraster
-image/x-portable-bitmap		application/vnd.cups-raster	100	imagetoraster
-image/x-portable-graymap	application/vnd.cups-raster	100	imagetoraster
-image/x-portable-pixmap		application/vnd.cups-raster	100	imagetoraster
-image/x-sgi-rgb			application/vnd.cups-raster	100	imagetoraster
-image/x-xbitmap			application/vnd.cups-raster	100	imagetoraster
-image/x-xpixmap			application/vnd.cups-raster	100	imagetoraster
-#image/x-xwindowdump		application/vnd.cups-raster	100	imagetoraster
-image/x-sun-raster		application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/gif			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/png			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/jpeg			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/tiff			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-bitmap			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-photocd			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-portable-anymap		application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-portable-bitmap		application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-portable-graymap	application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-portable-pixmap		application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-sgi-rgb			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-xbitmap			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-xpixmap			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-sun-raster		application/vnd.cups-raster	100	imagetoraster
 
-# pstoraster is part of GPL Ghostscript...
-application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
+# PWG Raster filter for IPP Everywhere...
+application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 
 ########################################################################
 #
@@ -100,5 +97,5 @@ application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
 @DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
 
 #
-# End of "$Id: mime.convs.in 8912 2009-12-08 02:13:42Z mike $".
+# End of "$Id: mime.convs.in 9750 2011-05-06 22:53:53Z mike $".
 #
diff --git a/conf/mime.types b/conf/mime.types
index d4403001d..9ef8752b6 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -1,13 +1,13 @@
 #
-# "$Id: mime.types 8783 2009-08-28 17:51:05Z mike $"
+# "$Id: mime.types 9667 2011-04-01 04:48:21Z mike $"
 #
-#   MIME types file for the Common UNIX Printing System (CUPS).
+#   Base MIME types file for CUPS.
 #
 #   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 #   VERSIONS OF CUPS.  Instead, create a "local.types" file that
 #   reflects your local configuration changes.
 #
-#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -79,14 +79,6 @@ application/postscript		ai eps ps string(0,%!) string(0,<04>%!) \
 				 contains(0,4096,"LANGUAGE = POSTSCRIPT") \
 				 (contains(0,4096,<0a>%!) + \
 				  !contains(0,4096,"ENTER LANGUAGE")))
-application/vnd.hp-HPGL		hpgl \
-				string(0,<1B>E<1B>%0B) \
-				string(0,<1B>%-1B) string(0,<201B>)\
-				string(0,BP;) string(0,IN;) string(0,DF;) \
-				string(0,BPINPS;) \
-				(contains(0,128,<1B>%-12345X) + \
-				 (contains(0,4096,"LANGUAGE=HPGL") \
-				  contains(0,4096,"LANGUAGE = HPGL")))
 
 ########################################################################
 #
@@ -100,6 +92,7 @@ image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) +\
 				 char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
 				 char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
 				 char(3,0xec) char(3,0xed) char(3,0xee) char(3,0xef))
+image/pwg-raster		string(0,"RaS2") + string(356,<0000000000000000>) priority(100)
 image/tiff			tiff tif string(0,MM<002A>) string(0,II<2A00>)
 image/x-photocd			pcd string(2048,PCD_IPI)
 image/x-portable-anymap		pnm
@@ -177,5 +170,5 @@ application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 application/octet-stream
 
 #
-# End of "$Id: mime.types 8783 2009-08-28 17:51:05Z mike $".
+# End of "$Id: mime.types 9667 2011-04-01 04:48:21Z mike $".
 #
diff --git a/conf/snmp.conf.in b/conf/snmp.conf.in
index 43855ab66..1e8dfbcbb 100644
--- a/conf/snmp.conf.in
+++ b/conf/snmp.conf.in
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: snmp.conf.in 9045 2010-03-24 07:48:42Z mike $"
 #
 #   Sample SNMP configuration file for CUPS.  See "man cups-snmp.conf" for a
 #   complete description of this file.
@@ -9,5 +9,5 @@
 @CUPS_SNMP_COMMUNITY@
 
 #
-# End of "$Id$".
+# End of "$Id: snmp.conf.in 9045 2010-03-24 07:48:42Z mike $".
 #