From 0085cc461ba462f4144d20dc6239c1e63404795f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 3 Dec 2012 12:35:32 +0100 Subject: [PATCH] gnutls: update to 3.1.5; SONAME majors bumped. --- common/shlibs | 3 +++ srcpkgs/gnutls/gnutls-devel.template | 6 +++--- srcpkgs/gnutls/template | 18 +++++++++--------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index ea0643620f..e2426e8ee5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -202,6 +202,9 @@ libgnutls.so.26 gnutls-2.6.6_1 libgnutlsxx.so.26 gnutls-2.6.6_1 libgnutls-extra.so.26 gnutls-2.6.6_1 libgnutls-openssl.so.26 gnutls-2.6.6_1 +libgnutls.so.28 gnutls-3.1.5_1 +libgnutlsxx.so.27 gnutls-3.1.5_1 +libgnutls-openssl.so.27 gnutls-3.1.5_1 libwrap.so.0 tcp_wrappers-libs-7.6_1 libdevmapper.so.1.02 device-mapper-2.02.54_1 libdevmapper-event.so.1.02 device-mapper-2.02.54_1 diff --git a/srcpkgs/gnutls/gnutls-devel.template b/srcpkgs/gnutls/gnutls-devel.template index db42ac080f..9c1ca9f64e 100644 --- a/srcpkgs/gnutls/gnutls-devel.template +++ b/srcpkgs/gnutls/gnutls-devel.template @@ -1,15 +1,15 @@ # Template file for 'libgrypt-devel'. # -depends="zlib-devel p11-kit-devel libtasn1-devel libgcrypt-devel gnutls>=2.12.18" +noarch=yes +depends="zlib-devel libtasn1-devel p11-kit-devel nettle-devel + ${sourcepkg}>=${version}" short_desc="${short_desc} -- development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - do_install() { vmove usr/include usr - vmove "usr/lib/*.a" usr/lib vmove usr/lib/pkgconfig usr/lib vmove usr/share/man/man3 usr/share/man vmove usr/share/info usr/share diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index bcf9e1b252..fdae5978ac 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -1,17 +1,16 @@ # Template build file for 'gnutls'. pkgname=gnutls -version=2.12.18 -#distfiles="ftp://ftp.gnutls.org/pub/gnutls/gnutls-$version.tar.bz2" -distfiles="http://mirror.symnds.com/software/GNU/$pkgname/$pkgname-$version.tar.bz2" -build_style=gnu-configure -configure_args="--with-lzo --with-zlib --disable-guile --with-libgcrypt" -makedepends="pkg-config zlib-devel lzo-devel readline-devel libgpg-error-devel libtasn1-devel libgcrypt-devel p11-kit-devel" +version=3.1.5 revision=1 +build_style=gnu-configure +configure_args="--with-zlib --disable-guile --disable-static + --disable-valgrind-tests" short_desc="GNU Transport Layer Security library" maintainer="Juan RP " homepage="http://www.gnu.org/software/gnutls/" license="GPL-3, LGPL-2.1" -checksum=780b12e3f05191316390611a3d9d982d29ca3f3abc234517b2fc542064b6f07a +distfiles="http://ftp.gnu.org/gnu/gnutls/gnutls-${version}.tar.xz" +checksum=2f095984dd9cbbf4dce417ecd81640fe47732322d025062b2c9a189d022de0d3 long_desc=" GnuTLS is a portable ANSI C based library which implements the TLS 1.0 and SSL 3.0 protocols. The library does not include any patented algorithms and @@ -29,5 +28,6 @@ long_desc=" Additionally GnuTLS provides an emulation API for the widely used OpenSSL library, to ease integration with existing applications." -subpackages="$pkgname-devel $pkgname-tools" - +subpackages="${pkgname}-devel ${pkgname}-tools" +makedepends="pkg-config lzo-devel readline-devel libgpg-error-devel + libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel"