[weasel-commit] Source: gnome-keyring=2.26.3-2
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Wed, 27 Jan 2010 20:41:50 -0500
================================
gnome-keyring:source=2.26.3-2 (previous: 2.26.3-1)
cvc rdiff gnome-keyring -1 /weasel.rpath.org@wgl:3-devel/2.26.3-2
================================
2.26.3-2 Filip Brcic (brcha@xxxxxxx) Wed Jan 27 20:41:34 2010
fixed recipe + metadata
gnome-keyring-2.26.3-parallel-tests.patch: new
--- /dev/null
+++ gnome-keyring-2.26.3-parallel-tests.patch
@@ -0,0 +43 @@
+Index: gnome-keyring-2.26.3/tests/test.make
+===================================================================
+--- gnome-keyring-2.26.3.orig/tests/test.make
++++ gnome-keyring-2.26.3/tests/test.make
+@@ -22,9 +22,11 @@ noinst_PROGRAMS= \
+ run-auto-test \
+ run-prompt-test
+
+-run-auto-test.c: $(UNIT_AUTO) Makefile.am
++run-auto-test.h: $(UNIT_AUTO) Makefile.am
+ sh $(top_srcdir)/tests/prep-tests.sh -b run-auto-test $(UNIT_AUTO)
+
++run-auto-test.c: run-auto-test.h
++
+ run_auto_test_SOURCES = \
+ run-auto-test.c \
+ run-auto-test.h \
+@@ -37,9 +39,11 @@ run_auto_test_LDADD = \
+ run_auto_test_CFLAGS = \
+ $(UNIT_FLAGS)
+
+-run-prompt-test.c: $(UNIT_PROMPT) Makefile.am
++run-prompt-test.h: $(UNIT_PROMPT) Makefile.am
+ sh $(top_srcdir)/tests/prep-tests.sh -b run-prompt-test $(UNIT_PROMPT)
+
++run-prompt-test.c: run-prompt-test.h
++
+ run_prompt_test_SOURCES = \
+ run-prompt-test.c \
+ run-prompt-test.h \
+@@ -52,6 +56,12 @@ run_prompt_test_LDADD = \
+ run_prompt_test_CFLAGS = \
+ $(UNIT_FLAGS)
+
++BUILT_SOURCES = \
++ run-auto-test.c \
++ run-auto-test.h \
++ run-prompt-test.c \
++ run-prompt-test.h
++
+ #
------------------------------------------------------------------------------
+ # Run the tests
+
gnome-keyring.recipe: changed
Index: gnome-keyring.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- gnome-keyring.recipe /weasel.rpath.org@wgl:3-devel/2.26.3-1
+++ gnome-keyring.recipe /weasel.rpath.org@wgl:3-devel/2.26.3-2
@@ -1,7 +1,6 @@
#
-# Copyright (c) 2004-2007 rPath, Inc.
-# This file is distributed under the terms of the MIT License.
-# A copy is available at http://www.rpath.com/permanent/mit-license.html
+# Copyright (c) 2010 Filip Brcic <brcha@xxxxxxxxxxxx>
+# Distributed under the terms of the GNU General Public License v3
#
loadSuperClass('gnomepackage')
@@ -10,8 +9,40 @@
version = '2.26.3'
buildRequires = [
- 'GConf:devel', 'GConf:runtime', 'hal:devel', 'libgcrypt:devel',
- 'libgpg-error:devel', 'libtasn1:devel', 'libtasn1:runtime',
'pam:devel',
+ 'GConf:devel', 'GConf:runtime', 'ORBit2:devel', 'hal:devel',
+ 'libgcrypt:devel', 'libgpg-error:devel', 'libtasn1:devel',
+ 'libtasn1:runtime', 'pam:devel',
]
- buildMultiarch = True
+ shortDesc = 'Password and keyring managing daemon'
+ url = 'http://www.gnome.org/'
+ licenses = [ 'GPL-2', 'LGPL-2' ]
+ categories = [ 'Gnome' ]
+
+ docs = [
+ 'keyring-intro.txt',
+ ]
+
+ extraConfig = (
+ ' --enable-hal'
+ ' --enable-pam'
+ ' --with-pam-dir=%(essentiallibdir)s/security'
+ ' --with-root-certs=/usr/share/ca-certificates/'
+ ' --enable-acl-prompts'
+ ' --enable-ssh-agent'
+ )
+
+ patches = [
+ 'gnome-keyring-2.26.3-assert.patch',
+ 'gnome-keyring-2.26.3-parallel-tests.patch',
+ ]
+
+ def unpack(r):
+ GnomePackageRecipe.unpack(r)
+
+ r.Replace('CFLAGS="\$CFLAGS -Werror',
+ 'CFLAGS="$CFLAGS',
+ 'configure.in')
+
+ r.addAction('intltoolize --force --copy --automake')
+ r.Autoreconf()
gnome-keyring-2.26.3-assert.patch: new
--- /dev/null
+++ gnome-keyring-2.26.3-assert.patch
@@ -0,0 +25 @@
+From 8970f08b52c847e591ae1b0ea791bbbf52b7194b Mon Sep 17 00:00:00 2001
+From: Stef Walter <stef@xxxxxxxxxxxxxx>
+Date: Sun, 13 Sep 2009 16:18:24 +0000
+Subject: [PATCH 1/2] [rpc-layer] Fix erroneous assertion. Let error messages
handle this case.
+
+Fixes bug #533164
+---
+ pkcs11/rpc-layer/gck-rpc-module.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/pkcs11/rpc-layer/gck-rpc-module.c
b/pkcs11/rpc-layer/gck-rpc-module.c
+index 99e283e..8094d57 100644
+--- a/pkcs11/rpc-layer/gck-rpc-module.c
++++ b/pkcs11/rpc-layer/gck-rpc-module.c
+@@ -225,7 +225,6 @@ call_connect (CallState *cs)
+ assert (cs);
+ assert (cs->socket == -1);
+ assert (cs->call_status == CALL_INVALID);
+- assert (pkcs11_socket_path[0]);
+
+ debug (("connecting to: %s", pkcs11_socket_path));
+
+--
+1.6.4.2
+
Committed by: brcha
Other related posts:
