From: Zdenek Dohnal Date: Thu, 22 Jun 2023 10:57:32 +0000 (+0200) Subject: Prepare files for next release in the future X-Git-Tag: v2.4.7~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e87252604130d85cb965c70dce26acb21180eb7;p=thirdparty%2Fcups.git Prepare files for next release in the future --- diff --git a/CHANGES.md b/CHANGES.md index 33c7a7d234..42839c697e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,12 @@ -CHANGES - OpenPrinting CUPS 2.4.6 - TBA +CHANGES - OpenPrinting CUPS 2.4.7 - TBA ============================================== -Changes in CUPS v2.4.6 - TBA ----------------------------- +Changes in CUPS v2.4.7 (TBA) +----------------------------------- + + +Changes in CUPS v2.4.6 (2023-06-22) +----------------------------------- - Fix linking error on old MacOS (Issue #715) - Fix printing multiple files on specific printers (Issue #643) @@ -10,13 +14,13 @@ Changes in CUPS v2.4.6 - TBA in `cupsdAcceptClient()` (fixes CVE-2023-34241) -Changes in CUPS v2.4.5 - 2023-06-13 +Changes in CUPS v2.4.5 (2023-06-13) ----------------------------------- - Fix corruption of locally saved certificates (Issue #724) -Changes in CUPS v2.4.4 - 2023-06-06 +Changes in CUPS v2.4.4 (2023-06-06) ----------------------------------- - Fix segfault in `cupsGetNamedDest()` when trying to get default printer, but diff --git a/README.md b/README.md index a3063e1951..5acad872c5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -OpenPrinting CUPS v2.4.6 +OpenPrinting CUPS v2.4.7 ======================== ![Version](https://img.shields.io/github/v/release/openprinting/cups?include_prereleases) diff --git a/configure b/configure index 7c1b2e92d7..ad8bb615e1 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for CUPS 2.4.6. +# Generated by GNU Autoconf 2.71 for CUPS 2.4.7. # # Report bugs to . # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CUPS' PACKAGE_TARNAME='cups' -PACKAGE_VERSION='2.4.6' -PACKAGE_STRING='CUPS 2.4.6' +PACKAGE_VERSION='2.4.7' +PACKAGE_STRING='CUPS 2.4.7' PACKAGE_BUGREPORT='https://github.com/openprinting/cups/issues' PACKAGE_URL='https://openprinting.github.io/cups' @@ -1504,7 +1504,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.4.6 to adapt to many kinds of systems. +\`configure' configures CUPS 2.4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1570,7 +1570,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CUPS 2.4.6:";; + short | recursive ) echo "Configuration of CUPS 2.4.7:";; esac cat <<\_ACEOF @@ -1758,7 +1758,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CUPS configure 2.4.6 +CUPS configure 2.4.7 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2113,7 +2113,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by CUPS $as_me 2.4.6, which was +It was created by CUPS $as_me 2.4.7, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3244,8 +3244,8 @@ done ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION="2.4.6" -CUPS_API_VERSION="$(echo 2.4.6 | awk -F. '{print $1 "." $2}')" +CUPS_VERSION="2.4.7" +CUPS_API_VERSION="$(echo 2.4.7 | awk -F. '{print $1 "." $2}')" CUPS_BUILD="cups-$CUPS_VERSION" @@ -12884,7 +12884,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by CUPS $as_me 2.4.6, which was +This file was extended by CUPS $as_me 2.4.7, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12949,7 +12949,7 @@ 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.4.6 +CUPS config.status 2.4.7 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5ad5ead1ef..cf8ba03f2e 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ dnl We need at least autoconf 2.71... AC_PREREQ([2.71]) dnl Package name and version... -AC_INIT([CUPS],[2.4.6],[https://github.com/openprinting/cups/issues],[cups],[https://openprinting.github.io/cups]) +AC_INIT([CUPS],[2.4.7],[https://github.com/openprinting/cups/issues],[cups],[https://openprinting.github.io/cups]) dnl This line is provided to ensure that you don't run the autoheader program dnl against this project. Doing so is completely unsupported and WILL cause diff --git a/cups/cups.h b/cups/cups.h index 6281ec987e..3a76db3ea7 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -43,10 +43,10 @@ extern "C" { * Constants... */ -# define CUPS_VERSION 2.0406 +# define CUPS_VERSION 2.0407 # define CUPS_VERSION_MAJOR 2 # define CUPS_VERSION_MINOR 4 -# define CUPS_VERSION_PATCH 6 +# define CUPS_VERSION_PATCH 7 # define CUPS_BC_FD 3 /* Back-channel file descriptor for diff --git a/vcnet/config.h b/vcnet/config.h index d46344ffb4..238a8ae6cf 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -100,8 +100,8 @@ typedef unsigned long useconds_t; * Version of software... */ -#define CUPS_SVERSION "CUPS v2.4.6" -#define CUPS_MINIMAL "CUPS/2.4.6" +#define CUPS_SVERSION "CUPS v2.4.7" +#define CUPS_MINIMAL "CUPS/2.4.7" /* diff --git a/vcnet/libcups2_native.nuspec b/vcnet/libcups2_native.nuspec index a5d26fc183..db6b466038 100644 --- a/vcnet/libcups2_native.nuspec +++ b/vcnet/libcups2_native.nuspec @@ -3,7 +3,7 @@ libcups2_native OpenPrinting CUPS Library for VS2019+ - 2.4.6.0 + 2.4.7.0 Michael R Sweet, OpenPrinting michaelrsweet https://github.com/OpenPrinting/cups @@ -16,7 +16,7 @@ and other Unix®-like operating systems. The CUPS library provides a convenient Copyright © 2020-2023 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products. http ipp native - + diff --git a/vcnet/libcups2_native.redist.nuspec b/vcnet/libcups2_native.redist.nuspec index 927bee6e18..0ac53323f4 100644 --- a/vcnet/libcups2_native.redist.nuspec +++ b/vcnet/libcups2_native.redist.nuspec @@ -3,7 +3,7 @@ libcups2_native.redist OpenPrinting CUPS Library for VS2019+ Redist - 2.4.6.0 + 2.4.7.0 Michael R Sweet, OpenPrinting michaelrsweet https://github.com/OpenPrinting/cups diff --git a/xcode/config.h b/xcode/config.h index 2b6c1450ac..a41306e08d 100644 --- a/xcode/config.h +++ b/xcode/config.h @@ -19,8 +19,8 @@ * Version of software... */ -#define CUPS_SVERSION "CUPS v2.4.6" -#define CUPS_MINIMAL "CUPS/2.4.6" +#define CUPS_SVERSION "CUPS v2.4.7" +#define CUPS_MINIMAL "CUPS/2.4.7" /*