From 6539a0afd57df07c1dd476775d92a28c5fce892d Mon Sep 17 00:00:00 2001 From: msweet Date: Thu, 20 Feb 2014 16:15:09 +0000 Subject: [PATCH] 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 --- CHANGES-1.7.txt | 2 ++ cups/file-private.h | 26 ++++++++++++++------------ cups/file.c | 2 ++ cups/file.h | 26 ++++++++++++++------------ cups/http-addr.c | 2 ++ cups/http-addrlist.c | 2 ++ cups/thread-private.h | 2 ++ cups/thread.c | 25 ++++++++----------------- 8 files changed, 46 insertions(+), 41 deletions(-) diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt index 21abc9d47..3635e8b12 100644 --- 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 60a250148..219480fdb 100644 --- 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 337641952..a96ef564b 100644 --- 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 a3defede1..6e73fea1b 100644 --- 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 0a49ee3e8..243440ec2 100644 --- 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 bfa519a22..0b3f083a9 100644 --- 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 5bc441cde..67dbe5418 100644 --- 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 da1882e9d..c9c5cfb49 100644 --- 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. */ /* -- 2.39.2