From 0fa5512e7d7c0c94136c5a33ef417031e52bce4e Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Wed, 16 May 2012 11:28:45 -0600
Subject: [PATCH] patch to fix segfaults on hurd

---
 debian/changelog                |  1 +
 debian/patches/skip-noedit.diff | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 debian/patches/skip-noedit.diff

diff --git a/debian/changelog b/debian/changelog
index a038598..fe7d070 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sudo (1.8.5-1) UNRELEASED; urgency=low
 
   * new upstream version
   * patch to use flock on hurd, run autoconf in rules, closes: #655883
+  * patch to avoid calling unlink with null pointer on hurd, closes: #655948
   * patch to actually use hardening build flags, closes: #655417
   * fix sudo-ldap.postinst syntax issue, closes: #669576
 
diff --git a/debian/patches/skip-noedit.diff b/debian/patches/skip-noedit.diff
new file mode 100644
index 0000000..569bc13
--- /dev/null
+++ b/debian/patches/skip-noedit.diff
@@ -0,0 +1,12 @@
+Skip installing/unlinking files without doedit set
+--- a/plugins/sudoers/visudo.c
++++ b/plugins/sudoers/visudo.c
+@@ -247,6 +247,8 @@
+ 
+     /* Install the sudoers temp files. */
+     tq_foreach_fwd(&sudoerslist, sp) {
++	if (!sp->doedit)
++	    continue;
+ 	if (!sp->modified)
+ 	    (void) unlink(sp->tpath);
+ 	else
-- 
2.30.2