diff options
| author | Samuel Thibault <sthibault@debian.org> | 2010-02-06 18:39:33 +0000 |
|---|---|---|
| committer | Samuel Thibault <sthibault@debian.org> | 2010-02-06 18:39:33 +0000 |
| commit | 6b8ef33c92abdd35c73870efc7c321b02545e8ef (patch) | |
| tree | 0df26029d4e8f3337f4095cf02d7c97ef154b7fe /debian | |
| parent | c998b414b963781ca23d7751a7b5ac39c0377368 (diff) | |
* debian/patches/proxy-defpager.diff: New patch to fix proxying defpager.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/proxy-defpager.diff | 59 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 61 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 475245af..b010f5c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ hurd (20090404-3) UNRELEASED; urgency=low * debian/rules: Do not ship *_pic.a, as mklibs breaks them. * debian/patches/MAKEDEV.patch: Make MAKEDEV bash-free. * debian/patches/tmpfs.patch: New patch to fix tmpfs crash. + * debian/patches/proxy-defpager.diff: New patch to fix proxying defpager. [ Guillem Jover ] * Update make-new-tarball.sh to exclude git instead of CVS paths. diff --git a/debian/patches/proxy-defpager.diff b/debian/patches/proxy-defpager.diff new file mode 100644 index 00000000..0ba12dee --- /dev/null +++ b/debian/patches/proxy-defpager.diff @@ -0,0 +1,59 @@ +https://savannah.gnu.org/bugs/?26751 + +2009-06-07 Zheng Da <zhengda1936@gmail.com> + + * Makefile: Use customized default_pager.defs. + + * proxy-defpager.c: Include customized default_pager header. + +--- + Makefile | 7 +++++-- + proxy-defpager.c | 5 +++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff -u -a -r1.40 -r1.40.10.1 +--- a/trans/Makefile 6 Jun 2007 16:08:56 -0000 1.40 ++++ b/trans/Makefile 7 Jun 2009 03:51:49 -0000 1.40.10.1 +@@ -26,13 +26,16 @@ + fakeroot.c proxy-defpager.c + OBJS = $(SRCS:.c=.o) fsysServer.o ifsockServer.o passwordServer.o \ + crashServer.o crash_replyUser.o msgServer.o \ +- default_pagerServer.o default_pagerUser.o \ ++ ourdefault_pagerServer.o ourdefault_pagerUser.o \ + device_replyServer.o elfcore.o + HURDLIBS = threads ports netfs trivfs iohelp fshelp pipe ihash shouldbeinlibc + password-LDLIBS = $(LIBCRYPT) + + 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 +@@ -40,7 +43,7 @@ + crash: crashServer.o crash_replyUser.o msgServer.o elfcore.o + password: passwordServer.o + streamio: device_replyServer.o +-proxy-defpager: default_pagerServer.o default_pagerUser.o ++proxy-defpager: ourdefault_pagerServer.o ourdefault_pagerUser.o + + proxy-defpager crash password streamio: ../libthreads/libthreads.a ../libports/libports.a ../libtrivfs/libtrivfs.a ../libthreads/libthreads.a ../libfshelp/libfshelp.a + fifo new-fifo: ../libpipe/libpipe.a +diff -u -a -r1.5 -r1.5.10.1 +--- a/trans/proxy-defpager.c 6 Jun 2007 16:08:56 -0000 1.5 ++++ b/trans/proxy-defpager.c 7 Jun 2009 03:51:49 -0000 1.5.10.1 +@@ -23,9 +23,10 @@ + #include <error.h> + #include <version.h> + #include <hurd/paths.h> ++#include <string.h> + +-#include "default_pager_S.h" +-#include "default_pager_U.h" ++#include "ourdefault_pager_S.h" ++#include "ourdefault_pager_U.h" + + static mach_port_t real_defpager, dev_master; + diff --git a/debian/patches/series b/debian/patches/series index 055633fa..02c62bdc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,3 +33,4 @@ libpthread_cancel_init.patch libpthread_kill_0.patch console_current_vcs.patch tmpfs.patch +proxy-defpager.diff |