Prep CUPS 2.5 development.

diff --git a/README.md b/README.md
index c5937876a52b1a9ac0c53405e366ffcbe1b90d8e..4dcb43645930a8c77f73641b05ad83991c8a5430 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-OpenPrinting CUPS v2.4.3
+OpenPrinting CUPS v2.5b1
 ========================
 
 ![Version](https://img.shields.io/github/v/release/openprinting/cups?include_prereleases)
@@ -6,6 +6,9 @@ OpenPrinting CUPS v2.4.3
 [![Build and Test](https://github.com/OpenPrinting/cups/workflows/Build%20and%20Test/badge.svg)](https://github.com/OpenPrinting/cups/actions/workflows/build.yml)
 [![Coverity Scan](https://img.shields.io/coverity/scan/23806)](https://scan.coverity.com/projects/openprinting-cups)
 
+> *Note:* This branch is tracking a future CUPS 2.5.x feature release.  Check
+> out the "2.4.x" branch for CUPS 2.4.x.
+
 
 Introduction
 ------------

diff --git a/configure b/configure
index b796488c337f754dfac5edbdf64a6669f6f90aec..bd08c4c3f93e510593db340516a812c65015bad3 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for CUPS 2.4.3.
+# Generated by GNU Autoconf 2.71 for CUPS 2.5b1.
 #
 # Report bugs to <https://github.com/openprinting/cups/issues>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.4.3'
-PACKAGE_STRING='CUPS 2.4.3'
+PACKAGE_VERSION='2.5b1'
+PACKAGE_STRING='CUPS 2.5b1'
 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.3 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.5b1 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.3:";;
+     short | recursive ) echo "Configuration of CUPS 2.5b1:";;
    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.3
+CUPS configure 2.5b1
 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.3, which was
+It was created by CUPS $as_me 2.5b1, 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.3"
-CUPS_API_VERSION="$(echo 2.4.3 | awk -F. '{print $1 "." $2}')"
+CUPS_VERSION="2.5b1"
+CUPS_API_VERSION="$(echo 2.5b1 | awk -F. '{print $1 "." $2}')"
 CUPS_BUILD="cups-$CUPS_VERSION"
 
 
@@ -7133,7 +7133,7 @@ printf "%s\n" "#define CUPS_LITE 1" >>confdefs.h
  ;; #(
   *) :
 
-    as_fn_error $? "Bad build component \"$COMPONENT\" specified." "$LINENO" 5
+    as_fn_error $? "Bad build component \"$COMPONENTS\" specified." "$LINENO" 5
  ;; #(
   *) :
      ;;
@@ -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.3, which was
+This file was extended by CUPS $as_me 2.5b1, 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.3
+CUPS config.status 2.5b1
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 487a75e66e0c0d4d069c28b7253e06b806fc1f6e..4b297568f4c5fd2da71c1e453549a8b3bf01b04e 100644 (file)
--- 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.3],[https://github.com/openprinting/cups/issues],[cups],[https://openprinting.github.io/cups])
+AC_INIT([CUPS],[2.5b1],[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/vcnet/config.h b/vcnet/config.h
index a900249d5a3be1b4d891f479005bc2ac967950af..d4bd0ed7db43325f4d7154ee7f7c739ed54259c7 100644 (file)
--- 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.3"
-#define CUPS_MINIMAL "CUPS/2.4.3"
+#define CUPS_SVERSION "CUPS v2.5.0"
+#define CUPS_MINIMAL "CUPS/2.5.0"
 
 
 /*
@@ -386,10 +386,8 @@ typedef unsigned long useconds_t;
  */
 
 #define HAVE_TLS 1
-/* #undef HAVE_CDSASSL */
 #define HAVE_OPENSSL 1
 /* #undef HAVE_GNUTLS */
-/* #undef HAVE_SSPISSL */
 
 
 /*

diff --git a/vcnet/libcups2_native.nuspec b/vcnet/libcups2_native.nuspec
index 7d5ba94cf83fc8b0b5d3bb0839fcc1ad338a57cd..2f3c17e1029d48617dcfad029f7f9bcab7182ac0 100644 (file)
--- a/vcnet/libcups2_native.nuspec
+++ b/vcnet/libcups2_native.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <id>libcups2_native</id>
         <title>OpenPrinting CUPS Library for VS2019+</title>
-        <version>2.4.3.5</version>
+        <version>2.5.0.0</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
@@ -16,7 +16,7 @@ and other Unix®-like operating systems. The CUPS library provides a convenient
         <copyright>Copyright © 2020-2023 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
         <tags>http ipp native</tags>
        <dependencies>
-           <dependency id="libcups2_native.redist" version="2.4.3.5" />
+           <dependency id="libcups2_native.redist" version="2.5.0.0" />
        </dependencies>
     </metadata>
     <files>

diff --git a/vcnet/libcups2_native.redist.nuspec b/vcnet/libcups2_native.redist.nuspec
index 3d71a15cbbd2f9f4551c8fb270715d333379ca3a..ca4dad152449312216f9643296800589613c7ca6 100644 (file)
--- a/vcnet/libcups2_native.redist.nuspec
+++ b/vcnet/libcups2_native.redist.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <id>libcups2_native.redist</id>
         <title>OpenPrinting CUPS Library for VS2019+ Redist</title>
-        <version>2.4.3.5</version>
+        <version>2.5.0.0</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>

diff --git a/xcode/config.h b/xcode/config.h
index bb94fd0e414c1b747298550626de196cae193ae3..294d25c4dab196490d87384472682754a5ca4a5e 100644 (file)
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -19,8 +19,8 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.4.3"
-#define CUPS_MINIMAL "CUPS/2.4.3"
+#define CUPS_SVERSION "CUPS v2.5.0"
+#define CUPS_MINIMAL "CUPS/2.5.0"
 
 
 /*
@@ -307,10 +307,8 @@
  */
 
 #define HAVE_TLS 1
-#define HAVE_CDSASSL 1
-/* #undef HAVE_OPENSSL */
+#define HAVE_OPENSSL 1
 /* #undef HAVE_GNUTLS */
-/* #undef HAVE_SSPISSL */
 
 
 /*