diff options
| author | manu <manu@pkgsrc.org> | 2019-07-17 01:44:31 +0000 |
|---|---|---|
| committer | manu <manu@pkgsrc.org> | 2019-07-17 01:44:31 +0000 |
| commit | 6e834a35655faaec037a5f193486704447e8cced (patch) | |
| tree | c560a7f4c84f48600424e3d313d2ee9cff1ca6ff /print/cups-base | |
| parent | a875b9121cd9b045968de698820698f47f81e566 (diff) | |
| download | pkgsrc-6e834a35655faaec037a5f193486704447e8cced.tar.gz | |
The scheduler now uses both the group's membership list as well as the
various OS-specific membership functions to determine whether a user belongs
to a named group (Issue #5613)
From upstream
https://github.com/apple/cups/commit/3c27d2a6ddf50a4cb02c0b7a464eaf7b6f1ea601
Diffstat (limited to 'print/cups-base')
| -rw-r--r-- | print/cups-base/Makefile | 3 | ||||
| -rw-r--r-- | print/cups-base/distinfo | 3 | ||||
| -rw-r--r-- | print/cups-base/patches/patch-5613 | 49 |
3 files changed, 53 insertions, 2 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 6e8c7264c63..edafc5c8679 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:13 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2019/07/17 01:44:31 manu Exp $ .include "../../print/cups/Makefile.common" DISTNAME= cups-${CUPS_VERS}-source PKGNAME= cups-base-${CUPS_VERS} +PKGREVISION= 1 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo index 3f92b8732c0..d954056f587 100644 --- a/print/cups-base/distinfo +++ b/print/cups-base/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.13 2019/04/17 09:39:27 wiz Exp $ +$NetBSD: distinfo,v 1.14 2019/07/17 01:44:31 manu Exp $ SHA1 (cups-2.2.11-source.tar.gz) = b995f520becc6c3e74b89165f689fe8255c86ba5 RMD160 (cups-2.2.11-source.tar.gz) = f40e35094287f229d3d3d9a06cf7d576d62a60d4 SHA512 (cups-2.2.11-source.tar.gz) = 21a6916041b50044d336871f10d1192635458a3d318f19a18ad21d27027dd3839400601019e758424c218225a34aba148ba3a57f0ce3fe14c4df03bd1fde3403 Size (cups-2.2.11-source.tar.gz) = 10405908 bytes +SHA1 (patch-5613) = 0c04b22fea5efc558a1915eaf1c940f47b013f43 SHA1 (patch-ae) = f34ec899f4816bdcf96ff315e001e3ac5a960200 SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6 diff --git a/print/cups-base/patches/patch-5613 b/print/cups-base/patches/patch-5613 new file mode 100644 index 00000000000..6e4e6740fc0 --- /dev/null +++ b/print/cups-base/patches/patch-5613 @@ -0,0 +1,49 @@ +$NetBSD: patch-5613,v 1.1 2019/07/17 01:44:31 manu Exp $ + +The scheduler now uses both the group's membership list as well as the +various OS-specific membership functions to determine whether a user belongs +to a named group (Issue #5613) + +From upstream +https://github.com/apple/cups/commit/3c27d2a6ddf50a4cb02c0b7a464eaf7b6f1ea601 + +--- ./scheduler/auth.c ++++ ./scheduler/auth.c +@@ -1166,7 +1166,23 @@ cupsdCheckGroup( + + groupid = group->gr_gid; + ++ for (i = 0; group->gr_mem[i]; i ++) ++ { ++ /* ++ * User appears in the group membership... ++ */ ++ ++ if (!_cups_strcasecmp(username, group->gr_mem[i])) ++ return (1); ++ } ++ + #ifdef HAVE_GETGROUPLIST ++ /* ++ * If the user isn't in the group membership list, try the results from ++ * getgrouplist() which is supposed to return the full list of groups a user ++ * belongs to... ++ */ ++ + if (user) + { + int ngroups; /* Number of groups */ +@@ -1187,13 +1203,6 @@ cupsdCheckGroup( + if ((int)groupid == (int)groups[i]) + return (1); + } +- +-#else +- for (i = 0; group->gr_mem[i]; i ++) +- { +- if (!_cups_strcasecmp(username, group->gr_mem[i])) +- return (1); +- } + #endif /* HAVE_GETGROUPLIST */ + } + else |