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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 13:02:07 +0000 (Fri, 24 Jul 2009)
New Revision: 1499

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

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 13:00:53 UTC (rev 1498)
+++ sysvinit/trunk/debian/changelog	2009-07-24 13:02:07 UTC (rev 1499)
@@ -9,6 +9,7 @@
     - Drop patch 16_doc_runlevel now included upstream.
     - Drop patch 17_doc_halt now included upstream.
     - Drop patch 25_last_sanify now included upstream.
+    - Drop patch 26_last_ipv6 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.

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-24 13:00:53 UTC (rev 1498)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 13:02:07 UTC (rev 1499)
@@ -5,7 +5,6 @@
 #12_doc_lastb
 14_doc_fsf_addr
 21_ifdown_kfreebsd
-##26_last_ipv6
 ##27_last_usageopts
 ##28_last_full-time
 ##30_strip

Deleted: sysvinit/trunk/debian/patches/26_last_ipv6.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/26_last_ipv6.dpatch	2009-07-24 13:00:53 UTC (rev 1498)
+++ sysvinit/trunk/debian/patches/26_last_ipv6.dpatch	2009-07-24 13:02:07 UTC (rev 1499)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 26_last_ipv6.dpatch by Petter Reinholdtsen
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Improve handling of IPv6 addresses.  Patch from Fedora.
-
- at DPATCH@
-diff -Naur sysvinit-2.86/src/last.c sysvinit-2.86-ipv6/src/last.c
---- sysvinit-2.86/src/last.c	2004-07-30 14:16:26.000000000 +0200
-+++ sysvinit-2.86-ipv6/src/last.c	2006-07-19 16:14:24.000000000 +0200
-@@ -307,14 +307,15 @@
- 	struct sockaddr		*sa;
- 	int			salen, flags;
- 	unsigned int		topnibble;
-+	unsigned int		azero = 0, sitelocal = 0;
- 	int			mapped = 0;
- 
- 	flags = useip ? NI_NUMERICHOST : 0;
- 
- 	/*
- 	 *	IPv4 or IPv6 ? We use 2 heuristics:
--	 *	1. Current IPv6 range uses 2000-3fff. Outside of
--	 *	   that is illegal and must be IPv4.
-+	 *	1. Current IPv6 range uses 2000-3fff or fec0-feff.
-+	 *	   Outside of that is illegal and must be IPv4.
- 	 *	2. If last 3 bytes are 0, must be IPv4
- 	 *	3. If IPv6 in IPv4, handle as IPv4
- 	 *
-@@ -323,7 +324,11 @@
- 	if (a[0] == 0 && a[1] == 0 && a[2] == htonl (0xffff))
- 		mapped = 1;
- 	topnibble = ntohl((unsigned int)a[0]) >> 28;
--	if (topnibble < 2 || topnibble > 3 || mapped ||
-+
-+	azero = ntohl((unsigned int)a[0]) >> 16;
-+	sitelocal = (azero >= 0xfec0 && azero <= 0xfeff) ? 1 : 0;
-+	
-+	if (((topnibble < 2 || topnibble > 3) && (!sitelocal)) || mapped ||
- 	    (a[1] == 0 && a[2] == 0 && a[3] == 0)) {
- 		/* IPv4 */
- 		sin.sin_family = AF_INET;