Add code signing for macOS Mojave.

diff --git a/Makedefs.in b/Makedefs.in
index da2ba9e9ebcc194d9c96d801692f9e547bd7a57c..df3527dad26cf55685c5095b697d5ead08117e3a 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,10 +1,11 @@
 #
 # Common makefile definitions for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
-# Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 #
@@ -122,6 +123,13 @@ IPPALIASES =       @IPPALIASES@
 
 INSTALLXPC     =       @INSTALLXPC@
 
+#
+# Code signing...
+#
+
+CODE_SIGN      =       @CODE_SIGN@
+CODE_SIGN_IDENTITY = -
+
 #
 # Program options...
 #

diff --git a/backend/Makefile b/backend/Makefile
index 95e07b27e8b379d1337723dae7d049ea8417c88b..4a1a56eedd11332ac60292cfd2aff2b180997523 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,7 +1,7 @@
 #
 # Backend makefile for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -203,6 +203,7 @@ test1284:   test1284.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -213,6 +214,7 @@ testbackend:        testbackend.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -224,6 +226,7 @@ testsupplies:       testsupplies.o libbackend.a ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -244,6 +247,7 @@ libbackend.a:       $(LIBOBJS)
 dnssd: dnssd.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        if test `uname` = Darwin; then \
                $(RM) mdns; \
                $(LN) dnssd mdns; \
@@ -257,8 +261,11 @@ dnssd:     dnssd.o ../cups/$(LIBCUPS) libbackend.a
 ipp:   ipp.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
-       $(RM) http
-       $(LN) ipp http
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+       $(RM) http https ipps
+       for file in $(IPPALIASES); do \
+               $(LN) ipp $$file; \
+       done
 
 
 #
@@ -268,6 +275,7 @@ ipp:        ipp.o ../cups/$(LIBCUPS) libbackend.a
 lpd:   lpd.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -277,6 +285,7 @@ lpd:        lpd.o ../cups/$(LIBCUPS) libbackend.a
 snmp:  snmp.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -286,12 +295,14 @@ snmp:     snmp.o ../cups/$(LIBCUPS) libbackend.a
 socket:        socket.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 socket-static: socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o socket-static socket.o libbackend.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -302,6 +313,7 @@ usb:        usb.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
                $(BACKLIBS) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c
 
 

diff --git a/berkeley/Makefile b/berkeley/Makefile
index 9df1360afec2007546f5071640d3b751119bc4cc..73aa221673fb826ebd5897743f03965bea7b43ab 100644 (file)
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,7 +1,7 @@
 #
 # Berkeley commands makefile for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -121,6 +121,7 @@ uninstall:
 lpc:   lpc.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -130,6 +131,7 @@ lpc:        lpc.o ../cups/$(LIBCUPS)
 lpq:   lpq.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -139,6 +141,7 @@ lpq:        lpq.o ../cups/$(LIBCUPS)
 lpr:   lpr.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -148,6 +151,7 @@ lpr:        lpr.o ../cups/$(LIBCUPS)
 lprm:  lprm.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 5b0154aad4a4587a9c020ac4e581c06dcf20776a..21f1dd5fb8e36cecb30663285b1154bd9ade930c 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,7 +1,7 @@
 #
 # CGI makefile for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -205,6 +205,7 @@ libcupscgi.1.dylib: $(LIBOBJS) libcupscgi.exp
                -compatibility_version 1.0.0 \
                -exported_symbols_list libcupscgi.exp \
                $(LIBOBJS) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) libcupscgi.dylib
        $(LN) $@ libcupscgi.dylib
 
@@ -237,6 +238,7 @@ libcupscgi.a:       $(LIBOBJS)
 admin.cgi:     admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -246,6 +248,7 @@ admin.cgi:  admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 classes.cgi:   classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -255,6 +258,7 @@ classes.cgi:        classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 help.cgi:      help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -264,6 +268,7 @@ help.cgi:   help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 jobs.cgi:      jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -275,6 +280,7 @@ makedocset: makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
                $(LIBZ) $(LIBGSSAPI)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -284,6 +290,7 @@ makedocset: makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 printers.cgi:  printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ printers.o -L. -lcupscgi $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -295,6 +302,7 @@ testcgi:    testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
                $(LIBZ) $(LIBGSSAPI)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Testing CGI API...
        ./testcgi
 
@@ -308,6 +316,7 @@ testhi:     testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
                $(LIBZ) $(LIBGSSAPI)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Testing help index API...
        ./testhi
 
@@ -320,6 +329,7 @@ testtemplate:       testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/$(LIBCUPSSTATIC) \
                $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 064adb6f356967f3fffb09145737786a60c15a2f..ad1b68f65b392a6d83cd49004c5c5acb0ff61c6d 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,7 +1,7 @@
 dnl
 dnl Common configuration stuff for CUPS.
 dnl
-dnl Copyright 2007-2017 by Apple Inc.
+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.
@@ -66,6 +66,14 @@ 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/configure b/configure
index d6a39069df8d58dedf28ce4b7359953abb7e6ef3..ecba9c9a075de1272b8e8c7330c391865f7649ea 100755 (executable)
--- a/configure
+++ b/configure
@@ -740,6 +740,7 @@ LIBPAPER
 LIBMALLOC
 PKGCONFIG
 INSTALLSTATIC
+CODE_SIGN
 INSTALL
 CUPS_HTMLVIEW
 XDGOPEN
@@ -4251,6 +4252,16 @@ 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/cups/Makefile b/cups/Makefile
index 72b646a62955ea726bb38a3956902fcb7b3b9203..debe84c79733d841b3a562a5d63c42ed901b774a 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -361,6 +361,7 @@ libcups.2.dylib:    $(LIBOBJS) $(LIBCUPSORDER)
                -exported_symbols_list t.exp \
                $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) libcups.dylib t.exp
        $(LN) $@ libcups.dylib
 
@@ -427,6 +428,7 @@ libcupsimage.2.dylib:       $(IMAGEOBJS) libcups.2.dylib
                -current_version 2.3.0 \
                -compatibility_version 2.0.0 \
                $(IMAGEOBJS) $(DSOLIBS) -L../cups $(LINKCUPS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) libcupsimage.dylib
        $(LN) $@ libcupsimage.dylib
 
@@ -461,6 +463,7 @@ rasterbench:        rasterbench.o libcups.a $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ rasterbench.o libcupsimage.a $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -471,6 +474,7 @@ testadmin:  testadmin.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testadmin.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -481,6 +485,7 @@ testarray:  testarray.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testarray.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running array API tests...
        ./testarray
 
@@ -493,6 +498,7 @@ testcache:  testcache.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -504,6 +510,7 @@ testclient: testclient.o $(LIBCUPSSTATIC) libcupsimage.a
        $(LD_CC) $(LDFLAGS) -o $@ testclient.o \
                libcupsimage.a $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -514,6 +521,7 @@ testconflicts:      testconflicts.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testconflicts.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -524,6 +532,7 @@ testcreds:  testcreds.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcreds.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -534,6 +543,7 @@ testcups:   testcups.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testcups.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -544,6 +554,7 @@ testdest:   testdest.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -554,6 +565,7 @@ testfile:   testfile.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testfile.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running file API tests...
        ./testfile
 
@@ -566,6 +578,7 @@ testgetdests:       testgetdests.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testgetdests.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -576,6 +589,7 @@ testhttp:   testhttp.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhttp.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running HTTP API tests...
        ./testhttp
 
@@ -588,6 +602,7 @@ testipp:    testipp.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testipp.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running IPP API tests...
        ./testipp
 
@@ -600,6 +615,7 @@ testi18n:   testi18n.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testi18n.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running internationalization API tests...
        ./testi18n
 
@@ -612,6 +628,7 @@ testlang:   testlang.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testlang.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Creating locale directory structure...
        $(RM) -r locale
        $(MKDIR) locale/en
@@ -636,6 +653,7 @@ testoptions:        testoptions.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testoptions.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running option API tests...
        ./testoptions
 
@@ -648,6 +666,7 @@ testppd:    testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testppd.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running PPD API tests...
        ./testppd
 
@@ -660,6 +679,7 @@ testpwg:    testpwg.o $(LIBCUPSSTATIC) test.ppd
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testpwg.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running PWG API tests...
        ./testpwg test.ppd
 
