This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository hurd.
commit 2929e9a1cb5f568ec7d6f86ed971047c54ff4475 Author: Samuel Thibault <[email protected]> Date: Mon Jan 2 17:49:51 2017 +0000 refresh patches --- debian/patches/crash-logging.patch | 2 +- debian/patches/procfs | 56 +++++++++++++++++++------------------- debian/patches/procfs-compatible | 4 +-- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/debian/patches/crash-logging.patch b/debian/patches/crash-logging.patch index b7c2755..9f82a89 100644 --- a/debian/patches/crash-logging.patch +++ b/debian/patches/crash-logging.patch @@ -10,9 +10,9 @@ Index: hurd-debian/hurd/paths.h --- hurd-debian.orig/hurd/paths.h +++ hurd-debian/hurd/paths.h @@ -54,6 +54,7 @@ the Free Software Foundation, 675 Mass A - #define _HURD_IFSOCK _HURD "ifsock" /* S_IFSOCK */ /* Symbolic names for all non-essential translators. */ + #define _HURD_MAGIC _HURD "magic" +#define _HURD_CRASH _HURD "crash" #define _HURD_MTAB _HURD "mtab" diff --git a/debian/patches/procfs b/debian/patches/procfs index 8719ed4..7efcf3a 100644 --- a/debian/patches/procfs +++ b/debian/patches/procfs @@ -13,11 +13,11 @@ Date: Mon Dec 19 02:13:06 2016 +0100 * procfs/rootdir.c: Likewise. Instead, return the magic retry response `pid' for the `self' node. -diff --git b/hurd/hurd_types.h a/hurd/hurd_types.h -index 2960a294..43411778 100644 ---- b/hurd/hurd_types.h -+++ a/hurd/hurd_types.h -@@ -114,9 +114,6 @@ enum retry_type +Index: hurd-debian/hurd/hurd_types.h +=================================================================== +--- hurd-debian.orig/hurd/hurd_types.h ++++ hurd-debian/hurd/hurd_types.h +@@ -115,9 +115,6 @@ enum retry_type as for FS_RETRY_NORMAL. "/..." means retry "...", but starting from the users root directory. @@ -27,22 +27,22 @@ index 2960a294..43411778 100644 */ }; typedef enum retry_type retry_type; -diff --git b/hurd/paths.h a/hurd/paths.h -index e1b00e90..a13ba9b7 100644 ---- b/hurd/paths.h -+++ a/hurd/paths.h -@@ -54,7 +54,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +Index: hurd-debian/hurd/paths.h +=================================================================== +--- hurd-debian.orig/hurd/paths.h ++++ hurd-debian/hurd/paths.h +@@ -54,7 +54,6 @@ the Free Software Foundation, 675 Mass A #define _HURD_IFSOCK _HURD "ifsock" /* S_IFSOCK */ /* Symbolic names for all non-essential translators. */ -#define _HURD_MAGIC _HURD "magic" + #define _HURD_CRASH _HURD "crash" #define _HURD_MTAB _HURD "mtab" - #endif /* hurd/paths.h */ -diff --git b/procfs/main.c a/procfs/main.c -index 87c726ff..857eac4a 100644 ---- b/procfs/main.c -+++ a/procfs/main.c +Index: hurd-debian/procfs/main.c +=================================================================== +--- hurd-debian.orig/procfs/main.c ++++ hurd-debian/procfs/main.c @@ -35,12 +35,14 @@ /* Command-line options */ int opt_clk_tck; @@ -58,7 +58,7 @@ index 87c726ff..857eac4a 100644 #define OPT_KERNEL_PID HURD_PID_KERNEL #define OPT_ANON_OWNER 0 -@@ -52,6 +54,7 @@ static void set_compatibility_options (void) +@@ -52,6 +54,7 @@ static void set_compatibility_options (v { opt_clk_tck = 100; opt_stat_mode = 0444; @@ -66,7 +66,7 @@ index 87c726ff..857eac4a 100644 } static error_t -@@ -79,6 +82,19 @@ argp_parser (int key, char *arg, struct argp_state *state) +@@ -79,6 +82,19 @@ argp_parser (int key, char *arg, struct opt_stat_mode = v; break; @@ -97,7 +97,7 @@ index 87c726ff..857eac4a 100644 { "kernel-process", 'k', "PID", 0, "Process identifier for the kernel, used to retrieve its command " "line, as well as the global up and idle times. " -@@ -239,6 +259,9 @@ netfs_append_args (char **argz, size_t *argz_len) +@@ -239,6 +259,9 @@ netfs_append_args (char **argz, size_t * FOPT (opt_stat_mode, OPT_STAT_MODE, "--stat-mode=%o", opt_stat_mode); @@ -114,11 +114,11 @@ index 87c726ff..857eac4a 100644 + opt_fake_self = OPT_FAKE_SELF; opt_kernel_pid = OPT_KERNEL_PID; opt_anon_owner = OPT_ANON_OWNER; - err = argp_parse (&argp, argc, argv, 0, 0, 0); -diff --git b/procfs/main.h a/procfs/main.h -index 051db953..4e28b7eb 100644 ---- b/procfs/main.h -+++ a/procfs/main.h + +Index: hurd-debian/procfs/main.h +=================================================================== +--- hurd-debian.orig/procfs/main.h ++++ hurd-debian/procfs/main.h @@ -20,5 +20,6 @@ /* Startup options */ extern int opt_clk_tck; @@ -126,10 +126,10 @@ index 051db953..4e28b7eb 100644 +extern pid_t opt_fake_self; extern pid_t opt_kernel_pid; extern uid_t opt_anon_owner; -diff --git b/procfs/rootdir.c a/procfs/rootdir.c -index 4f4a1426..748805e7 100644 ---- b/procfs/rootdir.c -+++ a/procfs/rootdir.c +Index: hurd-debian/procfs/rootdir.c +=================================================================== +--- hurd-debian.orig/procfs/rootdir.c ++++ hurd-debian/procfs/rootdir.c @@ -416,7 +416,19 @@ out: return err; } @@ -151,7 +151,7 @@ index 4f4a1426..748805e7 100644 static struct node *rootdir_mounts_node; static error_t -@@ -682,10 +694,13 @@ rootdir_translated_node_get_translator (void *hook, char **argz, +@@ -682,10 +694,13 @@ rootdir_translated_node_get_translator ( static const struct procfs_dir_entry rootdir_entries[] = { { .name = "self", diff --git a/debian/patches/procfs-compatible b/debian/patches/procfs-compatible index fc50b19..873ef1f 100644 --- a/debian/patches/procfs-compatible +++ b/debian/patches/procfs-compatible @@ -4,8 +4,8 @@ Index: hurd-debian/procfs/main.c =================================================================== --- hurd-debian.orig/procfs/main.c +++ hurd-debian/procfs/main.c -@@ -318,6 +318,9 @@ int main (int argc, char **argv) - opt_fake_self = OPT_FAKE_SELF; +@@ -294,6 +294,9 @@ int main (int argc, char **argv) + opt_stat_mode = OPT_STAT_MODE; opt_kernel_pid = OPT_KERNEL_PID; opt_anon_owner = OPT_ANON_OWNER; + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
