[arch-commits] Commit in gnome-keyring/trunk (3 files)
Date: Wednesday, March 7, 2012 @ 14:28:30 Author: ibiru Revision: 152645 update to 3.3.5 Modified: gnome-keyring/trunk/PKGBUILD gnome-keyring/trunk/gnome-keyring.install Deleted: gnome-keyring/trunk/silence_no_socket_to_connect.patch + PKGBUILD | 21 - gnome-keyring.install |6 silence_no_socket_to_connect.patch | 717 --- 3 files changed, 9 insertions(+), 735 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-03-07 19:17:54 UTC (rev 152644) +++ PKGBUILD2012-03-07 19:28:30 UTC (rev 152645) @@ -2,34 +2,31 @@ # Maintainer: Jan De Groot pkgname=gnome-keyring -pkgver=3.2.2 -pkgrel=3 +pkgver=3.3.5 +pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) license=('GPL' 'LGPL') -depends=('gtk3' 'dconf' 'libgcrypt' 'libcap-ng' 'p11-kit' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2') +depends=('gtk3' 'gcr' 'libcap-ng') +makedepends=('intltool') groups=('gnome') options=('!libtool' '!emptydirs') url="http://www.gnome.org"; install=gnome-keyring.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz -silence_no_socket_to_connect.patch) -sha256sums=('f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3' -'4cf3965e9beea747a7916682d37f36bc481bee10247788d4dd53f6e27fe5c041') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('25a6b87d10dbb34ea2b634f97aa018260cf1a4e75fe3ba663ce313f30698a419') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/silence_no_socket_to_connect.patch" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring \ --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \ - --disable-schemas-compile --disable-update-mime + --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } Modified: gnome-keyring.install === --- gnome-keyring.install 2012-03-07 19:17:54 UTC (rev 152644) +++ gnome-keyring.install 2012-03-07 19:28:30 UTC (rev 152645) @@ -1,8 +1,5 @@ post_install() { glib-compile-schemas /usr/share/glib-2.0/schemas -update-mime-database /usr/share/mime 1> /dev/null -gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -update-desktop-database -q setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon } @@ -12,7 +9,4 @@ post_remove() { glib-compile-schemas /usr/share/glib-2.0/schemas -update-mime-database /usr/share/mime 1> /dev/null -gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -update-desktop-database -q } Deleted: silence_no_socket_to_connect.patch === --- silence_no_socket_to_connect.patch 2012-03-07 19:17:54 UTC (rev 152644) +++ silence_no_socket_to_connect.patch 2012-03-07 19:28:30 UTC (rev 152645) @@ -1,717 +0,0 @@ -From 5ca7387952f99bf318d337df2d853f5bc3c0ddd2 Mon Sep 17 00:00:00 2001 -From: Stef Walter -Date: Mon, 19 Dec 2011 12:08:51 + -Subject: rpc-layer: Correctly handle case where gnome-keyring-daemon not running - - * In the gnome-keyring-pkcs11.so module return stand in info - when the gnome-keyring-daemon info is not running. - * In addition no slots will be listed - -https://bugzilla.gnome.org/show_bug.cgi?id=665961 -diff --git a/pkcs11/rpc-layer/gkm-rpc-module.c b/pkcs11/rpc-layer/gkm-rpc-module.c -index ea939a7..b95bee1 100644 a/pkcs11/rpc-layer/gkm-rpc-module.c -+++ b/pkcs11/rpc-layer/gkm-rpc-module.c -@@ -228,10 +228,8 @@ call_connect (CallState *cs) - assert (cs->socket == -1); - assert (cs->call_status == CALL_INVALID); - -- if (!pkcs11_socket_path) { -- warning (("no socket to connect to")); -+ if (!pkcs11_socket_path) - return CKR_DEVICE_REMOVED; -- } - - debug (("connecting to: %s", pkcs11_socket_path)); - -@@ -968,13 +966,14 @@ proto_read_sesssion_info (GkmRpcMessage *msg, CK_SESSION_INFO_PTR info) - * CALL MACROS - */ - --#define BEGIN_CALL(call_id) \ -+#define BEGIN_CALL_OR(call_id, if_no_daemon) \ - debug ((#call_id ": enter")); \ - return_val_if_fail (pkcs11_initialized, CKR_CRYPTOKI_NOT_INITIALIZED); \ - { \ - CallState *_cs; \ - CK_RV _ret = CKR_OK; \ - _ret = call_lookup (&_cs); \ -+ if (_ret == CKR_DEVICE_REMOVED) return (if_no_daemon); \ - if (_ret != CKR_OK) return _ret; \ - _ret = call_prepare (_cs, GKM_RPC_CALL_##call_id); \ - if (_ret
[arch-commits] Commit in gnome-keyring/trunk (3 files)
Date: Sunday, May 2, 2010 @ 13:29:10 Author: ibiru Revision: 79300 upgpkg: gnome-keyring 2.30.1-2 backport the fix for adding service for org.freedesktop.secrets. Added: gnome-keyring/trunk/add_service_for_org.freedesktop.secrets_1.patch gnome-keyring/trunk/add_service_for_org.freedesktop.secrets_2.patch Modified: gnome-keyring/trunk/PKGBUILD -+ PKGBUILD| 14 ++- add_service_for_org.freedesktop.secrets_1.patch | 40 ++ add_service_for_org.freedesktop.secrets_2.patch | 21 +++ 3 files changed, 72 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-05-02 17:10:34 UTC (rev 79299) +++ PKGBUILD2010-05-02 17:29:10 UTC (rev 79300) @@ -3,7 +3,7 @@ pkgname=gnome-keyring pkgver=2.30.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) license=('GPL' 'LGPL') @@ -12,11 +12,19 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org"; install=gnome-keyring.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a76e7e06c3daa44340f8a3a0f3ef4b784973cdddff2d854cb30a3e7950796e5a') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2 +add_service_for_org.freedesktop.secrets_1.patch + add_service_for_org.freedesktop.secrets_2.patch) +sha256sums=('a76e7e06c3daa44340f8a3a0f3ef4b784973cdddff2d854cb30a3e7950796e5a' +'4172736975e9b3edb7e7aeaff11effea2a6bd9165059d977111083ad7624ad51' + '4afad6d8e84731a85162f82c995128cc0b36b3db239ef7dce1a2f742a7fe9b68') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/add_service_for_org.freedesktop.secrets_1.patch || return 1 + patch -Np1 -i ${srcdir}/add_service_for_org.freedesktop.secrets_2.patch || return 1 + autoconf || return 1 + automake || return 1 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring \ Added: add_service_for_org.freedesktop.secrets_1.patch === --- add_service_for_org.freedesktop.secrets_1.patch (rev 0) +++ add_service_for_org.freedesktop.secrets_1.patch 2010-05-02 17:29:10 UTC (rev 79300) @@ -0,0 +1,40 @@ +From b36d6beeb2fa430210c8a2aa19f772bd75325e42 Mon Sep 17 00:00:00 2001 +From: Rob Bradford +Date: Wed, 14 Apr 2010 18:12:41 + +Subject: Add dbus activation service file for org.freedesktop.secrets + +Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=611002 +--- +diff --git a/daemon/Makefile.am b/daemon/Makefile.am +index be96523..4c95b5a 100644 +--- a/daemon/Makefile.am b/daemon/Makefile.am +@@ -54,14 +54,16 @@ gnome_keyring_daemon_LDADD = \ + + EXTRA_DIST = \ + org.gnome.keyring.service.in \ ++ org.freedesktop.secrets.service.in \ + $(desktop_in_files) + + CLEANFILES = \ + org.gnome.keyring.service \ ++ org.freedesktop.service \ + $(desktop_DATA) + + servicedir = $(DBUS_SERVICES_DIR) +-service_in_files = org.gnome.keyring.service.in ++service_in_files = org.gnome.keyring.service.in org.freedesktop.secrets.service.in + service_DATA = $(service_in_files:.service.in=.service) + service_PATH = $(VALGRIND_RUN)$(bindir) + +diff --git a/daemon/org.freedesktop.secrets.service.in b/daemon/org.freedesktop.secrets.service.in +new file mode 100644 +index 000..d4db713 +--- a/dev/null b/daemon/org.freedesktop.secrets.service.in +@@ -0,0 +1,3 @@ ++[D-BUS Service] ++Name=org.freedesktop.secrets ++ex...@path@/gnome-keyring-daemon --start --foreground --components=secrets +-- +cgit v0.8.3.1 Added: add_service_for_org.freedesktop.secrets_2.patch === --- add_service_for_org.freedesktop.secrets_2.patch (rev 0) +++ add_service_for_org.freedesktop.secrets_2.patch 2010-05-02 17:29:10 UTC (rev 79300) @@ -0,0 +1,21 @@ +From d6bb94e9c05072fc791fb5045f5b1ab22d11d916 Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Mon, 19 Apr 2010 13:47:26 + +Subject: Make sure the service files are created correctly + +--- +diff --git a/daemon/Makefile.am b/daemon/Makefile.am +index 4c95b5a..9edb13f 100644 +--- a/daemon/Makefile.am b/daemon/Makefile.am +@@ -68,7 +68,7 @@ service_DATA = $(service_in_files:.service.in=.service) + service_PATH = $(VALGRIND_RUN)$(bindir) + + # Rule to make the service file with bindir expanded +-$(service_DATA): $(service_in_files) Makefile ++%.service: %.service.in Makefile + @sed -e "s|\...@path\@|$(service_PATH)|" $< > $@ + + desktop_in_files = \ +-- +cgit v0.8.3.1
[arch-commits] Commit in gnome-keyring/trunk (3 files)
Date: Monday, June 21, 2010 @ 08:34:51 Author: jgc Revision: 83358 upgpkg: gnome-keyring 2.30.2-1 Update to 2.30.2, remove upstream-applied patches Modified: gnome-keyring/trunk/PKGBUILD Deleted: gnome-keyring/trunk/add_service_for_org.freedesktop.secrets_1.patch gnome-keyring/trunk/add_service_for_org.freedesktop.secrets_2.patch -+ PKGBUILD| 24 - add_service_for_org.freedesktop.secrets_1.patch | 40 -- add_service_for_org.freedesktop.secrets_2.patch | 21 --- 3 files changed, 8 insertions(+), 77 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-06-21 12:31:11 UTC (rev 83357) +++ PKGBUILD2010-06-21 12:34:51 UTC (rev 83358) @@ -1,9 +1,9 @@ #$Id$ -#Maintainer: Jan De Groot +# Maintainer: Jan De Groot pkgname=gnome-keyring -pkgver=2.30.1 -pkgrel=2 +pkgver=2.30.2 +pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) license=('GPL' 'LGPL') @@ -12,27 +12,19 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org"; install=gnome-keyring.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2 -add_service_for_org.freedesktop.secrets_1.patch - add_service_for_org.freedesktop.secrets_2.patch) -sha256sums=('a76e7e06c3daa44340f8a3a0f3ef4b784973cdddff2d854cb30a3e7950796e5a' -'4172736975e9b3edb7e7aeaff11effea2a6bd9165059d977111083ad7624ad51' - '4afad6d8e84731a85162f82c995128cc0b36b3db239ef7dce1a2f742a7fe9b68') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('f65a6a786e5fbcf75f57465b8f44b17d0212b1ecb618ff5f3754806ffa5b77de') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/add_service_for_org.freedesktop.secrets_1.patch || return 1 - patch -Np1 -i ${srcdir}/add_service_for_org.freedesktop.secrets_2.patch || return 1 - autoconf || return 1 - automake || return 1 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring \ - --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs || return 1 + --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs make || return 1 - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-keyring ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-keyring ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } Deleted: add_service_for_org.freedesktop.secrets_1.patch === --- add_service_for_org.freedesktop.secrets_1.patch 2010-06-21 12:31:11 UTC (rev 83357) +++ add_service_for_org.freedesktop.secrets_1.patch 2010-06-21 12:34:51 UTC (rev 83358) @@ -1,40 +0,0 @@ -From b36d6beeb2fa430210c8a2aa19f772bd75325e42 Mon Sep 17 00:00:00 2001 -From: Rob Bradford -Date: Wed, 14 Apr 2010 18:12:41 + -Subject: Add dbus activation service file for org.freedesktop.secrets - -Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=611002 -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index be96523..4c95b5a 100644 a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -54,14 +54,16 @@ gnome_keyring_daemon_LDADD = \ - - EXTRA_DIST = \ - org.gnome.keyring.service.in \ -+ org.freedesktop.secrets.service.in \ - $(desktop_in_files) - - CLEANFILES = \ - org.gnome.keyring.service \ -+ org.freedesktop.service \ - $(desktop_DATA) - - servicedir = $(DBUS_SERVICES_DIR) --service_in_files = org.gnome.keyring.service.in -+service_in_files = org.gnome.keyring.service.in org.freedesktop.secrets.service.in - service_DATA = $(service_in_files:.service.in=.service) - service_PATH = $(VALGRIND_RUN)$(bindir) - -diff --git a/daemon/org.freedesktop.secrets.service.in b/daemon/org.freedesktop.secrets.service.in -new file mode 100644 -index 000..d4db713 a/dev/null -+++ b/daemon/org.freedesktop.secrets.service.in -@@ -0,0 +1,3 @@ -+[D-BUS Service] -+Name=org.freedesktop.secrets -+ex...@path@/gnome-keyring-daemon --start --foreground --components=secrets --- -cgit v0.8.3.1 Deleted: add_service_for_org.freedesktop.secrets_2.patch === --- add_service_for_org.freedesktop.secrets_2.patch 2010-06-21 12:31:11 UTC (rev 83357) +++ add_service_for_org.freedesktop.secrets_2.patch 2010-06-21 12:34:51 UTC (rev