r4295 - in glibc-package/trunk/debian: . patches patches/kfreebsd
Author: aurel32
Date: 2010-05-28 23:01:57 +0000 (Fri, 28 May 2010)
New Revision: 4295
Removed:
glibc-package/trunk/debian/patches/kfreebsd/local-syscalls_2.11.patch
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/trunk/debian/patches/series.kfreebsd-amd64
glibc-package/trunk/debian/patches/series.kfreebsd-i386
Log:
* kfreebsd/local-sysdeps.diff: update to revision 3039 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-05-28 22:51:08 UTC (rev 4294)
+++ glibc-package/trunk/debian/changelog 2010-05-28 23:01:57 UTC (rev 4295)
@@ -58,8 +58,7 @@
[ Aurelien Jarno ]
* Enable multi-arch.
- * Add debian/patches/kfreebsd/local-syscalls_2.11.patch to add the
- lchflag syscalls on GNU/kFreeBSD.
+ * kfreebsd/local-sysdeps.diff: update to revision 3039 (from glibc-bsd).
* Add debian/patches/alpha/local-longjmp-chk.diff and
debian/patches/alpha/cvs-timer_settime.diff to fix FTBFS on alpha, and
debian/patches/alpha/local-lowlevellock.diff to fix the testsuite.
Deleted: glibc-package/trunk/debian/patches/kfreebsd/local-syscalls_2.11.patch
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-syscalls_2.11.patch 2010-05-28 22:51:08 UTC (rev 4294)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-syscalls_2.11.patch 2010-05-28 23:01:57 UTC (rev 4295)
@@ -1,50 +0,0 @@
-To be merged in the kfreebsd/ directory when 2.11 is the default
-
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Makefile
---- b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Makefile
-@@ -36,7 +36,7 @@
- # For <fcntl.h>.
- sysdep_routines += sys_open sys_openat open_2
- # For <sys/stat.h>.
--sysdep_routines += sys_fchmodat sys_fstat sys_fstatat sys_lstat sys_mkdirat sys_mkfifoat sys_mknod sys_mknodat sys_nfstat sys_nlstat sys_nstat sys_stat
-+sysdep_routines += sys_fchmodat sys_fstat sys_fstatat sys_lstat sys_mkdirat sys_mkfifoat sys_mknod sys_mknodat sys_nfstat sys_nlstat sys_nstat sys_stat lchflags
- # For <sys/statfs.h>.
- sysdep_routines += fstatfs64 statfs64 sys_fstatfs sys_statfs
- # For <stdio.h>
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list
-@@ -15,6 +15,7 @@@ -57,6 +59,7 @@
- kldunload - kldunload i:i kldunload
- kldunloadf - kldunloadf i:ii kldunloadf
- ktrace - ktrace i:siii ktrace
-+lchflags - lchflags i:si lchflags
- lchmod - lchmod i:si __lchmod lchmod
- lchown - lchown i:sii __lchown lchown
- sys_lio_listio - lio_listio i:ibnP __syscall_lio_listio
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
-@@ -87,6 +87,11 @@
- kenv;
- sysctlnametomib;
- }
-+ GLIBC_2.11 {
-+ lchflags;
-+ #errlist-compat 94
-+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
-+ }
- GLIBC_PRIVATE {
- # needed by libpthread.
- __clone; __libc_fork; __libc_sigaction;
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/errno.h
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/errno.h
-@@ -155,8 +155,9 @@
- #define EMULTIHOP 90 /* Multihop attempted */
- #define ENOLINK 91 /* Link has been severed */
- #define EPROTO 92 /* Protocol error */
-+#define ENOTCAPABLE 93 /* Capabilities insufficient */
-
--#define ELAST 92 /* Must be equal largest errno */
-+#define ELAST 93 /* Must be equal largest errno */
-
- # ifndef __ASSEMBLER__
- /* Function to get address of global `errno' variable. */
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2010-05-28 22:51:08 UTC (rev 4294)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2010-05-28 23:01:57 UTC (rev 4295)
@@ -85,7 +85,7 @@
+# For <fcntl.h>.
+sysdep_routines += sys_open sys_openat open_2
+# For <sys/stat.h>.
-+sysdep_routines += sys_fchmodat sys_fstat sys_fstatat sys_lstat sys_mkdirat sys_mkfifoat sys_mknod sys_mknodat sys_nfstat sys_nlstat sys_nstat sys_stat
++sysdep_routines += sys_fchmodat sys_fstat sys_fstatat sys_lstat sys_mkdirat sys_mkfifoat sys_mknod sys_mknodat sys_nfstat sys_nlstat sys_nstat sys_stat lchflags
+# For <sys/statfs.h>.
+sysdep_routines += fstatfs64 statfs64 sys_fstatfs sys_statfs
+# For <stdio.h>
@@ -183,7 +183,7 @@
+endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
-@@ -0,0 +1,109 @@
+@@ -0,0 +1,114 @@
+libc {
+ # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
+ # When you get an error from errlist-compat.awk, you need to add a new
@@ -273,6 +273,11 @@
+ kenv;
+ sysctlnametomib;
+ }
++ GLIBC_2.11 {
++ lchflags;
++ #errlist-compat 94
++ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
++ }
+ GLIBC_PRIVATE {
+ # needed by libpthread.
+ __clone; __libc_fork; __libc_sigaction;
@@ -3171,7 +3176,7 @@
+#define _DIRENT_HAVE_D_TYPE 1
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/errno.h
-@@ -0,0 +1,182 @@
+@@ -0,0 +1,183 @@
+/*-
+ * Copyright (c) 1982, 1986, 1989, 1993
+ * The Regents of the University of California. All rights reserved.
@@ -3329,8 +3334,9 @@
+#define EMULTIHOP 90 /* Multihop attempted */
+#define ENOLINK 91 /* Link has been severed */
+#define EPROTO 92 /* Protocol error */
++#define ENOTCAPABLE 93 /* Capabilities insufficient */
+
-+#define ELAST 92 /* Must be equal largest errno */
++#define ELAST 93 /* Must be equal largest errno */
+
+# ifndef __ASSEMBLER__
+/* Function to get address of global `errno' variable. */
@@ -23270,6 +23276,195 @@
+#endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list
+@@ -0,0 +1,186 @@
++# 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
++lchflags - lchflags i:si lchflags
++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/syscalls.list.orig
@@ -0,0 +1,185 @@
+# File name Caller Syscall name # args Strong name Weak names
+sys_access - access i:si __syscall_access
Modified: glibc-package/trunk/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/trunk/debian/patches/series.kfreebsd-amd64 2010-05-28 22:51:08 UTC (rev 4294)
+++ glibc-package/trunk/debian/patches/series.kfreebsd-amd64 2010-05-28 23:01:57 UTC (rev 4295)
@@ -9,4 +9,3 @@
kfreebsd/local-sys_queue_h.diff
kfreebsd/local-sysdeps.diff
kfreebsd/local-undef-glibc.diff
-kfreebsd/local-syscalls_2.11.patch
Modified: glibc-package/trunk/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.kfreebsd-i386 2010-05-28 22:51:08 UTC (rev 4294)
+++ glibc-package/trunk/debian/patches/series.kfreebsd-i386 2010-05-28 23:01:57 UTC (rev 4295)
@@ -9,4 +9,3 @@
kfreebsd/local-sys_queue_h.diff
kfreebsd/local-sysdeps.diff
kfreebsd/local-undef-glibc.diff
-kfreebsd/local-syscalls_2.11.patch
Reply to: