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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 09:46:42 +0000 (Fri, 24 Jul 2009)
New Revision: 1487

Removed:
   sysvinit/trunk/debian/patches/41_utmp_64bit.dpatch
   sysvinit/trunk/debian/patches/60_init_race.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
  - Drop patch 41_utmp_64bit now included upstream.
  - Drop patch 60_init_race now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 09:43:10 UTC (rev 1486)
+++ sysvinit/trunk/debian/changelog	2009-07-24 09:46:42 UTC (rev 1487)
@@ -1,6 +1,8 @@
 sysvinit (2.87dsf-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    - Drop patch 41_utmp_64bit 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 09:43:10 UTC (rev 1486)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 09:46:42 UTC (rev 1487)
@@ -17,7 +17,6 @@
 ##30_strip
 ##31_build_warnings
 ##40_selinux
-##41_utmp_64bit
 ##42_utmpdump_retval
 ##45_pidof_symlink
 ##46_pidof_symlinkman
@@ -27,7 +26,6 @@
 ##52_bootlogd_createlogfile
 ##53_bootlogd_ttyB
 ##54_bootlogd_findptyfail
-##60_init_race
 ##61_init_msg
 ##62_init_freebsdterm
 ##63_init_longer_procname

Deleted: sysvinit/trunk/debian/patches/41_utmp_64bit.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/41_utmp_64bit.dpatch	2009-07-24 09:43:10 UTC (rev 1486)
+++ sysvinit/trunk/debian/patches/41_utmp_64bit.dpatch	2009-07-24 09:46:42 UTC (rev 1487)
@@ -1,50 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# 41_wtmp_64bit.dpatch by Petter Reinholdtsen
-
-The patch is a copy of sysvinit-2.86-timeval.patch from Fedora.  It
-fixes utmp/wtmp updating of ut_addr_v6 on 64-bit platforms.  See bug
-https://bugzilla.redhat.com/show_bug.cgi?id=176494
-
- at DPATCH@
---- sysvinit-2.86/src/utmp.c.timeval	1999-06-09 07:11:33.000000000 -0400
-+++ sysvinit-2.86/src/utmp.c	2006-08-09 19:46:26.000000000 -0400
-@@ -47,7 +47,8 @@
- 	int fd;
- 	struct utmp utmp;
- 	struct utsname uname_buf;
--
-+	struct timeval tv;
-+	
- 	/*
- 	 *	Try to open the wtmp file. Note that we even try
- 	 *	this if we have updwtmp() so we can see if the
-@@ -76,7 +77,9 @@
- 	 */
- 	memset(&utmp, 0, sizeof(utmp));
- #if defined(__GLIBC__)
--	gettimeofday(&utmp.ut_tv, NULL);
-+	gettimeofday(&tv, NULL);
-+	utmp.ut_tv.tv_sec = tv.tv_sec;
-+	utmp.ut_tv.tv_usec = tv.tv_usec;
- #else
- 	time(&utmp.ut_time);
- #endif
-@@ -113,6 +116,7 @@
- 	struct utmp utmp;
- 	struct utmp tmp;
- 	struct utmp *utmptr;
-+	struct timeval tv;
- 
- 	/*
- 	 *	Can't do much if UTMP_FILE is not present.
-@@ -144,7 +148,9 @@
- 	utmp.ut_pid = pid;
- 	strncpy(utmp.ut_id, id, sizeof(utmp.ut_id));
- #if defined(__GLIBC__)
--	gettimeofday(&utmp.ut_tv, NULL);
-+	gettimeofday(&tv, NULL);
-+	utmp.ut_tv.tv_sec = tv.tv_sec;
-+	utmp.ut_tv.tv_usec = tv.tv_usec;
- #else
- 	time(&utmp.ut_time);
- #endif

Deleted: sysvinit/trunk/debian/patches/60_init_race.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/60_init_race.dpatch	2009-07-24 09:43:10 UTC (rev 1486)
+++ sysvinit/trunk/debian/patches/60_init_race.dpatch	2009-07-24 09:46:42 UTC (rev 1487)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60_init_race.dpatch by Petter Reinholdtsen
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Avoid race condition when starting programs during boot.  Patch
-## DP: found in SuSe.  Fixes bug #327612.
-
- at DPATCH@
-diff -urNad trunk~/src/init.c trunk/src/init.c
---- trunk~/src/init.c	2008-03-26 09:33:58.000000000 +0100
-+++ trunk/src/init.c	2008-03-26 09:33:58.000000000 +0100
-@@ -971,6 +971,7 @@
-   				dup(f);
-   				dup(f);
- 			}
-+			SETSIG(sa, SIGCHLD, SIG_DFL, SA_RESTART);
- 			if ((pid = fork()) < 0) {
-   				initlog(L_VB, "cannot fork");
- 				exit(1);
-@@ -983,7 +984,6 @@
- 				SETSIG(sa, SIGINT, SIG_IGN, SA_RESTART);
- 				SETSIG(sa, SIGTSTP, SIG_IGN, SA_RESTART);
- 				SETSIG(sa, SIGQUIT, SIG_IGN, SA_RESTART);
--				SETSIG(sa, SIGCHLD, SIG_DFL, SA_RESTART);
- 
- 				while ((rc = waitpid(pid, &st, 0)) != pid)
- 					if (rc < 0 && errno == ECHILD)