Merge branch '2.8' into 3.0

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

gvim/.md5sum

@@ -12,4 +12,5 @@ bd739c11c478b7ee352467d6caed871d  vim-7.3.471-515.xz
 a48bc97d01078fa6b396dc79f9916fa1  vim-7.3.516-600.xz
 c4608d5814f016a9d67fe2f13ab036fb  vim-7.3.601-659.xz
 9ffdd42550500b2a86f35c8191917c6f  vim-7.3.660-712.xz
+2af3bf40678d6616e1c2a093b750185c  vim-7.3.713-754.xz
 5b9510a17074e2b37d8bb38ae09edbf2  vim-7.3.tar.bz2

gvim/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  vim, gtk, xorg-libxt
 
 name=gvim
-version=7.3.712
+version=7.3.754
 release=1
 source=(ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2
         http://crux.nu/files/distfiles/vim-7.3.001-050.xz
@@ -20,6 +20,7 @@ source=(ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2
         http://crux.nu/files/distfiles/vim-7.3.516-600.xz
         http://crux.nu/files/distfiles/vim-7.3.601-659.xz
         http://crux.nu/files/distfiles/vim-7.3.660-712.xz
+        http://crux.nu/files/distfiles/vim-7.3.713-754.xz
         gvim.desktop)
 
 build () {

jre/.md5sum

@@ -1 +1 @@
-8e17fa7b2152ab11f915c6936542cc12  jre-7u9-linux-x64.tar.gz
+9ce426628b1cb2c16dd05fbd906440aa  jre-7u10-linux-x64.tar.gz

jre/Pkgfile

@@ -5,16 +5,12 @@
 # Packager:    Simone Rota, sip at crux dot nu
 
 name=jre
-version=1.7.0_09
+version=1.7.0_10
 release=1
-source=(file:///$name-7u9-linux-x64.tar.gz)
-
+source=(file:///$name-7u10-linux-x64.tar.gz)
 
 build(){
     cd $name$version
-    rm -rf $SRC/jre*/{man/ja,lib/{locale,deploy/messages_}}*
-    rm -rf $SRC/jre*/lib/fontconfig.{RedHat,SuSE,Sun,Turbo}.*
-    rm -rf $SRC/jre*/[A-Z]*
 
     install -d $PKG/usr/{bin,man,lib/$name$version}
     mv man/man1 $PKG/usr/man

samba/.md5sum

@@ -1,3 +1,3 @@
 448caca4745aef1a842f4fdb1aa62e1e  samba
-0c48bbeb9549fcda37f108aa3c2a817f  samba-3.6.9.tar.gz
+b5f0560c216122529b1c3b7f41c62567  samba-3.6.10.tar.gz
 fbaccda19afc8f75f6f0123cab82c87e  samba-config.patch

samba/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  ncurses openssl readline zlib tdb talloc libcap acl
 
 name=samba
-version=3.6.9
+version=3.6.10
 release=1
 source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
         samba-config.patch samba)

valgrind/.footprint

@@ -20,6 +20,7 @@ drwxr-xr-x	root/root	usr/include/valgrind/
 -rw-r--r--	root/root	usr/include/valgrind/libvex_emwarn.h
 -rw-r--r--	root/root	usr/include/valgrind/libvex_guest_amd64.h
 -rw-r--r--	root/root	usr/include/valgrind/libvex_guest_arm.h
+-rw-r--r--	root/root	usr/include/valgrind/libvex_guest_mips32.h
 -rw-r--r--	root/root	usr/include/valgrind/libvex_guest_offsets.h
 -rw-r--r--	root/root	usr/include/valgrind/libvex_guest_ppc32.h
 -rw-r--r--	root/root	usr/include/valgrind/libvex_guest_ppc64.h
@@ -41,6 +42,7 @@ drwxr-xr-x	root/root	usr/include/valgrind/
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_execontext.h
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_gdbserver.h
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_hashtable.h
+-rw-r--r--	root/root	usr/include/valgrind/pub_tool_inner.h
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_libcassert.h
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_libcbase.h
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_libcfile.h
@@ -52,6 +54,7 @@ drwxr-xr-x	root/root	usr/include/valgrind/
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_mallocfree.h
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_options.h
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_oset.h
+-rw-r--r--	root/root	usr/include/valgrind/pub_tool_poolalloc.h
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_redir.h
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_replacemalloc.h
 -rw-r--r--	root/root	usr/include/valgrind/pub_tool_seqmatch.h
@@ -71,8 +74,10 @@ drwxr-xr-x	root/root	usr/include/valgrind/vki/
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-arm-linux.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-darwin.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-linux.h
+-rw-r--r--	root/root	usr/include/valgrind/vki/vki-mips32-linux.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-posixtypes-amd64-linux.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-posixtypes-arm-linux.h
+-rw-r--r--	root/root	usr/include/valgrind/vki/vki-posixtypes-mips32-linux.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-posixtypes-ppc32-linux.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-posixtypes-ppc64-linux.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-posixtypes-s390x-linux.h
@@ -83,6 +88,7 @@ drwxr-xr-x	root/root	usr/include/valgrind/vki/
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-scnums-amd64-linux.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-scnums-arm-linux.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-scnums-darwin.h
+-rw-r--r--	root/root	usr/include/valgrind/vki/vki-scnums-mips32-linux.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-scnums-ppc32-linux.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-scnums-ppc64-linux.h
 -rw-r--r--	root/root	usr/include/valgrind/vki/vki-scnums-s390x-linux.h
@@ -101,6 +107,9 @@ drwxr-xr-x	root/root	usr/lib/valgrind/
 -rw-r--r--	root/root	usr/lib/valgrind/32bit-sse-valgrind-s1.xml
 -rw-r--r--	root/root	usr/lib/valgrind/32bit-sse-valgrind-s2.xml
 -rw-r--r--	root/root	usr/lib/valgrind/32bit-sse.xml
+-rw-r--r--	root/root	usr/lib/valgrind/64bit-avx-valgrind-s1.xml
+-rw-r--r--	root/root	usr/lib/valgrind/64bit-avx-valgrind-s2.xml
+-rw-r--r--	root/root	usr/lib/valgrind/64bit-avx.xml
 -rw-r--r--	root/root	usr/lib/valgrind/64bit-core-valgrind-s1.xml
 -rw-r--r--	root/root	usr/lib/valgrind/64bit-core-valgrind-s2.xml
 -rw-r--r--	root/root	usr/lib/valgrind/64bit-core.xml
@@ -110,6 +119,10 @@ drwxr-xr-x	root/root	usr/lib/valgrind/
 -rw-r--r--	root/root	usr/lib/valgrind/64bit-sse-valgrind-s1.xml
 -rw-r--r--	root/root	usr/lib/valgrind/64bit-sse-valgrind-s2.xml
 -rw-r--r--	root/root	usr/lib/valgrind/64bit-sse.xml
+-rw-r--r--	root/root	usr/lib/valgrind/amd64-avx-coresse-valgrind.xml
+-rw-r--r--	root/root	usr/lib/valgrind/amd64-avx-coresse.xml
+-rw-r--r--	root/root	usr/lib/valgrind/amd64-avx-linux-valgrind.xml
+-rw-r--r--	root/root	usr/lib/valgrind/amd64-avx-linux.xml
 -rw-r--r--	root/root	usr/lib/valgrind/amd64-coresse-valgrind.xml
 -rw-r--r--	root/root	usr/lib/valgrind/amd64-linux-valgrind.xml
 -rw-r--r--	root/root	usr/lib/valgrind/arm-core-valgrind-s1.xml
@@ -121,25 +134,52 @@ drwxr-xr-x	root/root	usr/lib/valgrind/
 -rw-r--r--	root/root	usr/lib/valgrind/arm-with-vfpv3-valgrind.xml
 -rw-r--r--	root/root	usr/lib/valgrind/arm-with-vfpv3.xml
 -rwxr-xr-x	root/root	usr/lib/valgrind/cachegrind-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/cachegrind-x86-linux
 -rwxr-xr-x	root/root	usr/lib/valgrind/callgrind-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/callgrind-x86-linux
 -rw-r--r--	root/root	usr/lib/valgrind/default.supp
 -rwxr-xr-x	root/root	usr/lib/valgrind/drd-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/drd-x86-linux
 -rwxr-xr-x	root/root	usr/lib/valgrind/exp-bbv-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/exp-bbv-x86-linux
 -rwxr-xr-x	root/root	usr/lib/valgrind/exp-dhat-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/exp-dhat-x86-linux
 -rwxr-xr-x	root/root	usr/lib/valgrind/exp-sgcheck-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/exp-sgcheck-x86-linux
 -rwxr-xr-x	root/root	usr/lib/valgrind/helgrind-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/helgrind-x86-linux
 -rw-r--r--	root/root	usr/lib/valgrind/i386-coresse-valgrind.xml
 -rw-r--r--	root/root	usr/lib/valgrind/i386-linux-valgrind.xml
 -rwxr-xr-x	root/root	usr/lib/valgrind/lackey-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/lackey-x86-linux
 -rw-r--r--	root/root	usr/lib/valgrind/libcoregrind-amd64-linux.a
+-rw-r--r--	root/root	usr/lib/valgrind/libcoregrind-x86-linux.a
 -rw-r--r--	root/root	usr/lib/valgrind/libreplacemalloc_toolpreload-amd64-linux.a
+-rw-r--r--	root/root	usr/lib/valgrind/libreplacemalloc_toolpreload-x86-linux.a
 -rw-r--r--	root/root	usr/lib/valgrind/libvex-amd64-linux.a
+-rw-r--r--	root/root	usr/lib/valgrind/libvex-x86-linux.a
 -rwxr-xr-x	root/root	usr/lib/valgrind/massif-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/massif-x86-linux
 -rwxr-xr-x	root/root	usr/lib/valgrind/memcheck-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/memcheck-x86-linux
+-rw-r--r--	root/root	usr/lib/valgrind/mips-cp0-valgrind-s1.xml
+-rw-r--r--	root/root	usr/lib/valgrind/mips-cp0-valgrind-s2.xml
+-rw-r--r--	root/root	usr/lib/valgrind/mips-cp0.xml
+-rw-r--r--	root/root	usr/lib/valgrind/mips-cpu-valgrind-s1.xml
+-rw-r--r--	root/root	usr/lib/valgrind/mips-cpu-valgrind-s2.xml
+-rw-r--r--	root/root	usr/lib/valgrind/mips-cpu.xml
+-rw-r--r--	root/root	usr/lib/valgrind/mips-fpu-valgrind-s1.xml
+-rw-r--r--	root/root	usr/lib/valgrind/mips-fpu-valgrind-s2.xml
+-rw-r--r--	root/root	usr/lib/valgrind/mips-fpu.xml
+-rw-r--r--	root/root	usr/lib/valgrind/mips-linux-valgrind.xml
+-rw-r--r--	root/root	usr/lib/valgrind/mips-linux.xml
 -rwxr-xr-x	root/root	usr/lib/valgrind/none-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/none-x86-linux
 -rw-r--r--	root/root	usr/lib/valgrind/power-altivec-valgrind-s1.xml
 -rw-r--r--	root/root	usr/lib/valgrind/power-altivec-valgrind-s2.xml
 -rw-r--r--	root/root	usr/lib/valgrind/power-altivec.xml
+-rw-r--r--	root/root	usr/lib/valgrind/power-core-valgrind-s1.xml
+-rw-r--r--	root/root	usr/lib/valgrind/power-core-valgrind-s2.xml
 -rw-r--r--	root/root	usr/lib/valgrind/power-core.xml
 -rw-r--r--	root/root	usr/lib/valgrind/power-fpu-valgrind-s1.xml
 -rw-r--r--	root/root	usr/lib/valgrind/power-fpu-valgrind-s2.xml
@@ -157,13 +197,34 @@ drwxr-xr-x	root/root	usr/lib/valgrind/
 -rw-r--r--	root/root	usr/lib/valgrind/powerpc-altivec32l.xml
 -rw-r--r--	root/root	usr/lib/valgrind/powerpc-altivec64l-valgrind.xml
 -rw-r--r--	root/root	usr/lib/valgrind/powerpc-altivec64l.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390-acr-valgrind-s1.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390-acr-valgrind-s2.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390-acr.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390-fpr-valgrind-s1.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390-fpr-valgrind-s2.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390-fpr.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390x-core64-valgrind-s1.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390x-core64-valgrind-s2.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390x-core64.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390x-generic-valgrind.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390x-generic.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390x-linux64-valgrind-s1.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390x-linux64-valgrind-s2.xml
+-rw-r--r--	root/root	usr/lib/valgrind/s390x-linux64.xml
 -rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_core-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_core-x86-linux.so
 -rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_drd-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_drd-x86-linux.so
 -rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_exp-dhat-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_exp-dhat-x86-linux.so
 -rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_exp-sgcheck-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_exp-sgcheck-x86-linux.so
 -rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_helgrind-x86-linux.so
 -rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_massif-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_massif-x86-linux.so
 -rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_memcheck-x86-linux.so
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/callgrind_annotate.1.gz

valgrind/.md5sum

@@ -1 +1 @@
-a855fda56edf05614f099dca316d1775  valgrind-3.7.0.tar.bz2
+288758010b271119a0ffc0183f1d6e38  valgrind-3.8.1.tar.bz2

valgrind/Pkgfile

@@ -4,7 +4,7 @@
 # Arch Maintainer: 
 
 name=valgrind
-version=3.7.0
+version=3.8.1
 release=1
 source=(http://$name.org/downloads/$name-$version.tar.bz2)