@@ -673,6 +693,7 @@ testraster: testraster.o $(LIBCUPSSTATIC) libcupsimage.a
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
                $(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
                $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running raster API tests...
        ./testraster
 
@@ -685,6 +706,7 @@ testsnmp:   testsnmp.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testsnmp.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -695,6 +717,7 @@ tlscheck:   tlscheck.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #

diff --git a/filter/Makefile b/filter/Makefile
index 433a3ec021231b5e796cd7c477146ea0fccaa030..696206aa75e8599f872ea04a4339d0b0cc69ce89 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -159,6 +159,7 @@ apihelp:
 commandtops:   commandtops.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ commandtops.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -168,6 +169,7 @@ commandtops:        commandtops.o ../cups/$(LIBCUPS)
 gziptoany:     gziptoany.o ../Makedefs ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ gziptoany.o $(LIBZ) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -177,6 +179,7 @@ gziptoany:  gziptoany.o ../Makedefs ../cups/$(LIBCUPS)
 pstops:        pstops.o common.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -186,6 +189,7 @@ pstops:     pstops.o common.o ../cups/$(LIBCUPS)
 rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -195,6 +199,7 @@ rastertoepson:      rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 rastertohp:    rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -204,6 +209,7 @@ rastertohp: rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -213,12 +219,14 @@ rastertolabel:    rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 rastertopwg:   rastertopwg.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 rastertopwg-static:    rastertopwg.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.a
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o ../cups/libcupsimage.a \
                ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
                $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #

diff --git a/locale/Makefile b/locale/Makefile
index d56c6f1482f130447098801bb0eaa8b67df52572..db2b7872485d6184a67140b8774339f85402c393 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -159,6 +159,7 @@ checkpo:    checkpo.o ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o checkpo checkpo.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 checkall:      checkpo
        ./checkpo *.po *.strings
@@ -176,6 +177,7 @@ po2strings: po2strings.o ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o po2strings po2strings.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -188,6 +190,7 @@ po2strings: po2strings.o ../cups/$(LIBCUPSSTATIC)
 strings2po:    strings2po.o
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o strings2po strings2po.o
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #

diff --git a/man/Makefile b/man/Makefile
index 6911cbab0587773afef22907b814a73b81e20785..8aa19c60da1b10650ef905f2207e00b7dc26662f 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,7 +1,7 @@
 #
 # Man page makefile for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1993-2006 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -226,3 +226,4 @@ mantohtml:  mantohtml.o ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@

diff --git a/monitor/Makefile b/monitor/Makefile
index 2631f09a75686b7d74daa1f6c3cda41c19e6ec45..b2c64b9cdb591019925df251794dd547dbc245eb 100644 (file)
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -1,7 +1,7 @@
 #
 # Port monitor makefile for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 2006 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -116,6 +116,7 @@ uninstall:
 bcp:   bcp.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ bcp.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -125,6 +126,7 @@ bcp:        bcp.o ../cups/$(LIBCUPS)
 tbcp:  tbcp.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ tbcp.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #

diff --git a/notifier/Makefile b/notifier/Makefile
index 16160c8ad7e114f50ffdf5149ce9e358c00bda8a..741ef8daa3b1ecff13c89bbc60df063fb312bfd9 100644 (file)
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -1,7 +1,7 @@
 #
 # Notifier makefile for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -120,6 +120,7 @@ depend:
 dbus:  dbus.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o dbus dbus.o $(DBUS_NOTIFIERLIBS) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -129,6 +130,7 @@ dbus:       dbus.o ../cups/$(LIBCUPS)
 mailto:        mailto.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o mailto mailto.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -138,6 +140,7 @@ mailto:     mailto.o ../cups/$(LIBCUPS)
 rss:   rss.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o rss rss.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -147,6 +150,7 @@ rss:        rss.o ../cups/$(LIBCUPS)
 testnotify:    testnotify.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o testnotify testnotify.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 $(OBJS):       ../Makedefs

diff --git a/ppdc/Makefile b/ppdc/Makefile
index 842505ca1bffedd147dc40e08c34659ffcf6619b..bed5e6313470866d5c3acb73be92d96b100d597f 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the CUPS PPD Compiler.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 2002-2006 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -224,6 +224,7 @@ genstrings:         genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
        $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
                libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Generating localization strings...
        ./genstrings >sample.c
 
@@ -235,6 +236,7 @@ genstrings:         genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
 ppdc:                  ppdc.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CXX) $(LDFLAGS) -o $@ ppdc.o -L. -lcupsppdc $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 ppdc-static:           ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
