From b42671b0019b018c1a5855dcc5f1137c43bbb980 Mon Sep 17 00:00:00 2001
From: Aldas Nabazas <aldas@opensde.net>
Date: Tue, 14 Sep 2010 13:58:26 +0200
Subject: [PATCH] pinentry: Updated (0.7.5 -> 0.8.0)

---
 security/pinentry/glib-2.16.1.patch | 47 -----------------------------
 security/pinentry/pinentry.desc     |  6 ++--
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 security/pinentry/glib-2.16.1.patch

diff --git a/security/pinentry/glib-2.16.1.patch b/security/pinentry/glib-2.16.1.patch
deleted file mode 100644
index 8c5f82324..000000000
--- a/security/pinentry/glib-2.16.1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../pinentry/glib-2.16.1.patch
-# Copyright (C) 2009 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-Conflict with glibc-2.16.1's gmem.h prototypes
-
---- ./gtk+-2/gtksecentry.c.orig	2009-04-11 13:18:31.000000000 +0300
-+++ ./gtk+-2/gtksecentry.c	2009-04-11 13:20:47.000000000 +0300
-@@ -270,7 +270,7 @@
- 
- 
- gpointer
--g_malloc(gulong size)
-+g_malloc(gsize size)
- {
-     gpointer p;
- 
-@@ -288,7 +288,7 @@
- }
- 
- gpointer
--g_malloc0(gulong size)
-+g_malloc0(gsize size)
- {
-     gpointer p;
- 
-@@ -308,7 +308,7 @@
- }
- 
- gpointer
--g_realloc(gpointer mem, gulong size)
-+g_realloc(gpointer mem, gsize size)
- {
-     gpointer p;
- 
diff --git a/security/pinentry/pinentry.desc b/security/pinentry/pinentry.desc
index 3bac2c670..d5ba0034f 100644
--- a/security/pinentry/pinentry.desc
+++ b/security/pinentry/pinentry.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../pinentry/pinentry.desc
-[COPY] Copyright (C) 2008 The OpenSDE Project
+[COPY] Copyright (C) 2008 - 2010 The OpenSDE Project
 [COPY] Copyright (C) 2006 The T2 SDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
@@ -31,7 +31,7 @@
 
 [L] GPL
 [S] Stable
-[V] 0.7.5
+[V] 0.8.0
 [P] X -----5---9 130.100
 
-[D] 1726438966 pinentry-0.7.5.tar.gz ftp://ftp.gnupg.org/gcrypt/pinentry/
+[D] 1871804755 pinentry-0.8.0.tar.gz ftp://ftp.gnupg.org/gcrypt/pinentry/