From 137fa9a836cf171acd1dac3828e5ec2d45f131ea Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 18 Sep 2018 11:27:20 -0400 Subject: [PATCH] Code signing changes. --- config-scripts/cups-common.m4 | 11 ++------ config-scripts/cups-opsys.m4 | 13 ++++++++-- configure | 22 ++++++++-------- scheduler/org.cups.cups-lpd.plist | 39 ---------------------------- xcode/CUPS.xcodeproj/project.pbxproj | 2 ++ 5 files changed, 26 insertions(+), 61 deletions(-) delete mode 100644 scheduler/org.cups.cups-lpd.plist diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index ad1b68f65..0da303e8f 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -4,7 +4,8 @@ dnl dnl Copyright 2007-2018 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. +dnl Licensed under Apache License v2.0. See the file "LICENSE" for more +dnl information. dnl dnl Set the name of the config header file... @@ -66,14 +67,6 @@ if test "x$CC" = x; then AC_MSG_ERROR([Unable to find required C compiler command.]) fi -AC_MSG_CHECKING(for codesign utility) -CODE_SIGN="/usr/bin/true" -AC_SUBST(CODE_SIGN) -if test $uname = Darwin; then - CODE_SIGN="/usr/bin/codesign" -fi -AC_MSG_RESULT(using $CODE_SIGN) - dnl Static library option... INSTALLSTATIC="" AC_ARG_ENABLE(static, [ --enable-static install static libraries]) diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4 index 28c2eaa6b..d3f6d7773 100644 --- a/config-scripts/cups-opsys.m4 +++ b/config-scripts/cups-opsys.m4 @@ -1,10 +1,11 @@ dnl dnl Operating system stuff for CUPS. dnl -dnl Copyright 2007-2017 by Apple Inc. +dnl Copyright 2007-2018 by Apple Inc. dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. dnl -dnl Licensed under Apache License v2.0. See the file "LICENSE" for more information. +dnl Licensed under Apache License v2.0. See the file "LICENSE" for more +dnl information. dnl dnl Get the build and host platforms and split the host_os value @@ -31,3 +32,11 @@ else LOCALTARGET="" fi AC_SUBST(LOCALTARGET) + +AC_MSG_CHECKING(for codesign utility) +CODE_SIGN="/usr/bin/true" +AC_SUBST(CODE_SIGN) +if test "$host_os_name" = darwin; then + CODE_SIGN="/usr/bin/codesign" +fi +AC_MSG_RESULT(using $CODE_SIGN) diff --git a/configure b/configure index ecba9c9a0..83a904db4 100755 --- a/configure +++ b/configure @@ -740,7 +740,6 @@ LIBPAPER LIBMALLOC PKGCONFIG INSTALLSTATIC -CODE_SIGN INSTALL CUPS_HTMLVIEW XDGOPEN @@ -770,6 +769,7 @@ AWK CUPS_BUILD CUPS_REVISION CUPS_VERSION +CODE_SIGN LOCALTARGET host_os host_vendor @@ -2633,6 +2633,16 @@ else fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for codesign utility" >&5 +$as_echo_n "checking for codesign utility... " >&6; } +CODE_SIGN="/usr/bin/true" + +if test "$host_os_name" = darwin; then + CODE_SIGN="/usr/bin/codesign" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $CODE_SIGN" >&5 +$as_echo "using $CODE_SIGN" >&6; } + ac_config_headers="$ac_config_headers config.h" @@ -4252,16 +4262,6 @@ if test "x$CC" = x; then as_fn_error $? "Unable to find required C compiler command." "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for codesign utility" >&5 -$as_echo_n "checking for codesign utility... " >&6; } -CODE_SIGN="/usr/bin/true" - -if test $uname = Darwin; then - CODE_SIGN="/usr/bin/codesign" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using $CODE_SIGN" >&5 -$as_echo "using $CODE_SIGN" >&6; } - INSTALLSTATIC="" # Check whether --enable-static was given. if test "${enable_static+set}" = set; then : diff --git a/scheduler/org.cups.cups-lpd.plist b/scheduler/org.cups.cups-lpd.plist deleted file mode 100644 index 1be598783..000000000 --- a/scheduler/org.cups.cups-lpd.plist +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Disabled - - Label - org.cups.cups-lpd - ProcessType - Adaptive - EnableTransactions - - EnablePressuredExit - - ProgramArguments - - /usr/libexec/cups/daemon/cups-lpd - -o - document-format=application/octet-stream - - Sockets - - Listeners - - SockServiceName - printer - SockType - stream - - - UserName - _lp - inetdCompatibility - - Wait - - - - diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj index 0bda75679..4cdbee749 100644 --- a/xcode/CUPS.xcodeproj/project.pbxproj +++ b/xcode/CUPS.xcodeproj/project.pbxproj @@ -11378,6 +11378,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = NO; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -11427,6 +11428,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = NO; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; -- 2.39.2