Remove init_fix.patch, merged upstream

3 files changed, 0 insertions, 52 deletions

diff --git a/debian/changelog b/debian/changelog
index 3aafdba3..4a5f38b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,7 +51,6 @@ hurd (20100802-1) unstable; urgency=low
   * debian/rules: Remove debian/ChangeLog generation.
   * debian/local/runsystem: Pass -g option to the console to maximize glyph
     usage for chinese.
-  * debian/patches/init_fix.patch: New upstream patch to fix halt/reboot.
   * debian/hurd.lintian-overrides: New overrides to announce which servers are
     supposed to be statically linked, and accept hurd to be essential.
   * debian/hurd-udeb.lintian-overrides: New overrides to validate
diff --git a/debian/patches/init_fix.patch b/debian/patches/init_fix.patch
deleted file mode 100644
index 8a7f27da..00000000
--- a/debian/patches/init_fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit a6bb3e62109c72ec912d264418c5e9b95c780dbf
-Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date:   Mon Aug 2 00:29:57 2010 +0200
-
-    Partially revert 8451b436 to fix halt/reboot
-    
-    init/init.c (S_msg_sig_post_untraced): Ignore result of
-    msg_sig_post_untraced_reply.
-    (S_msg_sig_post): Likewise.
-
-diff --git a/init/init.c b/init/init.c
-index 4645729..d66bee0 100644
---- a/init/init.c
-+++ b/init/init.c
-@@ -1353,16 +1353,12 @@ S_msg_sig_post_untraced (mach_port_t msgport,
- 			 mach_port_t reply, mach_msg_type_name_t reply_type,
- 			 int signo, natural_t sigcode, mach_port_t refport)
- {
--  kern_return_t err;
--
-   if (refport != mach_task_self ())
-     return EPERM;
-   mach_port_deallocate (mach_task_self (), refport);
- 
-   /* Reply immediately */
--  err = msg_sig_post_untraced_reply (reply, reply_type, 0);
--  if (err)
--    return err;
-+  msg_sig_post_untraced_reply (reply, reply_type, 0);
- 
-   process_signal (signo);
-   return MIG_NO_REPLY;
-@@ -1373,16 +1369,12 @@ S_msg_sig_post (mach_port_t msgport,
- 		mach_port_t reply, mach_msg_type_name_t reply_type,
- 		int signo, natural_t sigcode, mach_port_t refport)
- {
--  kern_return_t err;
--
-   if (refport != mach_task_self ())
-     return EPERM;
-   mach_port_deallocate (mach_task_self (), refport);
- 
-   /* Reply immediately */
--  err = msg_sig_post_reply (reply, reply_type, 0);
--  if (err)
--    return err;
-+  msg_sig_post_reply (reply, reply_type, 0);
- 
-   process_signal (signo);
-   return MIG_NO_REPLY;
diff --git a/debian/patches/series b/debian/patches/series
index 630ec8fc..9d9109f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,4 +25,3 @@ libpthread_procfs.patch
 makedev_keep_options.patch
 makedev_parted_store.patch
 console_ignore_bdf_err.patch
-init_fix.patch