This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch dde in repository hurd.
commit 40757bf4bff18b05664c1bb1fc4a22f2628bde7a Merge: c92700a 076957f Author: Samuel Thibault <[email protected]> Date: Thu Jan 14 01:22:16 2016 +0100 Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd into dde Makeconf | 9 +- auth/Makefile | 2 +- boot/Makefile | 3 +- boot/boot.c | 4 +- console-client/Makefile | 5 +- console-client/bdf.c | 4 +- console-client/driver.c | 2 +- console-client/pc-kbd.c | 23 ++--- console-client/vga-dynacolor.h | 10 ++- console-client/vga-dynafont.c | 8 +- console-client/vga-support.c | 8 +- console-client/vga-support.h | 4 +- console-client/vga.c | 2 +- console/Makefile | 2 +- daemons/Makefile | 3 +- daemons/lmail.c | 2 +- devnode/Makefile | 2 +- devnode/mig-mutate.h | 2 + doc/hurd.texi | 15 +++- eth-filter.multi-thread/Makefile | 2 +- eth-multiplexer/Makefile | 2 +- exec/Makefile | 2 +- exec/elfcore.c | 4 +- exec/main.c | 2 +- ext2fs/Makefile | 2 +- ext2fs/balloc.c | 12 +-- ext2fs/bitmap.c | 2 +- ext2fs/dir.c | 2 +- ext2fs/ext2fs.h | 17 ++-- ext2fs/hyper.c | 2 +- ext2fs/ialloc.c | 8 +- ext2fs/pager.c | 103 +++++++++++++--------- fatfs/Makefile | 2 +- fatfs/dir.c | 9 +- fatfs/fat.c | 6 +- fatfs/fat.h | 4 +- fatfs/inode.c | 9 +- fstests/fstests.c | 6 +- ftpfs/Makefile | 2 +- hostmux/Makefile | 2 +- hurd/console.h | 7 ++ include/sys/procfs.h | 4 +- isofs/Makefile | 2 +- isofs/rr.c | 2 +- isofs/rr.h | 28 +++--- libbpf/Makefile | 2 +- libddekit/Makefile | 2 +- libdiskfs/Makefile | 2 +- libdiskfs/boot-start.c | 4 +- libdiskfs/dir-chg.c | 2 +- libdiskfs/dir-lookup.c | 21 +++-- libdiskfs/diskfs.h | 5 +- libdiskfs/name-cache.c | 89 +------------------ libdiskfs/node-cache.c | 107 +++++++++++------------ libftpconn/cmd.c | 3 +- libftpconn/reply.c | 4 +- libhurd-slab/Makefile | 2 +- libihash/Makefile | 2 +- libihash/ihash.c | 124 ++++++++++++++++----------- libihash/ihash.h | 72 ++++++++++------ libihash/murmur3.c | 93 ++++++++++++++++++++ libmachdev/Makefile | 2 +- libnetfs/dir-lookup.c | 24 ++++-- libshouldbeinlibc/portinfo.c | 8 +- libshouldbeinlibc/ugids-verify-auth.c | 5 +- libshouldbeinlibc/xportinfo.c | 2 +- libstore/decode.c | 4 +- libstore/file.c | 4 +- libstore/zero.c | 5 +- libtrivfs/mig-decls.h | 6 ++ mach-defpager/Makefile | 4 +- mach-defpager/kalloc.c | 29 +------ nfs/Makefile | 2 +- nfs/ops.c | 2 +- nfsd/Makefile | 2 +- nfsd/cache.c | 23 ++--- nfsd/fsys.c | 2 +- nfsd/nfsd.h | 7 +- nfsd/ops.c | 14 +-- pfinet/Makefile | 2 +- pfinet/glue-include/linux/kernel.h | 8 +- pfinet/glue-include/linux/sched.h | 9 +- pfinet/linux-src/include/asm-i386/checksum.h | 6 +- pfinet/linux-src/include/linux/atalk.h | 2 +- pfinet/linux-src/include/linux/bitops.h | 8 +- pfinet/linux-src/include/linux/filter.h | 2 +- pfinet/linux-src/include/linux/firewall.h | 6 +- pfinet/linux-src/include/linux/hfs_fs.h | 4 +- pfinet/linux-src/include/linux/igmp.h | 2 +- pfinet/linux-src/include/linux/inetdevice.h | 8 +- pfinet/linux-src/include/linux/ipsec.h | 4 +- pfinet/linux-src/include/linux/netdevice.h | 10 +-- pfinet/linux-src/include/linux/netlink.h | 2 +- pfinet/linux-src/include/linux/notifier.h | 6 +- pfinet/linux-src/include/linux/parport.h | 6 +- pfinet/linux-src/include/linux/parport_pc.h | 32 +++---- pfinet/linux-src/include/linux/quotaops.h | 16 ++-- pfinet/linux-src/include/linux/rtnetlink.h | 22 ++--- pfinet/linux-src/include/linux/sched.h | 10 +-- pfinet/linux-src/include/linux/skbuff.h | 96 +++++++++------------ pfinet/linux-src/include/linux/tqueue.h | 4 +- pfinet/linux-src/include/net/addrconf.h | 10 +-- pfinet/linux-src/include/net/checksum.h | 2 +- pfinet/linux-src/include/net/dst.h | 22 ++--- pfinet/linux-src/include/net/if_inet6.h | 2 +- pfinet/linux-src/include/net/ip.h | 12 +-- pfinet/linux-src/include/net/ip6_fib.h | 4 +- pfinet/linux-src/include/net/ip6_route.h | 2 +- pfinet/linux-src/include/net/ip_fib.h | 14 +-- pfinet/linux-src/include/net/ipv6.h | 12 +-- pfinet/linux-src/include/net/ndisc.h | 2 +- pfinet/linux-src/include/net/neighbour.h | 18 ++-- pfinet/linux-src/include/net/pkt_cls.h | 4 +- pfinet/linux-src/include/net/pkt_sched.h | 6 +- pfinet/linux-src/include/net/profile.h | 30 +++---- pfinet/linux-src/include/net/route.h | 6 +- pfinet/linux-src/include/net/sock.h | 23 +++-- pfinet/linux-src/include/net/tcp.h | 28 +++--- pfinet/linux-src/net/ipv4/fib_hash.c | 10 +-- pfinet/linux-src/net/ipv4/fib_semantics.c | 4 +- pfinet/linux-src/net/ipv4/ip_fragment.c | 6 +- pfinet/linux-src/net/ipv4/tcp_input.c | 6 +- pfinet/linux-src/net/ipv6/reassembly.c | 6 +- pfinet/mapped-time.h | 4 +- pfinet/timer-emul.c | 4 +- pflocal/Makefile | 2 +- pflocal/socket.c | 25 +++++- proc/Makefile | 3 +- proc/mgt.c | 1 + procfs/Makefile | 2 +- procfs/process.c | 4 +- procfs/rootdir.c | 10 +-- random/Makefile | 4 +- random/gnupg-random.c | 14 +-- random/gnupg-rmd.h | 2 +- random/gnupg-rmd160.c | 21 +++-- startup/startup.c | 2 +- storeio/Makefile | 2 +- term/Makefile | 6 +- term/mig-mutate.h | 1 + tmpfs/Makefile | 2 +- trans/Makefile | 28 +++--- trans/mtab.c | 2 +- trans/streamio.c | 2 +- usermux/Makefile | 2 +- utils/Makefile | 7 +- utils/rpcscan.c | 3 +- utils/rpctrace.c | 23 ++--- utils/shd.c | 3 +- utils/vminfo.c | 22 ++--- utils/vmstat.c | 22 +++-- utils/w.c | 3 +- 152 files changed, 948 insertions(+), 804 deletions(-) diff --cc eth-filter.multi-thread/Makefile index 2aaf543,0000000..0a11174 mode 100644,000000..100644 --- a/eth-filter.multi-thread/Makefile +++ b/eth-filter.multi-thread/Makefile @@@ -1,35 -1,0 +1,35 @@@ +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 2008 Free Software Foundation, Inc. +# This file is part of the GNU Hurd. +# +# The GNU Hurd is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# The GNU Hurd is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the GNU Hurd; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + +dir := eth-filter +makemode := server + +SRCS = bpf_impl.c filter.c queue.c pcap_filter.c msg_queue.c +LCLHDRS = bpf_impl.h queue.h util.h filter.h msg_queue.h +HURDLIBS = ports trivfs fshelp ihash shouldbeinlibc - OTHERLIBS = -lpthread ++LDLIBS += -lpthread +target = eth-filter +MIGSTUBS = ourdeviceServer.o notifyServer.o device_replyUser.o +OBJS = $(SRCS:.c=.o) $(MIGSTUBS) + +include ../Makeconf + +CFLAGS += -I../pfinet/linux-src/include -I../pfinet/glue-include +LDFLAGS += -lpcap + +ourdevice.defs: device.defs + $(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ ]*device[ ]*:[ ]*device_t/s/device_t/mach_port_send_t/' > $@ diff --cc eth-multiplexer/Makefile index bfd065a,0000000..8b392f4 mode 100644,000000..100644 --- a/eth-multiplexer/Makefile +++ b/eth-multiplexer/Makefile @@@ -1,34 -1,0 +1,34 @@@ +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 2008 Free Software Foundation, Inc. +# This file is part of the GNU Hurd. +# +# The GNU Hurd is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# The GNU Hurd is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the GNU Hurd; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + +dir := eth-multiplexer +makemode := server +target = eth-multiplexer + +#CFLAGS += -DDEBUG +SRCS = ethernet.c vdev.c multiplexer.c dev_stat.c netfs_impl.c notify_impl.c device_impl.c demuxer.c +MIGSTUBS = deviceServer.o notifyServer.o +MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h +device-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name" +OBJS = $(SRCS:.c=.o) $(MIGSTUBS) +LCLHDRS = ethernet.h util.h vdev.h netfs_impl.h +HURDLIBS=ports fshelp shouldbeinlibc netfs bpf - OTHERLIBS = -lpthread ++LDLIBS += -lpthread + +CFLAGS += -I$(top_srcdir)/libbpf + +include ../Makeconf diff --cc libbpf/Makefile index d6ebdc3,6ba6a14..37189af --- a/libbpf/Makefile +++ b/libbpf/Makefile @@@ -15,19 -15,26 +15,19 @@@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -dir := libfshelp +dir := libbpf makemode := library -libname = libfshelp -SRCS = lock-acquire.c lock-init.c \ - translator-list.c \ - start-translator-long.c start-translator.c \ - fetch-root.c transbox-init.c set-active.c fetch-control.c \ - drop-transbox.c translated.c \ - delegate.c \ - exec-reauth.c \ - set-options.c \ - get-identity.c \ - perms-isowner.c perms-iscontroller.c perms-access.c \ - perms-checkdirmod.c \ - touch.c -installhdrs = fshelp.h +libname = libbpf +SRCS= bpf_impl.c queue.c +LCLHDRS = bpf_impl.h queue.h +installhdrs = bpf_impl.h queue.h + +MIGSTUBS = +OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS)) - OTHERLIBS = -lpthread -HURDLIBS = shouldbeinlibc iohelp ports ihash + LDLIBS += -lpthread -OBJS = $(subst .c,.o,$(SRCS)) + +MIGCOMSFLAGS = include ../Makeconf diff --cc libddekit/Makefile index a11534b,0000000..2f591ec mode 100644,000000..100644 --- a/libddekit/Makefile +++ b/libddekit/Makefile @@@ -1,53 -1,0 +1,53 @@@ +# +# Copyright (C) 2009 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +dir := libddekit +makemode := library + +libname = libddekit +SRCS= condvar.c init.c interrupt.c lock.c malloc.c memory.c \ + pci.c pgtab.c printf.c resources.c list.c panic.c \ + thread.c timer.c initcall.c +installhdrs = ddekit/condvar.h ddekit/lock.h \ + ddekit/semaphore.h ddekit/debug.h \ + ddekit/inline.h ddekit/panic.h \ + ddekit/thread.h ddekit/types.h \ + ddekit/pgtab.h ddekit/printf.h \ + ddekit/pci.h ddekit/assert.h \ + ddekit/interrupt.h ddekit/resources.h \ + ddekit/memory.h ddekit/timer.h \ + ddekit/initcall.h + +installhdrsubdir = . +LCLHDRS = $(installhdrs) \ + dde.h \ + config.h list.h util.h + +MIGSTUBS = deviceUser.o machUser.o +OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS)) + +HURDLIBS = ports shouldbeinlibc hurd-slab - OTHERLIBS = -lpthread ++LDLIBS += -lpthread + +MIGCOMSFLAGS = -prefix dde_ + +include ../Makeconf + +LIBS += -lpciaccess + +$(libname).so.$(hurd-version): + echo "INPUT ( $(libname).a )" > $@ diff --cc libmachdev/Makefile index 7116c3e,0000000..b7cdd6b mode 100644,000000..100644 --- a/libmachdev/Makefile +++ b/libmachdev/Makefile @@@ -1,35 -1,0 +1,35 @@@ +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is part of the GNU Hurd. +# +# The GNU Hurd is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# The GNU Hurd is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the GNU Hurd; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + +dir := libmachdev +makemode := library +libname = libmachdev + +SRCS = deviceUser.c machUser.c net.c ds_routines.c queue.c trivfs_server.c \ + device_replyUser.c deviceServer.c notifyServer.c misc.c +#block.c +LCLHDRS = dev_hdr.h device_emul.h ds_routines.h vm_param.h \ + util.h queue.h io_req.h if_ether.h machdev.h linux-errno.h \ + errno-base.h +installhdrs = machdev.h +HURDLIBS = ports trivfs bpf - OTHERLIBS = -lpthread ++LDLIBS += -lpthread +OBJS = $(SRCS:.c=.o) $(MIGSTUBS) +MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h +device-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name" + +include ../Makeconf diff --cc trans/Makefile index 96918ca,65b51d1..d257a84 --- a/trans/Makefile +++ b/trans/Makefile @@@ -53,27 -55,23 +55,27 @@@ fsys-MIGSFLAGS = "-DHURD_DEFAULT_PAYLOA include ../Makeconf +ourdefault_pager.defs: default_pager.defs + $(CPP) $(CPPFLAGS) -x c $< | sed -e '/MACH_MSG_TYPE_MAKE_SEND;/s/MAKE/COPY/' | sed -e '/subsystem/iserverprefix S_;' > $@ + vpath elfcore.c $(top_srcdir)/exec - symlink: fsysServer.o - ifsock: ifsockServer.o crash: crashServer.o crash_replyUser.o msgServer.o elfcore.o + ifsock: ifsockServer.o + mtab: fsUser.o password: passwordServer.o - streamio: device_replyServer.o +proxy-defpager: ourdefault_pagerServer.o ourdefault_pagerUser.o + proxy-defpager: default_pagerServer.o default_pagerUser.o + streamio: device_replyServer.o + symlink: fsysServer.o - proxy-defpager crash password streamio: ../libports/libports.a ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a + fakeroot: ../libnetfs/libnetfs.a fifo new-fifo: ../libpipe/libpipe.a - fwd: ../libfshelp/libfshelp.a ../libports/libports.a - hello-mt magic null ifsock fifo new-fifo firmlink: ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libports/libports.a ../libihash/libihash.a - magic: ../libiohelp/libiohelp.a - hello: ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libports/libports.a ../libihash/libihash.a - fakeroot: ../libnetfs/libnetfs.a ../libfshelp/libfshelp.a ../libiohelp/libiohelp.a ../libports/libports.a ../libihash/libihash.a - remap: ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libports/libports.a ../libihash/libihash.a - mtab: ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libports/libports.a ../libihash/libihash.a fsUser.o - $(targets): ../libshouldbeinlibc/libshouldbeinlibc.a + crash fifo firmlink hello hello-mt ifsock magic mtab new-fifo null password proxy-defpager remap streamio: ../libtrivfs/libtrivfs.a + $(targets): ../libfshelp/libfshelp.a \ + ../libihash/libihash.a \ + ../libiohelp/libiohelp.a \ + ../libports/libports.a \ + ../libshouldbeinlibc/libshouldbeinlibc.a $(targets): %: %.o -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
