Skip to Content.
Sympa Menu

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

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 (dd3c5765aa432cefa5e6e71eca53f59cdd30eb30)
  • Date: Sun, 11 Mar 2007 05:34:13 -0500

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

security/shadow/CONFIGURE | 13 ++++++++++++-
security/shadow/DETAILS | 2 +-
security/shadow/HISTORY | 6 ++++++
security/shadow/INSTALL | 6 +++++-
4 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 0d15a926fcebf29e83b3bc8f90b123fe3e776f6d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

shadow: bug 13505 and general fix for honoring config files

diff --git a/security/shadow/CONFIGURE b/security/shadow/CONFIGURE
index 7ad9599..ed1bef6 100755
--- a/security/shadow/CONFIGURE
+++ b/security/shadow/CONFIGURE
@@ -29,4 +29,15 @@ interactively" &&
}
fi
# the tools give negative return even after successfully fixing stuff
-true
+true &&
+# Unsure about TRACK_ROOT here
+local default_home=/home/users &&
+local old_home=$(grep '^HOME=' $INSTALL_ROOT/etc/default/useradd 2>/dev/null
| sed 's/HOME=//') &&
+if [[ -n "$old_home" ]]; then
+ default_home=$old_home
+fi &&
+config_query_string SHADOW_HOME "base directory for user homes:"
"$default_home" &&
+if ! [[ -e "$INSTALL_ROOT/$SHADOW_HOME" ]]; then
+ message "$SHADOW_HOME does not seem to exist, it's up to you to take care
of
+that..."
+fi
diff --git a/security/shadow/DETAILS b/security/shadow/DETAILS
index ebe63b0..6d8e67d 100755
--- a/security/shadow/DETAILS
+++ b/security/shadow/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=ftp://ftp.pld.org.pl/software/$SPELL/$SOURCE
WEB_SITE=http://shadow.pld.org.pl/
ENTERED=20050303
- PATCHLEVEL=3
+ PATCHLEVEL=4
SECURITY_PATCH=3
KEYWORDS="security password"
SHORT="Shadow password file utilities"
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index 81b43cc..f7f801d 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,9 @@
+2007-03-11 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE,INSTALL: fix general config file install (prevent make
install
+ from overwriting) while applying a fix according to bug 13505, now
asks
+ for $HOME prefix to make adduser possibly work out of the box
+ * DETAILS: deserves a patchlevel
+
2007-03-08 Thomas Orgis <sobukus AT sourcemage.org>
* pam.d/*: replace all pam_unix_auth.so with pam-unix.so as only the
latter
remains with newer pam (but 13600)
diff --git a/security/shadow/INSTALL b/security/shadow/INSTALL
index ec5de2e..775f67c 100755
--- a/security/shadow/INSTALL
+++ b/security/shadow/INSTALL
@@ -1,10 +1,14 @@
+# make sure that config files won't get overwritten by install
+echo "install:" > etc/Makefile &&
+echo "install:" > etc/pam.d/Makefile &&
make install DESTDIR=$INSTALL_ROOT &&

install_config_file etc/limits $INSTALL_ROOT/etc/limits &&
install_config_file etc/login.access $INSTALL_ROOT/etc/login.access &&
install_config_file etc/login.defs $INSTALL_ROOT/etc/login.defs &&
-
+sed -i 's,^HOME=.*$,HOME='"$SHADOW_HOME"',' etc/useradd &&
mkdir -p $INSTALL_ROOT/etc/default &&
+install_config_file etc/useradd $INSTALL_ROOT/etc/default/useradd &&

cp -fv $SCRIPT_DIRECTORY/adduser $INSTALL_ROOT/usr/sbin &&
cp -fv $SCRIPT_DIRECTORY/deluser $INSTALL_ROOT/usr/sbin



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (dd3c5765aa432cefa5e6e71eca53f59cdd30eb30), Thomas Orgis, 03/11/2007

Archive powered by MHonArc 2.6.24.

Top of Page