Merge branch '2.7' into 2.8

libmpfr/.md5sum

@@ -1 +1,2 @@
+7ebae78de35cd5f3bf45d17285ea3d81  libmpfr-3.1.1-p2.patch.gz
 91d51c41fcf2799e4ee7a7126fc95c17  mpfr-3.1.1.tar.xz

libmpfr/Pkgfile

@@ -4,12 +4,14 @@
 # Depends on:  libgmp
 
 name=libmpfr
-version=3.1.1
+version=3.1.1-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
     ./configure --prefix=/usr
     make
     make DESTDIR=$PKG install

openssh/.md5sum

@@ -1,2 +1,2 @@
-3c9347aa67862881c5da3f3b1c08da7b  openssh-6.0p1.tar.gz
+3345cbf4efe90ffb06a78670ab2d05d5  openssh-6.1p1.tar.gz
 ce4ef44c7d80f6451170e6fe5c07d3f4  sshd

openssh/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  openssl zlib tcp_wrappers
 
 name=openssh
-version=6.0p1
+version=6.1p1
 release=1
 source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$name-$version.tar.gz sshd)