[Pkg-sysvinit-commits] r1494 - in sysvinit/trunk/debian: . patches

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 12:52:39 +0000 (Fri, 24 Jul 2009)
New Revision: 1494

Removed:
   sysvinit/trunk/debian/patches/42_utmpdump_retval.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
Drop patch 42_utmpdump_retval now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 10:32:02 UTC (rev 1493)
+++ sysvinit/trunk/debian/changelog	2009-07-24 12:52:39 UTC (rev 1494)
@@ -7,6 +7,7 @@
     - Update patch 14_doc_fsf_addr to drop the parts now included upstream.
     - Drop patch 15_doc_pidof now included upstream.
     - Drop patch 41_utmp_64bit now included upstream.
+    - Drop patch 42_utmpdump_retval now included upstream.
     - Drop patch 60_init_race now included upstream.
 
   * XXX Need to remove debian patches now included in the new upstream release.

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-24 10:32:02 UTC (rev 1493)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 12:52:39 UTC (rev 1494)
@@ -14,7 +14,6 @@
 ##30_strip
 ##31_build_warnings
 ##40_selinux
-##42_utmpdump_retval
 ##45_pidof_symlink
 ##46_pidof_symlinkman
 ##47_pidof_chroot

Deleted: sysvinit/trunk/debian/patches/42_utmpdump_retval.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/42_utmpdump_retval.dpatch	2009-07-24 10:32:02 UTC (rev 1493)
+++ sysvinit/trunk/debian/patches/42_utmpdump_retval.dpatch	2009-07-24 12:52:39 UTC (rev 1494)
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# 42_utmpdump_retval.dpatch by Christian 'Dr. Disk' Hechelmann and Fedora.
-
-Avoid issue with unchecked return value from malloc(), as reported to
-<URL:https://bugzilla.redhat.com/show_bug.cgi?id=473485>
-
- at DPATCH@
-diff -ru sysvinit-2.86/src/utmpdump.c sysvinit-2.86.foo/src/utmpdump.c
---- sysvinit-2.86/src/utmpdump.c	2000-09-12 16:14:24.000000000 -0500
-+++ sysvinit-2.86.foo/src/utmpdump.c	2008-12-08 15:37:51.000000000 -0500
-@@ -81,18 +81,20 @@
- time_t
- strtotime(const char *s_time)
- {
--	struct tm *tm = malloc(sizeof(*tm));
-+	struct tm tm;
-+	
-+	memset(&tm, '\0', sizeof(struct tm));
- 
- 	if (s_time[0] == ' ' || s_time[0] == '\0')
- 		return (time_t)0;
- 
--	strptime(s_time, "%a %b %d %T %Y", tm);
-+	strptime(s_time, "%a %b %d %T %Y", &tm);
- 
- 	/* Cheesy way of checking for DST */
- 	if (s_time[26] == 'D')
--		tm->tm_isdst = 1;
-+		tm.tm_isdst = 1;
- 
--	return mktime(tm);
-+	return mktime(&tm);
- }
- 
- #define cleanse(x) xcleanse(x, sizeof(x))