commit hypermail

2 Feb 2007

Hello community,

here is the log from the commit of package hypermail
checked in at Fri Feb 2 13:07:57 CET 2007.

--------

--- hypermail/hypermail.changes	2007-01-02 15:55:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/hypermail/hypermail.changes	2007-02-01 17:16:40.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Feb 01 17:06:02 CET 2007 - mfabian@suse.de
+
+- Bugzilla #98496: fix the encoding problems by updating to
+  CVS HEAD (2.2.0.20070131).
+- make not only "set_i18n = 1" but also "set_i18n_body = 1"
+  the default to get everything converted to UTF-8.
+- fix crashes on 64 bit systems.
+
+-------------------------------------------------------------------

Old:
----
  hypermail-2.2.0.tar.bz2

New:
----
  64bit.patch
  hypermail-2.2.0.20070131.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hypermail.spec ++++++
--- /var/tmp/diff_new_pack.BH6405/_old	2007-02-02 13:07:44.000000000 +0100
+++ /var/tmp/diff_new_pack.BH6405/_new	2007-02-02 13:07:44.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package hypermail (Version 2.2.0)
+# spec file for package hypermail (Version 2.2.0.20070131)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -16,8 +16,8 @@
 Group:          Productivity/Networking/Email/Utilities
 Obsoletes:      hypemail
 Autoreqprov:    on
-Version:        2.2.0
-Release:        41
+Version:        2.2.0.20070131
+Release:        1
 URL:            http://www.hypermail-project.org/
 Summary:        Convert Mail Archives in mailbox Format to HTML Pages
 Source:         http://www.hypermail.org/dist/%{name}-%{version}.tar.bz2
@@ -28,7 +28,8 @@
 Patch4:         hypermail-gcc4.diff
 Patch5:         nonstaticpcre.patch
 Patch6:         strip.patch
-Patch7:         %{name}-%{version}-comparison.diff
+Patch7:         %{name}-2.2.0-comparison.diff
+Patch8:         64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || /usr/sbin/apxs2 -q PREFIX)
 
@@ -57,9 +58,13 @@
 %patch5
 %patch6
 %patch7
+%patch8 -p1
+find . -name CVS -type d | xargs rm -rf
+find . -type f | xargs chmod u+w
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS=" -g -O0 "
 rm -rf src/pcre
 libtoolize --force
 aclocal
@@ -95,6 +100,12 @@
 %doc %{_mandir}/man4/hmrc.4.gz
 
 %changelog -n hypermail
