diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-22 17:06:20 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-22 17:06:20 +0100 |
| commit | 47d70348352503e92ba694a6a683f629eaa18215 (patch) | |
| tree | 7fb6f5ec75596b795dee52cfa35e3ef00a047cfb /extra/gnutls | |
| parent | c0bcbcf4015ba2388cb0f0bd418e5242f9613b43 (diff) | |
| parent | 1f55cedf5ea357497d2a98eb2be78d8dab4a9665 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/hostapd/PKGBUILD
community/discid/PKGBUILD
community/dumb/PKGBUILD
community/dynamite/PKGBUILD
community/echat/PKGBUILD
community/fbdump/PKGBUILD
community/fldiff/PKGBUILD
community/flightgear/PKGBUILD
community/fonteditfs/PKGBUILD
community/freehdl/PKGBUILD
community/unclutter/PKGBUILD
community/unpaper/PKGBUILD
community/wmii/PKGBUILD
community/xkeycaps/PKGBUILD
community/xl2tpd/PKGBUILD
community/xmmsctrl/PKGBUILD
extra/gnutls/PKGBUILD
extra/inkscape/PKGBUILD
extra/ntp/PKGBUILD
extra/transmission/PKGBUILD
multilib/lib32-libpng/PKGBUILD
testing/libreoffice/PKGBUILD
Diffstat (limited to 'extra/gnutls')
| -rw-r--r-- | extra/gnutls/PKGBUILD | 24 | ||||
| -rw-r--r-- | extra/gnutls/buildfix.diff | 28 |
2 files changed, 43 insertions, 9 deletions
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 1229e9833..1fad95056 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,27 +1,33 @@ -# $Id: PKGBUILD 147016 2012-01-20 19:27:51Z andyrtr $ +# $Id: PKGBUILD 150689 2012-02-20 10:15:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.12 -pkgrel=1 +pkgver=3.0.13 +pkgrel=2 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install -options=('!libtool' '!zipman' '!makeflags') -depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit') -[ "$CARCH" = "mips64el" ] || makedepends=('valgrind') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) -md5sums=('685fe5c00786c04b39e9aac362fa0cac') +options=('!libtool' '!zipman') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11') +makedepends=('strace') +[ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') +source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig} + buildfix.diff) +md5sums=('ec549be557f31ea8c1738cb441ef23ec' + 'a6a9a1d148abd6377e7634eb03bdaf7c' + '9b2a32b41391d95aeb8ddae3756fa191') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # fix hanging make check - http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commit;h=642e6b5ca996325dc0ca6401a3b87039408b2585 + patch -Np1 -i ${srcdir}/buildfix.diff ./configure --prefix=/usr \ --with-zlib \ --disable-static \ --disable-guile \ - --enable-valgrind-tests # x86_64 test are all passed. some fail in i686 chroot + --enable-valgrind-tests make } diff --git a/extra/gnutls/buildfix.diff b/extra/gnutls/buildfix.diff new file mode 100644 index 000000000..23c749e9d --- /dev/null +++ b/extra/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]) |