Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9bb81a16771cc53c1ff82160b8fb7de1fd5a4ea9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9bb81a16771cc53c1ff82160b8fb7de1fd5a4ea9)
  • Date: Tue, 7 Mar 2023 10:54:15 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

x11/xscreensaver/HISTORY | 5 ++++-
x11/xscreensaver/PRE_BUILD | 19 +++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 9bb81a16771cc53c1ff82160b8fb7de1fd5a4ea9
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xscreensaver: fix build for non-PAM systems

The configure script wants to be smart and refuses the build if
it detects traces of PAM on the system. We create these traces
in /etc/pam.d, even with the very cast of xscreensaver, regardless
of linux-pam being present or not.

We could think about the general scheme here, as other spells also install
pam.d files.

diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index 505457c..903216e 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,6 +1,9 @@
+2023-03-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: hacked configure for non-PAM system
+
2022-05-01 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 6.04
- * DEPENDS: systemd dependency
+ * DEPENDS: systemd dependency

2022-03-06 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS, CONFIGURE, DEPENDS: version 6.03
diff --git a/x11/xscreensaver/PRE_BUILD b/x11/xscreensaver/PRE_BUILD
new file mode 100755
index 0000000..b6e1e30
--- /dev/null
+++ b/x11/xscreensaver/PRE_BUILD
@@ -0,0 +1,19 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# On Source Mage, /etc/pam.d gets populated regardless of linux-pam
+# being there. Upstream likely won't be sympathetic with this, so
+# keep a local hack.
+patch -p0 <<EOT
+--- configure.orig 2023-03-07 11:48:12.299643343 +0100
++++ configure 2023-03-07 11:49:19.190672169 +0100
+@@ -22069,7 +22069,8 @@
+ if test -d /etc/pam.d -o -f /etc/pam.conf ; then
+ warn "Your system seems to have PAM, but PAM is not being used."
+ warn2 "That is probably not going to work out well."
+- CONF_STATUS=1
++ # false positive on Source Mage
++ #CONF_STATUS=1
+ fi
+ fi
+
+EOT



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9bb81a16771cc53c1ff82160b8fb7de1fd5a4ea9), Thomas Orgis, 03/07/2023

Archive powered by MHonArc 2.6.24.

Top of Page