Fix handling of printer resource files (Issue #5652)

[thirdparty/cups.git] / xcode / config.h

diff --git a/xcode/config.h b/xcode/config.h
index e370974513243de94c603f407b86f19820f1c79f..38998eee645d423f8ee0259070947531849d0e13 100644 (file)
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -1,14 +1,10 @@
 /*
  * Configuration file for CUPS and Xcode.
  *
- * Copyright 2007-2016 by Apple Inc.
+ * Copyright 2007-2019 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products.
  *
- * 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/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 #ifndef _CUPS_CONFIG_H_
@@ -22,8 +18,8 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.2svn"
-#define CUPS_MINIMAL "CUPS/2.2svn"
+#define CUPS_SVERSION "CUPS v2.3.1"
+#define CUPS_MINIMAL "CUPS/2.3.1"
 
 
 /*
@@ -50,7 +46,7 @@
  */
 
 #define CUPS_DEFAULT_LOG_LEVEL "warn"
-#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "actions"
+#define CUPS_DEFAULT_ACCESS_LOG_LEVEL "none"
 
 
 /*
@@ -246,18 +242,11 @@
 #define HAVE_VSYSLOG 1
 
 
-/*
- * Do we have the ASL functions?
- */
-
-#define HAVE_ASL_H
-
-
 /*
  * Do we have the systemd journal functions?
  */
 
-/*#undef HAVE_SYSTEMD_SD_JOURNAL_H*/
+/* #undef HAVE_SYSTEMD_SD_JOURNAL_H */
 
 
 /*
@@ -312,6 +301,7 @@
 
 #define HAVE_CDSASSL 1
 /* #undef HAVE_GNUTLS */
+/* #undef HAVE_SSPISSL */
 #define HAVE_SSL 1
 
 
@@ -333,52 +323,22 @@
  * What Security framework headers do we have?
  */
 
-#if !TARGET_OS_IOS
+#if TARGET_OS_OSX
 #  define HAVE_AUTHORIZATION_H 1
-#endif /* !TARGET_OS_IOS */
+#endif /* TARGET_OS_OSX */
 
-/* #undef HAVE_SECBASEPRIV_H */
 #define HAVE_SECCERTIFICATE_H 1
-/* #undef HAVE_SECIDENTITYSEARCHPRIV_H */
 #define HAVE_SECITEM_H 1
-/* #undef HAVE_SECITEMPRIV_H */
 #define HAVE_SECPOLICY_H 1
-/* #undef HAVE_SECPOLICYPRIV_H */
-/* #undef HAVE_SECURETRANSPORTPRIV_H */
-
-
-/*
- * Do we have the cssmErrorString function?
- */
-
-#if !TARGET_OS_IOS
-#  define HAVE_CSSMERRORSTRING 1
-#endif /* !TARGET_OS_IOS */
 
 
 /*
  * Do we have the SecGenerateSelfSignedCertificate function?
  */
 
-#if TARGET_OS_IOS
+#if !TARGET_OS_OSX
 #  define HAVE_SECGENERATESELFSIGNEDCERTIFICATE 1
-#endif /* TARGET_OS_IOS */
-
-
-/*
- * Do we have the SecKeychainOpen function?
- */
-
-#if !TARGET_OS_IOS
-#  define HAVE_SECKEYCHAINOPEN 1
-#endif /* !TARGET_OS_IOS */
-
-
-/*
- * Do we have (a working) SSLSetEnabledCiphers function?
- */
-
-#define HAVE_SSLSETENABLEDCIPHERS 1
+#endif /* !TARGET_OS_OSX */
 
 
 /*
@@ -493,64 +453,72 @@
 #define HAVE_PTHREAD_H 1
 
 
+/*
+ * Do we have on-demand support (launchd/systemd/upstart)?
+ */
+
+#define HAVE_ONDEMAND 1
+
+
 /*
  * Do we have launchd support?
  */
 
 #define HAVE_LAUNCH_H 1
 #define HAVE_LAUNCHD 1
-#define HAVE_LAUNCH_ACTIVATE_SOCKET 1
 
 
 /*
- * Various scripting languages...
+ * Do we have systemd support?
  */
 
-#if !TARGET_OS_IOS
-#  define HAVE_JAVA 1
-#  define CUPS_JAVA "/usr/bin/java"
-#  define HAVE_PERL 1
-#  define CUPS_PERL "/usr/bin/perl"
-#  define HAVE_PHP 1
-#  define CUPS_PHP "/usr/bin/php"
-#  define HAVE_PYTHON 1
-#  define CUPS_PYTHON "/usr/bin/python"
-#endif /* !TARGET_OS_IOS */
+/* #undef HAVE_SYSTEMD */
 
 
 /*
- * Do we have CoreFoundation public and private headers?
+ * Do we have upstart support?
+ */
+
+/* #undef HAVE_UPSTART */
+
+
+/*
+ * Do we have CoreFoundation public headers?
  */
 
 #define HAVE_COREFOUNDATION_H 1
-/* #undef HAVE_CFPRIV_H */
-/* #undef HAVE_CFBUNDLEPRIV_H */
 
 
 /*
  * Do we have ApplicationServices public headers?
  */
 
-#if !TARGET_OS_IOS
+#if TARGET_OS_OSX
 #  define HAVE_APPLICATIONSERVICES_H 1
-#endif /* !TARGET_OS_IOS */
+#endif /* TARGET_OS_OSX */
 
 
 /*
  * Do we have the SCDynamicStoreCopyComputerName function?
  */
 
-#if !TARGET_OS_IOS
+#if TARGET_OS_OSX
 #  define HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME 1
-#endif /* !TARGET_OS_IOS */
+#endif /* TARGET_OS_OSX */
 
 
 /*
- * Do we have OS X 10.4's mbr_XXX functions?
+ * Do we have the getgrouplist() function?
+ */
+
+#define HAVE_GETGROUPLIST 1
+
+
+/*
+ * Do we have macOS 10.4's mbr_XXX functions?
  */
 
 #define HAVE_MEMBERSHIP_H 1
-/* #undef HAVE_MEMBERSHIPPRIV_H */
 #define HAVE_MBR_UID_TO_UUID 1
 
 
@@ -568,21 +536,22 @@
 
 /* #undef HAVE_DBUS */
 /* #undef HAVE_DBUS_MESSAGE_ITER_INIT_APPEND */
+/* #undef HAVE_DBUS_THREADS_INIT */
 
 
 /*
  * Do we have the GSSAPI support library (for Kerberos support)?
  */
 
-#if !TARGET_OS_IOS
-#  define HAVE_GSS_ACQUIRE_CRED_EX_F 1
+#if TARGET_OS_OSX
+#  define HAVE_GSS_ACQUIRED_CRED_EX_F 1
 #  define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1
 #  define HAVE_GSS_GSSAPI_H 1
 /* #undef HAVE_GSS_GSSAPI_SPI_H */
 #  define HAVE_GSSAPI 1
 /* #undef HAVE_GSSAPI_GSSAPI_H */
 /* #undef HAVE_GSSAPI_H */
-#endif /* !TARGET_OS_IOS */
+#endif /* TARGET_OS_OSX */
 
 
 /*
@@ -646,7 +615,7 @@
 
 #ifdef HAVE_ARC4RANDOM
 #  define CUPS_RAND() arc4random()
-#  define CUPS_SRAND(v) arc4random_stir()
+#  define CUPS_SRAND(v)
 #elif defined(HAVE_RANDOM)
 #  define CUPS_RAND() random()
 #  define CUPS_SRAND(v) srandom(v)
@@ -693,12 +662,14 @@
 
 
 /*
- * Location of OS X localization bundle, if any.
+ * Location of localization bundle, if any.
  */
 
-#if !TARGET_OS_IOS
+#if TARGET_OS_OSX
 #  define CUPS_BUNDLEDIR "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A"
-#endif /* !TARGET_OS_IOS */
+#else
+#  define CUPS_BUNDLEDIR "/System/Library/PrivateFrameworks/PrintKit.framework/Versions/A"
+#endif /* TARGET_OS_OSX */
 
 
 /*
@@ -706,14 +677,6 @@
  */
 
 #define HAVE_XPC 1
-/* #undef HAVE_XPC_PRIVATE_H */
-
-
-/*
- * Do we have Mini-XML?
- */
-
-/* #undef HAVE_MXML_H */
 
 
 /*