Skip to Content.
Sympa Menu

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

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 (79758251ace2b901a05f6e8b584245039d5135cb)
  • Date: Fri, 26 Aug 2022 01:45:30 +0000

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

wm-addons/alock/BUILD | 10 +----
wm-addons/alock/CONFIGURE | 15 +++++--
wm-addons/alock/DEPENDS | 77
++++++++++++++++++++++-----------------
wm-addons/alock/DETAILS | 27 +++++++------
wm-addons/alock/HISTORY | 7 +++
wm-addons/alock/INSTALL | 7 ++-
wm-addons/alock/PRE_BUILD | 6 +++
wm-addons/alock/procps-328.patch | 34 +++++++++++++++++
8 files changed, 123 insertions(+), 60 deletions(-)

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

alock: => 2.5.0

diff --git a/wm-addons/alock/BUILD b/wm-addons/alock/BUILD
index 75c8ed8..5bb5eea 100755
--- a/wm-addons/alock/BUILD
+++ b/wm-addons/alock/BUILD
@@ -1,9 +1,3 @@
-cd $SOURCE_DIRECTORY &&
+OPTS="${ALOCK_OPTS} ${OPTS}" &&

-if [[ "${ALOCK_SHADOW}" = "y" ]]; then
- OPTS="${OPTS} --with-passwd"
-fi &&
-
-OPTS="${OPTS} ${ALOCK_OPTS}" &&
-./configure --prefix $INSTALL_ROOT/usr $OPTS &&
-make
+default_build
diff --git a/wm-addons/alock/CONFIGURE b/wm-addons/alock/CONFIGURE
index f9aea88..25aaa18 100755
--- a/wm-addons/alock/CONFIGURE
+++ b/wm-addons/alock/CONFIGURE
@@ -1,5 +1,10 @@
-message "${PROBLEM_COLOR}Answering yes to 'Use shadow instead of pam'" &&
-message "will install alock suid to root${DEFAULT_COLOR}" &&
-config_query ALOCK_SHADOW "Use Shadow instead of PAM?" n &&
-config_query_option ALOCK_OPTS "Build Hash modules (SHA1, MD5)?" y \
- "--with-hash" "--without-hash"
+# remove obsolete options
+persistent_remove ALOCK_SHADOW &&
+
+config_query_option ALOCK_OPTS "Enable passwd support? (${PROBLEM_COLOR}will
install alock suid to root${QUERY_COLOR})" y \
+ "--enable-passwd" \
+ "--disable-passwd" &&
+
+config_query_option ALOCK_OPTS "Enable debugging support?" n \
+ "--enable-debug" \
+ "--disable-debug"
diff --git a/wm-addons/alock/DEPENDS b/wm-addons/alock/DEPENDS
index 1a87027..30fb07e 100755
--- a/wm-addons/alock/DEPENDS
+++ b/wm-addons/alock/DEPENDS
@@ -1,32 +1,45 @@
-depends xorg-libs &&
-
-optional_depends imlib2 \
- "--with-imlib2" \
- "--without-imlib2" \
- "for imlib2 support" &&
-
-optional_depends libxrender \
- "--with-xrender" \
- "--without-xrender" \
- "for Xrender support" &&
-
-optional_depends libxcursor \
- "--with-xcursor" \
- "--without-xcursor" \
- "for Xcursor support" &&
-
-optional_depends libxpm \
- "--with-xpm" \
- "--without-xpm" \
- "for XPM support" &&
-
-if [[ "${ALOCK_SHADOW}" = "y" ]]; then
- optional_depends shadow \
- "" "" \
- "for Shadow support"
-else
- optional_depends linux-pam \
- "--with-pam" \
- "--without-pam" \
- "for PAM support"
-fi
+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" \
+ "for hash support" &&
+
+optional_depends imlib2 \
+ "--enable-imlib2" \
+ "--disable-imlib2" \
+ "for Imlib2 support" &&
+
+optional_depends libxrender \
+ "--enable-xrender" \
+ "--disable-xrender" \
+ "for Xrender support" &&
+
+optional_depends libxcursor \
+ "--enable-xcursor" \
+ "--disable-xcursor" \
+ "for Xcursor support" &&
+
+optional_depends libxpm \
+ "--enable-xpm" \
+ "--disable-xpm" \
+ "for XPM support" &&
+
+optional_depends linux-pam \
+ "--enable-pam" \
+ "--disable-pam" \
+ "for PAM support" &&
+
+suggest_depends dunst \
+ "--with-dunst" \
+ "--without-dunst" \
+ "for dunst notification daemon integration" &&
+
+suggest_depends xbacklight \
+ "--with-xbacklight" \
+ "--without-xbacklight" \
+ "for xbacklight integration"
diff --git a/wm-addons/alock/DETAILS b/wm-addons/alock/DETAILS
index 6971a53..1ad34de 100755
--- a/wm-addons/alock/DETAILS
+++ b/wm-addons/alock/DETAILS
@@ -1,18 +1,21 @@
SPELL=alock
- VERSION=svn-60
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
-
SOURCE_HASH=sha512:f2470786bad0c3b4c5f88170939e7c672a0872ba1552045c1098e7e519764b83b0bd947b9f2129899b8f5addbf42f8cf9735e64504ee6b5e6d110e2da8832096
+ VERSION=2.5.0
+ 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_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://alock.googlecode.com/";
+ DOCS="LICENSE.txt ${DOCS}"
+ DOC_DIRS=""
+ WEB_SITE=https://github.com/Arkq/alock
LICENSE[0]=BSD
ENTERED=20080112
- SHORT="Locks the local X display until password is entered"
+ SHORT="simple screen lock application for X server"
cat << EOF
-alock locks the current X server until the user enters a password via the
-keyboard. If the authentication was successful the X server is unlocked and
-the user can continue to work.
-
-alock does not provide any fancy animations like xlock or xscreensaver and
-never will. Its just for locking the current X session.
+Alock is a simple screen lock application, which locks the X server until the
+correct password is provided. If the authentication was successful, the X
+server is unlocked and the user can continue to work. When 'alock' is started
+it just waits for the first keypress. This first keypress is to indicate that
+the user now wants to type in the password. Such a behavior might seem to be
+annoying at the first glance, however this approach is chosen due to security
+reasons.
EOF
diff --git a/wm-addons/alock/HISTORY b/wm-addons/alock/HISTORY
index 9751c06..ee5281c 100644
--- a/wm-addons/alock/HISTORY
+++ b/wm-addons/alock/HISTORY
@@ -1,3 +1,10 @@
+2022-08-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.5.0
+ * DEPENDS: added missing dependencies
+ * BUILD, CONFIGURE: rewritten
+ * PRE_BUILD: added, autoreconf, apply patch
+ * procps-328.patch: added, to fix dunst integration with older procps
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/wm-addons/alock/INSTALL b/wm-addons/alock/INSTALL
index 8c2ebae..5dcd365 100755
--- a/wm-addons/alock/INSTALL
+++ b/wm-addons/alock/INSTALL
@@ -1,5 +1,6 @@
default_install &&
-if [[ "${ALOCK_SHADOW}" = "y" ]]; then
- chown -v root:root $INSTALL_ROOT/usr/bin/alock &&
- chmod -v 4111 $INSTALL_ROOT/usr/bin/alock
+
+if list_find "${ALOCK_OPTS}" "--enable-passwd"; then
+ chown -v root:root "${INSTALL_ROOT}/usr/bin/alock" &&
+ chmod -v 4111 "${INSTALL_ROOT}/usr/bin/alock"
fi
diff --git a/wm-addons/alock/PRE_BUILD b/wm-addons/alock/PRE_BUILD
new file mode 100755
index 0000000..067c14e
--- /dev/null
+++ b/wm-addons/alock/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p1 < "${SPELL_DIRECTORY}/procps-328.patch" &&
+
+autoreconf -fi
diff --git a/wm-addons/alock/procps-328.patch
b/wm-addons/alock/procps-328.patch
new file mode 100644
index 0000000..89f1896
--- /dev/null
+++ b/wm-addons/alock/procps-328.patch
@@ -0,0 +1,34 @@
+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 (79758251ace2b901a05f6e8b584245039d5135cb), Vlad Glagolev, 08/25/2022

Archive powered by MHonArc 2.6.24.

Top of Page