new upstream version

diff --git a/debian/changelog b/debian/changelog
index 11f56dfaf86c0cc7c8905bf1d20ccd1730e29cd3..8cbb1f0a16bca3b8934af5dd84134bce24dad4cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sudo (1.8.3-1) unstable; urgency=low
+
+  * new upstream version, closes: #639391, #639568
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 22 Oct 2011 23:49:16 -0600
+
 sudo (1.8.2-2) unstable; urgency=low
 
   [ Luca Capello ]

diff --git a/debian/patches/fix-segfault-on-start.diff b/debian/patches/fix-segfault-on-start.diff
deleted file mode 100644 (file)
index 7899130..0000000
--- a/debian/patches/fix-segfault-on-start.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Fixes segfault on startup under certain conditions
---- a/src/utmp.c
-+++ b/src/utmp.c
-@@ -96,7 +96,7 @@
-     size_t idlen;
- 
-     /* Skip over "tty" in the id if old entry did too. */
--    if (strncmp(line, "tty", 3) == 0) {
-+    if (old != NULL && strncmp(line, "tty", 3) == 0) {
-       idlen = MIN(sizeof(old->ut_id), 3);
-       if (strncmp(old->ut_id, "tty", idlen) != 0)
-           line += 3;

diff --git a/debian/patches/series b/debian/patches/series
index be55d1e45042cfe27014f77412d8115022858c07..4e3aa5b4cc9e9cec21c18d7c309865b328c69b81 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 typo-in-classic-insults.diff
 paths-in-samples.diff
 upstream-sigbus-fix
-fix-segfault-on-start.diff