Source Mage code commit list

[Arwed von Merkatz <scm AT sourcemage.org>]

GIT changes to stable-rc-0.34 grimoire by Arwed von Merkatz 
<v.merkatz AT gmx.net>:

 disk/e2fsprogs/BUILD     |    2 --
 disk/e2fsprogs/HISTORY   |    5 -----
 utils/util-linux/BUILD   |    1 -
 utils/util-linux/DETAILS |    9 ++++-----
 utils/util-linux/HISTORY |   14 --------------
 5 files changed, 4 insertions(+), 27 deletions(-)

New commits:
commit 98aa6284ae32027934bb8c4d379117ea3567f28f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    Revert "e2fsprogs: blkid is provided by util-linux instead from e2fsprogs 
from now"
    
    This reverts commit 04dda0b8397fc7d6624bba125deaff57a257eed6.
    
    Conflicts:
    
        disk/e2fsprogs/DETAILS
        disk/e2fsprogs/HISTORY

commit b86b89294b6949d1ea288613b84f60f8364c6162
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    Revert "util-linux 2.15"
    
    This reverts commit 81e6a8267ec6ddc56e059db8ef7dec78ff67db72.

commit e08710c7b52122953c3f7a1a7ab5e5dcc92403d1
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    Revert "util-linux: => 2.15 [aes]"
    
    This reverts commit 8d59389d4e290bf30bb0679b3539825a349c8e45.

commit 955f274fa5607b5e8a1785233a93b615202e3161
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    Revert "util-linux: blkid is provided by util-linux instead of e2fsprogs 
from now"
    
    This reverts commit 1e47209c76d71e77929f8a407b491e7c21792e5c.

commit 8991ed0755e70a3bf76e7e9666360b082c34bf9d
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    Revert "util-linux: updated aes version patch to 20090526"
    
    This reverts commit d66c3e0570dc2365ff7cf457019ad5cc127b0969.

diff --git a/disk/e2fsprogs/BUILD b/disk/e2fsprogs/BUILD
index 570a161..b267671 100755
--- a/disk/e2fsprogs/BUILD
+++ b/disk/e2fsprogs/BUILD
@@ -1,5 +1,3 @@
-OPTS="--disable-libblkid $OPTS" &&
-
 [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=$HOST"
 
 ./configure --host=${BUILD} \
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index d9489cf..7bbacd5 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,11 +1,6 @@
 2009-05-31 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: Updated to 1.41.6
 
-2009-05-12 Ladislav Hagara <hgr AT vabo.cz>
-       * BUILD: added --disable-libblkid
-         blkid is provided by util-linux instead from e2fsprogs from now
-       * DETAILS: PATCHLEVEL=1
-
 2009-04-24 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.41.5
 
diff --git a/utils/util-linux/BUILD b/utils/util-linux/BUILD
index 02bc5e4..70f437b 100755
--- a/utils/util-linux/BUILD
+++ b/utils/util-linux/BUILD
@@ -1,4 +1,3 @@
-OPTS="--with-fsprobe=builtin $OPTS" &&
 OPTS="--build=$BUILD $OPTS" &&
 
 if [[ $CROSS_INSTALL == on ]]; then
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index a47b446..1667602 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,8 +1,7 @@
            SPELL=util-linux
 if [[ $UL_VERSION == aes ]]; then
-         VERSION=2.15
-      PATCHLEVEL=1
-         SOURCE3=$SPELL-ng-$VERSION-20090526.diff.bz2
+         VERSION=2.14.2
+         SOURCE3=$SPELL-ng-$VERSION-20090214.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
@@ -11,12 +10,12 @@ if [[ $UL_VERSION == aes ]]; then
      SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
   SOURCE4_IGNORE=signature
 else
-         VERSION=2.15
+         VERSION=2.14.2
 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_DIRECTORY=$BUILD_DIRECTORY/$SPELL-ng-$VERSION
    SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL-ng/v$BRANCH/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.sign
       SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index a2da435..ba13e36 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,17 +1,3 @@
-2009-05-27 Vlad Glagolev <stealth AT sourcemage.org>
-       * DETAILS: updated aes patch to 20090526
-
-2009-05-12 Ladislav Hagara <hgr AT vabo.cz>
-       * BUILD: added --with-fsprobe=builtin
-         blkid is provided by util-linux instead of e2fsprogs from now
-       * DETAILS: PATCHLEVEL=1
-
-2009-05-11 Vlad Glagolev <stealth AT sourcemage.org>
-       * DETAILS: updated aes version to 2.15; quoting paths
-
-2009-05-06 Ladislav Hagara <hgr AT vabo.cz>
-       * DETAILS: 2.15
-
 2009-02-14 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated aes version to 2.14.2