Andreas Radke pushed to branch main at Arch Linux / Packaging / Packages / cups
Commits:
17d7ec1a by Xeonacid at 2024-05-21T17:28:58+02:00
Add missing header grp.h
- - - - -
2 changed files:
- PKGBUILD
- guid.patch
Changes:
=====================================
PKGBUILD
=====================================
@@ -27,7 +27,7 @@
sha256sums=('75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0'
'06173dfaea37bdd9b39b3e09aba98c34ae7112a2f521db45a688907d8848caa2'
'f0b15192952c151b1843742c87850ff3a7d0f3ba5dd236ed16623ef908472ad7'
'3385047b9ac8a7b13aeb8f0ca55d15f793ce7283516db0155fe28a67923c592d'
- '0bf6a75ba1b051771f155d9a5d36b307a6d40c6857d645b250fe93f3fb713474')
+ '1b1c3268bdff6627b78070b6cd9abec6ef41572c27abbafccb237199f7137653')
#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>"
=====================================
guid.patch
=====================================
@@ -1,12 +1,13 @@
--- 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
-@@ -134,9 +134,14 @@ main(int argc, /* I - Number
of command-line args */
+@@ -134,9 +134,15 @@ main(int argc, /* I - Number
of command-line args */
# if CUPS_SNAP
if (setgroups(0, NULL))
# else
- if (setgroups(1, &gid))
-# endif /* CUPS_SNAP */
+#include <pwd.h>
++#include <grp.h>
+ struct passwd * pwd = getpwuid(uid);
+ if(initgroups(pwd->pw_name,pwd->pw_gid))
+ {
@@ -19,13 +20,14 @@
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.new 2021-11-29 16:29:58.810719066 +0100
-@@ -296,7 +296,16 @@
+@@ -296,7 +296,17 @@
*/
if (!getuid() && user)
- setuid(user); /* Run as restricted user */
+ {
+#include <pwd.h>
++#include <grp.h>
+ struct passwd * pwd = getpwuid(user);
+ if(initgroups(pwd->pw_name,pwd->pw_gid))
+ {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cups/-/commit/17d7ec1a7960634ba7bbc0d49ad3902fc424b623
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cups/-/commit/17d7ec1a7960634ba7bbc0d49ad3902fc424b623
You're receiving this email because of your account on gitlab.archlinux.org.
