[Glibc-bsd-commits] r2483 - in trunk/kfreebsd-7/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2009-04-28 17:08:55 +0000 (Tue, 28 Apr 2009)
New Revision: 2483

Removed:
   trunk/kfreebsd-7/debian/patches/000_ext2fs.diff
   trunk/kfreebsd-7/debian/patches/000_kenv.diff
   trunk/kfreebsd-7/debian/patches/000_ktimer.diff
Modified:
   trunk/kfreebsd-7/debian/changelog
Log:
* note dropping 000_*.diff patches applied upstream



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2009-04-26 22:43:57 UTC (rev 2482)
+++ trunk/kfreebsd-7/debian/changelog	2009-04-28 17:08:55 UTC (rev 2483)
@@ -1,11 +1,12 @@
-kfreebsd-7 (7.2~cvs20090421-1) EXPERIMENTAL; urgency=low
+kfreebsd-7 (7.2~cvs20090428-1) EXPERIMENTAL; urgency=low
 
   [ Petr Salinger ]
   * New upstream snapshot (RELENG_7_2)
+     - drop 000_*.diff patches applied upstream
      - update of some patches
      - refresh all patches
 
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 21 Apr 2009 12:00:00 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 28 Apr 2009 12:00:00 +0200
 
 kfreebsd-7 (7.1-4) unstable; urgency=low
 

Deleted: trunk/kfreebsd-7/debian/patches/000_ext2fs.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/000_ext2fs.diff	2009-04-26 22:43:57 UTC (rev 2482)
+++ trunk/kfreebsd-7/debian/patches/000_ext2fs.diff	2009-04-28 17:08:55 UTC (rev 2483)
@@ -1,13 +0,0 @@
-upstream head revision 186740
-
---- head/sys/gnu/fs/ext2fs/ext2_bitops.h
-+++ head/sys/gnu/fs/ext2fs/ext2_bitops.h
-@@ -84,7 +84,7 @@
- 		mask = ~0U << (ofs & 31);
- 		bit = *p | ~mask;
- 		if (bit != ~0U)
--			return (ffs(~bit) + ofs - 1);
-+			return (ffs(~bit) + (ofs & ~31U) - 1);
- 		p++;
- 		ofs = (ofs + 31U) & ~31U;
- 	}

Deleted: trunk/kfreebsd-7/debian/patches/000_kenv.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/000_kenv.diff	2009-04-26 22:43:57 UTC (rev 2482)
+++ trunk/kfreebsd-7/debian/patches/000_kenv.diff	2009-04-28 17:08:55 UTC (rev 2483)
@@ -1,33 +0,0 @@
-Index: head/sys/kern/kern_environment.c
-===================================================================
---- head/sys/kern/kern_environment.c	(revision 190221)
-+++ head/sys/kern/kern_environment.c	(working copy)
-@@ -87,7 +87,7 @@
- 	} */ *uap;
- {
- 	char *name, *value, *buffer = NULL;
--	size_t len, done, needed;
-+	size_t len, done, needed, buflen;
- 	int error, i;
- 
- 	KASSERT(dynamic_kenv, ("kenv: dynamic_kenv = 0"));
-@@ -100,13 +100,17 @@
- 			return (error);
- #endif
- 		done = needed = 0;
-+		buflen = uap->len;
-+		if (buflen > KENV_SIZE * (KENV_MNAMELEN + KENV_MVALLEN + 2))
-+			buflen = KENV_SIZE * (KENV_MNAMELEN +
-+			    KENV_MVALLEN + 2);
- 		if (uap->len > 0 && uap->value != NULL)
--			buffer = malloc(uap->len, M_TEMP, M_WAITOK|M_ZERO);
-+			buffer = malloc(buflen, M_TEMP, M_WAITOK|M_ZERO);
- 		mtx_lock(&kenv_lock);
- 		for (i = 0; kenvp[i] != NULL; i++) {
- 			len = strlen(kenvp[i]) + 1;
- 			needed += len;
--			len = min(len, uap->len - done);
-+			len = min(len, buflen - done);
- 			/*
- 			 * If called with a NULL or insufficiently large
- 			 * buffer, just keep computing the required size.

Deleted: trunk/kfreebsd-7/debian/patches/000_ktimer.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/000_ktimer.diff	2009-04-26 22:43:57 UTC (rev 2482)
+++ trunk/kfreebsd-7/debian/patches/000_ktimer.diff	2009-04-28 17:08:55 UTC (rev 2483)
@@ -1,14 +0,0 @@
-Index: head/sys/kern/kern_time.c
-===================================================================
---- head/sys/kern/kern_time.c	(revision 190192)
-+++ head/sys/kern/kern_time.c	(working copy)
-@@ -1085,7 +1085,8 @@
- 	struct itimer *it;
- 
- 	PROC_LOCK_ASSERT(p, MA_OWNED);
--	if ((p->p_itimers == NULL) || (timerid >= TIMER_MAX) ||
-+	if ((p->p_itimers == NULL) ||
-+	    (timerid < 0) || (timerid >= TIMER_MAX) ||
- 	    (it = p->p_itimers->its_timers[timerid]) == NULL) {
- 		return (NULL);
- 	}