[Glibc-bsd-commits] r4017 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-01-28 18:54:30 +0000 (Sat, 28 Jan 2012)
New Revision: 4017

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/syscall.diff
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/control
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
Add sys/syscall.h.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-01-28 18:30:11 UTC (rev 4016)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-01-28 18:54:30 UTC (rev 4017)
@@ -1,8 +1,9 @@
 kfreebsd-kernel-headers (0.70) UNRELEASED; urgency=low
 
   * Remove <osreldate.h> (not a kernel header).
+  * Add sys/syscall.h.
 
- -- Robert Millan <rmh at debian.org>  Sat, 28 Jan 2012 19:29:22 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 28 Jan 2012 19:54:25 +0100
 
 kfreebsd-kernel-headers (0.69) unstable; urgency=low
 

Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control	2012-01-28 18:30:11 UTC (rev 4016)
+++ trunk/kfreebsd-kernel-headers/debian/control	2012-01-28 18:54:30 UTC (rev 4017)
@@ -11,7 +11,7 @@
 Package: kfreebsd-kernel-headers
 Architecture: kfreebsd-any
 Depends: ${misc:Depends}
-Replaces: libc0.1-dev (<= 2.3.6.ds1-8)
+Replaces: libc0.1-dev
 Description: kernel of FreeBSD headers for development
  This package provides headers from the kernel of FreeBSD. These headers
  are used by the installed headers for GNU glibc and other system libraries.

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2012-01-28 18:30:11 UTC (rev 4016)
+++ trunk/kfreebsd-kernel-headers/debian/install	2012-01-28 18:54:30 UTC (rev 4017)
@@ -283,6 +283,7 @@
 sys/sys/sockio.h                        usr/include/sys
 sys/sys/soundcard.h                     usr/include/sys
 sys/sys/sx.h                            usr/include/sys
+sys/sys/syscall.h			usr/include/sys
 sys/sys/sysctl.h                        usr/include/sys
 sys/sys/sysent.h                        usr/include/sys
 sys/sys/syslimits.h                     usr/include/sys

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2012-01-28 18:30:11 UTC (rev 4016)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2012-01-28 18:54:30 UTC (rev 4017)
@@ -1,7 +1,9 @@
 # Patches that come from upstream
-type_collision.diff
 000_v4l.diff
 
+# Patches that are in good shape for merging upstream
+type_collision.diff
+
 # Other patches that might or might not be mergeable
 000_bruno_haible.diff
 001_sys_soundcard.diff
@@ -34,3 +36,4 @@
 035_devfs_int.diff
 042_syscall_stubs.diff
 ctltype_quad.diff
+syscall.diff

Added: trunk/kfreebsd-kernel-headers/debian/patches/syscall.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/syscall.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/syscall.diff	2012-01-28 18:54:30 UTC (rev 4017)
@@ -0,0 +1,68 @@
+--- a/sys/sys/syscall.h
++++ b/sys/sys/syscall.h
+@@ -1,3 +1,6 @@
++#ifndef _SYSCALL_H
++#define _SYSCALL_H	1
++
+ /*
+  * System call numbers.
+  *
+@@ -306,6 +309,7 @@
+ #define	SYS_extattr_get_fd	372
+ #define	SYS_extattr_delete_fd	373
+ #define	SYS___setugid	374
++#define SYS_nfsclnt	375
+ #define	SYS_eaccess	376
+ #define	SYS_afs3_syscall	377
+ #define	SYS_nmount	378
+@@ -427,8 +431,8 @@
+ #define	SYS_jail_remove	508
+ #define	SYS_closefrom	509
+ #define	SYS___semctl	510
+-#define	SYS_msgctl	511
+-#define	SYS_shmctl	512
++#define	SYS_msgctl	SYS_freebsd7_msgctl
++#define	SYS_shmctl	SYS_freebsd7_shmctl
+ #define	SYS_lpathconf	513
+ #define	SYS_cap_new	514
+ #define	SYS_cap_getrights	515
+@@ -446,4 +450,39 @@
+ #define	SYS_rctl_add_rule	528
+ #define	SYS_rctl_remove_rule	529
+ #define	SYS_posix_fallocate	530
++#define SYS_posix_fadvise	531
+ #define	SYS_MAXSYSCALL	532
++
++/* FIXME: some of these might not be needed anymore. */
++
++#define SYS_obreak	SYS_break
++#define SYS_sysctl	SYS___sysctl
++#define SYS_getcwd	SYS___getcwd
++#define SYS_setugid	SYS___setugid
++#define SYS_semctl	SYS_freebsd7___semctl
++
++#define SYS_acl_get_file	SYS___acl_get_file
++#define SYS_acl_set_file	SYS___acl_set_file
++#define SYS_acl_get_fd		SYS___acl_get_fd
++#define SYS_acl_set_fd		SYS___acl_set_fd
++#define SYS_acl_delete_file	SYS___acl_delete_file
++#define SYS_acl_delete_fd	SYS___acl_delete_fd
++#define SYS_acl_aclcheck_file	SYS___acl_aclcheck_file
++#define SYS_acl_aclcheck_fd	SYS___acl_aclcheck_fd
++#define SYS_acl_get_link	SYS___acl_get_link
++#define SYS_acl_set_link	SYS___acl_set_link
++#define SYS_acl_delete_link	SYS___acl_delete_link
++#define SYS_acl_aclcheck_link	SYS___acl_aclcheck_link
++
++#define SYS_mac_get_proc	SYS___mac_get_proc
++#define SYS_mac_set_proc	SYS___mac_set_proc
++#define SYS_mac_get_fd		SYS___mac_get_fd
++#define SYS_mac_get_file	SYS___mac_get_file
++#define SYS_mac_set_fd		SYS___mac_set_fd
++#define SYS_mac_set_file	SYS___mac_set_file
++#define SYS_mac_get_pid		SYS___mac_get_pid
++#define SYS_mac_get_link	SYS___mac_get_link
++#define SYS_mac_set_link	SYS___mac_set_link
++#define SYS_mac_execve		SYS___mac_execve
++
++#endif