[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 04/10: Refresh patches
From: |
Samuel Thibault |
Subject: |
[hurd] 04/10: Refresh patches |
Date: |
Tue, 27 May 2014 08:32:07 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit 5386a066f50878349a256a71c8f7c8b43316c68f
Author: Samuel Thibault <address@hidden>
Date: Sun May 25 17:52:05 2014 +0000
Refresh patches
---
debian/changelog | 1 +
debian/patches/exec_filename_exec.patch | 2 +-
debian/patches/exec_filename_fs.patch | 8 -------
debian/patches/libmachdev.patch | 37 ---------------------------------
debian/patches/mount-bind.patch | 8 +++----
debian/patches/proxy-defpager.diff | 3 ++-
debian/patches/series | 1 -
7 files changed, 8 insertions(+), 52 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8951008..8feb2a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ hurd (1:0.5.git20140525-1) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* New upstream snapshot.
- Breaks old netdde, which needs to be rebuilt.
+ - patches/libmachdev.patch: Drop patch, fixed upstream.
[ Justus Winter ]
* patches/libports_revert_stacksize.patch: Drop patch, not needed any more.
diff --git a/debian/patches/exec_filename_exec.patch
b/debian/patches/exec_filename_exec.patch
index de6790c..47bc5fa 100644
--- a/debian/patches/exec_filename_exec.patch
+++ b/debian/patches/exec_filename_exec.patch
@@ -303,9 +303,9 @@ Index: hurd-debian/exec/Makefile
target = exec
#targets = exec exec.static
@@ -30,6 +30,7 @@
- OTHERLIBS = -lpthread
exec-MIGSFLAGS = -imacros $(srcdir)/execmutations.h
+ exec_startup-MIGSFLAGS = -imacros $(srcdir)/execmutations.h
+exec_experimental-MIGSFLAGS = -imacros $(srcdir)/execmutations.h
include ../Makeconf
diff --git a/debian/patches/exec_filename_fs.patch
b/debian/patches/exec_filename_fs.patch
index b82bbd4..8f3dcb7 100644
--- a/debian/patches/exec_filename_fs.patch
+++ b/debian/patches/exec_filename_fs.patch
@@ -759,14 +759,6 @@ Index: hurd-debian/trans/fakeroot.c
mach_port_deallocate (mach_task_self (), file);
}
-@@ -930,6 +982,7 @@
- {
- mig_routine_t netfs_io_server_routine (mach_msg_header_t *);
- mig_routine_t netfs_fs_server_routine (mach_msg_header_t *);
-+ mig_routine_t netfs_fs_experimental_server_routine (mach_msg_header_t *);
- mig_routine_t ports_notify_server_routine (mach_msg_header_t *);
- mig_routine_t netfs_fsys_server_routine (mach_msg_header_t *);
- mig_routine_t ports_interrupt_server_routine (mach_msg_header_t *);
@@ -937,6 +990,7 @@
mig_routine_t routine;
if ((routine = netfs_io_server_routine (inp)) ||
diff --git a/debian/patches/libmachdev.patch b/debian/patches/libmachdev.patch
deleted file mode 100644
index 6ac0635..0000000
--- a/debian/patches/libmachdev.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-FIXME: I'm not even sure how these are supposed to be.
-
-diff --git a/libmachdev/net.c b/libmachdev/net.c
-index 606765f..766d9b4 100644
---- a/libmachdev/net.c
-+++ b/libmachdev/net.c
-@@ -212,7 +212,7 @@ deliver_msg(struct net_rcv_msg *msg, if_filter_list_t *ifp)
- MACH_SEND_MSG|MACH_SEND_TIMEOUT,
- msg->msg_hdr.msgh_size, 0, MACH_PORT_NULL,
- 0, MACH_PORT_NULL);
-- if (err != MACH_MSG_SUCCESS)
-+ if (0 && err != MACH_MSG_SUCCESS)
- {
- /* TODO: remove from filter */
- }
-@@ -377,7 +377,7 @@ device_open (mach_port_t reply_port, mach_msg_type_name_t
reply_port_type,
- }
-
- *devp = ports_get_right (nd);
-- *devicePoly = MACH_MSG_TYPE_COPY_SEND;
-+ *devicePoly = MACH_MSG_TYPE_MAKE_SEND;
- return D_SUCCESS;
- }
-
-diff --git a/libmachdev/ds_routines.c b/libmachdev/ds_routines.c
-index 6b8d1d4..f0c034f 100644
---- a/libmachdev/ds_routines.c
-+++ b/libmachdev/ds_routines.c
-@@ -206,7 +206,7 @@ ds_device_close (device_t dev)
- ret = (device->emul_ops->close
- ? (*device->emul_ops->close) (device->emul_data)
- : D_SUCCESS);
-- mach_device_deallocate (device_to_pi (device));
-+ //mach_device_deallocate (device_to_pi (device));
-
- ports_port_deref (device_to_pi (device));
- return ret;
diff --git a/debian/patches/mount-bind.patch b/debian/patches/mount-bind.patch
index 7c7d301..e55c8fc 100644
--- a/debian/patches/mount-bind.patch
+++ b/debian/patches/mount-bind.patch
@@ -57,11 +57,11 @@ index df77c66..e6893cb 100644
ARGZ (append (&mntopts, &mntopts_len, options, options_len));
}
@@ -273,7 +284,7 @@ do_mount (struct fs *fs, int remount)
- {
- ARGZ (add (&fsopts, &fsopts_len, o));
}
-- else if (strcmp (o, "defaults") != 0)
-+ else if ((strcmp (o, "defaults") != 0) && (strlen (o) != 0))
+ else if (strcmp (o, "defaults") != 0 &&
+ strcmp (o, "loop") != 0 &&
+- strcmp (o, "exec") != 0)
++ strcmp (o, "exec") != 0 && strlen (o) != 0)
{
/* Prepend `--' to the option to make a long option switch,
e.g. `--ro' or `--rsize=1024'. */
diff --git a/debian/patches/proxy-defpager.diff
b/debian/patches/proxy-defpager.diff
index 782a016..a95df1d 100644
--- a/debian/patches/proxy-defpager.diff
+++ b/debian/patches/proxy-defpager.diff
@@ -47,12 +47,13 @@ Index: hurd-debian/trans/proxy-defpager.c
===================================================================
--- hurd-debian.orig/trans/proxy-defpager.c 2012-11-26 00:23:22.000000000
+0000
+++ hurd-debian/trans/proxy-defpager.c 2012-11-26 00:25:32.000000000 +0000
-@@ -23,9 +23,10 @@
+@@ -23,10 +23,11 @@
#include <error.h>
#include <version.h>
#include <hurd/paths.h>
+#include <string.h>
+ #include "libtrivfs/trivfs_io_S.h"
-#include "default_pager_S.h"
-#include "default_pager_U.h"
+#include "ourdefault_pager_S.h"
diff --git a/debian/patches/series b/debian/patches/series
index 82dc25c..9a4cc9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,7 +33,6 @@ libdde_devres.patch
libdde_pr_cont.patch
libdde_rx_queue.patch
libdde_rcu.patch
-libmachdev.patch
exec_filename_exec.patch
exec_filename_fs.patch
exec_filename_use.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] branch master updated (1cba06c -> 88eac85), Samuel Thibault, 2014/05/27
- [hurd] 03/10: * New upstream snapshot., Samuel Thibault, 2014/05/27
- [hurd] 05/10: upload, Samuel Thibault, 2014/05/27
- [hurd] 06/10: refresh patches, Samuel Thibault, 2014/05/27
- [hurd] 07/10: control: bump gnumach-dev dependency, Samuel Thibault, 2014/05/27
- [hurd] 04/10: Refresh patches,
Samuel Thibault <=
- [hurd] 10/10: Refresh patches, Samuel Thibault, 2014/05/27
- [hurd] 02/10: Merge branch 'upstream-merged', Samuel Thibault, 2014/05/27
- [hurd] 08/10: New upstream snapshot, Samuel Thibault, 2014/05/27
- [hurd] 09/10: Merge branch 'upstream-merged', Samuel Thibault, 2014/05/27
- [hurd] 01/10: New upstream snapshot, Samuel Thibault, 2014/05/27