Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (92882bd04cf684ac13b8d4e8d2d5a7bcb610ccd8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (92882bd04cf684ac13b8d4e8d2d5a7bcb610ccd8)
  • Date: Sat, 20 Jun 2009 17:29:06 -0500

GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara AT unob.cz>:

crypto/pinentry/DEPENDS | 7 ++
crypto/pinentry/DETAILS | 4 -
crypto/pinentry/HISTORY | 5 +
crypto/pinentry/PRE_BUILD | 3 -
crypto/pinentry/g_mem_set_vtable.diff | 99
----------------------------------
5 files changed, 13 insertions(+), 105 deletions(-)

New commits:
commit 92882bd04cf684ac13b8d4e8d2d5a7bcb610ccd8
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

pinentry 0.7.6
i have problem with qt4, with turned-off qt4 pinentry is ok

diff --git a/crypto/pinentry/DEPENDS b/crypto/pinentry/DEPENDS
index cd7211e..eef7e76 100755
--- a/crypto/pinentry/DEPENDS
+++ b/crypto/pinentry/DEPENDS
@@ -11,4 +11,9 @@ optional_depends gtk+2 \
optional_depends qt-x11 \
"--with-qt-includes=/usr/include/qt --enable-pinentry-qt" \
"--disable-pinentry-qt" \
- "to build Qt pinentry"
+ "to build Qt pinentry"
&&
+
+optional_depends qt4
\
+ "--with-qt-includes=/usr/include/Qt --enable-pinentry-qt4"
\
+ "--disable-pinentry-qt4"
\
+ "to build Qt4 pinentry"
diff --git a/crypto/pinentry/DETAILS b/crypto/pinentry/DETAILS
index 02e7abd..dc08543 100755
--- a/crypto/pinentry/DETAILS
+++ b/crypto/pinentry/DETAILS
@@ -1,9 +1,9 @@
SPELL=pinentry
- VERSION=0.7.5
+ VERSION=0.7.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/pinentry/$SOURCE
-
SOURCE_HASH=sha512:8f1b7dc68c84560d0fb0aff4738dc7a335be3af78c94a1d9a25298e43852de7de9d117ec8647679bfe5cf0739f5795eb8b0ce574a62c07ace631275a901d4243
+
SOURCE_HASH=sha512:86dedb45f33c17485307dba7c79e854bdd4f2d18e703f0bb209cffcf3ee7bc98d7f415db65b8ac6c088e10ace406026f1cceac119d12e65db2ca841ce4cbb5fa
WEB_SITE=http://www.gnu.org/directory/security/libgcrypt.html
ENTERED=20030326
LICENSE[0]=GPL
diff --git a/crypto/pinentry/HISTORY b/crypto/pinentry/HISTORY
index 6d1e295..c4eaa22 100644
--- a/crypto/pinentry/HISTORY
+++ b/crypto/pinentry/HISTORY
@@ -1,3 +1,8 @@
+2009-06-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.7.6
+ * DEPENDS: added optional_depends qt4
+ * PRE_BUILD, g_mem_set_vtable.diff: removed patch
+
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
diff --git a/crypto/pinentry/PRE_BUILD b/crypto/pinentry/PRE_BUILD
deleted file mode 100755
index dbf098f..0000000
--- a/crypto/pinentry/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 715328a..0000000
--- a/crypto/pinentry/g_mem_set_vtable.diff
+++ /dev/null
@@ -1,99 +0,0 @@
-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 Ladislav Hagara (92882bd04cf684ac13b8d4e8d2d5a7bcb610ccd8), Ladislav Hagara, 06/20/2009

Archive powered by MHonArc 2.6.24.

Top of Page