summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2011-05-13 17:11:54 +0400
committerGeorge Sherwood2011-05-14 09:39:12 -0500
commitd0f0e53686c926bf84a53123b63ab239d032db59 (patch)
tree38d2fe8969270541d1e312fdfc14c1e5725a322f
parent532bcf055528957d39605c4fdc8ea0b9180e8cc5 (diff)
util-linux: => 2.19.1 [aes] (security)
(cherry picked from commit 969ff33da3b233daa41f11a20672b3a3ae792ed8)
-rwxr-xr-xutils/util-linux/DETAILS16
-rw-r--r--utils/util-linux/HISTORY4
2 files changed, 8 insertions, 12 deletions
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index a0db34a2b7..aa1b6219a0 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,16 +1,8 @@
SPELL=util-linux
if [[ $UL_VERSION == aes ]]; then
- VERSION=2.18
- SECURITY_PATCH=1
- 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/v$BRANCH/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.sign
- SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
- SOURCE3=$SPELL-ng-$VERSION-20100706.diff.bz2
+ VERSION=2.19.1
+ SECURITY_PATCH=2
+ SOURCE3=$SPELL-$VERSION-20110510.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
@@ -21,6 +13,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-ng-$VERSION"
else
VERSION=2.19.1
SECURITY_PATCH=2
+fi
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
@@ -29,7 +22,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[0]=$SOURCE_URL.sign
SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-fi
WEB_SITE=http://userweb.kernel.org/~kzak/util-linux-ng/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 85c43c50d8..052d3a489b 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,7 @@
+2011-05-13 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated aes version to 2.19.1 (security); updated aes patch
+ to 20110510
+
2011-05-02 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.19.1, SECURITY_PATCH=2, CVE-2011-{1089,1676,1677}