Update Github repository to match macOS 11.2 CUPS sources (cups-494.1).

diff --git a/CHANGES.md b/CHANGES.md
index df7289268c76bdffb6ce981b658c3565635150a9..9e1b74c7e97a640bcf017ece4dd2c903623d0707 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,11 @@
-CHANGES - 2.3.3 - 2020-04-24
+CHANGES - 2.3.4 - 2020-04-24 (IN PROGRESS)
 ============================
 
+Changes in CUPS v2.3.4
+----------------------
+
+- CVE-20XX-YYYY: TODO rdar://61415567 embargo
+
 Changes in CUPS v2.3.3
 ----------------------
 

diff --git a/INSTALL.md b/INSTALL.md
index 37cc94b6b01ef03dbe93bc063277ad079fbaff03..a9482fb75cf382dd02d3894c7e77b4e98f0b6c0d 100644 (file)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,4 +1,4 @@
-INSTALL - CUPS v2.3.3 - 2020-04-24
+INSTALL - CUPS v2.3.4 - 2020-04-24 (IN PROGRESS)
 ==================================
 
 This file describes how to compile and install CUPS from source code. For more

diff --git a/README.md b/README.md
index 700213d787b2e4716b7af49d1887100ceae15905..375f8c340da868eeb77fbafdcbc314c5510f4c3f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-README - CUPS v2.3.3 - 2020-04-24
+README - CUPS v2.3.4 - 2020-04-24 (IN PROGRESS)
 =================================
 
 INTRODUCTION
@@ -157,7 +157,7 @@ This will prevent the filters from misinterpreting your print file.
 LEGAL STUFF
 -----------
 
-Copyright © 2007-2019 by Apple Inc.
+Copyright © 2007-2020 by Apple Inc.
 Copyright © 1997-2007 by Easy Software Products.
 
 CUPS is provided under the terms of the Apache License, Version 2.0 with

diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index 0d009f0ad942a857c28fef3ffc6115911b3a322d..3f03630f01b9793f0095ef6fae379cf4c487f37a 100644 (file)
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -288,11 +288,11 @@ static void status_timer_cb(CFRunLoopTimerRef timer, void *info);
 #define IS_64BIT 1
 #define IS_NOT_64BIT 0
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__arm64e__)
 static pid_t   child_pid;              /* Child PID */
-static void run_legacy_backend(int argc, char *argv[], int fd) _CUPS_NORETURN; /* Starts child backend process running as a ppc executable */
-#endif /* __i386__ || __x86_64__ */
-static void sigterm_handler(int sig);  /* SIGTERM handler */
+static void run_legacy_backend(int argc, char *argv[], int fd) _CUPS_NORETURN; /* Starts child backend process running as a x86_64 executable */
+static void sigterm_handler(int sig);    /* SIGTERM handler */
+#endif /* __arm64e__ */
 static void sigquit_handler(int sig, siginfo_t *si, void *unused) _CUPS_NORETURN;
 
 #ifdef PARSE_PS_ERRORS
@@ -436,18 +436,18 @@ print_device(const char *uri,             /* I - Device URI */
 
     status = registry_open(&driverBundlePath);
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__arm64e__)
     /*
      * If we were unable to load the class drivers for this printer it's
-     * probably because they're ppc or i386. In this case try to run this
-     * backend as i386 or ppc executables so we can use them...
+     * probably because they're x86_64 (or older). In this case try to run this
+     * backend as x86_64 so we can use them...
      */
     if (status == -2)
     {
       run_legacy_backend(argc, argv, print_fd);
       /* Never returns here */
     }
-#endif /* __i386__ || __x86_64__ */
+#endif /* __arm64e__ */
 
     if (status ==  -2)
     {
@@ -2053,11 +2053,11 @@ static void setup_cfLanguage(void)
 }
 
 #pragma mark -
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__arm64e__)
 /*!
  * @function   run_legacy_backend
  *
- * @abstract   Starts child backend process running as a ppc or i386 executable.
+ * @abstract   Starts child backend process running as a x86_64 executable.
  *
  * @result     Never returns; always calls exit().
  *
@@ -2076,18 +2076,14 @@ static void run_legacy_backend(int argc,
 
 
  /*
-  * If we're running as x86_64 or i386 and couldn't load the class driver
-  * (because it's ppc or i386), then try to re-exec ourselves in ppc or i386
-  * mode to try again. If we don't have a ppc or i386 architecture we may be
+  * If we're running as ARM and couldn't load the class driver
+  * (because it's x86_64, i386 or ppc), then try to re-exec ourselves in x86_64
+  * mode to try again. If we don't have that architecture we may be
   * running with the same architecture again so guard against this by setting
   * and testing an environment variable...
   */
 
