[arch-commits] Commit in gcr/repos (10 files)
Jan de Groot
jgc at archlinux.org
Sun Mar 8 15:36:24 UTC 2015
Date: Sunday, March 8, 2015 @ 16:36:23
Author: jgc
Revision: 233092
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
gcr/repos/gnome-unstable-i686/
gcr/repos/gnome-unstable-i686/10-gcr.conf
(from rev 233091, gcr/trunk/10-gcr.conf)
gcr/repos/gnome-unstable-i686/PKGBUILD
(from rev 233091, gcr/trunk/PKGBUILD)
gcr/repos/gnome-unstable-i686/gcr.install
(from rev 233091, gcr/trunk/gcr.install)
gcr/repos/gnome-unstable-i686/skip-annotation-gck_object_cache_get_attributes.patch
(from rev 233091, gcr/trunk/skip-annotation-gck_object_cache_get_attributes.patch)
gcr/repos/gnome-unstable-x86_64/
gcr/repos/gnome-unstable-x86_64/10-gcr.conf
(from rev 233091, gcr/trunk/10-gcr.conf)
gcr/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 233091, gcr/trunk/PKGBUILD)
gcr/repos/gnome-unstable-x86_64/gcr.install
(from rev 233091, gcr/trunk/gcr.install)
gcr/repos/gnome-unstable-x86_64/skip-annotation-gck_object_cache_get_attributes.patch
(from rev 233091, gcr/trunk/skip-annotation-gck_object_cache_get_attributes.patch)
-----------------------------------------------------------------------------+
gnome-unstable-i686/10-gcr.conf | 3
gnome-unstable-i686/PKGBUILD | 48 ++++++++++
gnome-unstable-i686/gcr.install | 14 ++
gnome-unstable-i686/skip-annotation-gck_object_cache_get_attributes.patch | 33 ++++++
gnome-unstable-x86_64/10-gcr.conf | 3
gnome-unstable-x86_64/PKGBUILD | 48 ++++++++++
gnome-unstable-x86_64/gcr.install | 14 ++
gnome-unstable-x86_64/skip-annotation-gck_object_cache_get_attributes.patch | 33 ++++++
8 files changed, 196 insertions(+)
Copied: gcr/repos/gnome-unstable-i686/10-gcr.conf (from rev 233091, gcr/trunk/10-gcr.conf)
===================================================================
--- gnome-unstable-i686/10-gcr.conf (rev 0)
+++ gnome-unstable-i686/10-gcr.conf 2015-03-08 15:36:23 UTC (rev 233092)
@@ -0,0 +1,3 @@
+ at users - memlock 1024
+
+# vim:set ft=limits:
Copied: gcr/repos/gnome-unstable-i686/PKGBUILD (from rev 233091, gcr/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2015-03-08 15:36:23 UTC (rev 233092)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=gcr
+pkgver=3.15.90
+pkgrel=1
+pkgdesc="A library for bits of crypto UI and parsing"
+arch=(i686 x86_64)
+url="http://www.gnome.org"
+license=('GPL2')
+depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt'
+ 'p11-kit')
+makedepends=('intltool' 'gobject-introspection' 'python' 'vala' 'libxslt')
+options=('!makeflags')
+install=gcr.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ 10-gcr.conf
+ skip-annotation-gck_object_cache_get_attributes.patch)
+sha256sums=('b0ad0cfb9f504cda67e740f79a53b5d19c9814a07b7f257d47fbf0409376efe2'
+ '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc'
+ 'cc4056b4cdb79ce7804ae7562d62ff108a39244bd0fe673fec8c1aa4bf193411')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i ../skip-annotation-gck_object_cache_get_attributes.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr \
+ --libexec=/usr/lib/gcr \
+ --disable-static \
+ --disable-update-mime \
+ --disable-schemas-compile
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ # gcr wants to lock some memory to prevent swapping out private keys
+ # https://bugs.archlinux.org/task/32616
+ # https://bugzilla.gnome.org/show_bug.cgi?id=688161
+ install -Dm644 ../10-gcr.conf "$pkgdir/etc/security/limits.d/10-gcr.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: gcr/repos/gnome-unstable-i686/gcr.install (from rev 233091, gcr/trunk/gcr.install)
===================================================================
--- gnome-unstable-i686/gcr.install (rev 0)
+++ gnome-unstable-i686/gcr.install 2015-03-08 15:36:23 UTC (rev 233092)
@@ -0,0 +1,14 @@
+post_install () {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-mime-database /usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade () {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: gcr/repos/gnome-unstable-i686/skip-annotation-gck_object_cache_get_attributes.patch (from rev 233091, gcr/trunk/skip-annotation-gck_object_cache_get_attributes.patch)
===================================================================
--- gnome-unstable-i686/skip-annotation-gck_object_cache_get_attributes.patch (rev 0)
+++ gnome-unstable-i686/skip-annotation-gck_object_cache_get_attributes.patch 2015-03-08 15:36:23 UTC (rev 233092)
@@ -0,0 +1,33 @@
+From 05ab60fb80ec9e1eafb6859f050de32269cdddc2 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau at redhat.com>
+Date: Thu, 5 Mar 2015 09:17:41 +0100
+Subject: Add (skip) annotation to gck_object_cache_get_attributes
+
+This works around a bug in vala 0.27.1/git master where it would call
+this method in the implementation of Pkcs11Certificate::set_property in
+seahorse. This causes an infinite loop as
+Pkcs11Certificate is an implementation of the GckObjectCacheInterface,
+so calling gck_object_cache_get_attributes() for ::set_property which in
+turn calls g_object_set(self, "attributes", value, NULL); is going to
+loop.
+
+This can be reverted once vala is fixed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=745629
+
+diff --git a/gck/gck-object-cache.c b/gck/gck-object-cache.c
+index 2325bfa..8da15cb 100644
+--- a/gck/gck-object-cache.c
++++ b/gck/gck-object-cache.c
+@@ -83,7 +83,7 @@ gck_object_cache_default_init (GckObjectCacheIface *iface)
+ }
+
+ /**
+- * gck_object_cache_get_attributes:
++ * gck_object_cache_get_attributes: (skip):
+ * @object: an object with an attribute cache
+ *
+ * Gets the attributes cached on this object.
+--
+cgit v0.10.2
+
Copied: gcr/repos/gnome-unstable-x86_64/10-gcr.conf (from rev 233091, gcr/trunk/10-gcr.conf)
===================================================================
--- gnome-unstable-x86_64/10-gcr.conf (rev 0)
+++ gnome-unstable-x86_64/10-gcr.conf 2015-03-08 15:36:23 UTC (rev 233092)
@@ -0,0 +1,3 @@
+ at users - memlock 1024
+
+# vim:set ft=limits:
Copied: gcr/repos/gnome-unstable-x86_64/PKGBUILD (from rev 233091, gcr/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2015-03-08 15:36:23 UTC (rev 233092)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=gcr
+pkgver=3.15.90
+pkgrel=1
+pkgdesc="A library for bits of crypto UI and parsing"
+arch=(i686 x86_64)
+url="http://www.gnome.org"
+license=('GPL2')
+depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt'
+ 'p11-kit')
+makedepends=('intltool' 'gobject-introspection' 'python' 'vala' 'libxslt')
+options=('!makeflags')
+install=gcr.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ 10-gcr.conf
+ skip-annotation-gck_object_cache_get_attributes.patch)
+sha256sums=('b0ad0cfb9f504cda67e740f79a53b5d19c9814a07b7f257d47fbf0409376efe2'
+ '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc'
+ 'cc4056b4cdb79ce7804ae7562d62ff108a39244bd0fe673fec8c1aa4bf193411')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i ../skip-annotation-gck_object_cache_get_attributes.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr \
+ --libexec=/usr/lib/gcr \
+ --disable-static \
+ --disable-update-mime \
+ --disable-schemas-compile
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ # gcr wants to lock some memory to prevent swapping out private keys
+ # https://bugs.archlinux.org/task/32616
+ # https://bugzilla.gnome.org/show_bug.cgi?id=688161
+ install -Dm644 ../10-gcr.conf "$pkgdir/etc/security/limits.d/10-gcr.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: gcr/repos/gnome-unstable-x86_64/gcr.install (from rev 233091, gcr/trunk/gcr.install)
===================================================================
--- gnome-unstable-x86_64/gcr.install (rev 0)
+++ gnome-unstable-x86_64/gcr.install 2015-03-08 15:36:23 UTC (rev 233092)
@@ -0,0 +1,14 @@
+post_install () {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-mime-database /usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade () {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: gcr/repos/gnome-unstable-x86_64/skip-annotation-gck_object_cache_get_attributes.patch (from rev 233091, gcr/trunk/skip-annotation-gck_object_cache_get_attributes.patch)
===================================================================
--- gnome-unstable-x86_64/skip-annotation-gck_object_cache_get_attributes.patch (rev 0)
+++ gnome-unstable-x86_64/skip-annotation-gck_object_cache_get_attributes.patch 2015-03-08 15:36:23 UTC (rev 233092)
@@ -0,0 +1,33 @@
+From 05ab60fb80ec9e1eafb6859f050de32269cdddc2 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau at redhat.com>
+Date: Thu, 5 Mar 2015 09:17:41 +0100
+Subject: Add (skip) annotation to gck_object_cache_get_attributes
+
+This works around a bug in vala 0.27.1/git master where it would call
+this method in the implementation of Pkcs11Certificate::set_property in
+seahorse. This causes an infinite loop as
+Pkcs11Certificate is an implementation of the GckObjectCacheInterface,
+so calling gck_object_cache_get_attributes() for ::set_property which in
+turn calls g_object_set(self, "attributes", value, NULL); is going to
+loop.
+
+This can be reverted once vala is fixed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=745629
+
+diff --git a/gck/gck-object-cache.c b/gck/gck-object-cache.c
+index 2325bfa..8da15cb 100644
+--- a/gck/gck-object-cache.c
++++ b/gck/gck-object-cache.c
+@@ -83,7 +83,7 @@ gck_object_cache_default_init (GckObjectCacheIface *iface)
+ }
+
+ /**
+- * gck_object_cache_get_attributes:
++ * gck_object_cache_get_attributes: (skip):
+ * @object: an object with an attribute cache
+ *
+ * Gets the attributes cached on this object.
+--
+cgit v0.10.2
+
More information about the arch-commits
mailing list