This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository hurd.
commit 88eac8569b92ab991f764cbf60783516f65db5c8 Author: Samuel Thibault <[email protected]> Date: Mon May 26 20:03:58 2014 +0000 Refresh patches --- debian/patches/external.patch | 79 +++++++++++++++++++++++++------------------ debian/patches/newRPC.patch | 2 +- 2 files changed, 47 insertions(+), 34 deletions(-) diff --git a/debian/patches/external.patch b/debian/patches/external.patch index 5e2a4b8..22de395 100644 --- a/debian/patches/external.patch +++ b/debian/patches/external.patch @@ -2,9 +2,9 @@ Include procfs, random, and DDE in the build Index: hurd-debian/Makefile =================================================================== ---- hurd-debian.orig/Makefile 2010-09-27 19:42:53.000000000 +0000 -+++ hurd-debian/Makefile 2010-09-27 19:45:57.000000000 +0000 -@@ -31,7 +31,8 @@ +--- hurd-debian.orig/Makefile ++++ hurd-debian/Makefile +@@ -28,7 +28,8 @@ include ./Makeconf # Hurd libraries lib-subdirs = libshouldbeinlibc libihash libiohelp libports libthreads \ libpager libfshelp libdiskfs libtrivfs libps \ @@ -14,7 +14,7 @@ Index: hurd-debian/Makefile # Hurd programs prog-subdirs = auth proc exec init term \ -@@ -40,7 +41,7 @@ +@@ -37,7 +38,7 @@ prog-subdirs = auth proc exec init term login daemons boot console \ hostmux usermux ftpfs trans \ console-client utils sutils \ @@ -23,22 +23,35 @@ Index: hurd-debian/Makefile ifeq ($(HAVE_SUN_RPC),yes) prog-subdirs += nfs nfsd +Index: hurd-debian/Makeconf +=================================================================== --- hurd-debian.orig/Makeconf +++ hurd-debian/Makeconf -@@ -548,7 +548,7 @@ vpath %.defs $(top_srcdir)/hurd +@@ -576,14 +576,18 @@ vpath %.defs $(top_srcdir)/hurd # These we want to find in the libc include directory... mach_defs_names = bootstrap exc mach mach4 \ mach_host mach_port mach_timer_reply memory_object \ - memory_object_default notify + memory_object_default notify experimental ++mach_debug_defs_names = mach_debug device_defs_names = dev_forward device device_reply device_request - + mach_defs = $(addsuffix .defs,$(mach_defs_names)) -diff --git a/configure.ac b/configure.ac -index 05b959b..68ec159 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -227,6 +227,12 @@ AC_SUBST(boot_store_types)dnl ++mach_debug_defs = $(addsuffix .defs,$(mach_debug_defs_names)) + device_defs = $(addsuffix .defs,$(device_defs_names)) + + $(mach_defs): %.defs: + echo '#include <mach/$@>' > $@ ++$(mach_debug_defs): %.defs: ++ echo '#include <mach_debug/$@>' > $@ + $(device_defs): %.defs: + echo '#include <device/$@>' > $@ + +Index: hurd-debian/configure.ac +=================================================================== +--- hurd-debian.orig/configure.ac ++++ hurd-debian/configure.ac +@@ -241,6 +241,12 @@ AC_SUBST(boot_store_types)dnl AC_MSG_CHECKING(boot store types) AC_MSG_RESULT($boot_store_types) @@ -53,13 +66,29 @@ index 05b959b..68ec159 100644 Index: hurd-debian/procfs/Makefile =================================================================== ---- hurd-debian.orig/procfs/Makefile 2012-11-26 00:23:22.000000000 +0000 -+++ hurd-debian/procfs/Makefile 2012-11-26 00:25:35.000000000 +0000 -@@ -1,46 +1,31 @@ +--- hurd-debian.orig/procfs/Makefile ++++ hurd-debian/procfs/Makefile +@@ -1,46 +1,33 @@ -TARGET = procfs -OBJS = procfs.o netfs.o procfs_dir.o \ - process.o proclist.o rootdir.o dircat.o main.o mach_debugUser.o -LIBS = -lnetfs -lps -lfshelp -lpthread +- +-CC = gcc +-CFLAGS = -Wall -g +-CPPFLAGS = +-LDFLAGS = +- +-ifdef PROFILE +-CFLAGS= -g -pg +-CPPFLAGS= -DPROFILE +-LDFLAGS= -static +-LIBS= -lnetfs -lfshelp -liohelp -lps -lports -lpthread -lihash -lshouldbeinlibc +-endif +- +-CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 +- +-all: $(TARGET) +# Makefile - for procfs +# +# Copyright (C) 2008 Free Software Foundation, Inc. @@ -83,31 +112,15 @@ Index: hurd-debian/procfs/Makefile + +target = procfs + -+SRCS = procfs.c netfs.c procfs_dir.c process.c proclist.c rootdir.c dircat.c main.c ++SRCS = procfs.c netfs.c procfs_dir.c process.c proclist.c rootdir.c dircat.c main.c mach_debugUser.c +LCLHDRS = dircat.h main.h process.h procfs.h procfs_dir.h proclist.h rootdir.h + +OBJS = $(SRCS:.c=.o) +HURDLIBS = netfs fshelp iohelp ps ports ihash shouldbeinlibc +OTHERLIBS = -lpthread --CC = gcc --CFLAGS = -Wall -g --CPPFLAGS = --LDFLAGS = -- --ifdef PROFILE --CFLAGS= -g -pg --CPPFLAGS= -DPROFILE --LDFLAGS= -static --LIBS= -lnetfs -lfshelp -liohelp -lps -lports -lpthread -lihash -lshouldbeinlibc --endif -- --CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -- --all: $(TARGET) -- --rootdir.o: rootdir.c mach_debug_U.h -- + rootdir.o: rootdir.c mach_debug_U.h + -$(TARGET): $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - diff --git a/debian/patches/newRPC.patch b/debian/patches/newRPC.patch index a90f166..b5e74c8 100644 --- a/debian/patches/newRPC.patch +++ b/debian/patches/newRPC.patch @@ -36,9 +36,9 @@ index 5cf995d..5dba70c 100644 mach_host mach_port mach_timer_reply memory_object \ - memory_object_default notify experimental + memory_object_default notify experimental gnumach + mach_debug_defs_names = mach_debug device_defs_names = dev_forward device device_reply device_request - mach_defs = $(addsuffix .defs,$(mach_defs_names)) diff --git a/exec/Makefile b/exec/Makefile index 3ef742d..7507b0a 100644 --- a/exec/Makefile -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
