Remove unnecessary patch files

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)

9 files changed, 10 insertions, 197 deletions

diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog
index 93bd5740ebb3..ca6973a0398b 100644
--- a/net-mail/mailutils/ChangeLog
+++ b/net-mail/mailutils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/mailutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.54 2012/08/11 16:01:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.55 2012/10/20 08:43:46 eras Exp $
+
+  20 Oct 2012; Eray Aslan <eras@gentoo.org>
+  -files/mailutils-0.6-imap4d-format-string.patch,
+  -files/mailutils-0.6-imap4d-gcc4.0-ftbfs.patch,
+  -files/mailutils-0.6-mh-Makefile.in.patch,
+  -files/mailutils-IDEF0954-IDEF0955.patch, -files/mailutils-IDEF0956.patch,
+  -files/mailutils-IDEF0957.patch, -files/mailutils-SQLinjection.patch,
+  -files/mailutils-getline.diff:
+  Remove unnecessary patch files
 
   11 Aug 2012; Jeroen Roovers <jer@gentoo.org> mailutils-2.2.ebuild,
   +files/mailutils-2.2-gets.patch:
diff --git a/net-mail/mailutils/files/mailutils-0.6-imap4d-format-string.patch b/net-mail/mailutils/files/mailutils-0.6-imap4d-format-string.patch
deleted file mode 100644
index 070d4b43b4e7..000000000000
--- a/net-mail/mailutils/files/mailutils-0.6-imap4d-format-string.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pur mailutils-0.6-orig/imap4d/search.c mailutils-0.6/imap4d/search.c
---- mailutils-0.6-orig/imap4d/search.c	2005-09-09 11:00:44.000000000 +0300
-+++ mailutils-0.6/imap4d/search.c	2005-09-09 11:02:05.000000000 +0300
-@@ -195,7 +195,7 @@ imap4d_search (struct imap4d_command *co
-   char buffer[64];
-   
-   rc = imap4d_search0 (arg, 0, buffer, sizeof buffer);
--  return util_finish (command, rc, buffer);
-+  return util_finish (command, rc, "%s", buffer);
- }
-   
- int
diff --git a/net-mail/mailutils/files/mailutils-0.6-imap4d-gcc4.0-ftbfs.patch b/net-mail/mailutils/files/mailutils-0.6-imap4d-gcc4.0-ftbfs.patch
deleted file mode 100644
index 48134e334ac4..000000000000
--- a/net-mail/mailutils/files/mailutils-0.6-imap4d-gcc4.0-ftbfs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN mailutils-0.6.1/imap4d/fetch.c mailutils-0.6.1/imap4d/fetch.c
---- mailutils-0.6.1/imap4d/fetch.c	2004-06-02 09:30:52.000000000 +0200
-+++ mailutils-0.6.1/imap4d/fetch.c	2005-03-22 12:38:54.000000000 +0100
-@@ -63,8 +63,6 @@
- static int fetch_header_fields_not __P ((message_t, char **, unsigned long, unsigned long));
- static int fetch_send_address      __P ((const char *));
- 
--static struct fetch_command* fetch_getcommand __P ((char *, struct fetch_command[]));
--
- struct fetch_command
- {
-   const char *name;
-@@ -101,6 +99,8 @@
-   { NULL, 0, 0}
- };
- 
-+static struct fetch_command* fetch_getcommand __P ((char *, struct fetch_command[]));
-+
- /* Go through the fetch array sub command and returns the the structure.  */
- 
- static struct fetch_command *
diff --git a/net-mail/mailutils/files/mailutils-0.6-mh-Makefile.in.patch b/net-mail/mailutils/files/mailutils-0.6-mh-Makefile.in.patch
deleted file mode 100644
index be0281fa4715..000000000000
--- a/net-mail/mailutils/files/mailutils-0.6-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
deleted file mode 100644
index a8ad412a711f..000000000000
--- a/net-mail/mailutils/files/mailutils-IDEF0954-IDEF0955.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-===================================================================
-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
deleted file mode 100644
index 821904ac0047..000000000000
--- a/net-mail/mailutils/files/mailutils-IDEF0956.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-===================================================================
-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
deleted file mode 100644
index 2cba9e660ff9..000000000000
--- a/net-mail/mailutils/files/mailutils-IDEF0957.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-===================================================================
-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';
-     }
diff --git a/net-mail/mailutils/files/mailutils-SQLinjection.patch b/net-mail/mailutils/files/mailutils-SQLinjection.patch
deleted file mode 100644
index c87b6bf6ac31..000000000000
--- a/net-mail/mailutils/files/mailutils-SQLinjection.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- auth/sql.c.orig	2005-03-08 14:24:11.000000000 -0800
-+++ auth/sql.c	2005-05-13 19:12:38.000000000 -0700
-@@ -74,7 +74,7 @@
-   
-   for (p = (const unsigned char *) ustr; *p; p++)
-     {
--      if (strchr ("'\"", *p))
-+      if (strchr ("'\"\\", *p))
- 	len++;
-     }
- 
-@@ -84,7 +84,7 @@
- 
-   for (p = (const unsigned char *) ustr, q = str; *p; p++)
-     {
--      if (strchr ("'\"", *p))
-+      if (strchr ("'\"\\", *p))
- 	*q++ = '\\';
-       *q++ = *p;
-     }
diff --git a/net-mail/mailutils/files/mailutils-getline.diff b/net-mail/mailutils/files/mailutils-getline.diff
deleted file mode 100644
index b957473f3025..000000000000
--- a/net-mail/mailutils/files/mailutils-getline.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./mailbox/getline.h.old	2005-01-01 16:39:25.619823831 +0100
-+++ ./mailbox/getline.h	2005-01-01 16:28:47.798840941 +0100
-@@ -18,6 +18,7 @@
- #ifndef _GETLINE_H_
- # define _GETLINE_H_ 1
- 
-+# include <sys/types.h>
- # include <stdio.h>
- 
- # ifndef PARAMS
-@@ -28,8 +29,8 @@
- #  endif
- # endif
- 
--extern int getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
-+extern ssize_t getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
- 
--extern int getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
-+extern ssize_t getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
- 
- #endif /* ! _GETLINE_H_ */