added security patches backported from 0.6.90, wrt #94053. Dropped ~alpha keyword, doesn't compile. Removed vulnerable ebuilds

Package-Manager: portage-2.0.51.19

6 files changed, 106 insertions, 17 deletions

diff --git a/net-mail/mailutils/files/digest-mailutils-0.5 b/net-mail/mailutils/files/digest-mailutils-0.5
deleted file mode 100644
index 8ba57aae240b..000000000000
--- a/net-mail/mailutils/files/digest-mailutils-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e61b0520eb33d5f155ebb0224bb332a8 mailutils-0.5.tar.bz2 2098183
diff --git a/net-mail/mailutils/files/digest-mailutils-0.6 b/net-mail/mailutils/files/digest-mailutils-0.6-r1
index f0e8fdbea34f..f0e8fdbea34f 100644
--- a/net-mail/mailutils/files/digest-mailutils-0.6
+++ b/net-mail/mailutils/files/digest-mailutils-0.6-r1
diff --git a/net-mail/mailutils/files/mailutils-0.5-mh-Makefile.in.patch b/net-mail/mailutils/files/mailutils-0.5-mh-Makefile.in.patch
deleted file mode 100644
index be0281fa4715..000000000000
--- a/net-mail/mailutils/files/mailutils-0.5-mh-Makefile.in.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- mh/Makefile.in.orig	2004-07-08 20:56:01.101223522 -0700
-+++ mh/Makefile.in	2004-07-08 20:56:31.499212613 -0700
-@@ -976,11 +976,8 @@
- install-exec-hook: @BUILD_MH_EXEC_HOOK@
- 
- mh_finish_install:
--	@here=`pwd`; \
--	cd $(DESTDIR)$(bindir); \
--	rm -f folders; \
--	$(LN_S) folder folders; \
--	cd $$here
-+	rm -f $(DESTDIR)/$(bindir)/folders; \
-+	$(LN_S) folder $(DESTDIR)/$(bindir)/folders
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/net-mail/mailutils/files/mailutils-IDEF0954-IDEF0955.patch b/net-mail/mailutils/files/mailutils-IDEF0954-IDEF0955.patch
new file mode 100644
index 000000000000..a8ad412a711f
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-IDEF0954-IDEF0955.patch
@@ -0,0 +1,72 @@
+===================================================================
+RCS file: /cvsroot/mailutils/cvsroot/mailutils/mailutils/imap4d/util.c,v
+retrieving revision 1.62
+retrieving revision 1.63
+diff -u -r1.62 -r1.63
+--- mailutils/mailutils/imap4d/util.c	2005/01/04 17:16:42	1.62
++++ mailutils/mailutils/imap4d/util.c	2005/05/13 09:39:22	1.63
+@@ -199,13 +199,14 @@
+ 	  {
+ 	    errno = 0;
+ 	    val = strtoul (s, &s, 10);
+-	    if (val == ULONG_MAX && errno == ERANGE)
++	    if ((val == ULONG_MAX && errno == ERANGE) || val > max)
+ 	      {
+ 		if (*set)
+ 		  free (*set);
+ 		*n = 0;
+ 		return EINVAL;
+ 	      }
++	    
+ 	    if (low)
+ 	      {
+ 		/* Reverse it. */
+@@ -400,26 +401,40 @@
+ int
+ util_finish (struct imap4d_command *command, int rc, const char *format, ...)
+ {
+-  char *tempbuf = NULL;
++  size_t size;
+   char *buf = NULL;
++  char *tempbuf = NULL;
+   int new_state;
+   int status = 0;
+   va_list ap;
+-
+-  asprintf (&tempbuf, "%s %s%s %s\r\n", command->tag, sc2string (rc),
+-	    command->name, format);
++  char *sc = sc2string (rc);
++  
+   va_start (ap, format);
+-  vasprintf (&buf, tempbuf, ap);
++  vasprintf (&tempbuf, format, ap);
+   va_end (ap);
++  if (!tempbuf)
++    imap4d_bye (ERR_NO_MEM);
++  
++  size = strlen (command->tag) + 1 +
++         strlen (sc) + strlen (command->name) + 1 +
++         strlen (tempbuf) + 1;
++  buf = malloc (size);
+   if (!buf)
+     imap4d_bye (ERR_NO_MEM);
++  strcpy (buf, command->tag);
++  strcat (buf, " ");
++  strcat (buf, sc);
++  strcat (buf, command->name);
++  strcat (buf, " ");
++  strcat (buf, tempbuf);
++  free (tempbuf);
+ 
+   if (daemon_param.transcript)
+-    syslog (LOG_DEBUG, "sent: %s", buf);
++    syslog (LOG_DEBUG, "sent: %s\r\n", buf);
+ 
+-  status = stream_sequential_write (ostream, buf, strlen (buf));
++  stream_sequential_write (ostream, buf, strlen (buf));
+   free (buf);
+-  free (tempbuf);
++  stream_sequential_write (ostream, "\r\n", 2);
+ 
+   /* Reset the state.  */
+   if (rc == RESP_OK)
diff --git a/net-mail/mailutils/files/mailutils-IDEF0956.patch b/net-mail/mailutils/files/mailutils-IDEF0956.patch
new file mode 100644
index 000000000000..821904ac0047
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-IDEF0956.patch
@@ -0,0 +1,18 @@
+===================================================================
+RCS file: /cvsroot/mailutils/cvsroot/mailutils/mailutils/imap4d/fetch.c,v
+retrieving revision 1.47
+retrieving revision 1.48
+diff -u -r1.47 -r1.48
+--- mailutils/mailutils/imap4d/fetch.c	2003/07/26 11:07:04	1.47
++++ mailutils/mailutils/imap4d/fetch.c	2005/05/13 09:38:56	1.48
+@@ -1155,6 +1168,10 @@
+ 	}
+       else
+ 	util_send (" \"\"");
++    }
++  else if (end + 2 < end) /* Check for integer overflow */
++    {
++      return RESP_BAD;
+     }
+   else
+     {
diff --git a/net-mail/mailutils/files/mailutils-IDEF0957.patch b/net-mail/mailutils/files/mailutils-IDEF0957.patch
new file mode 100644
index 000000000000..2cba9e660ff9
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-IDEF0957.patch
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /cvsroot/mailutils/cvsroot/mailutils/mailutils/mailbox/header.c,v
+retrieving revision 1.65
+retrieving revision 1.66
+diff -u -r1.65 -r1.66
+--- mailutils/mailutils/mailbox/header.c	2004/06/02 11:03:36	1.65
++++ mailutils/mailutils/mailbox/header.c	2005/05/13 09:39:57	1.66
+@@ -710,7 +710,7 @@
+     {
+       /* save one for the null */
+       --buflen;
+-      len = (len > buflen) ? len : len;
++      len = (len > buflen) ? buflen : len;
+       memcpy (buf, header->hdr[num].fn, len);
+       buf[len] = '\0';
+     }