-#  ifdef __x86_64__
-  usb_legacy_status = getenv("USB_I386_STATUS");
-#  else
-  usb_legacy_status = getenv("USB_PPC_STATUS");
-#  endif /* __x86_64__ */
+  usb_legacy_status = getenv("USB_LEGACY_STATUS");
 
   if (!usb_legacy_status)
   {
@@ -2116,21 +2112,13 @@ static void run_legacy_backend(int argc,
     * Set the environment variable...
     */
 
-#  ifdef __x86_64__
-    setenv("USB_I386_STATUS", "1", false);
-#  else
-    setenv("USB_PPC_STATUS", "1", false);
-#  endif /* __x86_64__ */
+    setenv("USB_LEGACY_STATUS", "1", false);
 
    /*
     * Tell the kernel to use the specified CPU architecture...
     */
 
-#  ifdef __x86_64__
-    cpu_type_t cpu = CPU_TYPE_I386;
-#  else
-    cpu_type_t cpu = CPU_TYPE_POWERPC;
-#  endif /* __x86_64__ */
+    cpu_type_t cpu = CPU_TYPE_X86_64;
     size_t ocount = 1;
     posix_spawnattr_t attrs;
 
@@ -2139,11 +2127,7 @@ static void run_legacy_backend(int argc,
       posix_spawnattr_setsigdefault(&attrs, &oldmask);
       if (posix_spawnattr_setbinpref_np(&attrs, 1, &cpu, &ocount) || ocount != 1)
       {
-#  ifdef __x86_64__
-       perror("DEBUG: Unable to set binary preference to i386");
-#  else
-       perror("DEBUG: Unable to set binary preference to ppc");
-#  endif /* __x86_64__ */
+       perror("DEBUG: Unable to set binary preference to X86_64");
        _cupsLangPrintFilter(stderr, "ERROR",
                             _("Unable to use legacy USB class driver."));
        exit(CUPS_BACKEND_STOP);
@@ -2217,8 +2201,6 @@ static void run_legacy_backend(int argc,
 
   exit(exitstatus);
 }
-#endif /* __i386__ || __x86_64__ */
-
 
 /*
  * 'sigterm_handler()' - SIGTERM handler.
@@ -2227,7 +2209,6 @@ static void run_legacy_backend(int argc,
 static void
 sigterm_handler(int sig)               /* I - Signal */
 {
-#if defined(__i386__) || defined(__x86_64__)
  /*
   * If we started a child process pass the signal on to it...
   */
@@ -2253,8 +2234,8 @@ sigterm_handler(int sig)          /* I - Signal */
       _exit(CUPS_BACKEND_STOP);
     }
   }
-#endif /* __i386__ || __x86_64__ */
 }
+#endif /* __arm64e__ */
 
 
 /*

diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index 393fe65eeeeae55c1958797f2570e8d60b28ffcf..d7c762392924fcfbd5251d885e13d77d7f4bf6e0 100644 (file)
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -1,7 +1,7 @@
 /*
  * LIBUSB interface code for CUPS.
  *
- * Copyright 2007-2019 by Apple Inc.
+ * Copyright 2007-2020 by Apple Inc.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more
  * information.

diff --git a/cgi-bin/var.c b/cgi-bin/var.c
index 349a2184536b8c0474e720755d2d09c20d2c2af5..e8fc9cec87e2c3f14269352ebcbf4127fb9c4893 100644 (file)
--- a/cgi-bin/var.c
+++ b/cgi-bin/var.c
@@ -1,7 +1,7 @@
 /*
  * CGI form variable and array functions for CUPS.
  *
- * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 2007-2020 by Apple Inc.
  * Copyright © 1997-2005 by Easy Software Products.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 86e8bc488781735e751e7858999645ef14ebca38..2b619977cd45a654125742dd360e03be0905883d 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -1,7 +1,7 @@
 dnl
 dnl Compiler stuff for CUPS.
 dnl
-dnl Copyright 2007-2018 by Apple Inc.
+dnl Copyright 2007-2020 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.
@@ -175,7 +175,7 @@ if test -n "$GCC"; then
        # doesn't trigger...
        gccversion=`$CC --version | head -1 | awk '{print $NF}'`
        case "$gccversion" in
-               7.* | 8.*)
+        7.* | 8.* | 9.*)
                        WARNING_OPTIONS="$WARNING_OPTIONS -Wno-format-truncation -Wno-tautological-compare"
                        ;;
        esac

diff --git a/configure b/configure
index 7a7a12f8904a3b935f92717f36804b20847996b8..2958d78df0aa0307169ea122ffe3dd7ab39c4f89 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for CUPS 2.3.3.
+# Generated by GNU Autoconf 2.69 for CUPS 2.3.4.
 #
 # Report bugs to <https://github.com/apple/cups/issues>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.3.3'
-PACKAGE_STRING='CUPS 2.3.3'
+PACKAGE_VERSION='2.3.4'
+PACKAGE_STRING='CUPS 2.3.4'
 PACKAGE_BUGREPORT='https://github.com/apple/cups/issues'
 PACKAGE_URL='https://www.cups.org/'
 
@@ -1467,7 +1467,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures CUPS 2.3.3 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.3.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1532,7 +1532,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CUPS 2.3.3:";;
+     short | recursive ) echo "Configuration of CUPS 2.3.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1713,7 +1713,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CUPS configure 2.3.3
+CUPS configure 2.3.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2177,7 +2177,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by CUPS $as_me 2.3.3, which was
+It was created by CUPS $as_me 2.3.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2694,7 +2694,7 @@ done
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION="2.3.3"
+CUPS_VERSION="2.3.4"
 CUPS_REVISION=""
 CUPS_BUILD="cups-$CUPS_VERSION"
 
@@ -10385,7 +10385,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by CUPS $as_me 2.3.3, which was
+This file was extended by CUPS $as_me 2.3.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10448,7 +10448,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-CUPS config.status 2.3.3
+CUPS config.status 2.3.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index dbf3bda385143fce07fb017c870e41020eecfb53..ae842ff7e5a5f959c247029d0b600eb1c6e63a94 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl
 dnl Configuration script for CUPS.
 dnl
-dnl Copyright © 2007-2019 by Apple Inc.
+dnl Copyright © 2007-2020 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
@@ -12,7 +12,7 @@ dnl We need at least autoconf 2.60...
 AC_PREREQ(2.60)
 
 dnl Package name and version...
-AC_INIT([CUPS], [2.3.3], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.3.4], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
 
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)

diff --git a/cups/cups.h b/cups/cups.h
index 74955ebd6f7d29ff08b42dbf948e42fcef237c25..3793dfbe8e47b8f97fe015581e05a2c8a3c8b02e 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,7 +1,7 @@
 /*
  * API definitions for CUPS.
  *
- * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 2007-2020 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -42,10 +42,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION                 2.0303
+#  define CUPS_VERSION                 2.0304
 #  define CUPS_VERSION_MAJOR           2
 #  define CUPS_VERSION_MINOR           3
-#  define CUPS_VERSION_PATCH           3
+#  define CUPS_VERSION_PATCH           4
 
 #  define CUPS_BC_FD                   3
                                        /* Back-channel file descriptor for

diff --git a/cups/cupspm.md b/cups/cupspm.md
index b6e09baa97003a8a74a90b968d05ad01d81e43f6..f271c89d365488cf5f21a2d4dda0ab566801936d 100644 (file)
--- a/cups/cupspm.md
+++ b/cups/cupspm.md
@@ -1,8 +1,8 @@
 ---
 title: CUPS Programming Manual
 author: Michael R Sweet
-copyright: Copyright © 2007-2019 by Apple Inc. All Rights Reserved.
-version: 2.3.3
+copyright: Copyright © 2007-2020 by Apple Inc. All Rights Reserved.
+version: 2.3.4
 ...
 
 > Please [file issues on Github](https://github.com/apple/cups/issues) to

diff --git a/cups/ipp.c b/cups/ipp.c
index 3d529346c270a6d30edd823b9d8f0a432d43669d..f19747d619356eb07b47d0e89058d495c8f9c9b4 100644 (file)
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1,7 +1,7 @@
 /*
  * Internet Printing Protocol functions for CUPS.
  *
- * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 2007-2020 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
@@ -2866,7 +2866,8 @@ ippReadIO(void       *src,                /* I - Data source */
   unsigned char                *buffer,        /* Data buffer */
                        string[IPP_MAX_TEXT],
                                        /* Small string buffer */
-                       *bufptr;        /* Pointer into buffer */
+                       *bufptr,        /* Pointer into buffer */
+                       *bufptrEnd;     /* Pointer after valid buffer range */
   ipp_attribute_t      *attr;          /* Current attribute */
   ipp_tag_t            tag;            /* Current tag */
   ipp_tag_t            value_tag;      /* Current value tag */
@@ -3441,6 +3442,8 @@ ippReadIO(void       *src,                /* I - Data source */
                }
 
                 bufptr = buffer;
+                bufptrEnd = &buffer[n];
+
 
               /*
                * text-with-language and name-with-language are composite
@@ -3454,7 +3457,7 @@ ippReadIO(void       *src,                /* I - Data source */
 
                n = (bufptr[0] << 8) | bufptr[1];
 
-               if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE) || n >= (int)sizeof(string))
+               if ((bufptr + 2 + n) > bufptrEnd || n >= (int)sizeof(string))
                {
                  _cupsSetError(IPP_STATUS_ERROR_INTERNAL,
                                _("IPP language length overflows value."), 1);
@@ -3481,7 +3484,7 @@ ippReadIO(void       *src,                /* I - Data source */
                 bufptr += 2 + n;
                n = (bufptr[0] << 8) | bufptr[1];
 
-               if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE))
+               if ((bufptr + 2 + n) > bufptrEnd)
                {
                  _cupsSetError(IPP_STATUS_ERROR_INTERNAL,
                                _("IPP string length overflows value."), 1);

diff --git a/cups/ppd.c b/cups/ppd.c
index 199cf0348413cb6e8f30e564c091d6640ca6253f..cf84833a4569b2c339de7240b3f676a9896de430 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -2335,8 +2335,16 @@ ppd_add_attr(ppd_file_t *ppd,            /* I - PPD file data */
   * Copy data over...
   */
 
+  if (!_cups_strcasecmp(spec, "custom") || !_cups_strncasecmp(spec, "custom.", 7))
+  {
+    temp->spec[0] = '_';
+    strlcpy(temp->spec + 1, spec, sizeof(temp->spec) - 1);
+  }
+  else {
+      strlcpy(temp->spec, spec, sizeof(temp->spec));
+  }
+
   strlcpy(temp->name, name, sizeof(temp->name));
-  strlcpy(temp->spec, spec, sizeof(temp->spec));
   strlcpy(temp->text, text, sizeof(temp->text));
   temp->value = (char *)value;
 

diff --git a/doc/help/cupspm.html b/doc/help/cupspm.html
index fbe4f6d88c82057e3e1c80da3b35735370d4379c..e9a80d9c3fda7abfa6f87b928ecb3ecb5025f0e4 100644 (file)
--- a/doc/help/cupspm.html
+++ b/doc/help/cupspm.html
@@ -7,8 +7,8 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
     <meta name="creator" content="codedoc v3.1">
     <meta name="author" content="Michael R Sweet">
-    <meta name="copyright" content="Copyright &#xa9; 2007-2019 by Apple Inc. All Rights Reserved.">
-    <meta name="version" content="2.3.3">
+    <meta name="copyright" content="Copyright &#xa9; 2007-2020 by Apple Inc. All Rights Reserved.">
+    <meta name="version" content="2.3.4">
     <style type="text/css"><!--
 body, p, h1, h2, h3, h4 {
   font-family: sans-serif;
@@ -174,7 +174,7 @@ h3.title {
   <body>
     <h1 class="title">CUPS Programming Manual</h1>
     <p>Michael R Sweet</p>
-    <p>Copyright &#xa9; 2007-2019 by Apple Inc. All Rights Reserved.</p>
+    <p>Copyright &#xa9; 2007-2020 by Apple Inc. All Rights Reserved.</p>
     <div class="contents">
       <h2 class="title">Contents</h2>
       <ul class="contents">

diff --git a/examples/testfile.txt b/examples/testfile.txt
index bad0a31e37f548da258823067d42a0cd3594bcb8..46bbf08483b154c1e7d1826cddfed5abb869cc67 100644 (file)
--- a/examples/testfile.txt
+++ b/examples/testfile.txt
@@ -1,60 +1,60 @@
-All work and no play makes Johhny a dull boy.  All work and no\r
-play makes Johhny a dull boy.  All work and no play makes Johhny\r
-a dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy. All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy. All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy. All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy. All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy. All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy. All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy.  All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.  All\r
-work and no play makes Johhny a dull boy. All work and no play\r
-makes Johhny a dull boy.  All work and no play makes Johhny a\r
-dull boy.  All work and no play makes Johhny a dull boy.\r
+All work and no play makes Johhny a dull boy.  All work and no
+play makes Johhny a dull boy.  All work and no play makes Johhny
+a dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy. All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy. All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy. All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy. All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy. All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy. All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy.  All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.  All
+work and no play makes Johhny a dull boy. All work and no play
+makes Johhny a dull boy.  All work and no play makes Johhny a
+dull boy.  All work and no play makes Johhny a dull boy.

diff --git a/locale/cups.pot b/locale/cups.pot
index 679d18560b411547eeaa977d924c4faca5daff13..b294b02e04b3bac0edddb8cf1e713dc4560ffd8a 100644 (file)
--- a/locale/cups.pot
+++ b/locale/cups.pot
@@ -1,7 +1,7 @@
 #
 # Message catalog template for CUPS.
 #
-# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 2007-2020 by Apple Inc.
 # Copyright © 2005-2007 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -23,7 +23,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: CUPS 2.3.3\n"
+"Project-Id-Version: CUPS 2.3.4\n"
 "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n"
 "POT-Creation-Date: 2019-12-18 20:19-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
index b28c4724ffb131e4ed8e812155e6c0586ff0aad8..a42449765076be5b039f0dab0bc1b96d91e11ae4 100644 (file)
--- a/ppdc/ppdc-source.cxx
+++ b/ppdc/ppdc-source.cxx
@@ -1,7 +1,7 @@
 //
 // Source class for the CUPS PPD Compiler.
 //
-// Copyright 2007-2018 by Apple Inc.
+// Copyright 2007-2020 by Apple Inc.
 // Copyright 2002-2007 by Easy Software Products.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more

diff --git a/scheduler/printers.c b/scheduler/printers.c
index e341bdb0067fe1d08c3fb69f3989afcf2e37cd36..432e87dc5e142ad0eb13d3097bdabe4dde825663 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1,7 +1,7 @@
 /*
  * Printer routines for the CUPS scheduler.
  *
- * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 2007-2020 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

diff --git a/templates/Makefile b/templates/Makefile
index 59720bd686f989f57f86fa371c5773de89d580ba..b0a47dee8b49eeef51ca410744178e3f55a1ac86 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -73,8 +73,6 @@ FILES =       \
                printers.tmpl \
                printers-header.tmpl \
                restart.tmpl \
-               samba-export.tmpl \
-               samba-exported.tmpl \
                search.tmpl \
                set-printer-options-header.tmpl \
                set-printer-options-trailer.tmpl \

diff --git a/vcnet/config.h b/vcnet/config.h
index 76fc7fd5f0a8319e302a6cd513717b900f1c305f..d711ca9794ce0c97e28cb60b2857b137005a19de 100644 (file)
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -1,7 +1,7 @@
 /*
  * Configuration file for CUPS on Windows.
  *
- * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 2007-2020 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -97,8 +97,8 @@ typedef unsigned long useconds_t;
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.3.3"
-#define CUPS_MINIMAL "CUPS/2.3.3"
+#define CUPS_SVERSION "CUPS v2.3.4"
+#define CUPS_MINIMAL "CUPS/2.3.4"
 
 
 /*

diff --git a/xcode/config.h b/xcode/config.h
index 5953431a3ce0f426107c01d4014e2005b05bf7cc..c165c61ab916c11f73d6b1caefc2314a46a35227 100644 (file)
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -1,7 +1,7 @@
 /*
  * Configuration file for CUPS and Xcode.
  *
- * Copyright 2007-2019 by Apple Inc.
+ * Copyright 2007-2020 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products.
  *
  * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -18,8 +18,8 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.3.3"
-#define CUPS_MINIMAL "CUPS/2.3.3"
+#define CUPS_SVERSION "CUPS v2.3.4"
+#define CUPS_MINIMAL "CUPS/2.3.4"
 
 
 /*