summaryrefslogtreecommitdiff
path: root/debian/patches/logfiles_adm_readable.patch
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2016-08-09 18:51:30 +0200
committerDidier Raboud <odyx@debian.org>2016-08-09 18:56:55 +0200
commit38b2a72763cff6c908e07fbbc546fdef00a6383c (patch)
tree1b5c18a99324ec2c4b02c58a65d1813b58be720e /debian/patches/logfiles_adm_readable.patch
parent9d11bf6aed95115f6cce3986b90def928800a3d4 (diff)
parent393d9b6bbaeed4f18c0fa5a219edaed50f95b0c4 (diff)
Initialize git-dpm; reword most patch descriptions
Diffstat (limited to 'debian/patches/logfiles_adm_readable.patch')
-rw-r--r--debian/patches/logfiles_adm_readable.patch22
1 files changed, 16 insertions, 6 deletions
diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch
index 22fd0a197..5ca775e9b 100644
--- a/debian/patches/logfiles_adm_readable.patch
+++ b/debian/patches/logfiles_adm_readable.patch
@@ -1,8 +1,18 @@
-Description: Make log files readable to group "adm", if present.
-Author: Martin Pitt <mpitt@debian.org>
+From 1fbe6349d45868b6ffb206f51d5445f5ead2423a Mon Sep 17 00:00:00 2001
+From: Martin Pitt <mpitt@debian.org>
+Date: Tue, 9 Aug 2016 18:11:38 +0200
+Subject: Make log files readable to group "adm", if present.
+
Bug-Ubuntu: https://launchpad.net/bugs/345953
Last-Update: 2015-02-10
+Patch-Name: logfiles_adm_readable.patch
+---
+ scheduler/log.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/scheduler/log.c b/scheduler/log.c
+index 0a135a7..ecc41e5 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -24,6 +24,7 @@
@@ -13,7 +23,7 @@ Last-Update: 2015-02-10
/*
-@@ -113,6 +114,7 @@
+@@ -113,6 +114,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
filename[1024], /* Formatted log filename */
*ptr; /* Pointer into filename */
const char *logptr; /* Pointer into log filename */
@@ -21,7 +31,7 @@ Last-Update: 2015-02-10
/*
-@@ -133,6 +135,11 @@
+@@ -133,6 +135,11 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
}
/*
@@ -33,7 +43,7 @@ Last-Update: 2015-02-10
* Format the filename as needed...
*/
-@@ -253,7 +260,7 @@
+@@ -253,7 +260,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
* Change ownership and permissions of non-device logs...
*/
@@ -42,7 +52,7 @@ Last-Update: 2015-02-10
fchmod(cupsFileNumber(*lf), LogFilePerm);
}
}
-@@ -304,7 +311,7 @@
+@@ -304,7 +311,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
* Change ownership and permissions of non-device logs...
*/