@@ -242,6 +244,7 @@ ppdc-static:                ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
        $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Testing PPD compiler...
        ./ppdc-static -l en,fr -I ../data foo.drv
        ./ppdc-static -l en,fr -z -I ../data foo.drv
@@ -254,6 +257,7 @@ ppdc-static:                ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
 ppdhtml:                       ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CXX) $(LDFLAGS) -o $@ ppdhtml.o -L. -lcupsppdc $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -263,6 +267,7 @@ ppdhtml:                    ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 ppdi:                  ppdi.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CXX) $(LDFLAGS) -o $@ ppdi.o -L. -lcupsppdc $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 ppdi-static:           ppdc-static ppdi.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC)
@@ -270,6 +275,7 @@ ppdi-static:                ppdc-static ppdi.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC)
        $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Testing PPD importer...
        $(RM) -r ppd ppd2 sample-import.drv
        ./ppdc-static -l en -I ../data sample.drv
@@ -290,6 +296,7 @@ ppdi-static:                ppdc-static ppdi.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC)
 ppdmerge:                      ppdmerge.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CXX) $(LDFLAGS) -o $@ ppdmerge.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -299,6 +306,7 @@ ppdmerge:                   ppdmerge.o ../cups/$(LIBCUPS)
 ppdpo:                 ppdpo.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CXX) $(LDFLAGS) -o $@ ppdpo.o -L. -lcupsppdc $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -310,6 +318,7 @@ testcatalog:                testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
        $(LD_CXX) $(LDFLAGS) -o $@ testcatalog.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -337,6 +346,7 @@ libcupsppdc.1.dylib:        $(LIBOBJS) ../cups/$(LIBCUPS)
                -compatibility_version 1.0.0 \
                -exported_symbols_list t.exp \
                $(LIBOBJS) $(LINKCUPS) $(COMMONLIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) libcupsppdc.dylib t.exp
        $(LN) $@ libcupsppdc.dylib
 

diff --git a/scheduler/Makefile b/scheduler/Makefile
index ab56222c8d1f3847882b2a157204d398ac2ae339..8c70e603ef2f9fcd7c4582bf049facf4c27be1fc 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -357,6 +357,7 @@ cupsd:      $(CUPSDOBJS) $(LIBCUPSMIME) ../cups/$(LIBCUPS)
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
                $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) \
                 $(DNSSDLIBS) $(LIBS) $(LIBGSSAPI) $(LIBWRAP)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 cupsd-static:  $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
@@ -365,6 +366,7 @@ cupsd-static:       $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
                $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) $(DNSSDLIBS) \
                 $(LIBGSSAPI) $(LIBWRAP)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -374,6 +376,7 @@ cupsd-static:       $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 cupsfilter:    cupsfilter.o $(LIBCUPSMIME) ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o cupsfilter cupsfilter.o -L. -lcupsmime $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) convert
        $(LN) cupsfilter convert
 
@@ -382,6 +385,7 @@ cupsfilter-static:  cupsfilter.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(LDFLAGS) -o cupsfilter-static cupsfilter.o libcupsmime.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
                $(DNSSDLIBS) $(LIBGSSAPI)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -391,6 +395,7 @@ cupsfilter-static:  cupsfilter.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 cups-deviced:  cups-deviced.o util.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o cups-deviced cups-deviced.o util.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -401,6 +406,7 @@ cups-driverd:       cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/$(LIBCUPSPPDC)
        echo Linking $@...
        $(LD_CXX) $(LDFLAGS) -o cups-driverd cups-driverd.o util.o \
                -L../ppdc -lcupsppdc $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -410,6 +416,7 @@ cups-driverd:       cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/$(LIBCUPSPPDC)
 cups-exec:     cups-exec.o
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o cups-exec cups-exec.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -419,6 +426,7 @@ cups-exec:  cups-exec.o
 cups-lpd:      cups-lpd.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o cups-lpd cups-lpd.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -444,6 +452,7 @@ libcupsmime.1.dylib:        $(LIBOBJS) libcupsmime.exp
                -compatibility_version 1.0.0 \
                -exported_symbols_list libcupsmime.exp \
                $(LIBOBJS) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) libcupsmime.dylib
        $(LN) $@ libcupsmime.dylib
 
