Load cups into easysw/current.

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

CHANGES-1.2.txt

@@ -3,6 +3,25 @@ CHANGES-1.2.txt
 
 CHANGES IN CUPS V1.2.12
 
+ - The PHP cups_print_file() function crashed if the options
+ array contained non-string option values (STR #2430)
+ - The image/tiff file matching rule incorrectly identified
+ some text files as TIFF files (STR #2431)
+ - The filter(7) man page incorrectly documented the
+ "PAGE: total #-pages" message (STR #2427)
+ - PCL text files were mis-identified as HP-GL/2 and
+ caused the HP-GL/2 filter to hang (STR #2423)
+ - When printing to a queue with user ACLs, the scheduler
+ incorrectly returned a quota error instead of a "not
+ allowed to print" error (STR #2409)
+ - cupsaddsmb could get in a loop if no printer drivers
+ were installed (STR #2407)
+ - cupsRasterReadHeader() did not byte-swap the header
+ properly when compiled with certain versions of GCC.
+ - The IPP backend did not send the document-format
+ attribute for filtered jobs (STR #2411)
+ - Some PPD files could cause a crash in ppdOpen2 (STR
+ #2408)
  - The web admin interface incorrectly handled the "share
  printers" and "show remote printers" settings (STR
  #2393)

CHANGES.txt

@@ -1,10 +1,48 @@
-CHANGES.txt - 2007-06-21
+CHANGES.txt - 2007-07-16
 ------------------------
 
-CHANGES IN CUPS V1.3
+CHANGES IN CUPS V1.3??
 
- - Documentation updates (STR #1775, STR #2130, STR #2131,
- STR #2263, STR #2356, STR #2397)
+ - The USB backend could deadlock on Mac OS X while performing
+ a side-channel command.
+ - The scheduler did not prevent remote queues from being
+ shared/published.
+ - The scheduler did not remove the temporary request file on
+ authentication errors.
+ - ppdLocalizeIPPReason() did not handle "scheme:" schemes or
+ "file" URLs.
+ - ppdLocalizeIPPReason() was not exported on Mac OS X.
+
+
+CHANGES IN CUPS V1.3b1
+
+ - Copyright updates - CUPS is now owned by Apple Inc.
+ - Documentation updates (STR #1775, STR #2027, STR #2130,
+ STR #2131, STR #2263, STR #2356, STR #2397)
+ - Added new cupsfilter utility (STR #1734)
+ - Added new job-printer-state-message and
+ job-printer-state-reasons attributes to jobs (STR #2418)
+ - Added LDAP+SSL support (STR #1967)
+ - CUPS now supports authentication via peer credentials
+ over domain sockets (STR #2242, STR #2277)
+ - The CUPS sample driver PPDs are now generated by the PPD
+ compiler and include all of the localized languages by
+ default (STR #2164)
+ - You can now specify "AuthType Default" in the cupsd.conf
+ file to use the default authentication defined by the
+ DefaultAuthType directive.
+ - The SNMP backend no longer adds a default Address line
+ when none is specified in the snmp.conf file; this allows
+ the backend to be easily disabled as needed (STR #2434)
+ - Added a new cupsctl command for doing basic changes to
+ the cupsd.conf file (STR #1777)
+ - Added a new ppdLocalizeIPPReason() function to get the
+ localized text/URI for a given IPP reason keyword for a
+ driver.
+ - Removed the deskjet2.ppd driver, as it only worked with
+ a very small subset of HP DeskJet printers and was
+ confusing to users. The rastertohp driver still
+ supports the deskjet2.ppd options for existing queues.
  - The scheduler did not add a trailing banner page if a
  client did not specify the last document in a job (STR
  #1711)

CREDITS.txt

@@ -42,4 +42,4 @@ like to thank the following individuals for their contributions:
  Yugami - LDAP browsing support.
 
 If I've missed someone, please let me know by sending an email to
-"mike@easysw.com".
+"msweet@apple.com".

INSTALL.txt

@@ -1,5 +1,5 @@
-INSTALL - CUPS v1.2rc1 - 2006-03-24
------------------------------------
+INSTALL - CUPS v1.3b1 - 2007-07-12
+----------------------------------
 
 This file describes how to compile and install CUPS from source
 code. For more information on CUPS see the file called

LICENSE.txt

@@ -1,12 +1,10 @@
  Common UNIX Printing System License Agreement
 
- Copyright 1997-2007 by Easy Software Products
-  44141 AIRPORT VIEW DR STE 204
- HOLLYWOOD, MARYLAND 20636 USA
+  Copyright 2007 by Apple Inc.
+  1 Infinite Loop
+ Cupertino, CA 95014 USA
 
- Voice: +1.301.373.9600
- Email: [email protected]
- WWW: http:https://www.cups.org
+ WWW: http:https://www.cups.org/
 
 
 INTRODUCTION
@@ -49,8 +47,8 @@ application, driver, or filter.
 
 LICENSE EXCEPTIONS
 
-In addition, as the copyright holder of CUPS, Easy Software
-Products grants the following special exceptions:
+In addition, as the copyright holder of CUPS, Apple Inc. grants
+the following special exceptions:
 
  1. Apple Operating System Development License Exception;
 
@@ -93,9 +91,9 @@ Products grants the following special exceptions:
 
  2. OpenSSL Toolkit License Exception;
 
- a. Easy Software Products explicitly allows the
- compilation and distribution of the CUPS software
- with the OpenSSL Toolkit.
+ a. Apple Inc. explicitly allows the compilation and
+ distribution of the CUPS software with the OpenSSL
+ Toolkit.
 
 No developer is required to provide these exceptions in a
 derived work.
@@ -105,8 +103,8 @@ KERBEROS SUPPORT CODE
 
 The Kerberos support code ("KSC") is copyright 2006 by Jelmer
 Vernooij and is provided 'as-is', without any express or implied
-warranty. In no event will the author or Easy Software Products
-be held liable for any damages arising from the use of the KSC.
+warranty. In no event will the author or Apple Inc. be held
+liable for any damages arising from the use of the KSC.
 
 Sources files containing KSC have the following text at the top
 of each source file:
@@ -139,39 +137,12 @@ redistribute it freely, subject to the following restrictions:
 
 TRADEMARKS
 
-Easy Software Products has trademarked the Common UNIX Printing
-System, CUPS, and CUPS logo. You may use these names and logos
-in any direct port or binary distribution of CUPS. Please
-contact Easy Software Products for written permission to use
-them in derivative products. Our intention is to protect the
-value of these trademarks and ensure that any derivative product
-meets the same high-quality standards as the original.
-
-
-BINARY DISTRIBUTION RIGHTS
-
-Easy Software Products also sells rights to the CUPS source code
-under a binary distribution license for vendors that are unable
-to release source code for their additions and modifications to
-CUPS under the GNU GPL and LGPL. For information please contact
-us at the address shown above.
-
-The Common UNIX Printing System provides a "pdftops" filter that
-is based on the Xpdf software. For binary distribution licensing
-of this software, please contact:
-
- Derek B. Noonburg
- Email: [email protected]
- WWW: http:https://www.glyphandcog.com/
-
-
-SUPPORT
-
-Easy Software Products sells software support for CUPS as well
-as a commercial printing product based on CUPS called ESP Print
-Pro. You can find out more at our web site:
-
- http:https://www.easysw.com/
+Apple Inc. has trademarked the Common UNIX Printing System, CUPS,
+and CUPS logo. You may use these names and logos in any direct port
+or binary distribution of CUPS. Please contact Apple Inc. for written
+permission to use them in derivative products. Our intention is to
+protect the value of these trademarks and ensure that any derivative
+product meets the same high-quality standards as the original.
 
  GNU GENERAL PUBLIC LICENSE
  Version 2, June 1991

Makedefs.in

@@ -1,25 +1,16 @@
 #
-# "$Id: Makedefs.in 6564 2007-06-18 23:40:38Z mike $"
+# "$Id: Makedefs.in 6649 2007-07-11 21:46:42Z mike $"
 #
 # Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
+# Copyright 2007 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # 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: [email protected]
-# WWW: http:https://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:https://www.cups.org/".
 #
 
 #
@@ -280,5 +271,5 @@ DBUSDIR = @DBUSDIR@
 
 
 #
-# End of "$Id: Makedefs.in 6564 2007-06-18 23:40:38Z mike $"
+# End of "$Id: Makedefs.in 6649 2007-07-11 21:46:42Z mike $"
 #

Makefile

@@ -1,25 +1,16 @@
 #
-# "$Id: Makefile 6563 2007-06-18 22:18:46Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
 #
 # Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
+# Copyright 2007 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # 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-3142 USA
-#
-# Voice: (301) 373-9600
-# EMail: [email protected]
-# WWW: http:https://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:https://www.cups.org/".
 #
 
 include Makedefs
@@ -291,5 +282,5 @@ dist: all
 
 
 #
-# End of "$Id: Makefile 6563 2007-06-18 22:18:46Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
 #

README.txt

@@ -1,5 +1,13 @@
-README - CUPS v1.3svn - 2007-01-03
-----------------------------------
+README - CUPS v1.3b1 - 2007-07-13
+---------------------------------
+
+******************************************************************
+******************************************************************
+**** ****
+**** BETA SOFTWARE - USE AT YOUR OWN RISK ****
+**** ****
+******************************************************************
+******************************************************************
 
 Looking for compile instructions? Read the file "INSTALL.txt"
 instead...
@@ -8,10 +16,10 @@ instead...
 INTRODUCTION
 
  CUPS provides a portable printing layer for UNIX(r)-based
- operating systems. It has been developed by Easy Software
- Products to promote a standard printing solution for all UNIX
- vendors and users. CUPS provides the System V and Berkeley
- command-line interfaces.
+ operating systems. It was developed by Easy Software Products
+ and is now owned and maintained by Apple Inc. to promote a
+ standard printing solution for all UNIX vendors and users. CUPS
+ provides the System V and Berkeley command-line interfaces.
 
  CUPS uses the Internet Printing Protocol ("IPP") as the basis
  for managing print jobs and queues. The Line Printer Daemon
@@ -29,15 +37,8 @@ INTRODUCTION
  EPSON, HP, OKIDATA, and Zebra printers are included that use
  these filters.
 
- Drivers for thousands of printers are provided with our ESP
- Print Pro software, available at:
-
- http:https://www.easysw.com/printpro/
-
  CUPS is licensed under the GNU General Public License and GNU
- Library General Public License. Please contact Easy Software
- Products for commercial support and "binary distribution"
- rights.
+ Library General Public License versions 2.
 
 
 READING THE DOCUMENTATION
@@ -60,19 +61,13 @@ GETTING SUPPORT AND OTHER RESOURCES
 
  http:https://www.cups.org/newsgroups.php
 
- Commercial support (with a guaranteed response time) is
- available from Easy Software Products. For more information
- see:
-
- http:https://www.easysw.com/cups/
-
  See the CUPS web site at "http:https://www.cups.org/" for other
  site links.
 
 
 SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER
 
- CUPS 1.2 includes a web-based administration tool that allows
+ CUPS 1.3 includes a web-based administration tool that allows
  you to manage printers, classes, and jobs on your server. 
  Open the following URL in your browser to access the printer
  administration tools:
@@ -101,14 +96,14 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
  Driver PPD File
  ----------------------------- ------------
  Dymo Label Printers dymo.ppd
+ Intellitech Intellibar intelbar.ppd
  EPSON Stylus Color Series stcolor.ppd
  EPSON Stylus Photo Series stphoto.ppd
  EPSON Stylus New Color Series stcolor2.ppd
  EPSON Stylus New Photo Series stphoto2.ppd
  EPSON 9-pin Series epson9.ppd
  EPSON 24-pin Series epson24.ppd
  HP DeskJet Series deskjet.ppd
- HP New DeskJet Series deskjet2.ppd
  HP LaserJet Series laserjet.ppd
  OKIDATA 9-Pin Series okidata9.ppd
  OKIDATA 24-Pin Series okidat24.ppd
@@ -133,10 +128,7 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
 
  The sample drivers provide basic printing capabilities, but
  generally do not exercise the full potential of the printers
- or CUPS. For fully-functional commercial printer drivers
- check out our ESP Print Pro software at:
-
- http:https://www.easysw.com/printpro/
+ or CUPS.
 
 
 PRINTING FILES
@@ -170,9 +162,9 @@ PRINTING FILES
 
 LEGAL STUFF
 
- CUPS is Copyright 1993-2007 by Easy Software Products. CUPS,
- the CUPS logo, and the Common UNIX Printing System are the
- trademark property of Easy Software Products.
+ CUPS is Copyright 2007 by Apple Inc. CUPS, the CUPS logo, and
+ the Common UNIX Printing System are the trademark property of
+ Apple Inc.
 
  The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
 
@@ -189,18 +181,3 @@ LEGAL STUFF
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  "doc/help/license.html" or "LICENSE.txt" files for more
  information.
-
- For commercial licensing information, please contact:
-
- Attn: CUPS Licensing Information
- Easy Software Products
- 44141 Airport View Drive, Suite 204
- Hollywood, Maryland 20636 USA
-
- Voice: +1.301.373.9600
- Email: [email protected]
- WWW: http:https://www.cups.org/
-
- Note that commercial licensors may also require a license from
- Derek B. Noonburg who developed the Xpdf software used to print
- PDF files.