Merge branch '2.5' into 2.6

Conflicts: e2fsprogs/Pkgfile
2009-06-30 11:54:55 +02:00 · 2009-06-30 11:54:55 +02:00 · 3c0e247326
commit 3c0e247326
parent 4418edb012 f49fcfaef2
6 changed files with 8 additions and 9 deletions
--- a/e2fsprogs/.md5sum
+++ b/e2fsprogs/.md5sum
@ -1,2 +1,2 @@
-732c559db400c8fc994f4f38568c9f1f  e2fsprogs-1.41.6.tar.gz
+b55d2b557f1f17ff918e9201c1d730f5  e2fsprogs-1.41.7.tar.gz
 19d075d83b1fb6d0019eee6157dd0b41  e2fsprogs-symlink.patch
--- a/e2fsprogs/Pkgfile
+++ b/e2fsprogs/Pkgfile
@ -3,8 +3,8 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu

 name=e2fsprogs
-version=1.41.6
-release=2
+version=1.41.7
+release=1
 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \
        $name-symlink.patch)

@ -18,7 +18,6 @@ build() {
                --disable-debugfs \
                --disable-imager \
                --disable-e2initrd-helper \
-                --disable-evms \
                --disable-nls \
                --disable-fsck \
                --disable-libblkid
--- a/nasm/.md5sum
+++ b/nasm/.md5sum
@ -1 +1 @@
-da4977f6d9d9b8f00527f2c62109453b  nasm-2.05.01.tar.bz2
+0db94e88fd9b7a360f826f9ffd6c0fc7  nasm-2.06.tar.bz2
--- a/nasm/Pkgfile
+++ b/nasm/Pkgfile
@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu

 name=nasm
-version=2.05.01
+version=2.06
 release=1
 source=(http://www.nasm.us/pub/nasm/releasebuilds/$version/$name-$version.tar.bz2)

--- a/sed/.md5sum
+++ b/sed/.md5sum
@ -1 +1 @@
-31580bee0c109c0fc8f31c4cf204757e  sed-4.2.tar.gz
+7d310fbd76e01a01115075c1fd3f455a  sed-4.2.1.tar.bz2
--- a/sed/Pkgfile
+++ b/sed/Pkgfile
@ -3,9 +3,9 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu

 name=sed
-version=4.2
+version=4.2.1
 release=1
-source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
+source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2)

 build() {
    cd $name-$version