r19438 - in /desktop/unstable/gnome-keyring/debian: changelog control control.in patches/03_secure-mem_crash.patch rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Apr 8 13:22:13 UTC 2009
Author: joss
Date: Wed Apr 8 13:22:13 2009
New Revision: 19438
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19438
Log:
* Add missing build-dep on intltool.
* Pass /etc/ssl/certs as the directory for root certificates.
* Update glib dependency for libgnome-keyring-dev.
* Standards version is 3.8.1.
* 03_secure-mem_crash.patch: new patch, stolen upstream. Fixes
assertion error in the secure memory allocator. Closes: #522266.
Added:
desktop/unstable/gnome-keyring/debian/patches/03_secure-mem_crash.patch
Modified:
desktop/unstable/gnome-keyring/debian/changelog
desktop/unstable/gnome-keyring/debian/control
desktop/unstable/gnome-keyring/debian/control.in
desktop/unstable/gnome-keyring/debian/rules
Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=19438&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog (original)
+++ desktop/unstable/gnome-keyring/debian/changelog Wed Apr 8 13:22:13 2009
@@ -4,6 +4,12 @@
* libgcr0.symbols, libgnome-keyring0.symbols: add
Build-Depends-Package fields.
* libgp11-0.symbols: also add symbols file for libgp11.
+ * Add missing build-dep on intltool.
+ * Pass /etc/ssl/certs as the directory for root certificates.
+ * Update glib dependency for libgnome-keyring-dev.
+ * Standards version is 3.8.1.
+ * 03_secure-mem_crash.patch: new patch, stolen upstream. Fixes
+ assertion error in the secure memory allocator. Closes: #522266.
-- Josselin Mouette <joss at debian.org> Wed, 08 Apr 2009 14:32:14 +0200
Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=19438&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control (original)
+++ desktop/unstable/gnome-keyring/debian/control Wed Apr 8 13:22:13 2009
@@ -2,9 +2,10 @@
Section: gnome
Priority: optional
Maintainer: Ondřej Surý <ondrej at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
gnome-pkg-tools (>= 0.10),
+ intltool (>= 0.35.0),
libgtk2.0-dev (>= 2.6.0),
libglib2.0-dev (>= 2.16.0),
libgconf2-dev (>= 2.8.0),
@@ -14,11 +15,11 @@
gtk-doc-tools,
docbook-xml,
libdbus-1-dev (>= 1.0),
- libgcrypt11-dev,
+ libgcrypt11-dev (>= 1.2.2),
libhal-storage-dev (>= 0.5.7),
libpam0g-dev,
libglib2.0-doc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Package: gnome-keyring
Section: gnome
@@ -42,7 +43,7 @@
Architecture: any
Depends: ${misc:Depends},
libgnome-keyring0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.8)
+ libglib2.0-dev (>= 2.16)
Description: Development files for GNOME keyring service
gnome-keyring is a daemon in the session, similar to ssh-agent,
and other applications can use it to store passwords and other
Modified: desktop/unstable/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control.in?rev=19438&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control.in (original)
+++ desktop/unstable/gnome-keyring/debian/control.in Wed Apr 8 13:22:13 2009
@@ -5,6 +5,7 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
gnome-pkg-tools (>= 0.10),
+ intltool (>= 0.35.0),
libgtk2.0-dev (>= 2.6.0),
libglib2.0-dev (>= 2.16.0),
libgconf2-dev (>= 2.8.0),
@@ -14,11 +15,11 @@
gtk-doc-tools,
docbook-xml,
libdbus-1-dev (>= 1.0),
- libgcrypt11-dev,
+ libgcrypt11-dev (>= 1.2.2),
libhal-storage-dev (>= 0.5.7),
libpam0g-dev,
libglib2.0-doc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Package: gnome-keyring
Section: gnome
@@ -42,7 +43,7 @@
Architecture: any
Depends: ${misc:Depends},
libgnome-keyring0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.8)
+ libglib2.0-dev (>= 2.16)
Description: Development files for GNOME keyring service
gnome-keyring is a daemon in the session, similar to ssh-agent,
and other applications can use it to store passwords and other
Added: desktop/unstable/gnome-keyring/debian/patches/03_secure-mem_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/03_secure-mem_crash.patch?rev=19438&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/03_secure-mem_crash.patch (added)
+++ desktop/unstable/gnome-keyring/debian/patches/03_secure-mem_crash.patch Wed Apr 8 13:22:13 2009
@@ -1,0 +1,31 @@
+Debian #522266
+Upstream commit r1706
+
+--- trunk/egg/egg-secure-memory.c 2009/03/11 03:49:47 1665
++++ trunk/egg/egg-secure-memory.c 2009/04/02 03:29:53 1706
+@@ -625,7 +625,7 @@
+ /* How many words we actually want */
+ n_words = sec_size_to_words (length) + 2;
+
+- /* Less memory is required */
++ /* Less memory is required than is in the cell */
+ if (n_words <= cell->n_words) {
+
+ /* TODO: No shrinking behavior yet */
+@@ -636,7 +636,15 @@
+ VALGRIND_MAKE_MEM_DEFINED (alloc, length);
+ #endif
+
+- return sec_clear_memory (alloc, valid, length);
++ /*
++ * Even though we may be reusing the same cell, that doesn't
++ * mean that the allocation is shrinking. It could have shrunk
++ * and is now expanding back some.
++ */
++ if (length < valid)
++ return sec_clear_memory (alloc, length, valid);
++ else
++ return alloc;
+ }
+
+ /* Need braaaaaiiiiiinsss... */
Modified: desktop/unstable/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/rules?rev=19438&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/rules (original)
+++ desktop/unstable/gnome-keyring/debian/rules Wed Apr 8 13:22:13 2009
@@ -9,6 +9,7 @@
LDFLAGS := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --with-pam-dir=/lib/security
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-static --with-pam-dir=/lib/security \
+ --with-root-certs=/etc/ssl/certs
DEB_DH_MAKESHLIBS_ARGS_gnome-keyring := --no-act
More information about the pkg-gnome-commits
mailing list