From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Sun, 7 Mar 2021 15:21:40 +0000 (-0500)
Subject: Merge branch 'master' into remove_underscore
X-Git-Tag: v2.4b1~202^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F110%2Fhead;p=thirdparty%2Fcups.git

Merge branch 'master' into remove_underscore
---

1daaa38524e965d07778f20d0db22b9e9831897e
diff --cc CHANGES.md
index e317297ff2,234eca96cf..1e55a51175
--- a/CHANGES.md
+++ b/CHANGES.md
@@@ -7,17 -13,15 +13,16 @@@ CUPS v2.4rc1 (Pending
  - The `cupsfilter` command now shows error messages when options are used
    incorrectly (Issue #88)
  - Documentation fixes (Issue #92)
- - Remove underscore from queue name if it is the last character (PR #56)
+ - Kerberos (`AuthType Negotiate`) authentication is now deprecated (Issue #98)
+ - The PPD functions now treat boolean values as case-insensitive (Issue #106)
++- Temporary queue names no longer end with an underscore (Issue #110)
+ - Removed support for the (long deprecated and unused) `FontPath`,
+   `LPDConfigFile`, `RIPCache`, and `SMBConfigFile` directives in `cupsd.conf`
+   and `cups-files.conf`.
  
  
- Changes in CUPS v2.3.4
- ----------------------
- 
- - Updated the macOS USB backend to support the M1 processor architecture.
- 
- 
- Changes in CUPS v2.3.3op2
- -------------------------
+ CUPS v2.3.3op2 (February 1, 2021)
+ ---------------------------------
  
  - Security: Fixed a buffer (read) overflow in the `ippReadIO` function
    (CVE-2020-10001)