[gentoo-commits] repo/gentoo:master commit in: mail-filter/libdkim/files/, mail-filter/libdkim/, ...

[Pacho Ramos]

commit: a7136e6b9a688c12dd808dabae5c873b2a1328cb
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Apr  2 10:16:41 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Apr  2 10:16:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7136e6b

mail-filter/libdkim: Fix patch (#568632 by Kai Peter)

Package-Manager: Portage-2.3.27, Repoman-2.3.9

 .../libdkim/files/libdkim-1.0.21-gcc6.patch|  4 +-
 .../libdkim/files/libdkim-extra-options-r1.patch   | 87 ++
 .../libdkim/files/patches/fix_warnings.patch   | 48 ++--
 mail-filter/libdkim/files/patches/strtok_r.patch   |  4 +-
 mail-filter/libdkim/libdkim-1.0.21-r4.ebuild   | 53 +
 5 files changed, 168 insertions(+), 28 deletions(-)

diff --git a/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch 
b/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch
index 087e731d02c..d449ce95e48 100644
--- a/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch
+++ b/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch
@@ -1,5 +1,5 @@
 a/src/dkimverify.cpp
-+++ b/src/dkimverify.cpp
+--- src/dkimverify.cpp
 src/dkimverify.cpp
 @@ -211,14 +211,14 @@
  unsigned DecodeBase64(char *ptr)
  {

diff --git a/mail-filter/libdkim/files/libdkim-extra-options-r1.patch 
b/mail-filter/libdkim/files/libdkim-extra-options-r1.patch
new file mode 100644
index 000..abedbaa8a0b
--- /dev/null
+++ b/mail-filter/libdkim/files/libdkim-extra-options-r1.patch
@@ -0,0 +1,87 @@
+diff -Naur libdkim.orig/src/libdkimtest.cpp libdkim/src/libdkimtest.cpp
+--- src/libdkimtest.cpp2009-03-13 16:17:45.0 -0500
 src/libdkimtest.cpp2009-03-13 16:26:02.0 -0500
+@@ -55,8 +55,23 @@
+   return 0;
+ }
+ 
++void usage()
++{
+ 
+-
++  printf( "usage: libdkimtest [-b] [-c] 
[-d] [-l] [-h] [-i] [-q] [-s] [-t] [-v] [-x] [-z]   \n");
++  printf( "-b 1=allman, 2=ietf or 3=both\n");
++  printf( "-c r=relaxed [DEFAULT], s=simple, 
t=relaxed/simple, u=simple/relaxed\n");
++  printf( "-d   the domain tag, if not provided it will 
be determined from the sender/from header\n");
++  printf( "-l   include body length tag\n");
++  printf( "-h   this help\n");
++  printf( "-i the identity, if not provided it will not 
be included\n");
++  printf( "-s   sign the message\n");
++  printf( "-t   include a timestamp tag\n");
++  printf( "-v   verify the message\n");
++  printf( "-x  the expire time in seconds since epoch ( 
DEFAULT = current time + 604800)\n\t\t if set to - then it will not be 
included\n");
++  printf( "-z 1=sha1, 2=sha256, 3=both\n");
++  printf( "-y selector tag DEFAULT=default\n");
++}
+ int main(int argc, char* argv[])
+ {
+   int n;
+@@ -77,7 +92,7 @@
+   time();
+ 
+   opts.nCanon = DKIM_SIGN_RELAXED;
+-  opts.nIncludeBodyLengthTag = 1;
++  opts.nIncludeBodyLengthTag = 0;
+   opts.nIncludeQueryMethod = 0;
+   opts.nIncludeTimeStamp = 0;
+   opts.expireTime = t + 604800;   // expires in 1 week
+@@ -92,6 +107,11 @@
+   int nArgParseState = 0;
+   bool bSign = true;
+ 
++  if(argc<2){
++  usage();
++  exit(1);
++  }
++
+   for( n = 1; n < argc; n++ )
+   {
+   if( argv[n][0] == '-' && strlen(argv[n]) > 1 )
+@@ -121,14 +141,16 @@
+   }
+   break;
+ 
+-
++  case 'd': 
++  strncpy(opts.szDomain,(const 
char*)(argv[n]+2),sizeof(opts.szDomain)-1);
++  break;
+   case 'l':   // body length tag
+   opts.nIncludeBodyLengthTag = 1;
+   break;
+ 
+ 
+   case 'h':
+-  printf( "usage: \n" );
++  usage();
+   return 0;
+ 
+   case 'i':   // identity 
+@@ -138,7 +160,7 @@
+   }
+   else
+   {
+-  strcpy( opts.szIdentity, argv[n] + 2 );
++  strncpy( opts.szIdentity, argv[n] + 
2,sizeof(opts.szIdentity)-1 );
+   }
+   break;
+ 
+@@ -169,6 +191,9 @@
+   }
+   break;
+ 
++  case 'y':
++  strncpy( opts.szSelector, argv[n]+2, 
sizeof(opts.szSelector)-1);
++  break;
+ 
+   case 'z':   // sign w/ sha1, sha256 or both 
+  

[gentoo-commits] repo/gentoo:master commit in: mail-filter/libdkim/files/, mail-filter/libdkim/

[Patrice Clement]

commit: 557e61c250d1be190c3ec5bc1d459cfb9ac950a4
Author: Peter Levine  gmail  com>
AuthorDate: Tue May 16 01:03:33 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu May 25 20:53:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557e61c2

mail-filter/libdkim: fix building with GCC-6.

Gentoo-Bug: https://bugs.gentoo.org/594320
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4638

 .../libdkim/files/libdkim-1.0.21-gcc6.patch| 25 ++
 mail-filter/libdkim/libdkim-1.0.21-r3.ebuild   |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch 
b/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch
new file mode 100644
index 000..087e731d02c
--- /dev/null
+++ b/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch
@@ -0,0 +1,25 @@
+--- a/src/dkimverify.cpp
 b/src/dkimverify.cpp
+@@ -211,14 +211,14 @@
+ unsigned DecodeBase64(char *ptr)
+ {
+   static const unsigned char base64_table[256] = {
+-  
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+-  
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1,
+-  -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 
9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,
+-  
-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1,
+-  
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+-  
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+-  
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+-  
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
++  (unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,
++  (unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,62,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,63,52,53,54,55,56,57,58,59,60,61,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,
++  (unsigned char) -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 
9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,(unsigned char) -1,(unsigned 
char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,
++  (unsigned char) 
-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,(unsigned
 char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned 
char) -1,
++  (unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,
++  (unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,
++  (unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) 
-1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned