Browse Source

metamail: Updated (2.7 -> 2.7-54) switching to debian's metamail version

Note:

metamail is a kind of dinosaur of a package, and because there seems to be
no official development going on upstream, and the formerly download
location seems to be pretty dead, I switched to the source tarball provided
by debian which itself includes more tools. Besides that I removed all
patches we had locally and incorporated the official debian patchset.
stable/0.2
Christian Wiese 14 years ago
parent
commit
ee752873c5
  1. 93
      mail/metamail/00_mm-2.7-make.patch
  2. 33
      mail/metamail/05_mm-2.7-fonts.patch
  3. 27
      mail/metamail/10_mm-2.7-glibc.patch
  4. 141
      mail/metamail/15_mm-2.7-csh.patch
  5. 62
      mail/metamail/20_mm-2.7-uudecode.patch
  6. 37
      mail/metamail/25_mm-2.7-sunquote.patch
  7. 1811
      mail/metamail/30_mm-2.7-ohnonotagain.patch
  8. 28
      mail/metamail/35_mm-2.7-arghhh.patch
  9. 99
      mail/metamail/40_mm-2.7-sml.patch
  10. 28
      mail/metamail/45_metamail-2.7-nl.patch
  11. 34
      mail/metamail/50_mm-2.7-linux.patch
  12. 40
      mail/metamail/55_metamail-2.7-fixpartial.patch
  13. 28
      mail/metamail/60_metamail-2.7-fixawk.patch
  14. 29
      mail/metamail/65_metamail-2.7-usesox.patch
  15. 29
      mail/metamail/70_mm-2.7-sendmail.patch
  16. 29
      mail/metamail/80_mm-2.7-strip.patch
  17. 29
      mail/metamail/85_mm-2.7-rm.patch
  18. 26
      mail/metamail/90_mm-2.7-malloc.patch
  19. 26
      mail/metamail/95_mm-2.7-gcc-4.0.patch
  20. 13
      mail/metamail/metamail.conf
  21. 10
      mail/metamail/metamail.desc

93
mail/metamail/00_mm-2.7-make.patch

@ -1,93 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/00_mm-2.7-make.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/Makefile.orig Wed Jan 26 12:32:33 1994
+++ mm2.7/src/Makefile Wed Oct 11 21:44:12 1995
@@ -38,7 +38,7 @@
STATICFLAG=FOOBAR${HOST_ARCH}
-CFLAGS = -g -I. ${$(STATICFLAG)}
+CFLAGS = $(RPM_OPT_FLAGS) -I. -DLINUX ${$(STATICFLAG)}
# The following is better if you want to make sure you run with SYSV defined
# CFLAGS = -g -I. ${$(STATICFLAG)} -DSYSV
# Also, for SGI Irix, compile in K&R mode
@@ -75,7 +75,7 @@
INSTALL = install -c -s
# Root of installation tree
-INSTROOT = /usr/local
+INSTROOT = /usr
#
# This is where binaries should be copied
LOCALBINDIR = ${INSTROOT}/bin
@@ -91,7 +91,7 @@
FONTSUFFIX=pcf
# This is where the mailcap file should be put
-MAILCAPDIR = ${INSTROOT}/etc
+MAILCAPDIR = /etc
# This helps with the "for" constructs below on some platforms:
SHELL=/bin/sh
@@ -145,7 +145,7 @@
echo "installing man page $$target";\
${CP} $$file $$target; \
done)
- @echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old
+ @echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old"
-mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old
@echo "installing file $(MAILCAPDIR)/mailcap"
${CP} mailcap $(MAILCAPDIR)
--- mm2.7/src/Makefile.don Thu Feb 22 14:12:21 1996
+++ mm2.7/src/Makefile Thu Feb 22 14:12:54 1996
@@ -145,10 +145,6 @@
echo "installing man page $$target";\
${CP} $$file $$target; \
done)
- @echo "Renaming old mailcap file to $(MAILCAPDIR)/mailcap.old"
- -mv $(MAILCAPDIR)/mailcap $(MAILCAPDIR)/mailcap.old
- @echo "installing file $(MAILCAPDIR)/mailcap"
- ${CP} mailcap $(MAILCAPDIR)
uninstall-all:
@(cd bin; \
@@ -172,8 +168,6 @@
echo "rm-ing man page $$target";\
${RM} $$target; \
done)
- @echo "rm-ing file $(MAILCAPDIR)/mailcap"
- @${RM} $(MAILCAPDIR)/mailcap
clean:
-${RM} -rf *.BAK
--- mm2.7/src/Makefile.don Thu Feb 22 14:19:05 1996
+++ mm2.7/src/Makefile Thu Feb 22 14:19:27 1996
@@ -138,13 +138,6 @@
echo "installing man page $$target";\
${CP} $$file $$target; \
done)
- @(cd man; \
- for file in *.4; \
- do \
- target=$(MAN4DIR)/`basename $$file .4`.$(MAN4EXT); \
- echo "installing man page $$target";\
- ${CP} $$file $$target; \
- done)
uninstall-all:
@(cd bin; \

33
mail/metamail/05_mm-2.7-fonts.patch

@ -1,33 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/05_mm-2.7-fonts.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/fonts/Makefile.marc Tue Feb 13 14:56:31 1996
+++ mm2.7/src/fonts/Makefile Tue Feb 13 14:57:00 1996
@@ -28,11 +28,11 @@
-${DIRBUILDER}
shownonascii: Xshownonascii
- sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xshownonascii > shownonascii
+ sed -e s@/u/nsb/lib/fonts@/usr/lib/metamail/fonts@ < Xshownonascii > shownonascii
chmod +x shownonascii
mailto-hebrew: Xmailto-hebrew
- sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xmailto-hebrew > mailto-hebrew
+ sed -e s@/u/nsb/lib/fonts@/usr/lib/metamail/fonts@ < Xmailto-hebrew > mailto-hebrew
chmod +x mailto-hebrew
clean:

27
mail/metamail/10_mm-2.7-glibc.patch

@ -1,27 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/10_mm-2.7-glibc.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/metamail/metamail.c.ewt Mon Aug 26 17:16:59 1996
+++ mm2.7/src/metamail/metamail.c Mon Aug 26 17:17:12 1996
@@ -48,6 +48,7 @@
#ifndef AMIGA
#ifdef SYSV
#include <termio.h>
+#include <sys/ioctl.h>
#include <unistd.h>
#else /* SYSV */
#include <sgtty.h>

141
mail/metamail/15_mm-2.7-csh.patch

@ -1,141 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/15_mm-2.7-csh.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/metamail/mailto.c.cshfix Sat Oct 25 09:50:36 1997
+++ mm2.7/src/metamail/mailto.c Sat Oct 25 09:51:03 1997
@@ -200,9 +200,12 @@
}
TildeHelp() {
- char *pager = getenv("PAGER");
char TmpName[100], CmdBuf[150];
+ char *pager;
FILE *fp;
+
+ if ((pager = getenv("METAMAIL_PAGER")) == NULL)
+ pager = getenv("PAGER");
strcpy(TmpName, tmpname());
fp = fopen(TmpName, "w");
--- mm2.7/src/bin/showexternal.cshfix Sat Oct 25 09:45:05 1997
+++ mm2.7/src/bin/showexternal Sat Oct 25 09:46:25 1997
@@ -19,6 +19,9 @@
if (! $?METAMAIL_TMPDIR) then
set METAMAIL_TMPDIR=/tmp
endif
+if (! $?METAMAIL_PAGER) then
+ set METAMAIL_PAGER=more
+endif
if (! $?FTP) then
set FTP=ftp
endif
@@ -27,11 +30,19 @@
echo "Usage: showexternal body-file access-type name [site [directory [mode [server]]]]"
exit -1
endif
-set bodyfile=$1
+# Check argument integrity. Don't trust mail headers
+switch ("$1$2$3$4$5$6$7")
+case "*[ ]*":
+ echo "Illegal white space in arguments -- possibly a mail bomb?!"
+ echo "Command was:"
+ echo \'$0\' \'$1\' \'$2\' \'$3\' \'$4\' \'$5\' \'$6\' \'$7\'
+ exit 2
+endsw
+set bodyfile="$1"
set atype=`echo $2 | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
set name=$3
if ($#argv > 3) then
- set site=$4
+ set site="$4"
else
set site=""
endif
@@ -41,12 +52,12 @@
set dir=""
endif
if ($#argv > 5) then
- set mode=$6
+ set mode="$6"
else
set mode=""
endif
if ($#argv > 6) then
- set server=$7
+ set server="$7"
else
set server=""
endif
@@ -96,7 +107,7 @@
!
sed -e 1,/^\$/d < $bodyfile >> ${METAMAIL_TMPDIR}/ext.junk.$$
- more ${METAMAIL_TMPDIR}/ext.junk.$$
+ ${METAMAIL_PAGER} ${METAMAIL_TMPDIR}/ext.junk.$$
rm ${METAMAIL_TMPDIR}/ext.junk.$$
breaksw
default:
--- mm2.7/src/bin/showpartial.cshfix Sat Oct 25 09:46:37 1997
+++ mm2.7/src/bin/showpartial Sat Oct 25 09:47:24 1997
@@ -11,14 +11,14 @@
echo "Usage: showpartial file id partnum totalnum"
exit -1
endif
-set file=$1
+set file="$1"
# This next line is because message-id can contain weird chars
set id=`echo $2 | tr -d \!\$\&\*\(\)\|\'\"\;\/\<\>\\`
@ partnum = $3
if ($#argv == 3 || $4 == "") then
set totalnum=-1
else
- @ totalnum = $4
+ @ totalnum = "$4"
endif
if (! -d $TREEROOT) then
--- mm2.7/src/bin/sun-message.csh.cshfix Sat Oct 25 09:49:16 1997
+++ mm2.7/src/bin/sun-message.csh Sat Oct 25 09:50:15 1997
@@ -8,6 +8,10 @@
mkdir /tmp/decode.$$
cd /tmp/decode.$$
+if (! $?METAMAIL_PAGER) then
+ set METAMAIL_PAGER=more
+endif
+
if ($2 == "uuencode") then
uudecode $1
@@ -37,7 +41,7 @@
cd /tmp; /bin/rm -rf /tmp/decode.$$
exit 0
else if ($ans == 1) then
- more $fn
+ ${METAMAIL_PAGER} $fn
else if ($ans == 2) then
set nfn = ""
echo -n "Save as: $HOME/"
@@ -53,7 +57,7 @@
set defans = "3"
end
else
- more $1
+ ${METAMAIL_PAGER} $1
endif

62
mail/metamail/20_mm-2.7-uudecode.patch

@ -1,62 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/20_mm-2.7-uudecode.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/bin/sun-audio-file.ewt Fri Oct 24 09:41:11 1997
+++ mm2.7/src/bin/sun-audio-file Fri Oct 24 09:52:05 1997
@@ -6,7 +6,13 @@
set METAMAIL_TMPDIR=/tmp
endif
-cd ${METAMAIL_TMPDIR}
-uudecode < $1
-audiotool audio-file
-rm -f audio-file $1
+set fn=`mktemp $METAMAIL_TMPDIR/audio.XXXXXX`
+test -n "$fn"
+if $? then
+ exit 1
+endif
+
+uudecode -o $fn < $1
+
+audiotool $fn
+rm -f $fn $1
--- mm2.7/src/bin/sun-message.csh.ewt Fri Oct 24 09:44:07 1997
+++ mm2.7/src/bin/sun-message.csh Fri Oct 24 09:52:30 1997
@@ -9,7 +9,13 @@
cd /tmp/decode.$$
if ($2 == "uuencode") then
- uudecode $1
+ set fn=`mktemp $METAMAIL_TMPDIR/audio.XXXXXX`
+ test -n "$fn"
+ if $? then
+ exit 1
+ endif
+
+ uudecode -o $fn $1
echo "The following file was uudecoded:"
echo ""
@@ -17,7 +23,6 @@
set defans = "1"
while (1)
ls -l
- set fn = *
echo ""
echo "Please choose one:"

37
mail/metamail/25_mm-2.7-sunquote.patch

@ -1,37 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/25_mm-2.7-sunquote.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/bin/sun-message.csh~ Tue May 19 10:22:52 1998
+++ mm2.7/src/bin/sun-message.csh Tue May 19 10:26:39 1998
@@ -5,6 +5,8 @@
# 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.
#
+# $2 is untrustworthy data. Quote it.
+#
mkdir /tmp/decode.$$
cd /tmp/decode.$$
@@ -12,7 +14,7 @@
set METAMAIL_PAGER=more
endif
-if ($2 == "uuencode") then
+if ("$2" == "uuencode") then
set fn=`mktemp $METAMAIL_TMPDIR/audio.XXXXXX`
test -n "$fn"
if $? then

1811
mail/metamail/30_mm-2.7-ohnonotagain.patch

File diff suppressed because it is too large Load Diff

28
mail/metamail/35_mm-2.7-arghhh.patch

@ -1,28 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/35_mm-2.7-arghhh.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/bin/showexternal~ Mon Jun 22 10:55:36 1998
+++ mm2.7/src/bin/showexternal Tue Jun 23 21:16:04 1998
@@ -215,7 +215,7 @@
exit -1
endif
echo Subject: Automated Mail Server Request > "$NEWNAME"
- echo To: ${server} >> "$NEWNAME"
+ echo To: "$server" >> "$NEWNAME"
echo "" >> "$NEWNAME"
sed -e 1,/^\$/d < $bodyfile >> "$NEWNAME"
echo "" >> "$NEWNAME"

99
mail/metamail/40_mm-2.7-sml.patch

@ -1,99 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/40_mm-2.7-sml.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/metamail/splitmail.c.sml Fri Jul 30 15:52:01 1999
+++ mm2.7/src/metamail/splitmail.c Fri Jul 30 15:52:14 1999
@@ -42,8 +42,8 @@
#define VERBOSEDELIVERYCMD VerboseDeliveryCmd
#else
extern char *getenv();
-#define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi"
-#define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi"
+#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
+#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
#endif
usageexit() {
--- mm2.7/src/bin/audiosend.sml Fri Jul 30 15:49:33 1999
+++ mm2.7/src/bin/audiosend Fri Jul 30 15:49:44 1999
@@ -110,7 +110,7 @@
switch ("$which")
case 1:
echo -n "Sending mail, please wait... "
- /usr/lib/sendmail "$to" "$cc" < $fname
+ /usr/sbin/sendmail "$to" "$cc" < $fname
if (! $status) then
echo "Done."
rm $fname
--- mm2.7/src/bin/mailserver.sml Fri Jul 30 15:50:19 1999
+++ mm2.7/src/bin/mailserver Fri Jul 30 15:50:36 1999
@@ -76,7 +76,7 @@
probably run in some circumstance other than mail delivery.
--------------------
!
- cat $TmpFile - | /usr/lib/sendmail "$MAINTAINER"
+ cat $TmpFile - | /usr/sbin/sendmail "$MAINTAINER"
# Takes the rest of the message from standard input
rm $TmpFile
exit 0
@@ -94,7 +94,7 @@
The file you requested, if it exists, will not be sent to you.
!
- /usr/lib/sendmail -t < $TmpFile
+ /usr/sbin/sendmail -t < $TmpFile
rm $TmpFile
exit 0
endif
@@ -116,7 +116,7 @@
echo "--------------------------------" >> $TmpFile
ls -R >> $TmpFile
echo "" >> $TmpFile
- /usr/lib/sendmail -t < $TmpFile
+ /usr/sbin/sendmail -t < $TmpFile
rm $TmpFile
exit 0
endif
@@ -144,7 +144,7 @@
echo "Command failed:" >> $TmpFile
echo " metasend -b -t $FromName -f $Subject -m $ct -s Re: $Subject" >> $TmpFile
echo "" >> $TmpFile
- /usr/lib/sendmail -t < $TmpFile
+ /usr/sbin/sendmail -t < $TmpFile
rm $TmpFile
exit 0
endif
@@ -157,7 +157,7 @@
echo The file: "$Subject" >> $TmpFile
echo was sent to: "$FromName" >> $TmpFile
echo "" >> $TmpFile
- /usr/lib/sendmail -t < $TmpFile
+ /usr/sbin/sendmail -t < $TmpFile
endif
rm -f $TmpFile
--- mm2.7/src/man/mailto.1.sml Fri Jul 30 15:51:30 1999
+++ mm2.7/src/man/mailto.1 Fri Jul 30 15:51:37 1999
@@ -230,7 +230,7 @@
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
- verbose -- controls the verbosity of output from /usr/lib/sendmail
+ verbose -- controls the verbosity of output from /usr/sbin/sendmail
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

28
mail/metamail/45_metamail-2.7-nl.patch

@ -1,28 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/45_metamail-2.7-nl.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/metamail/mailto.c~ Thu Sep 9 01:24:39 1999
+++ mm2.7/src/metamail/mailto.c Thu Sep 9 01:28:07 1999
@@ -1796,6 +1796,8 @@
printf("\nEnter the MIME Content-type value for the data from file %s\n (type '?' for a list of locally-valid content-types): ", sdum);
fflush(stdout);
fgets(LineBuf, sizeof(LineBuf), stdin);
+ if (LineBuf[strlen(LineBuf)-1] == '\n')
+ LineBuf[strlen(LineBuf)-1] = '\0';
if (index(LineBuf, '/')) {
char lc[100], *s, AnsBuf[100];
strcpy(lc, LineBuf);

34
mail/metamail/50_mm-2.7-linux.patch

@ -1,34 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/50_mm-2.7-linux.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/config.h.linux Sun Jun 18 21:59:38 2000
+++ mm2.7/src/config.h Sun Jun 18 21:59:10 2000
@@ -100,9 +100,11 @@
#endif
#ifdef SYSV
-#define killpg(a, b) kill(-(a), (b))
-#define bcopy(a, b, c) memcpy(b, a, c)
-#define bzero(a, b) memset(a, 0, b)
+#ifndef linux
+# define killpg(a, b) kill(-(a), (b))
+# define bcopy(a, b, c) memcpy(b, a, c)
+# define bzero(a, b) memset(a, 0, b)
+#endif
#define bcmp memcmp
#define index strchr
#define rindex strrchr

40
mail/metamail/55_metamail-2.7-fixpartial.patch

@ -1,40 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/55_metamail-2.7-fixpartial.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/bin/showpartial.fixpartial Thu Feb 1 12:20:37 2001
+++ mm2.7/src/bin/showpartial Thu Feb 1 12:21:29 2001
@@ -13,7 +13,7 @@
endif
set file="$1"
# This next line is because message-id can contain weird chars
-set id=`echo $2 | tr -d \!\$\&\*\(\)\|\'\"\;\/\<\>\\`
+set id=`echo $2 | tr -d \!\$\&\*\(\)\|\'\"\;\/\<\>\\\\`
@ partnum = "$3"
if ($#argv == 3 || "$4" == "") then
set totalnum=-1
@@ -74,9 +74,9 @@
end
if ("$found" == "$totalnum") then
cd "${TREEROOT}/$id"
- cat "$list" > "${TREEROOT}/$id/FULL"
+ cat $list > "${TREEROOT}/$id/FULL"
# cat ${TREEROOT}/$id/HDRS $list > ${TREEROOT}/$id/FULL
- rm "$list"
+ rm $list
echo All parts of this "${totalnum}"-part message have now been read.
metamail -d "${TREEROOT}/$id/FULL"
echo WARNING: To save space, the full file is now being deleted.

28
mail/metamail/60_metamail-2.7-fixawk.patch

@ -1,28 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/60_metamail-2.7-fixawk.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/bin/sun2mime.fixawk Thu Feb 1 12:28:33 2001
+++ mm2.7/src/bin/sun2mime Thu Feb 1 12:28:55 2001
@@ -20,7 +20,7 @@
rm -rf $TMPFILE
fi
-/bin/nawk '
+/bin/gawk '
BEGIN { printf("Content-type: multipart/mixed; boundary=--------\n\n")
RS=""; FS="\n"; mode="HEADER" }
mode == "HEADER" {

29
mail/metamail/65_metamail-2.7-usesox.patch

@ -1,29 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/65_metamail-2.7-usesox.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7/src/bin/showaudio.usesox Thu Feb 1 12:31:32 2001
+++ mm2.7/src/bin/showaudio Thu Feb 1 12:36:24 2001
@@ -151,6 +151,9 @@
# Solaris 2.0
/bin/audioconvert -i raw,voice -f sun $* | /bin/audioplay
exit $status
+else if (-e /usr/bin/play) then
+# Red Hat Linux
+ exec /usr/bin/play $*
else
set dev=/dev/audio
endif

29
mail/metamail/70_mm-2.7-sendmail.patch

@ -1,29 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/70_mm-2.7-sendmail.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -Nur mm2.7.orig/src/bin/showexternal mm2.7/src/bin/showexternal
--- mm2.7.orig/src/bin/showexternal 2003-05-14 23:58:27.000000000 +0200
+++ mm2.7/src/bin/showexternal 2003-05-14 23:59:21.000000000 +0200
@@ -219,7 +219,7 @@
echo "" >> "$NEWNAME"
sed -e 1,/^\$/d < $bodyfile >> "$NEWNAME"
echo "" >> "$NEWNAME"
- /usr/lib/sendmail -t < "$NEWNAME"
+ /usr/sbin/sendmail -t < "$NEWNAME"
if ($status) then
echo sendmail failed
cd ${METAMAIL_TMPDIR}

29
mail/metamail/80_mm-2.7-strip.patch

@ -1,29 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/80_mm-2.7-strip.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -Nur mm2.7.orig/src/Makefile mm2.7/src/Makefile
--- mm2.7.orig/src/Makefile 2003-05-15 00:11:18.000000000 +0200
+++ mm2.7/src/Makefile 2003-05-15 00:19:21.000000000 +0200
@@ -72,7 +72,7 @@
# install -s -c $(LOCALBINDIR) $$file
#
#INSTALL = cp
-INSTALL = install -c -s
+INSTALL = install -c
# Root of installation tree
INSTROOT = /usr

29
mail/metamail/85_mm-2.7-rm.patch

@ -1,29 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/85_mm-2.7-rm.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -Nur mm2.7.orig/src/Makefile mm2.7/src/Makefile
--- mm2.7.orig/src/Makefile 2003-05-15 00:19:21.000000000 +0200
+++ mm2.7/src/Makefile 2003-05-15 00:21:59.000000000 +0200
@@ -15,7 +15,7 @@
# System V users may change the following to remove the "-s" and all will still work.
LN = ln -s
-RM = rm
+RM = rm -f
# To shut rm up on SGI machines (where symlinks have mode 0000)
# RM = rm -f

26
mail/metamail/90_mm-2.7-malloc.patch

@ -1,26 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/90_mm-2.7-malloc.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7.orig/src/metamail/shared.c 2005-03-26 21:59:06.116190632 +0100
+++ mm2.7/src/metamail/shared.c 2005-03-26 22:08:01.887740976 +0100
@@ -11,7 +11,7 @@
#include <sys/utsname.h>
#endif
-extern char *malloc();
+extern void *malloc();
char **Exceptions;
int *NeedsPortableNewlines;
int ExceptionsAlloced = 0, ExceptionsUsed = 0;

26
mail/metamail/95_mm-2.7-gcc-4.0.patch

@ -1,26 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../metamail/95_mm-2.7-gcc-4.0.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- mm2.7_orig/src/richmail/richtext.c 1994-02-09 17:31:18.000000000 +0100
+++ mm2.7/src/richmail/richtext.c 2005-09-11 22:36:19.000000000 +0200
@@ -79,7 +79,7 @@
extern tputs();
#endif
-static outputc(), realoutputc(), MakeWorkingMargins(), Pause(), fputsmovingright(), ResetTerminalCodes(), FinalizeTerminal(), outputstr(), FPUTS();
+static outputc(), realoutputc(), MakeWorkingMargins(), Pause(), fputsmovingright(), ResetTerminalCodes(), FinalizeTerminal(), outputstr(), FPUTS(), lc2strcmp();
#define OUTC(c) (outputc((RCHAR)(c)))

13
mail/metamail/metamail.conf

@ -2,6 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../metamail/metamail.conf # Filename: package/.../metamail/metamail.conf
# Copyright (C) 2011 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -13,7 +14,13 @@
# GNU General Public License can be found in the file COPYING. # GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
hook_add preconf 5 "cd src" # saving our local patches and empty the patchfiles variable
makeopt="basics" localpatches=$patchfiles
makeinstopt="install-all" patchfiles=
# apply the debian patchset
var_append patchfiles ' ' "$( match_source_file -p $pkg_$ver.diff )"
# append our local patches
var_append patchfiles " " "$localpatches"

10
mail/metamail/metamail.desc

@ -3,7 +3,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../metamail/metamail.desc [COPY] Filename: package/.../metamail/metamail.desc
[COPY] Copyright (C) 2006 The OpenSDE Project [COPY] Copyright (C) 2006 - 2011 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] [COPY]
@ -29,10 +29,12 @@
[L] GPL [L] GPL
[S] Stable [S] Stable
[V] 2.7 [V] 2.7-54
[P] X -----5---9 131.200 [P] X -----5---9 131.200
[CV-URL] http://bmrc.berkeley.edu/~trey/emacs/metamail.html [CV-URL] http://bmrc.berkeley.edu/~trey/emacs/metamail.html
[D] 3274293306 mm2.7.tar.Z ftp://thumper.bellcore.com/pub/nsb/ [D] 3085272030 metamail_2.7.orig.tar.gz http://ftp.debian.org/debian/pool/main/m/metamail/
[D] 2475623582 metamail_2.7-54.diff.gz http://ftp.debian.org/debian/pool/main/m/metamail/
# old download site isnot available anymore
#[D] 3274293306 mm2.7.tar.Z ftp://thumper.bellcore.com/pub/nsb/

Loading…
Cancel
Save