diff options
Diffstat (limited to 'abs')
| -rw-r--r-- | abs/extra/glib-networking/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch | 36 | ||||
| -rw-r--r-- | abs/extra/glib-networking/PKGBUILD | 43 |
2 files changed, 63 insertions, 16 deletions
diff --git a/abs/extra/glib-networking/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch b/abs/extra/glib-networking/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch new file mode 100644 index 0000000..1728d39 --- /dev/null +++ b/abs/extra/glib-networking/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch @@ -0,0 +1,36 @@ +From ad464b856318691c1277dd3239573d18dd04bb08 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Tue, 28 Apr 2015 22:09:33 +0200 +Subject: [PATCH] gnutls: Switch backend priorities so gnutls-pkcs11 is + preferred + +--- + tls/gnutls/gtlsbackend-gnutls-pkcs11.c | 2 +- + tls/gnutls/gtlsbackend-gnutls.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tls/gnutls/gtlsbackend-gnutls-pkcs11.c b/tls/gnutls/gtlsbackend-gnutls-pkcs11.c +index 48be45e..429acbb 100644 +--- a/tls/gnutls/gtlsbackend-gnutls-pkcs11.c ++++ b/tls/gnutls/gtlsbackend-gnutls-pkcs11.c +@@ -61,5 +61,5 @@ g_tls_backend_gnutls_pkcs11_register (GIOModule *module) + g_io_extension_point_implement (G_TLS_BACKEND_EXTENSION_POINT_NAME, + g_tls_backend_gnutls_pkcs11_get_type(), + "gnutls-pkcs11", +- -5); ++ 0); + } +diff --git a/tls/gnutls/gtlsbackend-gnutls.c b/tls/gnutls/gtlsbackend-gnutls.c +index 55ec1a5..ca79b92 100644 +--- a/tls/gnutls/gtlsbackend-gnutls.c ++++ b/tls/gnutls/gtlsbackend-gnutls.c +@@ -310,5 +310,5 @@ g_tls_backend_gnutls_register (GIOModule *module) + g_io_extension_point_implement (G_TLS_BACKEND_EXTENSION_POINT_NAME, + g_tls_backend_gnutls_get_type(), + "gnutls", +- 0); ++ -5); + } +-- +2.3.6 + diff --git a/abs/extra/glib-networking/PKGBUILD b/abs/extra/glib-networking/PKGBUILD index d2ed8c3..46869e8 100644 --- a/abs/extra/glib-networking/PKGBUILD +++ b/abs/extra/glib-networking/PKGBUILD @@ -1,31 +1,42 @@ -# $Id: PKGBUILD 159094 2012-05-15 14:33:52Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.32.3 +pkgver=2.46.1 pkgrel=1 pkgdesc="Network-related giomodules for glib" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') -makedepends=('intltool') -options=('!libtool') +license=(GPL2) +depends=(glib2 libproxy gnutls ca-certificates gsettings-desktop-schemas) +makedepends=(intltool) install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('39fe23e86a57bb7a8a67c65668394ad0fbe2d43960c1f9d68311d5d13ef1e5cf') +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz + 0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch) +sha256sums=('d5034214217f705891b6c9e719cc2c583c870bfcfdc454ebbb5e5e8940ac90b1' + '5d12c3b8905f67a93adc884920f7e062404b723e9d2e56f935b914e58a20b29e') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch +} build() { - cd "$pkgname-$pkgver" - ./configure \ - --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/glib-networking --disable-static + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/$pkgname --disable-static \ + --disable-installed-tests make } +check() { + cd $pkgname-$pkgver + make -j1 -k check +} + package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install testfiles_DATA= } # vim:set ts=2 sw=2 et: |