1 |
commit: a7136e6b9a688c12dd808dabae5c873b2a1328cb |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 2 10:16:41 2018 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 2 10:16:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7136e6b |
7 |
|
8 |
mail-filter/libdkim: Fix patch (#568632 by Kai Peter) |
9 |
|
10 |
Package-Manager: Portage-2.3.27, Repoman-2.3.9 |
11 |
|
12 |
.../libdkim/files/libdkim-1.0.21-gcc6.patch | 4 +- |
13 |
.../libdkim/files/libdkim-extra-options-r1.patch | 87 ++++++++++++++++++++++ |
14 |
.../libdkim/files/patches/fix_warnings.patch | 48 ++++++------ |
15 |
mail-filter/libdkim/files/patches/strtok_r.patch | 4 +- |
16 |
mail-filter/libdkim/libdkim-1.0.21-r4.ebuild | 53 +++++++++++++ |
17 |
5 files changed, 168 insertions(+), 28 deletions(-) |
18 |
|
19 |
diff --git a/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch b/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch |
20 |
index 087e731d02c..d449ce95e48 100644 |
21 |
--- a/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch |
22 |
+++ b/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch |
23 |
@@ -1,5 +1,5 @@ |
24 |
---- a/src/dkimverify.cpp |
25 |
-+++ b/src/dkimverify.cpp |
26 |
+--- src/dkimverify.cpp |
27 |
++++ src/dkimverify.cpp |
28 |
@@ -211,14 +211,14 @@ |
29 |
unsigned DecodeBase64(char *ptr) |
30 |
{ |
31 |
|
32 |
diff --git a/mail-filter/libdkim/files/libdkim-extra-options-r1.patch b/mail-filter/libdkim/files/libdkim-extra-options-r1.patch |
33 |
new file mode 100644 |
34 |
index 00000000000..abedbaa8a0b |
35 |
--- /dev/null |
36 |
+++ b/mail-filter/libdkim/files/libdkim-extra-options-r1.patch |
37 |
@@ -0,0 +1,87 @@ |
38 |
+diff -Naur libdkim.orig/src/libdkimtest.cpp libdkim/src/libdkimtest.cpp |
39 |
+--- src/libdkimtest.cpp 2009-03-13 16:17:45.000000000 -0500 |
40 |
++++ src/libdkimtest.cpp 2009-03-13 16:26:02.000000000 -0500 |
41 |
+@@ -55,8 +55,23 @@ |
42 |
+ return 0; |
43 |
+ } |
44 |
+ |
45 |
++void usage() |
46 |
++{ |
47 |
+ |
48 |
+- |
49 |
++ printf( "usage: libdkimtest [-b<allman|ietf|both>] [-c<r|s|t|u>] [-d<domain>] [-l] [-h] [-i<you@××××××××××.com>] [-q] [-s] [-t] [-v] [-x<expire time>] [-z<hash>] <msgfile> <privkeyfile> <outfile>\n"); |
50 |
++ printf( "-b<standard> 1=allman, 2=ietf or 3=both\n"); |
51 |
++ printf( "-c<canonicalization> r=relaxed [DEFAULT], s=simple, t=relaxed/simple, u=simple/relaxed\n"); |
52 |
++ printf( "-d<domain> the domain tag, if not provided it will be determined from the sender/from header\n"); |
53 |
++ printf( "-l include body length tag\n"); |
54 |
++ printf( "-h this help\n"); |
55 |
++ printf( "-i<identity> the identity, if not provided it will not be included\n"); |
56 |
++ printf( "-s sign the message\n"); |
57 |
++ printf( "-t include a timestamp tag\n"); |
58 |
++ printf( "-v verify the message\n"); |
59 |
++ printf( "-x<expire_time> the expire time in seconds since epoch ( DEFAULT = current time + 604800)\n\t\t if set to - then it will not be included\n"); |
60 |
++ printf( "-z<hash> 1=sha1, 2=sha256, 3=both\n"); |
61 |
++ printf( "-y<selector> selector tag DEFAULT=default\n"); |
62 |
++} |
63 |
+ int main(int argc, char* argv[]) |
64 |
+ { |
65 |
+ int n; |
66 |
+@@ -77,7 +92,7 @@ |
67 |
+ time(&t); |
68 |
+ |
69 |
+ opts.nCanon = DKIM_SIGN_RELAXED; |
70 |
+- opts.nIncludeBodyLengthTag = 1; |
71 |
++ opts.nIncludeBodyLengthTag = 0; |
72 |
+ opts.nIncludeQueryMethod = 0; |
73 |
+ opts.nIncludeTimeStamp = 0; |
74 |
+ opts.expireTime = t + 604800; // expires in 1 week |
75 |
+@@ -92,6 +107,11 @@ |
76 |
+ int nArgParseState = 0; |
77 |
+ bool bSign = true; |
78 |
+ |
79 |
++ if(argc<2){ |
80 |
++ usage(); |
81 |
++ exit(1); |
82 |
++ } |
83 |
++ |
84 |
+ for( n = 1; n < argc; n++ ) |
85 |
+ { |
86 |
+ if( argv[n][0] == '-' && strlen(argv[n]) > 1 ) |
87 |
+@@ -121,14 +141,16 @@ |
88 |
+ } |
89 |
+ break; |
90 |
+ |
91 |
+- |
92 |
++ case 'd': |
93 |
++ strncpy(opts.szDomain,(const char*)(argv[n]+2),sizeof(opts.szDomain)-1); |
94 |
++ break; |
95 |
+ case 'l': // body length tag |
96 |
+ opts.nIncludeBodyLengthTag = 1; |
97 |
+ break; |
98 |
+ |
99 |
+ |
100 |
+ case 'h': |
101 |
+- printf( "usage: \n" ); |
102 |
++ usage(); |
103 |
+ return 0; |
104 |
+ |
105 |
+ case 'i': // identity |
106 |
+@@ -138,7 +160,7 @@ |
107 |
+ } |
108 |
+ else |
109 |
+ { |
110 |
+- strcpy( opts.szIdentity, argv[n] + 2 ); |
111 |
++ strncpy( opts.szIdentity, argv[n] + 2,sizeof(opts.szIdentity)-1 ); |
112 |
+ } |
113 |
+ break; |
114 |
+ |
115 |
+@@ -169,6 +191,9 @@ |
116 |
+ } |
117 |
+ break; |
118 |
+ |
119 |
++ case 'y': |
120 |
++ strncpy( opts.szSelector, argv[n]+2, sizeof(opts.szSelector)-1); |
121 |
++ break; |
122 |
+ |
123 |
+ case 'z': // sign w/ sha1, sha256 or both |
124 |
+ opts.nHash = atoi( &argv[n][2] ); |
125 |
|
126 |
diff --git a/mail-filter/libdkim/files/patches/fix_warnings.patch b/mail-filter/libdkim/files/patches/fix_warnings.patch |
127 |
index 56ed6ffc8a1..84704290a60 100644 |
128 |
--- a/mail-filter/libdkim/files/patches/fix_warnings.patch |
129 |
+++ b/mail-filter/libdkim/files/patches/fix_warnings.patch |
130 |
@@ -5,9 +5,9 @@ |
131 |
|
132 |
@DPATCH@ |
133 |
|
134 |
-diff -ru libdkim-1.0.19.orig/src/dkim.cpp libdkim-1.0.19/src/dkim.cpp |
135 |
---- libdkim-1.0.19.orig/src/dkim.cpp 2008-05-12 20:07:32.000000000 +1000 |
136 |
-+++ libdkim-1.0.19/src/dkim.cpp 2009-04-15 19:38:08.000000000 +1000 |
137 |
+diff -ru src/dkim.cpp src/dkim.cpp |
138 |
+--- src/dkim.cpp 2008-05-12 20:07:32.000000000 +1000 |
139 |
++++ src/dkim.cpp 2009-04-15 19:38:08.000000000 +1000 |
140 |
@@ -172,7 +172,7 @@ |
141 |
} |
142 |
|
143 |
@@ -42,9 +42,9 @@ diff -ru libdkim-1.0.19.orig/src/dkim.cpp libdkim-1.0.19/src/dkim.cpp |
144 |
{ |
145 |
if (ErrorCode >= 0 || ErrorCode <= DKIM_MAX_ERROR) |
146 |
return "Unknown"; |
147 |
-diff -ru libdkim-1.0.19.orig/src/dkim.h libdkim-1.0.19/src/dkim.h |
148 |
---- libdkim-1.0.19.orig/src/dkim.h 2009-04-15 19:37:48.000000000 +1000 |
149 |
-+++ libdkim-1.0.19/src/dkim.h 2009-04-15 19:38:08.000000000 +1000 |
150 |
+diff -ru src/dkim.h src/dkim.h |
151 |
+--- src/dkim.h 2009-04-15 19:37:48.000000000 +1000 |
152 |
++++ src/dkim.h 2009-04-15 19:38:08.000000000 +1000 |
153 |
@@ -155,14 +155,14 @@ |
154 |
void DKIM_CALL DKIMSignFree( DKIMContext* pSignContext ); |
155 |
|
156 |
@@ -63,9 +63,9 @@ diff -ru libdkim-1.0.19.orig/src/dkim.h libdkim-1.0.19/src/dkim.h |
157 |
|
158 |
#ifdef __cplusplus |
159 |
} |
160 |
-diff -ru libdkim-1.0.19.orig/src/dkimbase.cpp libdkim-1.0.19/src/dkimbase.cpp |
161 |
---- libdkim-1.0.19.orig/src/dkimbase.cpp 2008-05-12 20:07:36.000000000 +1000 |
162 |
-+++ libdkim-1.0.19/src/dkimbase.cpp 2009-04-15 19:49:32.000000000 +1000 |
163 |
+diff -ru src/dkimbase.cpp src/dkimbase.cpp |
164 |
+--- src/dkimbase.cpp 2008-05-12 20:07:36.000000000 +1000 |
165 |
++++ src/dkimbase.cpp 2009-04-15 19:49:32.000000000 +1000 |
166 |
@@ -118,10 +118,10 @@ |
167 |
// Process - split buffers into lines without any CRs or LFs at the end. |
168 |
// |
169 |
@@ -102,9 +102,9 @@ diff -ru libdkim-1.0.19.orig/src/dkimbase.cpp libdkim-1.0.19/src/dkimbase.cpp |
170 |
{ |
171 |
// no colon?! |
172 |
} |
173 |
-diff -ru libdkim-1.0.19.orig/src/dkimbase.h libdkim-1.0.19/src/dkimbase.h |
174 |
---- libdkim-1.0.19.orig/src/dkimbase.h 2008-05-12 20:07:24.000000000 +1000 |
175 |
-+++ libdkim-1.0.19/src/dkimbase.h 2009-04-15 19:49:32.000000000 +1000 |
176 |
+diff -ru src/dkimbase.h src/dkimbase.h |
177 |
+--- src/dkimbase.h 2008-05-12 20:07:24.000000000 +1000 |
178 |
++++ src/dkimbase.h 2009-04-15 19:49:32.000000000 +1000 |
179 |
@@ -41,7 +41,7 @@ |
180 |
|
181 |
int Init(void); |
182 |
@@ -114,9 +114,9 @@ diff -ru libdkim-1.0.19.orig/src/dkimbase.h libdkim-1.0.19/src/dkimbase.h |
183 |
int ProcessFinal(void); |
184 |
|
185 |
int Alloc( char*& szBuffer, int nRequiredSize ); |
186 |
-diff -ru libdkim-1.0.19.orig/src/dkimsign.cpp libdkim-1.0.19/src/dkimsign.cpp |
187 |
---- libdkim-1.0.19.orig/src/dkimsign.cpp 2008-05-12 20:07:46.000000000 +1000 |
188 |
-+++ libdkim-1.0.19/src/dkimsign.cpp 2009-04-15 19:49:32.000000000 +1000 |
189 |
+diff -ru src/dkimsign.cpp src/dkimsign.cpp |
190 |
+--- src/dkimsign.cpp 2008-05-12 20:07:46.000000000 +1000 |
191 |
++++ src/dkimsign.cpp 2009-04-15 19:49:32.000000000 +1000 |
192 |
@@ -144,7 +144,7 @@ |
193 |
|
194 |
fwrite( szBuffer, 1, nBufLength, fpdebug ); |
195 |
@@ -183,9 +183,9 @@ diff -ru libdkim-1.0.19.orig/src/dkimsign.cpp libdkim-1.0.19/src/dkimsign.cpp |
196 |
{ |
197 |
OPENSSL_free(sig); |
198 |
BIO_free_all(b64); |
199 |
-diff -ru libdkim-1.0.19.orig/src/dkimsign.h libdkim-1.0.19/src/dkimsign.h |
200 |
---- libdkim-1.0.19.orig/src/dkimsign.h 2008-05-12 20:07:58.000000000 +1000 |
201 |
-+++ libdkim-1.0.19/src/dkimsign.h 2009-04-15 19:49:32.000000000 +1000 |
202 |
+diff -ru src/dkimsign.h src/dkimsign.h |
203 |
+--- src/dkimsign.h 2008-05-12 20:07:58.000000000 +1000 |
204 |
++++ src/dkimsign.h 2009-04-15 19:49:32.000000000 +1000 |
205 |
@@ -32,7 +32,7 @@ |
206 |
|
207 |
int Init( DKIMSignOptions* pOptions ); |
208 |
@@ -206,9 +206,9 @@ diff -ru libdkim-1.0.19.orig/src/dkimsign.h libdkim-1.0.19/src/dkimsign.h |
209 |
void AddInterTagSpace( int nSizeOfNextTag ); |
210 |
void AddFoldedValueToSig( const string &sValue, char cbrk ); |
211 |
|
212 |
-diff -ru libdkim-1.0.19.orig/src/dkimverify.cpp libdkim-1.0.19/src/dkimverify.cpp |
213 |
---- libdkim-1.0.19.orig/src/dkimverify.cpp 2009-04-15 19:37:48.000000000 +1000 |
214 |
-+++ libdkim-1.0.19/src/dkimverify.cpp 2009-04-15 19:49:32.000000000 +1000 |
215 |
+diff -ru src/dkimverify.cpp src/dkimverify.cpp |
216 |
+--- src/dkimverify.cpp 2009-04-15 19:37:48.000000000 +1000 |
217 |
++++ src/dkimverify.cpp 2009-04-15 19:49:32.000000000 +1000 |
218 |
@@ -440,7 +440,7 @@ |
219 |
{ |
220 |
ProcessFinal(); |
221 |
@@ -275,9 +275,9 @@ diff -ru libdkim-1.0.19.orig/src/dkimverify.cpp libdkim-1.0.19/src/dkimverify.cp |
222 |
{ |
223 |
if (values[j] != NULL && values[j] < values[0]) |
224 |
{ |
225 |
-diff -ru libdkim-1.0.19.orig/src/libdkimtest.cpp libdkim-1.0.19/src/libdkimtest.cpp |
226 |
---- libdkim-1.0.19.orig/src/libdkimtest.cpp 2008-05-12 20:08:54.000000000 +1000 |
227 |
-+++ libdkim-1.0.19/src/libdkimtest.cpp 2009-04-15 19:38:08.000000000 +1000 |
228 |
+diff -ru src/libdkimtest.cpp src/libdkimtest.cpp |
229 |
+--- src/libdkimtest.cpp 2008-05-12 20:08:54.000000000 +1000 |
230 |
++++ src/libdkimtest.cpp 2009-04-15 19:38:08.000000000 +1000 |
231 |
@@ -60,9 +60,9 @@ |
232 |
int main(int argc, char* argv[]) |
233 |
{ |
234 |
|
235 |
diff --git a/mail-filter/libdkim/files/patches/strtok_r.patch b/mail-filter/libdkim/files/patches/strtok_r.patch |
236 |
index b3b4999aaf5..13acc585a07 100644 |
237 |
--- a/mail-filter/libdkim/files/patches/strtok_r.patch |
238 |
+++ b/mail-filter/libdkim/files/patches/strtok_r.patch |
239 |
@@ -6,8 +6,8 @@ |
240 |
@DPATCH@ |
241 |
|
242 |
diff -ru libdkim-1.0.19/src/dkimverify.cpp libdkim-1.0.19-new/src/dkimverify.cpp |
243 |
---- libdkim-1.0.19/src/dkimverify.cpp 2008-05-12 20:08:06.000000000 +1000 |
244 |
-+++ libdkim-1.0.19-new/src/dkimverify.cpp 2009-06-11 18:28:10.000000000 +1000 |
245 |
+--- src/dkimverify.cpp 2008-05-12 20:08:06.000000000 +1000 |
246 |
++++ src/dkimverify.cpp 2009-06-11 18:28:10.000000000 +1000 |
247 |
@@ -855,6 +855,9 @@ |
248 |
//////////////////////////////////////////////////////////////////////////////// |
249 |
int CDKIMVerify::ParseDKIMSignature( const string& sHeader, SignatureInfo &sig ) |
250 |
|
251 |
diff --git a/mail-filter/libdkim/libdkim-1.0.21-r4.ebuild b/mail-filter/libdkim/libdkim-1.0.21-r4.ebuild |
252 |
new file mode 100644 |
253 |
index 00000000000..9c1009fae2b |
254 |
--- /dev/null |
255 |
+++ b/mail-filter/libdkim/libdkim-1.0.21-r4.ebuild |
256 |
@@ -0,0 +1,53 @@ |
257 |
+# Copyright 1999-2018 Gentoo Foundation |
258 |
+# Distributed under the terms of the GNU General Public License v2 |
259 |
+ |
260 |
+EAPI=6 |
261 |
+inherit autotools toolchain-funcs vcs-clean |
262 |
+ |
263 |
+DESCRIPTION="DomainKeys Identified Mail library from Alt-N Inc" |
264 |
+HOMEPAGE="http://libdkim.sourceforge.net" |
265 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip" |
266 |
+ |
267 |
+LICENSE="Apache-2.0 yahoo-patent-license-1.2" |
268 |
+SLOT="0" |
269 |
+KEYWORDS="~amd64 ~x86" |
270 |
+IUSE="libressl static-libs" |
271 |
+ |
272 |
+RDEPEND=" |
273 |
+ !libressl? ( dev-libs/openssl:0= ) |
274 |
+ libressl? ( dev-libs/libressl:0= ) |
275 |
+ !mail-filter/libdkim-exim |
276 |
+" |
277 |
+DEPEND="${RDEPEND} |
278 |
+ app-arch/unzip |
279 |
+" |
280 |
+ |
281 |
+S="${WORKDIR}/${PN}/src" |
282 |
+ |
283 |
+src_prepare() { |
284 |
+ default |
285 |
+ |
286 |
+ ecvs_clean |
287 |
+ cp "${FILESDIR}"/debianize/* "${S}" || die |
288 |
+ eapply "${FILESDIR}"/patches/*.patch |
289 |
+ eapply "${FILESDIR}"/libdkim-extra-options-r1.patch |
290 |
+ eapply "${FILESDIR}"/${P}-gcc6.patch |
291 |
+ |
292 |
+ # Bug 476772 |
293 |
+ if ! use static-libs; then |
294 |
+ sed -i \ |
295 |
+ -e '/^TARGETS/s/libdkim.a//' \ |
296 |
+ -e '/install -m 644 libdkim.a/d' \ |
297 |
+ Makefile.in || die 'sed on Makefile.in failed' |
298 |
+ fi |
299 |
+ |
300 |
+ # Bug 476770 |
301 |
+ tc-export AR |
302 |
+ |
303 |
+ eautoreconf |
304 |
+} |
305 |
+ |
306 |
+src_install() { |
307 |
+ default |
308 |
+ dodoc ../README |
309 |
+} |