← Back to branch summary

~ubuntu-branches/ubuntu/natty/logrotate/natty-updates

« back to all changes in this revision

Viewing changes to debian/patches/datehack.patch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2008-11-07 14:57:09 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20081107145709-s8ktufsiktmkuidl
Tags: 3.7.7-1ubuntu1
https://launchpad.net/bugs/64964
* Merge with Debian experimental (LP: #64964). Remaining Ubuntu changes:
  - debian/control: Drop mailx to Suggests for Ubuntu; it's only used on
    request, and we don't configure an MTA by default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/datehack.patch
1
1
No longer consider state file dates before 1996 as fatal errors.
2
2
(Closes: #65534)
3
3
 
4
 
Index: logrotate-3.7.1/logrotate.c
 
4
Index: logrotate-3.7.7/logrotate.c
5
5
===================================================================
6
 
--- logrotate-3.7.1.orig/logrotate.c    2006-04-08 20:46:40.217463729 +0100
7
 
+++ logrotate-3.7.1/logrotate.c 2006-04-08 20:52:51.770419373 +0100
8
 
@@ -1145,7 +1145,7 @@
 
6
--- logrotate-3.7.7.orig/logrotate.c    2008-05-14 11:31:35.000000000 +0100
 
7
+++ logrotate-3.7.7/logrotate.c 2008-11-07 01:05:42.151555014 +0000
 
8
@@ -1443,7 +1443,7 @@
9
9
        }
10
 
        
 
10
 
11
11
        /* Hack to hide earlier bug */
12
12
-       if ((year != 1900) && (year < 1996 || year > 2100)) {
13
13
+       if ((year != 1900) && (year < 1970 || year > 2100)) {
14
 
            message(MESS_ERROR, "bad year %d for file %s in state file %s\n",
15
 
                    year, argv[0], stateFilename);
16
 
            fclose(f);
 
14
            message(MESS_ERROR,
 
15
                    "bad year %d for file %s in state file %s\n", year,
 
16
                    argv[0], stateFilename);