Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev (a52697231b36d551ba7e13488f769c2ad67cf939)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev (a52697231b36d551ba7e13488f769c2ad67cf939)
  • Date: Sat, 21 Feb 2015 09:05:14 -0600

GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

security/shadow/BUILD | 38 +++++---------------------------------
security/shadow/DEPENDS | 12 ++++++------
security/shadow/DETAILS | 4 ++--
security/shadow/HISTORY | 6 ++++++
security/shadow/PRE_BUILD | 34 ++++++++++++++++++++++++++++++++++
utils/sysstat/HISTORY | 3 +++
utils/sysstat/INSTALL | 17 +++++++++--------
7 files changed, 65 insertions(+), 49 deletions(-)

New commits:
commit a52697231b36d551ba7e13488f769c2ad67cf939
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sysstat: fixed syntax errors in INSTALL
(cherry picked from commit bbe844e826c638ef47e2bb270f722810ef80f32c)

commit c8552f6963382ce5b10678d514b1c146b84baa07
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

shadow: use sha512-based crypt passwords by default
(cherry picked from commit 3f51925fe11d90911d51ae319d092cca9a5a5c5b)

diff --git a/security/shadow/BUILD b/security/shadow/BUILD
index 5be0025..3c9d599 100755
--- a/security/shadow/BUILD
+++ b/security/shadow/BUILD
@@ -1,8 +1,8 @@
-# Do not install default pam configuration files
-sedit 's|pam.d||' etc/Makefile.in &&
+OPTS="--enable-shadowgrp --build=${BUILD} $OPTS" &&

-OPTS="$OPTS --enable-shadowgrp --build=${BUILD}" &&
-if [[ $CROSS_INSTALL == on ]]; then OPTS="$OPTS --host=${HOST}"; fi &&
+if [[ $CROSS_INSTALL == on ]]; then
+ OPTS="--host=${HOST} $OPTS"
+fi &&

./configure --prefix=${TRACK_ROOT}/usr \
--sysconfdir=${TRACK_ROOT}/etc \
@@ -10,33 +10,5 @@ if [[ $CROSS_INSTALL == on ]]; then OPTS="$OPTS
--host=${HOST}"; fi &&
--mandir=${TRACK_ROOT}/usr/share/man \
--infodir=${TRACK_ROOT}/usr/share/info \
$OPTS &&
-make DESTDIR=$INSTALL_ROOT &&

-# patch login.defs.linux so that spurious messages don't show up during login
-if echo $OPTS | grep -q -- '--with-libpam'; then
- sedit '
-s|^CHFN_AUTH|#\0|g
-s|^CRACKLIB_DICTPATH|#\0|g
-s|^ENV_HZ|#\0|g
-s|^ENVIRON_FILE|#\0|g
-s|^ENV_PATH|#\0|g
-s|^ENV_SUPATH|#\0|g
-s|^FAILLOG_ENAB|#\0|g
-s|^FTMP_FILE|#\0|g
-s|^LASTLOG_ENAB|#\0|g
-s|^MAIL_CHECK_ENAB|#\0|g
-s|^MOTD_FILE|#\0|g
-s|^NOLOGINS_FILE|#\0|g
-s|^OBSCURE_CHECKS_ENAB|#\0|g
-s|^PASS_ALWAYS_WARN|#\0|g
-s|^PASS_CHANGE_TRIES|#\0|g
-s|^PASS_MIN_LEN|#\0|g
-s|^PORTTIME_CHECKS_ENAB|#\0|g
-s|^QUOTAS_ENAB|#\0|g
-s|^SU_WHEEL_ONLY|#\0|g
-' etc/login.defs
-else
- sedit '
-s|^#MD5_CRYPT_ENAB.*|MD5_CRYPT_ENAB yes|
-' etc/login.defs
-fi
+make DESTDIR=$INSTALL_ROOT
diff --git a/security/shadow/DEPENDS b/security/shadow/DEPENDS
index 1a31341..cb76c42 100755
--- a/security/shadow/DEPENDS
+++ b/security/shadow/DEPENDS
@@ -24,15 +24,15 @@ optional_depends libselinux \

optional_depends attr \
'--with-attr=yes' \
- '--with-attr=no' \
- 'support extended attributes' &&
+ '--with-attr=no' \
+ 'support extended attributes' &&

optional_depends acl \
'--with-acl' \
- '--without-acl' \
- 'for filesystem access control list support' &&
+ '--without-acl' \
+ 'for filesystem access control list support' &&

optional_depends audit \
'--with-audit' \
- '--without-audit' \
- 'support the audit system'
+ '--without-audit' \
+ 'support the audit system'
diff --git a/security/shadow/DETAILS b/security/shadow/DETAILS
index 6fc6641..941d785 100755
--- a/security/shadow/DETAILS
+++ b/security/shadow/DETAILS
@@ -1,12 +1,12 @@
SPELL=shadow
VERSION=4.1.5.1
+ SECURITY_PATCH=7

