← Back to branch summary

~ubuntu-branches/ubuntu/vivid/logrotate/vivid

« back to all changes in this revision

Viewing changes to debian/patches/20-configparse.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Paul Martin
  • Date: 2005-05-25 10:43:42 UTC
  • mfrom: (2.1.1 warty)
  • Revision ID: james.westby@ubuntu.com-20050525104342-kc8tsbw57qbfmi7s
Tags: 3.7-5
http://bugs.debian.org/279965
Brown paper bag upload.

42-execlp-bin-sh: Fix major flaw in the last patch... it tries to 
execute the logfile. Thanks very much for the quick report, Philipp.
It was my fault, not yours. (Closes: #279965)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/20-configparse.dpatch
 
1
#!/bin/sh -e
 
2
## 03-configparse.dpatch by Paul Martin <pm@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: No description.
 
6
 
 
7
if [ $# -lt 1 ]; then
 
8
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
9
    exit 1
 
10
fi
 
11
 
 
12
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
 
13
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
 
14
 
 
15
case "$1" in
 
16
       -patch) patch $patch_opts -p1 < $0;;
 
17
       -unpatch) patch $patch_opts -p1 -R < $0;;
 
18
        *)
 
19
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
20
                exit 1;;
 
21
esac
 
22
 
 
23
exit 0
 
24
 
 
25
@DPATCH@
 
26
diff -urNad /home/pm/deb/logrotate/logrotate-3.7/config.c logrotate-3.7/config.c
 
27
--- /home/pm/deb/logrotate/logrotate-3.7/config.c       2004-02-11 18:17:16.000000000 +0000
 
28
+++ logrotate-3.7/config.c      2004-02-11 18:19:12.000000000 +0000
 
29
@@ -745,7 +745,7 @@
 
30
 
 
31
                    while (*start) {
 
32
                        chptr = start;
 
33
-                       while (!isspace(*chptr) && *chptr != ',' && *chptr)
 
34
+                       while (!isspace(*chptr) && /* *chptr != ',' && */ *chptr)
 
35
                            chptr++;
 
36
 
 
37
                        tabooExts = realloc(tabooExts, sizeof(*tabooExts) * 
 
38
@@ -757,7 +757,7 @@
 
39
                        tabooCount++;
 
40
 
 
41
                        start = chptr;
 
42
-                       if (*start == ',') start++;
 
43
+                       /* if (*start == ',') start++; */
 
44
                        while (isspace(*start) && *start) start++;
 
45
                    }
 
46