fix compile failure
(cherry picked from commit 861707329bd805b9da39d12bf1b9649b621dc77a)
This commit is contained in:
parent
f5b268fdbb
commit
d250841dce
@ -1,37 +0,0 @@
|
||||
From 89fabc72df74a5af2bec57f0577aea474ca0ec78 Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Fella <nicolas.fella@gmx.de>
|
||||
Date: Fri, 23 Aug 2019 14:43:19 +0200
|
||||
Subject: [PATCH] Add wheel to system groups
|
||||
|
||||
---
|
||||
config-scripts/cups-defaults.m4 | 2 +-
|
||||
configure | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
|
||||
index b3d96ef0a..517539e1f 100644
|
||||
--- a/config-scripts/cups-defaults.m4
|
||||
+++ b/config-scripts/cups-defaults.m4
|
||||
@@ -245,7 +245,7 @@ AC_ARG_WITH(system_groups, [ --with-system-groups set default system groups
|
||||
AC_MSG_CHECKING(for default system groups)
|
||||
if test -f /etc/group; then
|
||||
CUPS_SYSTEM_GROUPS=""
|
||||
- GROUP_LIST="lpadmin sys system root"
|
||||
+ GROUP_LIST="lpadmin sys system root wheel"
|
||||
for group in $GROUP_LIST; do
|
||||
if test "`grep \^${group}: /etc/group`" != ""; then
|
||||
if test "x$CUPS_SYSTEM_GROUPS" = x; then
|
||||
diff --git a/configure b/configure
|
||||
index 18be3db75..d3df145bc 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -9601,7 +9601,7 @@ else
|
||||
$as_echo_n "checking for default system groups... " >&6; }
|
||||
if test -f /etc/group; then
|
||||
CUPS_SYSTEM_GROUPS=""
|
||||
- GROUP_LIST="lpadmin sys system root"
|
||||
+ GROUP_LIST="lpadmin sys system root wheel"
|
||||
for group in $GROUP_LIST; do
|
||||
if test "`grep \^${group}: /etc/group`" != ""; then
|
||||
if test "x$CUPS_SYSTEM_GROUPS" = x; then
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Name: cups
|
||||
Epoch: 1
|
||||
Version: 2.2.13
|
||||
Release: 8
|
||||
Release: 9
|
||||
Summary: CUPS is the standards-based, open source printing system for linux operating systems.
|
||||
License: GPLv2+ and LGPLv2+ with exceptions and AML
|
||||
Url: http://www.cups.org/
|
||||
@ -33,7 +33,6 @@ Patch19: cups-filter-debug.patch
|
||||
Patch20: cups-dymo-deviceid.patch
|
||||
Patch21: custom-option-keywords-did-not.patch
|
||||
Patch22: CVE-2020-3898.patch
|
||||
Patch23: add-wheel-to-system-groups.patch
|
||||
Patch6000: backport-CVE-2020-10001.patch
|
||||
|
||||
Provides: cupsddk cupsddk-drivers cups-filesystem cups-client cups-ipptool cups-lpd
|
||||
@ -326,6 +325,9 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb
|
||||
%doc %{_datadir}/%{name}/www/apple-touch-icon.png
|
||||
|
||||
%changelog
|
||||
* Wed Nov 24 2021 hanhui <hanhui15@huawei.com> 2.2.13-9
|
||||
- DESC:fix compile failure,ippfind error
|
||||
|
||||
* Fri Sep 24 2021 liuyumeng <liuyumeng5@huawei.com> 2.2.13-8
|
||||
- Type:CVE
|
||||
- ID:CVE-2020-10001
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user