diff options
Diffstat (limited to 'debian/patches/procfs-0007-procfs-provide-magic-retry-response-for-proc-self.patch')
| -rw-r--r-- | debian/patches/procfs-0007-procfs-provide-magic-retry-response-for-proc-self.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/debian/patches/procfs-0007-procfs-provide-magic-retry-response-for-proc-self.patch b/debian/patches/procfs-0007-procfs-provide-magic-retry-response-for-proc-self.patch index 74b0bc97..abfa8136 100644 --- a/debian/patches/procfs-0007-procfs-provide-magic-retry-response-for-proc-self.patch +++ b/debian/patches/procfs-0007-procfs-provide-magic-retry-response-for-proc-self.patch @@ -1,4 +1,4 @@ -From bb245976b92068ca5239b5b860aa4dbfd70b44a5 Mon Sep 17 00:00:00 2001 +From b1faf7142f061ae981f45b23d0f9731b881a622b Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Sun, 21 Sep 2014 12:03:47 +0200 Subject: [PATCH 7/7] procfs: provide magic retry response for /proc/self @@ -32,10 +32,10 @@ index 4341177..f22816d 100644 }; typedef enum retry_type retry_type; diff --git a/hurd/paths.h b/hurd/paths.h -index 92875b2..32bc2b4 100644 +index a13ba9b..e1b00e9 100644 --- a/hurd/paths.h +++ b/hurd/paths.h -@@ -53,6 +53,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +@@ -54,6 +54,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define _HURD_IFSOCK _HURD "ifsock" /* S_IFSOCK */ /* Symbolic names for all non-essential translators. */ @@ -44,10 +44,10 @@ index 92875b2..32bc2b4 100644 #endif /* hurd/paths.h */ diff --git a/procfs/main.c b/procfs/main.c -index 54e9682..1afc923 100644 +index 36a2d25..cec2d72 100644 --- a/procfs/main.c +++ b/procfs/main.c -@@ -34,14 +34,12 @@ +@@ -35,14 +35,12 @@ /* Command-line options */ int opt_clk_tck; mode_t opt_stat_mode; @@ -59,10 +59,10 @@ index 54e9682..1afc923 100644 #define OPT_CLK_TCK sysconf(_SC_CLK_TCK) #define OPT_STAT_MODE 0400 -#define OPT_FAKE_SELF -1 - #define OPT_KERNEL_PID 2 + #define OPT_KERNEL_PID HURD_PID_KERNEL #define OPT_ANON_OWNER 0 -@@ -74,19 +72,6 @@ argp_parser (int key, char *arg, struct argp_state *state) +@@ -75,19 +73,6 @@ argp_parser (int key, char *arg, struct argp_state *state) opt_stat_mode = v; break; @@ -82,7 +82,7 @@ index 54e9682..1afc923 100644 case 'k': v = strtol (arg, &endp, 0); if (*endp || ! *arg || (signed) opt_kernel_pid < 0) -@@ -98,7 +83,6 @@ argp_parser (int key, char *arg, struct argp_state *state) +@@ -99,7 +84,6 @@ argp_parser (int key, char *arg, struct argp_state *state) case 'c': opt_clk_tck = 100; opt_stat_mode = 0444; @@ -90,10 +90,10 @@ index 54e9682..1afc923 100644 break; case 'a': -@@ -146,10 +130,6 @@ struct argp_option common_options[] = { +@@ -149,10 +133,6 @@ struct argp_option common_options[] = { "You can use this option to override its mode to be more permissive " "for compatibility purposes. " - "(default: 0400)" }, + "(default: " STR (OPT_STAT_MODE) ")" }, - { "fake-self", 'S', "PID", OPTION_ARG_OPTIONAL, - "Provide a fake \"self\" symlink to the given PID, for compatibility " - "purposes. If PID is omitted, \"self\" will point to init. " @@ -101,7 +101,7 @@ index 54e9682..1afc923 100644 { "kernel-process", 'k', "PID", 0, "Process identifier for the kernel, used to retreive its command " "line, as well as the global up and idle times. " -@@ -243,9 +223,6 @@ netfs_append_args (char **argz, size_t *argz_len) +@@ -248,9 +228,6 @@ netfs_append_args (char **argz, size_t *argz_len) FOPT (opt_stat_mode, OPT_STAT_MODE, "--stat-mode=%o", opt_stat_mode); @@ -111,7 +111,7 @@ index 54e9682..1afc923 100644 FOPT (opt_anon_owner, OPT_ANON_OWNER, "--anonymous-owner=%d", opt_anon_owner); -@@ -287,7 +264,6 @@ int main (int argc, char **argv) +@@ -292,7 +269,6 @@ int main (int argc, char **argv) opt_clk_tck = OPT_CLK_TCK; opt_stat_mode = OPT_STAT_MODE; |