Update "mutt" package to version 1.4.2.2. Changes since version 1.4.2.1:
- security fix for CVE-2006-3242 - minor tweak to satisfy modern compilers Note: Both changes were available in "pkgsrc" as patches already.
This commit is contained in:
tron
parent
06eb7023cb
commit
83bd31b1a2
5 changed files with 28 additions and 72 deletions
|
|
@ -1,8 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.143 2006/06/20 09:14:46 tron Exp $
|
||||
# $NetBSD: Makefile,v 1.144 2006/07/14 19:55:56 tron Exp $
|
||||
|
||||
DISTNAME= mutt-1.4.2.1i
|
||||
DISTNAME= mutt-1.4.2.2i
|
||||
PKGNAME= ${DISTNAME:C/i$//}
|
||||
PKGREVISION= 7
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= ftp://ftp.mutt.org/mutt/ \
|
||||
ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
|
||||
|
|
@ -44,7 +43,7 @@ SUBST_FILES.gpg= contrib/gpg.rc
|
|||
SUBST_SED.gpg= -e "s,/usr/bin/gpg,gpg,g"
|
||||
|
||||
SUBST_CLASSES+= paths
|
||||
SUBST_MESSAGE.paths= Fixing pathnames in manual pagae.
|
||||
SUBST_MESSAGE.paths= Fixing pathnames in manual page.
|
||||
SUBST_STAGE.paths= post-patch
|
||||
SUBST_FILES.paths= doc/mutt.man
|
||||
SUBST_SED.paths= -e "s,/usr/local/doc/mutt/,${DOCDIR}/,g"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
$NetBSD: distinfo,v 1.30 2006/06/20 09:14:46 tron Exp $
|
||||
$NetBSD: distinfo,v 1.31 2006/07/14 19:55:56 tron Exp $
|
||||
|
||||
SHA1 (mutt-1.4.2.1i.tar.gz) = 10fae2eef5a671d1ea6e17acd6e64cd1f37c3961
|
||||
RMD160 (mutt-1.4.2.1i.tar.gz) = 314536f77e0494dc6e4a5d57c681de791c8ce0fc
|
||||
Size (mutt-1.4.2.1i.tar.gz) = 2611253 bytes
|
||||
SHA1 (mutt-1.4.2.2i.tar.gz) = 0ee12f734f21186b143fa96a5ea79f72397747fb
|
||||
RMD160 (mutt-1.4.2.2i.tar.gz) = a749c13e9b56b0f3cf09ce5eabae3fd2edce4c0a
|
||||
Size (mutt-1.4.2.2i.tar.gz) = 2676306 bytes
|
||||
SHA1 (patch-aa) = 057c11486bb855e321853a106992c8792b75b812
|
||||
SHA1 (patch-ab) = 9eb4d0d861fff0a6a387d035293e28c6dd17a06c
|
||||
SHA1 (patch-ab) = 46518ebcd144bdb19da3f2238455d25544539e23
|
||||
SHA1 (patch-ac) = acfece3438c1cadc43247c590045699be7212ede
|
||||
SHA1 (patch-ad) = 6d7647913a0442ce474d02129d9bec0dbbd3df52
|
||||
SHA1 (patch-ae) = 442e3be4d0a5483e55f8e218cfbfc026e28235f5
|
||||
SHA1 (patch-ag) = c369b0b5d4855e50a016530f81190b2cbd47cef1
|
||||
SHA1 (patch-ah) = 04549728683b4250a26f6d6c7a212b8d505014d2
|
||||
SHA1 (patch-ai) = 317b736d6b9a896e1ee185cce37a1c2184c02cde
|
||||
|
|
|
|||
|
|
@ -1,25 +1,26 @@
|
|||
$NetBSD: patch-ab,v 1.12 2005/05/29 03:44:12 minskim Exp $
|
||||
$NetBSD: patch-ab,v 1.13 2006/07/14 19:55:56 tron Exp $
|
||||
|
||||
--- Makefile.in.orig 2004-02-12 02:52:26.000000000 -0600
|
||||
+++ Makefile.in
|
||||
@@ -26,6 +26,7 @@ datadir = @datadir@
|
||||
sysconfdir = @sysconfdir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
localstatedir = @localstatedir@
|
||||
+localedir = $(prefix)/share/locale
|
||||
--- Makefile.in.orig 2006-07-14 19:38:58.000000000 +0100
|
||||
+++ Makefile.in 2006-07-14 20:45:15.000000000 +0100
|
||||
@@ -167,7 +167,7 @@
|
||||
DBX = @DBX@
|
||||
DEBUGGER = @DEBUGGER@
|
||||
DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
- -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
|
||||
+ -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" \
|
||||
-DHAVE_CONFIG_H=1
|
||||
|
||||
DEPDIR = @DEPDIR@
|
||||
@@ -267,7 +267,7 @@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
infodir = @infodir@
|
||||
libexecdir = @libexecdir@
|
||||
-localstatedir = @localstatedir@
|
||||
+localstatedir = $(prefix)/share/locale
|
||||
mandir = @mandir@
|
||||
@@ -139,7 +140,7 @@ makedoc_DEPENDENCIES =
|
||||
|
||||
CPP = @CPP@
|
||||
|
||||
-DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" -DHAVE_CONFIG_H=1
|
||||
+DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H=1
|
||||
|
||||
|
||||
INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
|
||||
@@ -611,7 +612,7 @@ install-exec-local:
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
@@ -985,7 +985,7 @@
|
||||
ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
|
||||
fi
|
||||
if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ad,v 1.6 2006/02/07 00:00:51 minskim Exp $
|
||||
|
||||
--- keymap.h.orig 2001-09-11 04:20:34.000000000 -0700
|
||||
+++ keymap.h
|
||||
@@ -19,6 +19,8 @@
|
||||
#ifndef KEYMAP_H
|
||||
#define KEYMAP_H
|
||||
|
||||
+#include "mapping.h"
|
||||
+
|
||||
/* maximal length of a key binding sequence used for buffer in km_bindkey */
|
||||
#define MAX_SEQ 8
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
$NetBSD: patch-ae,v 1.4 2006/06/20 09:14:46 tron Exp $
|
||||
|
||||
--- imap/browse.c.orig 2002-02-26 10:38:56.000000000 +0000
|
||||
+++ imap/browse.c 2006-06-20 10:05:32.000000000 +0100
|
||||
@@ -452,7 +452,7 @@
|
||||
if (*s == '\"')
|
||||
{
|
||||
s++;
|
||||
- while (*s && *s != '\"')
|
||||
+ while (*s && *s != '\"' && n < sizeof (ns) - 1)
|
||||
{
|
||||
if (*s == '\\')
|
||||
s++;
|
||||
@@ -463,12 +463,14 @@
|
||||
s++;
|
||||
}
|
||||
else
|
||||
- while (*s && !ISSPACE (*s))
|
||||
+ while (*s && !ISSPACE (*s) && n < sizeof (ns) - 1)
|
||||
{
|
||||
ns[n++] = *s;
|
||||
s++;
|
||||
}
|
||||
ns[n] = '\0';
|
||||
+ if (n == sizeof (ns) - 1)
|
||||
+ dprint (1, (debugfile, "browse_get_namespace: too long: [%s]\n", ns));
|
||||
/* delim? */
|
||||
s = imap_next_word (s);
|
||||
/* delimiter is meaningless if namespace is "". Why does
|
||||
Loading…
Reference in a new issue