[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4363 - in glibc-package/trunk/debian: . patches/kfreebsd



Author: ps-guest
Date: 2010-06-29 09:04:39 +0000 (Tue, 29 Jun 2010)
New Revision: 4363

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 3063 (from glibc-bsd)



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2010-06-25 08:55:09 UTC (rev 4362)
+++ glibc-package/trunk/debian/changelog	2010-06-29 09:04:39 UTC (rev 4363)
@@ -3,6 +3,9 @@
   [ Samuel Thibault ]
   * testsuite-checking/expected-results-i486-gnu-libc: update.
 
+  [ Petr Salinger ]
+  * kfreebsd/local-sysdeps.diff: update to revision 3063 (from glibc-bsd).
+
  -- Samuel Thibault <sthibault@debian.org>  Fri, 25 Jun 2010 10:54:31 +0200
 
 eglibc (2.11.2-2) unstable; urgency=medium

Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff	2010-06-25 08:55:09 UTC (rev 4362)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff	2010-06-29 09:04:39 UTC (rev 4363)
@@ -16276,7 +16276,7 @@
 +#endif	/* net/ethernet.h */
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/net/if.h
-@@ -0,0 +1,436 @@
+@@ -0,0 +1,449 @@
 +/*-
 + * Copyright (c) 1982, 1986, 1989, 1993
 + *	The Regents of the University of California.  All rights reserved.
@@ -16418,6 +16418,7 @@
 +#define	IFF_STATICARP	0x80000		/* (n) static ARP */
 +#define	IFF_NEEDSGIANT	0x100000	/* (i) hold Giant over if_start calls */
 +#define IFF_DYING       0x200000        /* (n) interface is winding down */
++#define	IFF_RENAMING    0x400000        /* (n) interface is being renamed */
 +
 +/*
 + * Old names for driver flags so that user space tools can continue to use
@@ -16484,6 +16485,8 @@
 +#define	IFCAP_TOE6		0x08000	/* interface can offload TCP6 */
 +#define	IFCAP_VLAN_HWFILTER	0x10000 /* interface hw can filter vlan tag */
 +#define IFCAP_POLLING_NOCOUNT   0x20000 /* polling ticks cannot be fragmented */
++#define	IFCAP_VLAN_HWTSO        0x40000 /* can do IFCAP_TSO on VLANs */
++#define	IFCAP_LINKSTATE         0x80000 /* the runtime link state is dynamic */
 +
 +#define	IFCAP_HWCSUM		(IFCAP_RXCSUM | IFCAP_TXCSUM)
 +#define	IFCAP_TSO		(IFCAP_TSO4 | IFCAP_TSO6)
@@ -16550,6 +16553,14 @@
 +#define	IFAN_DEPARTURE	1	/* interface departure */
 +
 +/*
++ * Buffer with length to be used in SIOCGIFDESCR/SIOCSIFDESCR requests
++ */
++struct ifreq_buffer {
++	size_t  length;
++	void    *buffer;
++};
++ 
++/*
 + * Interface request structure used for socket
 + * ioctl's.  All interface ioctl's must have parameter
 + * definitions which begin with ifr_name.  The
@@ -16562,6 +16573,7 @@
 +		struct	sockaddr ifru_dstaddr;
 +		struct	sockaddr ifru_broadaddr;
 +		struct	sockaddr ifru_netmask;
++		struct  ifreq_buffer ifru_buffer;
 +		short	ifru_flags[2];
 +		short	ifru_index;
 +		int	ifru_jid;
@@ -16576,6 +16588,7 @@
 +#define	ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-to-p link */
 +#define	ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address */
 +#define	ifr_netmask	ifr_ifru.ifru_netmask	/* interface net mask */
++#define	ifr_buffer      ifr_ifru.ifru_buffer    /* user supplied buffer with its length */
 +#define	ifr_flags	ifr_ifru.ifru_flags[0]	/* flags (low 16 bits) */
 +#define	ifr_flagshigh	ifr_ifru.ifru_flags[1]	/* flags (high 16 bits) */
 +#define ifr_jid         ifr_ifru.ifru_jid       /* jail/vnet */
@@ -23464,194 +23477,6 @@
 +sys_shm_unlink		-	shm_unlink		i:s		__syscall_shm_unlink
 +readlink		-	readlink       		i:spi   	__syscall_readlink __readlink readlink
 --- /dev/null
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list.orig
-@@ -0,0 +1,185 @@
-+# File name		Caller	Syscall name		# args		Strong name	Weak names
-+sys_access		-	access			i:si		__syscall_access
-+acl_aclcheck_fd		-	acl_aclcheck_fd		i:iip		__acl_aclcheck_fd
-+acl_aclcheck_file	-	acl_aclcheck_file	i:sip		__acl_aclcheck_file
-+acl_delete_fd		-	acl_delete_fd		i:ii		__acl_delete_fd
-+acl_delete_file		-	acl_delete_file		i:si		__acl_delete_file
-+acl_get_fd		-	acl_get_fd		i:iip		__acl_get_fd
-+acl_get_file		-	acl_get_file		i:sip		__acl_get_file
-+acl_set_fd		-	acl_set_fd		i:iip		__acl_set_fd
-+acl_set_file		-	acl_set_file		i:sip		__acl_set_file
-+sys_aio_cancel		-	aio_cancel		i:ip		__syscall_aio_cancel
-+sys_aio_error		-	aio_error		i:p		__syscall_aio_error
-+sys_aio_read		-	aio_read		i:p		__syscall_aio_read
-+sys_aio_return		-	aio_return		i:p		__syscall_aio_return
-+sys_aio_suspend		-	aio_suspend		i:bnP		__syscall_aio_suspend
-+sys_aio_waitcomplete	-	aio_waitcomplete	i:pp		__syscall_aio_waitcomplete
-+sys_aio_write		-	aio_write		i:p		__syscall_aio_write
-+sys_clock_getres	-	clock_getres		i:ip		__syscall_clock_getres
-+sys_clock_gettime	-	clock_gettime		i:ip		__syscall_clock_gettime
-+sys_clock_settime	-	clock_settime		i:ip		__syscall_clock_settime
-+sys_execve		-	execve			i:ppp		__syscall_execve
-+extattrctl		-	extattrctl		i:sisI		extattrctl
-+extattr_delete_file	-	extattr_delete_file	i:ss		extattr_delete_file
-+extattr_get_file	-	extattr_get_file	i:ssbn		extattr_get_file
-+extattr_set_file	-	extattr_set_file	i:ssbn		extattr_set_file
-+fhopen			-	fhopen			i:pi		fhopen
-+sys_fork		-	fork			i:		__syscall_fork	fork
-+sys_fhstat		-	fhstat			i:pp		__syscall_fhstat
-+sys_getfsstat		-	getfsstat		i:pii		__syscall_getfsstat
-+sys_statfs		-	statfs			i:sp		__syscall_statfs
-+sys_fstatfs		-	fstatfs			i:ip		__syscall_fstatfs
-+sys_fhstatfs		-	fhstatfs		i:pp		__syscall_fhstatfs
-+sys_fstat		-	fstat			i:ip		__syscall_fstat
-+sys_ftruncate		-	ftruncate		i:ii		__syscall_ftruncate
-+sys_freebsd6_ftruncate	-	freebsd6_ftruncate	i:iii		__syscall_freebsd6_ftruncate
-+futimes			-	futimes			i:ip		__futimes futimes
-+sys_getcwd		-	getcwd			i:bn		__syscall_getcwd
-+sys_getdents		-	getdents		i:ibn		__syscall_getdents
-+sys_getdirentries	-	getdirentries		i:ibnP		__syscall_getdirentries
-+getfh			-	getfh			i:sp		getfh
-+sys_getlogin		-	getlogin		i:bn		__syscall_getlogin
-+getpgid			-	getpgid			i:i		__getpgid __getpgid_internal getpgid
-+getpgrp			-	getpgrp			i:		getpgrp
-+getresgid		-	getresgid		i:ppp		getresgid
-+getresuid		-	getresuid		i:ppp		getresuid
-+getrlimit		-	getrlimit		i:ip		__getrlimit getrlimit getrlimit64
-+getsid			-	getsid			i:i		getsid
-+issetugid		-	issetugid		i:		issetugid
-+jail			-	jail			i:p		jail
-+kenv			-	kenv			i:issi		kenv
-+kldfind			-	kldfind			i:s		kldfind
-+kldfirstmod		-	kldfirstmod		i:i		kldfirstmod
-+kldload			-	kldload			i:s		kldload
-+kldnext			-	kldnext			i:i		kldnext
-+kldstat			-	kldstat			i:ip		kldstat
-+kldsym			-	kldsym			i:iip		kldsym
-+kldunload		-	kldunload		i:i		kldunload
-+kldunloadf		-	kldunloadf		i:ii		kldunloadf
-+ktrace			-	ktrace			i:siii		ktrace
-+lchmod			-	lchmod			i:si		__lchmod lchmod
-+lchown			-	lchown			i:sii		__lchown lchown
-+sys_lio_listio		-	lio_listio		i:ibnP		__syscall_lio_listio
-+sys_lseek		-	lseek			i:iii		__syscall_lseek
-+sys_freebsd6_lseek	-	freebsd6_lseek		i:iiii		__syscall_freebsd6_lseek
-+sys_lstat		-	lstat			i:sp		__syscall_lstat
-+lutimes			-	lutimes			i:sp		__lutimes lutimes
-+posix_madvise		-	madvise			i:pii		posix_madvise
-+minherit		-	minherit		i:aii		minherit
-+mincore			-	mincore			i:anV		mincore
-+mlock			-	mlock			i:bn		mlock
-+mlockall		-	mlockall		i:i		mlockall
-+mkfifo			-	mkfifo			i:si		__mkfifo mkfifo
-+sys_mknod		-	mknod			i:sii		__syscall_mknod
-+sys_mmap		-	mmap			b:aniiii	__syscall_mmap
-+sys_freebsd6_mmap	-	freebsd6_mmap		b:aniiiii	__syscall_freebsd6_mmap
-+sys_munmap		-	munmap			i:pi		__syscall_munmap
-+modfind			-	modfind			i:s		modfind
-+modfnext		-	modfnext		i:i		modfnext
-+modnext			-	modnext			i:i		modnext
-+modstat			-	modstat			i:ip		modstat
-+mount			-	mount			i:ssiP		mount
-+msgctl			-	msgctl			i:iip		msgctl
-+msgget			-	msgget			i:ii		msgget
-+msgrcv			-	msgrcv			Ci:ibnii	__libc_msgrcv msgrcv
-+msgsnd			-	msgsnd			Ci:ibni		__libc_msgsnd msgsnd
-+munlock			-	munlock			i:ai		munlock
-+munlockall		-	munlockall		i:		munlockall
-+nanosleep		-	nanosleep		Ci:pp		__libc_nanosleep __nanosleep nanosleep
-+nmount			-	nmount			i:pii		nmount
-+sys_nfstat		-	nfstat			i:ip		__syscall_nfstat
-+sys_nlstat		-	nlstat			i:sp		__syscall_nlstat
-+sys_nstat		-	nstat			i:sp		__syscall_nstat
-+ntp_adjtime		-	ntp_adjtime		i:p		ntp_adjtime
-+obreak			-	obreak			i:a		__syscall_obreak
-+sys_open		-	open			i:siv		__syscall_open
-+poll			-	poll			Ci:pii		__poll poll
-+sys_pread		-	pread			i:ibni		__syscall_pread
-+sys_freebsd6_pread	-	freebsd6_pread		i:ibnii		__syscall_freebsd6_pread
-+sys_pwrite		-	pwrite			i:ibni		__syscall_pwrite
-+sys_freebsd6_pwrite	-	freebsd6_pwrite		i:ibnii		__syscall_freebsd6_pwrite
-+preadv			-	preadv			Ci:ipii		__preadv  preadv  __preadv64  preadv64 
-+pwritev			-	pwritev			Ci:ipii		__pwritev pwritev __pwritev64 pwritev64 
-+quotactl		-	quotactl		i:siip		quotactl
-+sys_readv		-	readv			i:ipi		__syscall_readv
-+rfork			-	rfork			i:i		__rfork rfork
-+rtprio			-	rtprio			i:iip		__rtprio rtprio
-+sched_gets		-	sched_getscheduler	i:i		__sched_getscheduler sched_getscheduler
-+sched_primax		-	sched_get_priority_max	i:i		__sched_get_priority_max sched_get_priority_max
-+sched_primin		-	sched_get_priority_min	i:i		__sched_get_priority_min sched_get_priority_min
-+sched_rr_gi		-	sched_rr_get_interval	i:ip		__sched_rr_get_interval sched_rr_get_interval
-+sched_setp		-	sched_setparam		i:ip		__sched_setparam sched_setparam
-+sched_sets		-	sched_setscheduler	i:iip		__sched_setscheduler sched_setscheduler
-+sched_yield		-	sched_yield		i:		__sched_yield sched_yield
-+semget			-	semget			i:iii		semget
-+semop			-	semop			i:ipi		semop
-+bsd_sendfile		-	sendfile		i:iiiippi	bsd_sendfile
-+setegid			-	setegid			i:i		setegid
-+seteuid			-	seteuid			i:i		seteuid
-+setgid			-	setgid			i:i		__setgid setgid
-+sys_setlogin		-	setlogin		i:s		__syscall_setlogin
-+setpgid			-	setpgid			i:ii		__setpgid setpgid
-+setresgid		-	setresgid		i:iii		setresgid
-+setresuid		-	setresuid		i:iii		setresuid
-+setrlimit		-	setrlimit		i:ip		__setrlimit setrlimit setrlimit64
-+setsid			-	setsid			i:		__setsid setsid
-+setuid			-	setuid			i:i		__setuid setuid
-+shmat			-	shmat			i:iai		shmat
-+shmctl			-	shmctl			i:iip		shmctl
-+shmdt			-	shmdt			i:a		shmdt
-+shmget			-	shmget			i:iii		shmget
-+sys_sigaction		-	sigaction		i:ipp		__syscall_sigaction
-+sigpending		-	sigpending		i:p		sigpending
-+sigprocmask		-	sigprocmask		i:iPP		__sigprocmask sigprocmask
-+sigsuspend		-	sigsuspend		Ci:p		__sigsuspend sigsuspend
-+sigwaitinfo		-	sigwaitinfo		Ci:pp		__sigwaitinfo sigwaitinfo
-+sigtimedwait		-	sigtimedwait		Ci:ppP		__sigtimedwait sigtimedwait
-+sigqueue		-	sigqueue		i:iii		__sigqueue sigqueue
-+sys_stat		-	stat			i:sp		__syscall_stat
-+sysarch			-	sysarch			i:ip		__sysarch sysarch
-+sysctl			-	sysctl			i:pibNbn	__sysctl sysctl
-+sys_truncate		-	truncate		i:sii		__syscall_truncate
-+sys_freebsd6_truncate	-	freebsd6_truncate	i:si		__syscall_freebsd6_truncate
-+undelete		-	undelete		i:s		undelete
-+unmount			-	unmount			i:si		unmount
-+utrace			-	utrace			i:bn		utrace
-+sys_writev		-	writev			i:ipi		__syscall_writev
-+yield			-	yield			i:		__syscall_yield
-+wait4			-	wait4			i:iWiP		__syscall_wait4 __wait4	wait4
-+sys_close		-	close			i:i		__syscall_close
-+sys_fcntl		-	fcntl			i:iiF		__syscall_fcntl
-+sys_write		-	write			i:ibn		__syscall_write
-+sys_read		-	read			i:ibn		__syscall_read
-+sys_connect		-	connect			i:ipi		__syscall_connect
-+sys_bind		-	bind			i:ipi		__syscall_bind
-+sys_sendto		-	sendto			i:ibnibn	__syscall_sendto
-+sys_nanosleep		EXTRA	nanosleep		i:pp		__syscall_nanosleep
-+sys_sigsuspend		EXTRA	sigsuspend		i:p		__syscall_sigsuspend
-+swapcontext		-	swapcontext		i:pp		__swapcontext swapcontext
-+swapon			-	swapon			i:s		swapon
-+swapoff			-	swapoff			i:s		swapoff
-+getcontext		-	getcontext		i:p		__getcontext getcontext
-+setcontext		-	setcontext		i:p		__setcontext setcontext
-+kqueue			EXTRA	kqueue			i:		__kqueue kqueue
-+kevent			EXTRA	kevent			i:ipipip	__kevent kevent
-+sys_umtx		-	_umtx_op		i:piipp		__syscall__umtx_op
-+sys_cpuset_getaffinity	-	cpuset_getaffinity	i:iiiip		__syscall_cpuset_getaffinity
-+sys_cpuset_setaffinity	-	cpuset_setaffinity	i:iiiip		__syscall_cpuset_setaffinity
-+sys_faccessat		-	faccessat		i:isii		__syscall_faccessat
-+sys_fchmodat		-	fchmodat		i:isii		__syscall_fchmodat
-+sys_fchownat		-	fchownat		i:isiii		__syscall_fchownat
-+sys_fexecve		-	fexecve			i:ipp		__syscall_fexecve
-+sys_fstatat		-	fstatat			i:ispi		__syscall_fstatat
-+sys_futimesat		-	futimesat		i:isp		__syscall_futimesat
-+sys_linkat		-	linkat			i:isisi		__syscall_linkat
-+sys_mkdirat		-	mkdirat			i:isi		__syscall_mkdirat
-+sys_mkfifoat		-	mkfifoat		i:isi		__syscall_mkfifoat
-+sys_mknodat		-	mknodat			i:isii		__syscall_mknodat
-+sys_openat		-	openat			i:isii		__syscall_openat
-+sys_readlinkat		-	readlinkat		i:issi		__syscall_readlinkat
-+sys_renameat		-	renameat		i:isis		__syscall_renameat
-+sys_symlinkat		-	symlinkat		i:sis		__syscall_symlinkat
-+sys_unlinkat		-	unlinkat		i:isi		__syscall_unlinkat
-+sys_shm_open		-	shm_open		i:sii		__syscall_shm_open
-+sys_shm_unlink		-	shm_unlink		i:s		__syscall_shm_unlink
-+readlink		-	readlink       		i:spi   	__syscall_readlink __readlink readlink
---- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sysconf.c
 @@ -0,0 +1,69 @@
 +/* Get file-specific information about a file.


Reply to: