From: Ian Beckwith <ianb@erislabs.net>
Date: Sat, 28 Jan 2012 22:54:26 +0000 (+0000)
Subject: 030_fix-if-else: remove patch, taken upstream
X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=refs%2Fheads%2Fpatches%2F030_fix-if-else

030_fix-if-else: remove patch, taken upstream
---

diff --git a/debian/patches/030_fix-if-else.patch b/debian/patches/030_fix-if-else.patch
deleted file mode 100644
index 9c12683..0000000
--- a/debian/patches/030_fix-if-else.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Backported fix from ckdaily snapshot to fix parsing of if/else constructs
-See #323510.
---- ckermit-211.orig/ckuus6.c
-+++ ckermit-211/ckuus6.c
-@@ -6607,7 +6607,7 @@
-     if (!iftest[cmdlvl]) {              /* If IF was false do ELSE part */
-         if (maclvl > -1 || tlevel > -1) { /* In macro or command file */
-             debug(F100,"doelse pushing","",0);
--#ifdef COMMENT
-+#ifndef COMMENT
-             pushcmd(NULL);              /* save rest of command. */
- #else
-             /* This fixes certain obscure problems */
---- ckermit-211.orig/ckuusr.c
-+++ ckermit-211/ckuusr.c
-@@ -7983,8 +7983,7 @@
- 	    line[k++] = SP;
- 	    line[k] = NUL;
- 	    debug(F111,"XXMACRO A",line,k);
--	    /* Defer evaluation of variables until the commands are exec'd */
--	    if ((y = cmtxt("Braced list of commands","",&s,NULL)) < 0)
-+	    if ((y = cmtxt("Braced list of commands","",&s,xxstring)) < 0)
- 	      return(y);
- 	    k = ckstrncpy(line+k,s,LINBUFSIZ-k);
- 	    debug(F111,"XXMACRO B",line,k);
diff --git a/debian/patches/series b/debian/patches/series
index f300933..e7b18b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-030_fix-if-else.patch
 040_pam-password-prompting.patch
 050_ck_patch.patch
 060_speeling.patch