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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 13:39:55 +0000 (Fri, 24 Jul 2009)
New Revision: 1517

Removed:
   sysvinit/trunk/debian/patches/70_wall_ttyname.dpatch
   sysvinit/trunk/debian/patches/71_wall_hostname.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
  - Drop patch 70_wall_ttyname now included upstream.
  - Drop patch 71_wall_hostname now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 13:39:03 UTC (rev 1516)
+++ sysvinit/trunk/debian/changelog	2009-07-24 13:39:55 UTC (rev 1517)
@@ -29,6 +29,8 @@
     - Drop patch 64_init_reexec_env now included upstream.
     - Drop patch 64_init_set_PATH now included upstream.
     - Drop patch 65_init_u_in_06 now included upstream.
+    - Drop patch 70_wall_ttyname now included upstream.
+    - Drop patch 71_wall_hostname 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 13:39:03 UTC (rev 1516)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 13:39:55 UTC (rev 1517)
@@ -13,8 +13,6 @@
 #68_init_quiet
 ##69_init_waiting
 ##70_init_consoleopen
-##70_wall_ttyname
-##71_wall_hostname
 ##80_killall_pidof
 ##80_killall_sched
 ##81_killall_avoid_init

Deleted: sysvinit/trunk/debian/patches/70_wall_ttyname.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/70_wall_ttyname.dpatch	2009-07-24 13:39:03 UTC (rev 1516)
+++ sysvinit/trunk/debian/patches/70_wall_ttyname.dpatch	2009-07-24 13:39:55 UTC (rev 1517)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_wall_ttyname.dpatch by Petter Reinholdtsen
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use UT_LINESIZE from <utmp.h> instead of hardcoded string
-## DP: lengths.  Patch from SuSe.
-
- at DPATCH@
-Index: sysvinit/src/dowall.c
-===================================================================
---- sysvinit/src/dowall.c	(revisjon 64)
-+++ sysvinit/src/dowall.c	(arbeidskopi)
-@@ -65,7 +65,7 @@
- 	uid_t			uid;
- 	char			*tty;
- 	static char		uidbuf[32];
--	static char		ttynm[32];
-+	static char		ttynm[UT_LINESIZE + 4];
- 	static int		init = 0;
- 
- 	if (!init) {
-@@ -180,7 +180,7 @@
- 		   utmp->ut_user[0] == 0) continue;
- 		if (strncmp(utmp->ut_line, "/dev/", 5) == 0) {
- 			term[0] = 0;
--			strncat(term, utmp->ut_line, UT_LINESIZE);
-+			strncat(term, utmp->ut_line, sizeof(term)-1);
- 		} else
- 			snprintf(term, sizeof(term), "/dev/%.*s",
- 				UT_LINESIZE, utmp->ut_line);

Deleted: sysvinit/trunk/debian/patches/71_wall_hostname.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/71_wall_hostname.dpatch	2009-07-24 13:39:03 UTC (rev 1516)
+++ sysvinit/trunk/debian/patches/71_wall_hostname.dpatch	2009-07-24 13:39:55 UTC (rev 1517)
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 71_wall_hostname.dpatch by Petter Reinholdtsen
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Include hostname in output from halt.  Closes debian bug
-## DP: #325772.
-
- at DPATCH@
-Index: sysvinit/src/dowall.c
-===================================================================
---- sysvinit/src/dowall.c	(revisjon 100)
-+++ sysvinit/src/dowall.c	(arbeidskopi)
-@@ -131,6 +131,7 @@
- 	time_t			t;
- 	char			term[UT_LINESIZE+6];
- 	char			line[81];
-+	char                    hostname[256]; /* HOST_NAME_MAX+1 */
- 	char			*date, *p;
- 	char			*user, *tty;
- 	int			fd, flags;
-@@ -144,6 +145,16 @@
- 
- 	getuidtty(&user, &tty);
- 
-+	/* Get and report current hostname, to make it easier to find
-+	   out which machine is being shut down. */
-+	if (0 != gethostname(hostname, sizeof(hostname))) {
-+		strncpy(hostname, "[unknown]", sizeof(hostname)-1);
-+	}
-+	/* If hostname is truncated, it is unspecified if the string
-+	   is null terminated or not.  Make sure we know it is null
-+	   terminated. */
-+	hostname[sizeof(hostname)-1] = 0;
-+
- 	/* Get the time */
- 	time(&t);
- 	date = ctime(&t);
-@@ -157,8 +168,8 @@
- 			date);
- 	} else {
- 		snprintf(line, sizeof(line),
--			"\007\r\nBroadcast message from %s %s(%s):\r\n\r\n",
--			user, tty, date);
-+			"\007\r\nBroadcast message from %s@%s %s(%s):\r\n\r\n",
-+			user, hostname, tty, date);
- 	}
- 
- 	/*