summaryrefslogtreecommitdiff
path: root/debian/patches/confdirperms.patch
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2019-08-17 15:32:31 +0200
committerDidier Raboud <odyx@debian.org>2019-08-17 15:32:44 +0200
commitfecb588399b17da2258dd7e31730f7d263ec955b (patch)
treebff2792084ceb2e2afd5c7951ba8c5aa605aa908 /debian/patches/confdirperms.patch
parentd8028e6c25bb0d343ee4e261ee0938147ab81706 (diff)
parent1cd07131ecfb487064814a2c315e89b38066d73c (diff)
merge patched-debian/master into debian/master
Diffstat (limited to 'debian/patches/confdirperms.patch')
-rw-r--r--debian/patches/confdirperms.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch
index afb824ee6..43e6cccc5 100644
--- a/debian/patches/confdirperms.patch
+++ b/debian/patches/confdirperms.patch
@@ -1,4 +1,4 @@
-From 2a03d964274a972df70409b72302ef65ff43b043 Mon Sep 17 00:00:00 2001
+From 743868ed0a64d376638adb5b454a18baf8a541ed Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:41 +0200
Subject: Do not mess with the permissions of cupsd.conf.
@@ -11,7 +11,7 @@ Patch-Name: confdirperms.patch
1 file changed, 2 insertions(+)
diff --git a/scheduler/conf.c b/scheduler/conf.c
-index 03fc8ecd5..86e37582b 100644
+index a159b6ff8..6892085a4 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1134,10 +1134,12 @@ cupsdReadConfiguration(void)