1 |
alonbl 08/01/15 18:26:03 |
2 |
|
3 |
Added: gpgme-1.1.6-cvs.patch digest-gpgme-1.1.6 |
4 |
Log: |
5 |
Version bump + some corrections from cvs |
6 |
(Portage version: 2.1.4, RepoMan options: --force) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 app-crypt/gpgme/files/gpgme-1.1.6-cvs.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/gpgme/files/gpgme-1.1.6-cvs.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/gpgme/files/gpgme-1.1.6-cvs.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: gpgme-1.1.6-cvs.patch |
15 |
=================================================================== |
16 |
diff -urNp gpgme-1.1.6.org/assuan/assuan-pipe-connect.c gpgme.svn/assuan/assuan-pipe-connect.c |
17 |
--- gpgme-1.1.6.org/assuan/assuan-pipe-connect.c 2007-09-27 15:00:05.000000000 +0200 |
18 |
+++ gpgme.svn/assuan/assuan-pipe-connect.c 2008-01-04 18:06:42.000000000 +0200 |
19 |
@@ -39,6 +39,14 @@ |
20 |
|
21 |
#include "assuan-defs.h" |
22 |
|
23 |
+#ifdef _ASSUAN_IN_GPGME_BUILD_ASSUAN |
24 |
+ |
25 |
+int _gpgme_io_pipe (int filedes[2], int inherit_idx); |
26 |
+int _gpgme_io_spawn (const char *path, char **argv, |
27 |
+ struct spawn_fd_item_s *fd_child_list, |
28 |
+ struct spawn_fd_item_s *fd_parent_list); |
29 |
+#endif |
30 |
+ |
31 |
/* Hacks for Slowaris. */ |
32 |
#ifndef PF_LOCAL |
33 |
# ifdef PF_UNIX |
34 |
diff -urNp gpgme-1.1.6.org/gpgme/engine-gpgconf.c gpgme.svn/gpgme/engine-gpgconf.c |
35 |
--- gpgme-1.1.6.org/gpgme/engine-gpgconf.c 2008-01-04 16:17:15.000000000 +0200 |
36 |
+++ gpgme.svn/gpgme/engine-gpgconf.c 2008-01-14 19:34:21.000000000 +0200 |
37 |
@@ -313,8 +310,8 @@ gpgconf_config_load_cb (void *hook, char |
38 |
|
39 |
if (fields >= 3) |
40 |
{ |
41 |
- comp->description = strdup (field[2]); |
42 |
- if (!comp->description) |
43 |
+ comp->program_name = strdup (field[2]); |
44 |
+ if (!comp->program_name) |
45 |
return gpg_error_from_syserror (); |
46 |
} |
47 |
|
48 |
@@ -457,9 +454,18 @@ gpgconf_config_load_cb2 (void *hook, cha |
49 |
return gpg_error_from_syserror (); |
50 |
} |
51 |
|
52 |
- err = gpgconf_parse_option (opt, &opt->no_arg_value, field[8]); |
53 |
- if (err) |
54 |
- return err; |
55 |
+ if (opt->flags & GPGME_CONF_NO_ARG_DESC) |
56 |
+ { |
57 |
+ opt->no_arg_description = strdup (field[8]); |
58 |
+ if (!opt->no_arg_description) |
59 |
+ return gpg_error_from_syserror (); |
60 |
+ } |
61 |
+ else |
62 |
+ { |
63 |
+ err = gpgconf_parse_option (opt, &opt->no_arg_value, field[8]); |
64 |
+ if (err) |
65 |
+ return err; |
66 |
+ } |
67 |
|
68 |
err = gpgconf_parse_option (opt, &opt->value, field[9]); |
69 |
if (err) |
70 |
diff -urNp gpgme-1.1.6.org/gpgme/kdpipeiodevice.cpp gpgme.svn/gpgme/kdpipeiodevice.cpp |
71 |
--- gpgme-1.1.6.org/gpgme/kdpipeiodevice.cpp 2007-11-12 13:21:58.000000000 +0200 |
72 |
+++ gpgme.svn/gpgme/kdpipeiodevice.cpp 2008-01-10 15:38:34.000000000 +0200 |
73 |
@@ -329,11 +329,14 @@ void KDPipeIODevice::Private::emitReadyR |
74 |
emit q->readyRead(); |
75 |
|
76 |
if ( !thisPointer ) |
77 |
- return; |
78 |
- qDebug( "KDPipeIODevice::Private::emitReadyRead %p, %d: locking reader (CONSUMER THREAD)", this, counter ); |
79 |
- synchronized( reader ) { |
80 |
- qDebug( "KDPipeIODevice::Private::emitReadyRead %p, %d: locked reader (CONSUMER THREAD)", this, counter ); |
81 |
- reader->readyReadSentCondition.wakeAll(); |
82 |
+ return; |
83 |
+ |
84 |
+ if ( reader ) { |
85 |
+ qDebug( "KDPipeIODevice::Private::emitReadyRead %p, %d: locking reader (CONSUMER THREAD)", this, counter ); |
86 |
+ synchronized( reader ) { |
87 |
+ qDebug( "KDPipeIODevice::Private::emitReadyRead %p, %d: locked reader (CONSUMER THREAD)", this, counter ); |
88 |
+ reader->readyReadSentCondition.wakeAll(); |
89 |
+ } |
90 |
} |
91 |
qDebug( "KDPipeIODevice::Private::emitReadyRead %p leaving %d", this, counter ); |
92 |
|
93 |
@@ -704,7 +707,7 @@ void Reader::run() { |
94 |
|
95 |
while ( !cancel && !error && bufferFull() ) { |
96 |
notifyReadyRead(); |
97 |
- if ( bufferFull() ) { |
98 |
+ if ( !cancel && bufferFull() ) { |
99 |
qDebug( "%p: Reader::run: buffer is full, going to sleep", this ); |
100 |
bufferNotFullCondition.wait( &mutex ); |
101 |
} |
102 |
diff -urNp gpgme-1.1.6.org/tests/gpg/Makefile.am gpgme.svn/tests/gpg/Makefile.am |
103 |
--- gpgme-1.1.6.org/tests/gpg/Makefile.am 2008-01-04 16:25:18.000000000 +0200 |
104 |
+++ gpgme.svn/tests/gpg/Makefile.am 2008-01-10 06:40:25.000000000 +0200 |
105 |
@@ -38,10 +38,10 @@ TESTS = t-encrypt t-encrypt-sym t-encryp |
106 |
t-encrypt-large t-file-name t-gpgconf $(tests_unix) |
107 |
|
108 |
CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf |
109 |
-DISTCLEANFILES = pubring.gpg~ random_seed gpg.conf |
110 |
+DISTCLEANFILES = pubring.gpg~ random_seed gpg.conf gpg-agent.conf |
111 |
|
112 |
EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \ |
113 |
- geheim.txt pubkey-1.asc seckey-1.asc |
114 |
+ geheim.txt pubkey-1.asc seckey-1.asc pinentry |
115 |
|
116 |
INCLUDES = -I$(top_srcdir)/gpgme |
117 |
|
118 |
@@ -55,7 +55,7 @@ noinst_PROGRAMS = $(TESTS) t-genkey |
119 |
clean-local: |
120 |
$(srcdir)/mkdemodirs --clean |
121 |
|
122 |
-all-local: ./pubring.gpg ./gpg.conf |
123 |
+all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf |
124 |
|
125 |
./pubring.gpg: $(srcdir)/pubdemo.asc ./Alpha/Secret.gpg |
126 |
$(GPG) --homedir . --import $(srcdir)/pubdemo.asc |
127 |
@@ -68,3 +68,7 @@ all-local: ./pubring.gpg ./gpg.conf |
128 |
./gpg.conf: |
129 |
# This is required for t-sig-notations. |
130 |
echo no-force-v3-sigs > ./gpg.conf |
131 |
+ |
132 |
+./gpg-agent.conf: |
133 |
+# This is required for gpg2, which does not support command fd. |
134 |
+ echo pinentry-program $(abs_srcdir)/pinentry > ./gpg-agent.conf |
135 |
diff -urNp gpgme-1.1.6.org/tests/gpg/pinentry gpgme.svn/tests/gpg/pinentry |
136 |
--- gpgme-1.1.6.org/tests/gpg/pinentry 1970-01-01 02:00:00.000000000 +0200 |
137 |
+++ gpgme.svn/tests/gpg/pinentry 2008-01-10 06:33:34.000000000 +0200 |
138 |
@@ -0,0 +1,22 @@ |
139 |
+#! /bin/bash |
140 |
+# Dummy pinentry |
141 |
+# |
142 |
+# Copyright 2008 g10 Code GmbH |
143 |
+# |
144 |
+# This file is free software; as a special exception the author gives |
145 |
+# unlimited permission to copy and/or distribute it, with or without |
146 |
+# modifications, as long as this notice is preserved. |
147 |
+# |
148 |
+# This file is distributed in the hope that it will be useful, but |
149 |
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the |
150 |
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR |
151 |
+# PURPOSE. |
152 |
+ |
153 |
+echo OK Your orders please |
154 |
+ |
155 |
+while read cmd; do |
156 |
+ case $cmd in |
157 |
+ GETPIN) echo D abc; echo OK;; |
158 |
+ *) echo OK;; |
159 |
+ esac |
160 |
+done |
161 |
diff -urNp gpgme-1.1.6.org/tests/gpg/t-gpgconf.c gpgme.svn/tests/gpg/t-gpgconf.c |
162 |
--- gpgme-1.1.6.org/tests/gpg/t-gpgconf.c 2008-01-04 16:17:15.000000000 +0200 |
163 |
+++ gpgme.svn/tests/gpg/t-gpgconf.c 2008-01-10 06:54:16.000000000 +0200 |
164 |
@@ -254,6 +254,11 @@ main (int argc, char **argv) |
165 |
gpgme_conf_comp_t conf; |
166 |
gpgme_conf_comp_t comp; |
167 |
int first; |
168 |
+ |
169 |
+#ifndef ENABLE_GPGCONF |
170 |
+ return 0; |
171 |
+#endif |
172 |
+ |
173 |
init_gpgme (GPGME_PROTOCOL_GPGCONF); |
174 |
|
175 |
err = gpgme_new (&ctx); |
176 |
@@ -287,15 +292,23 @@ main (int argc, char **argv) |
177 |
comp = conf; |
178 |
while (comp && strcmp (comp->name, "dirmngr")) |
179 |
comp = comp->next; |
180 |
- opt = comp->options; |
181 |
- while (opt && strcmp (opt->name, "verbose")) |
182 |
- opt = opt->next; |
183 |
|
184 |
- err = gpgme_conf_opt_change (opt, 0, arg); |
185 |
- fail_if_err (err); |
186 |
- |
187 |
- err = gpgme_op_conf_save (ctx, comp); |
188 |
- fail_if_err (err); |
189 |
+ if (comp) |
190 |
+ { |
191 |
+ opt = comp->options; |
192 |
+ while (opt && strcmp (opt->name, "verbose")) |
193 |
+ opt = opt->next; |
194 |
+ |
195 |
+ /* Allow for the verbose option not to be there. */ |
196 |
+ if (opt) |
197 |
+ { |
198 |
+ err = gpgme_conf_opt_change (opt, 0, arg); |
199 |
+ fail_if_err (err); |
200 |
+ |
201 |
+ err = gpgme_op_conf_save (ctx, comp); |
202 |
+ fail_if_err (err); |
203 |
+ } |
204 |
+ } |
205 |
} |
206 |
#endif |
207 |
|
208 |
|
209 |
|
210 |
|
211 |
1.1 app-crypt/gpgme/files/digest-gpgme-1.1.6 |
212 |
|
213 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/gpgme/files/digest-gpgme-1.1.6?rev=1.1&view=markup |
214 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/gpgme/files/digest-gpgme-1.1.6?rev=1.1&content-type=text/plain |
215 |
|
216 |
Index: digest-gpgme-1.1.6 |
217 |
=================================================================== |
218 |
MD5 df7ab717bf9b0189bd76b06c0c8a2509 gpgme-1.1.6.tar.gz 961286 |
219 |
RMD160 b761fed5ad88ef4b467c981bcc0ef95317c11ac1 gpgme-1.1.6.tar.gz 961286 |
220 |
SHA256 7cf6cd9dfc1f02488eab8cb8a64d3904c71df9a04b1e9614beeec72dbde3f49f gpgme-1.1.6.tar.gz 961286 |
221 |
|
222 |
|
223 |
|
224 |
-- |
225 |
gentoo-commits@l.g.o mailing list |