@@ -488,6 +497,7 @@ testmime:   testmime.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testmime.o libcupsmime.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
                $(DNSSDLIBS) $(LIBGSSAPI)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running MIME tests...
        ./testmime
 
@@ -500,6 +510,7 @@ testspeed:  testspeed.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o testspeed testspeed.o ../cups/$(LIBCUPSSTATIC) \
                $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -510,6 +521,7 @@ testsub:    testsub.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o testsub testsub.o ../cups/$(LIBCUPSSTATIC) \
                $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #

diff --git a/scheduler/job.c b/scheduler/job.c
index 90aaccbf85ab8e91a32b3dd7b7eee71a36055173..781b11514edf845a8aa488b83d8367fb2fae4112 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -3336,8 +3336,14 @@ finalize_job(cupsd_job_t *job,           /* I - Job */
                   job_state == IPP_JOB_COMPLETED)
          {
            job_state = IPP_JOB_ABORTED;
-           message   = "Job aborted due to backend errors; please consult "
-                       "the error_log file for details.";
+
+           if (ErrorLog)
+           {
+             snprintf(buffer, sizeof(buffer), "Job aborted due to backend errors; please consult the %s file for details.", ErrorLog);
+             message = buffer;
+            }
+            else
+             message = "Job aborted due to backend errors.";
 
            ippSetString(job->attrs, &job->reasons, 0, "aborted-by-system");
          }