+* Thu Feb 01 2007 - mfabian@suse.de
+- Bugzilla #98496: fix the encoding problems by updating to
+  CVS HEAD (2.2.0.20070131).
+- make not only "set_i18n = 1" but also "set_i18n_body = 1"
+  the default to get everything converted to UTF-8.
+- fix crashes on 64 bit systems.
 * Tue Jan 02 2007 - anicka@suse.cz
 - fix comparison with string literal [#231197]
 * Thu May 18 2006 - schwab@suse.de

++++++ 64bit.patch ++++++
diff -ru hypermail-2.2.0.20070131.orig/src/parse.c hypermail-2.2.0.20070131/src/parse.c
--- hypermail-2.2.0.20070131.orig/src/parse.c	2005-10-25 08:19:25.000000000 +0200
+++ hypermail-2.2.0.20070131/src/parse.c	2007-02-01 16:21:32.000000000 +0100
@@ -48,6 +48,10 @@
 #include 
 #endif
 
+#ifdef HAVE_STRING_H
+#include 
+#endif
+
 /*
 ** LCC doesn't have lstat() defined in sys/stat.h.  We'll define it
 ** in lcc_extras.h, but really it just calls stat().
@@ -862,7 +866,7 @@
 
 #ifdef HAVE_ICONV
 	      char *orig2,*output2,*output3;
-	      int len;
+	      size_t len;
 	      orig2=output2=malloc(strlen(string)+1);
 	      memset(output2,0,strlen(string)+1);
 	      old_output=output;
@@ -3110,7 +3114,7 @@
 #if HAVE_ICONV
 	if (charset){
 	  char *tmpptr;
-	  int tmplen=0;
+	  size_t tmplen=0;
 	  tmpptr=subject;
 	  subject=i18n_convstring(tmpptr,charset,"UTF-8",&tmplen);
 	  if(tmpptr)
diff -ru hypermail-2.2.0.20070131.orig/src/print.c hypermail-2.2.0.20070131/src/print.c
--- hypermail-2.2.0.20070131.orig/src/print.c	2006-03-28 04:00:18.000000000 +0200
+++ hypermail-2.2.0.20070131/src/print.c	2007-02-01 17:00:28.000000000 +0100
@@ -46,6 +46,10 @@
 #endif
 #endif
 
+#ifdef HAVE_STRING_H
+#include 
+#endif
+
 static char *indextypename[NO_INDEX];
 
 #ifdef GDBM
@@ -1412,7 +1416,7 @@
   fprintf(fp, "
\n");
 
 #ifdef HAVE_ICONV
-  int tmplen;
+  size_t tmplen;
   char *tmpsubject=i18n_convstring(email->subject,"UTF-8",email->charset,&tmplen);
   char *tmptmpname=i18n_convstring(email->name,"UTF-8",email->charset,&tmplen); 
   char *tmpname=convchars(tmptmpname,"utf-8");
@@ -2040,7 +2044,7 @@
     char *ptr;
 #ifdef HAVE_ICONV
     char *localsubject=NULL,*localname=NULL;
-    int convlen=0;
+    size_t convlen=0;
 #endif
 
 
diff -ru hypermail-2.2.0.20070131.orig/src/proto.h hypermail-2.2.0.20070131/src/proto.h
--- hypermail-2.2.0.20070131.orig/src/proto.h	2005-10-25 08:22:09.000000000 +0200
+++ hypermail-2.2.0.20070131/src/proto.h	2007-02-01 16:21:32.000000000 +0100
@@ -93,7 +93,7 @@
 /*
 ** string.c functions
 */
-char *i18n_convstring(char *, char *, char *, int *);
+char *i18n_convstring(char *, char *, char *, size_t *);
 char *i18n_utf2numref(char *, int);
 char *i18n_numref2utf(char *);
 
diff -ru hypermail-2.2.0.20070131.orig/src/string.c hypermail-2.2.0.20070131/src/string.c
--- hypermail-2.2.0.20070131.orig/src/string.c	2005-11-02 14:44:48.000000000 +0100
+++ hypermail-2.2.0.20070131/src/string.c	2007-02-01 16:41:10.000000000 +0100
@@ -28,6 +28,10 @@
 #include "parse.h"
 #include "uconvert.h"
 
+#ifdef HAVE_STRING_H
+#include 
+#endif
+
 /* I18N hack */
 #ifdef HAVE_ICONV_H
 #include 
@@ -93,9 +97,9 @@
 }
 
 
