Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd

Conflicts:
	debian/changelog

1 files changed, 0 insertions, 48 deletions

diff --git a/debian/patches/procfs-default.patch b/debian/patches/procfs-default.patch
deleted file mode 100644
index 023ab9d5..00000000
--- a/debian/patches/procfs-default.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Define a macro for the default value of each command line
-parameter. This allows one to generate a minimal response to
-fsys_get_options requests.
-
-* procfs/main.c: New macro definitions for default values.
----
- procfs/main.c |   17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/procfs/main.c b/procfs/main.c
-index ba74e87..3e53307 100644
---- a/procfs/main.c
-+++ b/procfs/main.c
-@@ -37,6 +37,13 @@ pid_t opt_fake_self;
- #define NOEXEC_KEY -2 /* Likewise. */
- #define NOSUID_KEY -3 /* Likewise. */
- 
-+/* Default values */
-+#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_ANON_OWNER 0
-+
- static error_t
- argp_parser (int key, char *arg, struct argp_state *state)
- {
-@@ -211,11 +218,11 @@ int main (int argc, char **argv)
-   mach_port_t bootstrap;
-   error_t err;
- 
--  opt_clk_tck = sysconf(_SC_CLK_TCK);
--  opt_stat_mode = 0400;
--  opt_fake_self = -1;
--  opt_kernel_pid = 2;
--  opt_anon_owner = 0;
-+  opt_clk_tck = OPT_CLK_TCK;
-+  opt_stat_mode = OPT_STAT_MODE;
-+  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);
-   if (err)
-     error (1, err, "Could not parse command line");
--- 
-1.7.10.4
-
-