Several libcups files did not have the Apple license exception notice (STR #4361)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11627 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 21abc9d47d361c4b9fe29bb354008d56cdcbbde5..3635e8b126d1b4a3df08fc55cb7d6a2131cb0fde 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -5,6 +5,8 @@ CHANGES IN CUPS V1.7.2
 
        - Security: The scheduler now blocks URLs containing embedded HTML
          (STR #4356)
+       - Several libcups files did not have the Apple license exception
+         notice (STR #4361)
        - Fixed a D-BUS threading issue that caused the scheduler to crash
          (STR #4347)
        - The scheduler now automatically reconnects to Avahi as needed

diff --git a/cups/file-private.h b/cups/file-private.h
index 60a25014889d751fab56e0ab219e12f636f0babf..219480fdbd8b1ea8b292f3fececec780f7fb1e84 100644 (file)
--- a/cups/file-private.h
+++ b/cups/file-private.h
@@ -1,21 +1,23 @@
 /*
  * "$Id$"
  *
- *   Private file definitions for CUPS.
+ * Private file definitions for CUPS.
  *
- *   Since stdio files max out at 256 files on many systems, we have to
- *   write similar functions without this limit.  At the same time, using
- *   our own file functions allows us to provide transparent support of
- *   gzip'd print files, PPD files, etc.
+ * Since stdio files max out at 256 files on many systems, we have to
+ * write similar functions without this limit.  At the same time, using
+ * our own file functions allows us to provide transparent support of
+ * gzip'd print files, PPD files, etc.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   These coded instructions, statements, and computer programs are the
- *   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/".
+ * These coded instructions, statements, and computer programs are the
+ * 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/".
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_FILE_PRIVATE_H_

diff --git a/cups/file.c b/cups/file.c
index 3376419524c9b289e94a86bb3299f7e61d62d47f..a96ef564bb0791f154a9b3556a3a55d14b08c847 100644 (file)
--- a/cups/file.c
+++ b/cups/file.c
@@ -16,6 +16,8 @@
  * 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/".
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*

diff --git a/cups/file.h b/cups/file.h
index a3defede1409e2e6cf2164cff72715d5a6deb974..6e73fea1b29ca1ee10dc1caf2384fa2e074d5cf7 100644 (file)
--- a/cups/file.h
+++ b/cups/file.h
@@ -1,21 +1,23 @@
 /*
  * "$Id$"
  *
- *   Public file definitions for CUPS.
+ * Public file definitions for CUPS.
  *
- *   Since stdio files max out at 256 files on many systems, we have to
- *   write similar functions without this limit.  At the same time, using
- *   our own file functions allows us to provide transparent support of
- *   gzip'd print files, PPD files, etc.
+ * Since stdio files max out at 256 files on many systems, we have to
+ * write similar functions without this limit.  At the same time, using
+ * our own file functions allows us to provide transparent support of
+ * gzip'd print files, PPD files, etc.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   These coded instructions, statements, and computer programs are the
- *   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/".
+ * These coded instructions, statements, and computer programs are the
+ * 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/".
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_FILE_H_

diff --git a/cups/http-addr.c b/cups/http-addr.c
index 0a49ee3e807a42f5c0e00358f0ae17a07636d46b..243440ec2b67c3a3aa51baef0682b4b3faf856be 100644 (file)
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -11,6 +11,8 @@
  * 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/".
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*

diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index bfa519a22ec42e0312dfff075a38074a2b309bb8..0b3f083a9924fb7300dab2965aa89d9a3d828f87 100644 (file)
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -11,6 +11,8 @@
  * 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/".
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*

diff --git a/cups/thread-private.h b/cups/thread-private.h
index 5bc441cde67db07add7fdbb9a112aa0c0b86e3c1..67dbe54184d027eb623c707610786468c352be0a 100644 (file)
--- a/cups/thread-private.h
+++ b/cups/thread-private.h
@@ -10,6 +10,8 @@
  * 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/".
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_THREAD_PRIVATE_H_

diff --git a/cups/thread.c b/cups/thread.c
index da1882e9de063ebc5bc0bc1db7eab240830d3664..c9c5cfb49357d2eb6305868baa1727aa9be24d79 100644 (file)
--- a/cups/thread.c
+++ b/cups/thread.c
@@ -1,26 +1,17 @@
 /*
  * "$Id$"
  *
- *   Threading primitives for CUPS.
+ * Threading primitives for CUPS.
  *
- *   Copyright 2009-2012 by Apple Inc.
+ * Copyright 2009-2014 by Apple Inc.
  *
- *   These coded instructions, statements, and computer programs are the
- *   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/".
+ * These coded instructions, statements, and computer programs are the
+ * 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/".
  *
- * Contents:
- *
- *   _cupsMutexInit()    - Initialize a mutex.
- *   _cupsMutexLock()    - Lock a mutex.
- *   _cupsMutexUnlock()  - Unlock a mutex.
- *   _cupsRWInit()       - Initialize a reader/writer lock.
- *   _cupsRWLockRead()   - Acquire a reader/writer lock for reading.
- *   _cupsRWLockWrite()  - Acquire a reader/writer lock for writing.
- *   _cupsRWUnlock()     - Release a reader/writer lock.
- *   _cupsThreadCreate() - Create a thread.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*