[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (31fca2497d3e7784efd0bf143acaffacda4fde5a)

Ladislav Hagara scm at mail.sourcemage.org
Tue Sep 5 09:32:56 EDT 2006


GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara at unob.cz>:

 mail/mailutils/DETAILS                                   |    6 -
 mail/mailutils/HISTORY                                   |    5 +
 mail/mailutils/INSTALL                                   |    1 
 mail/mailutils/PRE_BUILD                                 |    7 -
 mail/mailutils/patches/mailutils-IDEF0954-IDEF0955.patch |   72 ---------------
 mail/mailutils/patches/mailutils-IDEF0956.patch          |   18 ---
 mail/mailutils/patches/mailutils-IDEF0957.patch          |   16 ---
 mail/mailutils/patches/mailutils-SQLinjection.patch      |   20 ----
 mail/mailutils/patches/mailutils-getline.diff            |   21 ----
 9 files changed, 7 insertions(+), 159 deletions(-)

New commits:
commit 31fca2497d3e7784efd0bf143acaffacda4fde5a
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    mailutils 1.0
    seems old 0.6 version was broken
    i was not able to cast it, moreover PRE_BUILD was (in stable-rc and stable is) without execute permissions

diff --git a/mail/mailutils/DETAILS b/mail/mailutils/DETAILS
index 9447b81..34e7078 100755
--- a/mail/mailutils/DETAILS
+++ b/mail/mailutils/DETAILS
@@ -1,14 +1,12 @@
            SPELL=mailutils
-         VERSION=0.6
+         VERSION=1.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnu.org/gnu/mailutils/$SOURCE
         WEB_SITE=http://www.gnu.org/software/mailutils
-     SOURCE_HASH=sha512:1bc35e8cc94660468f0112149f97bb8769b1ed5a9397e2c97757a3dbb50bb21fb04bf84bcc81046c34f5924448a81b372dd709910b4158a0e39346c8ae6d4449
+     SOURCE_HASH=sha512:f52e94194705e47a2d795facc06566ff3a5805dd476f5e1ad81ca3f8d0ab35eea2f1df938d3b318d4afa45f2816a64a08a3193f01d222c86d7b9b9a69fd9c25b
       LICENSE[0]=GPL
          ENTERED=20041111
-         UPDATED=20050531
-       BUILD_API=2
         KEYWORDS="mail"
            SHORT="A series of useful mail clients, servers, and libraries."
 cat << EOF
diff --git a/mail/mailutils/HISTORY b/mail/mailutils/HISTORY
index 518c7b0..f63b0a5 100644
--- a/mail/mailutils/HISTORY
+++ b/mail/mailutils/HISTORY
@@ -1,3 +1,8 @@
+2006-09-05 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.0, removed BUILD_API and UPDATED
+	* PRE_BUILD, patches/*: removed patches
+	* INSTALL: removed
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/mail/mailutils/INSTALL b/mail/mailutils/INSTALL
deleted file mode 100755
index b90070a..0000000
--- a/mail/mailutils/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make install
\ No newline at end of file
diff --git a/mail/mailutils/PRE_BUILD b/mail/mailutils/PRE_BUILD
deleted file mode 100644
index 3983834..0000000
--- a/mail/mailutils/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p2 < ${SCRIPT_DIRECTORY}/patches/mailutils-IDEF0954-IDEF0955.patch &&
-patch -p2 < ${SCRIPT_DIRECTORY}/patches/mailutils-IDEF0956.patch &&
-patch -p2 < ${SCRIPT_DIRECTORY}/patches/mailutils-IDEF0957.patch &&
-patch -p0 < ${SCRIPT_DIRECTORY}/patches/mailutils-SQLinjection.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/patches/mailutils-getline.diff
diff --git a/mail/mailutils/patches/mailutils-IDEF0954-IDEF0955.patch b/mail/mailutils/patches/mailutils-IDEF0954-IDEF0955.patch
deleted file mode 100644
index a8ad412..0000000
--- a/mail/mailutils/patches/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/mail/mailutils/patches/mailutils-IDEF0956.patch b/mail/mailutils/patches/mailutils-IDEF0956.patch
deleted file mode 100644
index 821904a..0000000
--- a/mail/mailutils/patches/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/mail/mailutils/patches/mailutils-IDEF0957.patch b/mail/mailutils/patches/mailutils-IDEF0957.patch
deleted file mode 100644
index 2cba9e6..0000000
--- a/mail/mailutils/patches/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/mail/mailutils/patches/mailutils-SQLinjection.patch b/mail/mailutils/patches/mailutils-SQLinjection.patch
deleted file mode 100644
index c87b6bf..0000000
--- a/mail/mailutils/patches/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/mail/mailutils/patches/mailutils-getline.diff b/mail/mailutils/patches/mailutils-getline.diff
deleted file mode 100644
index b957473..0000000
--- a/mail/mailutils/patches/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_ */



More information about the SM-Commit mailing list