Skip to Content.
Sympa Menu

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

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 (7731d7d7b5245cc0f6dfc78b5c1cbe3290f5300b)
  • Date: Fri, 20 Jun 2008 15:28:42 -0500

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

ChangeLog | 4 +++
crypto/loop-AES.gpg | 0
crypto/loop-aes/DEPENDS | 2 -
crypto/loop-aes/HISTORY | 3 ++
dev/null |binary
loop-AES.gpg |binary
utils/util-linux/CONFIGURE | 3 --
utils/util-linux/DETAILS | 18
+++++++++++++---
utils/util-linux/FINAL | 5 ++--
utils/util-linux/HISTORY | 9 ++++++++
utils/util-linux/INSTALL | 12 +---------
utils/util-linux/PREPARE | 3 ++
utils/util-linux/PRE_BUILD | 4 +--
utils/util-linux/PRE_SUB_DEPENDS | 2 -
utils/util-linux/SUB_DEPENDS | 8 +++----
utils/util-linux/loop-aes-util-linux-ng-2.13.1.diff.bz2 | 0
16 files changed, 48 insertions(+), 25 deletions(-)

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

loop-AES.gpg moved to index, needed by some spells from the different
sections

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

loop-aes: fixed util-linux subdep

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

util-linux: fixed the spell to work correctly with loop-AES, added
version "aes"

diff --git a/ChangeLog b/ChangeLog
index 9f9c0c5..88fa43a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * crypto/loop-AES.gpg moved to index, needed by some spells from the
+ different sections
+
2008-06-20 Arjan Bouter <abouter AT sourcemage.org>
* windowmanagers/xfce: removed deprecated spell

diff --git a/crypto/loop-AES.gpg b/crypto/loop-AES.gpg
deleted file mode 100644
index 0409475..0000000
Binary files a/crypto/loop-AES.gpg and /dev/null differ
diff --git a/crypto/loop-aes/DEPENDS b/crypto/loop-aes/DEPENDS
index e281da6..69bdcba 100755
--- a/crypto/loop-aes/DEPENDS
+++ b/crypto/loop-aes/DEPENDS
@@ -1,7 +1,7 @@
depends sharutils &&
depends -sub STATIC gnupg &&
depends -sub STATIC aespipe &&
-depends -sub LAES util-linux &&
+depends -sub AES util-linux &&

suggest_depends dietlibc \
"" "" \
diff --git a/crypto/loop-aes/HISTORY b/crypto/loop-aes/HISTORY
index 8692e29..464aebf 100644
--- a/crypto/loop-aes/HISTORY
+++ b/crypto/loop-aes/HISTORY
@@ -1,3 +1,6 @@
+2008-06-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: fixed util-linux subdep
+
2008-05-30 Vlad Glagolev <stealth AT sourcemage.org>
* init.d/losetup: added init script
* INSTALL, init.d/loop-aes.conf: added config/script for automounting
diff --git a/loop-AES.gpg b/loop-AES.gpg
new file mode 100644
index 0000000..0409475
Binary files /dev/null and b/loop-AES.gpg differ
diff --git a/utils/util-linux/CONFIGURE b/utils/util-linux/CONFIGURE
index 2f91356..1cb4b03 100755
--- a/utils/util-linux/CONFIGURE
+++ b/utils/util-linux/CONFIGURE
@@ -1,5 +1,4 @@
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
+config_query SELINUX "Do you want to enable selinux support?" n
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index 14b0f3c..117eb4c 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,18 +1,30 @@
SPELL=util-linux
+if [[ $UL_VERSION == aes ]]; then
+ VERSION=2.13.1.1
+ SOURCE3=$SPELL-ng-${VERSION%.?}-20080303.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
+ SOURCE4_URL[0]=$SOURCE3_URL.sign
+ SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
+ SOURCE4_IGNORE=signature
+else
VERSION=2.14
+fi
+ BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-ng-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-ng-$VERSION
- SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL-ng/v2.14/$SOURCE
+ SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL-ng/v$BRANCH/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.sign
- SOURCE_GPG=kernel.gpg:$SOURCE2
+ SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://userweb.kernel.org/~kzak/util-linux-ng/
ENTERED=20010922
LICENSE[0]=GPL
KEYWORDS="utils"
SECURITY_PATCH=1
- SHORT="Essential utilities for any Linux box"
+ 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
diff --git a/utils/util-linux/FINAL b/utils/util-linux/FINAL
index 26187cf..3096b5f 100755
--- a/utils/util-linux/FINAL
+++ b/utils/util-linux/FINAL
@@ -1,4 +1,5 @@
-if test -f $INSTALL_ROOT/etc/sysconfig/hwclock && [ "$UTC" ]; then
- sedit "s/^UTC=.*$/UTC=$UTC/" ${INSTALL_ROOT}/etc/sysconfig/hwclock
+if test -f $INSTALL_ROOT/etc/sysconfig/hwclock && [[ $UTC ]]; then
+ sed -i "s/^UTC=.*$/UTC=$UTC/" $INSTALL_ROOT/etc/sysconfig/hwclock
fi
+
persistent_remove UTC || true
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 852b0f0..c3f1f55 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,12 @@
+2008-06-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added multiversioning for compatibility with loop-AES,
+ no more b0rkage made by the previous commit :P, added urls for
+ the loop-AES patch
+ * FINAL: added bashism a bit, `sed -i' > `sedit', cleaned up
+ * INSTALL: use $INSTALL_ROOT where needed, added some bashism,
+ `install' > `cp', SPELL > SCRIPT
+ * CONFIGURE: removed loop-AES selection, provided by spell version now
+
2008-06-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.14

