summaryrefslogtreecommitdiff
path: root/debian/patches/confdirperms.patch
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2018-03-27 19:15:40 +0200
committerDidier Raboud <odyx@debian.org>2018-03-27 19:15:41 +0200
commitbe073359f2d5f2d0e1a2fdfe13c1a99914aefc40 (patch)
tree5e48cf37df015ea06877e610886719755a7f589d /debian/patches/confdirperms.patch
parentbf0d27a6f9efe6eb5a2a73e26fda0d892e7087c2 (diff)
parent953a8a40cc368dd9406caeb91251b4c69ca7c019 (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 8bdc4933b..672137728 100644
--- a/debian/patches/confdirperms.patch
+++ b/debian/patches/confdirperms.patch
@@ -1,4 +1,4 @@
-From c62fb4a103968661968b81ebee9215c87f475ab7 Mon Sep 17 00:00:00 2001
+From 4114fb44d253cba85748be81324a699387be296c 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 ab98e1c7d..cd79a1324 100644
+index 7ba915bd7..ca5469f6f 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1134,10 +1134,12 @@ cupsdReadConfiguration(void)