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.
./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