@@ -3345,8 +3351,14 @@ finalize_job(cupsd_job_t *job,           /* I - Job */
           {
             job_state     = IPP_JOB_PENDING;
            printer_state = IPP_PRINTER_STOPPED;
-           message       = "Printer stopped due to backend errors; please "
-                           "consult the error_log file for details.";
+
+           if (ErrorLog)
+           {
+             snprintf(buffer, sizeof(buffer), "Printer stopped due to backend errors; please consult the %s file for details.", ErrorLog);
+             message = buffer;
+            }
+            else
+             message = "Printer stopped due to backend errors.";
 
            ippSetString(job->attrs, &job->reasons, 0, "none");
          }
@@ -3384,15 +3396,20 @@ finalize_job(cupsd_job_t *job,          /* I - Job */
 
              ippSetString(job->attrs, &job->reasons, 0,
                           "job-hold-until-specified");
-             message = "Job held indefinitely due to backend errors; please "
-                       "consult the error_log file for details.";
+
+             if (ErrorLog)
+             {
+               snprintf(buffer, sizeof(buffer), "Job held indefinitely due to backend errors; please consult the %s file for details.", ErrorLog);
+               message = buffer;
+             }
+             else
+               message = "Job held indefinitely due to backend errors.";
             }
             else if (!strcmp(reason, "account-info-needed"))
             {
              cupsdSetJobHoldUntil(job, "indefinite", 0);
 
-             message = "Job held indefinitely - account information is "
-                       "required.";
+             message = "Job held indefinitely - account information is required.";
             }
             else if (!strcmp(reason, "account-closed"))
             {
@@ -3404,8 +3421,7 @@ finalize_job(cupsd_job_t *job,            /* I - Job */
             {
              cupsdSetJobHoldUntil(job, "indefinite", 0);
 
-             message = "Job held indefinitely - account limit has been "
-                       "reached.";
+             message = "Job held indefinitely - account limit has been reached.";
            }
             else
             {
@@ -3424,8 +3440,14 @@ finalize_job(cupsd_job_t *job,           /* I - Job */
          */
 
          printer_state = IPP_PRINTER_STOPPED;
-         message       = "Printer stopped due to backend errors; please "
-                         "consult the error_log file for details.";
+
+         if (ErrorLog)
+         {
+           snprintf(buffer, sizeof(buffer), "Printer stopped due to backend errors; please consult the %s file for details.", ErrorLog);
+           message = buffer;
+         }
+         else
+           message = "Printer stopped due to backend errors.";
 
          if (job_state == IPP_JOB_COMPLETED)
          {
@@ -3522,8 +3544,14 @@ finalize_job(cupsd_job_t *job,           /* I - Job */
     if (job_state == IPP_JOB_COMPLETED)
     {
       job_state = IPP_JOB_STOPPED;
-      message   = "Job stopped due to filter errors; please consult the "
-                 "error_log file for details.";
+
+      if (ErrorLog)
+      {
+       snprintf(buffer, sizeof(buffer), "Job stopped due to filter errors; please consult the %s file for details.", ErrorLog);
+       message = buffer;
+      }
+      else
+       message = "Job stopped due to filter errors.";
 
       if (WIFSIGNALED(job->status))
        ippSetString(job->attrs, &job->reasons, 0, "cups-filter-crashed");

diff --git a/systemv/Makefile b/systemv/Makefile
index 877ccdb881a8927198555e775ded15083c984358..a4156b778c35ca66f2bba27c9c8b22a7a7124fdf 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -156,6 +156,7 @@ uninstall:
 cancel:        cancel.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o cancel cancel.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -165,6 +166,7 @@ cancel:     cancel.o ../cups/$(LIBCUPS)
 cupsaccept:    cupsaccept.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o cupsaccept cupsaccept.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        for file in accept cupsenable cupsdisable cupsreject reject; do \
                $(RM) $$file; \
                $(LN) cupsaccept $$file; \
@@ -178,6 +180,7 @@ cupsaccept: cupsaccept.o ../cups/$(LIBCUPS)
 cupsaddsmb:    cupsaddsmb.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o cupsaddsmb cupsaddsmb.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -187,6 +190,7 @@ cupsaddsmb: cupsaddsmb.o ../cups/$(LIBCUPS)
 cupsctl:       cupsctl.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o cupsctl cupsctl.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -196,6 +200,7 @@ cupsctl:    cupsctl.o ../cups/$(LIBCUPS)
 cupstestdsc:   cupstestdsc.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ cupstestdsc.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -205,11 +210,13 @@ cupstestdsc:      cupstestdsc.o ../cups/$(LIBCUPS)
 cupstestppd:   cupstestppd.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ cupstestppd.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 cupstestppd-static:    cupstestppd.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.a
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ cupstestppd.o ../cups/libcupsimage.a \
                ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(LIBGSSAPI) $(LIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -219,6 +226,7 @@ cupstestppd-static: cupstestppd.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.
 lp:    lp.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o lp lp.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -228,6 +236,7 @@ lp: lp.o ../cups/$(LIBCUPS)
 lpadmin:       lpadmin.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -237,6 +246,7 @@ lpadmin:    lpadmin.o ../cups/$(LIBCUPS)
 lpinfo:        lpinfo.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o lpinfo lpinfo.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -246,6 +256,7 @@ lpinfo:     lpinfo.o ../cups/$(LIBCUPS)
 lpmove:        lpmove.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o lpmove lpmove.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -255,6 +266,7 @@ lpmove:     lpmove.o ../cups/$(LIBCUPS)
 lpoptions:     lpoptions.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o lpoptions lpoptions.o $(LIBZ) $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -264,6 +276,7 @@ lpoptions:  lpoptions.o ../cups/$(LIBCUPS)
 lpstat:        lpstat.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o lpstat lpstat.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #

diff --git a/test/Makefile b/test/Makefile
index 7f58104065fb7aef8c0d453c06fe86c0fe2cd1d0..41a5605ac7d264731c6de25cc0804216356efb42 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -177,12 +177,16 @@ local:    ippserver ippserver-shared ipptool-static
 # ippfind
 #
 
-ippfind:       ippfind.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSSTATIC)
+ippfind:       ippfind.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ ippfind.o $(LIBS)
-       echo Linking $@-static...
-       $(LD_CC) $(LDFLAGS) -o $@-static ippfind.o  ../cups/$(LIBCUPSSTATIC) \
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+
+ippfind-static:        ippfind.o ../cups/$(LIBCUPSSTATIC)
+       echo Linking $@
+       $(LD_CC) $(LDFLAGS) -o $@ ippfind.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -193,6 +197,7 @@ ippserver:  ippserver.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ ippserver.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -202,6 +207,7 @@ ippserver:  ippserver.o ../cups/$(LIBCUPSSTATIC)
 ippserver-shared:      ippserver.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ ippserver.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -211,6 +217,7 @@ ippserver-shared:   ippserver.o ../cups/$(LIBCUPS)
 ipptool:       ipptool.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ ipptool.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -221,6 +228,7 @@ ipptool-static:     ipptool.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ ipptool.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #