diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-02-14 11:53:23 -0500 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-02-14 11:53:23 -0500 |
| commit | fa26ab9573afab69475d60c3eb3e38be3b5a0587 (patch) | |
| tree | 761925dce8611b283b37d8370bb92bf239ed73c6 /config-scripts | |
| parent | ec7e5bddc7494ad40158b88711f6d2a37cd8c0c8 (diff) | |
| download | cups-fa26ab9573afab69475d60c3eb3e38be3b5a0587.tar.gz | |
Eliminate use of private macOS security headers/APIs (Issue #5516)
Eliminate use of deprecated cssmErrorString function.
Switch to using SecCertificateCreateWithData.
Clean out unused private header availability checks.
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-common.m4 | 16 | ||||
| -rw-r--r-- | config-scripts/cups-ssl.m4 | 15 |
2 files changed, 2 insertions, 29 deletions
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 27dc33436..6a457b508 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -140,16 +140,6 @@ AC_CHECK_HEADER(iconv.h, SAVELIBS="$SAVELIBS $LIBS") LIBS="$SAVELIBS") -dnl Checks for Mini-XML (www.minixml.org)... -LIBMXML="" -AC_CHECK_HEADER(mxml.h, - SAVELIBS="$LIBS" - AC_SEARCH_LIBS(mmxlNewElement,mxml, - AC_DEFINE(HAVE_MXML_H) - LIBMXML="-lmxml") - LIBS="$SAVELIBS") -AC_SUBST(LIBMXML) - dnl Checks for statfs and its many headers... AC_CHECK_HEADER(sys/mount.h,AC_DEFINE(HAVE_SYS_MOUNT_H)) AC_CHECK_HEADER(sys/statfs.h,AC_DEFINE(HAVE_SYS_STATFS_H)) @@ -354,15 +344,12 @@ case $host_os_name in dnl Check for framework headers... AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h,AC_DEFINE(HAVE_APPLICATIONSERVICES_H)) AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H)) - AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H)) - AC_CHECK_HEADER(CoreFoundation/CFBundlePriv.h,AC_DEFINE(HAVE_CFBUNDLEPRIV_H)) dnl Check for dynamic store function... AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName) dnl Check for the new membership functions in MacOSX 10.4... AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H)) - AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H)) AC_CHECK_FUNCS(mbr_uid_to_uuid) dnl Need <dlfcn.h> header... @@ -396,7 +383,6 @@ case $host_os_name in else CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin" fi]) - AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H)) dnl Check for sandbox/Seatbelt support if test $host_os_version -ge 100; then @@ -417,8 +403,6 @@ case $host_os_name in AC_CHECK_HEADER(xpc/xpc.h, AC_DEFINE(HAVE_XPC) INSTALLXPC="install-xpc") - AC_CHECK_HEADER(xpc/private.h, - AC_DEFINE(HAVE_XPC_PRIVATE_H)) ;; esac diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index 8446e3d15..c1648b1c1 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -1,7 +1,7 @@ dnl dnl TLS stuff for CUPS. dnl -dnl Copyright 2007-2017 by Apple Inc. +dnl Copyright 2007-2019 by Apple Inc. dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. dnl dnl Licensed under Apache License v2.0. See the file "LICENSE" for more information. @@ -27,23 +27,12 @@ if test x$enable_ssl != xno; then CUPS_SERVERKEYCHAIN="/Library/Keychains/System.keychain" dnl Check for the various security headers... - AC_CHECK_HEADER(Security/SecureTransportPriv.h, - AC_DEFINE(HAVE_SECURETRANSPORTPRIV_H)) AC_CHECK_HEADER(Security/SecCertificate.h, AC_DEFINE(HAVE_SECCERTIFICATE_H)) AC_CHECK_HEADER(Security/SecItem.h, AC_DEFINE(HAVE_SECITEM_H)) - AC_CHECK_HEADER(Security/SecItemPriv.h, - AC_DEFINE(HAVE_SECITEMPRIV_H),, - [#include <Security/SecItem.h>]) AC_CHECK_HEADER(Security/SecPolicy.h, - AC_DEFINE(HAVE_SECPOLICY_H)) - AC_CHECK_HEADER(Security/SecPolicyPriv.h, - AC_DEFINE(HAVE_SECPOLICYPRIV_H)) - AC_CHECK_HEADER(Security/SecBasePriv.h, - AC_DEFINE(HAVE_SECBASEPRIV_H)) - AC_CHECK_HEADER(Security/SecIdentitySearchPriv.h, - AC_DEFINE(HAVE_SECIDENTITYSEARCHPRIV_H))]) + AC_DEFINE(HAVE_SECPOLICY_H))]) fi fi |