[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e8ff6a77babaf4c2a058569e4c7aac59c7df0257)

Vlad Glagolev scm at sourcemage.org
Wed Oct 15 10:30:42 EDT 2008


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 utils/util-linux/CONFIGURE       |    1 +
 utils/util-linux/DETAILS         |   11 +++++------
 utils/util-linux/HISTORY         |    3 +++
 utils/util-linux/INSTALL         |    6 +++---
 utils/util-linux/PRE_BUILD       |    4 ++--
 utils/util-linux/PRE_INSTALL     |    6 ++++--
 utils/util-linux/PRE_SUB_DEPENDS |    2 +-
 utils/util-linux/SUB_DEPENDS     |    2 +-
 8 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit e8ff6a77babaf4c2a058569e4c7aac59c7df0257
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    util-linux: updated aes version to 2.14.1

diff --git a/utils/util-linux/CONFIGURE b/utils/util-linux/CONFIGURE
index 1cb4b03..a878a73 100755
--- a/utils/util-linux/CONFIGURE
+++ b/utils/util-linux/CONFIGURE
@@ -1,4 +1,5 @@
 if [[ ! -e $INSTALL_ROOT/etc/sysconfig/hwclock ]]; then
   config_query UTC "Should the hardware clock store time in UTC (may break systems like MS Windows)?" y
 fi &&
+
 config_query SELINUX "Do you want to enable selinux support?" n
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 7a1a266..06fe301 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,7 +1,7 @@
            SPELL=util-linux
 if [[ $UL_VERSION == aes ]]; then
-         VERSION=2.14
-         SOURCE3=$SPELL-ng-${VERSION%.?}-20080624.diff.bz2
+         VERSION=2.14.1
+         SOURCE3=$SPELL-ng-$VERSION-20081015.diff.bz2
          SOURCE4=$SOURCE3.sign
   SOURCE3_URL[0]=http://loop-aes.sourceforge.net/updates/$SOURCE3
   SOURCE3_URL[1]=http://koti.tnnet.fi/jari.ruusu/linux/$SOURCE3
@@ -27,8 +27,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-ng-$VERSION
   SECURITY_PATCH=1
            SHORT="essential utilities for any Linux box"
 cat << EOF
-Util-linux is a suite of essential utilities for any Linux system. Its
-primary audience is system integrators and DIY Linux hackers. Util-linux
-is attempting to be portable, but the only platform it has been tested
-much on is Linux i386.
+Util-linux is a suite of essential utilities for any Linux system. Its primary
+audience is system integrators and DIY Linux hackers. Util-linux is attempting
+to be portable, but the only platform it has been tested much on is Linux i386.
 EOF
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index df5f576..68a1837 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,6 @@
+2008-10-15 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated aes version to 2.14.1; fixed desc
+
 2008-09-10 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.14.1
 
diff --git a/utils/util-linux/INSTALL b/utils/util-linux/INSTALL
index b1179cb..e8663e5 100755
--- a/utils/util-linux/INSTALL
+++ b/utils/util-linux/INSTALL
@@ -1,5 +1,5 @@
-make install DESTDIR=$INSTALL_ROOT &&
+make install DESTDIR="$INSTALL_ROOT" &&
 
-if [[ ! -e $INSTALL_ROOT/etc/filesystems ]]; then
-  install -vm 644 $SPELL_DIRECTORY/filesystems $INSTALL_ROOT/etc
+if [[ ! -e "$INSTALL_ROOT/etc/filesystems" ]]; then
+  install -vm 644 "$SPELL_DIRECTORY/filesystems" "$INSTALL_ROOT/etc"
 fi
diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
index ce6fabe..a39de68 100755
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -1,8 +1,8 @@
 default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&
 
 if [[ $UL_VERSION == aes ]]; then
-  bzcat $SOURCE_CACHE/$SOURCE3 | patch -p1
+  bzcat "$SOURCE_CACHE/$SOURCE3" | patch -p1
 fi &&
 
 if [[ $SELINUX == y ]]; then
diff --git a/utils/util-linux/PRE_INSTALL b/utils/util-linux/PRE_INSTALL
index ab35723..bce3060 100755
--- a/utils/util-linux/PRE_INSTALL
+++ b/utils/util-linux/PRE_INSTALL
@@ -1,6 +1,8 @@
 default_pre_install &&
+
 # ensure that mount is available - needed for and only for staged install
 # older sorceries don't have this backup
-if [[ -d $SOURCE_DIRECTORY/old.binaries ]]; then
-  cp $SOURCE_DIRECTORY/old.binaries/bin/*mount $INSTALL_ROOT/bin/
+if [[ -d "$SOURCE_DIRECTORY/old.binaries" ]]; then
+  install -vm 755 "$SOURCE_DIRECTORY"/old.binaries/bin/*mount \
+                  "$INSTALL_ROOT/bin"
 fi
diff --git a/utils/util-linux/PRE_SUB_DEPENDS b/utils/util-linux/PRE_SUB_DEPENDS
index 86955a4..cde027e 100755
--- a/utils/util-linux/PRE_SUB_DEPENDS
+++ b/utils/util-linux/PRE_SUB_DEPENDS
@@ -1,4 +1,4 @@
 case $THIS_SUB_DEPENDS in
    AES) [[ $UL_VERSION == aes ]];;
-       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+     *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
 esac
diff --git a/utils/util-linux/SUB_DEPENDS b/utils/util-linux/SUB_DEPENDS
index 42dd46e..312e2e0 100755
--- a/utils/util-linux/SUB_DEPENDS
+++ b/utils/util-linux/SUB_DEPENDS
@@ -3,5 +3,5 @@ case $THIS_SUB_DEPENDS in
                message "Requested AES-patched version of $SPELL, forcing option UL_VERSION=aes" &&
                UL_VERSION=aes
        fi;;
-     *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
 esac



More information about the SM-Commit mailing list