Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6a7ef61f1913cbd3b4d8b88407ab6ed84fdf995d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6a7ef61f1913cbd3b4d8b88407ab6ed84fdf995d)
  • Date: Wed, 12 Oct 2016 20:13:05 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

utils/calcurse/DETAILS | 1 +
utils/calcurse/HISTORY | 5 ++++-
utils/calcurse/PRE_BUILD | 4 ++++
utils/calcurse/repetition.patch | 27 +++++++++++++++++++++++++++
4 files changed, 36 insertions(+), 1 deletion(-)

New commits:
commit 6a7ef61f1913cbd3b4d8b88407ab6ed84fdf995d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

calcurse: fixed crash when editing a repetitive task

diff --git a/utils/calcurse/DETAILS b/utils/calcurse/DETAILS
index ced05da..b2148b9 100755
--- a/utils/calcurse/DETAILS
+++ b/utils/calcurse/DETAILS
@@ -1,5 +1,6 @@
SPELL=calcurse
VERSION=4.2.0
+ PATCHLEVEL=1
SOURCE="calcurse-${VERSION}.tar.gz"
SOURCE2=$SOURCE.asc
SOURCE_URL[0]="http://calcurse.org/files/$SOURCE";
diff --git a/utils/calcurse/HISTORY b/utils/calcurse/HISTORY
index 47d1847..750f362 100644
--- a/utils/calcurse/HISTORY
+++ b/utils/calcurse/HISTORY
@@ -1,8 +1,11 @@
2016-10-12 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 4.2.0; corrected license; use calcurse.gpg
+ * DETAILS: updated spell to 4.2.0; corrected license; use
calcurse.gpg;
+ PATCHLEVEL=1
* DEPENDS: gettext is optional; added asciidoc optional dep
* calcurse.gpg: added, 9326B440 public key (Lukas Fleischer
<lfleischer AT lfos.de>)
+ * PRE_BUILD: added, to apply patch
+ * repetition.patch: added, to fix SIGABRT on a repetitive appt edit
* 34876C5B.gpg: dropped, deprecated key

2012-02-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
diff --git a/utils/calcurse/PRE_BUILD b/utils/calcurse/PRE_BUILD
new file mode 100755
index 0000000..152bb3d
--- /dev/null
+++ b/utils/calcurse/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p1 < "${SPELL_DIRECTORY}/repetition.patch"
diff --git a/utils/calcurse/repetition.patch b/utils/calcurse/repetition.patch
new file mode 100644
index 0000000..37c5b1b
--- /dev/null
+++ b/utils/calcurse/repetition.patch
@@ -0,0 +1,27 @@
+From b4950990c106ef0faeca660d59bfd1e8f0b091cc Mon Sep 17 00:00:00 2001
+From: Vlad Glagolev <scm AT vaygr.net>
+Date: Wed, 12 Oct 2016 15:57:12 -0400
+Subject: [PATCH] Prevent free-before-init of timstr to fix crash when passing
+ empty repetition value on appt edit.
+
+Signed-off-by: Vlad Glagolev <scm AT vaygr.net>
+---
+ src/ui-day.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ui-day.c b/src/ui-day.c
+index d7112af..64321a3 100644
+--- a/src/ui-day.c
++++ b/src/ui-day.c
+@@ -177,7 +177,7 @@ static void update_rept(struct rpt **rpt, const long
start)
+ {
+ int newtype, newfreq;
+ time_t newuntil;
+- char *freqstr = NULL, *timstr, *outstr;
++ char *freqstr = NULL, *timstr = NULL, *outstr;
+ const char *msg_rpt_prefix = _("Enter the new repetition type:");
+ const char *msg_rpt_daily = _("(d)aily");
+ const char *msg_rpt_weekly = _("(w)eekly");
+--
+2.7.4
+



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6a7ef61f1913cbd3b4d8b88407ab6ed84fdf995d), Vlad Glagolev, 10/12/2016

Archive powered by MHonArc 2.6.24.

Top of Page