Skip to Content.
Sympa Menu

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

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 (dfe672243730504388dc46fc56b9e9beafd3817b)
  • Date: Tue, 6 Feb 2007 13:07:40 -0600

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

security/shadow/CONFIGURE | 22
+++++++++-
security/shadow/DETAILS | 2
security/shadow/FINAL | 2
security/shadow/HISTORY | 12
++++-
security/shadow/PRE_REMOVE | 9
+++-
security/shadow/REPAIR^acad95bdda57e3a157ee57a47035a0d5^PRE_REMOVE | 8 +++
smgl/smgl-archspecs/DETAILS | 2
smgl/smgl-archspecs/HISTORY | 4 +
smgl/smgl-archspecs/INSTALL | 3 -
9 files changed, 53 insertions(+), 11 deletions(-)

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

smgl-archspecs: bumping to 0.7.2

commit fe545c4b24abdeb7177efbab4a650469f4d6a284
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

shadow: fixing the unpleasant result of saying n to the account files
conversion but still having pwunconv in PRE_REMOVE

diff --git a/security/shadow/CONFIGURE b/security/shadow/CONFIGURE
index 6c97b30..b5e0ef1 100755
--- a/security/shadow/CONFIGURE
+++ b/security/shadow/CONFIGURE
@@ -1,5 +1,23 @@
-config_query SHADOW_CONV "Attempt to convert/fix accounts (with installed
shadow utils)" n &&
-if [[ "$SHADOW_CONV" == y ]]; then
+# There's a bug introduced by the solution of bug 8834:
+# if you said "n" to $SHADOW_CONV, you ended up with the state pw/grpunconv
+# left on dispelling old shadow.
+# Introducing a new var $SHADOW_NEWCONV for the query to be able to re-ask
+# the question.
+
+conv_default=n &&
+if [[ "$SHADOW_CONV" == "y" ]]; then conv_default=y; fi &&
+# if we haven't yet an answer on the new question and the old answer was not
y
+if [[ -z "$SHADOW_NEWCONV" ]] && [[ $conv_default == n ]]; then
+ message "Checking passwd for shadowness (there could have been an unwanted
run of pwunconv/grpunconv)." &&
+ if ! grep -q '^root:x:' "$INSTALL_ROOT/etc/passwd"; then
+ message "Your passwd file contains password hashes, suggesting
(re)conversion to shadow." &&
+ message "You can still say n to the upcoming query but make sure
then to run pwconv / grpconv yourself if you want existing passwords
shadowed." &&
+ conv_default=y
+ fi
+fi &&
+
+config_query SHADOW_NEWCONV "Attempt to convert/fix accounts (with installed
shadow utils)" $conv_default &&
+if [[ "$SHADOW_NEWCONV" == y ]]; then
message "OK, checking your user and group accounts" &&
grpck -r "$INSTALL_ROOT/etc/group" "$INSTALL_ROOT/etc/gshadow" ||
{
diff --git a/security/shadow/DETAILS b/security/shadow/DETAILS
index 223eace..797de76 100755
--- a/security/shadow/DETAILS
+++ b/security/shadow/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://shadow.pld.org.pl/
ENTERED=20050303
PATCHLEVEL=3
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
KEYWORDS="security password"
SHORT="Shadow password file utilities"

diff --git a/security/shadow/FINAL b/security/shadow/FINAL
index eca5bd2..05402f7 100755
--- a/security/shadow/FINAL
+++ b/security/shadow/FINAL
@@ -1,4 +1,4 @@
-if [ "$SHADOW_CONV" == y ]; then
+if [ "$SHADOW_NEWCONV" == y ]; then
#Create or update necessary files for shadow
message "running pwconv and grpconv" &&
${INSTALL_ROOT}/usr/sbin/pwconv &&
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index 1e09e8e..54989a3 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,11 @@
+2007-02-06 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE,PRE_REMOVE, REPAIR^...^PRE_REMOVE, FINAL: I made the
pwconv
+ optional, but there still was unconditional pwunconv in
+ PRE_REMOVE - now the mess had to be cleaned up: no pwunconv, ever!
+ (see bug 8834)
+ * DETAILS: SECURITY_PATCH++ as there can be a state of password hashes
+ in passwd files
+
2007-01-22 Thomas Orgis <sobukus AT sourcemage.org>
* CONFIGURE: default the answer to "n" by default, making the account
modification opt-in as it should be
@@ -9,8 +17,8 @@
2007-01-20 Thomas Orgis <sobukus AT sourcemage.org>
* pam.d/su: move that to coreutils as the su binary comes from
there now
- * DETAILS: a patchlevel can't hurt for having changed install
- footprint
+ * DETAILS: a patchlevel can't hurt for having changed install
+ footprint

2006-07-15 Flavien Bridault <vlaaad AT sourcemage.org>
* BUILD: do not install default /etc/pam.d/* files from the tarball
diff --git a/security/shadow/PRE_REMOVE b/security/shadow/PRE_REMOVE
index 58e91bd..580de53 100755
--- a/security/shadow/PRE_REMOVE
+++ b/security/shadow/PRE_REMOVE
@@ -1,3 +1,8 @@
+message "I will NOT put your passwords back into passwd/group!" &&
+message "You'd need to run pwunconv/grpunconv before dispel for having a
workable system without shadow."
+# do not do this unasked and on every upgrade cast
+# you normally never dispel shadow for good unless you are
+# curious to see what happens...
#Restore /etc/passwd when dispelling shadow
-${INSTALL_ROOT}/usr/sbin/pwunconv &&
-${INSTALL_ROOT}/usr/sbin/grpunconv
+#${INSTALL_ROOT}/usr/sbin/pwunconv &&
+#${INSTALL_ROOT}/usr/sbin/grpunconv
diff --git
a/security/shadow/REPAIR^acad95bdda57e3a157ee57a47035a0d5^PRE_REMOVE
b/security/shadow/REPAIR^acad95bdda57e3a157ee57a47035a0d5^PRE_REMOVE
new file mode 100755
index 0000000..580de53
--- /dev/null
+++ b/security/shadow/REPAIR^acad95bdda57e3a157ee57a47035a0d5^PRE_REMOVE
@@ -0,0 +1,8 @@
+message "I will NOT put your passwords back into passwd/group!" &&
+message "You'd need to run pwunconv/grpunconv before dispel for having a
workable system without shadow."
+# do not do this unasked and on every upgrade cast
+# you normally never dispel shadow for good unless you are
+# curious to see what happens...
+#Restore /etc/passwd when dispelling shadow
+#${INSTALL_ROOT}/usr/sbin/pwunconv &&
+#${INSTALL_ROOT}/usr/sbin/grpunconv
diff --git a/smgl/smgl-archspecs/DETAILS b/smgl/smgl-archspecs/DETAILS
index 047645a..af6b3aa 100755
--- a/smgl/smgl-archspecs/DETAILS
+++ b/smgl/smgl-archspecs/DETAILS
@@ -1,5 +1,5 @@
SPELL=smgl-archspecs
- VERSION=0.7.1
+ VERSION=0.7.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
diff --git a/smgl/smgl-archspecs/HISTORY b/smgl/smgl-archspecs/HISTORY
index ceacc9b..e5fbbb6 100644
--- a/smgl/smgl-archspecs/HISTORY
+++ b/smgl/smgl-archspecs/HISTORY
@@ -1,3 +1,7 @@
+2007-02-06 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: bumped to 0.7.2 (minimalized amd specs)
+ * INSTALL: fix for the now again properly prepared tarball
+
2007-02-03 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: bumped to 0.7.1, just cleaning up descriptions for
Core 2
diff --git a/smgl/smgl-archspecs/INSTALL b/smgl/smgl-archspecs/INSTALL
index 82c1d45..774aad1 100755
--- a/smgl/smgl-archspecs/INSTALL
+++ b/smgl/smgl-archspecs/INSTALL
@@ -1,3 +1,2 @@
mkdir -p $INSTALL_ROOT/usr/share/archspecs/ &&
-# the tarball contains the spec dirs right away
-cp -Rv $SOURCE_DIRECTORY/{64,32,null} $INSTALL_ROOT/usr/share/archspecs/
+cp -Rv "$SOURCE_DIRECTORY"/archspecs/* "$INSTALL_ROOT"/usr/share/archspecs/




Archive powered by MHonArc 2.6.24.

Top of Page