[Glibc-bsd-commits] r1635 -
trunk/kfreebsd-kernel-headers/debian/patches
Petr Salinger
ps-guest at costa.debian.org
Sat Jul 29 06:01:31 UTC 2006
Author: ps-guest
Date: 2006-07-29 06:01:31 +0000 (Sat, 29 Jul 2006)
New Revision: 1635
Modified:
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
Log:
* drop useless parts of patches
patched files are not provided by kfreebsd-kernel-headers
Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2006-07-28 14:36:03 UTC (rev 1634)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2006-07-29 06:01:31 UTC (rev 1635)
@@ -123,49 +123,6 @@
/*
* Page-directory and page-table entires follow this format, with a few
* of the fields not present here and there, depending on a lot of things.
-diff -ur sys.orig/net/ethernet.h sys/net/ethernet.h
---- sys.orig/net/ethernet.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/net/ethernet.h 2004-12-07 23:48:33.000000000 +0100
-@@ -8,6 +8,9 @@
- #ifndef _NET_ETHERNET_H_
- #define _NET_ETHERNET_H_
-
-+/* Define the types u_char, u_short. */
-+#include <sys/types.h>
-+
- /*
- * Somce basic Ethernet constants.
- */
-@@ -62,6 +65,7 @@
- u_char ether_shost[ETHER_ADDR_LEN];
- u_short ether_type;
- };
-+#define ether_addr_octet octet
-
- /*
- * Structure of a 48-bit Ethernet address.
-@@ -363,19 +367,8 @@
-
- #else /* _KERNEL */
-
--#include <sys/cdefs.h>
--
--/*
-- * Ethernet address conversion/parsing routines.
-- */
--__BEGIN_DECLS
--struct ether_addr *ether_aton(const char *);
--int ether_hostton(const char *, struct ether_addr *);
--int ether_line(const char *, struct ether_addr *, char *);
--char *ether_ntoa(const struct ether_addr *);
--int ether_ntohost(char *, const struct ether_addr *);
--__END_DECLS
--
-+/* The API functions are declared in <netinet/ether.h>. */
-+
- #endif /* !_KERNEL */
-
- #endif /* !_NET_ETHERNET_H_ */
diff -ur sys.orig/net/if_arp.h sys/net/if_arp.h
--- sys.orig/net/if_arp.h 2004-12-07 23:50:18.000000000 +0100
+++ sys/net/if_arp.h 2004-12-07 23:48:33.000000000 +0100
@@ -244,150 +201,6 @@
#ifdef _KERNEL
#include "opt_nfs.h"
#endif
-diff -ur sys.orig/sys/acl.h sys/sys/acl.h
---- sys.orig/sys/acl.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/acl.h 2004-12-07 23:48:37.000000000 +0100
-@@ -35,6 +35,9 @@
- #ifndef _SYS_ACL_H_
- #define _SYS_ACL_H_
-
-+#include <features.h>
-+#include <sys/types.h>
-+
- /*
- * POSIX.1e ACL types and related constants.
- */
-@@ -155,73 +158,75 @@
- #else /* !_KERNEL */
-
- /*
-- * Syscall interface -- use the library calls instead as the syscalls
-+ * Syscall interface, defined in libc.
-+ * Use the libposix1e calls instead as the syscalls
- * have strict acl entry ordering requirements.
- */
- __BEGIN_DECLS
--int __acl_aclcheck_fd(int _filedes, acl_type_t _type, struct acl *_aclp);
--int __acl_aclcheck_file(const char *_path, acl_type_t _type,
-- struct acl *_aclp);
--int __acl_aclcheck_link(const char *_path, acl_type_t _type,
-- struct acl *_aclp);
--int __acl_delete_fd(int _filedes, acl_type_t _type);
--int __acl_delete_file(const char *_path_p, acl_type_t _type);
--int __acl_delete_link(const char *_path_p, acl_type_t _type);
--int __acl_get_fd(int _filedes, acl_type_t _type, struct acl *_aclp);
--int __acl_get_file(const char *_path, acl_type_t _type, struct acl *_aclp);
--int __acl_get_link(const char *_path, acl_type_t _type, struct acl *_aclp);
--int __acl_set_fd(int _filedes, acl_type_t _type, struct acl *_aclp);
--int __acl_set_file(const char *_path, acl_type_t _type, struct acl *_aclp);
--int __acl_set_link(const char *_path, acl_type_t _type, struct acl *_aclp);
-+extern int __acl_aclcheck_fd(int _filedes, acl_type_t _type, struct acl *_aclp) __THROW;
-+extern int __acl_aclcheck_file(const char *_path, acl_type_t _type,
-+ struct acl *_aclp) __THROW;
-+extern int __acl_aclcheck_link(const char *_path, acl_type_t _type,
-+ struct acl *_aclp) __THROW;
-+extern int __acl_delete_fd(int _filedes, acl_type_t _type) __THROW;
-+extern int __acl_delete_file(const char *_path_p, acl_type_t _type) __THROW;
-+extern int __acl_delete_link(const char *_path_p, acl_type_t _type) __THROW;
-+extern int __acl_get_fd(int _filedes, acl_type_t _type, struct acl *_aclp) __THROW;
-+extern int __acl_get_file(const char *_path, acl_type_t _type, struct acl *_aclp) __THROW;
-+extern int __acl_get_link(const char *_path, acl_type_t _type, struct acl *_aclp) __THROW;
-+extern int __acl_set_fd(int _filedes, acl_type_t _type, struct acl *_aclp) __THROW;
-+extern int __acl_set_file(const char *_path, acl_type_t _type, struct acl *_aclp) __THROW;
-+extern int __acl_set_link(const char *_path, acl_type_t _type, struct acl *_aclp) __THROW;
- __END_DECLS
-
- /*
- * Supported POSIX.1e ACL manipulation and assignment/retrieval API
-+ * (defined in libposix1e)
- * _np calls are local extensions that reflect an environment capable of
- * opening file descriptors of directories, and allowing additional
- * ACL type for different filesystems (i.e., AFS).
- */
- __BEGIN_DECLS
--int acl_add_perm(acl_permset_t _permset_d, acl_perm_t _perm);
--int acl_calc_mask(acl_t *_acl_p);
--int acl_clear_perms(acl_permset_t _permset_d);
--int acl_copy_entry(acl_entry_t _dest_d, acl_entry_t _src_d);
--ssize_t acl_copy_ext(void *_buf_p, acl_t _acl, ssize_t _size);
--acl_t acl_copy_int(const void *_buf_p);
--int acl_create_entry(acl_t *_acl_p, acl_entry_t *_entry_p);
--int acl_delete_entry(acl_t _acl, acl_entry_t _entry_d);
--int acl_delete_fd_np(int _filedes, acl_type_t _type);
--int acl_delete_file_np(const char *_path_p, acl_type_t _type);
--int acl_delete_link_np(const char *_path_p, acl_type_t _type);
--int acl_delete_def_file(const char *_path_p);
--int acl_delete_def_link_np(const char *_path_p);
--int acl_delete_perm(acl_permset_t _permset_d, acl_perm_t _perm);
--acl_t acl_dup(acl_t _acl);
--int acl_free(void *_obj_p);
--acl_t acl_from_text(const char *_buf_p);
--int acl_get_entry(acl_t _acl, int _entry_id, acl_entry_t *_entry_p);
--acl_t acl_get_fd(int _fd);
--acl_t acl_get_fd_np(int fd, acl_type_t _type);
--acl_t acl_get_file(const char *_path_p, acl_type_t _type);
--acl_t acl_get_link_np(const char *_path_p, acl_type_t _type);
--void *acl_get_qualifier(acl_entry_t _entry_d);
--int acl_get_perm_np(acl_permset_t _permset_d, acl_perm_t _perm);
--int acl_get_permset(acl_entry_t _entry_d, acl_permset_t *_permset_p);
--int acl_get_tag_type(acl_entry_t _entry_d, acl_tag_t *_tag_type_p);
--acl_t acl_init(int _count);
--int acl_set_fd(int _fd, acl_t _acl);
--int acl_set_fd_np(int _fd, acl_t _acl, acl_type_t _type);
--int acl_set_file(const char *_path_p, acl_type_t _type, acl_t _acl);
--int acl_set_link_np(const char *_path_p, acl_type_t _type, acl_t _acl);
--int acl_set_permset(acl_entry_t _entry_d, acl_permset_t _permset_d);
--int acl_set_qualifier(acl_entry_t _entry_d, const void *_tag_qualifier_p);
--int acl_set_tag_type(acl_entry_t _entry_d, acl_tag_t _tag_type);
--ssize_t acl_size(acl_t _acl);
--char *acl_to_text(acl_t _acl, ssize_t *_len_p);
--int acl_valid(acl_t _acl);
--int acl_valid_fd_np(int _fd, acl_type_t _type, acl_t _acl);
--int acl_valid_file_np(const char *_path_p, acl_type_t _type, acl_t _acl);
--int acl_valid_link_np(const char *_path_p, acl_type_t _type, acl_t _acl);
-+extern int acl_add_perm(acl_permset_t _permset_d, acl_perm_t _perm) __THROW;
-+extern int acl_calc_mask(acl_t *_acl_p) __THROW;
-+extern int acl_clear_perms(acl_permset_t _permset_d) __THROW;
-+extern int acl_copy_entry(acl_entry_t _dest_d, acl_entry_t _src_d) __THROW;
-+extern ssize_t acl_copy_ext(void *_buf_p, acl_t _acl, ssize_t _size) __THROW;
-+extern acl_t acl_copy_int(const void *_buf_p) __THROW;
-+extern int acl_create_entry(acl_t *_acl_p, acl_entry_t *_entry_p) __THROW;
-+extern int acl_delete_entry(acl_t _acl, acl_entry_t _entry_d) __THROW;
-+extern int acl_delete_fd_np(int _filedes, acl_type_t _type) __THROW;
-+extern int acl_delete_file_np(const char *_path_p, acl_type_t _type) __THROW;
-+extern int acl_delete_link_np(const char *_path_p, acl_type_t _type) __THROW;
-+extern int acl_delete_def_file(const char *_path_p) __THROW;
-+extern int acl_delete_def_link_np(const char *_path_p) __THROW;
-+extern int acl_delete_perm(acl_permset_t _permset_d, acl_perm_t _perm) __THROW;
-+extern acl_t acl_dup(acl_t _acl) __THROW;
-+extern int acl_free(void *_obj_p) __THROW;
-+extern acl_t acl_from_text(const char *_buf_p) __THROW;
-+extern int acl_get_entry(acl_t _acl, int _entry_id, acl_entry_t *_entry_p) __THROW;
-+extern acl_t acl_get_fd(int _fd) __THROW;
-+extern acl_t acl_get_fd_np(int fd, acl_type_t _type) __THROW;
-+extern acl_t acl_get_file(const char *_path_p, acl_type_t _type) __THROW;
-+extern acl_t acl_get_link_np(const char *_path_p, acl_type_t _type) __THROW;
-+extern void *acl_get_qualifier(acl_entry_t _entry_d) __THROW;
-+extern int acl_get_perm_np(acl_permset_t _permset_d, acl_perm_t _perm) __THROW;
-+extern int acl_get_permset(acl_entry_t _entry_d, acl_permset_t *_permset_p) __THROW;
-+extern int acl_get_tag_type(acl_entry_t _entry_d, acl_tag_t *_tag_type_p) __THROW;
-+extern acl_t acl_init(int _count) __THROW;
-+extern int acl_set_fd(int _fd, acl_t _acl) __THROW;
-+extern int acl_set_fd_np(int _fd, acl_t _acl, acl_type_t _type) __THROW;
-+extern int acl_set_file(const char *_path_p, acl_type_t _type, acl_t _acl) __THROW;
-+extern int acl_set_link_np(const char *_path_p, acl_type_t _type, acl_t _acl) __THROW;
-+extern int acl_set_permset(acl_entry_t _entry_d, acl_permset_t _permset_d) __THROW;
-+extern int acl_set_qualifier(acl_entry_t _entry_d, const void *_tag_qualifier_p) __THROW;
-+extern int acl_set_tag_type(acl_entry_t _entry_d, acl_tag_t _tag_type) __THROW;
-+extern ssize_t acl_size(acl_t _acl) __THROW;
-+extern char *acl_to_text(acl_t _acl, ssize_t *_len_p) __THROW;
-+extern int acl_valid(acl_t _acl) __THROW;
-+extern int acl_valid_fd_np(int _fd, acl_type_t _type, acl_t _acl) __THROW;
-+extern int acl_valid_file_np(const char *_path_p, acl_type_t _type, acl_t _acl) __THROW;
-+extern int acl_valid_link_np(const char *_path_p, acl_type_t _type, acl_t _acl) __THROW;
- __END_DECLS
-
- #endif /* !_KERNEL */
diff -ur sys.orig/sys/callout.h sys/sys/callout.h
--- sys.orig/sys/callout.h 2004-12-07 23:50:18.000000000 +0100
+++ sys/sys/callout.h 2004-12-07 23:48:37.000000000 +0100
@@ -609,30 +422,6 @@
+typedef __pid_t lwpid_t;
+
#endif /* _SYS_PROCFS_H_ */
-diff -ur sys.orig/sys/reboot.h sys/sys/reboot.h
---- sys.orig/sys/reboot.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/reboot.h 2004-12-07 23:48:38.000000000 +0100
-@@ -33,6 +33,8 @@
- #ifndef _SYS_REBOOT_H_
- #define _SYS_REBOOT_H_
-
-+#include <features.h>
-+
- /*
- * Arguments to reboot system call. These are passed to
- * the boot program and on to init.
-@@ -64,4 +66,11 @@
-
- #define RB_BOOTINFO 0x80000000 /* have `struct bootinfo *' arg */
-
-+__BEGIN_DECLS
-+
-+/* Reboot or halt the system. */
-+extern int reboot (int __howto) __THROW;
-+
-+__END_DECLS
-+
- #endif
diff -ur sys.orig/sys/resourcevar.h sys/sys/resourcevar.h
--- sys.orig/sys/resourcevar.h 2004-12-07 23:50:18.000000000 +0100
+++ sys/sys/resourcevar.h 2004-12-07 23:48:38.000000000 +0100
Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2006-07-28 14:36:03 UTC (rev 1634)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2006-07-29 06:01:31 UTC (rev 1635)
@@ -60,46 +60,6 @@
/*
* Overlay for ip header used by other protocols (tcp, udp).
-diff -ur sys.orig/netinet6/in6.h sys/netinet6/in6.h
---- sys.orig/netinet6/in6.h 2004-04-07 22:46:15.000000000 +0200
-+++ sys/netinet6/in6.h 2004-11-30 01:16:42.000000000 +0100
-@@ -61,13 +61,15 @@
- * @(#)in.h 8.3 (Berkeley) 1/3/94
- */
-
--#ifndef __KAME_NETINET_IN_H_INCLUDED_
-+#ifndef _NETINET_IN_H
- #error "do not include netinet6/in6.h directly, include netinet/in.h. see RFC2553"
- #endif
-
- #ifndef _NETINET6_IN6_H_
- #define _NETINET6_IN6_H_
-
-+#include <sys/types.h>
-+
- /*
- * Identification of the network protocol stack
- * for *BSD-current/release: http://www.kame.net/dev/cvsweb.cgi/kame/COVERAGE
-@@ -122,7 +124,6 @@
- } __u6_addr; /* 128-bit IP6 address */
- };
-
--#define s6_addr __u6_addr.__u6_addr8
- #ifdef _KERNEL /* XXX nonstandard */
- #define s6_addr8 __u6_addr.__u6_addr8
- #define s6_addr16 __u6_addr.__u6_addr16
-@@ -242,11 +243,6 @@
- #ifdef _KERNEL
- #define IN6_ARE_ADDR_EQUAL(a, b) \
- (bcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0)
--#else
--#if __BSD_VISIBLE
--#define IN6_ARE_ADDR_EQUAL(a, b) \
-- (memcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0)
--#endif
- #endif
-
- #ifdef _KERNEL /* non standard */
diff -ur sys.orig/netinet6/in6_var.h sys/netinet6/in6_var.h
--- sys.orig/netinet6/in6_var.h 2004-11-30 01:05:19.000000000 +0100
+++ sys/netinet6/in6_var.h 2004-11-30 01:16:42.000000000 +0100
Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2006-07-28 14:36:03 UTC (rev 1634)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2006-07-29 06:01:31 UTC (rev 1635)
@@ -127,54 +127,6 @@
int sbuf_putc(struct sbuf *, int);
int sbuf_trim(struct sbuf *);
int sbuf_overflowed(struct sbuf *);
-diff -ur sys.old/sys/time.h sys/sys/time.h
---- sys.old/sys/time.h 2005-08-17 16:32:16.000000000 +0200
-+++ sys/sys/time.h 2005-08-22 23:13:48.000000000 +0200
-@@ -33,14 +33,10 @@
- #ifndef _SYS_TIME_H_
- #define _SYS_TIME_H_
-
--#include <sys/_timeval.h>
- #include <sys/types.h>
--#include <sys/timespec.h>
-+#include <sys/time.h>
-+#include <stdint.h>
-
--struct timezone {
-- int tz_minuteswest; /* minutes west of Greenwich */
-- int tz_dsttime; /* type of dst correction */
--};
- #define DST_NONE 0 /* not on dst */
- #define DST_USA 1 /* USA style dst */
- #define DST_AUST 2 /* Australian style dst */
-@@ -49,7 +45,6 @@
- #define DST_EET 5 /* Eastern European dst */
- #define DST_CAN 6 /* Canada */
-
--#if __BSD_VISIBLE
- struct bintime {
- time_t sec;
- uint64_t frac;
-@@ -137,7 +132,6 @@
- /* 18446744073709 = int(2^64 / 1000000) */
- bt->frac = tv->tv_usec * (uint64_t)18446744073709LL;
- }
--#endif /* __BSD_VISIBLE */
-
- #ifdef _KERNEL
-
-@@ -216,11 +210,6 @@
- #define ITIMER_VIRTUAL 1
- #define ITIMER_PROF 2
-
--struct itimerval {
-- struct timeval it_interval; /* timer interval */
-- struct timeval it_value; /* current value */
--};
--
- /*
- * Getkerninfo clock information structure
- */
diff -ur sys.old/sys/timespec.h sys/sys/timespec.h
--- sys.old/sys/timespec.h 2005-08-17 16:32:16.000000000 +0200
+++ sys/sys/timespec.h 2005-08-22 23:13:48.000000000 +0200
More information about the Glibc-bsd-commits
mailing list