Load cups into easysw/current.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@342 a1ca3aef-8c08-0410-bb20-df032aa958be

5 files changed, 41 insertions, 55 deletions

diff --git a/conf/Makefile b/conf/Makefile
index 968e66004..4cac3841f 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,25 +1,16 @@
 #
-# "$Id: Makefile 5412 2006-04-17 14:30:53Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs
@@ -28,7 +19,7 @@ include ../Makedefs
 # Config files...
 #
 
-KEEP	=	cupsd.conf
+KEEP	=	cupsd.conf snmp.conf
 REPLACE	=	mime.convs mime.types
 
 
@@ -102,5 +93,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 5412 2006-04-17 14:30:53Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
 #
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ee0b28fb4..96138db38 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cupsd.conf.in 6268 2007-02-12 02:46:11Z mike $"
+# "$Id: cupsd.conf.in 6634 2007-07-09 20:15:40Z mike $"
 #
 #   Sample configuration file for the Common UNIX Printing System (CUPS)
 #   scheduler.  See "man cupsd.conf" for a complete description of this
@@ -41,7 +41,7 @@ DefaultAuthType Basic
 
 # Restrict access to configuration files...
 <Location /admin/conf>
-  AuthType Basic
+  AuthType Default
   Require user @SYSTEM
   Order allow,deny
   Allow localhost
@@ -57,7 +57,7 @@ DefaultAuthType Basic
 
   # All administration operations require an adminstrator to authenticate...
   <Limit Pause-Printer Resume-Printer Set-Printer-Attributes 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-Add-Printer CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
-    AuthType Basic
+    AuthType Default
     Require user @SYSTEM
     Order deny,allow
   </Limit>
@@ -74,5 +74,5 @@ DefaultAuthType Basic
 </Policy>
 
 #
-# End of "$Id: cupsd.conf.in 6268 2007-02-12 02:46:11Z mike $".
+# End of "$Id: cupsd.conf.in 6634 2007-07-09 20:15:40Z mike $".
 #
diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index ec3291871..108e507b2 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.convs.in 6566 2007-06-18 23:56:23Z mike $"
+# "$Id: mime.convs.in 6649 2007-07-11 21:46:42Z mike $"
 #
 #   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 #   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
@@ -7,23 +7,14 @@
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 ########################################################################
@@ -118,5 +109,5 @@ image/x-sun-raster	application/vnd.cups-raster	100	imagetoraster
 @DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
 
 #
-# End of "$Id: mime.convs.in 6566 2007-06-18 23:56:23Z mike $".
+# End of "$Id: mime.convs.in 6649 2007-07-11 21:46:42Z mike $".
 #
diff --git a/conf/mime.types b/conf/mime.types
index ed53e7947..bda116265 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.types 6545 2007-06-04 14:24:01Z mike $"
+# "$Id: mime.types 6649 2007-07-11 21:46:42Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
@@ -7,23 +7,14 @@
 #   VERSIONS OF CUPS.  Instead, create a "local.types" file that
 #   reflects your local configuration changes.
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 ########################################################################
@@ -84,7 +75,7 @@ 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>&)\
+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;) \
@@ -105,7 +96,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/tiff			tiff tif string(0,MM) string(0,II)
+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
 image/x-portable-bitmap		pbm string(0,P1) string(0,P4)
@@ -180,5 +171,5 @@ application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 application/octet-stream
 
 #
-# End of "$Id: mime.types 6545 2007-06-04 14:24:01Z mike $".
+# End of "$Id: mime.types 6649 2007-07-11 21:46:42Z mike $".
 #
diff --git a/conf/snmp.conf.in b/conf/snmp.conf.in
new file mode 100644
index 000000000..a85dbc7c8
--- /dev/null
+++ b/conf/snmp.conf.in
@@ -0,0 +1,13 @@
+#
+# "$Id$"
+#
+#   Sample SNMP configuration file for CUPS.  See "man smnp.conf" for a
+#   complete description of this file.
+#
+
+@CUPS_SNMP_ADDRESS@
+@CUPS_SNMP_COMMUNITY@
+
+#
+# End of "$Id$".
+#