add davids patches

3 files changed, 94 insertions, 0 deletions

diff --git a/debian/patches/david-add-random.patch b/debian/patches/david-add-random.patch
new file mode 100644
index 00000000..fd1f4a52
--- /dev/null
+++ b/debian/patches/david-add-random.patch
@@ -0,0 +1,41 @@
+Hi,
+
+With the random merge, can /dev/(u)random devices now be added to
+MAKEDEV?  (I'm not married to the seed file argument, in case there
+is a better default location for it.)
+
+Thanks.
+
+David
+
+ sutils/MAKEDEV.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/sutils/MAKEDEV.sh b/sutils/MAKEDEV.sh
+index 0a8f514..db98353 100644
+--- a/sutils/MAKEDEV.sh
++++ b/sutils/MAKEDEV.sh
+@@ -100,7 +100,7 @@ mkdev() {
+ 	;;
+ 
+       std)
+-	mkdev console tty null zero full fd time mem klog shm
++	mkdev console tty null zero random urandom full fd time mem klog shm
+ 	;;
+       console|com[0-9])
+ 	st $I root 600 /hurd/term ${DEVDIR}/$I device $I;;
+@@ -117,6 +117,10 @@ mkdev() {
+ 	st $I root 666 /hurd/null --full;;
+       zero)
+ 	st $I root 666 /bin/nullauth -- /hurd/storeio -Tzero;;
++      random)
++	st $I root 644 /hurd/random --secure --seed-file /var/lib/random-seed;;
++      urandom)
++	st $I root 644 /hurd/random --fast --seed-file /var/lib/random-seed;;
+       tty)
+ 	st $I root 666 /hurd/magic tty;;
+       fd)
+-- 
+1.9.3
+
+
diff --git a/debian/patches/david-fix-mach_debug.patch b/debian/patches/david-fix-mach_debug.patch
new file mode 100644
index 00000000..017548de
--- /dev/null
+++ b/debian/patches/david-fix-mach_debug.patch
@@ -0,0 +1,51 @@
+Hi,
+
+The hard-coded /usr/include vpath will break building with sysroot
+headers.  Can the mach_debug defs files be handled like the others?
+
+Thanks.
+
+David
+
+ Makeconf        | 4 ++++
+ procfs/Makefile | 3 ---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Makeconf b/Makeconf
+index 5cf995d..32eec13 100644
+--- a/Makeconf
++++ b/Makeconf
+@@ -576,13 +576,17 @@ vpath %.defs $(top_srcdir)/hurd
+ mach_defs_names = bootstrap exc mach mach4 \
+ 	mach_host mach_port mach_timer_reply memory_object \
+ 	memory_object_default notify
++mach_debug_defs_names = mach_debug
+ device_defs_names = dev_forward device device_reply device_request
+ 
+ mach_defs = $(addsuffix .defs,$(mach_defs_names))
++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/$@>' > $@
+ 
+diff --git a/procfs/Makefile b/procfs/Makefile
+index 6d7ca48..78f20c4 100644
+--- a/procfs/Makefile
++++ b/procfs/Makefile
+@@ -28,7 +28,4 @@ OBJS = $(SRCS:.c=.o)
+ HURDLIBS = netfs fshelp iohelp ps ports ihash shouldbeinlibc
+ OTHERLIBS = -lpthread
+ 
+-# Where to find .defs files.
+-vpath %.defs /usr/include/mach_debug
+-
+ include ../Makeconf
+-- 
+1.9.3
+
+
diff --git a/debian/patches/series b/debian/patches/series
index ccef28f8..ae00cc74 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,3 +50,5 @@ fix-net_rcv_msg.patch
 0003-trans-fakeroot-fix-error-handling.patch
 0004-libports-avoid-realloc-3-corner-case.patch
 0005-libdiskfs-add-permission-check-to-file_chflags.patch
+david-add-random.patch
+david-fix-mach_debug.patch