-char *i18n_convstring(char *string, char *fromcharset, char *tocharset, int *len){
+char *i18n_convstring(char *string, char *fromcharset, char *tocharset, size_t *len){
 
-  int origlen,strleft,bufleft;
+  size_t origlen,strleft,bufleft;
   char *convbuf,*origconvbuf;
   iconv_t iconvfd;
   size_t ret;
@@ -1226,7 +1230,7 @@
   free(newcmd2);
    
   /* put subject */
-  if (strlen(subject)>0){
+  if (subject && strlen(subject)>0){
     newcmd2 = replace(newcmd, "$SUBJECT", convsubj);
   }else{
     newcmd2 = replace(newcmd, "$SUBJECT", "");
++++++ hypermail-2.2.0.tar.bz2 -> hypermail-2.2.0.20070131.tar.bz2 ++++++
++++ 4988 lines of diff (skipped)

++++++ hypermail-setup.patch ++++++
--- /var/tmp/diff_new_pack.BH6405/_old	2007-02-02 13:07:45.000000000 +0100
+++ /var/tmp/diff_new_pack.BH6405/_new	2007-02-02 13:07:45.000000000 +0100
@@ -1,18 +1,26 @@
-diff -ru hypermail-2.2.0.orig/src/setup.c hypermail-2.2.0/src/setup.c
---- hypermail-2.2.0.orig/src/setup.c	2004-02-17 19:48:20.000000000 +0100
-+++ hypermail-2.2.0/src/setup.c	2005-07-26 17:19:34.000000000 +0200
-@@ -147,84 +147,84 @@
+diff -Nru hypermail-2.2.0.20070131/src/setup.c hypermail-2.2.0.20070131.new/src/setup.c
+--- hypermail-2.2.0.20070131/src/setup.c	2005-10-25 08:15:14.000000000 +0200
++++ hypermail-2.2.0.20070131.new/src/setup.c	2007-01-31 20:18:37.000000000 +0100
+@@ -150,90 +150,90 @@
  int set_delete_level;
  
  struct Config cfg[] = {
+-    {"i18n", &set_i18n, BTRUE, CFG_SWITCH,
++    {"i18n", &set_i18n, BTRUE,
+      "# Enable I18N features, must linked with iconv().\n",FALSE},
+ 
+-    {"i18n_body", &set_i18n_body, BFALSE, CFG_SWITCH,
++    {"i18n_body", &set_i18n_body, BTRUE,
+      "# Translate message body into UTF-8. \"i18n\" must be enabled.\n",FALSE},
+ 
 -    {"antispam_at", &set_antispam_at, ANTISPAM_AT, CFG_STRING,
 +    {"antispam_at", &set_antispam_at, DV_STRING(ANTISPAM_AT),
-      "# replace any @ sign with this string, if spam flags enabled\n", FALSE},
+      "# replace any @ sign with this string, if spam flags enabled.\n", FALSE},
       
 -    {"language", &set_language, LANGUAGE, CFG_STRING,
 +    {"language", &set_language, DV_STRING(LANGUAGE),
       "# A two-letter string specifying the language to use!\n"
-      "# For example 'en' for English\n", FALSE},
+      "# For example 'en' for English.\n", FALSE},
  
 -    {"htmlsuffix", &set_htmlsuffix, HTMLSUFFIX, CFG_STRING,
 +    {"htmlsuffix", &set_htmlsuffix, DV_STRING(HTMLSUFFIX),
@@ -103,7 +111,7 @@
       "# Set this to -1 to have hypermail figure out whether the input\n"
       "# is entirely new messages to be appended or whether it contains\n"
       "# messages that are already in the archive. A value of -1 cannot be\n"
-@@ -234,22 +234,22 @@
+@@ -243,22 +243,22 @@
       "# existing archive is not empty.\n"
       "# Set this to 1 to append the input to existing archive.\n", FALSE},
  
@@ -130,7 +138,7 @@
       "# Set this to 1 or 2 to always show a progress report  as\n"
       "# Hypermail works. With a setting of 1, hypermail\n"
       "# overwrites the progress information relating to attachment\n"
-@@ -257,12 +257,12 @@
+@@ -266,12 +266,12 @@
       "# is listed individually with the number of the message the\n"
       "# attachments relate to. This is written to stdout.\n", FALSE},
  
@@ -145,7 +153,7 @@
       "# Set this to 1 to show the articles in a proportionally-spaced\n"
       "# font rather than a fixed-width (monospace) font.\n"
       "# Set this to 2 for more complex conversion to html\n"
-@@ -271,21 +271,21 @@
+@@ -280,21 +280,21 @@
       "# showhtml = 1, and showhtml = 0 will look pretty dull, but\n"
       "# 1 and 2 run risks of altering the appearance in undesired ways.\n", FALSE},
  
@@ -171,7 +179,7 @@
       "# Set this to 1 to put the individual message links at the top\n"
       "# of the individual message pages. Set this to 0 to produce pages\n"
       "# without the Next, Previous, Reply, In-Reply-To, etc. links. Set\n"
-@@ -293,14 +293,14 @@
+@@ -302,14 +302,14 @@
       "# pages, or 4 to produce those links only at the bottom of the\n"
       "# message.\n", FALSE},
  
@@ -188,7 +196,7 @@
       "# Setting this variable to On will tell Hypermail to generate\n"
       "# an index menu at the top and bottom of each page in a table\n"
       "# format. Set to Off if you want the standard Hypermail page look\n"
-@@ -308,44 +308,44 @@
+@@ -317,44 +317,44 @@
       "NOTE: THIS OPTION HAS BEEN DEPRECATED BY THE WAI CHANGES. IT WILL BE\n"
       "IGNORED.\n", FALSE},
  
@@ -243,7 +251,7 @@
       "# Set this to On to use gdbm to implement a header cache.\n"
       "# This will speed up hypermail, especially if your filesystem is slow.\n"
       "# It will not provide any speedup with the linkquotes option.\n"
-@@ -354,20 +354,20 @@
+@@ -363,20 +363,20 @@
  #endif
      , FALSE},
  
@@ -268,7 +276,7 @@
       "# Set this to On to generate filenames that are not sequential, but\n"
       "# rather a hash of the message properties.\n"
  #ifndef HAVE_LIBFNV
-@@ -376,214 +376,214 @@
+@@ -385,214 +385,214 @@
  #endif
       , FALSE},
  
@@ -525,7 +533,7 @@
       "# If nonzero, break the threads index file into multiple files,\n"
       "# with the initial message of each thread in the main index file\n"
       "# along with links to files containing the replies. Setting this\n"
-@@ -595,7 +595,7 @@
+@@ -604,7 +604,7 @@
       "# if the indextable option is turned on, and probably needs to\n"
       "# be less than thrdlevels.\n", FALSE},
  
@@ -534,7 +542,7 @@
       "# Sets the number of the first message of an archive. This option is\n"
       "# only active when adding new messages to brand new archive.\n"
       "# If not set, the default number will be 0000.\n"
-@@ -603,7 +603,7 @@
+@@ -612,7 +612,7 @@
       "# rebuild your archive, you must use the same value or you'll break any\n"
       "# link pointing to your archive.\n", FALSE},
  
@@ -543,7 +551,7 @@
       "# This string causes the messages to be put in subdirectories\n"
       "# by date. The string will be passed to strftime(3) to generate\n"
       "# subdirectory names based on message dates. Suggested values are\n"
-@@ -613,14 +613,14 @@
+@@ -622,14 +622,14 @@
       "# and update the archive incrementally (e.g. with -u), you must\n"
       "# use the usegdbm option.\n", FALSE},
  
@@ -560,7 +568,7 @@
       "# Controls the labels used in folders.html to describe the\n"
       "# directories created by the folder_by_date or msgsperfolder\n"
       "# options. For folder_by_date labels, the describe_folder string\n"
-@@ -632,7 +632,7 @@
+@@ -641,7 +641,7 @@
       "# %M for the number of the last message that can be put in the\n"
       "# directory.\n", FALSE},
  
@@ -569,8 +577,8 @@
       "# If folder_by_date or msgsperfolder are in use, create\n"
       "# a symbolic link by this name to the most recently created\n"
       "# subdirectory. Note that many web servers are configured to\n"
-@@ -640,33 +640,33 @@
-      "# be created in the directory specified by the 'dir' or '-d' option.",
+@@ -649,33 +649,33 @@
+      "# be created in the directory specified by the 'dir' or '-d' option.\n",
       FALSE},
  
 -    {"base_url", &set_base_url, NULL, CFG_STRING,
@@ -611,7 +619,7 @@
       "# 0 - remove deleted and expired files. Note that with this choice\n"
       "#     threading may be screwed up if there are replies to deleted or\n"
       "#     expired options and the archive is updated incrementally\n"
-@@ -676,55 +676,55 @@
+@@ -685,55 +685,55 @@
       "# Deleted and expired messages are removed from the index files\n"
       "# regardless of the delete_level selection.\n", FALSE},
  
@@ -676,7 +684,7 @@
       "# Any characters listed in this string are removed from user-specified\n"
       "# attachment filenames. Those characters will be replaced by a \"_\"\n"
       "# (which means that specifying \"_\" here won't have any effect).\n"
-@@ -735,17 +735,17 @@
+@@ -744,17 +744,17 @@
       "# includes on filenames ending in something other than .shtml), but\n"
       "# that will prevent browsers from recognizing many file types.\n", FALSE},
  
@@ -690,14 +698,14 @@
 +    {"href_detection", &set_href_detection, BTRUE,
       "# Set this to On to assume that any string on the body of the message\n"
       "# that says 

    

commit hypermail

root＠Hilbert.suse.de