diff options
author | Didier Raboud <odyx@debian.org> | 2018-02-12 13:05:42 +0100 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2018-02-12 13:05:43 +0100 |
commit | e02ddeca1b701a486f1f4358841000e2d28eca63 (patch) | |
tree | f9a8de53eeb069f9f5f01eae118f3721b23c05dc /debian/patches/confdirperms.patch | |
parent | c4abeea4f32c27408ed5ae0c514797c64656550e (diff) | |
parent | 256b2f3e6c39fdc637a83de8a33e41170ed1ac9b (diff) |
merge patched-debian/master into debian/master
Diffstat (limited to 'debian/patches/confdirperms.patch')
-rw-r--r-- | debian/patches/confdirperms.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch index 8bdc4933b..c19d18a19 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 3033f1e91eff2a13b2973837cc00a8ee563b3379 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 a9aa35f94..cb182ec71 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -1134,10 +1134,12 @@ cupsdReadConfiguration(void) |