From: Michael R Sweet Date: Tue, 16 Feb 2021 18:27:34 +0000 (-0500) Subject: Bump version to 2.4.0, no longer following Apple CUPS (leading). X-Git-Tag: v2.4b1~262 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7632150f1e63344f03ea059515f5dcb9a03c2b7;p=thirdparty%2Fcups.git Bump version to 2.4.0, no longer following Apple CUPS (leading). --- diff --git a/CHANGES-OPENPRINTING.md b/CHANGES-OPENPRINTING.md deleted file mode 100644 index 0963b8e3a9..0000000000 --- a/CHANGES-OPENPRINTING.md +++ /dev/null @@ -1,100 +0,0 @@ -OpenPrinting CUPS Changes -========================= - -Changes in CUPS v2.3.3op3 -------------------------- - -- The `cupsfilter` command now shows error messages when options are used - incorrectly (Issue #88) -- Documentation fixes (Issue #92) - - -Changes in CUPS v2.3.3op2 -------------------------- - -- Security: Fixed a buffer (read) overflow in the `ippReadIO` function - (CVE-2020-10001) -- Clarified the documentation for the "Listen" directive (Issue #53) -- Fixed duplicate ColorModel entries for AirPrint printers (Issue 59) -- Fixed directory/permission defaults for Debian kfreebsd-based systems - (Issue #60, Issue #61) -- Fixed crash bug in `ppdOpen` (Issue #64, Issue #78) -- Fixed regression in `snprintf` emulation function (Issue #67) -- The scheduler's systemd service file now waits for the nslcd service to start - (Issue #69) -- The libusb-based USB backend now uses a simpler read timer implementation to - avoid a regression in a previous change (Issue #72) -- The PPD caching code now only tracks the `APPrinterIconPath` value on macOS - (Issue #73) -- Fixed segfault in help.cgi when searching in man pages (Issue #81) -- Root certificates were incorrectly stored in "~/.cups/ssl". - - -Changes in CUPS v2.3.3op1 -------------------------- - -- The automated test suite can now be activated using `make test` for - consistency with other projects and CI environments - the old `make check` - continues to work as well, and the previous test server behavior can be - accessed by running `make testserver`. -- ippeveprinter now supports multiple icons and strings files. -- ippeveprinter now uses the system's FQDN with Avahi. -- ippeveprinter now supports Get-Printer-Attributes on "/". -- ippeveprinter now uses a deterministic "printer-uuid" value. -- ippeveprinter now uses system sounds on macOS for Identify-Printer. -- Updated ippfind to look for files in "~/Desktop" on Windows. -- Updated ippfind to honor `SKIP-XXX` directives with `PAUSE`. -- Updated IPP Everywhere support to work around printers that only advertise - color raster support but really also support grayscale (Issue #1) -- ipptool now supports DNS-SD URIs like `ipps://My%20Printer._ipps._tcp.local` - (Issue #5) -- The scheduler now allows root backends to have world read permissions but not - world execute permissions (Issue #21) -- Failures to bind IPv6 listener sockets no longer cause errors if IPv6 is - disabled on the host (Issue #25) -- The SNMP backend now supports the HP and Ricoh vendor MIBs (Issue #28) -- The scheduler no longer includes a timestamp in files it writes (Issue #29) -- The systemd service names are now "cups.service" and "cups-lpd.service" - (Issue #30, Issue #31) -- The scheduler no longer adds the local hostname to the ServerAlias list - (Issue #32) -- Added `LogFileGroup` directive in "cups-files.conf" to control the group - owner of log files (Issue #34) -- Added `--with-max-log-size` configure option (Issue #35) -- Added `--enable-sync-on-close` configure option (Issue #37) -- Added `--with-error-policy` configure option (Issue #38) -- IPP Everywhere PPDs could have an "unknown" default InputSlot (Issue #44) -- The `httpAddrListen` function now uses a listen backlog of 128. -- Added USB quirks (Apple issue #5789, #5823, #5831) -- Fixed IPP Everywhere v1.1 conformance issues in ippeveprinter. -- Fixed DNS-SD name collision support in ippeveprinter. -- Fixed compiler and code analyzer warnings. -- Fixed TLS support on Windows. -- Fixed ippfind sub-type searches with Avahi. -- Fixed the default hostname used by ippeveprinter on macOS. -- Fixed resolution of local IPP-USB printers with Avahi. -- Fixed coverity issues (Issue #2) -- Fixed `httpAddrConnect` issues (Issue #3) -- Fixed web interface device URI issue (Issue #4) -- Fixed lp/lpr "printer/class not found" error reporting (Issue #6) -- Fixed xinetd support for LPD clients (Issue #7) -- Fixed libtool build issue (Issue #11) -- Fixed a memory leak in the scheduler (Issue #12) -- Fixed a potential integer overflow in the PPD hashing code (Issue #13) -- Fixed output-bin and print-quality handling issues (Issue #18) -- Fixed PPD options getting mapped to odd IPP values like "tray---4" (Issue #23) -- Fixed remote access to the cupsd.conf and log files (Issue #24) -- Fixed the automated test suite when running in certain build/CI environments - (Issue #25) -- Fixed a logging regression caused by a previous change for Apple issue #5604 - (Issue #25) -- Fixed fax phone number handling with GNOME (Issue #40) -- Fixed potential rounding error in rastertopwg filter (Issue #41) -- Fixed the "uri-security-supported" value from the scheduler (Issue #42) -- Fixed IPP backend crash bug with "printer-alert" values (Issue #43) -- Removed old Solaris inetconv(1m) reference in cups-lpd man page (Issue #46) -- Fixed default options that incorrectly use the "custom" prefix (Issue #48) -- Fixed a memory leak when resolving DNS-SD URIs (Issue #49) -- Fixed systemd status reporting by adopting the notify interface (Issue #51) -- Fixed crash in rastertopwg (Apple issue #5773) -- Fixed cupsManualCopies values in IPP Everywhere PPDs (Apple issue #5807) diff --git a/CHANGES.md b/CHANGES.md index ee2ed141be..15db8fa3f7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,10 +1,110 @@ -CHANGES - 2.3.4 - 2020-11-18 +CHANGES - 2.4.0 - 2021-02-16 ============================ +Changes in CUPS v2.4.0 +---------------------- + +- The `cupsfilter` command now shows error messages when options are used + incorrectly (Issue #88) +- Documentation fixes (Issue #92) + + Changes in CUPS v2.3.4 ---------------------- -- CVE-20XX-YYYY: TODO rdar://61415567 embargo +- Updated the macOS USB backend to support the M1 processor architecture. + + +Changes in CUPS v2.3.3op2 +------------------------- + +- Security: Fixed a buffer (read) overflow in the `ippReadIO` function + (CVE-2020-10001) +- Clarified the documentation for the "Listen" directive (Issue #53) +- Fixed duplicate ColorModel entries for AirPrint printers (Issue 59) +- Fixed directory/permission defaults for Debian kfreebsd-based systems + (Issue #60, Issue #61) +- Fixed crash bug in `ppdOpen` (Issue #64, Issue #78) +- Fixed regression in `snprintf` emulation function (Issue #67) +- The scheduler's systemd service file now waits for the nslcd service to start + (Issue #69) +- The libusb-based USB backend now uses a simpler read timer implementation to + avoid a regression in a previous change (Issue #72) +- The PPD caching code now only tracks the `APPrinterIconPath` value on macOS + (Issue #73) +- Fixed segfault in help.cgi when searching in man pages (Issue #81) +- Root certificates were incorrectly stored in "~/.cups/ssl". + + +Changes in CUPS v2.3.3op1 +------------------------- + +- The automated test suite can now be activated using `make test` for + consistency with other projects and CI environments - the old `make check` + continues to work as well, and the previous test server behavior can be + accessed by running `make testserver`. +- ippeveprinter now supports multiple icons and strings files. +- ippeveprinter now uses the system's FQDN with Avahi. +- ippeveprinter now supports Get-Printer-Attributes on "/". +- ippeveprinter now uses a deterministic "printer-uuid" value. +- ippeveprinter now uses system sounds on macOS for Identify-Printer. +- Updated ippfind to look for files in "~/Desktop" on Windows. +- Updated ippfind to honor `SKIP-XXX` directives with `PAUSE`. +- Updated IPP Everywhere support to work around printers that only advertise + color raster support but really also support grayscale (Issue #1) +- ipptool now supports DNS-SD URIs like `ipps://My%20Printer._ipps._tcp.local` + (Issue #5) +- The scheduler now allows root backends to have world read permissions but not + world execute permissions (Issue #21) +- Failures to bind IPv6 listener sockets no longer cause errors if IPv6 is + disabled on the host (Issue #25) +- The SNMP backend now supports the HP and Ricoh vendor MIBs (Issue #28) +- The scheduler no longer includes a timestamp in files it writes (Issue #29) +- The systemd service names are now "cups.service" and "cups-lpd.service" + (Issue #30, Issue #31) +- The scheduler no longer adds the local hostname to the ServerAlias list + (Issue #32) +- Added `LogFileGroup` directive in "cups-files.conf" to control the group + owner of log files (Issue #34) +- Added `--with-max-log-size` configure option (Issue #35) +- Added `--enable-sync-on-close` configure option (Issue #37) +- Added `--with-error-policy` configure option (Issue #38) +- IPP Everywhere PPDs could have an "unknown" default InputSlot (Issue #44) +- The `httpAddrListen` function now uses a listen backlog of 128. +- Added USB quirks (Apple issue #5789, #5823, #5831) +- Fixed IPP Everywhere v1.1 conformance issues in ippeveprinter. +- Fixed DNS-SD name collision support in ippeveprinter. +- Fixed compiler and code analyzer warnings. +- Fixed TLS support on Windows. +- Fixed ippfind sub-type searches with Avahi. +- Fixed the default hostname used by ippeveprinter on macOS. +- Fixed resolution of local IPP-USB printers with Avahi. +- Fixed coverity issues (Issue #2) +- Fixed `httpAddrConnect` issues (Issue #3) +- Fixed web interface device URI issue (Issue #4) +- Fixed lp/lpr "printer/class not found" error reporting (Issue #6) +- Fixed xinetd support for LPD clients (Issue #7) +- Fixed libtool build issue (Issue #11) +- Fixed a memory leak in the scheduler (Issue #12) +- Fixed a potential integer overflow in the PPD hashing code (Issue #13) +- Fixed output-bin and print-quality handling issues (Issue #18) +- Fixed PPD options getting mapped to odd IPP values like "tray---4" (Issue #23) +- Fixed remote access to the cupsd.conf and log files (Issue #24) +- Fixed the automated test suite when running in certain build/CI environments + (Issue #25) +- Fixed a logging regression caused by a previous change for Apple issue #5604 + (Issue #25) +- Fixed fax phone number handling with GNOME (Issue #40) +- Fixed potential rounding error in rastertopwg filter (Issue #41) +- Fixed the "uri-security-supported" value from the scheduler (Issue #42) +- Fixed IPP backend crash bug with "printer-alert" values (Issue #43) +- Removed old Solaris inetconv(1m) reference in cups-lpd man page (Issue #46) +- Fixed default options that incorrectly use the "custom" prefix (Issue #48) +- Fixed a memory leak when resolving DNS-SD URIs (Issue #49) +- Fixed systemd status reporting by adopting the notify interface (Issue #51) +- Fixed crash in rastertopwg (Apple issue #5773) +- Fixed cupsManualCopies values in IPP Everywhere PPDs (Apple issue #5807) + Changes in CUPS v2.3.3 ---------------------- diff --git a/README.md b/README.md index dfcf5f0a91..6a20b3a112 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -README - CUPS v2.3.4op1 - 2021-02-01 -==================================== +README - CUPS v2.4.0 - 2021-02-16 +================================= ![Version](https://img.shields.io/github/v/release/openprinting/cups?include_prereleases) ![Apache 2.0](https://img.shields.io/github/license/openprinting/cups) diff --git a/configure b/configure index 016ca0659d..92b5d0bfdb 100755 --- a/configure +++ b/configure @@ -1,12 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for CUPS 2.3.4op1. +# Generated by GNU Autoconf 2.70 for CUPS 2.4.0. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -611,10 +610,10 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CUPS' PACKAGE_TARNAME='cups' -PACKAGE_VERSION='2.3.4op1' -PACKAGE_STRING='CUPS 2.3.4op1' +PACKAGE_VERSION='2.4.0' +PACKAGE_STRING='CUPS 2.4.0' PACKAGE_BUGREPORT='https://github.com/openprinting/cups/issues' -PACKAGE_URL='https://openprinting.github.io/' +PACKAGE_URL='https://openprinting.github.io/cups' # Factoring default headers for most tests. ac_includes_default="\ @@ -1509,7 +1508,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures CUPS 2.3.4op1 to adapt to many kinds of systems. +\`configure' configures CUPS 2.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1575,7 +1574,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CUPS 2.3.4op1:";; + short | recursive ) echo "Configuration of CUPS 2.4.0:";; esac cat <<\_ACEOF @@ -1696,7 +1695,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to . -CUPS home page: . +CUPS home page: . _ACEOF ac_status=$? fi @@ -1760,10 +1759,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CUPS configure 2.3.4op1 -generated by GNU Autoconf 2.71 +CUPS configure 2.4.0 +generated by GNU Autoconf 2.70 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2020 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2115,8 +2114,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.3.4op1, which was -generated by GNU Autoconf 2.71. Invocation command line was +It was created by CUPS $as_me 2.4.0, which was +generated by GNU Autoconf 2.70. Invocation command line was $ $0$ac_configure_args_raw @@ -3236,7 +3235,7 @@ done ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION="2.3.4op1" +CUPS_VERSION="2.4.0" CUPS_REVISION="" CUPS_BUILD="cups-$CUPS_VERSION" @@ -3841,10 +3840,7 @@ else CFLAGS= fi fi -ac_prog_cc_stdc=no -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : @@ -3868,28 +3864,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam done rm -f conftest.$ac_ext CC=$ac_save_CC -fi -if test "x$ac_cv_prog_cc_c11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 -printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 fi -fi -if test x$ac_prog_cc_stdc = xno +# AC_CACHE_VAL +ac_prog_cc_stdc_options= +case "x$ac_cv_prog_cc_c11" in #( + x) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } ;; #( + xno) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } ;; #( + *) : + ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c11" + CC="$CC$ac_prog_cc_stdc_options" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c11" != xno then : + ac_prog_cc_stdc=c11 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 +else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} @@ -3900,9 +3896,9 @@ else $as_nop ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_c_conftest_c99_program +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99 do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO" @@ -3914,28 +3910,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam done rm -f conftest.$ac_ext CC=$ac_save_CC -fi -if test "x$ac_cv_prog_cc_c99" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 -fi -fi -if test x$ac_prog_cc_stdc = xno +# AC_CACHE_VAL +ac_prog_cc_stdc_options= +case "x$ac_cv_prog_cc_c99" in #( + x) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } ;; #( + xno) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } ;; #( + *) : + ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c99" + CC="$CC$ac_prog_cc_stdc_options" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno then : + ac_prog_cc_stdc=c99 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 +else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} @@ -3948,7 +3944,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO" @@ -3960,25 +3957,34 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam done rm -f conftest.$ac_ext CC=$ac_save_CC -fi -if test "x$ac_cv_prog_cc_c89" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x +fi +# AC_CACHE_VAL +ac_prog_cc_stdc_options= +case "x$ac_cv_prog_cc_c89" in #( + x) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } ;; #( + xno) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } ;; #( + *) : + ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c89" + CC="$CC$ac_prog_cc_stdc_options" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } + ac_prog_cc_stdc=c89 + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" + ac_prog_cc_stdc=no + ac_cv_prog_cc_stdc=no fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 + fi + fi ac_ext=c @@ -4394,22 +4400,19 @@ else CXXFLAGS= fi fi -ac_prog_cxx_stdcxx=no -if test x$ac_prog_cxx_stdcxx = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_11+y} +if test ${ac_cv_prog_cxx_cxx11+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_11=no + ac_cv_prog_cxx_cxx11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_cxx_conftest_cxx11_program _ACEOF -for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +for ac_arg in '' -std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA do CXX="$ac_save_CXX $ac_arg" if ac_fn_cxx_try_compile "$LINENO" @@ -4421,35 +4424,36 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam done rm -f conftest.$ac_ext CXX=$ac_save_CXX -fi -if test "x$ac_cv_prog_cxx_cxx11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx11" -fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 - ac_prog_cxx_stdcxx=cxx11 -fi fi -if test x$ac_prog_cxx_stdcxx = xno +# AC_CACHE_VAL +ac_prog_cxx_stdcxx_options= +case "x$ac_cv_prog_cxx_cxx11" in #( + x) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } ;; #( + xno) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } ;; #( + *) : + ac_prog_cxx_stdcxx_options=" $ac_cv_prog_cxx_cxx11" + CXX=$CXX$ac_prog_cxx_stdcxx_options + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } ;; +esac +if test "x$ac_cv_prog_cxx_cxx11" != xno then : + ac_prog_cxx_stdcxx=cxx11 + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_cv_prog_cxx_cxx98=$ac_cv_prog_cxx_cxx11 +else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_98+y} +if test ${ac_cv_prog_cxx_cxx98+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_98=no + ac_cv_prog_cxx_cxx98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4467,25 +4471,32 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam done rm -f conftest.$ac_ext CXX=$ac_save_CXX -fi -if test "x$ac_cv_prog_cxx_cxx98" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx98" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx98" fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 +# AC_CACHE_VAL +ac_prog_cxx_stdcxx_options= +case "x$ac_cv_prog_cxx_cxx98" in #( + x) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } ;; #( + xno) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } ;; #( + *) : + ac_prog_cxx_stdcxx_options=" $ac_cv_prog_cxx_cxx98" + CXX=$CXX$ac_prog_cxx_stdcxx_options + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } ;; +esac +if test "x$ac_cv_prog_cxx_cxx98" != xno +then : ac_prog_cxx_stdcxx=cxx98 + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 +else $as_nop + ac_prog_cxx_stdcxx=no + ac_cv_prog_cxx_stdcxx=no fi + fi ac_ext=c @@ -11226,8 +11237,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.3.4op1, which was -generated by GNU Autoconf 2.71. Invocation command line was +This file was extended by CUPS $as_me 2.4.0, which was +generated by GNU Autoconf 2.70. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -11283,7 +11294,7 @@ Configuration headers: $config_headers Report bugs to . -CUPS home page: ." +CUPS home page: ." _ACEOF ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` @@ -11291,11 +11302,11 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -CUPS config.status 2.3.4op1 -configured by $0, generated by GNU Autoconf 2.71, +CUPS config.status 2.4.0 +configured by $0, generated by GNU Autoconf 2.70, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2020 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." diff --git a/configure.ac b/configure.ac index f3f12cc1de..75dfe40199 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ dnl We need at least autoconf 2.60... AC_PREREQ(2.60) dnl Package name and version... -AC_INIT([CUPS], [2.3.4op1], [https://github.com/openprinting/cups/issues], [cups], [https://openprinting.github.io/]) +AC_INIT([CUPS], [2.4.0], [https://github.com/openprinting/cups/issues], [cups], [https://openprinting.github.io/cups]) sinclude(config-scripts/cups-opsys.m4) sinclude(config-scripts/cups-common.m4)