gentoo resync : 23.06.2018

2 files changed, 192 insertions, 0 deletions

diff --git a/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch b/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch
new file mode 100644
index 000000000000..919b6619e5f1
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.4-MH-testsuite.patch
@@ -0,0 +1,70 @@
+From 696754b9332922a00e977903d6df3def6ddb3fb6 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Fri, 10 Nov 2017 21:28:17 +0200
+Subject: Minor fix in MH testsuite
+
+Running fmtcheck without .mh_profile triggers mh_install, which
+surprises the testsuite with unexpected output "I'm going to
+create the standard MH path for you." Defining the MH envar to
+an existing file name suppresses it.
+
+* mh/tests/fmtcnd00.at: Always define MH prior to starting fmtcheck.
+* mh/tests/fmtcomp.at: Likewise.
+* mh/tests/fmtfunc.at: Likewise.
+---
+ mh/tests/fmtcnd00.at | 2 +-
+ mh/tests/fmtcomp.at  | 4 ++--
+ mh/tests/fmtfunc.at  | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mh/tests/fmtcnd00.at b/mh/tests/fmtcnd00.at
+index 507e8e5..f674d41 100644
+--- a/mh/tests/fmtcnd00.at
++++ b/mh/tests/fmtcnd00.at
+@@ -28,7 +28,7 @@ m4_pushdef([FMTCOND],[
+ AT_SETUP([$1])
+ AT_KEYWORDS([format fmtcond fmtcnd00])
+ AT_DATA([msg],[$2])
+-AT_CHECK([fmtcheck -format 'FORMAT' msg
++AT_CHECK([MH=/dev/null fmtcheck -format 'FORMAT' msg
+ ],
+ [0],
+ [$3])
+diff --git a/mh/tests/fmtcomp.at b/mh/tests/fmtcomp.at
+index 72cd823..615470a 100644
+--- a/mh/tests/fmtcomp.at
++++ b/mh/tests/fmtcomp.at
+@@ -22,7 +22,7 @@ dnl
+ m4_pushdef([FMTCOMP],[
+ AT_SETUP([$1])
+ AT_KEYWORDS([format fmtcomp])
+-AT_CHECK([fmtcheck -disass -dump -format '$2'
++AT_CHECK([MH=/dev/null fmtcheck -disass -dump -format '$2'
+ ],
+ [m4_if([$4],[],[0],[1])],
+ [$3],[$4])
+@@ -296,7 +296,7 @@ m4_pushdef([FMTCOMP],[
+ AT_SETUP([$1])
+ AT_KEYWORDS([format fmtdiag])
+ AT_DATA([input.fmt],[$2])
+-AT_CHECK([fmtcheck -form input.fmt
++AT_CHECK([MH=/dev/null fmtcheck -form input.fmt
+ ],
+ [1],
+ [],
+diff --git a/mh/tests/fmtfunc.at b/mh/tests/fmtfunc.at
+index 844a777..0829d45 100644
+--- a/mh/tests/fmtfunc.at
++++ b/mh/tests/fmtfunc.at
+@@ -212,7 +212,7 @@ AT_DATA([input.fmt],[%(getenv MH_TEST)
+ AT_DATA([message],[
+ 
+ ])
+-AT_CHECK([MH_TEST=defined fmtcheck -form input.fmt -width 80 message
++AT_CHECK([MH=/dev/null MH_TEST=defined fmtcheck -form input.fmt -width 80 message
+ ],
+ [0],
+ [defined
+-- 
+cgit v1.0-41-gc330
+
diff --git a/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch b/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch
new file mode 100644
index 000000000000..0e52fae20c1b
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.4-fix-endianness.patch
@@ -0,0 +1,122 @@
+From feecde8c46cdb597a76df5e6ef02b854843a8a5c Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Thu, 21 Jun 2018 09:46:43 +0300
+Subject: Fix endianness bug in string to IP conversion
+
+* libmailutils/cidr/fromsa.c (_mu_inaddr_to_bytes)
+(_mu_sockaddr_to_bytes): Fix improper endianness conversion.
+* libmailutils/cidr/tosa.c (mu_cidr_to_sockaddr): Simplify conversion.
+---
+ libmailutils/cidr/fromsa.c | 45 ++++++++++++++++++++-------------------------
+ libmailutils/cidr/tosa.c   |  9 ++-------
+ 2 files changed, 22 insertions(+), 32 deletions(-)
+
+diff --git a/libmailutils/cidr/fromsa.c b/libmailutils/cidr/fromsa.c
+index f57aadc..39d24fd 100644
+--- a/libmailutils/cidr/fromsa.c
++++ b/libmailutils/cidr/fromsa.c
+@@ -29,55 +29,50 @@
+ #include <mailutils/cidr.h>
+ #include <mailutils/errno.h>
+ 
+-static void
+-uint32_to_bytes (unsigned char *bytes, uint32_t u)
+-{
+-  int i;
+-  
+-  for (i = 0; i < 4; i++)
+-    {
+-      bytes[i] = u & 0xff;
+-      u >>= 8;
+-    }
+-}
+-
+ int
+ _mu_inaddr_to_bytes (int af, void *buf, unsigned char *bytes)
+ {
+-  uint32_t u;
++  size_t len;
+   
+   switch (af)
+     {
+     case AF_INET:
+-      memcpy (&u, buf, sizeof u);
+-      uint32_to_bytes (bytes, u);
+-      return 4;
+-
++      len = 4;
++      break;
++      
+ #ifdef MAILUTILS_IPV6
+     case AF_INET6:
+-      memcpy (bytes, buf, 16);
+-      return 16;
++      len = 16;
++      break;
+ #endif
++
++    default:
++      len = 0;
+     }
+-  return 0;
++  memcpy (bytes, buf, len);
++  return len;
+ }
+ 
+ int
+ _mu_sockaddr_to_bytes (unsigned char *bytes, struct sockaddr const *sa)
+ {
++  void *buf;
+   switch (sa->sa_family)
+     {
+     case AF_INET:
+-      uint32_to_bytes (bytes, ((struct sockaddr_in*)sa)->sin_addr.s_addr);
+-      return 4;
++      buf = &(((struct sockaddr_in*)sa)->sin_addr.s_addr);
++      break;
+ 
+ #ifdef MAILUTILS_IPV6
+     case AF_INET6:
+-      memcpy (bytes, &((struct sockaddr_in6*)sa)->sin6_addr, 16);
+-      return 16;
++      buf = &(((struct sockaddr_in6*)sa)->sin6_addr);
++      break;
+ #endif
++      
++    default:
++      return 0;
+     }
+-  return 0;
++  return _mu_inaddr_to_bytes (sa->sa_family, buf, bytes);
+ }
+ 
+ int
+diff --git a/libmailutils/cidr/tosa.c b/libmailutils/cidr/tosa.c
+index 33715e1..2b372b1 100644
+--- a/libmailutils/cidr/tosa.c
++++ b/libmailutils/cidr/tosa.c
+@@ -42,19 +42,14 @@ mu_cidr_to_sockaddr (struct mu_cidr *cidr, struct sockaddr **psa)
+   } addr;
+   struct sockaddr *sa;
+   int socklen;
+-  int i;
+-  
++
+   memset (&addr, 0, sizeof (addr));
+   addr.sa.sa_family = cidr->family;
+   switch (cidr->family)
+     {
+     case AF_INET:
+       socklen = sizeof (addr.s_in);
+-      for (i = 0; i < cidr->len; i++)
+-	{
+-	  addr.s_in.sin_addr.s_addr <<= 8;
+-	  addr.s_in.sin_addr.s_addr |= cidr->address[i];
+-	}
++      memcpy (&addr.s_in.sin_addr.s_addr, cidr->address, 4);
+       break;
+ 
+ #ifdef MAILUTILS_IPV6
+-- 
+cgit v1.0-41-gc330
+