First stage of general tidy-up, getting rid of old versions of the ebuild

(Portage version: 2.0.53)

8 files changed, 2 insertions, 234 deletions

diff --git a/mail-mta/exim/files/digest-exim-4.43-r2 b/mail-mta/exim/files/digest-exim-4.43-r2
deleted file mode 100644
index 5deaf298b99b..000000000000
--- a/mail-mta/exim/files/digest-exim-4.43-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f8f646d4920660cb5579becd9265a3bf exim-4.43.tar.bz2 1388183
-MD5 5363ec73d6c3f9b5c8c87b246027cbf7 exiscan-acl-4.43-28.patch 440225
diff --git a/mail-mta/exim/files/digest-exim-4.50 b/mail-mta/exim/files/digest-exim-4.50
deleted file mode 100644
index a96f78c973a6..000000000000
--- a/mail-mta/exim/files/digest-exim-4.50
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7844eff82171872f6b3971a4183368d9 exim-4.50.tar.bz2 1434928
diff --git a/mail-mta/exim/files/digest-exim-4.50-r1 b/mail-mta/exim/files/digest-exim-4.50-r1
deleted file mode 100644
index a96f78c973a6..000000000000
--- a/mail-mta/exim/files/digest-exim-4.50-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7844eff82171872f6b3971a4183368d9 exim-4.50.tar.bz2 1434928
diff --git a/mail-mta/exim/files/digest-exim-4.50-r2 b/mail-mta/exim/files/digest-exim-4.50-r2
deleted file mode 100644
index a96f78c973a6..000000000000
--- a/mail-mta/exim/files/digest-exim-4.50-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7844eff82171872f6b3971a4183368d9 exim-4.50.tar.bz2 1434928
diff --git a/mail-mta/exim/files/digest-exim-4.52 b/mail-mta/exim/files/digest-exim-4.52
deleted file mode 100644
index a3b5dc3d96d7..000000000000
--- a/mail-mta/exim/files/digest-exim-4.52
+++ /dev/null
@@ -1 +0,0 @@
-MD5 89601650f3b854d469451f30b369622b exim-4.52.tar.bz2 1535866
diff --git a/mail-mta/exim/files/digest-exim-4.60-r1 b/mail-mta/exim/files/digest-exim-4.60-r1
new file mode 100644
index 000000000000..e0aea836212a
--- /dev/null
+++ b/mail-mta/exim/files/digest-exim-4.60-r1
@@ -0,0 +1,2 @@
+MD5 eed3c8fc393cf7ccc9c1079b28516128 exim-4.60.tar.bz2 1554749
+MD5 eb249c90af3ab11e5a4d307e184a75ac exiscan.conf 22113
diff --git a/mail-mta/exim/files/exim-4.33-r1-header-syntax.patch b/mail-mta/exim/files/exim-4.33-r1-header-syntax.patch
deleted file mode 100644
index 06cef16b17db..000000000000
--- a/mail-mta/exim/files/exim-4.33-r1-header-syntax.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-*** exim-4.33/src/verify.c  Wed May  5 11:08:36 2004
---- verify.c	Thu May  6 14:36:40 2004
-***************
-*** 1264,1282 ****
-
-      if (recipient == NULL && Ustrcmp(errmess, "empty address") != 0)
-        {
--       uschar hname[64];
--       uschar *t = h->text;
--       uschar *tt = hname;
-        uschar *verb = US"is";
-        int len;
-
--       while (*t != ':') *tt++ = *t++;
--       *tt = 0;
--
-        /* Arrange not to include any white space at the end in the
-        error message. */
-
--       t = ss;
-        while (t > s && isspace(t[-1])) t--;
-
-        /* Add the address which failed to the error message, since in a
---- 1264,1276 ----
-
-      if (recipient == NULL && Ustrcmp(errmess, "empty address") != 0)
-        {
-        uschar *verb = US"is";
-+       uschar *t = ss;
-        int len;
-
-        /* Arrange not to include any white space at the end in the
-        error message. */
-
-        while (t > s && isspace(t[-1])) t--;
-
-        /* Add the address which failed to the error message, since in a
diff --git a/mail-mta/exim/files/exim-4.43-r2-host_aton-buff.patch b/mail-mta/exim/files/exim-4.43-r2-host_aton-buff.patch
deleted file mode 100644
index bf69b49c6ea6..000000000000
--- a/mail-mta/exim/files/exim-4.43-r2-host_aton-buff.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-*** src/lookups/dnsdb.c   Tue Oct  5 09:32:08 2004
-- --- dnsdb.c	 Wed Dec 29 09:36:13 2004
-***************
-*** 125,131 ****
-  /* If the type is PTR, we have to construct the relevant magic lookup
-  key. This code is now in a separate function. */
-  
-! if (type == T_PTR)
-    {
-    dns_build_reverse(keystring, buffer);
-    keystring = buffer;
-- --- 125,131 ----
-  /* If the type is PTR, we have to construct the relevant magic lookup
-  key. This code is now in a separate function. */
-  
-! if (type == T_PTR && string_is_ip_address(keystring, NULL))
-    {
-    dns_build_reverse(keystring, buffer);
-    keystring = buffer;
-*** src/host.c    Tue Oct  5 09:32:08 2004
-- --- host.c	Wed Dec 29 09:43:17 2004
-***************
-*** 710,721 ****
-  
-    if (*p == ':') p++;
-  
-!   /* Split the address into components separated by colons. */
-  
-    while (*p != 0)
-      {
-      int len = Ustrcspn(p, ":");
-      if (len == 0) nulloffset = ci;
-      component[ci++] = p;
-      p += len;
-      if (*p == ':') p++;
-- --- 754,771 ----
-  
-    if (*p == ':') p++;
-  
-!   /* Split the address into components separated by colons. The input address 
-!   is supposed to be checked for syntax. There was a case where this was 
-!   overlooked; to guard against that happening again, check here and crash if 
-!   there is a violation. */
-  
-    while (*p != 0)
-      {
-      int len = Ustrcspn(p, ":");
-      if (len == 0) nulloffset = ci;
-+     if (ci > 7) log_write(0, LOG_MAIN|LOG_PANIC_DIE, 
-+       "Internal error: invalid IPv6 address \"%s\" passed to host_aton()",
-+       address);  
-      component[ci++] = p;
-      p += len;
-      if (*p == ':') p++;
-*** src/auths/auth-spa.c  Tue Oct  5 09:32:08 2004
-- --- auth-spa.c	  Wed Dec 29 10:55:58 2004
-***************
-*** 404,411 ****
-    *out = '\0';
-  }
-  
-  int
-! spa_base64_to_bits (char *out, const char *in)
-  /* base 64 to raw bytes in quasi-big-endian order, returning count of bytes */
-  {
-    int len = 0;
-- --- 406,416 ----
-    *out = '\0';
-  }
-  
-+ 
-+ /* The outlength parameter was added by PH, December 2004 */
-+ 
-  int
-! spa_base64_to_bits (char *out, int outlength, const char *in)
-  /* base 64 to raw bytes in quasi-big-endian order, returning count of bytes */
-  {
-    int len = 0;
-***************
-*** 418,423 ****
-- --- 423,430 ----
-  
-    do
-      {
-+       if (len >= outlength)                   /* Added by PH */
-+         return (-1);                          /* Added by PH */
-        digit1 = in[0];
-        if (DECODE64 (digit1) == BAD)
-         return (-1);
-***************
-*** 435,445 ****
-- --- 442,456 ----
-        ++len;
-        if (digit3 != '=')
-         {
-+          if (len >= outlength)                   /* Added by PH */
-+            return (-1);                          /* Added by PH */
-           *out++ =
-             ((DECODE64 (digit2) << 4) & 0xf0) | (DECODE64 (digit3) >> 2);
-           ++len;
-           if (digit4 != '=')
-             {
-+              if (len >= outlength)                   /* Added by PH */
-+                return (-1);                          /* Added by PH */
-               *out++ = ((DECODE64 (digit3) << 6) & 0xc0) | DECODE64 (digit4);
-               ++len;
-             }
-*** src/auths/auth-spa.h  Tue Oct  5 09:32:08 2004
-- --- auth-spa.h	  Wed Dec 29 10:55:58 2004
-***************
-*** 9,14 ****
-- --- 11,19 ----
-   * All the code used here was torn by Marc Prud'hommeaux out of the
-   * Samba project (by Andrew Tridgell, Jeremy Allison, and others).
-   */
-+  
-+ /* December 2004: The spa_base64_to_bits() function has no length checking in 
-+ it. I have added a check. PH */ 
-  
-  /* It seems that some systems have existing but different definitions of some
-  of the following types. I received a complaint about "int16" causing
-***************
-*** 75,81 ****
-  #define spa_request_length(ptr) (((ptr)->buffer - (uint8x*)(ptr)) + (ptr)->bufIndex)
-  
-  void spa_bits_to_base64 (unsigned char *, const unsigned char *, int);
-! int spa_base64_to_bits(char *, const char *);
-  void spa_build_auth_response (SPAAuthChallenge *challenge,
-         SPAAuthResponse *response, char *user, char *password);
-  void spa_build_auth_request (SPAAuthRequest *request, char *user,
-- --- 80,86 ----
-  #define spa_request_length(ptr) (((ptr)->buffer - (uint8x*)(ptr)) + (ptr)->bufIndex)
-  
-  void spa_bits_to_base64 (unsigned char *, const unsigned char *, int);
-! int spa_base64_to_bits(char *, int, const char *);
-  void spa_build_auth_response (SPAAuthChallenge *challenge,
-         SPAAuthResponse *response, char *user, char *password);
-  void spa_build_auth_request (SPAAuthRequest *request, char *user,
-*** src/auths/spa.c	    Tue Oct  5 09:32:08 2004
-- --- spa.c Wed Dec 29 10:55:58 2004
-***************
-*** 133,139 ****
-    return FAIL;
-    }
-  
-! if (spa_base64_to_bits((char *)(&request), (const char *)(data)) < 0)
-    {
-    DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in "
-    "request: %s\n", data);
-- --- 135,141 ----
-    return FAIL;
-    }
-  
-! if (spa_base64_to_bits((char *)(&request), sizeof(request), (const char *)(data)) < 0)
-    {
-    DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in "
-    "request: %s\n", data);
-***************
-*** 153,159 ****
-    }
-  
-  /* dump client response */
-! if (spa_base64_to_bits((char *)(&response), (const char *)(data)) < 0)
-    {
-    DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in "
-    "response: %s\n", data);
-- --- 155,161 ----
-    }
-  
-  /* dump client response */
-! if (spa_base64_to_bits((char *)(&response), sizeof(response), (const char *)(data)) < 0)
-    {
-    DEBUG(D_auth) debug_printf("auth_spa_server(): bad base64 data in "
-    "response: %s\n", data);
-***************
-*** 319,325 ****
-         /* convert the challenge into the challenge struct */
-         DSPA("\n\n%s authenticator: challenge (%s)\n\n",
-                 ablock->name, buffer + 4);
-!        spa_base64_to_bits ((char *)(&challenge), (const char *)(buffer + 4));
-  
-         spa_build_auth_response (&challenge, &response,
-                 CS username, CS password);
-- --- 324,330 ----
-         /* convert the challenge into the challenge struct */
-         DSPA("\n\n%s authenticator: challenge (%s)\n\n",
-                 ablock->name, buffer + 4);
-!        spa_base64_to_bits ((char *)(&challenge), sizeof(challenge), (const char *)(buffer + 4));
-  
-         spa_build_auth_response (&challenge, &response,
-                 CS username, CS password);