Thu Feb 23 23:15:11 UTC 2012

3 files changed, 40 insertions, 8 deletions

diff --git a/multilib/lib32-gnutls/PKGBUILD b/multilib/lib32-gnutls/PKGBUILD
index 7cc6e57ca..c207fce68 100644
--- a/multilib/lib32-gnutls/PKGBUILD
+++ b/multilib/lib32-gnutls/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 66056 2012-02-22 16:55:31Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Christoph Vigano <mail at cvigano dot de>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
@@ -5,17 +6,17 @@
 # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
 _pkgbasename=gnutls
 pkgname=lib32-$_pkgbasename
-pkgver=3.0.12
+pkgver=3.0.13
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)"
 arch=('x86_64')
 license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/gnutls/"
-options=('!libtool' '!makeflags')
-depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit' $_pkgbasename)
+options=('!libtool')
+depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit>=0.11' $_pkgbasename)
 makedepends=('gcc-multilib' 'lib32-libidn')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.xz)
-md5sums=('685fe5c00786c04b39e9aac362fa0cac')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.xz buildfix.diff)
+md5sums=('ec549be557f31ea8c1738cb441ef23ec' '9b2a32b41391d95aeb8ddae3756fa191')
 
 build() {
   export CC="gcc -m32"
@@ -24,6 +25,8 @@ build() {
 
   cd ${srcdir}/${_pkgbasename}-${pkgver}
 
+  patch -Np1 -i ${srcdir}/buildfix.diff
+
   # build fails without --disable-hardware-acceleration because of assembler errors
   ./configure --prefix=/usr --libdir=/usr/lib32 \
     --with-zlib \
diff --git a/multilib/lib32-gnutls/buildfix.diff b/multilib/lib32-gnutls/buildfix.diff
new file mode 100644
index 000000000..23c749e9d
--- /dev/null
+++ b/multilib/lib32-gnutls/buildfix.diff
@@ -0,0 +1,28 @@
+index 17f6d3f..cc01dcd 100644 (file)
+
+
+--- a/tests/mini-loss-time.c
++++ b/tests/mini-loss-time.c
+@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
+     {
+       /* parent */
+       server (fd[0], server_packet);
++      kill(child, SIGTERM);
+     }
+   else 
+     {
+--- a/src/libopts/m4/libopts.m4
++++ b/src/libopts/m4/libopts.m4
+@@ -487,9 +487,9 @@ AC_DEFUN([LIBOPTS_CHECK_COMMON],[
+     fi])
+ 
+   AC_ARG_ENABLE([libopts-install],
+-    AC_HELP_STRING([--disable-libopts-install],
+-       [Do not install libopts with client installation]))
+-  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" != Xno])
++    AC_HELP_STRING([--enable-libopts-install],
++       [Install libopts with client installation]))
++  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" = Xyes])
+ 
+   [if test -z "${NEED_LIBOPTS_DIR}" ; then]
+      AC_MSG_CHECKING([whether autoopts-config can be found])
diff --git a/multilib/lib32-libssh2/PKGBUILD b/multilib/lib32-libssh2/PKGBUILD
index 88ac921e1..f97d8d02c 100644
--- a/multilib/lib32-libssh2/PKGBUILD
+++ b/multilib/lib32-libssh2/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Florian Pritz <flo@xssn.at>
-# $Id: PKGBUILD 60959 2011-12-19 19:12:57Z bluewind $
+# $Id: PKGBUILD 66052 2012-02-22 16:41:55Z bluewind $
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,17 +7,18 @@
 
 _pkgbasename=libssh2
 pkgname=lib32-$_pkgbasename
-pkgver=1.3.0
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts (32-bit)"
 url="http://www.libssh2.org/"
 arch=('i686' 'x86_64')
 license=('BSD')
 depends=('lib32-openssl' $_pkgbasename)
+provides=('libssh2.so')
 makedepends=('zlib' "gcc-multilib")
 options=('!libtool')
 source=("http://www.libssh2.org/download/${_pkgbasename}-${pkgver}.tar.gz")
-md5sums=('6425331899ccf1015f1ed79448cb4709')
+md5sums=('ee670161d8c5dff93ae84a3f34f15669')
 
 build() {
   export CC="gcc -m32"