Date: Thursday, June 11, 2015 @ 17:42:40
Author: heftig
Revision: 240588
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
glib-networking/repos/testing-i686/
glib-networking/repos/testing-i686/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
(from rev 240587,
glib-networking/trunk/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch)
glib-networking/repos/testing-i686/PKGBUILD
(from rev 240587, glib-networking/trunk/PKGBUILD)
glib-networking/repos/testing-i686/glib-networking.install
(from rev 240587, glib-networking/trunk/glib-networking.install)
glib-networking/repos/testing-i686/skip-test-needs-glib-243.patch
(from rev 240587, glib-networking/trunk/skip-test-needs-glib-243.patch)
glib-networking/repos/testing-x86_64/
glib-networking/repos/testing-x86_64/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
(from rev 240587,
glib-networking/trunk/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch)
glib-networking/repos/testing-x86_64/PKGBUILD
(from rev 240587, glib-networking/trunk/PKGBUILD)
glib-networking/repos/testing-x86_64/glib-networking.install
(from rev 240587, glib-networking/trunk/glib-networking.install)
glib-networking/repos/testing-x86_64/skip-test-needs-glib-243.patch
(from rev 240587, glib-networking/trunk/skip-test-needs-glib-243.patch)
--------------------------------------------------------------------------------+
testing-i686/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
| 36 ++++++++
testing-i686/PKGBUILD
| 42 ++++++++++
testing-i686/glib-networking.install
| 11 ++
testing-i686/skip-test-needs-glib-243.patch
| 28 ++++++
testing-x86_64/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
| 36 ++++++++
testing-x86_64/PKGBUILD
| 42 ++++++++++
testing-x86_64/glib-networking.install
| 11 ++
testing-x86_64/skip-test-needs-glib-243.patch
| 28 ++++++
8 files changed, 234 insertions(+)
Copied:
glib-networking/repos/testing-i686/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
(from rev 240587,
glib-networking/trunk/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch)
===================================================================
---
testing-i686/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
(rev 0)
+++
testing-i686/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
2015-06-11 15:42:40 UTC (rev 240588)
@@ -0,0 +1,36 @@
+From ad464b856318691c1277dd3239573d18dd04bb08 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@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
+
Copied: glib-networking/repos/testing-i686/PKGBUILD (from rev 240587,
glib-networking/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-06-11 15:42:40 UTC (rev 240588)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+
+pkgname=glib-networking
+pkgver=2.44.0
+pkgrel=3
+pkgdesc="Network-related giomodules for glib"
+arch=(i686 x86_64)
+url="http://www.gtk.org/";
+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:0:4}/$pkgname-$pkgver.tar.xz
+ 0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch)
+sha256sums=('8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346'
+ '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/$pkgname --disable-static \
+ --disable-installed-tests
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -j1 -k check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install testfiles_DATA=
+}
+
+# vim:set ts=2 sw=2 et:
Copied: glib-networking/repos/testing-i686/glib-networking.install (from rev
240587, glib-networking/trunk/glib-networking.install)
===================================================================
--- testing-i686/glib-networking.install (rev 0)
+++ testing-i686/glib-networking.install 2015-06-11 15:42:40 UTC (rev
240588)
@@ -0,0 +1,11 @@
+post_install() {
+ gio-querymodules /usr/lib/gio/modules
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: glib-networking/repos/testing-i686/skip-test-needs-glib-243.patch (from
rev 240587, glib-networking/trunk/skip-test-needs-glib-243.patch)
===================================================================
--- testing-i686/skip-test-needs-glib-243.patch (rev 0)
+++ testing-i686/skip-test-needs-glib-243.patch 2015-06-11 15:42:40 UTC (rev
240588)
@@ -0,0 +1,28 @@
+From 17613e50901c50fedcfe3542f0dc93630c9b2884 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain.l...@canonical.com>
+Date: Wed, 10 Dec 2014 12:05:19 +0000
+Subject: tls/tests: skip test_create_certificate_chain if not running against
+ glib 2.43
+
+https://bugzilla.gnome.org/show_bug.cgi?id=741331
+
+diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c
+index 97c1793..7d3f031 100644
+--- a/tls/tests/certificate.c
++++ b/tls/tests/certificate.c
+@@ -226,6 +226,12 @@ test_create_certificate_chain (void)
+ GTlsCertificate *cert, *intermediate, *root;
+ GError *error = NULL;
+
++ if (glib_check_version (2, 43, 0))
++ {
++ g_test_skip ("This test requires glib 2.43");
++ return;
++ }
++
+ cert = g_tls_certificate_new_from_file (tls_test_file_path ("chain.pem"),
&error);
+ g_assert_no_error (error);
+ g_assert (G_IS_TLS_CERTIFICATE (cert));
+--
+cgit v0.10.2
+
Copied:
glib-networking/repos/testing-x86_64/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
(from rev 240587,
glib-networking/trunk/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch)
===================================================================
---
testing-x86_64/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
(rev 0)
+++
testing-x86_64/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
2015-06-11 15:42:40 UTC (rev 240588)
@@ -0,0 +1,36 @@
+From ad464b856318691c1277dd3239573d18dd04bb08 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@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
+
Copied: glib-networking/repos/testing-x86_64/PKGBUILD (from rev 240587,
glib-networking/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-06-11 15:42:40 UTC (rev 240588)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+
+pkgname=glib-networking
+pkgver=2.44.0
+pkgrel=3
+pkgdesc="Network-related giomodules for glib"
+arch=(i686 x86_64)
+url="http://www.gtk.org/";
+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:0:4}/$pkgname-$pkgver.tar.xz
+ 0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch)
+sha256sums=('8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346'
+ '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/$pkgname --disable-static \
+ --disable-installed-tests
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -j1 -k check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install testfiles_DATA=
+}
+
+# vim:set ts=2 sw=2 et:
Copied: glib-networking/repos/testing-x86_64/glib-networking.install (from rev
240587, glib-networking/trunk/glib-networking.install)
===================================================================
--- testing-x86_64/glib-networking.install (rev 0)
+++ testing-x86_64/glib-networking.install 2015-06-11 15:42:40 UTC (rev
240588)
@@ -0,0 +1,11 @@
+post_install() {
+ gio-querymodules /usr/lib/gio/modules
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: glib-networking/repos/testing-x86_64/skip-test-needs-glib-243.patch
(from rev 240587, glib-networking/trunk/skip-test-needs-glib-243.patch)
===================================================================
--- testing-x86_64/skip-test-needs-glib-243.patch
(rev 0)
+++ testing-x86_64/skip-test-needs-glib-243.patch 2015-06-11 15:42:40 UTC
(rev 240588)
@@ -0,0 +1,28 @@
+From 17613e50901c50fedcfe3542f0dc93630c9b2884 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain.l...@canonical.com>
+Date: Wed, 10 Dec 2014 12:05:19 +0000
+Subject: tls/tests: skip test_create_certificate_chain if not running against
+ glib 2.43
+
+https://bugzilla.gnome.org/show_bug.cgi?id=741331
+
+diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c
+index 97c1793..7d3f031 100644
+--- a/tls/tests/certificate.c
++++ b/tls/tests/certificate.c
+@@ -226,6 +226,12 @@ test_create_certificate_chain (void)
+ GTlsCertificate *cert, *intermediate, *root;
+ GError *error = NULL;
+
++ if (glib_check_version (2, 43, 0))
++ {
++ g_test_skip ("This test requires glib 2.43");
++ return;
++ }
++
+ cert = g_tls_certificate_new_from_file (tls_test_file_path ("chain.pem"),
&error);
+ g_assert_no_error (error);
+ g_assert (G_IS_TLS_CERTIFICATE (cert));
+--
+cgit v0.10.2
+