SOURCE_HASH=sha512:c3bc605de1ca5b774b80d0d92cef5d4c0d5b4a206acadcf5a819f195453093bfe7990d7e32b98799180847ae4fadecfc7876c8ee7297f343acce2230d805d02c
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://pkg-shadow.alioth.debian.org/releases/$SOURCE
WEB_SITE=http://pkg-shadow.alioth.debian.org/
ENTERED=20050303
- SECURITY_PATCH=6
KEYWORDS="security password"
SHORT="Shadow password file utilities"

diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index dcf3afc..af6dab9 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,9 @@
+2015-02-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++; quoting paths
+ * DEPENDS: dropped tabs
+ * BUILD: moved all pre-configuration actions to PRE_BUILD;
readability++
+ * PRE_BUILD: use secure default values actually
+
2012-06-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.1.5.1
* PRE_BUILD, copydir.c.patch: patch removed
diff --git a/security/shadow/PRE_BUILD b/security/shadow/PRE_BUILD
new file mode 100755
index 0000000..a9768a1
--- /dev/null
+++ b/security/shadow/PRE_BUILD
@@ -0,0 +1,34 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Do not install default pam configuration files
+sedit 's|pam.d||' etc/Makefile.in &&
+
+# patch login.defs.linux so that spurious messages don't show up during login
+if is_depends_enabled $SPELL linux-pam; then
+ sedit '
+s|^CHFN_AUTH|#\0|g
+s|^CRACKLIB_DICTPATH|#\0|g
+s|^ENV_HZ|#\0|g
+s|^ENVIRON_FILE|#\0|g
+s|^ENV_PATH|#\0|g
+s|^ENV_SUPATH|#\0|g
+s|^FAILLOG_ENAB|#\0|g
+s|^FTMP_FILE|#\0|g
+s|^LASTLOG_ENAB|#\0|g
+s|^MAIL_CHECK_ENAB|#\0|g
+s|^MOTD_FILE|#\0|g
+s|^NOLOGINS_FILE|#\0|g
+s|^OBSCURE_CHECKS_ENAB|#\0|g
+s|^PASS_ALWAYS_WARN|#\0|g
+s|^PASS_CHANGE_TRIES|#\0|g
+s|^PASS_MIN_LEN|#\0|g
+s|^PORTTIME_CHECKS_ENAB|#\0|g
+s|^QUOTAS_ENAB|#\0|g
+s|^SU_WHEEL_ONLY|#\0|g
+' etc/login.defs
+else
+ sedit '
+s|^#ENCRYPT_METHOD.*|ENCRYPT_METHOD SHA512|
+' etc/login.defs
+fi
diff --git a/utils/sysstat/HISTORY b/utils/sysstat/HISTORY
index b0002f4..d84cb27 100644
--- a/utils/sysstat/HISTORY
+++ b/utils/sysstat/HISTORY
@@ -1,3 +1,6 @@
+2015-02-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * INSTALL: corrected syntax errors; verbosity++
+
2013-06-13 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* CONFIGURE: Query about installing cron jobs.
diff --git a/utils/sysstat/INSTALL b/utils/sysstat/INSTALL
index 14b2547..ee71de0 100755
--- a/utils/sysstat/INSTALL
+++ b/utils/sysstat/INSTALL
@@ -1,16 +1,17 @@
default_install &&

if [[ "x${SYSSTAT_CRON}" == "xy" ]]; then
- if ! -d "${INSTALL_ROOT}"/etc/cron.hourly; then
- install -d -m 0755 "${INSTALL_ROOT}"/etc/cron.hourly
+ if [[ ! -d "${INSTALL_ROOT}"/etc/cron.hourly ]]; then
+ install -d -vm 0755 "${INSTALL_ROOT}"/etc/cron.hourly
fi &&

- if ! -d "${INSTALL_ROOT}"/etc/cron.daily; then
- install -d -m 0755 "${INSTALL_ROOT}"/etc/cron.daily
+ if [[ ! -d "${INSTALL_ROOT}"/etc/cron.daily ]]; then
+ install -d -vm 0755 "${INSTALL_ROOT}"/etc/cron.daily
fi &&

- install -m 0755 "${SPELL_DIRECTORY}"/cron.hourly/sa1 \
- "${INSTALL_ROOT}"/etc/cron.hourly/sa1 &&
- install -m 0755 "${SPELL_DIRECTORY}"/cron.daily/sa2 \
- "${INSTALL_ROOT}"/etc/cron.daily/sa2
+ install -vm 0755 "${SPELL_DIRECTORY}"/cron.hourly/sa1 \
+ "${INSTALL_ROOT}"/etc/cron.hourly/sa1 &&
+
+ install -vm 0755 "${SPELL_DIRECTORY}"/cron.daily/sa2 \
+ "${INSTALL_ROOT}"/etc/cron.daily/sa2
fi



  • [SM-Commit] GIT changes to stable-rc-0.62 grimoire by Vlad Glagolev (a52697231b36d551ba7e13488f769c2ad67cf939), Vlad Glagolev, 02/21/2015

Archive powered by MHonArc 2.6.24.

Top of Page