pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/metamail * Apply security patch from
details: https://anonhg.NetBSD.org/pkgsrc/rev/033805a49bb6
branches: trunk
changeset: 469573:033805a49bb6
user: snj <snj%pkgsrc.org@localhost>
date: Wed Feb 25 03:58:42 2004 +0000
description:
* Apply security patch from
http://www.securityfocus.com/archive/1/354362/2004-02-15/2004-02-21/2
* Bump PKGREVISION to 2.
* Make patches only modify one file each
* Fix some spelling errors
* Use ${SED} instead of sed, and ${CHMOD} instead of chmod
* Set CFLAGS.SunOS instead of doing the bsd.prefs.mk dance
diffstat:
mail/metamail/Makefile | 17 +-
mail/metamail/distinfo | 20 ++-
mail/metamail/patches/patch-ac | 21 ----
mail/metamail/patches/patch-ad | 62 +++++-------
mail/metamail/patches/patch-ae | 46 +++++----
mail/metamail/patches/patch-af | 183 +++++++++++---------------------------
mail/metamail/patches/patch-ag | 195 +----------------------------------------
mail/metamail/patches/patch-ah | 33 ++++++-
mail/metamail/patches/patch-ai | 62 +++++++++++++
mail/metamail/patches/patch-aj | 52 ++++++++++
mail/metamail/patches/patch-ak | 83 +++++++++++++++++
mail/metamail/patches/patch-al | 60 ++++++++++++
mail/metamail/patches/patch-am | 13 ++
mail/metamail/patches/patch-an | 13 ++
mail/metamail/patches/patch-ao | 13 ++
15 files changed, 452 insertions(+), 421 deletions(-)
diffs (truncated from 975 to 300 lines):
diff -r 96f77910361a -r 033805a49bb6 mail/metamail/Makefile
--- a/mail/metamail/Makefile Wed Feb 25 03:47:50 2004 +0000
+++ b/mail/metamail/Makefile Wed Feb 25 03:58:42 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2004/01/20 12:19:43 agc Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/25 03:58:42 snj Exp $
DISTNAME= mm2.7
PKGNAME= metamail-2.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://thumper.bellcore.com/pub/nsb/
EXTRACT_SUFX= .tar.Z
@@ -20,18 +20,19 @@
USE_X11= YES
CFLAGS+= -DPKG_SYSCONFDIR='\\\"${PKG_SYSCONFDIR}\\\"'
-MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+CFLAGS.SunOS+= -DSYSV
+MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} CHMOD=${CHMOD} SED=${SED}
EGDIR= ${PREFIX}/share/examples/metamail
CONF_FILES= ${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
INSTALLATION_DIRS= bin man/man1 man/man4
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CFLAGS+= -DSYSV
-.endif
+SUBST_CLASSES+= awk
+SUBST_STAGE.awk= post-patch
+SUBST_MESSAGE.awk= Adjusting the path to awk
+SUBST_FILES.awk= bin/sun2mime
+SUBST_SED.awk= -e "s|/bin/nawk|${AWK}|"
post-patch:
${RM} -f ${WRKDIR}/mm2.7/src/bin/*.orig
diff -r 96f77910361a -r 033805a49bb6 mail/metamail/distinfo
--- a/mail/metamail/distinfo Wed Feb 25 03:47:50 2004 +0000
+++ b/mail/metamail/distinfo Wed Feb 25 03:58:42 2004 +0000
@@ -1,12 +1,18 @@
-$NetBSD: distinfo,v 1.6 2003/11/04 19:03:53 dmcmahill Exp $
+$NetBSD: distinfo,v 1.7 2004/02/25 03:58:42 snj Exp $
SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
Size (mm2.7.tar.Z) = 262881 bytes
SHA1 (patch-aa) = 5b03f920e11554af5f776ff352c85c06e2f8f8de
SHA1 (patch-ab) = 7cd0a70de63ba86172b5628bb082fb46100262b9
-SHA1 (patch-ac) = c2e0c044df30c3cc33c7f3ff2c620cd29816e1d6
-SHA1 (patch-ad) = a46353a5f6677f2388c50471eaee7cdff9f697d9
-SHA1 (patch-ae) = 1b8f88c25eb3b8e4a89e0c94b49f35ba0d809aa8
-SHA1 (patch-af) = 2bba73c3a2b11b0234b197e0e2236b17c60d5acb
-SHA1 (patch-ag) = d7dcd95194fad57b2863d165af427dd0d2b49bd5
-SHA1 (patch-ah) = 82d98f16b0c2d3a8448461b971d44dc352cd2921
+SHA1 (patch-ad) = f5b8a3e04da86fb875ffe34b3f4cba5c7b4e4d94
+SHA1 (patch-ae) = 15bd1530e763c8c6371a0fa8dff45cdd39916295
+SHA1 (patch-af) = 9ba42f1eef27d452debb9c1e0abc800f19deccac
+SHA1 (patch-ag) = 674ceb59955de76e9a673ee4969d359a30fba5f8
+SHA1 (patch-ah) = 0be03011df91c66f12836ce64eb37983f129e4c5
+SHA1 (patch-ai) = 4e85922573dc0ae2017c112198f1f23c2b08f729
+SHA1 (patch-aj) = 7384564119a360189c68bdc5ce0ba3648a44769c
+SHA1 (patch-ak) = fcf331b9d28243cb403fd0dc34a365eb147f3da4
+SHA1 (patch-al) = c63427174a5d80c62b207212e0d855457939d0bc
+SHA1 (patch-am) = d5d2cc002173da827fb452a91ccd906452420bfc
+SHA1 (patch-an) = 56c228106dc663623cb31ecf4eeba1fc5c27d045
+SHA1 (patch-ao) = 90566d47642fe8ee71295ea47f3cf7420d0b2880
diff -r 96f77910361a -r 033805a49bb6 mail/metamail/patches/patch-ac
--- a/mail/metamail/patches/patch-ac Wed Feb 25 03:47:50 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:09:40 agc Exp $
-
-*** bin/sun2mime.ORIG Sat Nov 13 15:53:51 1993
---- bin/sun2mime Mon Dec 12 10:07:44 1994
-***************
-*** 11,17 ****
- fi
- TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
-
-! /bin/nawk '
- BEGIN { printf("Content-type: multipart/mixed; boundary=--------\n\n")
- RS=""; FS="\n"; mode="HEADER" }
- mode == "HEADER" {
---- 11,17 ----
- fi
- TMPFILE=${METAMAIL_TMPDIR}/suntomime.$$
-
-! /usr/bin/awk '
- BEGIN { printf("Content-type: multipart/mixed; boundary=--------\n\n")
- RS=""; FS="\n"; mode="HEADER" }
- mode == "HEADER" {
diff -r 96f77910361a -r 033805a49bb6 mail/metamail/patches/patch-ad
--- a/mail/metamail/patches/patch-ad Wed Feb 25 03:47:50 2004 +0000
+++ b/mail/metamail/patches/patch-ad Wed Feb 25 03:58:42 2004 +0000
@@ -1,37 +1,27 @@
-$NetBSD: patch-ad,v 1.3 2003/11/04 19:03:53 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.4 2004/02/25 03:58:42 snj Exp $
-*** fonts/Makefile.orig Mon May 31 22:49:27 1993
---- fonts/Makefile Thu May 18 21:55:42 1995
-***************
-*** 28,39 ****
- -${DIRBUILDER}
-
- shownonascii: Xshownonascii
-! sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xshownonascii > shownonascii
- chmod +x shownonascii
-
- mailto-hebrew: Xmailto-hebrew
-! sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xmailto-hebrew > mailto-hebrew
- chmod +x mailto-hebrew
-
- clean:
- rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX} shownonascii mailto-hebrew fonts.dir
---- 28,45 ----
- -${DIRBUILDER}
-
- shownonascii: Xshownonascii
-! sed -e s@/u/nsb/lib/fonts@${PREFIX}/lib/metamail/fonts@ < Xshownonascii > shownonascii
- chmod +x shownonascii
-
- mailto-hebrew: Xmailto-hebrew
-! sed -e s@/u/nsb/lib/fonts@${PREFIX}/lib/metamail/fonts@ < Xmailto-hebrew > mailto-hebrew
- chmod +x mailto-hebrew
-+
-+ install:
-+ mkdir -p ${PREFIX}/lib/metamail/fonts
-+ ${INSTALL} -c heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} \
-+ heb8x13B.${FONTSUFFIX} fonts.alias ${PREFIX}/lib/metamail/fonts
-+ mkfontdir ${PREFIX}/lib/metamail/fonts
-
- clean:
- rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX} shownonascii mailto-hebrew fonts.dir
+--- fonts/Makefile.orig 1993-05-31 13:49:27.000000000 -0700
++++ fonts/Makefile 2004-02-24 19:19:01.000000000 -0800
+@@ -28,12 +28,18 @@ heb8x13B.${FONTSUFFIX}: heb8x13B.bdf
+ -${DIRBUILDER}
+
+ shownonascii: Xshownonascii
+- sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xshownonascii > shownonascii
+- chmod +x shownonascii
++ ${SED} -e s@/u/nsb/lib/fonts@${PREFIX}/lib/metamail/fonts@ < Xshownonascii > shownonascii
++ ${CHMOD} +x shownonascii
+
+ mailto-hebrew: Xmailto-hebrew
+- sed -e s@/u/nsb/lib/fonts@`pwd`@ < Xmailto-hebrew > mailto-hebrew
+- chmod +x mailto-hebrew
++ ${SED} -e s@/u/nsb/lib/fonts@${PREFIX}/lib/metamail/fonts@ < Xmailto-hebrew > mailto-hebrew
++ ${CHMOD} +x mailto-hebrew
++
++install:
++ mkdir -p ${PREFIX}/lib/metamail/fonts
++ ${INSTALL} -c heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} \
++ heb8x13B.${FONTSUFFIX} fonts.alias ${PREFIX}/lib/metamail/fonts
++ mkfontdir ${PREFIX}/lib/metamail/fonts
+
+ clean:
+ rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX} shownonascii mailto-hebrew fonts.dir
diff -r 96f77910361a -r 033805a49bb6 mail/metamail/patches/patch-ae
--- a/mail/metamail/patches/patch-ae Wed Feb 25 03:47:50 2004 +0000
+++ b/mail/metamail/patches/patch-ae Wed Feb 25 03:58:42 2004 +0000
@@ -1,23 +1,25 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:09:41 agc Exp $
+$NetBSD: patch-ae,v 1.3 2004/02/25 03:58:43 snj Exp $
-*** metamail/splitmail.c.orig Sun Jun 18 13:13:56 1995
---- metamail/splitmail.c Sun Jun 18 13:14:48 1995
-***************
-*** 41,48 ****
- #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
- #else
- extern char *getenv();
-! #define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi"
-! #define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi"
- #endif
-
- usageexit() {
---- 41,48 ----
- #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
- #else
- extern char *getenv();
-! #define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi"
-! #define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi"
- #endif
-
- usageexit() {
+--- metamail/splitmail.c.orig 1994-01-31 14:23:14.000000000 -0800
++++ metamail/splitmail.c 2004-02-24 10:49:02.000000000 -0800
+@@ -41,8 +41,8 @@ extern char *malloc(), *index(), *getmyn
+ #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() {
+@@ -361,7 +361,8 @@ char **OrigID;
+ }
+ if (!ULstrcmp(s, "subject")) {
+ *colon = ':';
+- strcpy(SubjectBuf, ++colon);
++ strncpy(SubjectBuf, ++colon, sizeof(SubjectBuf));
++ SubjectBuf[sizeof(SubjectBuf) - 1] = '\0';
+ return(0);
+ }
+ if (!ULstrcmp(s, "content-type")) {
diff -r 96f77910361a -r 033805a49bb6 mail/metamail/patches/patch-af
--- a/mail/metamail/patches/patch-af Wed Feb 25 03:47:50 2004 +0000
+++ b/mail/metamail/patches/patch-af Wed Feb 25 03:58:42 2004 +0000
@@ -1,131 +1,54 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:09:41 agc Exp $
+$NetBSD: patch-af,v 1.3 2004/02/25 03:58:43 snj Exp $
-*** mailto.c.orig Wed Feb 9 23:30:26 1994
---- metamail/mailto.c Mon Nov 20 01:21:37 1995
-***************
-*** 570,575 ****
---- 570,576 ----
- if (isupper(*sdum)) *sdum = tolower(*sdum);
- }
- if (strcmp(CharacterSet, "us-ascii")
-+ && strcmp(CharacterSet, "koi8-r")
- && strncmp(CharacterSet, "iso-8859-", 9)) {
- fprintf(stderr, "mailto: Unsupported character set: %s\n", CharacterSet);
- exit(-1);
-***************
-*** 1130,1135 ****
---- 1131,1137 ----
- if (part->isrich) {
- if (strcmp(CharacterSet, "us-ascii")
- && (strncmp(CharacterSet, "iso-8859-", 9)
-+ && strcmp(CharacterSet, "koi8-r")
- || part->encoding_type_needed != ENC_NONE)) {
- fprintf(fp, "Content-type: text/richtext; charset=\"%s\"\n", CharacterSet);
- } else {
-***************
-*** 1140,1145 ****
---- 1142,1148 ----
- WriteCtypeNicely(fp, part->content_type);
- if (strcmp(CharacterSet, "us-ascii")
- && (strncmp(CharacterSet, "iso-8859-", 9)
-+ && strcmp(CharacterSet, "koi8-r")
- || part->encoding_type_needed != ENC_NONE)) {
- fprintf(fp, "; charset=\"%s\"\n", CharacterSet);
- } else fputs("\n", fp);
-***************
-*** 1745,1750 ****
---- 1748,1754 ----
- }
- printf("\n\nEnter your choice as a number from 0 to %d: ", i);
- fflush(stdout);
-+ *LineBuf = '\0';
- fgets(LineBuf, sizeof(LineBuf), stdin);
- ans = atoi(LineBuf);
- if (ans == 0 || ans == 1) {
-***************
-*** 1791,1797 ****
- int ct;
- 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);
-! gets(LineBuf);
- if (index(LineBuf, '/')) {
- char lc[100], *s, AnsBuf[100];
- strcpy(lc, LineBuf);
---- 1795,1801 ----
- int ct;
- 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 (index(LineBuf, '/')) {
- char lc[100], *s, AnsBuf[100];
- strcpy(lc, LineBuf);
-***************
-*** 1809,1815 ****
- }
- if (mc) break;
- printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type. Do you want to use it anyway [no] ? ", LineBuf);
-! s = gets(AnsBuf);
- while (s && *s && isspace((unsigned char) *s)) ++s;
- if (s && (*s == 'y' || *s == 'Y')) break;
- continue;
---- 1813,1819 ----
- }
- if (mc) break;
- printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type. Do you want to use it anyway [no] ? ", LineBuf);
-! s = fgets(AnsBuf, sizeof(AnsBuf), stdin);
- while (s && *s && isspace((unsigned char) *s)) ++s;
- if (s && (*s == 'y' || *s == 'Y')) break;
- continue;
-*** metamail.c.bak Thu Feb 17 04:57:19 1994
---- metamail/metamail.c Mon Nov 20 01:21:37 1995
-***************
-*** 83,89 ****
- #define MAX_FILE_NAME_SIZE 256
Home |
Main Index |
Thread Index |
Old Index