Merge branch '2.8' into 3.0

Conflicts:
	jre/.footprint
	jre/.md5sum
	jre/Pkgfile

jre/.md5sum

@@ -1 +1 @@
-9ce426628b1cb2c16dd05fbd906440aa  jre-7u10-linux-x64.tar.gz
+78872a8326394b5aeb1ac58288db66ed  jre-7u11-linux-x64.tar.gz

jre/Pkgfile

@@ -5,9 +5,9 @@
 # Packager:    Simone Rota, sip at crux dot nu
 
 name=jre
-version=1.7.0_10
+version=1.7.0_11
 release=1
-source=(file:///$name-7u10-linux-x64.tar.gz)
+source=(file:///$name-7u11-linux-x64.tar.gz)
 
 build(){
     cd $name$version

llvm/.md5sum

@@ -1,2 +1,2 @@
 3896ef4334df08563b05d0848ba80582  clang-3.2.src.tar.gz
-71610289bbc819e3e15fdd562809a2d7  llvm-3.2.src.tar.gz
+3242192df982dfb0725c4a0ff27d6366  llvm-3.2.src.tar.gz

mplayer/.md5sum

@@ -1,3 +1,3 @@
 1ecd31d17b51f16332b1fcc7da36b312  font-arial-iso-8859-1.tar.bz2
-c72614f7e1a3485db7b6f8a9ba4a49de  mplayer-2013-01-10.tar.bz2
+1a483b2d3138cb865a226325820c6b89  mplayer-2013-01-14.tar.bz2
 c64631601912913f3e5dfbecc3b79d44  mplayer.conf

mplayer/Pkgfile

@@ -6,7 +6,7 @@
 # Nice to have: libsdl, libjpeg, libpng, lame, zlib, libogg, libvorbis, cdparanoia, win32-essential-codecs, faac, x264, libdvdnav, libdca
 
 name=mplayer
-version=2013-01-10
+version=2013-01-14
 release=1
 source=(http://crux.nu/~tek/mplayer-$version.tar.bz2
   http://www1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2

samhain/.md5sum

@@ -1 +1 @@
-8307f568a15a706192738ce9f3c72471  samhain_signed-3.0.9.tar.gz
+24bc9acafaa104cf87c65019fc425cb2  samhain_signed-3.0.10.tar.gz

samhain/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=samhain
-version=3.0.9
+version=3.0.10
 release=1
 source=(http://la-samhna.de/archive/${name}_signed-$version.tar.gz)