diff options
author | Didier Raboud <odyx@debian.org> | 2019-05-17 12:49:55 +0200 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2019-05-17 12:49:55 +0200 |
commit | 14b98b1c3fbfaa96d331e06190bf600c66fef09a (patch) | |
tree | dbca954cfab3d890c8bc75db36a527bcd2360d28 /debian/patches/confdirperms.patch | |
parent | 00fcdacdf9d656f5308bc5ea69291e12eb7a4a79 (diff) |
git-debrebase convert-from-dgit-view: drop upstream changes from breakwater
Drop upstream changes, and delete debian/patches, as part of converting
to git-debrebase format. Upstream changes will appear as commits.
[git-debrebase convert-from-dgit-view drop-patches]
Diffstat (limited to 'debian/patches/confdirperms.patch')
-rw-r--r-- | debian/patches/confdirperms.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch deleted file mode 100644 index e803648e1..000000000 --- a/debian/patches/confdirperms.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 188228c0d8f74792aa6929e07cf3a84e37bee33a 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. - -Last-Update: 2015-02-10 - -Patch-Name: confdirperms.patch ---- - scheduler/conf.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/scheduler/conf.c b/scheduler/conf.c -index b73d33f93..31eedbf71 100644 ---- a/scheduler/conf.c -+++ b/scheduler/conf.c -@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void) - Group, 1, 1) < 0 || - cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser, - Group, 1, 0) < 0 || -+ /* Never alter permissions of central conffile - cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser, - Group, 0, 0) < 0 || - cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser, - Group, 0, 0) < 0 || -+ */ - cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser, - Group, 0, 0) < 0 || - cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser, |