Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 crypto/seahorse/DETAILS                                                      
 |    1 
 crypto/seahorse/HISTORY                                                      
 |    5 +
 crypto/seahorse/PRE_BUILD                                                    
 |    3 
 
crypto/seahorse/patches/0001-Fix-segfault-when-built-with-ldap-disabled.patch 
|   31 ++++++++++
 4 files changed, 40 insertions(+)

New commits:
commit e666b6f4dc639887dc645ae12f7eaebe89f8e9ef
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    seahorse: Fix segfault with ldap disabled

diff --git a/crypto/seahorse/DETAILS b/crypto/seahorse/DETAILS
index 73cd33f..0d53940 100755
--- a/crypto/seahorse/DETAILS
+++ b/crypto/seahorse/DETAILS
@@ -1,6 +1,7 @@
 . "$GRIMOIRE/MESON_FUNCTIONS"
            SPELL=seahorse
          VERSION=40.0
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.xz
      
SOURCE_HASH=sha512:c389420fb1b3d54c1b9a1004f2c8b9e50118a1ffcba02aa8cfdd2223d1bc117368c9a1ad875c59abd319d95eb93ec3de2e9cedadbfc1d6a0997d613c8256c60b
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/crypto/seahorse/HISTORY b/crypto/seahorse/HISTORY
index 81ccf5b..4e5fd46 100644
--- a/crypto/seahorse/HISTORY
+++ b/crypto/seahorse/HISTORY
@@ -1,3 +1,8 @@
+2021-05-17 Ismael Luceno <ismael AT sourcemage.org>
+       * patches/0001-Fix-segfault-when-built-with-ldap-disabled.patch,
+         PRE_BUILD: added patch to fix null dereference with ldap disabled
+       * DETAILS: PATCHLEVEL++
+
 2021-05-16 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS, PREPARE: removed SEAHORSE_DEVEL
        * CONFIGURE: added, project switched to meson
diff --git a/crypto/seahorse/PRE_BUILD b/crypto/seahorse/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/crypto/seahorse/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git 
a/crypto/seahorse/patches/0001-Fix-segfault-when-built-with-ldap-disabled.patch
 
b/crypto/seahorse/patches/0001-Fix-segfault-when-built-with-ldap-disabled.patch
new file mode 100644
index 0000000..8da93d0
--- /dev/null
+++ 
b/crypto/seahorse/patches/0001-Fix-segfault-when-built-with-ldap-disabled.patch
@@ -0,0 +1,31 @@
+From 6fc0e3e321cdf0bf7e047234561fe8a8084a93f9 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111 AT mengyan1223.wang>
+Date: Wed, 14 Apr 2021 23:18:06 +0800
+Subject: [PATCH] Fix segfault when built with ldap disabled
+
+Fixes #321.
+
+Upstream-Status: Backport
+---
+ pgp/seahorse-pgp-backend.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c
+index 25febf31..8c10e7e3 100644
+--- a/pgp/seahorse-pgp-backend.c
++++ b/pgp/seahorse-pgp-backend.c
+@@ -445,7 +445,10 @@ seahorse_pgp_backend_add_remote (SeahorsePgpBackend   
*self,
+         /* Don't persist, so just immediately create a ServerSource */
+         g_autoptr(SeahorseServerSource) ssrc = NULL;
+         ssrc = seahorse_server_category_create_server (uri);
+-        g_list_store_append (G_LIST_STORE (self->remotes), ssrc);
++        /* If the scheme of the uri is ldap, but ldap support is disabled
++         * in the build, ssrc will be NULL. */
++        if (ssrc)
++            g_list_store_append (G_LIST_STORE (self->remotes), ssrc);
+     }
+ }
+ 
+-- 
+GitLab
+