Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a07ac457beb99091c2267a2b5520248815e280c9)

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 master grimoire by Vlad Glagolev (a07ac457beb99091c2267a2b5520248815e280c9)
  • Date: Thu, 29 May 2008 14:48:22 -0500

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

utils/util-linux/CONFIGURE | 9 +++++----
utils/util-linux/HISTORY | 4 +++-
utils/util-linux/PRE_BUILD | 10 +++++++---
utils/util-linux/PRE_SUB_DEPENDS | 4 ++++
utils/util-linux/SUB_DEPENDS | 7 +++++++
utils/util-linux/loop-aes-util-linux-ng-2.13.1.diff.bz2 |binary
6 files changed, 26 insertions(+), 8 deletions(-)

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

util-linux: added loop-AES support

diff --git a/utils/util-linux/CONFIGURE b/utils/util-linux/CONFIGURE
index 834b753..2f91356 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
+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 &&
+config_query UL_LAES "Do you want to enable loop-AES support?" n
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index a423d76..7de6e3f 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,6 @@
+2008-05-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD, CONFIGURE, PRE_SUB_DEPENDS, SUB_DEPENDS: added loop-AES
+
2008-04-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.13.1.1, gz -> bz2, SECURITY_PATCH=1

@@ -259,4 +262,3 @@
2002-03-26 Jeff Schmidt <jschmidt AT fnal.gov>
* HISTORY: Added this file.
* DETAILS: updated version from ~n to ~o
-
diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
index 5e3d708..f95be18 100755
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -1,6 +1,10 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&

-if [ "$SELINUX" == "y" ] ; then
+if [[ $UL_LAES == y ]]; then
+ bzcat $SPELL_DIRECTORY/loop-aes-util-linux-ng-2.13.1.diff.bz2 | patch -p1
+fi &&
+
+if [[ $SELINUX == y ]]; then
OPTS="--with-selinux"
fi
diff --git a/utils/util-linux/PRE_SUB_DEPENDS
b/utils/util-linux/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..d8da0f5
--- /dev/null
+++ b/utils/util-linux/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ LAES) [[ $UL_LAES == y ]];;
+ *) 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
new file mode 100755
index 0000000..d0f9af6
--- /dev/null
+++ b/utils/util-linux/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ LAES) if [[ $UL_LAES != y ]]; then
+ message "Requested $SPELL with loop-AES support, forcing
option UL_LAES=y" &&
+ UL_LAES=y
+ fi;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/utils/util-linux/loop-aes-util-linux-ng-2.13.1.diff.bz2
b/utils/util-linux/loop-aes-util-linux-ng-2.13.1.diff.bz2
new file mode 100644
index 0000000..49db038
Binary files /dev/null and
b/utils/util-linux/loop-aes-util-linux-ng-2.13.1.diff.bz2 differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a07ac457beb99091c2267a2b5520248815e280c9), Vlad Glagolev, 05/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page