Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (7e915660c168f37f11bdded77f679b3d790e63ce)
  • Date: Thu, 6 Jul 2006 04:13:03 -0500

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

utils/vlock/DEPENDS | 3 ++-
utils/vlock/HISTORY | 3 +++
utils/vlock/PRE_BUILD | 9 ++++++++-
utils/vlock/README.NOW | 9 ---------
4 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 7e915660c168f37f11bdded77f679b3d790e63ce
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

vlock now optionally with pam

diff --git a/utils/vlock/DEPENDS b/utils/vlock/DEPENDS
index 6555fbb..7f39d03 100755
--- a/utils/vlock/DEPENDS
+++ b/utils/vlock/DEPENDS
@@ -1 +1,2 @@
-depends linux-pam
+optional_depends linux-pam "YES_PAM" "NO_PAM" "...using PAM for auth"
+
diff --git a/utils/vlock/HISTORY b/utils/vlock/HISTORY
index d8169c8..454f65a 100644
--- a/utils/vlock/HISTORY
+++ b/utils/vlock/HISTORY
@@ -1,3 +1,6 @@
+2006-07-06 Thomas Orgis sobukus AT sourcemage.org>
+ * DEPENDS, PRE_BUILD: made pam optional
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/vlock/PRE_BUILD b/utils/vlock/PRE_BUILD
index c6de927..b208a86 100755
--- a/utils/vlock/PRE_BUILD
+++ b/utils/vlock/PRE_BUILD
@@ -1,3 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sedit "s/-O2/$CFLAGS/" Makefile
+sedit "s/-O2/$CFLAGS/" Makefile &&
+if list_find "$OPTS" "NO_PAM"
+then
+ message "seding Makefile to disable PAM" &&
+ sedit 's/^\(CFLAGS =.*\)-DUSE_PAM/\1/' Makefile &&
+ sedit 's/^\(LDFLAGS =.*\)-ldl -lpam -lpam_misc/\1-lcrypt/' Makefile
+fi
+
diff --git a/utils/vlock/README.NOW b/utils/vlock/README.NOW
deleted file mode 100644
index 86e375e..0000000
--- a/utils/vlock/README.NOW
+++ /dev/null
@@ -1,9 +0,0 @@
-spell should be able to be built without pam by removing some flags like the
-comment in the Makefile says only i haven't gotten it to work so i have added
-Linux-PAM in the DEPENDS file. it should go something like this to compile
-without PAM support:
-
-cat Makefile | \
-sed -e 's/CFLAGS = $(RPM_OPT_FLAGS) -DUSE_PAM/CFLAGS = $(RPM_OPT_FLAGS)/' |
\
-sed -e 's/LDFLAGS = -ldl -lpam -lpam_misc/LDFLAGS =
-lpam_misc/'>Makefile.new; \
-rm -f Makefile; mv Makefile.new Makefile



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (7e915660c168f37f11bdded77f679b3d790e63ce), Thomas Orgis, 07/06/2006

Archive powered by MHonArc 2.6.24.

Top of Page