diff --git a/utils/util-linux/INSTALL b/utils/util-linux/INSTALL
index bd47387..b1179cb 100755
--- a/utils/util-linux/INSTALL
+++ b/utils/util-linux/INSTALL
@@ -1,13 +1,5 @@
make install DESTDIR=$INSTALL_ROOT &&

-if [ ! -e /etc/filesystems ]; then
- cp ${SCRIPT_DIRECTORY}/filesystems /etc
-#else
- #
- # This way it is tracked on subsequent casts; we need a better way for this
- # as, if I modify /etc/filesystems and then recast util-linux, util-linux
- # will own my modifications to /etc/filesystems and on dispel will remove
- # my modified /etc/filesystems since it'll think it's the original...
- #
- #touch /etc/filesystems
+if [[ ! -e $INSTALL_ROOT/etc/filesystems ]]; then
+ install -vm 644 $SPELL_DIRECTORY/filesystems $INSTALL_ROOT/etc
fi
diff --git a/utils/util-linux/PREPARE b/utils/util-linux/PREPARE
new file mode 100755
index 0000000..4a9e99b
--- /dev/null
+++ b/utils/util-linux/PREPARE
@@ -0,0 +1,3 @@
+message "aes version is older, but needed for loop-AES patch" &&
+
+config_query_list UL_VERSION "What version do you want to use?" latest aes
diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
index f95be18..ce6fabe 100755
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -1,8 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-if [[ $UL_LAES == y ]]; then
- bzcat $SPELL_DIRECTORY/loop-aes-util-linux-ng-2.13.1.diff.bz2 | patch -p1
+if [[ $UL_VERSION == aes ]]; then
+ bzcat $SOURCE_CACHE/$SOURCE3 | patch -p1
fi &&

if [[ $SELINUX == y ]]; then
diff --git a/utils/util-linux/PRE_SUB_DEPENDS
b/utils/util-linux/PRE_SUB_DEPENDS
index d8da0f5..86955a4 100755
--- a/utils/util-linux/PRE_SUB_DEPENDS
+++ b/utils/util-linux/PRE_SUB_DEPENDS
@@ -1,4 +1,4 @@
case $THIS_SUB_DEPENDS in
- LAES) [[ $UL_LAES == y ]];;
+ AES) [[ $UL_VERSION == aes ]];;
*) 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 d0f9af6..42dd46e 100755
--- a/utils/util-linux/SUB_DEPENDS
+++ b/utils/util-linux/SUB_DEPENDS
@@ -1,7 +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;;
+ AES) if [[ $UL_VERSION != aes ]]; then
+ 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;;
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
deleted file mode 100644
index 49db038..0000000
Binary files a/utils/util-linux/loop-aes-util-linux-ng-2.13.1.diff.bz2 and
/dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7731d7d7b5245cc0f6dfc78b5c1cbe3290f5300b), Vlad Glagolev, 06/20/2008

Archive powered by MHonArc 2.6.24.

Top of Page