Merge branch '2.4' into 2.5

nasm/.md5sum

@@ -1 +1 @@
-84ce41ef7df84797add8f3cf54ae5975  nasm-2.04.tar.bz2
+71871d7758a21f07f057cea734ec59d9  nasm-2.05.tar.bz2

nasm/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=nasm
-version=2.04
+version=2.05
 release=1
 source=(http://www.nasm.us/pub/nasm/releasebuilds/$version/$name-$version.tar.bz2)
 

nfs-utils/.md5sum

@@ -1,4 +1,4 @@
 c5ccf58f5f9f57aba75c8b72219eb6e6  exports
 f75dd45017a56ab4ecb6e87ef40aba78  nfs
-167d231850b00c7c63300747aeb94c38  nfs-utils-1.1.3.tar.gz
+3ed5b9cb73fd1c9b358c7bfa7a6ae150  nfs-utils-1.1.4.tar.bz2
 7222d95af7b1313985505d1494927ae5  nfsserver

nfs-utils/Pkgfile

@@ -3,9 +3,9 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=nfs-utils
-version=1.1.3
+version=1.1.4
 release=1
-source=(http://dl.sourceforge.net/nfs/$name-$version.tar.gz \
+source=(http://dl.sourceforge.net/nfs/$name-$version.tar.bz2 \
         exports nfs nfsserver)
 
 build () {