Code signing changes.

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index ad1b68f65b392a6d83cd49004c5c5acb0ff61c6d..0da303e8f59adaa4b2f3a12612c0db696d40b9fe 100644 (file)
--- 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 28c2eaa6b7389aeb7d67cbc3522c4bd1ad21a136..d3f6d7773c31ba25cde8ddf5c645e2158fb16011 100644 (file)
--- 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 ecba9c9a075de1272b8e8c7330c391865f7649ea..83a904db472815c1905bb044117c41dc012423b0 100755 (executable)
--- 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 (file)
index 1be5987..0000000
--- a/scheduler/org.cups.cups-lpd.plist
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>Disabled</key>
-       <true/>
-       <key>Label</key>
-       <string>org.cups.cups-lpd</string>
-       <key>ProcessType</key>
-       <string>Adaptive</string>
-       <key>EnableTransactions</key>
-       <true/>
-       <key>EnablePressuredExit</key>
-       <true/>
-       <key>ProgramArguments</key>
-       <array>
-               <string>/usr/libexec/cups/daemon/cups-lpd</string>
-               <string>-o</string>
-               <string>document-format=application/octet-stream</string>
-       </array>
-       <key>Sockets</key>
-       <dict>
-               <key>Listeners</key>
-               <dict>
-                       <key>SockServiceName</key>
-                       <string>printer</string>
-                       <key>SockType</key>
-                       <string>stream</string>
-               </dict>
-       </dict>
-       <key>UserName</key>
-       <string>_lp</string>
-       <key>inetdCompatibility</key>
-       <dict>
-               <key>Wait</key>
-               <false/>
-       </dict>
-</dict>
-</plist>

diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
index 0bda75679cb6f8b587bf3db852cbedc113513af2..4cdbee74964a8d108a9ce2368cc6a3b1d307c328 100644 (file)
--- 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;