Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 utils/calcurse/DETAILS          |    3 
 utils/calcurse/HISTORY          |    5 +
 utils/calcurse/PRE_BUILD        |    4 
 utils/calcurse/repetition.patch |   27 ------
 utils/calcurse/todo.patch       |  162 
----------------------------------------
 5 files changed, 6 insertions(+), 195 deletions(-)

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

    calcurse: => 4.2.1

diff --git a/utils/calcurse/DETAILS b/utils/calcurse/DETAILS
index dc15db4..7d83e8b 100755
--- a/utils/calcurse/DETAILS
+++ b/utils/calcurse/DETAILS
@@ -1,6 +1,5 @@
            SPELL=calcurse
-         VERSION=4.2.0
-      PATCHLEVEL=2
+         VERSION=4.2.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 f048682..16f61e4 100644
--- a/utils/calcurse/HISTORY
+++ b/utils/calcurse/HISTORY
@@ -1,3 +1,8 @@
+2016-10-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 4.2.1
+       * PRE_BUILD: dropped, not needed
+       * repetition.patch, todo.patch: dropped, fixed by upstream
+
 2016-10-14 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: PATCHLEVEL++
        * PRE_BUILD: apply patch
diff --git a/utils/calcurse/PRE_BUILD b/utils/calcurse/PRE_BUILD
deleted file mode 100755
index 152bb3d..0000000
--- a/utils/calcurse/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-patch -p1 < "${SPELL_DIRECTORY}/repetition.patch"
diff --git a/utils/calcurse/repetition.patch b/utils/calcurse/repetition.patch
deleted file mode 100644
index 37c5b1b..0000000
--- a/utils/calcurse/repetition.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-
diff --git a/utils/calcurse/todo.patch b/utils/calcurse/todo.patch
deleted file mode 100644
index 5534167..0000000
--- a/utils/calcurse/todo.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 39d30073180aeed73ce26ca2a20be19d643e3160 Mon Sep 17 00:00:00 2001
-From: Lukas Fleischer <lfleischer AT calcurse.org>
-Date: Fri, 14 Oct 2016 07:44:37 +0200
-Subject: Prevent segfault when all todo items are hidden
-
-To prevent from illegal memory access, we checked whether the list of
-todo items is empty before performing an interactive todo item action
-such as flagging or removal. However, since 1a4bf2b (Add a "hide
-completed" view to the todo panel, 2016-01-17), it is possible to hide
-completed items from the todo panel. Thus, it may occur that the todo
-list box is empty while the list of todo items is not.
-
-To detect such situations as well, teach todo_get_item() to return NULL
-if the requested item does not exist. Then, instead of checking whether
-the todo item list is non-empty, make sure that the item returned by
-todo_get_item() is non-NULL when performing an action.
-
-Reported-by: Vlad Glagolev <scm AT vaygr.net>
-Signed-off-by: Lukas Fleischer <lfleischer AT calcurse.org>
----
- src/todo.c    |  3 +++
- src/ui-todo.c | 46 +++++++++++++++++++++++++---------------------
- 2 files changed, 28 insertions(+), 21 deletions(-)
-
-diff --git a/src/todo.c b/src/todo.c
-index 9a6f72f..8027803 100644
---- a/src/todo.c
-+++ b/src/todo.c
-@@ -59,6 +59,9 @@ struct todo *todo_get_item(int item_number, int 
skip_completed)
-       else
-               i = LLIST_NTH(&todolist, item_number);
- 
-+      if (!i)
-+              return NULL;
-+
-       return LLIST_GET_DATA(i);
- }
- 
-diff --git a/src/ui-todo.c b/src/ui-todo.c
-index 8eaef08..50bb30d 100644
---- a/src/ui-todo.c
-+++ b/src/ui-todo.c
-@@ -87,15 +87,14 @@ void ui_todo_delete(void)
-       const int nb_erase_choice = 2;
-       int answer;
- 
--      if (!LLIST_FIRST(&todolist) ||
--          (conf.confirm_delete
--           && (status_ask_bool(del_todo_str) != 1))) {
-+      struct todo *item = ui_todo_selitem();
-+
-+      if (!item || (conf.confirm_delete &&
-+                    (status_ask_bool(del_todo_str) != 1))) {
-               wins_erase_status_bar();
-               return;
-       }
- 
--      struct todo *item = ui_todo_selitem();
--
-       if (item->note)
-               answer = status_ask_choice(erase_warning, erase_choice,
-                                          nb_erase_choice);
-@@ -121,12 +120,12 @@ void ui_todo_delete(void)
- /* Edit the description of an already existing todo item. */
- void ui_todo_edit(void)
- {
--      if (!LLIST_FIRST(&todolist))
--              return;
--
-       struct todo *item = ui_todo_selitem();
-       const char *mesg = _("Enter the new TODO description:");
- 
-+      if (!item)
-+              return;
-+
-       status_mesg(mesg, "");
-       updatestring(win[STA].p, &item->mesg, 0, 1);
-       todo_resort(item);
-@@ -144,11 +143,11 @@ void ui_todo_pipe(void)
-       int pid;
-       FILE *fpout;
- 
--      if (!LLIST_FIRST(&todolist))
--              return;
--
-       struct todo *item = ui_todo_selitem();
- 
-+      if (!item)
-+              return;
-+
-       status_mesg(_("Pipe item to external command:"), "");
-       if (getstring(win[STA].p, cmd, BUFSIZ, 0, 1) != GETSTRING_VALID)
-               return;
-@@ -284,10 +283,11 @@ void ui_todo_update_panel(int which_pan)
- /* Change an item priority by pressing '+' or '-' inside TODO panel. */
- void ui_todo_chg_priority(int diff)
- {
--      if (!LLIST_FIRST(&todolist))
-+      struct todo *item = ui_todo_selitem();
-+
-+      if (!item)
-               return;
- 
--      struct todo *item = ui_todo_selitem();
-       int id = item->id + diff;
-       struct todo *item_new;
- 
-@@ -304,19 +304,21 @@ void ui_todo_chg_priority(int diff)
- 
- void ui_todo_popup_item(void)
- {
--      if (!LLIST_FIRST(&todolist))
-+      struct todo *item = ui_todo_selitem();
-+
-+      if (!item)
-               return;
- 
--      struct todo *item = ui_todo_selitem();
-       item_in_popup(NULL, NULL, item->mesg, _("TODO:"));
- }
- 
- void ui_todo_flag(void)
- {
--      if (!LLIST_FIRST(&todolist))
-+      struct todo *item = ui_todo_selitem();
-+
-+      if (!item)
-               return;
- 
--      struct todo *item = ui_todo_selitem();
-       todo_flag(item);
-       ui_todo_load_items();
-       io_set_modified();
-@@ -325,19 +327,21 @@ void ui_todo_flag(void)
- 
- void ui_todo_view_note(void)
- {
--      if (!LLIST_FIRST(&todolist))
-+      struct todo *item = ui_todo_selitem();
-+
-+      if (!item)
-               return;
- 
--      struct todo *item = ui_todo_selitem();
-       todo_view_note(item, conf.pager);
- }
- 
- void ui_todo_edit_note(void)
- {
--      if (!LLIST_FIRST(&todolist))
-+      struct todo *item = ui_todo_selitem();
-+
-+      if (!item)
-               return;
- 
--      struct todo *item = ui_todo_selitem();
-       todo_edit_note(item, conf.editor);
-       io_set_modified();
- }
--- 
-cgit v0.12-53-gcebf
-