merge patched-debian/experimental into debian/experimental

52 files changed, 397 insertions, 1018 deletions

diff --git a/CHANGES.md b/CHANGES.md
index ebeef6fed..382282079 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,14 @@
-CHANGES - 2.3b6 - 2018-12-07
+CHANGES - 2.3b6 - 2018-12-14
 ============================
 
+Changes in CUPS v2.3b7
+----------------------
+
+- Fixed some build failures (Issue #5451, Issue #5463)
+- Running ppdmerge with the same input and output filenames did not work as
+  advertised (Issue #5455)
+
+
 Changes in CUPS v2.3b6
 ----------------------
 
diff --git a/INSTALL.md b/INSTALL.md
index 22e130eba..24a0a2609 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,4 +1,4 @@
-INSTALL - CUPS v2.3b6 - 2018-12-07
+INSTALL - CUPS v2.3b7 - 2018-12-14
 ==================================
 
 This file describes how to compile and install CUPS from source code. For more
diff --git a/README.md b/README.md
index c1379fc58..ddd5ce095 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-README - CUPS v2.3b6 - 2018-12-07
+README - CUPS v2.3b7 - 2018-12-14
 =================================
 
 Looking for compile instructions?  Read the file `INSTALL.md` instead...
diff --git a/configure b/configure
index 92da33358..ec44fb644 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for CUPS 2.3b6.
+# Generated by GNU Autoconf 2.69 for CUPS 2.3b7.
 #
 # Report bugs to <https://github.com/apple/cups/issues>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -560,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.3b6'
-PACKAGE_STRING='CUPS 2.3b6'
+PACKAGE_VERSION='2.3b7'
+PACKAGE_STRING='CUPS 2.3b7'
 PACKAGE_BUGREPORT='https://github.com/apple/cups/issues'
 PACKAGE_URL='https://www.cups.org/'
 
@@ -1371,8 +1391,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1458,7 +1476,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.3b6 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.3b7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1523,7 +1541,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CUPS 2.3b6:";;
+     short | recursive ) echo "Configuration of CUPS 2.3b7:";;
    esac
   cat <<\_ACEOF
 
@@ -1704,10 +1722,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CUPS configure 2.3b6
-generated by GNU Autoconf 2.68
+CUPS configure 2.3b7
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1858,7 +1876,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2168,8 +2186,8 @@ 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.3b6, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by CUPS $as_me 2.3b7, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2661,7 +2679,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CODE_SIGN="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2691,7 +2709,7 @@ done
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION="2.3b6"
+CUPS_VERSION="2.3b7"
 CUPS_REVISION=""
 CUPS_BUILD="cups-$CUPS_VERSION"
 
@@ -2737,7 +2755,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2785,7 +2803,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2829,7 +2847,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3273,8 +3291,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3524,7 +3541,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3568,7 +3585,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3770,7 +3787,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3810,7 +3827,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3863,7 +3880,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3903,7 +3920,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3943,7 +3960,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3983,7 +4000,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4023,7 +4040,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4063,7 +4080,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4103,7 +4120,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4143,7 +4160,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4183,7 +4200,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_RMDIR="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4223,7 +4240,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4263,7 +4280,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_XDGOPEN="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4339,7 +4356,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4382,7 +4399,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4792,7 +4809,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4858,7 +4875,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -7800,7 +7817,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7843,7 +7860,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8395,7 +8412,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -8438,7 +8455,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -9009,6 +9026,8 @@ _ACEOF
 esac
 rm -rf conftest*
   fi
+
+
 fi
 
 
@@ -10476,16 +10495,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -10545,28 +10564,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -10587,8 +10594,8 @@ 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.3b6, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by CUPS $as_me 2.3b7, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -10650,11 +10657,11 @@ _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.3b6
-configured by $0, generated by GNU Autoconf 2.68,
+CUPS config.status 2.3b7
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -10743,7 +10750,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
diff --git a/configure.ac b/configure.ac
index b7c2f985e..3307c13f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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.3b6], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.3b7], [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/Dependencies b/cups/Dependencies
index 7f71eaa25..b30c76994 100644
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -1,9 +1,3 @@
-adminutil.o: adminutil.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  debug-internal.h debug-private.h ppd.h cups.h raster.h adminutil.h
 array.o: array.c ../cups/cups.h file.h versioning.h ipp.h http.h array.h \
   language.h pwg.h string-private.h ../config.h ../cups/versioning.h \
   debug-internal.h debug-private.h array-private.h ../cups/array.h
@@ -13,14 +7,6 @@ auth.o: auth.c cups-private.h string-private.h ../config.h \
   pwg.h http-private.h ../cups/language.h ../cups/http.h \
   language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
   debug-internal.h debug-private.h
-backchannel.o: backchannel.c cups.h file.h versioning.h ipp.h http.h \
-  array.h language.h pwg.h
-backend.o: backend.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  backend.h ppd.h cups.h raster.h
 debug.o: debug.c cups-private.h string-private.h ../config.h \
   ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
   ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
@@ -65,15 +51,6 @@ file.o: file.c file-private.h cups-private.h string-private.h ../config.h \
   pwg.h http-private.h ../cups/language.h ../cups/http.h \
   language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
   debug-internal.h debug-private.h
-getdevices.o: getdevices.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  debug-internal.h debug-private.h adminutil.h cups.h
-getifaddrs.o: getifaddrs.c http-private.h ../config.h ../cups/language.h \
-  array.h versioning.h ../cups/http.h ipp-private.h ../cups/cups.h \
-  file.h ipp.h http.h language.h pwg.h
 getputfile.o: getputfile.c cups-private.h string-private.h ../config.h \
   ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
   ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
@@ -161,6 +138,96 @@ options.o: options.c cups-private.h string-private.h ../config.h \
   pwg.h http-private.h ../cups/language.h ../cups/http.h \
   language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
   debug-internal.h debug-private.h
+pwg-media.o: pwg-media.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  debug-internal.h debug-private.h
+raster-error.o: raster-error.c cups-private.h string-private.h \
+  ../config.h ../cups/versioning.h array-private.h ../cups/array.h \
+  versioning.h ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h \
+  language.h pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  raster-private.h raster.h cups.h ../cups/debug-private.h \
+  ../cups/string-private.h debug-internal.h debug-private.h
+raster-stream.o: raster-stream.c raster-private.h raster.h cups.h file.h \
+  versioning.h ipp.h http.h array.h language.h pwg.h ../cups/cups.h \
+  ../cups/debug-private.h ../cups/versioning.h ../cups/string-private.h \
+  ../config.h debug-internal.h debug-private.h
+raster-stubs.o: raster-stubs.c raster-private.h raster.h cups.h file.h \
+  versioning.h ipp.h http.h array.h language.h pwg.h ../cups/cups.h \
+  ../cups/debug-private.h ../cups/versioning.h ../cups/string-private.h \
+  ../config.h
+request.o: request.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  debug-internal.h debug-private.h
+snprintf.o: snprintf.c string-private.h ../config.h ../cups/versioning.h
+string.o: string.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  debug-internal.h debug-private.h
+tempfile.o: tempfile.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  debug-internal.h debug-private.h
+thread.o: thread.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h
+tls.o: tls.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  debug-internal.h debug-private.h tls-darwin.c
+transcode.o: transcode.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  debug-internal.h debug-private.h
+usersys.o: usersys.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  debug-internal.h debug-private.h
+util.o: util.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  debug-internal.h debug-private.h
+adminutil.o: adminutil.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  debug-internal.h debug-private.h ppd.h cups.h raster.h adminutil.h
+backchannel.o: backchannel.c cups.h file.h versioning.h ipp.h http.h \
+  array.h language.h pwg.h
+backend.o: backend.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  backend.h ppd.h cups.h raster.h
+getdevices.o: getdevices.c cups-private.h string-private.h ../config.h \
+  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+  pwg.h http-private.h ../cups/language.h ../cups/http.h \
+  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+  debug-internal.h debug-private.h adminutil.h cups.h
+getifaddrs.o: getifaddrs.c getifaddrs-internal.h ../config.h
 ppd.o: ppd.c cups-private.h string-private.h ../config.h \
   ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
   ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
@@ -226,34 +293,14 @@ ppd-util.o: ppd-util.c cups-private.h string-private.h ../config.h \
   language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
   ppd-private.h ../cups/ppd.h cups.h raster.h debug-internal.h \
   debug-private.h
-pwg-media.o: pwg-media.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  debug-internal.h debug-private.h
-raster-error.o: raster-error.c cups-private.h string-private.h \
-  ../config.h ../cups/versioning.h array-private.h ../cups/array.h \
-  versioning.h ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h \
-  language.h pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  raster-private.h raster.h cups.h ../cups/debug-private.h \
-  ../cups/string-private.h debug-internal.h debug-private.h
 raster-interpret.o: raster-interpret.c ../cups/raster-private.h raster.h \
   cups.h file.h versioning.h ipp.h http.h array.h language.h pwg.h \
   ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h \
   ../cups/string-private.h ../config.h ../cups/ppd-private.h \
   ../cups/ppd.h pwg-private.h debug-internal.h debug-private.h
-raster-stream.o: raster-stream.c raster-private.h raster.h cups.h file.h \
-  versioning.h ipp.h http.h array.h language.h pwg.h ../cups/cups.h \
-  ../cups/debug-private.h ../cups/versioning.h ../cups/string-private.h \
-  ../config.h debug-internal.h debug-private.h
-request.o: request.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  debug-internal.h debug-private.h
+raster-interstub.o: raster-interstub.c ../cups/ppd-private.h \
+  ../cups/cups.h file.h versioning.h ipp.h http.h array.h language.h \
+  pwg.h ../cups/ppd.h cups.h raster.h pwg-private.h
 sidechannel.o: sidechannel.c sidechannel.h versioning.h cups-private.h \
   string-private.h ../config.h ../cups/versioning.h array-private.h \
   ../cups/array.h ipp-private.h ../cups/cups.h file.h ipp.h http.h \
@@ -266,48 +313,6 @@ snmp.o: snmp.c cups-private.h string-private.h ../config.h \
   pwg.h http-private.h ../cups/language.h ../cups/http.h \
   language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
   snmp-private.h debug-internal.h debug-private.h
-snprintf.o: snprintf.c string-private.h ../config.h ../cups/versioning.h
-string.o: string.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  debug-internal.h debug-private.h
-tempfile.o: tempfile.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  debug-internal.h debug-private.h
-thread.o: thread.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h
-tls.o: tls.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  debug-internal.h debug-private.h tls-darwin.c
-transcode.o: transcode.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  debug-internal.h debug-private.h
-usersys.o: usersys.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  debug-internal.h debug-private.h
-util.o: util.c cups-private.h string-private.h ../config.h \
-  ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
-  ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
-  pwg.h http-private.h ../cups/language.h ../cups/http.h \
-  language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
-  debug-internal.h debug-private.h
 raster-interstub.o: raster-interstub.c ../cups/ppd-private.h \
   ../cups/cups.h file.h versioning.h ipp.h http.h array.h language.h \
   pwg.h ../cups/ppd.h cups.h raster.h pwg-private.h
diff --git a/cups/getifaddrs-internal.h b/cups/getifaddrs-internal.h
new file mode 100644
index 000000000..35e98be77
--- /dev/null
+++ b/cups/getifaddrs-internal.h
@@ -0,0 +1,113 @@
+/*
+ * getifaddrs definitions for CUPS.
+ *
+ * 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.
+ */
+
+#ifndef _CUPS_GETIFADDRS_INTERNAL_H_
+#  define _CUPS_GETIFADDRS_INTERNAL_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include "config.h"
+#  ifdef _WIN32
+#    define _WINSOCK_DEPRECATED_NO_WARNINGS 1
+#    include <io.h>
+#    include <winsock2.h>
+#    define CUPS_SOCAST (const char *)
+#  else
+#    include <unistd.h>
+#    include <fcntl.h>
+#    include <sys/socket.h>
+#    define CUPS_SOCAST
+#  endif /* _WIN32 */
+
+#  if defined(__APPLE__) && !defined(_SOCKLEN_T)
+/*
+ * macOS 10.2.x does not define socklen_t, and in fact uses an int instead of
+ * unsigned type for length values...
+ */
+
+typedef int socklen_t;
+#  endif /* __APPLE__ && !_SOCKLEN_T */
+
+#  ifndef _WIN32
+#    include <net/if.h>
+#    include <resolv.h>
+#    ifdef HAVE_GETIFADDRS
+#      include <ifaddrs.h>
+#    else
+#      include <sys/ioctl.h>
+#      ifdef HAVE_SYS_SOCKIO_H
+#        include <sys/sockio.h>
+#      endif /* HAVE_SYS_SOCKIO_H */
+#    endif /* HAVE_GETIFADDRS */
+#  endif /* !_WIN32 */
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+
+/*
+ * Some OS's don't have getifaddrs() and freeifaddrs()...
+ */
+
+#  if !defined(_WIN32) && !defined(HAVE_GETIFADDRS)
+#    ifdef ifa_dstaddr
+#      undef ifa_dstaddr
+#    endif /* ifa_dstaddr */
+#    ifndef ifr_netmask
+#      define ifr_netmask ifr_addr
+#    endif /* !ifr_netmask */
+
+struct ifaddrs				/**** Interface Structure ****/
+{
+  struct ifaddrs	*ifa_next;	/* Next interface in list */
+  char			*ifa_name;	/* Name of interface */
+  unsigned int		ifa_flags;	/* Flags (up, point-to-point, etc.) */
+  struct sockaddr	*ifa_addr,	/* Network address */
+			*ifa_netmask;	/* Address mask */
+  union
+  {
+    struct sockaddr	*ifu_broadaddr;	/* Broadcast address of this interface. */
+    struct sockaddr	*ifu_dstaddr;	/* Point-to-point destination address. */
+  } ifa_ifu;
+
+  void			*ifa_data;	/* Interface statistics */
+};
+
+#    ifndef ifa_broadaddr
+#      define ifa_broadaddr ifa_ifu.ifu_broadaddr
+#    endif /* !ifa_broadaddr */
+#    ifndef ifa_dstaddr
+#      define ifa_dstaddr ifa_ifu.ifu_dstaddr
+#    endif /* !ifa_dstaddr */
+
+extern int	_cups_getifaddrs(struct ifaddrs **addrs) _CUPS_PRIVATE;
+#    define getifaddrs _cups_getifaddrs
+extern void	_cups_freeifaddrs(struct ifaddrs *addrs) _CUPS_PRIVATE;
+#    define freeifaddrs _cups_freeifaddrs
+#  endif /* !_WIN32 && !HAVE_GETIFADDRS */
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+
+#endif /* !_CUPS_GETIFADDRS_INTERNAL_H_ */
diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c
index 4e8ed8fb3..f751aa858 100644
--- a/cups/getifaddrs.c
+++ b/cups/getifaddrs.c
@@ -1,7 +1,7 @@
 /*
  * Network interface functions for CUPS.
  *
- * Copyright © 2007-2010 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
@@ -12,7 +12,7 @@
  * Include necessary headers.
  */
 
-#include "http-private.h"
+#include "getifaddrs-internal.h"
 
 
 #ifndef HAVE_GETIFADDRS
diff --git a/cups/http-private.h b/cups/http-private.h
index cfcabd304..9a789cf74 100644
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -332,48 +332,6 @@ extern const char *_cups_hstrerror(int error);
 
 
 /*
- * Some OS's don't have getifaddrs() and freeifaddrs()...
- */
-
-#  if !defined(_WIN32) && !defined(HAVE_GETIFADDRS)
-#    ifdef ifa_dstaddr
-#      undef ifa_dstaddr
-#    endif /* ifa_dstaddr */
-#    ifndef ifr_netmask
-#      define ifr_netmask ifr_addr
-#    endif /* !ifr_netmask */
-
-struct ifaddrs				/**** Interface Structure ****/
-{
-  struct ifaddrs	*ifa_next;	/* Next interface in list */
-  char			*ifa_name;	/* Name of interface */
-  unsigned int		ifa_flags;	/* Flags (up, point-to-point, etc.) */
-  struct sockaddr	*ifa_addr,	/* Network address */
-			*ifa_netmask;	/* Address mask */
-  union
-  {
-    struct sockaddr	*ifu_broadaddr;	/* Broadcast address of this interface. */
-    struct sockaddr	*ifu_dstaddr;	/* Point-to-point destination address. */
-  } ifa_ifu;
-
-  void			*ifa_data;	/* Interface statistics */
-};
-
-#    ifndef ifa_broadaddr
-#      define ifa_broadaddr ifa_ifu.ifu_broadaddr
-#    endif /* !ifa_broadaddr */
-#    ifndef ifa_dstaddr
-#      define ifa_dstaddr ifa_ifu.ifu_dstaddr
-#    endif /* !ifa_dstaddr */
-
-extern int	_cups_getifaddrs(struct ifaddrs **addrs) _CUPS_PRIVATE;
-#    define getifaddrs _cups_getifaddrs
-extern void	_cups_freeifaddrs(struct ifaddrs *addrs) _CUPS_PRIVATE;
-#    define freeifaddrs _cups_freeifaddrs
-#  endif /* !_WIN32 && !HAVE_GETIFADDRS */
-
-
-/*
  * Prototypes...
  */
 
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 50a8dfe47..bb0ff33af 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,7 +1,7 @@
 # see git-dpm(1) from git-dpm package
-aca9838965b5bcd00e3c8b2ccca0a36c99d0c35f
-aca9838965b5bcd00e3c8b2ccca0a36c99d0c35f
-c13e2f44eb15bcdbff9126df86d1ed9a5108e47c
+91981a9214c524b9054d30bd755d930ad2ad8a6d
+91981a9214c524b9054d30bd755d930ad2ad8a6d
+b1e7afd5964cbe1aeab6f0a2d5b33884693a143a
 b1e7afd5964cbe1aeab6f0a2d5b33884693a143a
 cups_2.3~b7.orig.tar.gz
 4bbc3c8ff3c756c2d3eaf5f39aba867eeebf9195
diff --git a/debian/patches/0001-Fix-compile-errors-not-sure-why-these-didn-t-show-up.patch b/debian/patches/0001-Fix-compile-errors-not-sure-why-these-didn-t-show-up.patch
deleted file mode 100644
index 430d5c46b..000000000
--- a/debian/patches/0001-Fix-compile-errors-not-sure-why-these-didn-t-show-up.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From 065632e2095bcb32f15a370633e60d6a6a3dd78e Mon Sep 17 00:00:00 2001
-From: Michael R Sweet <michael.r.sweet@gmail.com>
-Date: Sat, 8 Dec 2018 08:12:52 -0500
-Subject: Fix compile errors - not sure why these didn't show up before...
-
----
- cups/adminutil.c | 197 -----------------------------------------------
- scheduler/main.c |   2 +-
- 2 files changed, 1 insertion(+), 198 deletions(-)
-
-diff --git a/cups/adminutil.c b/cups/adminutil.c
-index 5ecada44c..1a5067f1b 100644
---- a/cups/adminutil.c
-+++ b/cups/adminutil.c
-@@ -32,12 +32,6 @@ static http_status_t	get_cupsd_conf(http_t *http, _cups_globals_t *cg,
- 			               time_t last_update, char *name,
- 				       size_t namelen, int *remote);
- static void		invalidate_cupsd_cache(_cups_globals_t *cg);
--static void		write_option(cups_file_t *dstfp, int order,
--			             const char *name, const char *text,
--				     const char *attrname,
--		        	     ipp_attribute_t *suppattr,
--				     ipp_attribute_t *defattr, int defval,
--				     int valcount);
- 
- 
- /*
-@@ -1330,88 +1324,6 @@ cupsAdminSetServerSettings(
- }
- 
- 
--/*
-- * 'do_samba_command()' - Do a SAMBA command.
-- */
--
--static int				/* O - Status of command */
--do_samba_command(const char *command,	/* I - Command to run */
--                 const char *address,	/* I - Address for command */
--                 const char *subcmd,	/* I - Sub-command */
--		 const char *authfile,	/* I - Samba authentication file */
--		 FILE *logfile)		/* I - Optional log file */
--{
--#ifdef _WIN32
--  return (1);				/* Always fail on Windows... */
--
--#else
--  int		status;			/* Status of command */
--  int		pid;			/* Process ID of child */
--
--
--  if (logfile)
--    _cupsLangPrintf(logfile,
--                    _("Running command: %s %s -N -A %s -c \'%s\'"),
--        	    command, address, authfile, subcmd);
--
--  if ((pid = fork()) == 0)
--  {
--   /*
--    * Child goes here, redirect stdin/out/err and execute the command...
--    */
--
--    int fd = open("/dev/null", O_RDONLY);
--
--    if (fd > 0)
--    {
--      dup2(fd, 0);
--      close(fd);
--    }
--
--    if (logfile)
--      dup2(fileno(logfile), 1);
--    else if ((fd = open("/dev/null", O_WRONLY)) > 1)
--    {
--      dup2(fd, 1);
--      close(fd);
--    }
--
--    dup2(1, 2);
--
--    execlp(command, command, address, "-N", "-A", authfile, "-c", subcmd,
--           (char *)0);
--    exit(errno);
--  }
--  else if (pid < 0)
--  {
--    status = -1;
--
--    if (logfile)
--      _cupsLangPrintf(logfile, _("Unable to run \"%s\": %s"),
--                      command, strerror(errno));
--  }
--  else
--  {
--   /*
--    * Wait for the process to complete...
--    */
--
--    while (wait(&status) != pid);
--  }
--
--  if (logfile)
--    _cupsLangPuts(logfile, "");
--
--  DEBUG_printf(("9do_samba_command: status=%d", status));
--
--  if (WIFEXITED(status))
--    return (WEXITSTATUS(status));
--  else
--    return (-WTERMSIG(status));
--#endif /* _WIN32 */
--}
--
--
- /*
-  * 'get_cupsd_conf()' - Get the current cupsd.conf file.
-  */
-@@ -1527,112 +1439,3 @@ invalidate_cupsd_cache(
-   cg->cupsd_num_settings = 0;
-   cg->cupsd_settings     = NULL;
- }
--
--
--/*
-- * 'write_option()' - Write a CUPS option to a PPD file.
-- */
--
--static void
--write_option(cups_file_t     *dstfp,	/* I - PPD file */
--             int             order,	/* I - Order dependency */
--             const char      *name,	/* I - Option name */
--	     const char      *text,	/* I - Option text */
--             const char      *attrname,	/* I - Attribute name */
--             ipp_attribute_t *suppattr,	/* I - IPP -supported attribute */
--	     ipp_attribute_t *defattr,	/* I - IPP -default attribute */
--	     int             defval,	/* I - Default value number */
--	     int             valcount)	/* I - Number of values */
--{
--  int	i;				/* Looping var */
--
--
--  cupsFilePrintf(dstfp, "*JCLOpenUI *%s/%s: PickOne\n"
--                        "*OrderDependency: %d JCLSetup *%s\n",
--                 name, text, order, name);
--
--  if (defattr->value_tag == IPP_TAG_INTEGER)
--  {
--   /*
--    * Do numeric options with a range or list...
--    */
--
--    cupsFilePrintf(dstfp, "*Default%s: %d\n", name,
--                   defattr->values[defval].integer);
--
--    if (suppattr->value_tag == IPP_TAG_RANGE)
--    {
--     /*
--      * List each number in the range...
--      */
--
--      for (i = suppattr->values[0].range.lower;
--           i <= suppattr->values[0].range.upper;
--	   i ++)
--      {
--        cupsFilePrintf(dstfp, "*%s %d: \"", name, i);
--
--        if (valcount == 1)
--	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\n\"\n*End\n",
--	                 attrname, i);
--        else if (defval == 0)
--	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\"\n", attrname, i);
--        else if (defval < (valcount - 1))
--	  cupsFilePrintf(dstfp, ",%d\"\n", i);
--        else
--	  cupsFilePrintf(dstfp, ",%d\n\"\n*End\n", i);
--      }
--    }
--    else
--    {
--     /*
--      * List explicit numbers...
--      */
--
--      for (i = 0; i < suppattr->num_values; i ++)
--      {
--        cupsFilePrintf(dstfp, "*%s %d: \"", name, suppattr->values[i].integer);
--
--        if (valcount == 1)
--	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\n\"\n*End\n", attrname,
--	          suppattr->values[i].integer);
--        else if (defval == 0)
--	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\"\n", attrname,
--	          suppattr->values[i].integer);
--        else if (defval < (valcount - 1))
--	  cupsFilePrintf(dstfp, ",%d\"\n", suppattr->values[i].integer);
--        else
--	  cupsFilePrintf(dstfp, ",%d\n\"\n*End\n", suppattr->values[i].integer);
--      }
--    }
--  }
--  else
--  {
--   /*
--    * Do text options with a list...
--    */
--
--    cupsFilePrintf(dstfp, "*Default%s: %s\n", name,
--                   defattr->values[defval].string.text);
--
--    for (i = 0; i < suppattr->num_values; i ++)
--    {
--      cupsFilePrintf(dstfp, "*%s %s: \"", name,
--                     suppattr->values[i].string.text);
--
--      if (valcount == 1)
--	cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%s\n\"\n*End\n", attrname,
--	        suppattr->values[i].string.text);
--      else if (defval == 0)
--	cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%s\"\n", attrname,
--	        suppattr->values[i].string.text);
--      else if (defval < (valcount - 1))
--	cupsFilePrintf(dstfp, ",%s\"\n", suppattr->values[i].string.text);
--      else
--	cupsFilePrintf(dstfp, ",%s\n\"\n*End\n",
--	               suppattr->values[i].string.text);
--    }
--  }
--
--  cupsFilePrintf(dstfp, "*JCLCloseUI: *%s\n\n", name);
--}
-diff --git a/scheduler/main.c b/scheduler/main.c
-index ce7df89c0..5b00efae2 100644
---- a/scheduler/main.c
-+++ b/scheduler/main.c
-@@ -155,7 +155,7 @@ main(int  argc,				/* I - Number of command-line args */
-   for (i = 1; i < argc; i ++)
-   {
-     if (!strcmp(argv[i], "--help"))
--      usage();
-+      usage(0);
-     else if (argv[i][0] == '-')
-     {
-       for (opt = argv[i] + 1; *opt != '\0'; opt ++)
diff --git a/debian/patches/0004-Install-root-backends-world-readable.patch b/debian/patches/0003-Install-root-backends-world-readable.patch
index 65d7a1332..cf5c2f676 100644
--- a/debian/patches/0004-Install-root-backends-world-readable.patch
+++ b/debian/patches/0003-Install-root-backends-world-readable.patch
@@ -1,4 +1,4 @@
-From 3f4a951bfba38fc7f590cace7a10aac7f8bab088 Mon Sep 17 00:00:00 2001
+From 1cf5a4e5689ca9d224332b8d267454b6cd8a31a4 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:06 +0200
 Subject: Install root backends world-readable
diff --git a/debian/patches/0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
index 97b6cde0b..fe5130914 100644
--- a/debian/patches/0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+++ b/debian/patches/0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -1,4 +1,4 @@
-From 58cbe1f0e0faa219b76f39eae13d5ecf2600224e Mon Sep 17 00:00:00 2001
+From 8da26a347a779bc58ad2baa4ab7285741dc872b0 Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:30 +0200
 Subject: Let snmp backend also use manufacturer-specific MIBs
diff --git a/debian/patches/0034-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0033-Build-mantohtml-with-the-build-architecture-compiler.patch
index 5252f50d1..b396c05ce 100644
--- a/debian/patches/0034-Build-mantohtml-with-the-build-architecture-compiler.patch
+++ b/debian/patches/0033-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -1,4 +1,4 @@
-From b5e5e1a472bdfff510390f6aad3022335e9a6e79 Mon Sep 17 00:00:00 2001
+From 8170a208349485cff63d4406e7b0699c2b14c5ce Mon Sep 17 00:00:00 2001
 From: Helmut Grohne <helmut@subdivi.de>
 Date: Tue, 9 Aug 2016 18:11:49 +0200
 Subject: Build mantohtml with the build architecture compiler
@@ -30,7 +30,7 @@ index 367f73c81..9c5d8f39e 100644
  CXX		=	@LIBTOOL_CXX@ @CXX@
  DSO		=	@DSO@
 diff --git a/configure.ac b/configure.ac
-index b79bc3c5d..b7c2f985e 100644
+index 9f5b41d5d..3307c13f9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -19,6 +19,15 @@ sinclude(config-scripts/cups-common.m4)
diff --git a/debian/patches/0036-Fix-service_idle_exit-build-issue-with-Werror-maybe-.patch b/debian/patches/0036-Fix-service_idle_exit-build-issue-with-Werror-maybe-.patch
deleted file mode 100644
index e0df008d3..000000000
--- a/debian/patches/0036-Fix-service_idle_exit-build-issue-with-Werror-maybe-.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From aca9838965b5bcd00e3c8b2ccca0a36c99d0c35f Mon Sep 17 00:00:00 2001
-From: Didier Raboud <odyx@debian.org>
-Date: Fri, 14 Dec 2018 15:46:56 +0100
-Subject: Fix service_idle_exit build issue with -Werror=maybe-unitialized
-
----
- scheduler/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scheduler/main.c b/scheduler/main.c
-index 5b00efae2..3b258a70a 100644
---- a/scheduler/main.c
-+++ b/scheduler/main.c
-@@ -129,7 +129,7 @@ main(int  argc,				/* I - Number of command-line args */
-   time_t		netif_time = 0;	/* Time since last network update */
- #endif /* __APPLE__ */
- #if defined(HAVE_ONDEMAND)
--  int			service_idle_exit;
-+  int			service_idle_exit = 0;
- 					/* Idle exit on select timeout? */
- #endif /* HAVE_ONDEMAND */
- 
diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch
index e1d10f32e..23806bd5e 100644
--- a/debian/patches/airprint-support.patch
+++ b/debian/patches/airprint-support.patch
@@ -1,4 +1,4 @@
-From bb47ff28be53f135572f3bc4f0fd4fda23b33624 Mon Sep 17 00:00:00 2001
+From ca92574b58092fb0e824ce9e6e44c582daacae57 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:29 +0200
 Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch
index c62e45d11..6e5cc84aa 100644
--- a/debian/patches/confdirperms.patch
+++ b/debian/patches/confdirperms.patch
@@ -1,4 +1,4 @@
-From 5ad311f768e51520d73057c20483f1bbeaf62b6b Mon Sep 17 00:00:00 2001
+From e81b709d97fe38fc2c4815df04acff8355c8a5d3 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:41 +0200
 Subject: Do not mess with the permissions of cupsd.conf.
diff --git a/debian/patches/cups-set-default-error-policy-retry-job.patch b/debian/patches/cups-set-default-error-policy-retry-job.patch
index d70ce41cf..fba651d63 100644
--- a/debian/patches/cups-set-default-error-policy-retry-job.patch
+++ b/debian/patches/cups-set-default-error-policy-retry-job.patch
@@ -1,4 +1,4 @@
-From 5365bcb9966544a5dea91330820066f6ce139cb8 Mon Sep 17 00:00:00 2001
+From fd31b7701639ede0d6424eff18a76f3c815d249c Mon Sep 17 00:00:00 2001
 From: Martin Pitt <martin.pitt@ubuntu.com>
 Date: Tue, 9 Aug 2016 18:11:47 +0200
 Subject: Set default job error policy to "retry-job", since it is less
diff --git a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
index f591b2231..07775bbe5 100644
--- a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
+++ b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
@@ -1,4 +1,4 @@
-From 951b3718cb0011b3b8062361923dbc1db3aafc1d Mon Sep 17 00:00:00 2001
+From 4b2c249f95612fe54deceb76e1fbe1d0813b20dd Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:46 +0200
 Subject: Set the default for SyncOnClose to Yes
diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch
index 4560d4242..3136560f6 100644
--- a/debian/patches/debianize_cups-config.patch
+++ b/debian/patches/debianize_cups-config.patch
@@ -1,4 +1,4 @@
-From 59338e4ef6c8cdd4c08547e12734902c341f15e6 Mon Sep 17 00:00:00 2001
+From a29e45d362f54d695f420d8a673d75d5d3ab2338 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:49 +0200
 Subject: Use dpkg-architecture in cups-config to make it
diff --git a/debian/patches/default_log_settings.patch b/debian/patches/default_log_settings.patch
index 187abfbef..07c8c52a5 100644
--- a/debian/patches/default_log_settings.patch
+++ b/debian/patches/default_log_settings.patch
@@ -1,4 +1,4 @@
-From 2dccbe4982487ce8c9df786f480e79133bd6df0b Mon Sep 17 00:00:00 2001
+From f920257fe1bb37089e7bb4bf70c4644a88f22341 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:40 +0200
 Subject: Deactivate CUPS' own log rotating as the system already provides a
diff --git a/debian/patches/do-not-broadcast-with-hostnames.patch b/debian/patches/do-not-broadcast-with-hostnames.patch
index 943eb36bb..d9a7a1761 100644
--- a/debian/patches/do-not-broadcast-with-hostnames.patch
+++ b/debian/patches/do-not-broadcast-with-hostnames.patch
@@ -1,4 +1,4 @@
-From 386e44d4ba979bc65263cf805895e1c90f28d192 Mon Sep 17 00:00:00 2001
+From 2aeca51f4df7331f4493965ce7159b92a7436502 Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:35 +0200
 Subject: Do not use host names for broadcasting print queues and
diff --git a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
index 6555c278e..82bdd3a39 100644
--- a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+++ b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
@@ -1,4 +1,4 @@
-From 642cd5d5d0f64baa01f96691b3b934f03f292b5b Mon Sep 17 00:00:00 2001
+From 083c506f52ca9a6adace8f090b82d0cdc4e7c6ea Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:07 +0200
 Subject: Fix jobs with multiple files or multiple formats
diff --git a/debian/patches/log-debug-history-nearly-unlimited.patch b/debian/patches/log-debug-history-nearly-unlimited.patch
index 4f155ba2b..2a41aab74 100644
--- a/debian/patches/log-debug-history-nearly-unlimited.patch
+++ b/debian/patches/log-debug-history-nearly-unlimited.patch
@@ -1,4 +1,4 @@
-From f97dd6caedde61e955e657cb6ea574723e1bfba3 Mon Sep 17 00:00:00 2001
+From 60bca31617b124af792943c4ab8b16ba68c15da9 Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:45 +0200
 Subject: Make log debug history nearly unlimited
diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch
index a36136486..22dfc50ab 100644
--- a/debian/patches/logfiles_adm_readable.patch
+++ b/debian/patches/logfiles_adm_readable.patch
@@ -1,4 +1,4 @@
-From 41457e63395fb83289ec90b7081b44d4104672c0 Mon Sep 17 00:00:00 2001
+From c10b7f5a54079d225ae6b75aee43a2782a6c104f Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:38 +0200
 Subject: Make log files readable to group "adm", if present.
diff --git a/debian/patches/man-cups-lpd-drop-dangling-references.patch b/debian/patches/man-cups-lpd-drop-dangling-references.patch
index 650ea3006..88905e386 100644
--- a/debian/patches/man-cups-lpd-drop-dangling-references.patch
+++ b/debian/patches/man-cups-lpd-drop-dangling-references.patch
@@ -1,4 +1,4 @@
-From ce58d57dc0256cf16d7054fac56e2b6ecb146bf7 Mon Sep 17 00:00:00 2001
+From 25b0df63b43c152623013661fd314992300864a9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
 Date: Tue, 9 Aug 2016 18:11:48 +0200
 Subject: Drop dangling references from cups-lpd.man
diff --git a/debian/patches/manpage-hyphen-minus.patch b/debian/patches/manpage-hyphen-minus.patch
index af5dbf53c..a3771ec69 100644
--- a/debian/patches/manpage-hyphen-minus.patch
+++ b/debian/patches/manpage-hyphen-minus.patch
@@ -1,4 +1,4 @@
-From cecca9261c370d4536c23679bc13ce32b522f1cd Mon Sep 17 00:00:00 2001
+From 97b417c21ae265edd382cdf106956f17e662b729 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:05 +0200
 Subject: Fix hyphen-used-as-minus-sign manpage errors
diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch
index b85436f27..c050e4f90 100644
--- a/debian/patches/manpage-translations.patch
+++ b/debian/patches/manpage-translations.patch
@@ -1,4 +1,4 @@
-From 6c690f9ccb35e762e79b469e4632e25cdc8308bd Mon Sep 17 00:00:00 2001
+From 91981a9214c524b9054d30bd755d930ad2ad8a6d Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:50 +0200
 Subject: po4a infrastructure and translations for manpages.
diff --git a/debian/patches/move-cupsd-conf-default-to-share.patch b/debian/patches/move-cupsd-conf-default-to-share.patch
index dd3fd21e0..541228704 100644
--- a/debian/patches/move-cupsd-conf-default-to-share.patch
+++ b/debian/patches/move-cupsd-conf-default-to-share.patch
@@ -1,4 +1,4 @@
-From f53d2e9ca5f89c92345e7252bc0e586228d1de8b Mon Sep 17 00:00:00 2001
+From 2e93370f4afda4c6c70c90bd87f36f6b127ac6e7 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:24 +0200
 Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
diff --git a/debian/patches/no-conffile-timestamp.patch b/debian/patches/no-conffile-timestamp.patch
index 34f40a442..2a406c7bd 100644
--- a/debian/patches/no-conffile-timestamp.patch
+++ b/debian/patches/no-conffile-timestamp.patch
@@ -1,4 +1,4 @@
-From d452eb94c91cb297968d6b6345da2f77852d8724 Mon Sep 17 00:00:00 2001
+From 80d8b050fdb784a61c88e49431f22775d6bb3ff2 Mon Sep 17 00:00:00 2001
 From: Joey Hess <joeyh@debian.org>
 Date: Tue, 9 Aug 2016 18:11:31 +0200
 Subject: Disable time stamps in conffiles, to avoid ever-changing files in
diff --git a/debian/patches/pwg-raster-attributes.patch b/debian/patches/pwg-raster-attributes.patch
index 210f719b6..510cc84e6 100644
--- a/debian/patches/pwg-raster-attributes.patch
+++ b/debian/patches/pwg-raster-attributes.patch
@@ -1,4 +1,4 @@
-From 69170b606dba682883e626d14482b2d70b9f86b2 Mon Sep 17 00:00:00 2001
+From 6743d6f9640dba30c69ace1bb21662e70743824b Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:04 +0200
 Subject: For PWG Raster, add required IPP attributes
diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch
index b12ae773f..e3a603617 100644
--- a/debian/patches/reactivate_recommended_driver.patch
+++ b/debian/patches/reactivate_recommended_driver.patch
@@ -1,4 +1,4 @@
-From e75eb5a97703b71e07e8003a7e6174795a2ebb54 Mon Sep 17 00:00:00 2001
+From 99d3f374c8d1fba6945ea224170007626ebbe19f Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:36 +0200
 Subject: CUPS removes the "(recommended)" comments of the NickNames of
diff --git a/debian/patches/removecvstag.patch b/debian/patches/removecvstag.patch
index 5b43ab46e..eb9bccf31 100644
--- a/debian/patches/removecvstag.patch
+++ b/debian/patches/removecvstag.patch
@@ -1,4 +1,4 @@
-From 35c12456988bb8e4fdad824cd9c6dd8f88b7283e Mon Sep 17 00:00:00 2001
+From 8d4abe846440efc1ce0fd75e7d43c0b53454cd38 Mon Sep 17 00:00:00 2001
 From: Kenshi Muto <kmuto@debian.org>
 Date: Tue, 9 Aug 2016 18:11:33 +0200
 Subject: Do not write VCS tags into installed conffiles
diff --git a/debian/patches/rename-systemd-units.patch b/debian/patches/rename-systemd-units.patch
index a92cf56ca..428a160e0 100644
--- a/debian/patches/rename-systemd-units.patch
+++ b/debian/patches/rename-systemd-units.patch
@@ -1,4 +1,4 @@
-From a30d2cf58c4fb0bcfd600bcef00d15f3584d07aa Mon Sep 17 00:00:00 2001
+From 622f1caccbcc9ec36491de0f7439d8cccbae5a47 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:34 +0200
 Subject: Rename the systemd service file from org.cups.cups.* to cups.*
diff --git a/debian/patches/series b/debian/patches/series
index d948073db..337ebd7f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
-0001-Fix-compile-errors-not-sure-why-these-didn-t-show-up.patch
 pwg-raster-attributes.patch
 manpage-hyphen-minus.patch
-0004-Install-root-backends-world-readable.patch
+0003-Install-root-backends-world-readable.patch
 fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
 tests-ignore-warnings.patch
 tests-ignore-usb-crash.patch
@@ -16,7 +15,7 @@ tests-make-lpstat-call-reproducible.patch
 tests-no-pdftourf.patch
 move-cupsd-conf-default-to-share.patch
 airprint-support.patch
-0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0018-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 no-conffile-timestamp.patch
 removecvstag.patch
 rename-systemd-units.patch
@@ -31,6 +30,5 @@ cupsd-set-default-for-SyncOnClose-to-Yes.patch
 cups-set-default-error-policy-retry-job.patch
 man-cups-lpd-drop-dangling-references.patch
 debianize_cups-config.patch
-0034-Build-mantohtml-with-the-build-architecture-compiler.patch
+0033-Build-mantohtml-with-the-build-architecture-compiler.patch
 manpage-translations.patch
-0036-Fix-service_idle_exit-build-issue-with-Werror-maybe-.patch
diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch
index 52c76481a..f769aa227 100644
--- a/debian/patches/show-compile-command-lines.patch
+++ b/debian/patches/show-compile-command-lines.patch
@@ -1,4 +1,4 @@
-From 8c6890d53f8b6b00305305d66393fdddcc1515dd Mon Sep 17 00:00:00 2001
+From 6031680a3f8dc038da4a7c96da252ffd25d76135 Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:43 +0200
 Subject: Show compile command lines
diff --git a/debian/patches/test-i18n-nonlinux.patch b/debian/patches/test-i18n-nonlinux.patch
index add107616..cf22ea8f7 100644
--- a/debian/patches/test-i18n-nonlinux.patch
+++ b/debian/patches/test-i18n-nonlinux.patch
@@ -1,4 +1,4 @@
-From c2ca36deab43a03ea9eef4c6a553e0b5423cbdfa Mon Sep 17 00:00:00 2001
+From fc4501a5dbf1d43b3c0e5c3f337ec33ff56fae48 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:16 +0200
 Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
diff --git a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
index b3bd4c9f7..f3124496f 100644
--- a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
+++ b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
@@ -1,4 +1,4 @@
-From d6e335a6254b8251e6ab334ed9ab6a05e915d4ca Mon Sep 17 00:00:00 2001
+From 7367e6801eb55d919e3e80fb9012831948bf37a5 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:18 +0200
 Subject: Tests: Force LC_* environment variables when testing (non)
diff --git a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
index fbc7d7932..67ce1ee8d 100644
--- a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
+++ b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
@@ -1,4 +1,4 @@
-From 392c6e545d0da5f4105a49df2f9bc7bfb88e9ea5 Mon Sep 17 00:00:00 2001
+From c8878cdcffcdb682deca0f8f7b30ba94bc43de7a Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:33:56 +0200
 Subject: Tests: ignore errors triggered on ipv6-deprived hosts
diff --git a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
index ee4983171..91807b30a 100644
--- a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+++ b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
@@ -1,4 +1,4 @@
-From 07cb24bfcaeea2b23ad589a3f78df23af83ae4da Mon Sep 17 00:00:00 2001
+From 4bfb2e0fa91b5d776f13e9474f8c791ec02f4133 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:30:48 +0200
 Subject: Tests: ignore loadFile failures
diff --git a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
index 54bd04eee..725376f0c 100644
--- a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+++ b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
@@ -1,4 +1,4 @@
-From be1140cafecb6f557c5c6436657407b120d01f80 Mon Sep 17 00:00:00 2001
+From 2e991ead5c056a856b27fa1b93f5bde74a3d1bd6 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:36:02 +0200
 Subject: Tests: ignore the failure to write uncompressed data
diff --git a/debian/patches/tests-ignore-usb-crash.patch b/debian/patches/tests-ignore-usb-crash.patch
index feaf5f4e2..db0d5a85c 100644
--- a/debian/patches/tests-ignore-usb-crash.patch
+++ b/debian/patches/tests-ignore-usb-crash.patch
@@ -1,4 +1,4 @@
-From 843dbc77b0b94602108bad6c1c539cf860bb8e56 Mon Sep 17 00:00:00 2001
+From 575b813ae16b72b56ece3655101006d5a67a0b5d Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:10 +0200
 Subject: Tests: ignore usb & dnssd backend unexpected exits
diff --git a/debian/patches/tests-ignore-warnings.patch b/debian/patches/tests-ignore-warnings.patch
index ec59392ab..98e23238b 100644
--- a/debian/patches/tests-ignore-warnings.patch
+++ b/debian/patches/tests-ignore-warnings.patch
@@ -1,4 +1,4 @@
-From 18ef20ac748cfa798a5142fc8529195c12725e0d Mon Sep 17 00:00:00 2001
+From b67731499e4a2f45df6631581c856e590ca5d743 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:09 +0200
 Subject: Tests: Ignore warnings from colord and Avahi
diff --git a/debian/patches/tests-make-lpstat-call-reproducible.patch b/debian/patches/tests-make-lpstat-call-reproducible.patch
index 8b2cc8215..478667aa8 100644
--- a/debian/patches/tests-make-lpstat-call-reproducible.patch
+++ b/debian/patches/tests-make-lpstat-call-reproducible.patch
@@ -1,4 +1,4 @@
-From 8fb60550cb6d1b1703f7a08f8976a48920ced46c Mon Sep 17 00:00:00 2001
+From 77d2490f40b6056bf140cda37fe7d8b7f5acafc7 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:22 +0200
 Subject: Force LC_ALL=C environment variable when grepping the output of
diff --git a/debian/patches/tests-no-pdftourf.patch b/debian/patches/tests-no-pdftourf.patch
index 665c664d7..f9a4303aa 100644
--- a/debian/patches/tests-no-pdftourf.patch
+++ b/debian/patches/tests-no-pdftourf.patch
@@ -1,4 +1,4 @@
-From f7e327359d2e6133972782194cc9a6821d0e2572 Mon Sep 17 00:00:00 2001
+From d446e120e33894a1946a247b57892750a2deee7a Mon Sep 17 00:00:00 2001
 From: Michael Sweet <michael.r.sweet@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:23 +0200
 Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c
diff --git a/debian/patches/tests-use-ipv4-lo-address.patch b/debian/patches/tests-use-ipv4-lo-address.patch
index 91bdf0b7b..0183231a9 100644
--- a/debian/patches/tests-use-ipv4-lo-address.patch
+++ b/debian/patches/tests-use-ipv4-lo-address.patch
@@ -1,4 +1,4 @@
-From 021baaeb36d828afe4b859de983171e51eb0ee47 Mon Sep 17 00:00:00 2001
+From 17be6e0260c807b5ce2c5bb5857275c744fef556 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:21 +0200
 Subject: Use 127.0.0.1 instead of localhost in the test-suite. This should
diff --git a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
index 8282958a6..74fd1f917 100644
--- a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
+++ b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
@@ -1,4 +1,4 @@
-From 7e2254e5906c95d82d4823647a1a50441b27df70 Mon Sep 17 00:00:00 2001
+From 31ef776837136b7fef9fa3ff5e73e1136b3e7f51 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:17 +0200
 Subject: Tests: Make sure that all scheduled jobs are finished before
diff --git a/packaging/cups.spec b/packaging/cups.spec
deleted file mode 100644
index 9db1af231..000000000
--- a/packaging/cups.spec
+++ /dev/null
@@ -1,433 +0,0 @@
-#
-# RPM "spec" file for CUPS.
-#
-# Original version by Jason McMullan <jmcc@ontv.com>.
-#
-# Copyright © 2007-2018 by Apple Inc.
-# Copyright © 1999-2007 by Easy Software Products, all rights reserved.
-#
-# Licensed under Apache License v2.0.  See the file "LICENSE" for more
-# information.
-#
-
-# Conditional build options (--with name/--without name):
-#
-#   dbus     - Enable/disable DBUS support (default = enable)
-#   dnssd    - Enable/disable DNS-SD support (default = enable)
-#   libusb1  - Enable/disable LIBUSB 1.0 support (default = enable)
-#   static   - Enable/disable static libraries (default = enable)
-#   systemd  - Enable/disable systemd support (default = enable)
-
-%{!?_with_dbus: %{!?_without_dbus: %define _with_dbus --with-dbus}}
-%{?_with_dbus: %define _dbus --enable-dbus}
-%{!?_with_dbus: %define _dbus --disable-dbus}
-
-%{!?_with_dnssd: %{!?_without_dnssd: %define _with_dnssd --with-dnssd}}
-%{?_with_dnssd: %define _dnssd --enable-avahi}
-%{!?_with_dnssd: %define _dnssd --disable-avahi}
-
-%{!?_with_libusb1: %{!?_without_libusb1: %define _with_libusb1 --with-libusb1}}
-%{?_with_libusb1: %define _libusb1 --enable-libusb}
-%{!?_with_libusb1: %define _libusb1 --disable-libusb}
-
-%{!?_with_static: %{!?_without_static: %define _without_static --without-static}}
-%{?_with_static: %define _static --enable-static}
-%{!?_with_static: %define _static --disable-static}
-
-%{!?_with_systemd: %{!?_without_systemd: %define _with_systemd --with-systemd}}
-%{?_with_systemd: %define _systemd --enable-systemd}
-%{!?_with_systemd: %define _systemd --disable-systemd}
-
-Summary: CUPS
-Name: cups
-Version: 2.3b6
-Release: 0
-Epoch: 1
-License: GPL
-Group: System Environment/Daemons
-Source: https://github.com/apple/cups/releases/download/v2.3b6/cups-2.3b6-source.tar.gz
-Url: http://www.cups.org
-Packager: Anonymous <anonymous@example.com>
-Vendor: Example Corp
-
-# Package names are as defined for Red Hat (and clone) distributions
-BuildRequires: gnutls-devel, pam-devel
-
-%if %{?_with_dbus:1}%{!?_with_dbus:0}
-BuildRequires: dbus-devel
-%endif
-
-%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
-BuildRequires: avahi-devel
-%endif
-
-%if %{?_with_libusb1:1}%{!?_with_libusb1:0}
-BuildRequires: libusb-devel >= 1.0
-%endif
-
-%if %{?_with_systemd:1}%{!?_with_systemd:0}
-BuildRequires: systemd-devel
-%endif
-
-# Use buildroot so as not to disturb the version already installed
-BuildRoot: /tmp/%{name}-root
-
-# Dependencies...
-Requires: %{name}-libs = %{epoch}:%{version}
-Obsoletes: lpd, lpr, LPRng
-Provides: lpd, lpr, LPRng
-Obsoletes: cups-da, cups-de, cups-es, cups-et, cups-fi, cups-fr, cups-he
-Obsoletes: cups-id, cups-it, cups-ja, cups-ko, cups-nl, cups-no, cups-pl
-Obsoletes: cups-pt, cups-ru, cups-sv, cups-zh
-
-%package devel
-Summary: CUPS - development environment
-Group: Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}
-
-%package libs
-Summary: CUPS - shared libraries
-Group: System Environment/Libraries
-Provides: libcups1
-
-%package lpd
-Summary: CUPS - LPD support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version} xinetd
-
-%description
-CUPS is the standards-based, open source printing system developed by
-Apple Inc. for macOS® and other UNIX®-like operating systems.
-
-%description devel
-This package provides the CUPS headers and development environment.
-
-%description libs
-This package provides the CUPS shared libraries.
-
-%description lpd
-This package provides LPD client support.
-
-%prep
-%setup
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \
-    ./configure %{_dbus} %{_dnssd} %{_libusb1} %{_static} %{_systemd}
-# If we got this far, all prerequisite libraries must be here.
-make
-
-%install
-# Make sure the RPM_BUILD_ROOT directory exists.
-rm -rf $RPM_BUILD_ROOT
-
-make BUILDROOT=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT/usr/share/cups/banners $RPM_BUILD_ROOT/usr/share/cups/data
-
-%post
-%if %{?_with_systemd:1}%{!?_with_systemd:0}
-/bin/systemctl enable org.cups.cupsd.service
-
-if test $1 -ge 1; then
-	/bin/systemctl stop org.cups.cupsd.service
-	/bin/systemctl start org.cups.cupsd.service
-fi
-
-%else
-/sbin/chkconfig --add cups
-/sbin/chkconfig cups on
-
-# Restart cupsd if we are upgrading...
-if test $1 -gt 1; then
-	/sbin/service cups stop
-	/sbin/service cups start
-fi
-%endif
-
-%post libs
-/sbin/ldconfig
-
-%preun
-%if %{?_with_systemd:1}%{!?_with_systemd:0}
-if test $1 -ge 1; then
-	/bin/systemctl stop org.cups.cupsd.service
-	/bin/systemctl disable org.cups.cupsd.service
-fi
-
-%else
-if test $1 = 0; then
-	/sbin/service cups stop
-	/sbin/chkconfig --del cups
-fi
-%endif
-
-%postun
-%if %{?_with_systemd:1}%{!?_with_systemd:0}
-if test $1 -ge 1; then
-	/bin/systemctl stop org.cups.cupsd.service
-	/bin/systemctl start org.cups.cupsd.service
-fi
-
-%else
-if test $1 -ge 1; then
-	/sbin/service cups stop
-	/sbin/service cups start
-fi
-%endif
-
-%postun libs
-/sbin/ldconfig
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%docdir /usr/share/doc/cups
-%defattr(-,root,root)
-%dir /etc/cups
-%config(noreplace) /etc/cups/*.conf
-/etc/cups/cups-files.conf.default
-/etc/cups/cupsd.conf.default
-/etc/cups/snmp.conf.default
-%dir /etc/cups/ppd
-%attr(0700,root,root) %dir /etc/cups/ssl
-
-%if %{?_with_dbus:1}%{!?_with_dbus:0}
-# DBUS
-/etc/dbus-1/system.d/*
-%endif
-
-# PAM
-%dir /etc/pam.d
-/etc/pam.d/*
-
-%if %{?_with_systemd:1}%{!?_with_systemd:0}
-# SystemD
-/usr/lib/systemd/system/org.cups.cupsd.*
-
-%else
-# Legacy init support on Linux
-/etc/init.d/*
-/etc/rc0.d/*
-/etc/rc2.d/*
-/etc/rc3.d/*
-/etc/rc5.d/*
-%endif
-
-/usr/bin/cancel
-/usr/bin/cupstestppd
-/usr/bin/ipptool
-/usr/bin/lp*
-%dir /usr/lib/cups
-%dir /usr/lib/cups/backend
-%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
-# DNS-SD
-/usr/bin/ippfind
-/usr/lib/cups/backend/dnssd
-%endif
-/usr/lib/cups/backend/http
-/usr/lib/cups/backend/https
-%attr(0700,root,root) /usr/lib/cups/backend/ipp
-/usr/lib/cups/backend/ipps
-%attr(0700,root,root) /usr/lib/cups/backend/lpd
-/usr/lib/cups/backend/snmp
-/usr/lib/cups/backend/socket
-/usr/lib/cups/backend/usb
-%dir /usr/lib/cups/cgi-bin
-/usr/lib/cups/cgi-bin/*
-%dir /usr/lib/cups/daemon
-/usr/lib/cups/daemon/cups-deviced
-/usr/lib/cups/daemon/cups-driverd
-/usr/lib/cups/daemon/cups-exec
-%dir /usr/lib/cups/driver
-%dir /usr/lib/cups/filter
-/usr/lib/cups/filter/*
-%dir /usr/lib/cups/monitor
-/usr/lib/cups/monitor/*
-%dir /usr/lib/cups/notifier
-/usr/lib/cups/notifier/*
-
-/usr/sbin/*
-%dir /usr/share/cups
-%dir /usr/share/cups/drv
-/usr/share/cups/drv/*
-%dir /usr/share/cups/ipptool
-/usr/share/cups/ipptool/*
-%dir /usr/share/cups/mime
-/usr/share/cups/mime/*
-%dir /usr/share/cups/model
-%dir /usr/share/cups/ppdc
-/usr/share/cups/ppdc/*
-%dir /usr/share/cups/templates
-/usr/share/cups/templates/*
-%if %{?_with_libusb1:1}%{!?_with_libusb1:0}
-# LIBUSB quirks files
-%dir /usr/share/cups/usb
-/usr/share/cups/usb/*
-%endif
-
-%dir /usr/share/doc/cups
-/usr/share/doc/cups/*.*
-%dir /usr/share/doc/cups/help
-/usr/share/doc/cups/help/accounting.html
-/usr/share/doc/cups/help/admin.html
-/usr/share/doc/cups/help/cgi.html
-/usr/share/doc/cups/help/encryption.html
-/usr/share/doc/cups/help/firewalls.html
-/usr/share/doc/cups/help/glossary.html
-/usr/share/doc/cups/help/kerberos.html
-/usr/share/doc/cups/help/license.html
-/usr/share/doc/cups/help/man-*.html
-/usr/share/doc/cups/help/network.html
-/usr/share/doc/cups/help/options.html
-/usr/share/doc/cups/help/overview.html
-/usr/share/doc/cups/help/policies.html
-/usr/share/doc/cups/help/ref-*.html
-/usr/share/doc/cups/help/security.html
-/usr/share/doc/cups/help/sharing.html
-/usr/share/doc/cups/help/translation.html
-%dir /usr/share/doc/cups/images
-/usr/share/doc/cups/images/*
-
-#%dir /usr/share/doc/cups/ca
-#/usr/share/doc/cups/ca/*
-#%dir /usr/share/doc/cups/cs
-#/usr/share/doc/cups/cs/*
-%dir /usr/share/doc/cups/de
-/usr/share/doc/cups/de/*
-%dir /usr/share/doc/cups/es
-/usr/share/doc/cups/es/*
-#%dir /usr/share/doc/cups/fr
-#/usr/share/doc/cups/fr/*
-%dir /usr/share/doc/cups/ja
-/usr/share/doc/cups/ja/*
-%dir /usr/share/doc/cups/pt_BR
-/usr/share/doc/cups/pt_BR/*
-%dir /usr/share/doc/cups/ru
-/usr/share/doc/cups/ru/*
-
-%dir /usr/share/locale/ca
-/usr/share/locale/ca/cups_ca.po
-%dir /usr/share/locale/cs
-/usr/share/locale/cs/cups_cs.po
-%dir /usr/share/locale/de
-/usr/share/locale/de/cups_de.po
-%dir /usr/share/locale/en
-/usr/share/locale/en/cups_en.po
-%dir /usr/share/locale/es
-/usr/share/locale/es/cups_es.po
-%dir /usr/share/locale/fr
-/usr/share/locale/fr/cups_fr.po
-%dir /usr/share/locale/it
-/usr/share/locale/it/cups_it.po
-%dir /usr/share/locale/ja
-/usr/share/locale/ja/cups_ja.po
-%dir /usr/share/locale/pt_BR
-/usr/share/locale/pt_BR/cups_pt_BR.po
-%dir /usr/share/locale/ru
-/usr/share/locale/ru/cups_ru.po
-%dir /usr/share/locale/zh_CN
-/usr/share/locale/zh_CN/cups_zh_CN.po
-
-%dir /usr/share/man/man1
-/usr/share/man/man1/cancel.1.gz
-/usr/share/man/man1/cups.1.gz
-/usr/share/man/man1/cupstestppd.1.gz
-%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
-# DNS-SD
-/usr/share/man/man1/ippfind.1.gz
-%endif
-/usr/share/man/man1/ipptool.1.gz
-/usr/share/man/man1/lp.1.gz
-/usr/share/man/man1/lpoptions.1.gz
-/usr/share/man/man1/lpq.1.gz
-/usr/share/man/man1/lpr.1.gz
-/usr/share/man/man1/lprm.1.gz
-/usr/share/man/man1/lpstat.1.gz
-%dir /usr/share/man/man5
-/usr/share/man/man5/*.conf.5.gz
-/usr/share/man/man5/cupsd-logs.5.gz
-/usr/share/man/man5/ipptoolfile.5.gz
-/usr/share/man/man5/mime.*.5.gz
-%dir /usr/share/man/man8
-/usr/share/man/man8/accept.8.gz
-/usr/share/man/man8/cups-deviced.8.gz
-/usr/share/man/man8/cups-driverd.8.gz
-/usr/share/man/man8/cups-exec.8.gz
-/usr/share/man/man8/cups-snmp.8.gz
-/usr/share/man/man8/cupsaccept.8.gz
-/usr/share/man/man8/cupsctl.8.gz
-/usr/share/man/man8/cupsfilter.8.gz
-/usr/share/man/man8/cupsd.8.gz
-/usr/share/man/man8/cupsd-helper.8.gz
-/usr/share/man/man8/cupsdisable.8.gz
-/usr/share/man/man8/cupsenable.8.gz
-/usr/share/man/man8/cupsreject.8.gz
-/usr/share/man/man8/lpadmin.8.gz
-/usr/share/man/man8/lpc.8.gz
-/usr/share/man/man8/lpinfo.8.gz
-/usr/share/man/man8/lpmove.8.gz
-/usr/share/man/man8/reject.8.gz
-
-%dir /var/cache/cups
-%attr(0775,root,sys) %dir /var/cache/cups/rss
-%dir /var/log/cups
-%dir /var/run/cups
-%attr(0711,lp,sys) %dir /var/run/cups/certs
-%attr(0710,lp,sys) %dir /var/spool/cups
-%attr(1770,lp,sys) %dir /var/spool/cups/tmp
-
-# Desktop files
-/usr/share/applications/*
-/usr/share/icons/*
-
-%files devel
-%defattr(-,root,root)
-%dir /usr/share/cups/examples
-/usr/share/cups/examples/*
-%dir /usr/share/man/man1
-/usr/share/man/man1/cups-config.1.gz
-/usr/share/man/man1/ppd*.1.gz
-%dir /usr/share/man/man5
-/usr/share/man/man5/ppdcfile.5.gz
-/usr/share/man/man7/backend.7.gz
-/usr/share/man/man7/filter.7.gz
-/usr/share/man/man7/notifier.7.gz
-
-/usr/bin/cups-config
-/usr/bin/ppd*
-%dir /usr/include/cups
-/usr/include/cups/*
-/usr/lib*/*.so
-
-%if %{?_with_static:1}%{!?_with_static:0}
-/usr/lib*/*.a
-%endif
-
-%dir /usr/share/doc/cups/help
-/usr/share/doc/cups/help/api*.html
-/usr/share/doc/cups/help/cupspm.html
-/usr/share/doc/cups/help/postscript-driver.html
-/usr/share/doc/cups/help/ppd-compiler.html
-/usr/share/doc/cups/help/raster-driver.html
-/usr/share/doc/cups/help/spec*.html
-
-%files libs
-%defattr(-,root,root)
-/usr/lib*/*.so.*
-
-%files lpd
-%defattr(-,root,root)
-%if %{?_with_systemd:1}%{!?_with_systemd:0}
-# SystemD
-/usr/lib/systemd/system/org.cups.cups-lpd*
-%else
-# Legacy xinetd
-/etc/xinetd.d/cups-lpd
-%endif
-
-%dir /usr/lib/cups
-%dir /usr/lib/cups/daemon
-/usr/lib/cups/daemon/cups-lpd
-%dir /usr/share/man/man8
-/usr/share/man/man8/cups-lpd.8.gz
diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx
index 8570948d5..94d67ff83 100644
--- a/ppdc/ppdmerge.cxx
+++ b/ppdc/ppdmerge.cxx
@@ -1,10 +1,11 @@
 //
 // PPD file merge utility for the CUPS PPD Compiler.
 //
-// Copyright 2007-2014 by Apple Inc.
-// Copyright 2002-2007 by Easy Software Products.
+// Copyright © 2007-2018 by Apple Inc.
+// Copyright © 2002-2007 by Easy Software Products.
 //
-// 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.
 //
 
 //
@@ -38,6 +39,7 @@ main(int  argc,				// I - Number of command-line arguments
   cups_array_t	*ppds;			// Array of PPD files
   const char	*inname,		// First input filename
 		*outname;		// Output filename (if any)
+  char		bckname[1024];		// Backup filename
   cups_file_t	*infile,		// Input file
 		*outfile;		// Output file
   cups_array_t	*languages;		// Languages in file
@@ -137,9 +139,6 @@ main(int  argc,				// I - Number of command-line arguments
         if (outname && !strcmp(inname, outname))
 	{
 	  // Rename input filename so that we don't overwrite it...
-	  char bckname[1024];		// Backup filename
-
-
 	  snprintf(bckname, sizeof(bckname), "%s.bck", inname);
 
 	  if (rename(inname, bckname))
diff --git a/scheduler/Dependencies b/scheduler/Dependencies
index a6476c4f0..519ecda61 100644
--- a/scheduler/Dependencies
+++ b/scheduler/Dependencies
@@ -149,7 +149,8 @@ network.o: network.c ../cups/http-private.h ../config.h \
   ../cups/pwg-private.h ../cups/thread-private.h ../cups/file-private.h \
   ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \
   statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \
-  colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h
+  colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h \
+  ../cups/getifaddrs-internal.h
 policy.o: policy.c cupsd.h ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
diff --git a/scheduler/network.c b/scheduler/network.c
index f935f648d..5ba00a1fb 100644
--- a/scheduler/network.c
+++ b/scheduler/network.c
@@ -1,7 +1,7 @@
 /*
  * Network interface functions for the CUPS scheduler.
  *
- * Copyright © 2007-2014 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
@@ -14,6 +14,7 @@
 
 #include <cups/http-private.h>
 #include "cupsd.h"
+#include <cups/getifaddrs-internal.h>
 
 
 /*
diff --git a/systemv/Dependencies b/systemv/Dependencies
index 6d7a4d96f..1971cdf09 100644
--- a/systemv/Dependencies
+++ b/systemv/Dependencies
@@ -11,26 +11,12 @@ cupsaccept.o: cupsaccept.c ../cups/cups-private.h \
   ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/thread-private.h
-cupsaddsmb.o: cupsaddsmb.c ../cups/cups-private.h \
-  ../cups/string-private.h ../config.h ../cups/versioning.h \
-  ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
-  ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/thread-private.h ../cups/adminutil.h
 cupsctl.o: cupsctl.c ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/versioning.h ../cups/array-private.h \
   ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/file.h \
   ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/pwg.h \
   ../cups/http-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/thread-private.h ../cups/adminutil.h
-cupstestdsc.o: cupstestdsc.c ../cups/cups-private.h \
-  ../cups/string-private.h ../config.h ../cups/versioning.h \
-  ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
-  ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/thread-private.h
 cupstestppd.o: cupstestppd.c ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \