Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (16638de474e0e7d4d73b623a773879025127f71c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (16638de474e0e7d4d73b623a773879025127f71c)
  • Date: Sat, 26 Apr 2008 19:00:21 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

crypto/pinentry/HISTORY | 5 +
crypto/pinentry/PRE_BUILD | 3 +
crypto/pinentry/g_mem_set_vtable.diff | 99
++++++++++++++++++++++++++++++++++
3 files changed, 107 insertions(+)

New commits:
commit 16638de474e0e7d4d73b623a773879025127f71c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

pinentry: Upstream patch to fix Bug #14471 from
https://bugs.g10code.com/gnupg/issue893

diff --git a/crypto/pinentry/HISTORY b/crypto/pinentry/HISTORY
index c22bf28..6d1e295 100644
--- a/crypto/pinentry/HISTORY
+++ b/crypto/pinentry/HISTORY
@@ -1,3 +1,8 @@
+2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply g_mem_set_vtable.diff
+ * g_mem_set_vtable.diff: Upstream patch to fix Bug #14471
+ from https://bugs.g10code.com/gnupg/issue893
+
2008-02-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7.5

diff --git a/crypto/pinentry/PRE_BUILD b/crypto/pinentry/PRE_BUILD
new file mode 100755
index 0000000..dbf098f
--- /dev/null
+++ b/crypto/pinentry/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/g_mem_set_vtable.diff
diff --git a/crypto/pinentry/g_mem_set_vtable.diff
b/crypto/pinentry/g_mem_set_vtable.diff
new file mode 100644
index 0000000..715328a
--- /dev/null
+++ b/crypto/pinentry/g_mem_set_vtable.diff
@@ -0,0 +1,99 @@
+only in patch2:
+unchanged:
+--- pinentry-0.7.5.orig/gtk+-2/gtksecentry.h
++++ pinentry-0.7.5/gtk+-2/gtksecentry.h
+@@ -173,6 +173,11 @@
+ gtk_secure_entry_get_layout_offsets(GtkSecureEntry * entry,
+ gint * x, gint * y);
+
++gpointer secentry_malloc(gsize size);
++gpointer secentry_malloc0(gsize size);
++gpointer secentry_realloc(gpointer mem, gsize size);
++void secentry_free(gpointer mem);
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
+only in patch2:
+unchanged:
+--- pinentry-0.7.5.orig/gtk+-2/gtksecentry.c
++++ pinentry-0.7.5/gtk+-2/gtksecentry.c
+@@ -270,7 +270,7 @@
+
+
+ gpointer
+-g_malloc(gulong size)
++secentry_malloc(gsize size)
+ {
+ gpointer p;
+
+@@ -282,13 +282,13 @@
+ else
+ p = (gpointer) malloc(size);
+ if (!p)
+- g_error("could not allocate %ld bytes", size);
++ g_error("could not allocate %" G_GSIZE_FORMAT " bytes", size);
+
+ return p;
+ }
+
+ gpointer
+-g_malloc0(gulong size)
++secentry_malloc0(gsize size)
+ {
+ gpointer p;
+
+@@ -302,13 +302,13 @@
+ } else
+ p = (gpointer) calloc(size, 1);
+ if (!p)
+- g_error("could not allocate %ld bytes", size);
++ g_error("could not allocate %" G_GSIZE_FORMAT " bytes", size);
+
+ return p;
+ }
+
+ gpointer
+-g_realloc(gpointer mem, gulong size)
++secentry_realloc(gpointer mem, gsize size)
+ {
+ gpointer p;
+
+@@ -332,13 +332,13 @@
+ }
+
+ if (!p)
+- g_error("could not reallocate %lu bytes", (gulong) size);
++ g_error("could not allocate %" G_GSIZE_FORMAT " bytes", size);
+
+ return p;
+ }
+
+ void
+-g_free(gpointer mem)
++secentry_free(gpointer mem)
+ {
+ if (mem) {
+ if (m_is_secure(mem))
+only in patch2:
+unchanged:
+--- pinentry-0.7.5.orig/gtk+-2/pinentry-gtk-2.c
++++ pinentry-0.7.5/gtk+-2/pinentry-gtk-2.c
+@@ -473,6 +473,17 @@
+ int
+ main (int argc, char *argv[])
+ {
++ static GMemVTable secure = {
++ secentry_malloc,
++ secentry_realloc,
++ secentry_free,
++ NULL,
++ NULL,
++ NULL
++ };
++
++ g_mem_set_vtable (&secure);
++
+ pinentry_init (PGMNAME);
+
+ #ifdef FALLBACK_CURSES



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (16638de474e0e7d4d73b623a773879025127f71c), Eric Sandall, 04/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page