Andreas Radke pushed to branch main at Arch Linux / Packaging / Packages / cups
Commits:
0a2664c5 by Andreas Radke at 2025-12-03T17:05:40+01:00
upgpkg: 2:2.4.15-3; apply upstream fix for invinite loop in GTK+
- - - - -
4 changed files:
- .SRCINFO
- + 0001-Fix_an_infinite_loop_issue_in_GTK.patch
- PKGBUILD
- REUSE.toml
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = cups
pkgver = 2.4.15
- pkgrel = 2
+ pkgrel = 3
epoch = 2
url = https://openprinting.github.io/cups/
arch = x86_64
@@ -22,6 +22,7 @@ pkgbase = cups
source = cups-2.4.0-statedir.patch
source = cups-freebind.patch
source = guid.patch
+ source = 0001-Fix_an_infinite_loop_issue_in_GTK.patch
sha256sums =
69c0d6ad8629aff633f4e4a510761ecc61263ca917d5a6ddc64e82ee7785a746
sha256sums =
d87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9
sha256sums =
57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
@@ -29,6 +30,7 @@ pkgbase = cups
sha256sums =
f0b15192952c151b1843742c87850ff3a7d0f3ba5dd236ed16623ef908472ad7
sha256sums =
3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d
sha256sums =
8becc2ad17787ef755fb77f83a87cf52f1a38154c5dde0f4a0051e06a0583fb9
+ sha256sums =
c4412d808b2c045db21cdeba925da26ecf9de59e803c87176751f93866514cbc
pkgname = libcups
pkgdesc = OpenPrinting CUPS - client libraries and headers
=====================================
0001-Fix_an_infinite_loop_issue_in_GTK.patch
=====================================
@@ -0,0 +1,11 @@
+--- a/cups/http.c 2025-12-03 16:55:34.714957932 +0100
++++ b/cups/http.c.new 2025-12-03 16:58:31.332742773 +0100
+@@ -2779,7 +2779,7 @@
+ /* See whether our read buffer is full... */
+ DEBUG_printf(("2_httpUpdate: used=%d", http->used));
+
+- if (http->used > 0 && !memchr(http->buffer, '\n', (size_t)http->used) &&
(size_t)http->used < sizeof(http->buffer))
++ if (http->used < sizeof(http->buffer))
+ {
+ /* No, try filling in more data... */
+ if ((bytes = http_read(http, http->buffer + http->used,
sizeof(http->buffer) - (size_t)http->used, /*timeout*/0)) > 0)
=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=2.4.15
-pkgrel=2
+pkgrel=3
epoch=2
arch=('x86_64')
license=('Apache-2.0 WITH LLVM-exception AND BSD-3-Clause AND Zlib AND
BSD-2-Clause')
@@ -20,6 +20,7 @@
source=(#https://github.com/OpenPrinting/cups/releases/download/v${pkgver}/cups-
# bugfixes
cups-freebind.patch
guid.patch
+ 0001-Fix_an_infinite_loop_issue_in_GTK.patch
)
sha256sums=('69c0d6ad8629aff633f4e4a510761ecc61263ca917d5a6ddc64e82ee7785a746'
'd87fa0f0b5ec677aae34668f260333db17ce303aa1a752cba5f8e72623d9acf9'
@@ -27,7 +28,8 @@
sha256sums=('69c0d6ad8629aff633f4e4a510761ecc61263ca917d5a6ddc64e82ee7785a746'
'5324bd933385713e0dfd0b20cf5f861d1401bdeb693c5be7edc3ca4404e78e2b'
'f0b15192952c151b1843742c87850ff3a7d0f3ba5dd236ed16623ef908472ad7'
'3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d'
- '8becc2ad17787ef755fb77f83a87cf52f1a38154c5dde0f4a0051e06a0583fb9')
+ '8becc2ad17787ef755fb77f83a87cf52f1a38154c5dde0f4a0051e06a0583fb9'
+ 'c4412d808b2c045db21cdeba925da26ecf9de59e803c87176751f93866514cbc')
#validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org
(CUPS.org PGP key) <[email protected]>
#validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org
<[email protected]>"
#validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet
<[email protected]>"
@@ -40,7 +42,9 @@ prepare() {
# reverts
# https://github.com/OpenPrinting/cups/issues/1429
- git revert -n 5d414f1f91bdca118413301b148f0b188eb1cdc6
+ # git revert -n 5d414f1f91bdca118413301b148f0b188eb1cdc6
+ # git cherry-pick -n 2dc021f33a3ea358c9f5c5c54643adc4c46a84a1
+ patch -Np1 -i ../0001-Fix_an_infinite_loop_issue_in_GTK.patch
# move /var/run -> /run for pid file
patch -Np1 -i "${srcdir}"/cups-2.4.0-statedir.patch
=====================================
REUSE.toml
=====================================
@@ -26,6 +26,7 @@ SPDX-License-Identifier = "0BSD"
path = [
"cups-2.4.0-statedir.patch",
"cups-freebind.patch",
+ "0001-Fix_an_infinite_loop_issue_in_GTK.patch",
]
SPDX-FileCopyrightText = "cups contributors"
SPDX-License-Identifier = "Apache-2.0"
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cups/-/commit/0a2664c57c9f4e0e5ce9891f60f08e691d88f390
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cups/-/commit/0a2664c57c9f4e0e5ce9891f60f08e691d88f390
You're receiving this email because of your account on gitlab.archlinux.org.
