Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jeremy Blosser (1c817af4d60990104cba71919ca46c3c6350c987)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jeremy Blosser <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jeremy Blosser (1c817af4d60990104cba71919ca46c3c6350c987)
  • Date: Sat, 27 Jan 2007 19:23:50 -0600

GIT changes to stable-rc-0.6 grimoire by Jeremy Blosser
<jblosser-smgl AT firinn.org>:

disk/autofs/BUILD | 4 +++-
disk/autofs/DEPENDS | 4 ++--
disk/autofs/HISTORY | 8 ++++++++
disk/autofs/INSTALL | 4 +++-
4 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 1c817af4d60990104cba71919ca46c3c6350c987
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

Badly needed fixing for autofs - it crapped up /etc (including
overwriting configs!!!!!) and the depend on openldap didn't work as opt-out.

diff --git a/disk/autofs/BUILD b/disk/autofs/BUILD
index cb8f506..3393628 100755
--- a/disk/autofs/BUILD
+++ b/disk/autofs/BUILD
@@ -2,7 +2,9 @@ DEFAULT_CFLAGS="CFLAGS = -O3 -fomit-f
SA_CFLAGS="CFLAGS = $CFLAGS -Wall" &&

sedit "s/$DEFAULT_CFLAGS/$SA_CFLAGS/" Makefile.rules &&
-
+# skip the samples that clobber up /etc
+#rm -rf samples &&
+sedit 's/\(SUBDIRS = lib daemon modules man\) samples/\1/' Makefile.rules &&
default_build
#./configure --build=$BUILD \
# --prefix=/usr \
diff --git a/disk/autofs/DEPENDS b/disk/autofs/DEPENDS
index 16469f4..17f6d87 100755
--- a/disk/autofs/DEPENDS
+++ b/disk/autofs/DEPENDS
@@ -1,6 +1,6 @@
depends mktemp &&

optional_depends openldap \
- "" \
- "" \
+ "--with-openldap" \
+ "--without-openldap" \
"for ldap support"
diff --git a/disk/autofs/HISTORY b/disk/autofs/HISTORY
index 2f101fb..28e7956 100644
--- a/disk/autofs/HISTORY
+++ b/disk/autofs/HISTORY
@@ -1,3 +1,11 @@
+2007-01-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD,INSTALL: What happened to this spell?
+ Or better, what didn't? Everything...
+ Now installing some examples as config files and
+ preventing the make install from writing into /etc
+ itself. That also removes the useless /etc/init.d/autofs .
+ * DEPENDS: also be able to _disable_ the openldap dep
+
2006-09-12 David Brown <dmlb2000 AT gmail.com>
* DETAILS: used gpg verification and version bump 4.1.4

diff --git a/disk/autofs/INSTALL b/disk/autofs/INSTALL
index c783124..9f862b4 100755
--- a/disk/autofs/INSTALL
+++ b/disk/autofs/INSTALL
@@ -12,6 +12,8 @@ INC="include /etc/modules.d/autofs" &&
grep -q "$INC" $MOD ||
echo "$INC" >> $MOD &&

+# together with disabling the samples subdir, we should now
+# _not_ delete the admin's config on every cast
for FILE in auto.home auto.master auto.misc
-do [ -f /etc/$FILE ] || cp $SCRIPT_DIRECTORY/$FILE /etc
+do install_config_file "$SCRIPT_DIRECTORY/$FILE" "$INSTALL_ROOT/etc/$FILE"
done



  • [SM-Commit] GIT changes to stable-rc-0.6 grimoire by Jeremy Blosser (1c817af4d60990104cba71919ca46c3c6350c987), Jeremy Blosser, 01/27/2007

Archive powered by MHonArc 2.6.24.

Top of Page