Date: Tuesday, November 30, 2021 @ 21:52:05 Author: andyrtr Revision: 429839
upgpkg: cups 1:2.4.0-2: update guid.patch to work with 2.4.x Modified: cups/trunk/PKGBUILD cups/trunk/guid.patch ------------+ PKGBUILD | 8 +++----- guid.patch | 15 ++++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-11-30 21:51:28 UTC (rev 429838) +++ PKGBUILD 2021-11-30 21:52:05 UTC (rev 429839) @@ -3,7 +3,7 @@ pkgbase="cups" pkgname=('libcups' 'cups') pkgver=2.4.0 -pkgrel=1 +pkgrel=2 epoch=1 arch=('x86_64') license=('Apache' 'custom') @@ -28,7 +28,7 @@ '06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2' 'f0b15192952c151b1843742c87850ff3a7d0f3ba5dd236ed16623ef908472ad7' '3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d' - 'SKIP') + '49558d59e285e32b8de9ac061fff756e6773e9f36c2c1d9d5e1a92feaeec5abd') #validpgpkeys=('3737FD0D0E63B30172440D2DDBA3A7AB08D76223') # CUPS.org (CUPS.org PGP key) <secur...@cups.org> #validpgpkeys+=('45D083946E3035282B3CCA9AF434104235DA97EB') # "CUPS.org <secur...@cups.org>" #validpgpkeys+=('845464660B686AAB36540B6F999559A027815955') # "Michael R Sweet <michael.r.sw...@gmail.com>" @@ -48,10 +48,8 @@ # use IP_FREEBIND, because cupsd cannot bind to not yet existing IP address patch -Np1 -i "${srcdir}"/cups-freebind.patch - - # https://github.com/OpenPrinting/cups/pull/274 - needs fixing, build broken # FS#56818 - https://github.com/apple/cups/issues/5236 -# patch -Np1 -i "${srcdir}"/guid.patch + patch -Np1 -i "${srcdir}"/guid.patch # Rebuild configure script for not zipping man-pages. # aclocal -I config-scripts Modified: guid.patch =================================================================== --- guid.patch 2021-11-30 21:51:28 UTC (rev 429838) +++ guid.patch 2021-11-30 21:52:05 UTC (rev 429839) @@ -1,20 +1,21 @@ --- cups-2.4.0/scheduler/cups-exec.c 2021-11-29 16:19:34.235186064 +0100 +++ cups-2.4.0/scheduler/cups-exec.c.new 2021-11-29 16:25:30.764049649 +0100 -@@ -136,7 +136,13 @@ +@@ -134,7 +134,13 @@ main(int argc, /* I - Number of command-line args */ + # if CUPS_SNAP + if (setgroups(0, NULL)) # else - if (setgroups(1, &gid)) - # endif /* CUPS_SNAP */ +- if (setgroups(1, &gid)) +#include <pwd.h> + struct passwd * pwd = getpwuid(uid); + if(initgroups(pwd->pw_name,pwd->pw_gid)) + { + fprintf(stderr, "DEBUG: initgroups failed\n"); ++ exit(errno + 100); ++ } + # endif /* CUPS_SNAP */ exit(errno + 100); -+ } - if (uid && setuid(uid)) - exit(errno + 100); ---- cups-2.4.0/scheduler/util.c 2021-11-29 15:27:31.000000000 +0100 + --- cups-2.4.0/scheduler/util.c 2021-11-29 15:27:31.000000000 +0100 +++ cups-2.4.0/scheduler/util.c.new 2021-11-29 16:29:58.810719066 +0100 @@ -296,7 +296,16 @@ */