From: zdohnal <zdohnal@redhat.com>
Date: Thu, 16 Nov 2023 07:39:57 +0000 (+0100)
Subject: Merge branch 'master' into colorprofile-leak
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7687e767a9cc07e6d0f17300d4c416ad467b35ec;p=thirdparty%2Fcups.git

Merge branch 'master' into colorprofile-leak
---

7687e767a9cc07e6d0f17300d4c416ad467b35ec
diff --cc CHANGES.md
index 9f40618fbe,1ade244666..ce5bb1a565
--- a/CHANGES.md
+++ b/CHANGES.md
@@@ -16,7 -16,7 +16,8 @@@ Changes in CUPS v2.5b1 (TBA
  - Fixed extensive looping in scheduler (Issue #604)
  - Fixed hanging of `lpstat` on IBM AIX (Issue #773)
  - Fixed hanging of `lpstat` on Solaris (Issue #156)
- - Fixed memory leak when creating color profiles
++- Fixed memory leak when creating color profiles (Issue #814)
+ - Fixed memory leak when unloading a job (Issue #813)
  - Fixed segfault in `cupsGetNamedDest()` when trying to get default printer, but
    the default printer is not set (Issue #719)
  - Fixed RFC 1179 port reserving behavior in LPD backend (Issue #743)