Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (66851e37ad6744232452f7bb698d364adfe1aaad)

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 master grimoire by Jeremy Blosser (66851e37ad6744232452f7bb698d364adfe1aaad)
  • Date: Mon, 12 Mar 2007 16:25:28 -0500

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

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

New commits:
commit 66851e37ad6744232452f7bb698d364adfe1aaad
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

Revert "shadow: bug 13505 and general fix for honoring config files"

This reverts commit 0d15a926fcebf29e83b3bc8f90b123fe3e776f6d.

commit bd5e1a4a4e83fdba77da9d56af72399a3734360b
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

Revert "shadow: ensure users group is there"

This reverts commit 6bad5cd6efa2bbadfee1ea69be7bf9fabf906729.

commit 8bc8a5fa92d037a8f9751668047ce993692f04eb
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

Revert "shadow: additional fix for bug 13505; place users instead of 1000
in useradd config, prevents the error when gid of users is != 1000"

This reverts commit ec1f8593d8f0e9ce8b44108e6669214bdde072c2.

diff --git a/security/shadow/CONFIGURE b/security/shadow/CONFIGURE
index ed1bef6..7ad9599 100755
--- a/security/shadow/CONFIGURE
+++ b/security/shadow/CONFIGURE
@@ -29,15 +29,4 @@ interactively" &&
}
fi
# the tools give negative return even after successfully fixing stuff
-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
+true
diff --git a/security/shadow/DETAILS b/security/shadow/DETAILS
index 6d8e67d..ebe63b0 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=4
+ PATCHLEVEL=3
SECURITY_PATCH=3
KEYWORDS="security password"
SHORT="Shadow password file utilities"
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index 3b63ec0..81b43cc 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,11 +1,3 @@
-2007-03-11 Thomas Orgis <sobukus AT sourcemage.org>
- * INSTALL: create users group, which is default upstream, change
- default useradd to GROUP=users instead of GROUP=1000
- * 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 1d70fb8..ec5de2e 100755
--- a/security/shadow/INSTALL
+++ b/security/shadow/INSTALL
@@ -1,16 +1,10 @@
-# 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 -e 's,^HOME=.*$,HOME='"$SHADOW_HOME"',' -e
's,GROUP=1000,GROUP=users,' etc/useradd &&
-mkdir -p $INSTALL_ROOT/etc/default &&
-install_config_file etc/useradd $INSTALL_ROOT/etc/default/useradd &&

-create_group users &&
+mkdir -p $INSTALL_ROOT/etc/default &&

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 Jeremy Blosser (66851e37ad6744232452f7bb698d364adfe1aaad), Jeremy Blosser, 03/12/2007

Archive powered by MHonArc 2.6.24.

Top of Page