[Glibc-bsd-commits] r4679 - in trunk/kfreebsd-kernel-headers/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Mon Jul 8 12:49:00 UTC 2013
Author: rmh
Date: 2013-07-05 18:53:03 +0000 (Fri, 05 Jul 2013)
New Revision: 4679
Removed:
trunk/kfreebsd-kernel-headers/debian/patches/hide_inpcbgroup.diff
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/control
trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff
trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff
trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
trunk/kfreebsd-kernel-headers/debian/patches/series
trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
Log:
New upstream release
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2013-07-03 18:18:59 UTC (rev 4678)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2013-07-05 18:53:03 UTC (rev 4679)
@@ -1,3 +1,9 @@
+kfreebsd-kernel-headers (9.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Robert Millan <rmh at debian.org> Wed, 03 Jul 2013 20:20:16 +0200
+
kfreebsd-kernel-headers (9.0-1) unstable; urgency=low
* patches/param_collision.diff: Fix DEV_BSIZE collision (in
Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control 2013-07-03 18:18:59 UTC (rev 4678)
+++ trunk/kfreebsd-kernel-headers/debian/control 2013-07-05 18:53:03 UTC (rev 4679)
@@ -5,7 +5,7 @@
Uploaders: Aurelien Jarno <aurel32 at debian.org>,
Guillem Jover <guillem at debian.org>,
Robert Millan <rmh at debian.org>
-Build-Depends: debhelper (>= 7), quilt, kfreebsd-source-9.0,
+Build-Depends: debhelper (>= 7), quilt, kfreebsd-source-9.1,
dpkg-dev (>= 1.16.0~),
Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-kernel-headers/
Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-kernel-headers/
Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2013-07-03 18:18:59 UTC (rev 4678)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2013-07-05 18:53:03 UTC (rev 4679)
@@ -577,7 +577,7 @@
struct thread;
/*
-@@ -790,9 +889,15 @@
+@@ -796,9 +895,15 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2013-07-03 18:18:59 UTC (rev 4678)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2013-07-05 18:53:03 UTC (rev 4679)
@@ -30,7 +30,7 @@
#include <sys/sx.h> /* XXX */
#include <sys/event.h> /* XXX */
#include <sys/_task.h>
-@@ -712,8 +715,19 @@
+@@ -730,8 +733,19 @@
*/
struct ifaddr {
struct sockaddr *ifa_addr; /* address of interface */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2013-07-03 18:18:59 UTC (rev 4678)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2013-07-05 18:53:03 UTC (rev 4679)
@@ -74,5 +74,5 @@
-#include <sys/_timespec.h>
+#include <sys/time.h>
- #if __USE_BSD
+ #if __BSD_VISIBLE
#define TIMEVAL_TO_TIMESPEC(tv, ts) \
Modified: trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2013-07-03 18:18:59 UTC (rev 4678)
+++ trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2013-07-05 18:53:03 UTC (rev 4679)
@@ -4,7 +4,7 @@
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
-@@ -237,7 +237,6 @@
+@@ -238,7 +238,6 @@
int setquota(struct thread *, struct mount *, u_long, int, void *);
int setuse(struct thread *, struct mount *, u_long, int, void *);
int getquotasize(struct thread *, struct mount *, u_long, int, void *);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff 2013-07-03 18:18:59 UTC (rev 4678)
+++ trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff 2013-07-05 18:53:03 UTC (rev 4679)
@@ -1,6 +1,6 @@
--- a/sys/amd64/include/sysarch.h
+++ b/sys/amd64/include/sysarch.h
-@@ -71,11 +71,11 @@
+@@ -83,11 +83,11 @@
#ifndef _KERNEL
__BEGIN_DECLS
@@ -18,7 +18,7 @@
struct thread;
--- a/sys/i386/include/sysarch.h
+++ b/sys/i386/include/sysarch.h
-@@ -88,13 +88,13 @@
+@@ -94,13 +94,13 @@
int i386_get_ioperm(unsigned int, unsigned int *, int *);
int i386_set_ioperm(unsigned int, unsigned int, int);
int i386_vm86(int, void *);
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/hide_inpcbgroup.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/hide_inpcbgroup.diff 2013-07-03 18:18:59 UTC (rev 4678)
+++ trunk/kfreebsd-kernel-headers/debian/patches/hide_inpcbgroup.diff 2013-07-05 18:53:03 UTC (rev 4679)
@@ -1,21 +0,0 @@
-
-In upstream HEAD (SVN rev 233096)
-
---- a/sys/netinet/in_pcb.h
-+++ b/sys/netinet/in_pcb.h
-@@ -364,6 +364,7 @@
- void *ipi_pspare[2];
- };
-
-+#ifdef _KERNEL
- /*
- * Connection groups hold sets of connections that have similar CPU/thread
- * affinity. Each connection belongs to exactly one connection group.
-@@ -406,7 +407,6 @@
- #define INP_WLOCK_ASSERT(inp) rw_assert(&(inp)->inp_lock, RA_WLOCKED)
- #define INP_UNLOCK_ASSERT(inp) rw_assert(&(inp)->inp_lock, RA_UNLOCKED)
-
--#ifdef _KERNEL
- /*
- * These locking functions are for inpcb consumers outside of sys/netinet,
- * more specifically, they were added for the benefit of TOE drivers. The
Modified: trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff 2013-07-03 18:18:59 UTC (rev 4678)
+++ trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff 2013-07-05 18:53:03 UTC (rev 4679)
@@ -12,7 +12,7 @@
/*
* __FreeBSD_kernel_version numbers are documented in the Porter's Handbook.
-@@ -79,11 +76,15 @@
+@@ -95,11 +92,15 @@
#include <sys/syslimits.h>
#define MAXCOMLEN 19 /* max command name remembered */
@@ -28,7 +28,7 @@
#define NOFILE OPEN_MAX /* max open files per process */
#define NOGROUP 65535 /* marker for empty group set member */
#define MAXHOSTNAMELEN 256 /* max hostname size */
-@@ -117,10 +118,12 @@
+@@ -133,10 +134,12 @@
#include <sys/limits.h>
#endif
@@ -41,7 +41,7 @@
#ifndef BLKDEV_IOSIZE
#define BLKDEV_IOSIZE PAGE_SIZE /* default block device I/O size */
-@@ -197,9 +200,11 @@
+@@ -213,9 +216,11 @@
#define PDROP 0x200 /* OR'd with pri to stop re-entry of interlock mutex */
#define PBDRY 0x400 /* for PCATCH stop is done on the user boundary */
@@ -53,7 +53,7 @@
#define NBPW sizeof(int) /* number of bytes per word (integer) */
#define CMASK 022 /* default file mask: S_IWGRP|S_IWOTH */
-@@ -245,6 +250,7 @@
+@@ -261,6 +266,7 @@
#define MAXPATHLEN PATH_MAX
#define MAXSYMLINKS 32
@@ -61,7 +61,7 @@
/* Bit map related macros. */
#define setbit(a,i) (((unsigned char *)(a))[(i)/NBBY] |= 1<<((i)%NBBY))
#define clrbit(a,i) (((unsigned char *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-@@ -252,15 +258,20 @@
+@@ -268,6 +274,7 @@
(((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY)))
#define isclr(a,i) \
((((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
@@ -69,8 +69,9 @@
/* Macros for counting and rounding. */
#ifndef howmany
- #define howmany(x, y) (((x)+((y)-1))/(y))
+@@ -275,9 +282,13 @@
#endif
+ #define nitems(x) (sizeof((x)) / sizeof((x)[0]))
#define rounddown(x, y) (((x)/(y))*(y))
+#if 0
#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) /* to any y */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2013-07-03 18:18:59 UTC (rev 4678)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2013-07-05 18:53:03 UTC (rev 4679)
@@ -1,6 +1,5 @@
# Patches from (or merged in) upstream
000_v4l.diff
-hide_inpcbgroup.diff
# Patches that are in good shape for merging upstream
Modified: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2013-07-03 18:18:59 UTC (rev 4678)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2013-07-05 18:53:03 UTC (rev 4679)
@@ -183,7 +183,7 @@
#ifndef _RLIM_T_DECLARED
typedef __rlim_t rlim_t; /* resource limit */
#define _RLIM_T_DECLARED
-@@ -269,10 +275,8 @@
+@@ -279,10 +285,8 @@
* The following are all things that really shouldn't exist in this header,
* since its purpose is to provide typedefs, not miscellaneous doodads.
*/
More information about the Glibc-bsd-commits
mailing list