* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/
@ 2011-07-07 9:24 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-07 9:24 UTC (permalink / raw
To: gentoo-commits
commit: 0218fa26bef11b0006654d0536674f417b68b657
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Jul 7 07:03:19 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Jul 7 07:03:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0218fa26
gnome-base/gnome-keyring: 3.0.2 → 3.1.1
Uses libcap-ng instead of libcap; the 3.0.2 libcap patch is no longer
relavant.
---
.../gnome-keyring-3.0.2-automagic-libcap.patch | 57 --------------------
...r200.ebuild => gnome-keyring-3.1.1-r200.ebuild} | 6 +-
...r300.ebuild => gnome-keyring-3.1.1-r300.ebuild} | 6 +-
3 files changed, 6 insertions(+), 63 deletions(-)
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch
deleted file mode 100644
index 2947af3..0000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b75b9d5aa7f6207eca190b9d8e08059872c99365 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Fri, 20 May 2011 17:53:43 -0400
-Subject: [PATCH] Fix automagic libcap dependency (GNOME bug #649936)
-
-Backport of the patch by Saleem Abdulrasool <compnerd@compnerd.org>
-to gnome-keyring-3.0.x
-
-Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
----
- configure.in | 29 +++++++++++++++++++++--------
- 1 files changed, 21 insertions(+), 8 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index b2d07a7..88f7e66 100644
---- a/configure.in
-+++ b/configure.in
-@@ -445,16 +445,29 @@ fi
- # libcap2
- #
-
--AC_CHECK_LIB([cap], [cap_get_proc], have_libcap="yes", have_libcap="no")
--
--if test $have_libcap = yes; then
-- AC_DEFINE(HAVE_LIBCAP, 1, [Have libcap2 package, libcap library])
-- DAEMON_LIBS="$DAEMON_LIBS -lcap"
--else
-- AC_MSG_WARN([libcap2 (or development headers) is not installed])
-+AC_ARG_WITH([libcap],
-+ [AC_HELP_STRING([--without-libcap],
-+ [build without libcap2 (disables Linux capabilities support)])],,
-+ [with_libcap=auto])
-+
-+if test x"$with_libcap" != x"no" ; then
-+ AC_CHECK_LIB([cap], [cap_get_proc],
-+ [
-+ with_libcap="yes"
-+ AC_DEFINE([HAVE_LIBCAP], [1], [Have libcap2 package, libcap library])
-+ DAEMON_LIBS="$DAEMON_LIBS -lcap"
-+ ],
-+ [
-+ if test x"$with_libcap" = x"yes" ; then
-+ AC_MSG_ERROR([libcap2 support requested, but package not found])
-+ else
-+ AC_MSG_WARN([libcap2 (or development headers) is not installed])
-+ fi
-+ with_libcap="no"
-+ ])
- fi
-
--libcap_status=$have_libcap
-+libcap_status=$with_libcap
-
- # --------------------------------------------------------------------
- # Debug mode
---
-1.7.5.rc3
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.1.1-r200.ebuild
similarity index 94%
rename from gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.1.1-r200.ebuild
index 4365aa0..b10de4f 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.1.1-r200.ebuild
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.25:2
>=sys-apps/dbus-1.0
>=dev-libs/libgcrypt-1.2.2
>=dev-libs/libtasn1-1
- caps? ( sys-libs/libcap )
+ caps? ( sys-libs/libcap-ng )
pam? ( virtual/pam )
"
# valgrind? ( dev-util/valgrind )
@@ -50,7 +50,7 @@ pkg_setup() {
G2CONF="${G2CONF}
$(use_enable debug)
$(use_enable test tests)
- $(use_with caps libcap)
+ $(use_with caps libcap-ng)
$(use_enable pam)
$(use_with pam pam-dir $(getpam_mod_dir))
--with-root-certs=${EPREFIX}/etc/ssl/certs/
@@ -67,7 +67,7 @@ src_prepare() {
-i gcr/Makefile.* || die "sed failed"
# https://bugzilla.gnome.org/show_bug.cgi?id=649936
- epatch "${FILESDIR}"/${PN}-3.0.2-automagic-libcap.patch
+ epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch
eautoreconf
gnome2_src_prepare
}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.1.1-r300.ebuild
similarity index 94%
rename from gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.1.1-r300.ebuild
index 025f941..fd49cb3 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.1.1-r300.ebuild
@@ -33,7 +33,7 @@ RDEPEND=">=dev-libs/glib-2.25:2
>=sys-apps/dbus-1.0
>=dev-libs/libgcrypt-1.2.2
>=dev-libs/libtasn1-1
- caps? ( sys-libs/libcap )
+ caps? ( sys-libs/libcap-ng )
pam? ( virtual/pam )
"
# valgrind? ( dev-util/valgrind )
@@ -52,7 +52,7 @@ pkg_setup() {
G2CONF="${G2CONF}
$(use_enable debug)
$(use_enable test tests)
- $(use_with caps libcap)
+ $(use_with caps libcap-ng)
$(use_enable pam)
$(use_with pam pam-dir $(getpam_mod_dir))
--with-root-certs=${EPREFIX}/etc/ssl/certs/
@@ -69,7 +69,7 @@ src_prepare() {
-i gcr/Makefile.* || die "sed failed"
# https://bugzilla.gnome.org/show_bug.cgi?id=649936
- epatch "${FILESDIR}"/${PN}-3.0.2-automagic-libcap.patch
+ epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch
eautoreconf
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/
@ 2011-08-30 21:55 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-08-30 21:55 UTC (permalink / raw
To: gentoo-commits
commit: eead68890752403db4978902746689f1fafc68ec
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 20:03:25 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Aug 30 20:03:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=eead6889
gnome-base/gnome-keyring: 3.1.4 → 3.1.90
Version bump, lots of improvements including a new gcr-viewer tool.
---
.../files/gnome-keyring-3.1.90-debug.patch | 138 ++++++++++++++++++++
...ng-3.1.4.ebuild => gnome-keyring-3.1.90.ebuild} | 6 +-
gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 3 +-
3 files changed, 145 insertions(+), 2 deletions(-)
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch
new file mode 100644
index 0000000..478c796
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch
@@ -0,0 +1,138 @@
+From f591c2326710dbc685a39eb6056eb7734219f181 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@collabora.co.uk>
+Date: Tue, 30 Aug 2011 11:36:15 +0000
+Subject: Fix compile warnings when building with --disable-debug
+
+---
+diff --git a/daemon/dbus/gkd-secret-property.c b/daemon/dbus/gkd-secret-property.c
+index cd2104e..35c7d38 100644
+--- a/daemon/dbus/gkd-secret-property.c
++++ b/daemon/dbus/gkd-secret-property.c
+@@ -377,8 +377,8 @@ static void
+ iter_append_variant (DBusMessageIter *iter, DataType data_type, GckAttribute *attr)
+ {
+ DBusMessageIter sub;
+- IterAppendFunc func;
+- const gchar *sig;
++ IterAppendFunc func = NULL;
++ const gchar *sig = NULL;
+
+ g_assert (iter);
+ g_assert (attr);
+@@ -414,9 +414,9 @@ static gboolean
+ iter_get_variant (DBusMessageIter *iter, DataType data_type, GckAttribute *attr)
+ {
+ DBusMessageIter variant;
+- IterGetFunc func;
++ IterGetFunc func = NULL;
+ gboolean ret;
+- const gchar *sig;
++ const gchar *sig = NULL;
+ char *signature;
+
+ g_assert (iter);
+diff --git a/daemon/ssh-agent/gkd-ssh-agent-ops.c b/daemon/ssh-agent/gkd-ssh-agent-ops.c
+index 7e2e9fe..691ebe0 100644
+--- a/daemon/ssh-agent/gkd-ssh-agent-ops.c
++++ b/daemon/ssh-agent/gkd-ssh-agent-ops.c
+@@ -983,7 +983,7 @@ op_sign_request (GkdSshAgentCall *call)
+ gsize n_data, n_result;
+ guint32 flags;
+ gsize offset;
+- gboolean ret;
++ gboolean ret = FALSE;
+ guint blobpos, sz;
+ guint8 *hash;
+ gulong algo, mech;
+diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
+index aae8ddd..46d302c 100644
+--- a/egg/egg-asn1x.c
++++ b/egg/egg-asn1x.c
+@@ -1579,10 +1579,8 @@ anode_encode_prepare_choice (GNode *node, gboolean want)
+ {
+ Atlv *tlv;
+ GNode *child;
+- gint type;
+
+- type = anode_def_type (node);
+- g_assert (type == TYPE_CHOICE);
++ g_assert (anode_def_type (node) == TYPE_CHOICE);
+
+ child = egg_asn1x_get_choice (node);
+ if (!child)
+diff --git a/egg/egg-secure-memory.c b/egg/egg-secure-memory.c
+index f699203..facc9fe 100644
+--- a/egg/egg-secure-memory.c
++++ b/egg/egg-secure-memory.c
+@@ -263,6 +263,8 @@ pool_free (void* item)
+ unused_push (&pool->unused, item);
+ }
+
++#ifndef G_DISABLE_ASSERT
++
+ static int
+ pool_valid (void* item)
+ {
+@@ -282,6 +284,8 @@ pool_valid (void* item)
+ return 0;
+ }
+
++#endif /* G_DISABLE_ASSERT */
++
+ /* -----------------------------------------------------------------------------
+ * SEC ALLOCATION
+ *
+diff --git a/gcr/gcr-certificate-renderer.c b/gcr/gcr-certificate-renderer.c
+index 5f53cb6..6c8535d 100644
+--- a/gcr/gcr-certificate-renderer.c
++++ b/gcr/gcr-certificate-renderer.c
+@@ -330,7 +330,7 @@ on_parsed_dn_part (guint index, GQuark oid, const guchar *value,
+ GcrDisplayView *view = ((on_parsed_dn_args*)user_data)->view;
+ const gchar *attr;
+ const gchar *desc;
+- gchar *field;
++ gchar *field = NULL;
+ gchar *display;
+
+ g_return_if_fail (GCR_IS_CERTIFICATE_RENDERER (self));
+diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
+index 1766e06..2162b98 100644
+--- a/gcr/gcr-parser.c
++++ b/gcr/gcr-parser.c
+@@ -1671,7 +1671,7 @@ gcr_parser_parse_data (GcrParser *self, gconstpointer data,
+ gsize n_data, GError **error)
+ {
+ ForeachArgs args = { self, data, n_data, GCR_ERROR_UNRECOGNIZED };
+- const gchar *message;
++ const gchar *message = NULL;
+ gint i;
+
+ g_return_val_if_fail (GCR_IS_PARSER (self), FALSE);
+diff --git a/pkcs11/gnome2-store/gkm-gnome2-storage.c b/pkcs11/gnome2-store/gkm-gnome2-storage.c
+index 6c8ef7f..feaf252 100644
+--- a/pkcs11/gnome2-store/gkm-gnome2-storage.c
++++ b/pkcs11/gnome2-store/gkm-gnome2-storage.c
+@@ -387,7 +387,7 @@ begin_modification_state (GkmGnome2Storage *self, GkmTransaction *transaction)
+ {
+ GkmDataResult res;
+ struct stat sb;
+- CK_RV rv;
++ CK_RV rv = CKR_OK;
+
+ if (!begin_write_state (self, transaction))
+ return FALSE;
+diff --git a/pkcs11/secret-store/gkm-secret-collection.c b/pkcs11/secret-store/gkm-secret-collection.c
+index 0aedc5c..c8906d9 100644
+--- a/pkcs11/secret-store/gkm-secret-collection.c
++++ b/pkcs11/secret-store/gkm-secret-collection.c
+@@ -473,7 +473,7 @@ gkm_secret_collection_real_unlock (GkmObject *obj, GkmCredential *cred)
+ GkmDataResult res;
+ GkmSecretData *sdata;
+ GkmSecret *master;
+- CK_RV rv;
++ CK_RV rv = CKR_GENERAL_ERROR;
+
+ master = gkm_credential_get_secret (cred);
+
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.1.4.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild
similarity index 92%
rename from gnome-base/gnome-keyring/gnome-keyring-3.1.4.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild
index e0d5921..0f18bcb 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.1.4.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild
@@ -55,7 +55,8 @@ pkg_setup() {
$(use_with pam pam-dir $(getpam_mod_dir))
--with-root-certs=${EPREFIX}/etc/ssl/certs/
--enable-ssh-agent
- --enable-gpg-agent"
+ --enable-gpg-agent
+ --disable-update-mime"
# $(use_enable valgrind)
}
@@ -65,6 +66,9 @@ src_prepare() {
sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
-i gcr/Makefile.* || die "sed failed"
+ # Upstream patch to initialize variables properly, will be in next release
+ epatch "${FILESDIR}/${P}-debug.patch"
+
# https://bugzilla.gnome.org/show_bug.cgi?id=649936
epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch
[[ ${PV} = 9999 ]] || eautoreconf
diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index e0d5921..f1d6944 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -55,7 +55,8 @@ pkg_setup() {
$(use_with pam pam-dir $(getpam_mod_dir))
--with-root-certs=${EPREFIX}/etc/ssl/certs/
--enable-ssh-agent
- --enable-gpg-agent"
+ --enable-gpg-agent
+ --disable-update-mime"
# $(use_enable valgrind)
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/
@ 2011-09-28 0:43 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-09-28 0:43 UTC (permalink / raw
To: gentoo-commits
commit: b5cca2d1b9c45a37858bd9518c00e4ffb92c475f
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 00:14:48 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 28 00:14:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b5cca2d1
gnome-base/gnome-keyring: 3.1.90 → 3.2.0
Bump. Patches were applied upstream. Drop unneeded gconf dependency.
---
.../gnome-keyring-3.1.1-automagic-libcap-ng.patch | 60 ---------
.../files/gnome-keyring-3.1.90-debug.patch | 138 --------------------
...ng-3.1.90.ebuild => gnome-keyring-3.2.0.ebuild} | 14 +--
gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 11 +-
4 files changed, 8 insertions(+), 215 deletions(-)
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic-libcap-ng.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic-libcap-ng.patch
deleted file mode 100644
index b87bae3..0000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic-libcap-ng.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 8191a26b9717f0b0b8beabdc765cc3c4713b2586 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Fri, 20 May 2011 18:06:00 -0400
-Subject: [PATCH] Fix automagic libcap-ng dependency (GNOME bug #649936)
-
-A slight modification of the patch by Saleem Abdulrasool
-<compnerd@compnerd.org>. Like his patch, this is for 3.1.x.
-
-Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
----
- configure.ac | 32 ++++++++++++++++++++++----------
- 1 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d9e947a..02372d8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -451,18 +451,30 @@ fi
- # libcap-ng
- #
-
--AC_CHECK_LIB([cap-ng], [capng_clear], have_libcapng="yes", have_libcapng="no")
--
--if test "$have_libcapng" = "yes"; then
-- AC_DEFINE(HAVE_LIBCAPNG, 1, [Have libcap-ng package, libcap-ng library])
-- DAEMON_LIBS="$DAEMON_LIBS -lcap-ng"
--else
-- have_lipcapng="no"
-- AC_MSG_WARN([libcap-ng (or development headers) is not installed])
-+AC_ARG_WITH([libcap-ng],
-+ [AC_HELP_STRING([--without-libcap-ng],
-+ [build without libcap-ng (disables Linux capabilities support)])],,
-+ [with_libcap_ng=auto])
-+
-+if test x"$with_libcap_ng" != x"no" ; then
-+ AC_CHECK_LIB([cap-ng], [capng_clear],
-+ [
-+ with_libcap_ng="yes"
-+ AC_DEFINE([HAVE_LIBCAPNG], [1], [have libcap-ng headers and library])
-+ DAEMON_LIBS="$DAEMON_LIBS -lcap-ng"
-+ ],
-+ [
-+ if test x"$with_libcap_ng" = x"yes" ; then
-+ AC_MSG_ERROR([libcap-ng support requested, but package not found])
-+ else
-+ AC_MSG_WARN([libcap-ng (or development headers) is not installed])
-+ fi
-+ with_libcap_ng="no"
-+ ])
- fi
-
--AM_CONDITIONAL(WITH_CAPS, test "$have_libcapng" = "yes")
--libcapng_status=$have_libcapng
-+AM_CONDITIONAL([WITH_CAPS], [test x"$with_libcap_ng" = x"yes"])
-+libcapng_status="$with_libcap_ng"
-
- # --------------------------------------------------------------------
- # Debug mode
---
-1.7.5.rc3
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch
deleted file mode 100644
index 478c796..0000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From f591c2326710dbc685a39eb6056eb7734219f181 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@collabora.co.uk>
-Date: Tue, 30 Aug 2011 11:36:15 +0000
-Subject: Fix compile warnings when building with --disable-debug
-
----
-diff --git a/daemon/dbus/gkd-secret-property.c b/daemon/dbus/gkd-secret-property.c
-index cd2104e..35c7d38 100644
---- a/daemon/dbus/gkd-secret-property.c
-+++ b/daemon/dbus/gkd-secret-property.c
-@@ -377,8 +377,8 @@ static void
- iter_append_variant (DBusMessageIter *iter, DataType data_type, GckAttribute *attr)
- {
- DBusMessageIter sub;
-- IterAppendFunc func;
-- const gchar *sig;
-+ IterAppendFunc func = NULL;
-+ const gchar *sig = NULL;
-
- g_assert (iter);
- g_assert (attr);
-@@ -414,9 +414,9 @@ static gboolean
- iter_get_variant (DBusMessageIter *iter, DataType data_type, GckAttribute *attr)
- {
- DBusMessageIter variant;
-- IterGetFunc func;
-+ IterGetFunc func = NULL;
- gboolean ret;
-- const gchar *sig;
-+ const gchar *sig = NULL;
- char *signature;
-
- g_assert (iter);
-diff --git a/daemon/ssh-agent/gkd-ssh-agent-ops.c b/daemon/ssh-agent/gkd-ssh-agent-ops.c
-index 7e2e9fe..691ebe0 100644
---- a/daemon/ssh-agent/gkd-ssh-agent-ops.c
-+++ b/daemon/ssh-agent/gkd-ssh-agent-ops.c
-@@ -983,7 +983,7 @@ op_sign_request (GkdSshAgentCall *call)
- gsize n_data, n_result;
- guint32 flags;
- gsize offset;
-- gboolean ret;
-+ gboolean ret = FALSE;
- guint blobpos, sz;
- guint8 *hash;
- gulong algo, mech;
-diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
-index aae8ddd..46d302c 100644
---- a/egg/egg-asn1x.c
-+++ b/egg/egg-asn1x.c
-@@ -1579,10 +1579,8 @@ anode_encode_prepare_choice (GNode *node, gboolean want)
- {
- Atlv *tlv;
- GNode *child;
-- gint type;
-
-- type = anode_def_type (node);
-- g_assert (type == TYPE_CHOICE);
-+ g_assert (anode_def_type (node) == TYPE_CHOICE);
-
- child = egg_asn1x_get_choice (node);
- if (!child)
-diff --git a/egg/egg-secure-memory.c b/egg/egg-secure-memory.c
-index f699203..facc9fe 100644
---- a/egg/egg-secure-memory.c
-+++ b/egg/egg-secure-memory.c
-@@ -263,6 +263,8 @@ pool_free (void* item)
- unused_push (&pool->unused, item);
- }
-
-+#ifndef G_DISABLE_ASSERT
-+
- static int
- pool_valid (void* item)
- {
-@@ -282,6 +284,8 @@ pool_valid (void* item)
- return 0;
- }
-
-+#endif /* G_DISABLE_ASSERT */
-+
- /* -----------------------------------------------------------------------------
- * SEC ALLOCATION
- *
-diff --git a/gcr/gcr-certificate-renderer.c b/gcr/gcr-certificate-renderer.c
-index 5f53cb6..6c8535d 100644
---- a/gcr/gcr-certificate-renderer.c
-+++ b/gcr/gcr-certificate-renderer.c
-@@ -330,7 +330,7 @@ on_parsed_dn_part (guint index, GQuark oid, const guchar *value,
- GcrDisplayView *view = ((on_parsed_dn_args*)user_data)->view;
- const gchar *attr;
- const gchar *desc;
-- gchar *field;
-+ gchar *field = NULL;
- gchar *display;
-
- g_return_if_fail (GCR_IS_CERTIFICATE_RENDERER (self));
-diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
-index 1766e06..2162b98 100644
---- a/gcr/gcr-parser.c
-+++ b/gcr/gcr-parser.c
-@@ -1671,7 +1671,7 @@ gcr_parser_parse_data (GcrParser *self, gconstpointer data,
- gsize n_data, GError **error)
- {
- ForeachArgs args = { self, data, n_data, GCR_ERROR_UNRECOGNIZED };
-- const gchar *message;
-+ const gchar *message = NULL;
- gint i;
-
- g_return_val_if_fail (GCR_IS_PARSER (self), FALSE);
-diff --git a/pkcs11/gnome2-store/gkm-gnome2-storage.c b/pkcs11/gnome2-store/gkm-gnome2-storage.c
-index 6c8ef7f..feaf252 100644
---- a/pkcs11/gnome2-store/gkm-gnome2-storage.c
-+++ b/pkcs11/gnome2-store/gkm-gnome2-storage.c
-@@ -387,7 +387,7 @@ begin_modification_state (GkmGnome2Storage *self, GkmTransaction *transaction)
- {
- GkmDataResult res;
- struct stat sb;
-- CK_RV rv;
-+ CK_RV rv = CKR_OK;
-
- if (!begin_write_state (self, transaction))
- return FALSE;
-diff --git a/pkcs11/secret-store/gkm-secret-collection.c b/pkcs11/secret-store/gkm-secret-collection.c
-index 0aedc5c..c8906d9 100644
---- a/pkcs11/secret-store/gkm-secret-collection.c
-+++ b/pkcs11/secret-store/gkm-secret-collection.c
-@@ -473,7 +473,7 @@ gkm_secret_collection_real_unlock (GkmObject *obj, GkmCredential *cred)
- GkmDataResult res;
- GkmSecretData *sdata;
- GkmSecret *master;
-- CK_RV rv;
-+ CK_RV rv = CKR_GENERAL_ERROR;
-
- master = gkm_credential_get_secret (cred);
-
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild
similarity index 84%
rename from gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild
index 0f18bcb..b911436 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit autotools eutils gnome2 multilib pam virtualx
+inherit gnome2 multilib pam virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -26,11 +26,11 @@ fi
# USE=valgrind is probably not a good idea for the tree
RDEPEND=">=dev-libs/glib-2.25:2
>=x11-libs/gtk+-2.90.0:3
- gnome-base/gconf:2
- >=sys-apps/dbus-1.0
+ app-misc/ca-certificates
>=dev-libs/libgcrypt-1.2.2
>=dev-libs/libtasn1-1
- dev-libs/p11-kit
+ >=dev-libs/p11-kit-0.6
+ >=sys-apps/dbus-1.0
caps? ( sys-libs/libcap-ng )
pam? ( virtual/pam )
"
@@ -66,12 +66,6 @@ src_prepare() {
sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
-i gcr/Makefile.* || die "sed failed"
- # Upstream patch to initialize variables properly, will be in next release
- epatch "${FILESDIR}/${P}-debug.patch"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=649936
- epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch
- [[ ${PV} = 9999 ]] || eautoreconf
gnome2_src_prepare
}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index f1d6944..b911436 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit autotools eutils gnome2 multilib pam virtualx
+inherit gnome2 multilib pam virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -26,11 +26,11 @@ fi
# USE=valgrind is probably not a good idea for the tree
RDEPEND=">=dev-libs/glib-2.25:2
>=x11-libs/gtk+-2.90.0:3
- gnome-base/gconf:2
- >=sys-apps/dbus-1.0
+ app-misc/ca-certificates
>=dev-libs/libgcrypt-1.2.2
>=dev-libs/libtasn1-1
- dev-libs/p11-kit
+ >=dev-libs/p11-kit-0.6
+ >=sys-apps/dbus-1.0
caps? ( sys-libs/libcap-ng )
pam? ( virtual/pam )
"
@@ -66,9 +66,6 @@ src_prepare() {
sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
-i gcr/Makefile.* || die "sed failed"
- # https://bugzilla.gnome.org/show_bug.cgi?id=649936
- epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch
- [[ ${PV} = 9999 ]] || eautoreconf
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-28 0:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-30 21:55 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-09-28 0:43 Alexandre Restovtsev
2011-07-07 9:24 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox