kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Update to 1.2.3

Browse source 
* Fix a problem creating filters on [older] FreeBSD mailing lists [1]

Submitted by:	Vladimir B. Grebenschikov <vova@sw.ru>
This commit is contained in:
Joe Marcus Clarke 2003-04-04 07:45:37 +00:00
parent 17bddc70ec
commit a4b23926a4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=78142
10 changed files with 60 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mail/evolution-devel/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= evolution
PORTVERSION= 1.2.2
PORTREVISION= 1
PORTVERSION= 1.2.3
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://people.FreeBSD.org/~sobomax/:local

2
mail/evolution-devel/distinfo
View file

@ -1,2 +1,2 @@
MD5 (gnome/evolution-1.2.2.tar.bz2) = 69805b56b0c6e44de26e9542554f4da3
MD5 (gnome/evolution-1.2.3.tar.bz2) = e1fd6e2fcfddb555a042e96b558ae84f
MD5 (gnome/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d

36
mail/evolution-devel/files/patch-camel_camel-mime-utils.c
View file

@ -1,11 +1,29 @@
--- camel/camel-mime-utils.c.orig Fri May 3 15:47:41 2002
+++ camel/camel-mime-utils.c Sun May 5 18:09:24 2002
@@ -3388,6 +3388,8 @@
}
d(printf("named offset = %d\n", offset));
--- camel/camel-mime-utils.c.orig Mon Oct 7 22:44:40 2002
+++ camel/camel-mime-utils.c Mon Dec 2 02:34:31 2002
@@ -3387,6 +3387,8 @@
return 0;
}
+
+ tm.tm_isdst = -1;
t = mktime(&tm);
#if defined(HAVE_TIMEZONE)
+ tm.tm_isdst = -1;
+
d(printf ("\ndecoding date '%s'\n", inptr));
memset (&tm, 0, sizeof(tm));
@@ -3739,8 +3741,6 @@
/* X-Mailing-List: gnome-hackers */
/* X-Mailing-List: <gnome-hackers> */
{ "X-Mailing-List", "[ \t]*<?([^@>]+)@?([^ \n\t\r>]*)" },
- /* X-Loop: gnome-hackers@gnome.org */
- { "X-Loop", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
/* List-Id: GNOME stuff <gnome-hackers.gnome.org> */
/* List-Id: <gnome-hackers.gnome.org> */
/* List-Id: <gnome-hackers> */
@@ -3756,6 +3756,8 @@
/* X-List: gnome-hackers */
/* X-List: gnome-hackers@gnome.org */
{ "X-List", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
+ /* X-Loop: gnome-hackers@gnome.org */
+ { "X-Loop", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
/* Sender: owner-gnome-hackers@gnome.org */
/* Sender: owner-gnome-hacekrs */
{ "Sender", "[ \t]*owner-([^@]+)@?([^ @\n\t\r>]*)" },

84
mail/evolution-devel/files/patch-gpg-temp
View file

@ -1,84 +0,0 @@
diff -u -r1.2.8.1 camel-mime-filter-canon.c
--- camel/camel-mime-filter-canon.c 21 Jan 2003 03:07:05 -0000 1.2.8.1
+++ camel/camel-mime-filter-canon.c 26 Feb 2003 23:12:09 -0000
@@ -26,6 +26,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#include <string.h>
#include <ctype.h>
@@ -170,7 +171,7 @@
if (len)
filter(f, in, len, prespace, out, outlen, outprespace);
- /* the data didn't contain an eol or was too short for "From ", we only need to check for "From" and add an eol */
+ /* the data didn't contain an eol or was too short for "From ", we only need to check for "From" */
if (f->backlen) {
inptr = (unsigned char *)f->backbuf;
inend = (unsigned char *)f->backbuf + f->backlen;
@@ -195,20 +196,7 @@
while (o>starto && (o[-1] == ' ' || o[-1] == '\t' || o[-1]=='\r'))
o--;
}
- /* check end of line canonicalisation */
- if (o>starto) {
- if (flags & CAMEL_MIME_FILTER_CANON_CRLF) {
- if (o[-1] != '\r')
- *o++ = '\r';
- } else {
- if (o[-1] == '\r')
- o--;
- }
- }
-
- /* and always finish with an eol */
- *o++ = '\n';
-
+
*outlen = o - *out;
f->backlen = 0;
diff -u -r1.24 camel-stream-filter.c
--- camel/camel-stream-filter.c 19 Jul 2002 11:25:02 -0000 1.24
+++ camel/camel-stream-filter.c 26 Feb 2003 23:12:10 -0000
@@ -19,11 +19,16 @@
* Boston, MA 02111-1307, USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
#include <string.h>
#include "camel-stream-filter.h"
#define d(x)
-/*#include <stdio.h>*/
/* use my malloc debugger? */
/*extern void g_check(void *mp);*/
@@ -368,10 +373,18 @@
{
CamelStreamFilter *filter = (CamelStreamFilter *)stream;
struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-
+ struct _filter *f;
+
if (p->filteredlen > 0)
return FALSE;
-
+
+ f = p->filters;
+ while (f) {
+ if (f->filter->backlen > 0)
+ return FALSE;
+ f = f->next;
+ }
+
return camel_stream_eos(filter->source);
}

1
mail/evolution-devel/pkg-plist
View file

@ -198,6 +198,7 @@ include/evolution/e-util/e-request.h
include/evolution/e-util/e-sexp.h
include/evolution/e-util/e-time-utils.h
include/evolution/e-util/e-url.h
include/evolution/e-util/e-xml-hash-utils.h
include/evolution/e-util/md5-utils.h
include/evolution/ebook/addressbook.h
include/evolution/ebook/e-book-listener.h

3
mail/evolution/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= evolution
PORTVERSION= 1.2.2
PORTREVISION= 1
PORTVERSION= 1.2.3
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://people.FreeBSD.org/~sobomax/:local

2
mail/evolution/distinfo
View file

@ -1,2 +1,2 @@
MD5 (gnome/evolution-1.2.2.tar.bz2) = 69805b56b0c6e44de26e9542554f4da3
MD5 (gnome/evolution-1.2.3.tar.bz2) = e1fd6e2fcfddb555a042e96b558ae84f
MD5 (gnome/db-3.1.17.tar.bz2) = b237f4e38a650d096389ff54d564928d

36
mail/evolution/files/patch-camel_camel-mime-utils.c
View file

@ -1,11 +1,29 @@
--- camel/camel-mime-utils.c.orig Fri May 3 15:47:41 2002
+++ camel/camel-mime-utils.c Sun May 5 18:09:24 2002
@@ -3388,6 +3388,8 @@
}
d(printf("named offset = %d\n", offset));
--- camel/camel-mime-utils.c.orig Mon Oct 7 22:44:40 2002
+++ camel/camel-mime-utils.c Mon Dec 2 02:34:31 2002
@@ -3387,6 +3387,8 @@
return 0;
}
+
+ tm.tm_isdst = -1;
t = mktime(&tm);
#if defined(HAVE_TIMEZONE)
+ tm.tm_isdst = -1;
+
d(printf ("\ndecoding date '%s'\n", inptr));
memset (&tm, 0, sizeof(tm));
@@ -3739,8 +3741,6 @@
/* X-Mailing-List: gnome-hackers */
/* X-Mailing-List: <gnome-hackers> */
{ "X-Mailing-List", "[ \t]*<?([^@>]+)@?([^ \n\t\r>]*)" },
- /* X-Loop: gnome-hackers@gnome.org */
- { "X-Loop", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
/* List-Id: GNOME stuff <gnome-hackers.gnome.org> */
/* List-Id: <gnome-hackers.gnome.org> */
/* List-Id: <gnome-hackers> */
@@ -3756,6 +3756,8 @@
/* X-List: gnome-hackers */
/* X-List: gnome-hackers@gnome.org */
{ "X-List", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
+ /* X-Loop: gnome-hackers@gnome.org */
+ { "X-Loop", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
/* Sender: owner-gnome-hackers@gnome.org */
/* Sender: owner-gnome-hacekrs */
{ "Sender", "[ \t]*owner-([^@]+)@?([^ @\n\t\r>]*)" },

84
mail/evolution/files/patch-gpg-temp
View file

@ -1,84 +0,0 @@
diff -u -r1.2.8.1 camel-mime-filter-canon.c
--- camel/camel-mime-filter-canon.c 21 Jan 2003 03:07:05 -0000 1.2.8.1
+++ camel/camel-mime-filter-canon.c 26 Feb 2003 23:12:09 -0000
@@ -26,6 +26,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#include <string.h>
#include <ctype.h>
@@ -170,7 +171,7 @@
if (len)
filter(f, in, len, prespace, out, outlen, outprespace);
- /* the data didn't contain an eol or was too short for "From ", we only need to check for "From" and add an eol */
+ /* the data didn't contain an eol or was too short for "From ", we only need to check for "From" */
if (f->backlen) {
inptr = (unsigned char *)f->backbuf;
inend = (unsigned char *)f->backbuf + f->backlen;
@@ -195,20 +196,7 @@
while (o>starto && (o[-1] == ' ' || o[-1] == '\t' || o[-1]=='\r'))
o--;
}
- /* check end of line canonicalisation */
- if (o>starto) {
- if (flags & CAMEL_MIME_FILTER_CANON_CRLF) {
- if (o[-1] != '\r')
- *o++ = '\r';
- } else {
- if (o[-1] == '\r')
- o--;
- }
- }
-
- /* and always finish with an eol */
- *o++ = '\n';
-
+
*outlen = o - *out;
f->backlen = 0;
diff -u -r1.24 camel-stream-filter.c
--- camel/camel-stream-filter.c 19 Jul 2002 11:25:02 -0000 1.24
+++ camel/camel-stream-filter.c 26 Feb 2003 23:12:10 -0000
@@ -19,11 +19,16 @@
* Boston, MA 02111-1307, USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
#include <string.h>
#include "camel-stream-filter.h"
#define d(x)
-/*#include <stdio.h>*/
/* use my malloc debugger? */
/*extern void g_check(void *mp);*/
@@ -368,10 +373,18 @@
{
CamelStreamFilter *filter = (CamelStreamFilter *)stream;
struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);
-
+ struct _filter *f;
+
if (p->filteredlen > 0)
return FALSE;
-
+
+ f = p->filters;
+ while (f) {
+ if (f->filter->backlen > 0)
+ return FALSE;
+ f = f->next;
+ }
+
return camel_stream_eos(filter->source);
}

1
mail/evolution/pkg-plist
View file

@ -198,6 +198,7 @@ include/evolution/e-util/e-request.h
include/evolution/e-util/e-sexp.h
include/evolution/e-util/e-time-utils.h
include/evolution/e-util/e-url.h
include/evolution/e-util/e-xml-hash-utils.h
include/evolution/e-util/md5-utils.h
include/evolution/ebook/addressbook.h
include/evolution/ebook/e-book-listener.h