Skip to Content.
Sympa Menu

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

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 (3ade6caed0f9cc1c4c8d166565dba265805ff54a)
  • Date: Thu, 1 Sep 2022 20:37:42 +0000

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

wm-addons/alock/DEPENDS | 2 --
wm-addons/alock/DETAILS | 4 ++--
wm-addons/alock/HISTORY | 5 +++++
wm-addons/alock/PRE_BUILD | 4 ----
wm-addons/alock/crypt-h.patch | 21 ---------------------
wm-addons/alock/crypt.patch | 29 -----------------------------
wm-addons/alock/procps-328.patch | 34 ----------------------------------
7 files changed, 7 insertions(+), 92 deletions(-)

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

alock: => 2.5.1

diff --git a/wm-addons/alock/DEPENDS b/wm-addons/alock/DEPENDS
index 30fb07e..0f3e7af 100755
--- a/wm-addons/alock/DEPENDS
+++ b/wm-addons/alock/DEPENDS
@@ -2,8 +2,6 @@ depends libx11 &&

optional_depends libxext "" "" "for feedback indicator" &&

-optional_depends libxxf86misc "" "" "to be able to disable Xorg hotkeys to
remove grabs" &&
-
optional_depends libgcrypt \
"--enable-hash" \
"--disable-hash" \
diff --git a/wm-addons/alock/DETAILS b/wm-addons/alock/DETAILS
index b28af85..c0915c7 100755
--- a/wm-addons/alock/DETAILS
+++ b/wm-addons/alock/DETAILS
@@ -1,9 +1,9 @@
SPELL=alock
- VERSION=2.5.0
+ VERSION=2.5.1
SECURITY_PATCH=1
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/Arkq/${SPELL}/archive/refs/tags/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:52e6776fa4a15dc3971bbe394e5ad762e600d4c1789aa05609166963497245648d5dcfc9e874e8b7e62bc7979d7948e8092acdf433bfc575b02be03047fb1c9d
+
SOURCE_HASH=sha512:e03753ba331c9c8fda25bae4ca29683d9cf89aa0f6c58de3126dea654d5e68ceedbddff87dc94f47b99021c4d01067c887c94e4e5514b481ef38d08f95fc76b9
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOCS="LICENSE.txt ${DOCS}"
DOC_DIRS=""
diff --git a/wm-addons/alock/HISTORY b/wm-addons/alock/HISTORY
index 3e42b13..0384196 100644
--- a/wm-addons/alock/HISTORY
+++ b/wm-addons/alock/HISTORY
@@ -1,3 +1,8 @@
+2022-09-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.5.1
+ * DEPENDS: dropped obsolete dependency
+ * *.patch: removed, no longer needed
+
2022-08-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH=1, correct license to MIT
* PRE_BUILD: apply patches
diff --git a/wm-addons/alock/PRE_BUILD b/wm-addons/alock/PRE_BUILD
index 15fe54b..90b3299 100755
--- a/wm-addons/alock/PRE_BUILD
+++ b/wm-addons/alock/PRE_BUILD
@@ -1,8 +1,4 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-patch -p1 < "${SPELL_DIRECTORY}/crypt.patch" &&
-patch -p1 < "${SPELL_DIRECTORY}/crypt-h.patch" &&
-patch -p1 < "${SPELL_DIRECTORY}/procps-328.patch" &&
-
autoreconf -fi
diff --git a/wm-addons/alock/crypt-h.patch b/wm-addons/alock/crypt-h.patch
deleted file mode 100644
index ae73f3b..0000000
--- a/wm-addons/alock/crypt-h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 5770e518db21e9e1d74cd04f8d6dc26b7695656b Mon Sep 17 00:00:00 2001
-From: nic <nic AT boet.cc>
-Date: Wed, 7 Oct 2020 15:14:42 -0500
-Subject: [PATCH] implicit declaration of function crypt
-
----
- src/auth_passwd.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/auth_passwd.c b/src/auth_passwd.c
-index 7b2fe21..0af2ded 100644
---- a/src/auth_passwd.c
-+++ b/src/auth_passwd.c
-@@ -17,6 +17,7 @@
- #include "alock.h"
-
- #include <string.h>
-+#include <crypt.h>
- #include <unistd.h>
- #include <errno.h>
- #include <grp.h>
diff --git a/wm-addons/alock/crypt.patch b/wm-addons/alock/crypt.patch
deleted file mode 100644
index e9047fd..0000000
--- a/wm-addons/alock/crypt.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b22a460def5f066227ec1486ffcf642bc1dd3315 Mon Sep 17 00:00:00 2001
-From: Vlad Glagolev <scm AT vaygr.net>
-Date: Sat, 27 Aug 2022 23:06:05 +0000
-Subject: [PATCH] Check crypt() value to avoid possible NULL ptr dereference
-
----
- src/auth_passwd.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/auth_passwd.c b/src/auth_passwd.c
-index 0af2ded..7c4dd43 100644
---- a/src/auth_passwd.c
-+++ b/src/auth_passwd.c
-@@ -65,13 +65,14 @@ static int module_init(Display *display) {
- }
-
- static int module_authenticate(const char *pass) {
-+ char *cpw;
-
- if (pass == NULL || pwd_entry == NULL)
- return -1;
-
- /* Simpler, and should work with crypt() algorithms using longer
- * salt strings (like the md5-based one on freebsd). --marekm */
-- return strcmp(crypt(pass, pwd_entry->pw_passwd), pwd_entry->pw_passwd);
-+ return !(cpw = crypt(pass, pwd_entry->pw_passwd)) ||
strcmp(pwd_entry->pw_passwd, (const char *)cpw) != 0;
- }
-
-
diff --git a/wm-addons/alock/procps-328.patch
b/wm-addons/alock/procps-328.patch
deleted file mode 100644
index 89f1896..0000000
--- a/wm-addons/alock/procps-328.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e4c3ed6d7be482c1885b189e9639efd91328d502 Mon Sep 17 00:00:00 2001
-From: Vlad Glagolev <scm AT vaygr.net>
-Date: Fri, 26 Aug 2022 00:04:59 +0000
-Subject: [PATCH] Fix pkill for older procps
-
----
- src/main.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index ad2fdab..285becc 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -572,7 +572,7 @@ int main(int argc, char **argv) {
-
- #if WITH_DUNST
- /* pause notification daemon */
-- system("pkill -x -SIGUSR1 dunst");
-+ system("pkill -SIGUSR1 -x dunst");
- #endif
-
- { /* try to initialize selected modules */
-@@ -664,7 +664,7 @@ return_success:
-
- #if WITH_DUNST
- /* resume notification daemon */
-- system("pkill -x -SIGUSR2 dunst");
-+ system("pkill -SIGUSR2 -x dunst");
- #endif
-
- return retval;
---
-2.25.1
-



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3ade6caed0f9cc1c4c8d166565dba265805ff54a), Vlad Glagolev, 09/01/2022

Archive powered by MHonArc 2.6.24.

Top of Page