From 6f8061605d68f66ea9e27d5245e0340d50deede3 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 5 Oct 2013 13:30:34 +0200 Subject: patches/proc_set_init_task.patch: Fix kernel pid in procfs too. --- debian/changelog | 6 ++++++ debian/patches/proc_set_init_task.patch | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ad9498cd..d5259a5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hurd (1:0.5.git20130928-2) UNRELEASED; urgency=low + + * patches/proc_set_init_task.patch: Fix kernel pid in procfs too. + + -- Samuel Thibault Sat, 05 Oct 2013 13:30:05 +0200 + hurd (1:0.5.git20130928-1) unstable; urgency=low * New upstream release, yay! diff --git a/debian/patches/proc_set_init_task.patch b/debian/patches/proc_set_init_task.patch index 0f9397b2..84383fe1 100644 --- a/debian/patches/proc_set_init_task.patch +++ b/debian/patches/proc_set_init_task.patch @@ -276,3 +276,25 @@ index 80f8397..b544b8d 100644 struct proc *allocate_proc (task_t); void proc_death_notify (struct proc *); void complete_proc (struct proc *, pid_t); +diff --git a/procfs/main.c b/procfs/main.c +index 54e9682..8727f86 100644 +--- a/procfs/main.c ++++ b/procfs/main.c +@@ -42,7 +42,7 @@ uid_t opt_anon_owner; + #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 3 + #define OPT_ANON_OWNER 0 + + #define NODEV_KEY -1 /* <= 0, so no short option. */ +@@ -153,7 +153,7 @@ struct argp_option common_options[] = { + { "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. " +- "(default: 2)" }, ++ "(default: 3)" }, + { "compatible", 'c', NULL, 0, + "Try to be compatible with the Linux procps utilities. " + "Currently equivalent to -h 100 -s 0444 -S 1." }, -- cgit v1.2.3 From e87bdc6cdd7d1a5253d17f94564d750431b0b720 Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Sun, 13 Oct 2013 18:00:13 +0200 Subject: hurd.hurd-console.init: Clean up pid if any. --- debian/changelog | 4 ++++ debian/hurd.hurd-console.init | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d5259a5a..82e439b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ hurd (1:0.5.git20130928-2) UNRELEASED; urgency=low + [ Samuel Thibault ] * patches/proc_set_init_task.patch: Fix kernel pid in procfs too. + [ Justus Winter ] + * hurd.hurd-console.init: Clean up pid if any. + -- Samuel Thibault Sat, 05 Oct 2013 13:30:05 +0200 hurd (1:0.5.git20130928-1) unstable; urgency=low diff --git a/debian/hurd.hurd-console.init b/debian/hurd.hurd-console.init index a14b0a5c..cac6fc2d 100644 --- a/debian/hurd.hurd-console.init +++ b/debian/hurd.hurd-console.init @@ -71,8 +71,9 @@ do_stop() RETVAL="$?" [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - #rm -f $PIDFILE + # The hurd-console usually deletes its pidfile when it + # exits. However, if it exits uncleanly, it is left behind. + rm -f $PIDFILE return "$RETVAL" } -- cgit v1.2.3 From fd94033385441884a1602c2fa3b5597d5d8245d5 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 28 Oct 2013 09:00:20 +0100 Subject: Remove dpkg | install-info dependency. --- debian/changelog | 2 ++ debian/control | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 82e439b0..3f841322 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ hurd (1:0.5.git20130928-2) UNRELEASED; urgency=low [ Samuel Thibault ] * patches/proc_set_init_task.patch: Fix kernel pid in procfs too. + * Remove dpkg | install-info dependency. + * Bump Standards-Version to 3.9.5. [ Justus Winter ] * hurd.hurd-console.init: Clean up pid if any. diff --git a/debian/control b/debian/control index 86baddf2..82a9bc88 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,10 @@ Source: hurd Section: admin Priority: required Maintainer: GNU Hurd Maintainers -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526), libc0.3-dev (>= 2.17-93~), texinfo, libncursesw5-dev, - debhelper (>= 7.0.50~), gcc-4.7, dpkg (>= 1.15.4) | install-info, autoconf, dh-autoreconf, + debhelper (>= 7.0.50~), gcc-4.7, autoconf, dh-autoreconf, libparted-dev, libpciaccess-dev, libx11-dev, x11proto-core-dev, pkg-config, xkb-data, gawk, flex, bison, autotools-dev, libdaemon-dev, libpcap0.8-dev Uploaders: Michael Banck , -- cgit v1.2.3