Import CUPS v2.0.2

apple · Mar 15, 2016 · 4ef75de · 4ef75de
1 parent 86243a7
commit 4ef75de
Show file tree

Hide file tree

Showing 137 changed files with 4,595 additions and 982 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,49 @@
-CHANGES.txt - 2.0.1 - 2014-11-14
+CHANGES.txt - 2.0.2 - 2015-02-03
 --------------------------------
 
+CHANGES IN CUPS V2.0.2
+
+ - Security: cupsRasterReadPixels buffer overflow with invalid page
+ header and compressed raster data (STR #4551)
+ - Command-line programs were not localized on Mac OS X
+ (<rdar:https://problem/14546232>)
+ - The scheduler incorrectly cleared the MakeModel string in the
+ printers.conf file after a restart (<rdar:https://problem/16827518>)
+ - CUPS did not compile with older versions of GNU TLS (STR #4527)
+ - CUPS did not compile without Avahi or mDNSResponder (STR #4523)
+ - ippLength() did not return the correct length for IPP_TAG_CONST
+ string values.
+ - The scheduler incorrectly aborted jobs after a job was restarted
+ (<rdar:https://problem/19129387>)
+ - The cups-files.conf file contained the old ServerCertificate/Key
+ directives instead of ServerKeychain.
+ - Fixed builds when no SSL/TLS library is available, or when explicitly
+ disabled (STR #4531)
+ - Fixed an OpenBSD charset transcoding issue.
+ - Fixed USB printing on OpenBSD (STR #4525)
+ - The --without-xinetd configure option did not work (STR #4542)
+ - Backends needing to load OS X kernel extensions did not work
+ (<rdar:https://problem/19015679>)
+ - Mapping of PPD keywords to IPP keywords did not work if the PPD
+ keyword was already an IPP keyword (<rdar:https://problem/19121005>)
+ - cupsGetPPD* sent bad requests (STR #4567)
+ - ippserver used the wrong temporary directory on Windows (STR #4547)
+ - ippserver did not handle Bonjour registrations properly (STR #4548)
+ - The scheduler could crash during shutdown if Avahi was shutdown
+ first (STR #4550)
+ - Added a USB quirk rule for Intermec printers (STR #4553)
+ - The scheduler did not always log which configuration file had the
+ error (STR #4559)
+ - The ippfind and ipptool programs now correctly match hostnames with
+ trailing dots (STR #4563)
+ - The ipptool timeout option did not work (STR #4515)
+ - Fixed several issues with client.conf, CUPS_SERVER, and the "-h"
+ option of most commands (STR #4528)
+ - Another change for OpenBSD (STR #4526)
+ - Added Japanese localization (STR #4524)
+ - Documentation changes (STR #4569)
+
+
 CHANGES IN CUPS V2.0.1
 
  - Security: SSLv3 is now disabled by default to protect against the

diff --git a/INSTALL.txt b/INSTALL.txt
@@ -1,4 +1,4 @@
-INSTALL - CUPS v2.0.1 - 2014-11-14
+INSTALL - CUPS v2.0.2 - 2015-02-03
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more
@@ -141,6 +141,10 @@ INSTALLING THE SOFTWARE
 
  gmake install ENTER
 
+ Use the BUILDROOT variable to install to an alternate root directory:
+
+ make BUILDROOT=/some/other/root/directory install ENTER
+
  You can also build binary packages that can be installed on other machines
  using the RPM spec file ("packaging/cups.spec") or EPM list file
  ("packaging/cups.list"). The latter also supports building of binary RPMs,

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 12145 2014-09-02 15:00:50Z msweet $"
+# "$Id: Makefile 12415 2015-01-21 00:03:08Z msweet $"
 #
 # Top-level Makefile for CUPS.
 #
@@ -105,7 +105,7 @@ distclean: clean
  $(RM) doc/index.html
  $(RM) man/client.conf.man man/cups-files.conf.man man/cups-lpd.man man/cups-snmp.man man/cupsaddsmb.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man
  $(RM) packaging/cups.list
- $(RM) scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket
+ $(RM) scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cups-lpdAT.service scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket
  $(RM) templates/header.tmpl
  -$(RM) doc/*/index.html
  -$(RM) templates/*/header.tmpl
@@ -348,5 +348,5 @@ dist: all
 
 
 #
-# End of "$Id: Makefile 12145 2014-09-02 15:00:50Z msweet $".
+# End of "$Id: Makefile 12415 2015-01-21 00:03:08Z msweet $".
 #
diff --git a/README.txt b/README.txt
@@ -1,4 +1,4 @@
-README - CUPS v2.0.1 - 2014-11-14
+README - CUPS v2.0.2 - 2015-02-03
 ---------------------------------
 
 Looking for compile instructions? Read the file "INSTALL.txt" instead...
@@ -140,7 +140,7 @@ PRINTING FILES
 
 LEGAL STUFF
 
- CUPS is Copyright 2007-2014 by Apple Inc. CUPS and the CUPS logo are
+ CUPS is Copyright 2007-2015 by Apple Inc. CUPS and the CUPS logo are
  trademarks of Apple Inc.
 
  The MD5 Digest code is Copyright 1999 Aladdin Enterprises.

diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
@@ -224,3 +224,6 @@
 
 # Canon MX320 (STR #4482)
 0x04A9 0x1736 unidir
+
+# All Intermec devices (STR #4553)
+0x067e no-reattach
diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb-libusb.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id: usb-libusb.c 12349 2014-12-09 22:10:52Z msweet $"
  *
  * LIBUSB interface code for CUPS.
  *
@@ -915,7 +915,7 @@ find_device(usb_cb_t cb, /* I - Callback function */
  write_endp = endp;
  }
 
- if (write_endp >= 0)
+ if (write_endp != 0xff)
  {
  /*
  * Save the best match so far...
@@ -1451,9 +1451,14 @@ open_device(usb_printer_t *printer, /* I - Printer */
  else
  {
  printer->usblp_attached = 0;
- fprintf(stderr, "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" kernel module attached\n",
- devdesc.idVendor, devdesc.idProduct);
- goto error;
+
+ if (errcode != LIBUSB_ERROR_NOT_SUPPORTED)
+ {
+ fprintf(stderr,
+ "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" "
+ "kernel module attached\n", devdesc.idVendor, devdesc.idProduct);
+ goto error;
+ }
  }
 
  /*
@@ -1999,6 +2004,6 @@ soft_reset_printer(
 
 
 /*
- * End of "$Id: usb-libusb.c 11594 2014-02-14 20:09:01Z msweet $".
+ * End of "$Id: usb-libusb.c 12349 2014-12-09 22:10:52Z msweet $".
  */
 
diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: help-index.c 11594 2014-02-14 20:09:01Z msweet $"
+ * "$Id: help-index.c 12344 2014-12-09 21:36:11Z msweet $"
  *
  * Online help index routines for CUPS.
  *
@@ -884,7 +884,7 @@ help_load_file(
 
 
  DEBUG_printf(("2help_load_file(hi=%p, filename=\"%s\", relative=\"%s\", "
- "mtime=%ld)", hi, filename, relative, mtime));
+ "mtime=%ld)", hi, filename, relative, (long)mtime));
 
  if ((fp = cupsFileOpen(filename, "r")) == NULL)
  return (-1);
@@ -1306,5 +1306,5 @@ help_sort_words(help_word_t *w1, /* I - Second word */
 
 
 /*
- * End of "$Id: help-index.c 11594 2014-02-14 20:09:01Z msweet $".
+ * End of "$Id: help-index.c 12344 2014-12-09 21:36:11Z msweet $".
  */
diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
@@ -75,11 +75,8 @@ PageLog @CUPS_LOGDIR@/page_log
 # Location of helper programs...
 #ServerBin @CUPS_SERVERBIN@
 
-# SSL/TLS certificate for the scheduler...
-#ServerCertificate @CUPS_SERVERCERT@
-
-# SSL/TLS private key for the scheduler...
-#ServerKey @CUPS_SERVERKEY@
+# SSL/TLS keychain for the scheduler...
+#ServerKeychain @CUPS_SERVERKEYCHAIN@
 
 # Location of other configuration files...
 #ServerRoot @CUPS_SERVERROOT@

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 12195 2014-10-02 18:45:59Z msweet $"
+dnl "$Id: cups-common.m4 12336 2014-12-09 21:19:52Z msweet $"
 dnl
 dnl Common configuration stuff for CUPS.
 dnl
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION=2.0.1
+CUPS_VERSION=2.0.2
 CUPS_REVISION=
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 # CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
@@ -145,6 +145,9 @@ AC_CHECK_HEADER(iconv.h,
  AC_SEARCH_LIBS(iconv_open,iconv,
  AC_DEFINE(HAVE_ICONV_H)
  SAVELIBS="$SAVELIBS $LIBS")
+ AC_SEARCH_LIBS(libiconv_open,iconv,
+ AC_DEFINE(HAVE_ICONV_H)
+ SAVELIBS="$SAVELIBS $LIBS")
  LIBS="$SAVELIBS")
 
 dnl Checks for Mini-XML (www.minixml.org)...
@@ -462,5 +465,5 @@ esac
 AC_SUBST(BUILDDIRS)
 
 dnl
-dnl End of "$Id: cups-common.m4 12195 2014-10-02 18:45:59Z msweet $".
+dnl End of "$Id: cups-common.m4 12336 2014-12-09 21:19:52Z msweet $".
 dnl
diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-network.m4 11719 2014-03-21 18:07:23Z msweet $"
+dnl "$Id: cups-network.m4 12325 2014-12-09 20:28:51Z msweet $"
 dnl
 dnl Networking stuff for CUPS.
 dnl
@@ -13,7 +13,12 @@ dnl which should have been included with this file. If this file is
 dnl file is missing or damaged, see the license at "http:https://www.cups.org/".
 dnl
 
-AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H))
+AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H),,[
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>])
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(gethostbyaddr, nsl)
 AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS))
@@ -67,5 +72,5 @@ AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET)
 AC_SUBST(CUPS_LISTEN_DOMAINSOCKET)
 
 dnl
-dnl End of "$Id: cups-network.m4 11719 2014-03-21 18:07:23Z msweet $".
+dnl End of "$Id: cups-network.m4 12325 2014-12-09 20:28:51Z msweet $".
 dnl
diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-ssl.m4 12122 2014-08-28 12:55:52Z msweet $"
+dnl "$Id: cups-ssl.m4 12290 2014-12-05 17:25:55Z msweet $"
 dnl
 dnl TLS stuff for CUPS.
 dnl
@@ -20,8 +20,7 @@ AC_ARG_ENABLE(gnutls, [ --enable-gnutls use GNU TLS for SSL/TLS support
 SSLFLAGS=""
 SSLLIBS=""
 have_ssl=0
-CUPS_SERVERCERT=""
-CUPS_SERVERKEY=""
+CUPS_SERVERKEYCHAIN=""
 
 if test x$enable_ssl != xno; then
  dnl Look for CDSA...
@@ -31,7 +30,7 @@ if test x$enable_ssl != xno; then
  have_ssl=1
  AC_DEFINE(HAVE_SSL)
  AC_DEFINE(HAVE_CDSASSL)
- CUPS_SERVERCERT="/Library/Keychains/System.keychain"
+ CUPS_SERVERKEYCHAIN="/Library/Keychains/System.keychain"
 
  dnl Check for the various security headers...
  AC_CHECK_HEADER(Security/SecureTransportPriv.h,
@@ -76,12 +75,12 @@ if test x$enable_ssl != xno; then
  fi
 
  if test $have_ssl = 1; then
- CUPS_SERVERCERT="ssl/server.crt"
- CUPS_SERVERKEY="ssl/server.key"
+ CUPS_SERVERKEYCHAIN="ssl"
 
  SAVELIBS="$LIBS"
  LIBS="$LIBS $SSLLIBS"
  AC_CHECK_FUNC(gnutls_transport_set_pull_timeout_function, AC_DEFINE(HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION))
+ AC_CHECK_FUNC(gnutls_priority_set_direct, AC_DEFINE(HAVE_GNUTLS_PRIORITY_SET_DIRECT))
  LIBS="$SAVELIBS"
  fi
  fi
@@ -96,8 +95,7 @@ elif test x$enable_cdsa = xyes -o x$enable_gnutls = xyes; then
  AC_MSG_ERROR([Unable to enable SSL support.])
 fi
 
-AC_SUBST(CUPS_SERVERCERT)
-AC_SUBST(CUPS_SERVERKEY)
+AC_SUBST(CUPS_SERVERKEYCHAIN)
 AC_SUBST(IPPALIASES)
 AC_SUBST(SSLFLAGS)
 AC_SUBST(SSLLIBS)
@@ -106,5 +104,5 @@ EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)
 
 dnl
-dnl End of "$Id: cups-ssl.m4 12122 2014-08-28 12:55:52Z msweet $".
+dnl End of "$Id: cups-ssl.m4 12290 2014-12-05 17:25:55Z msweet $".
 dnl
diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-startup.m4 11747 2014-03-27 01:15:48Z msweet $"
+dnl "$Id: cups-startup.m4 12351 2014-12-09 22:18:45Z msweet $"
 dnl
 dnl Launch-on-demand/startup stuff for CUPS.
 dnl
@@ -166,11 +166,11 @@ if test "x$xinetd" = x; then
  fi
  done
  fi
-elif test "x$xinet" != xno; then
+elif test "x$xinetd" != xno; then
  XINETD="$xinetd"
 fi
 
 
 dnl
-dnl End of "$Id: cups-startup.m4 11747 2014-03-27 01:15:48Z msweet $".
+dnl End of "$Id: cups-startup.m4 12351 2014-12-09 22:18:45Z msweet $".
 dnl
diff --git a/config.h.in b/config.h.in
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h.in 12140 2014-08-30 01:51:22Z msweet $"
+ * "$Id: config.h.in 12329 2014-12-09 20:50:51Z msweet $"
  *
  * Configuration file for CUPS.
  *
@@ -305,6 +305,13 @@
 #undef HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION
 
 
+/*
+ * Do we have the gnutls_priority_set_direct function?
+ */
+
+#undef HAVE_GNUTLS_PRIORITY_SET_DIRECT
+
+
 /*
  * What Security framework headers do we have?
  */
@@ -624,7 +631,7 @@
 
 #ifdef HAVE_ARC4RANDOM
 # define CUPS_RAND() arc4random()
-# define CUPS_SRAND(v) arc4random_stir()
+# define CUPS_SRAND(v)
 #elif defined(HAVE_RANDOM)
 # define CUPS_RAND() random()
 # define CUPS_SRAND(v) srandom(v)
@@ -712,5 +719,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h.in 12140 2014-08-30 01:51:22Z msweet $".
+ * End of "$Id: config.h.in 12329 2014-12-09 20:50:51Z msweet $".
  */