From: Michael R Sweet Date: Wed, 17 Jan 2018 20:14:03 +0000 (-0500) Subject: Bump versions and copyrights. X-Git-Tag: v2.3b2~1 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=f61dfc0df431be66018292336eacf7129e5315d5 Bump versions and copyrights. --- diff --git a/INSTALL.md b/INSTALL.md index edd18b458..60b4c9074 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,4 @@ -INSTALL - CUPS v2.3b1 - 2017-12-19 +INSTALL - CUPS v2.3b2 - 2018-01-17 ================================== This file describes how to compile and install CUPS from source code. For more diff --git a/README.md b/README.md index 22e231789..d20ca546d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -README - CUPS v2.3b2 - 2018-01-09 +README - CUPS v2.3b2 - 2018-01-17 ================================= Looking for compile instructions? Read the file `INSTALL.md` instead... diff --git a/configure b/configure index 34d2542a2..dc17c9247 100755 --- a/configure +++ b/configure @@ -1,11 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for CUPS 2.3b1. +# Generated by GNU Autoconf 2.68 for CUPS 2.3b2. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,31 +136,6 @@ 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 @@ -192,8 +169,7 @@ 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 / || exit 1" +test x\$exitcode = x0 || 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'\" && @@ -238,25 +214,21 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - 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 + # 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+"$@"} fi if test x$as_have_required = xno; then : @@ -359,14 +331,6 @@ $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 @@ -488,10 +452,6 @@ 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). @@ -526,16 +486,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 -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -547,8 +507,28 @@ else as_mkdir_p=false fi -as_test_x='test -x' -as_executable_p=as_fn_executable_p +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 # 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'" @@ -580,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CUPS' PACKAGE_TARNAME='cups' -PACKAGE_VERSION='2.3b1' -PACKAGE_STRING='CUPS 2.3b1' +PACKAGE_VERSION='2.3b2' +PACKAGE_STRING='CUPS 2.3b2' PACKAGE_BUGREPORT='https://github.com/apple/cups/issues' PACKAGE_URL='https://www.cups.org/' @@ -1388,6 +1368,8 @@ 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 @@ -1473,7 +1455,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.3b1 to adapt to many kinds of systems. +\`configure' configures CUPS 2.3b2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1538,7 +1520,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CUPS 2.3b1:";; + short | recursive ) echo "Configuration of CUPS 2.3b2:";; esac cat <<\_ACEOF @@ -1715,10 +1697,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CUPS configure 2.3b1 -generated by GNU Autoconf 2.69 +CUPS configure 2.3b2 +generated by GNU Autoconf 2.68 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1869,7 +1851,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -2179,8 +2161,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.3b1, which was -generated by GNU Autoconf 2.69. Invocation command line was +It was created by CUPS $as_me 2.3b2, which was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2654,7 +2636,7 @@ fi ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION="2.3b1" +CUPS_VERSION="2.3b2" CUPS_REVISION="" CUPS_BUILD="cups-$CUPS_VERSION" @@ -2700,7 +2682,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -2748,7 +2730,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -2792,7 +2774,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3236,7 +3218,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -struct stat; +#include +#include /* 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); @@ -3486,7 +3469,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3530,7 +3513,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3732,7 +3715,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3772,7 +3755,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3825,7 +3808,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3865,7 +3848,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3905,7 +3888,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3945,7 +3928,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -3985,7 +3968,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4025,7 +4008,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4065,7 +4048,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4105,7 +4088,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4145,7 +4128,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4185,7 +4168,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4225,7 +4208,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4301,7 +4284,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4344,7 +4327,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -4754,7 +4737,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" - as_fn_executable_p "$ac_path_GREP" || continue + { test -f "$ac_path_GREP" && $as_test_x "$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 @@ -4820,7 +4803,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" - as_fn_executable_p "$ac_path_EGREP" || continue + { test -f "$ac_path_EGREP" && $as_test_x "$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 @@ -7838,7 +7821,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -7881,7 +7864,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -8433,7 +8416,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -8476,7 +8459,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 @@ -9047,8 +9030,6 @@ _ACEOF esac rm -rf conftest* fi - - fi @@ -10494,16 +10475,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 -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -10563,16 +10544,28 @@ else as_mkdir_p=false fi - -# 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 +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 # 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'" @@ -10593,8 +10586,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.3b1, which was -generated by GNU Autoconf 2.69. Invocation command line was +This file was extended by CUPS $as_me 2.3b2, which was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10656,11 +10649,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.3b1 -configured by $0, generated by GNU Autoconf 2.69, +CUPS config.status 2.3b2 +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10749,7 +10742,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 72b534460..dd080d457 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl dnl Configuration script for CUPS. dnl -dnl Copyright 2007-2017 by Apple Inc. +dnl Copyright 2007-2018 by Apple Inc. dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. dnl dnl Licensed under Apache License v2.0. See the file "LICENSE" for more information. @@ -11,7 +11,7 @@ dnl We need at least autoconf 2.60... AC_PREREQ(2.60) dnl Package name and version... -AC_INIT([CUPS], [2.3b1], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/]) +AC_INIT([CUPS], [2.3b2], [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/doc/de/index.html.in b/doc/de/index.html.in index ab6486930..1b5c40736 100644 --- a/doc/de/index.html.in +++ b/doc/de/index.html.in @@ -49,6 +49,6 @@ -
CUPS und das CUPS Logo sind Warenzeichen der Apple Inc. Copyright © 2007-2017 Apple Inc. Alle Rechte vorbehalten.
+
CUPS und das CUPS Logo sind Warenzeichen der Apple Inc. Copyright © 2007-2018 Apple Inc. Alle Rechte vorbehalten.
diff --git a/doc/es/index.html.in b/doc/es/index.html.in index 2138ac627..91d2d7564 100644 --- a/doc/es/index.html.in +++ b/doc/es/index.html.in @@ -49,6 +49,6 @@ -
CUPS y el logo de CUPS son marcas registradas de Apple Inc. Derechos de autor © 2007-2017 Apple Inc. Todos los derechos reservados.
+
CUPS y el logo de CUPS son marcas registradas de Apple Inc. Derechos de autor © 2007-2018 Apple Inc. Todos los derechos reservados.
diff --git a/doc/index.html.in b/doc/index.html.in index e693884ef..f3e24fdaf 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -49,6 +49,6 @@ -
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2017 Apple Inc. All rights reserved.
+
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2018 Apple Inc. All rights reserved.
diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in index 437b32470..0b1e62bd2 100644 --- a/doc/ja/index.html.in +++ b/doc/ja/index.html.in @@ -49,6 +49,6 @@ -
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2017 Apple Inc. All rights reserved.
+
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2018 Apple Inc. All rights reserved.
diff --git a/doc/pt_BR/index.html.in b/doc/pt_BR/index.html.in index ec9ceffec..e0121a499 100644 --- a/doc/pt_BR/index.html.in +++ b/doc/pt_BR/index.html.in @@ -50,6 +50,6 @@ -
CUPS e o logo do CUPS são marcas registradas da Apple Inc. Copyright © 2007-2017 Apple Inc. Todos os direitos reservados.
+
CUPS e o logo do CUPS são marcas registradas da Apple Inc. Copyright © 2007-2018 Apple Inc. Todos os direitos reservados.
diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in index 98dd5b376..d33d977fd 100644 --- a/doc/ru/index.html.in +++ b/doc/ru/index.html.in @@ -50,6 +50,6 @@ -
CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2017) компании Apple Inc. Все права защищены.
+
CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2018) компании Apple Inc. Все права защищены.
diff --git a/man/backend.man b/man/backend.man index 25e14828d..184e3aaa6 100644 --- a/man/backend.man +++ b/man/backend.man @@ -193,4 +193,4 @@ for more information. .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cancel.man b/man/cancel.man index 98e215fef..388640fb6 100644 --- a/man/cancel.man +++ b/man/cancel.man @@ -87,4 +87,4 @@ Administrators wishing to prevent unauthorized cancellation of jobs via the \fI\ .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/classes.conf.man b/man/classes.conf.man index 6f9ec5ece..e2579792f 100644 --- a/man/classes.conf.man +++ b/man/classes.conf.man @@ -24,4 +24,4 @@ The name, location, and format of this file are an implementation detail that wi .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/client.conf.man.in b/man/client.conf.man.in index 5012d75c8..cb93160fc 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.man.in @@ -1,7 +1,7 @@ .\" .\" client.conf man page for CUPS. .\" -.\" Copyright 2007-2017 by Apple Inc. +.\" Copyright 2007-2018 by Apple Inc. .\" Copyright 2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. @@ -99,4 +99,4 @@ On Linux and other systems using GNU TLS, the \fI/etc/cups/ssl/site.crl\fR file, .BR default (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cups-config.man b/man/cups-config.man index 5e074ad72..a4c5f67b5 100644 --- a/man/cups-config.man +++ b/man/cups-config.man @@ -104,4 +104,4 @@ Compile a simple one-file CUPS filter: .BR cups (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in index b35ca2af9..7b96d687d 100644 --- a/man/cups-files.conf.man.in +++ b/man/cups-files.conf.man.in @@ -1,7 +1,7 @@ .\" .\" cups-files.conf man page for CUPS. .\" -.\" Copyright 2007-2017 by Apple Inc. +.\" Copyright 2007-2018 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. @@ -270,4 +270,4 @@ Specifies the SMB service configuration file to update. .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in index 0ef7371f2..ac7c682e6 100644 --- a/man/cups-lpd.man.in +++ b/man/cups-lpd.man.in @@ -114,4 +114,4 @@ service using the corresponding control program. CUPS Online Help (http://localhost:631/help), RFC 2569 .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man index e6be62da8..25137eee8 100644 --- a/man/cups-snmp.conf.man +++ b/man/cups-snmp.conf.man @@ -57,4 +57,4 @@ The default is 120 seconds (2 minutes). .BR cups-snmp (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cups-snmp.man.in b/man/cups-snmp.man.in index 5664f8940..031fa0a7a 100644 --- a/man/cups-snmp.man.in +++ b/man/cups-snmp.man.in @@ -49,4 +49,4 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port Moni .BR lpinfo (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cups.man b/man/cups.man index 46ae9ab04..49ca183fc 100644 --- a/man/cups.man +++ b/man/cups.man @@ -135,4 +135,4 @@ CUPS Online Help (http://localhost:631/help), CUPS Web Site (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cupsaccept.man b/man/cupsaccept.man index ef6ece490..3f859c92a 100644 --- a/man/cupsaccept.man +++ b/man/cupsaccept.man @@ -82,4 +82,4 @@ Finally, the CUPS versions may ask the user for an access password depending on .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in index a7bb81cce..dd628b62b 100644 --- a/man/cupsaddsmb.man.in +++ b/man/cupsaddsmb.man.in @@ -119,4 +119,4 @@ This is useful for debugging SAMBA configuration problems. .BR smb.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cupsctl.man b/man/cupsctl.man index d44dac9be..6fab9036d 100644 --- a/man/cupsctl.man +++ b/man/cupsctl.man @@ -94,4 +94,4 @@ You cannot set the Listen or Port directives using \fBcupsctl\fR. .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cupsd-helper.man b/man/cupsd-helper.man index fab5bf639..d866780fb 100644 --- a/man/cupsd-helper.man +++ b/man/cupsd-helper.man @@ -82,4 +82,4 @@ Driver information files must conform to the format defined in .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cupsd-logs.man b/man/cupsd-logs.man index 27eb766a4..f7e43a928 100644 --- a/man/cupsd-logs.man +++ b/man/cupsd-logs.man @@ -1,7 +1,7 @@ .\" .\" cupsd-logs man page for CUPS. .\" -.\" Copyright 2007-2017 by Apple Inc. +.\" Copyright 2007-2018 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more @@ -219,4 +219,4 @@ The \fIsides\fR field contains a copy of the sides attribute provided with the I .BR cups-files.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index ca3e9cee1..4a7f9e50f 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -1,7 +1,7 @@ .\" .\" cupsd.conf man page for CUPS. .\" -.\" Copyright 2007-2017 by Apple Inc. +.\" Copyright 2007-2018 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. @@ -896,4 +896,4 @@ Require authentication for accesses from outside the 10. network: .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cupsd.man.in b/man/cupsd.man.in index efb55ad44..3df6f408e 100644 --- a/man/cupsd.man.in +++ b/man/cupsd.man.in @@ -122,4 +122,4 @@ in the foreground with a test configuration file called .BR systemd (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cupsenable.man b/man/cupsenable.man index 20b4b3d19..b6eb632a5 100644 --- a/man/cupsenable.man +++ b/man/cupsenable.man @@ -93,4 +93,4 @@ This differs from the System V versions which require the root user to execute t .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cupsfilter.man b/man/cupsfilter.man index 08ea33097..e1aa836f2 100644 --- a/man/cupsfilter.man +++ b/man/cupsfilter.man @@ -131,4 +131,4 @@ The following command will generate a PDF preview of job 42 for a printer named .BR mime.types (7), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man index fe694bc2f..00354bd70 100644 --- a/man/cupstestdsc.man +++ b/man/cupstestdsc.man @@ -39,4 +39,4 @@ CUPS Online Help (http://localhost:631/help), Adobe PostScript Language Document Structuring Conventions Specification, Version 3.0. .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/cupstestppd.man b/man/cupstestppd.man index b751e51a4..e1070f510 100644 --- a/man/cupstestppd.man +++ b/man/cupstestppd.man @@ -139,4 +139,4 @@ The next command tests all PPD files under the current directory and print detai CUPS Online Help (http://localhost:631/help), Adobe PostScript Printer Description File Format Specification, Version 4.3. .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/filter.man b/man/filter.man index 8063432b7..9bbc49770 100644 --- a/man/filter.man +++ b/man/filter.man @@ -213,4 +213,4 @@ program to use the appropriate filters to do the conversions you need. .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/ippfind.man b/man/ippfind.man index 01c30609e..737e43593 100644 --- a/man/ippfind.man +++ b/man/ippfind.man @@ -249,4 +249,4 @@ Similarly, to send a PostScript test page to every PostScript printer, run: .SH SEE ALSO .BR ipptool (1) .SH COPYRIGHT -Copyright \[co] 2013-2015 by Apple Inc. +Copyright \[co] 2013-2018 by Apple Inc. diff --git a/man/ipptool.man b/man/ipptool.man index 3e9afe889..a5a8f44ed 100644 --- a/man/ipptool.man +++ b/man/ipptool.man @@ -1,7 +1,7 @@ .\" .\" ipptool man page. .\" -.\" Copyright 2010-2017 by Apple Inc. +.\" Copyright 2010-2018 by Apple Inc. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. .\" @@ -248,4 +248,4 @@ IANA IPP Registry (http://www.iana.org/assignments/ipp\-registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp) RFC 8011 (http://tools.ietf.org/html/rfc8011), .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man index 4b2e83713..b50fd6d14 100644 --- a/man/ipptoolfile.man +++ b/man/ipptoolfile.man @@ -1,7 +1,7 @@ .\" .\" ipptoolfile man page. .\" -.\" Copyright 2010-2017 by Apple Inc. +.\" Copyright 2010-2018 by Apple Inc. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. .\" @@ -645,4 +645,4 @@ IANA IPP Registry (http://www.iana.org/assignments/ipp-registrations), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp), RFC 8011 (http://tools.ietf.org/html/rfc8011) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/lp.man b/man/lp.man index 8bda28815..d6bba8833 100644 --- a/man/lp.man +++ b/man/lp.man @@ -258,4 +258,4 @@ Print a presentation document 2-up to a printer called "foo": .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/lpadmin.man b/man/lpadmin.man index baa7dd3a1..ad73545d7 100644 --- a/man/lpadmin.man +++ b/man/lpadmin.man @@ -1,7 +1,7 @@ .\" .\" lpadmin man page for CUPS. .\" -.\" Copyright 2007-2017 by Apple Inc. +.\" Copyright 2007-2018 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. @@ -211,4 +211,4 @@ Create an IPP Everywhere print queue: .BR lpoptions (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/lpc.man b/man/lpc.man index bd3bebe2b..67cef3ead 100644 --- a/man/lpc.man +++ b/man/lpc.man @@ -52,4 +52,4 @@ command or another CUPS-compatible client with that functionality. .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/lpinfo.man b/man/lpinfo.man index 13dfd5a5d..0f2c97997 100644 --- a/man/lpinfo.man +++ b/man/lpinfo.man @@ -117,4 +117,4 @@ List drivers matching "HP LaserJet": .BR lpadmin (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/lpmove.man b/man/lpmove.man index cb093aee1..8d5134f05 100644 --- a/man/lpmove.man +++ b/man/lpmove.man @@ -70,4 +70,4 @@ Move all jobs from "oldprinter" to "newprinter": .br CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in index 4666f89ba..4f43c64ad 100644 --- a/man/lpoptions.man.in +++ b/man/lpoptions.man.in @@ -129,4 +129,4 @@ The \fBlpoptions\fR command is unique to CUPS. .BR lprm (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/lpq.man b/man/lpq.man index e98b56f07..0c7821a02 100644 --- a/man/lpq.man +++ b/man/lpq.man @@ -60,4 +60,4 @@ Requests a more verbose (long) reporting format. .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/lpr.man b/man/lpr.man index 068439967..c7d517705 100644 --- a/man/lpr.man +++ b/man/lpr.man @@ -210,4 +210,4 @@ Print a presentation document 2-up to a printer called "foo": .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/lprm.man b/man/lprm.man index ae12e339a..d2ab6c266 100644 --- a/man/lprm.man +++ b/man/lprm.man @@ -78,4 +78,4 @@ Cancel all jobs: .BR lpstat (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/lpstat.man b/man/lpstat.man index 7b716237d..78707a0c3 100644 --- a/man/lpstat.man +++ b/man/lpstat.man @@ -1,7 +1,7 @@ .\" .\" lpstat man page for CUPS. .\" -.\" Copyright 2007-2017 by Apple Inc. +.\" Copyright 2007-2018 by Apple Inc. .\" Copyright 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. @@ -145,4 +145,4 @@ The Solaris \fI\-f\fR, \fI\-P\fR, and \fI\-S\fR options are silently ignored. .BR lprm (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/mailto.conf.man b/man/mailto.conf.man index ba2a29d5e..da9b53ea6 100644 --- a/man/mailto.conf.man +++ b/man/mailto.conf.man @@ -40,4 +40,4 @@ Specifies a prefix string for the subject line of an email notification. .BR cupsd (8), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/mime.convs.man b/man/mime.convs.man index 73cd0ee11..83be3bcf4 100644 --- a/man/mime.convs.man +++ b/man/mime.convs.man @@ -54,4 +54,4 @@ Define a filter that converts PostScript documents to CUPS Raster format: .BR mime.types (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/mime.types.man b/man/mime.types.man index 39282c732..77b0c913e 100644 --- a/man/mime.types.man +++ b/man/mime.types.man @@ -104,4 +104,4 @@ Define two MIME media types for raster data, with one being a subset with higher .BR mime.convs (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/notifier.man b/man/notifier.man index 871343603..dedbb2689 100644 --- a/man/notifier.man +++ b/man/notifier.man @@ -32,4 +32,4 @@ Notifiers inherit the environment and can use the logging mechanism documented i .BR filter (7), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/ppdc.man b/man/ppdc.man index aa81791d0..c59c3e940 100644 --- a/man/ppdc.man +++ b/man/ppdc.man @@ -94,4 +94,4 @@ The default is to use the line feed character alone. .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/ppdcfile.man b/man/ppdcfile.man index 4303d805d..a95edf38b 100644 --- a/man/ppdcfile.man +++ b/man/ppdcfile.man @@ -153,4 +153,4 @@ Directives may be placed anywhere on a line and are followed by one or more valu .BR ppdpo (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/ppdhtml.man b/man/ppdhtml.man index 382ebd547..c3811b7ec 100644 --- a/man/ppdhtml.man +++ b/man/ppdhtml.man @@ -39,4 +39,4 @@ Multiple \fI-I\fR options can be supplied to add additional directories. .BR ppdpo (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/ppdi.man b/man/ppdi.man index 3ed3198bf..0ce29fb55 100644 --- a/man/ppdi.man +++ b/man/ppdi.man @@ -46,4 +46,4 @@ If no source file is specified, the filename \fIppdi.drv\fR is used. .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/ppdmerge.man b/man/ppdmerge.man index 9f226edb4..33037d001 100644 --- a/man/ppdmerge.man +++ b/man/ppdmerge.man @@ -42,4 +42,4 @@ Merging of different device PPDs will yield unpredictable results. .BR ppdcfile (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/ppdpo.man b/man/ppdpo.man index bb69d268d..e212ac0ea 100644 --- a/man/ppdpo.man +++ b/man/ppdpo.man @@ -46,4 +46,4 @@ The supported extensions are \fI.po\fR or \fI.po.gz\fR for GNU gettext format me .BR ppdcfile(5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/printers.conf.man b/man/printers.conf.man index 09e335a72..18f1b43d4 100644 --- a/man/printers.conf.man +++ b/man/printers.conf.man @@ -24,4 +24,4 @@ The name, location, and format of this file are an implementation detail that wi .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man index c034e5c37..39f2a16a8 100644 --- a/man/subscriptions.conf.man +++ b/man/subscriptions.conf.man @@ -24,4 +24,4 @@ The name, location, and format of this file are an implementation detail that wi .BR printers.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2017 by Apple Inc. +Copyright \[co] 2007-2018 by Apple Inc. diff --git a/templates/de/trailer.tmpl b/templates/de/trailer.tmpl index e3a12bf6d..54f03ac78 100644 --- a/templates/de/trailer.tmpl +++ b/templates/de/trailer.tmpl @@ -1,5 +1,5 @@ -
CUPS und das CUPS-Logo sind Warenzeichen der Apple Inc. Copyright © 2007-2017 Apple Inc. Alle Rechte vorbehalten.
+
CUPS und das CUPS-Logo sind Warenzeichen der Apple Inc. Copyright © 2007-2018 Apple Inc. Alle Rechte vorbehalten.
diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl index 4baa71da4..399189ec2 100644 --- a/templates/es/trailer.tmpl +++ b/templates/es/trailer.tmpl @@ -1,5 +1,5 @@ -
CUPS y el logo de CUPS son marcas registradas de Apple Inc. Derechos de autor © 2007-2017 Apple Inc. Todos los derechos reservados.
+
CUPS y el logo de CUPS son marcas registradas de Apple Inc. Derechos de autor © 2007-2018 Apple Inc. Todos los derechos reservados.
diff --git a/templates/fr/trailer.tmpl b/templates/fr/trailer.tmpl index 632632af9..907155ecf 100644 --- a/templates/fr/trailer.tmpl +++ b/templates/fr/trailer.tmpl @@ -1,5 +1,5 @@ -
CUPS et le logo CUPS sont des marques déposées de Apple Inc. CUPS est sous copyright 2007-2017 Apple Inc. Tous droits réservés.
+
CUPS et le logo CUPS sont des marques déposées de Apple Inc. CUPS est sous copyright 2007-2018 Apple Inc. Tous droits réservés.
diff --git a/templates/ja/trailer.tmpl b/templates/ja/trailer.tmpl index 4f5ec0728..04a205e0a 100644 --- a/templates/ja/trailer.tmpl +++ b/templates/ja/trailer.tmpl @@ -1,5 +1,5 @@ -
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2017 Apple Inc. All rights reserved.
+
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2018 Apple Inc. All rights reserved.
diff --git a/templates/pt_BR/trailer.tmpl b/templates/pt_BR/trailer.tmpl index c4b40fcb9..d1a1e64dc 100644 --- a/templates/pt_BR/trailer.tmpl +++ b/templates/pt_BR/trailer.tmpl @@ -1,5 +1,5 @@ -
CUPS e sua logo são marcas registradas da Apple Inc. Copyright © 2007-2017 Apple Inc. Todos os direitos reservados.
+
CUPS e sua logo são marcas registradas da Apple Inc. Copyright © 2007-2018 Apple Inc. Todos os direitos reservados.
diff --git a/templates/ru/trailer.tmpl b/templates/ru/trailer.tmpl index 985a4b045..0da429890 100644 --- a/templates/ru/trailer.tmpl +++ b/templates/ru/trailer.tmpl @@ -1,6 +1,6 @@
CUPS, а так же логотип CUPS являются зарегистрированными торговыми марками -Apple Inc. Авторские права на CUPS принадлежат (2007-2017) компании Apple Inc. Все права защищены.
+Apple Inc. Авторские права на CUPS принадлежат (2007-2018) компании Apple Inc. Все права защищены. diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl index 4f5ec0728..04a205e0a 100644 --- a/templates/trailer.tmpl +++ b/templates/trailer.tmpl @@ -1,5 +1,5 @@ -
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2017 Apple Inc. All rights reserved.
+
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2018 Apple Inc. All rights reserved.