Hello community, here is the log from the commit of package metamail for openSUSE:Factory checked in at 2019-06-22 11:21:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/metamail (Old) and /work/SRC/openSUSE:Factory/.metamail.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "metamail" Sat Jun 22 11:21:52 2019 rev:23 rq:710241 version:2.7.19 Changes: -------- --- /work/SRC/openSUSE:Factory/metamail/metamail.changes 2016-06-12 18:52:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.metamail.new.4615/metamail.changes 2019-06-22 11:21:53.725239099 +0200 @@ -1,0 +2,7 @@ +Tue Jun 11 17:07:38 UTC 2019 - [email protected] + +- Remove tcsh dependency by dropping bogus mailserver and + sun-message.csh +- use autosetup, refresh all 5 patches + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metamail.spec ++++++ --- /var/tmp/diff_new_pack.Iv2Hck/_old 2019-06-22 11:21:54.689240123 +0200 +++ /var/tmp/diff_new_pack.Iv2Hck/_new 2019-06-22 11:21:54.693240128 +0200 @@ -29,8 +29,8 @@ Source: metamail-2.7-19.tar.gz Source1: mimecheck Source2: mimecheck.1 -Patch0: metamail-2.7-19.dif -Patch1: metamail-2.7-19-security.dif +Patch0: metamail-2.7-19-security.dif +Patch1: metamail-2.7-19.dif Patch2: metamail-2.7-19-getline.dif Patch3: metamail-2.7-19-binderman.dif Patch4: metamail-2.7-19-fix-bashisms.patch @@ -44,15 +44,11 @@ %prep -%setup -n metamail-2.7-19 -%patch -P 1 -b .security -%patch -P 0 -%patch2 -%patch3 -%patch4 -p1 -%patch5 -p1 +%autosetup -p1 -n metamail-2.7-19 %build +rm -f bin/mailserver +rm -f bin/sun-message.csh make make -C fonts @@ -76,7 +72,6 @@ /usr/bin/audiosend /usr/bin/extcompose /usr/bin/getfilename -/usr/bin/mailserver /usr/bin/mailto /usr/bin/mailto-hebrew /usr/bin/metamail @@ -102,7 +97,6 @@ /usr/bin/splitmail /usr/bin/sun-audio-file /usr/bin/sun-message -/usr/bin/sun-message.csh /usr/bin/sun-to-mime /usr/bin/sun2mime /usr/bin/uudepipe ++++++ metamail-2.7-19-binderman.dif ++++++ --- /var/tmp/diff_new_pack.Iv2Hck/_old 2019-06-22 11:21:54.717240153 +0200 +++ /var/tmp/diff_new_pack.Iv2Hck/_new 2019-06-22 11:21:54.717240153 +0200 @@ -1,5 +1,5 @@ ---- metamail/metamail.c -+++ metamail/metamail.c 2009-10-20 16:14:51.919429334 +0200 +--- a/metamail/metamail.c ++++ b/metamail/metamail.c @@ -1294,9 +1294,9 @@ struct MailcapEntry mc; struct part *PartsWritten=NULL; char *s, *cmd; ++++++ metamail-2.7-19-fix-bashisms.patch ++++++ --- /var/tmp/diff_new_pack.Iv2Hck/_old 2019-06-22 11:21:54.721240157 +0200 +++ /var/tmp/diff_new_pack.Iv2Hck/_new 2019-06-22 11:21:54.725240162 +0200 @@ -1,7 +1,6 @@ -diff -Ndur metamail-2.7-19/bin/extcompose metamail-2.7-19-fix-bashisms/bin/extcompose ---- metamail-2.7-19/bin/extcompose 1997-04-28 11:15:05.000000000 +0300 -+++ metamail-2.7-19-fix-bashisms/bin/extcompose 2014-12-28 01:12:48.394929799 +0200 -@@ -28,7 +28,7 @@ +--- a/bin/extcompose ++++ b/bin/extcompose +@@ -28,7 +28,7 @@ do echo " 4 -- In an Internet FTP directory that requires a valid login" echo " 5 -- Under the control of a mail server that will send the data on request" echo "" @@ -10,10 +9,9 @@ read ans case "$ans" in 1) accesstype=local-file ;; -diff -Ndur metamail-2.7-19/bin/showaudio metamail-2.7-19-fix-bashisms/bin/showaudio ---- metamail-2.7-19/bin/showaudio 2014-12-28 01:10:13.923940249 +0200 -+++ metamail-2.7-19-fix-bashisms/bin/showaudio 2014-12-28 01:12:48.395929799 +0200 -@@ -269,8 +269,8 @@ +--- a/bin/showaudio ++++ b/bin/showaudio +@@ -269,8 +269,8 @@ then read AUDIOPHONE fi ++++++ metamail-2.7-19-getline.dif ++++++ --- /var/tmp/diff_new_pack.Iv2Hck/_old 2019-06-22 11:21:54.729240166 +0200 +++ /var/tmp/diff_new_pack.Iv2Hck/_new 2019-06-22 11:21:54.733240170 +0200 @@ -1,6 +1,6 @@ ---- metamail/uue.c -+++ metamail/uue.c -@@ -33,7 +33,7 @@ +--- a/metamail/uue.c ++++ b/metamail/uue.c +@@ -33,7 +33,7 @@ FILE *outfp; } int @@ -9,7 +9,7 @@ char *buf; int size; FILE *fp; -@@ -73,7 +73,7 @@ +@@ -73,7 +73,7 @@ int *ctptr; char buf[63]; while (1) { @@ -18,7 +18,7 @@ fprintf (stderr, "Premature EOF!\n"); return; } -@@ -85,7 +85,7 @@ +@@ -85,7 +85,7 @@ int *ctptr; } } while (1) { ++++++ metamail-2.7-19-provide-filenames-for-attachments.patch ++++++ --- /var/tmp/diff_new_pack.Iv2Hck/_old 2019-06-22 11:21:54.737240174 +0200 +++ /var/tmp/diff_new_pack.Iv2Hck/_new 2019-06-22 11:21:54.741240179 +0200 @@ -1,5 +1,3 @@ -diff --git a/bin/metasend b/bin/metasend -index e0f0aff..395e3d3 100755 --- a/bin/metasend +++ b/bin/metasend @@ -55,7 +55,8 @@ fi ++++++ metamail-2.7-19-security.dif ++++++ --- /var/tmp/diff_new_pack.Iv2Hck/_old 2019-06-22 11:21:54.745240183 +0200 +++ /var/tmp/diff_new_pack.Iv2Hck/_new 2019-06-22 11:21:54.749240187 +0200 @@ -1,6 +1,6 @@ ---- metamail/metamail.c -+++ metamail/metamail.c 2006-02-23 18:56:04.000000000 +0100 -@@ -445,7 +445,7 @@ +--- a/metamail/metamail.c ++++ b/metamail/metamail.c +@@ -445,7 +445,7 @@ int nestingdepth; } LineBuf = malloc(LINE_BUF_SIZE); if (!LineBuf) ExitWithError(nomem); @@ -9,7 +9,7 @@ strcpy(boundary, LineBuf); boundarylen = strlen(boundary); if (BoundaryCt >= BoundaryAlloc) { -@@ -1202,9 +1202,9 @@ +@@ -1202,9 +1202,9 @@ char *SquirrelFile; fprintf(outfp, "Content-type: %s", ContentType); for (j=0; j<CParamsUsed; ++j) { fprintf(outfp, " ; "); @@ -21,7 +21,7 @@ } fprintf(outfp, "\n\n"); TranslateInputToOutput(InputFP, outfp, EncodingCode, ContentType); -@@ -2022,7 +2022,8 @@ +@@ -2022,7 +2022,8 @@ int ShowLeadingWhitespace; if (lc2strcmp(charset, PrevCharset)) { char *s2, *charsetinuse; @@ -31,7 +31,7 @@ for (s2=PrevCharset; *s2; ++s2) { if (isupper((unsigned char) *s2)) *s2 = tolower((unsigned char) *s2); } -@@ -2032,7 +2033,7 @@ +@@ -2032,7 +2033,7 @@ int ShowLeadingWhitespace; } } if (ecode == ENCODING_NONE) { @@ -40,7 +40,7 @@ } else { /* What follows is REALLY bogus, but all my encoding stuff is pipe-oriented right now... */ MkTmpFileName(TmpFile); -@@ -2115,7 +2116,7 @@ +@@ -2115,7 +2116,7 @@ struct part **PartsWritten; if (boundary[0] == '"') { boundary=UnquoteString(boundary); } @@ -49,9 +49,9 @@ strcpy(boundary, LineBuf); boundarylen = strlen(boundary); if (BoundaryCt >= BoundaryAlloc) { ---- metamail/splitmail.c -+++ metamail/splitmail.c 2006-02-23 18:55:01.000000000 +0100 -@@ -194,7 +194,7 @@ +--- a/metamail/splitmail.c ++++ b/metamail/splitmail.c +@@ -194,7 +194,7 @@ char **argv; s = endofheader(from); /* would be index(from, '\n'), but need to check for continuation lines */ *s = '\0'; @@ -60,7 +60,7 @@ strcat(SharedHeaders, from); strcat(SharedHeaders, "\n"); } -@@ -339,9 +339,10 @@ +@@ -339,9 +339,10 @@ static char *SharedHeads[] = { NULL }; @@ -72,7 +72,7 @@ char **OrigID; { int i; -@@ -361,7 +362,8 @@ +@@ -361,7 +362,8 @@ char **OrigID; } if (!ULstrcmp(s, "subject")) { *colon = ':'; ++++++ metamail-2.7-19.dif ++++++ --- /var/tmp/diff_new_pack.Iv2Hck/_old 2019-06-22 11:21:54.757240195 +0200 +++ /var/tmp/diff_new_pack.Iv2Hck/_new 2019-06-22 11:21:54.757240195 +0200 @@ -1,9 +1,5 @@ ---- .pkgextract -+++ .pkgextract 2005-07-01 12:53:06.000000000 +0200 -@@ -0,0 +1 @@ -+patch -p0 -s --suffix=security < ../metamail-2.7-19-security.dif ---- Makefile -+++ Makefile 2008-09-15 11:49:34.519504421 +0200 +--- a/Makefile ++++ b/Makefile @@ -26,7 +26,7 @@ MAKE = make CP = cp @@ -50,7 +46,7 @@ # This helps with the "for" constructs below on some platforms: SHELL=/bin/sh -@@ -129,22 +129,24 @@ install-all: basics +@@ -129,22 +129,24 @@ install-all: basics do \ target=$(LOCALBINDIR)/$$file; \ echo "installing binary $$target"; \ @@ -89,8 +85,8 @@ # @echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old" # -mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old # @echo "installing file $(MAILCAPDIR)/mailcap" ---- config.h -+++ config.h 2005-07-01 12:53:06.000000000 +0200 +--- a/config.h ++++ b/config.h @@ -38,6 +38,9 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE #ifdef LINUX @@ -125,8 +121,8 @@ #endif #endif #endif ---- bin/audiosend -+++ bin/audiosend 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/audiosend ++++ b/bin/audiosend @@ -43,14 +43,14 @@ else dev=/dev/audio fi @@ -171,8 +167,8 @@ if test $? -eq 0 then ---- bin/mailserver -+++ bin/mailserver 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/mailserver ++++ b/bin/mailserver @@ -28,20 +28,28 @@ setenv PATH ${METAMAILDIR}:${PATH} rehash set FromName="" @@ -298,7 +294,7 @@ To: $FromName Subject: Re: $Subject -@@ -135,18 +151,24 @@ Command failed: +@@ -135,18 +151,24 @@ Command failed: metasend -b -t "$FromName" -f "$Subject" -m "$ct" -s "Re: $Subject" ! @@ -326,8 +322,8 @@ +end: +rm -f $TmpFile exit 0 ---- bin/mailto-hebrew -+++ bin/mailto-hebrew 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/mailto-hebrew ++++ b/bin/mailto-hebrew @@ -29,13 +29,13 @@ # Brought into line with metamail 2.7 beta release Csh version # Dave Shield February 1994 @@ -350,8 +346,8 @@ MM_CHARSET=iso-8859-8; export MM_CHARSET -xterm -fn \*iso-8859-8 -e mailto $* +xterm -fn \*iso-8859-8 -e mailto "$@" ---- bin/metasend -+++ bin/metasend 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/metasend ++++ b/bin/metasend @@ -29,10 +29,10 @@ # Dave Shield February 1994 @@ -445,8 +441,8 @@ echo "Content-Transfer-Encoding: $encode" >> $fname fi echo "" >> $fname ---- bin/mgrep -+++ bin/mgrep 2005-07-01 12:53:06.000000000 +0200 +--- /dev/null ++++ b/bin/mgrep @@ -0,0 +1,80 @@ +#!/bin/sh + @@ -528,16 +524,16 @@ + test "$r" -ne 0 && res="$r" +done +exit $res ---- bin/mimeit -+++ bin/mimeit 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/mimeit ++++ b/bin/mimeit @@ -19,4 +19,4 @@ shift echo Subject: "$sub" ; \ echo Content-Transfer-Encoding: base64 ; echo "" ; \ - mimencode -b ) | splitmail -d $* + mimencode -b ) | splitmail -d "$@" ---- bin/patch-metamail -+++ bin/patch-metamail 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/patch-metamail ++++ b/bin/patch-metamail @@ -67,9 +67,15 @@ read ans case "$ans" in @@ -566,8 +562,8 @@ patch -p < ${PREFIX}${PATCHNUMBER} ;; *) echo Patch not installed esac ---- bin/showaudio -+++ bin/showaudio 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/showaudio ++++ b/bin/showaudio @@ -34,7 +34,7 @@ then METAMAIL_TMPDIR=/tmp fi @@ -722,8 +718,8 @@ else echo -n "Do you want to write the audio out to a file [y] ? " read ANS ---- bin/showexternal -+++ bin/showexternal 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/showexternal ++++ b/bin/showexternal @@ -28,9 +28,9 @@ # Brought into line with metamail 2.7 beta release Csh version # Dave Shield February 1994 @@ -868,8 +864,8 @@ echo "" >> $NEWNAME sed -e 1,/^\$/d < $bodyfile >> $NEWNAME $MAILCOMMAND -t < $NEWNAME ---- bin/shownonascii -+++ bin/shownonascii 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/shownonascii ++++ b/bin/shownonascii @@ -28,7 +28,12 @@ # Brought into line with metamail 2.7 beta release Csh version # Dave Shield February 1994 @@ -946,8 +942,8 @@ XCHARSET=\*`echo $CHARSET | sed -e s/iso-/iso/` -xterm -fn $XCHARSET -e $CMD +eval xterm -fn \$XCHARSET -e $CMD ---- bin/showpartial -+++ bin/showpartial 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/showpartial ++++ b/bin/showpartial @@ -38,18 +38,18 @@ then exit 1 fi @@ -971,8 +967,8 @@ fi if test ! -d $TREEROOT ---- bin/showpicture -+++ bin/showpicture 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/showpicture ++++ b/bin/showpicture @@ -58,7 +58,12 @@ then echo X11, you will be able to see the picture properly. if test $MM_NOTTY -eq 1 @@ -1001,8 +997,8 @@ cat > $SQUIRREL else SQUIRREL="$*" ---- bin/sun-audio-file -+++ bin/sun-audio-file 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/sun-audio-file ++++ b/bin/sun-audio-file @@ -18,7 +18,13 @@ if [ -z "$METAMAIL_TMPDIR" ] then METAMAIL_TMPDIR=/tmp fi @@ -1020,8 +1016,8 @@ +uudecode -o $fn < "$1" +audiotool $fn +rm -f $fn $1 ---- bin/sun-message -+++ bin/sun-message 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/sun-message ++++ b/bin/sun-message @@ -5,12 +5,24 @@ # then gives the user a short menu of choices: # display, save or quit. @@ -1050,7 +1046,7 @@ echo "The following file was uudecoded:" echo -@@ -37,7 +49,12 @@ then +@@ -37,7 +49,12 @@ then fi case $ans in @@ -1064,7 +1060,7 @@ 2) echo -n "Save as: $HOME/" read nfn if test ! -z "${nfn:-}" -@@ -57,5 +74,9 @@ then +@@ -57,5 +74,9 @@ then defans=3 done else @@ -1075,8 +1071,8 @@ + more "$1" + fi fi ---- bin/sun-message.csh -+++ bin/sun-message.csh 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/sun-message.csh ++++ b/bin/sun-message.csh @@ -5,11 +5,22 @@ # This is sun-message. It looks at $2 to figure out how to decode $1, then gives the # user a short menu of choices, display, save, or quit. @@ -1155,8 +1151,8 @@ endif ---- bin/sun-to-mime -+++ bin/sun-to-mime 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/sun-to-mime ++++ b/bin/sun-to-mime @@ -18,10 +18,15 @@ if [ -z "$METAMAIL_TMPDIR" ] then METAMAIL_TMPDIR=/tmp fi @@ -1175,8 +1171,8 @@ echo "------------" >> $TMPFILE #metamail -d -z $TMPFILE metamail -z $TMPFILE ---- bin/sun2mime -+++ bin/sun2mime 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/sun2mime ++++ b/bin/sun2mime @@ -6,12 +6,19 @@ # This program is for use with sun-message which takes an arg to figure out how # (or if) the message is encoded. @@ -1209,8 +1205,8 @@ metamail -z $TMPFILE rm -f $TMPFILE ---- bin/uudepipe -+++ bin/uudepipe 2005-07-01 12:53:06.000000000 +0200 +--- a/bin/uudepipe ++++ b/bin/uudepipe @@ -10,6 +10,11 @@ # MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY # OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS", @@ -1224,8 +1220,8 @@ +fi cat ${1-"-"} | sed "s:begin [0-9][0-9]* .*:begin 600 $file:" | uudecode cat $file && rm -f $file ---- fonts/Makefile -+++ fonts/Makefile 2005-07-01 12:53:06.000000000 +0200 +--- a/fonts/Makefile ++++ b/fonts/Makefile @@ -30,11 +30,11 @@ heb8x13B.${FONTSUFFIX}: heb8x13B.bdf -${DIRBUILDER} @@ -1240,8 +1236,8 @@ chmod +x mailto-hebrew clean: ---- fonts/Xmailto-hebrew -+++ fonts/Xmailto-hebrew 2005-07-01 12:53:06.000000000 +0200 +--- a/fonts/Xmailto-hebrew ++++ b/fonts/Xmailto-hebrew @@ -1,7 +1,7 @@ #!/bin/csh -fb # (The "-fb" might need to be changed to "-f" on some systems) @@ -1251,8 +1247,8 @@ if ($?MM_CHARSET) then if ($MM_CHARSET == iso-8859-8) then ---- fonts/Xshownonascii -+++ fonts/Xshownonascii 2005-07-01 12:53:06.000000000 +0200 +--- a/fonts/Xshownonascii ++++ b/fonts/Xshownonascii @@ -1,7 +1,11 @@ #!/bin/csh -fb # (The "-fb" might need to be changed to "-f" on some systems) @@ -1291,8 +1287,8 @@ - +exec xterm -fn "$XCHARSET" -e $CMD ---- man/mailto.1 -+++ man/mailto.1 2008-09-15 17:09:13.574803113 +0200 +--- a/man/mailto.1 ++++ b/man/mailto.1 @@ -1,6 +1,6 @@ .TH MAILTO 1 "Release 1" "Bellcore Prototype" .SH NAME @@ -1301,7 +1297,7 @@ .SH SYNOPSIS .ta 8n \fBmailto\fP [-a] [-c] [-s] [recipient name(s)] -@@ -230,7 +230,7 @@ The .mailrc file in your home directory +@@ -230,7 +230,7 @@ The .mailrc file in your home directory dot -- controls whether or not a period alone on a line should be interpreted as terminating your mail ignore -- controls whether or not interrupts are ignored @@ -1310,8 +1306,8 @@ quiet -- controls the verbosity of output from the mailto program. keepblind -- controls whether or not a 'blind' copy of the mail is kept. commasonly -- controls whether or not a space character ---- man/mgrep.1 -+++ man/mgrep.1 2005-07-01 12:53:06.000000000 +0200 +--- /dev/null ++++ b/man/mgrep.1 @@ -0,0 +1,41 @@ +.TH MGREP 1 +.SH NAME @@ -1354,8 +1350,8 @@ + for csh: (setenv GREP fgrep; mgrep string files) +.SH "SEE ALSO" +grep(1), egrep(1), fgrep(1) ---- metamail/Makefile -+++ metamail/Makefile 2005-07-01 12:53:06.000000000 +0200 +--- a/metamail/Makefile ++++ b/metamail/Makefile @@ -41,9 +41,9 @@ shared.o: shared.c ../config.h splitmail.o: shared.c ../config.h @@ -1381,8 +1377,8 @@ clean: $(RM) -f metamail mmencode mailto splitmail *.o *.BAK ---- metamail/codes.c -+++ metamail/codes.c 2005-07-01 12:53:06.000000000 +0200 +--- a/metamail/codes.c ++++ b/metamail/codes.c @@ -19,6 +19,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE extern char *index(); static char basis_64[] = @@ -1464,8 +1460,8 @@ if (sawnewline && boundaries && (c1 == '-')) { char Buf[200]; unsigned char *s; ---- metamail/mailto.c -+++ metamail/mailto.c 2005-07-01 12:53:47.000000000 +0200 +--- a/metamail/mailto.c ++++ b/metamail/mailto.c @@ -60,8 +60,63 @@ extern char *getenv(); #include <unistd.h> #endif @@ -2168,8 +2164,8 @@ printf("WARNING: You have entered 8-bit characters in what is supposed to be\n"); printf("plain ASCII text. If you are using a non-ASCII character set, you should\n"); printf("declare this to be the case with the MM_CHARSET environment variable.\n"); ---- metamail/metamail.c -+++ metamail/metamail.c 2005-07-01 12:53:06.000000000 +0200 +--- a/metamail/metamail.c ++++ b/metamail/metamail.c @@ -47,7 +47,17 @@ extern char *mktemp(char *); #ifndef AMIGA @@ -2752,8 +2748,8 @@ #else struct sgttyb ts; gtty(fileno(stdin), &ts); ---- metamail/mmencode.c -+++ metamail/mmencode.c 2005-07-01 12:53:06.000000000 +0200 +--- a/metamail/mmencode.c ++++ b/metamail/mmencode.c @@ -18,14 +18,27 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE #include <fcntl.h> #endif @@ -2822,8 +2818,8 @@ if (which == BASE64) { if (encode) { to64(fp, fpo, portablenewlines); ---- metamail/putenv.c -+++ metamail/putenv.c 2005-07-01 12:53:06.000000000 +0200 +--- a/metamail/putenv.c ++++ b/metamail/putenv.c @@ -23,7 +23,6 @@ Cambridge, MA 02139, USA. */ #include <stdlib.h> #else @@ -2837,8 +2833,8 @@ return 0; } +#endif ---- metamail/shared.c -+++ metamail/shared.c 2005-07-01 12:53:06.000000000 +0200 +--- a/metamail/shared.c ++++ b/metamail/shared.c @@ -1,16 +1,25 @@ #include <stdio.h> #include <ctype.h> @@ -2944,8 +2940,8 @@ +#endif +} + ---- metamail/splitmail.c -+++ metamail/splitmail.c 2005-07-01 12:53:06.000000000 +0200 +--- a/metamail/splitmail.c ++++ b/metamail/splitmail.c @@ -26,9 +26,16 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE #include <config.h> #include <ctype.h> @@ -3043,8 +3039,8 @@ char *ctype; { char *ct, *semicolon, *st, *s, *param, *eq, *matcheq; ---- metamail/uue.c -+++ metamail/uue.c 2005-07-01 12:53:06.000000000 +0200 +--- a/metamail/uue.c ++++ b/metamail/uue.c @@ -1,10 +1,13 @@ #include <stdio.h> +#include <string.h> @@ -3078,8 +3074,8 @@ fromuue (infp, outfp, boundaries, ctptr) FILE *infp, *outfp; char **boundaries; ---- richmail/iso2022.c -+++ richmail/iso2022.c 2005-07-01 12:53:06.000000000 +0200 +--- a/richmail/iso2022.c ++++ b/richmail/iso2022.c @@ -41,9 +41,13 @@ #include <stdio.h> @@ -3152,8 +3148,8 @@ OutPrevChar = ch; + return 0; } ---- richmail/richlex.c -+++ richmail/richlex.c 2005-07-01 12:53:06.000000000 +0200 +--- a/richmail/richlex.c ++++ b/richmail/richlex.c @@ -42,6 +42,7 @@ -------------------------------------------------------------------------*/ @@ -3216,8 +3212,8 @@ int encoding; { RichtextCharEncoding = encoding; ---- richmail/richlex.h -+++ richmail/richlex.h 2005-07-01 12:53:06.000000000 +0200 +--- a/richmail/richlex.h ++++ b/richmail/richlex.h @@ -101,7 +101,7 @@ extern int (*RichtextPutc) (); /* * Reset the richtext parsing mechanism. @@ -3245,8 +3241,8 @@ /* * Define a number of macros for decoding multi-byte character ---- richmail/richset.c -+++ richmail/richset.c 2005-07-01 12:53:06.000000000 +0200 +--- a/richmail/richset.c ++++ b/richmail/richset.c @@ -34,6 +34,7 @@ -------------------------------------------------------------------------*/ @@ -3318,8 +3314,8 @@ struct charsetmember *member; RCHAR ch; { ---- richmail/richset.h -+++ richmail/richset.h 2005-07-01 12:53:06.000000000 +0200 +--- a/richmail/richset.h ++++ b/richmail/richset.h @@ -58,7 +58,7 @@ extern "C" { struct charsetproc { @@ -3381,8 +3377,8 @@ /* * Determine if the given character is a control code character. ---- richmail/richtext.c -+++ richmail/richtext.c 2005-07-01 12:53:07.000000000 +0200 +--- a/richmail/richtext.c ++++ b/richmail/richtext.c @@ -16,6 +16,8 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE #include <stdio.h> #include <ctype.h> @@ -3644,8 +3640,8 @@ return((*s1 == *s2) ? 0 : -1); } +#endif ---- richmail/richtoatk.c -+++ richmail/richtoatk.c 2005-07-01 12:53:07.000000000 +0200 +--- a/richmail/richtoatk.c ++++ b/richmail/richtoatk.c @@ -13,9 +13,12 @@ OF THIS MATERIAL FOR ANY PURPOSE. IT IS WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. */ @@ -3696,8 +3692,8 @@ char *s; int immediate; { ---- richmail/usascii.c -+++ richmail/usascii.c 2005-07-01 12:53:07.000000000 +0200 +--- a/richmail/usascii.c ++++ b/richmail/usascii.c @@ -34,6 +34,7 @@ -------------------------------------------------------------------------*/
