<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b4b7814b4599903c3e249bec1712734e34caa664">https://github.com/macports/macports-ports/commit/b4b7814b4599903c3e249bec1712734e34caa664</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b4b7814b459 cups-ppdc: update to 2.4.0
</span>b4b7814b459 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b4b7814b4599903c3e249bec1712734e34caa664
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Mon Dec 6 09:54:23 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> cups-ppdc: update to 2.4.0
</span>---
print/cups-ppdc/Portfile | 38 +++++++----------
print/cups-ppdc/files/patch-configure.diff | 19 ---------
print/cups-ppdc/files/patch-cups-compiler.diff | 23 ++++++++++
print/cups-ppdc/files/patch-cups-hash-sha224.diff | 37 ----------------
print/cups-ppdc/files/patch-cups-network.diff | 13 ++++++
print/cups-ppdc/files/patch-cups-tempfile.diff | 51 -----------------------
print/cups-ppdc/files/patch-cups-usersys-ssl.diff | 31 --------------
7 files changed, 50 insertions(+), 162 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/cups-ppdc/Portfile b/print/cups-ppdc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e740293999e..be59304857c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/cups-ppdc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/cups-ppdc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup github 1.0
</span> # clock_gettime
legacysupport.newest_darwin_requires_legacy 15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup apple cups 2.3.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OpenPrinting cups 2.4.0 v
</span> name cups-ppdc
categories print textproc
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,41 +19,31 @@ long_description \
</span> PPD files can be used to set up a printer when proprietary drivers are not available. \
See the ppdcfile(5) man page for information on the PPD file format.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 676fec5542a7ee80111011757589fe44f7354c29 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fe381d941907011e0f2323dce93f0dc4a60cca9fa56b5d896288819cb933f074 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8148606
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fe98cfd498e841e6f9f9f63a5dc1094dea907bf9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dc1fbddf1534bc226ac19adf71514267bc81013617d7535fe9de1d516d035a69 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8160152
</span>
patchfiles patch-static-targets.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cups-hash-sha224.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cups-usersys-ssl.diff \
</span> patch-cups-getifaddrs.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cups-tempfile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cups-compiler.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cups-network.diff
</span>
platform darwin 8 {
patchfiles-append \
patch-cups-transcode-iconv.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix broken build with old GCC and unrecognized flag warnings with new GCC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PIEFLAGS@||" Makedefs.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Until patch-cups-network.diff and patch-cups-compiler.diff are merged
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoconf yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # <os/availability.h> introduced in 10.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|<os/availability.h>|<AvailabilityMacros.h>|" cups/versioning.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-dnssd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gssapi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-ssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-gssapi \
</span> --disable-shared \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-dnssd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-ondemand \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-tls \
</span> --with-bundledir=""
# code signing is broken on Snow Leopard - "sign" with /usr/bin/true
configure.env-append CODE_SIGN=true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -fno-stack-protector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -fno-stack-protector
</span> if {${os.platform} eq "darwin" && ${os.major} < 10} {
configure.cflags-append -U__BLOCKS__
configure.cxxflags-append -U__BLOCKS__
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,9 +59,9 @@ post-configure {
</span> }
build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/cups "make"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/cups ${build.cmd}
</span> foreach tool {ppdc ppdi ppdpo ppdhtml ppdmerge} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/ppdc "make ${tool}-static"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/ppdc "${build.cmd} ${tool}-static"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/cups-ppdc/files/patch-configure.diff b/print/cups-ppdc/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3fb268ad3f0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/cups-ppdc/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5981,7 +5981,6 @@ $as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "Run 'sudo mkdir -p /usr/local/include/sandbox' and 'sudo touch /usr/local/include/sandbox/private.h' to build CUPS." "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6905,7 +6904,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add useful warning options for tracking down problems...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- WARNING_OPTIONS="-Wall -Wno-format-y2k -Wunused -Wno-unused-result -Wsign-conversion"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ WARNING_OPTIONS="-Wall -Wno-format-y2k -Wunused"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Test GCC version for certain warning flags since -Werror
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # doesn't trigger...
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/cups-ppdc/files/patch-cups-compiler.diff b/print/cups-ppdc/files/patch-cups-compiler.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9b527c805c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/cups-ppdc/files/patch-cups-compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The -Wl,-pie flag compiles successfully on Tiger but does not link.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+So test linking instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config-scripts/cups-compiler.m4.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config-scripts/cups-compiler.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -156,7 +156,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OLDCFLAGS="$CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_CASE(["$host_os_name"], [darwin*], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="$CFLAGS -fPIE -Wl,-pie"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_LINK_IFELSE([AC_LANG_PROGRAM()], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PIEFLAGS="-fPIE -Wl,-pie"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -164,7 +164,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ], [*], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="$CFLAGS -fPIE -pie"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_LINK_IFELSE([AC_LANG_PROGRAM()], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PIEFLAGS="-fPIE -pie"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ], [
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/cups-ppdc/files/patch-cups-hash-sha224.diff b/print/cups-ppdc/files/patch-cups-hash-sha224.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 12a63ee04c1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/cups-ppdc/files/patch-cups-hash-sha224.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: https://github.com/OpenPrinting/cups/pull/225
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove if/when we switch from Apple CUPS to OpenPrinting CUPS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cups/hash.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cups/hash.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,6 +85,7 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (CC_SHA1_DIGEST_LENGTH);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef CC_SHA224_DIGEST_LENGTH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (!strcmp(algorithm, "sha2-224"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC_SHA256_CTX ctx; /* SHA-224 context */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,6 +99,7 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (CC_SHA224_DIGEST_LENGTH);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (!strcmp(algorithm, "sha2-256"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC_SHA256_CTX ctx; /* SHA-256 context */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,6 +139,7 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (CC_SHA512_DIGEST_LENGTH);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef CC_SHA224_DIGEST_LENGTH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (!strcmp(algorithm, "sha2-512_224"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC_SHA512_CTX ctx; /* SHA-512 context */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,6 +161,7 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (CC_SHA224_DIGEST_LENGTH);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (!strcmp(algorithm, "sha2-512_256"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC_SHA512_CTX ctx; /* SHA-512 context */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/cups-ppdc/files/patch-cups-network.diff b/print/cups-ppdc/files/patch-cups-network.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d1e5c7c1aca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/cups-ppdc/files/patch-cups-network.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/OpenPrinting/cups/issues/301
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config-scripts/cups-network.m4.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config-scripts/cups-network.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADER([resolv.h], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE([HAVE_RESOLV_H], [1], [Have the <resolv.h> header?])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-]. [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <arpa/inet.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/cups-ppdc/files/patch-cups-tempfile.diff b/print/cups-ppdc/files/patch-cups-tempfile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 82386399b76..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/cups-ppdc/files/patch-cups-tempfile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: https://github.com/OpenPrinting/cups/pull/229
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cups/ppd-util.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cups/ppd-util.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -226,16 +226,20 @@ cupsGetPPD3(http_t *http, /* I - HTTP connection or @code CUPS_HTTP_DEFAUL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * per-process TMPDIR value.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef _CS_DARWIN_USER_TEMP_DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char tmppath[1024]; /* Temporary directory */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* _CS_DARWIN_USER_TEMP_DIR */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((tmpdir = getenv("TMPDIR")) != NULL && access(tmpdir, W_OK))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmpdir = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!tmpdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef _CS_DARWIN_USER_TEMP_DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (confstr(_CS_DARWIN_USER_TEMP_DIR, tmppath, sizeof(tmppath)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmpdir = tmppath;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* _CS_DARWIN_USER_TEMP_DIR */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmpdir = "/private/tmp"; /* This should never happen */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cups/tempfile.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cups/tempfile.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,9 +38,9 @@ cupsTempFd(char *filename, /* I - Pointer to buffer */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int fd; /* File descriptor for temp file */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int tries; /* Number of tries */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *tmpdir; /* TMPDIR environment var */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__) || defined(_WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if (defined(__APPLE__) && defined(_CS_DARWIN_USER_TEMP_DIR)) || defined(_WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char tmppath[1024]; /* Temporary directory */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __APPLE__ || _WIN32 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* (__APPLE__ && _CS_DARWIN_USER_TEMP_DIR) || _WIN32 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DWORD curtime; /* Current time */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,9 +72,11 @@ cupsTempFd(char *filename, /* I - Pointer to buffer */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!tmpdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef _CS_DARWIN_USER_TEMP_DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (confstr(_CS_DARWIN_USER_TEMP_DIR, tmppath, sizeof(tmppath)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmpdir = tmppath;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmpdir = "/private/tmp"; /* This should never happen */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/cups-ppdc/files/patch-cups-usersys-ssl.diff b/print/cups-ppdc/files/patch-cups-usersys-ssl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7a282cdbd28..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/cups-ppdc/files/patch-cups-usersys-ssl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream: https://github.com/OpenPrinting/cups/pull/223
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove if/when we switch from Apple CUPS to OpenPrinting CUPS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cups/usersys.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cups/usersys.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,7 +92,9 @@ typedef struct _cups_client_conf_s /**** client.conf config data ****/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int cups_apple_get_boolean(CFStringRef key, int *value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int cups_apple_get_string(CFStringRef key, char *value, size_t valsize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* __APPLE__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int cups_boolean_value(const char *value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1054,6 +1056,7 @@ _cupsSetDefaults(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * 'cups_apple_get_boolean()' - Get a boolean setting from the CUPS preferences.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1075,6 +1078,7 @@ cups_apple_get_boolean(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ((int)bval_set);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* HAVE_SSL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * 'cups_apple_get_string()' - Get a string setting from the CUPS preferences.
</span></pre><pre style='margin:0'>
</pre>