Merge branch '3.1' into 3.2

2015-07-06 11:54:57 +02:00 · 2015-07-06 11:54:57 +02:00 · cfef3ddab5
commit cfef3ddab5
parent f23f0c6fc9 5eb370f64d
10 changed files with 16 additions and 10 deletions
--- a/coreutils/.md5sum
+++ b/coreutils/.md5sum
@ -1,2 +1,2 @@
-abed135279f87ad6762ce57ff6d89c41  coreutils-8.23.tar.xz
+40efdbce865d2458d8da0a9dcee7c16c  coreutils-8.24.tar.xz
 e14ef9dd59a7e6c7f3ae706771964d75  coreutils-uname.patch
--- a/coreutils/Pkgfile
+++ b/coreutils/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  libgmp acl libcap

 name=coreutils
-version=8.23
+version=8.24
 release=1
 source=(http://ftp.gnu.org/pub/gnu/$name/$name-$version.tar.xz
        coreutils-uname.patch)
--- a/libdevmapper/.md5sum
+++ b/libdevmapper/.md5sum
@ -1 +1 @@
-5ae469f1a021729d3db9d269077ad4fe  LVM2.2.02.123.tgz
+da8d81a6a2ea235025795d9e001a6ae3  LVM2.2.02.124.tgz
--- a/libdevmapper/Pkgfile
+++ b/libdevmapper/Pkgfile
@ -4,12 +4,12 @@
 # Depends on:  eudev

 name=libdevmapper
-version=1.02.100
+version=1.02.101
 release=1
-source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.2.02.123.tgz)
+source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.2.02.124.tgz)

 build() {
-    cd LVM2.2.02.123
+    cd LVM2.2.02.124

    # needed for static linking with eudev
    export UDEV_LIBS="$(pkg-config --libs --static libudev)"
--- a/libmpfr/.md5sum
+++ b/libmpfr/.md5sum
@ -1 +1,2 @@
+185288424f0053b6db9c5544660b8e80  libmpfr-3.1.3-p2.patch.gz
 6969398cd2fbc56a6af570b5273c56a9  mpfr-3.1.3.tar.xz
--- a/libmpfr/Pkgfile
+++ b/libmpfr/Pkgfile
@ -4,12 +4,15 @@
 # Depends on:  libgmp

 name=libmpfr
-version=3.1.3
+version=3.1.3-p2
 release=1
-source=(http://www.mpfr.org/mpfr-${version%-*}/mpfr-${version%-*}.tar.xz)
+source=(http://www.mpfr.org/mpfr-${version%-*}/mpfr-${version%-*}.tar.xz
+        $name-$version.patch.gz)

 build() {
    cd mpfr-${version%-*}
+    gunzip -c $SRC/$name-$version.patch.gz | patch -p1
+    touch doc/mpfr.info
    ./configure --prefix=/usr
    make
    make DESTDIR=$PKG install
--- a/libmpfr/libmpfr-3.1.3-p2.patch.gz
+++ b/libmpfr/libmpfr-3.1.3-p2.patch.gz
--- a/vim/.footprint
+++ b/vim/.footprint
@ -210,6 +210,7 @@ drwxr-xr-x	root/root	usr/share/vim/doc/
 -rw-r--r--	root/root	usr/share/vim/doc/pattern.txt
 -rw-r--r--	root/root	usr/share/vim/doc/pi_getscript.txt
 -rw-r--r--	root/root	usr/share/vim/doc/pi_gzip.txt
+-rw-r--r--	root/root	usr/share/vim/doc/pi_logipat.txt
 -rw-r--r--	root/root	usr/share/vim/doc/pi_netrw.txt
 -rw-r--r--	root/root	usr/share/vim/doc/pi_paren.txt
 -rw-r--r--	root/root	usr/share/vim/doc/pi_spec.txt
@ -608,6 +609,7 @@ drwxr-xr-x	root/root	usr/share/vim/indent/
 drwxr-xr-x	root/root	usr/share/vim/plugin/
 -rw-r--r--	root/root	usr/share/vim/plugin/getscriptPlugin.vim
 -rw-r--r--	root/root	usr/share/vim/plugin/gzip.vim
+-rw-r--r--	root/root	usr/share/vim/plugin/logiPat.vim
 -rw-r--r--	root/root	usr/share/vim/plugin/matchparen.vim
 -rw-r--r--	root/root	usr/share/vim/plugin/netrwPlugin.vim
 -rw-r--r--	root/root	usr/share/vim/plugin/rrhelper.vim
--- a/vim/.md5sum
+++ b/vim/.md5sum
@ -1 +1 @@
-eb3c5f273a8e518a39c0fd6e691e2903  vim-7.4.703.tar.xz
+2952442ac4c7a2ffb7ba0d3705c639c4  vim-7.4.764.tar.xz
--- a/vim/Pkgfile
+++ b/vim/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  ncurses acl

 name=vim
-version=7.4.703
+version=7.4.764
 release=1
 source=(http://crux.nu/files/distfiles/$name-$version.tar.xz)