I'm going to commit this tomorrow if no one objects.
Bernd
Bernd Ahlers [Mon, Jul 24, 2006 at 09:57:43PM +0200] wrote:
>Bernd Ahlers [Sun, Jul 16, 2006 at 11:19:19AM +0200] wrote:
>>Attached is an update to mutt-1.5.12. The current sidebar patch doesn't
>>apply correctly, so the sidebar FLAVOR isn't functional yet. I'll send
>>a new diff when this is fixed.
>>
>A new sidebar patch has been released. Thanks to jolan@ for fixing and
>hosting the patch.
>
>Please test!
>
>Bernd
>
>
>Index: Makefile.inc
>===================================================================
>RCS file: /home/OpenBSD/cvs/ports/mail/mutt/Makefile.inc,v
>retrieving revision 1.21
>diff -u -p -r1.21 Makefile.inc
>--- Makefile.inc 22 Mar 2006 12:43:09 -0000 1.21
>+++ Makefile.inc 24 Jul 2006 19:05:09 -0000
>@@ -25,6 +25,7 @@ WANTLIB= c crypto des ssl
> FLAVORS+= slang mixmaster compressed
> FLAVOR?=
>
>+AUTOCONF_VERSION?= 2.59
> CONFIGURE_STYLE= autoconf old
> CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \
> --with-docdir="${PREFIX}/share/doc/mutt" \
>@@ -70,10 +71,10 @@ RUN_DEPENDS+= ::mail/mixmaster
> .endif
>
> .if ${FLAVOR:L:Mhcache}
>-CONFIGURE_ARGS+= --enable-hcache
>+CONFIGURE_ARGS+= --enable-hcache --without-qdbm
> LIB_DEPENDS+= gdbm.2::databases/gdbm
> .else
>-CONFIGURE_ARGS+= --without-gdbm
>+CONFIGURE_ARGS+= --without-gdbm --without-qdbm
> .endif
>
> .if ${FLAVOR:L:Midn}
>@@ -84,10 +85,10 @@ CONFIGURE_ARGS+= --without-idn
> .endif
>
> .if ${FLAVOR:L:Msidebar}
>-PATCHFILES+= patch-1.5.10i.sidebar.20050816.txt-fixed:1
>+PATCHFILES+= patch-1.5.12.sidebar.20060720.txt-fixed:1
> PATCH_DIST_STRIP= -p1
> .else
>-SUPDISTFILES+= patch-1.5.10i.sidebar.20050816.txt-fixed:1
>+SUPDISTFILES+= patch-1.5.12.sidebar.20060720.txt-fixed:1
> .endif
>
> .if defined(HOMESPOOL)
>Index: snapshot/Makefile
>===================================================================
>RCS file: /home/OpenBSD/cvs/ports/mail/mutt/snapshot/Makefile,v
>retrieving revision 1.39
>diff -u -p -r1.39 Makefile
>--- snapshot/Makefile 21 Jun 2006 08:16:45 -0000 1.39
>+++ snapshot/Makefile 24 Jul 2006 09:46:58 -0000
>@@ -2,12 +2,9 @@
>
> COMMENT= "tty-based e-mail client, development version"
>
>-VERSION= 1.5.11
>+VERSION= 1.5.12
> DISTNAME= mutt-${VERSION}
>-PKGNAME= ${DISTNAME}p3
> MASTER_SITES= ${MASTER_SITES_MUTT:=devel/}
>-
>-AUTOCONF_VERSION= 2.59
>
> FLAVORS= hcache idn sidebar
>
>Index: snapshot/distinfo
>===================================================================
>RCS file: /home/OpenBSD/cvs/ports/mail/mutt/snapshot/distinfo,v
>retrieving revision 1.22
>diff -u -p -r1.22 distinfo
>--- snapshot/distinfo 12 Nov 2005 02:29:47 -0000 1.22
>+++ snapshot/distinfo 24 Jul 2006 19:05:47 -0000
>@@ -1,12 +1,12 @@
>-MD5 (mutt-1.5.11.tar.gz) = 00e6f8f7c37d4840e5e30583ebee21ce
>-MD5 (patch-1.5.10i.sidebar.20050816.txt-fixed) =
>5ea280615802a0b95c1460021d85cbec
>-MD5 (patch-1.5.11.rr.compressed.1.gz) = fb79645e8269e2f5bfb53a8ecf955bf7
>-RMD160 (mutt-1.5.11.tar.gz) = 812bfa6b1c9bfb1650341f7522298699c7b214a5
>-RMD160 (patch-1.5.10i.sidebar.20050816.txt-fixed) =
>8a0db3dd9f368f0685739ef995d06bc69c9885d4
>-RMD160 (patch-1.5.11.rr.compressed.1.gz) =
>00f3302e86ce382e274e1b1745e0082ef1f643c4
>-SHA1 (mutt-1.5.11.tar.gz) = cc5823016fe7de6ee3a131b19a3f78796f9f53d5
>-SHA1 (patch-1.5.10i.sidebar.20050816.txt-fixed) =
>43372798b01357ab7162ab7051a556d378e34e4f
>-SHA1 (patch-1.5.11.rr.compressed.1.gz) =
>0a82f2253d11655a6f743d1a2cfc82877c4ef134
>-SIZE (mutt-1.5.11.tar.gz) = 3187375
>-SIZE (patch-1.5.10i.sidebar.20050816.txt-fixed) = 47269
>-SIZE (patch-1.5.11.rr.compressed.1.gz) = 10433
>+MD5 (mutt-1.5.12.tar.gz) = 57196c816211a72900fdc54341eb0132
>+MD5 (patch-1.5.12.rr.compressed.1.gz) = bb7e439d74b22ede912d2d30862b1367
>+MD5 (patch-1.5.12.sidebar.20060720.txt-fixed) =
>0f9d206c2d63b29581a934f6aedffbc2
>+RMD160 (mutt-1.5.12.tar.gz) = e68d4c5b099b8148769d138a36fa8561b278969c
>+RMD160 (patch-1.5.12.rr.compressed.1.gz) =
>7c9ba32d944cc842c340535ee629133052e2680f
>+RMD160 (patch-1.5.12.sidebar.20060720.txt-fixed) =
>bea87a7cbbff8389912dbd95231619f5d2d027ee
>+SHA1 (mutt-1.5.12.tar.gz) = bb888a35f42a77de7e326c03b60854ad1cc266ea
>+SHA1 (patch-1.5.12.rr.compressed.1.gz) =
>23d231f43d83e01e79cde9861679116541436446
>+SHA1 (patch-1.5.12.sidebar.20060720.txt-fixed) =
>dedf1e370c08c224d562b52493598a34a7b61cff
>+SIZE (mutt-1.5.12.tar.gz) = 3440835
>+SIZE (patch-1.5.12.rr.compressed.1.gz) = 10430
>+SIZE (patch-1.5.12.sidebar.20060720.txt-fixed) = 47421
>Index: snapshot/patches/patch-Makefile_in
>===================================================================
>RCS file: snapshot/patches/patch-Makefile_in
>diff -N snapshot/patches/patch-Makefile_in
>--- /dev/null 1 Jan 1970 00:00:00 -0000
>+++ snapshot/patches/patch-Makefile_in 21 Jul 2006 16:09:04 -0000
>@@ -0,0 +1,12 @@
>+$OpenBSD$
>+--- Makefile.in.orig Fri Jul 14 20:21:03 2006
>++++ Makefile.in Fri Jul 21 18:08:41 2006
>+@@ -939,7 +939,7 @@ info: info-recursive
>+
>+ info-am:
>+
>+-install-data-am: install-data-local
>++install-data-am: Muttrc
>+
>+ install-exec-am: install-binPROGRAMS install-binSCRIPTS
>+ @$(NORMAL_INSTALL)
>Index: snapshot/patches/patch-configure_in
>===================================================================
>RCS file:
>/home/OpenBSD/cvs/ports/mail/mutt/snapshot/patches/patch-configure_in,v
>retrieving revision 1.4
>diff -u -p -r1.4 patch-configure_in
>--- snapshot/patches/patch-configure_in 29 Sep 2005 17:25:28 -0000
>1.4
>+++ snapshot/patches/patch-configure_in 15 Jul 2006 09:08:44 -0000
>@@ -1,7 +1,7 @@
> $OpenBSD: patch-configure_in,v 1.4 2005/09/29 17:25:28 bernd Exp $
>---- configure.in.orig Thu Sep 15 16:21:24 2005
>-+++ configure.in Thu Sep 15 20:05:30 2005
>-@@ -459,7 +459,7 @@ docdir=$mutt_cv_docdir
>+--- configure.in.orig Fri Jul 14 20:15:32 2006
>++++ configure.in Sat Jul 15 11:06:15 2006
>+@@ -476,7 +476,7 @@ docdir=$mutt_cv_docdir
> AC_SUBST(docdir)
>
> if test x$mutt_cv_setgid = xyes; then
>Index: snapshot/patches/patch-doc_Makefile_in
>===================================================================
>RCS file:
>/home/OpenBSD/cvs/ports/mail/mutt/snapshot/patches/patch-doc_Makefile_in,v
>retrieving revision 1.4
>diff -u -p -r1.4 patch-doc_Makefile_in
>--- snapshot/patches/patch-doc_Makefile_in 29 Sep 2005 17:25:28 -0000
>1.4
>+++ snapshot/patches/patch-doc_Makefile_in 15 Jul 2006 09:08:44 -0000
>@@ -1,23 +1,23 @@
> $OpenBSD: patch-doc_Makefile_in,v 1.4 2005/09/29 17:25:28 bernd Exp $
>---- doc/Makefile.in.orig Thu Sep 15 16:19:54 2005
>-+++ doc/Makefile.in Tue Sep 27 15:52:56 2005
>-@@ -68,7 +68,7 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTA
>- ChangeLog.old \
>- README NEWS TODO README.SECURITY README.SSL
>+--- doc/Makefile.in.orig Wed Jul 5 10:40:07 2006
>++++ doc/Makefile.in Sat Jul 15 11:08:39 2006
>+@@ -71,7 +71,7 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTA
>+ all: ../makedoc$(EXEEXT)
>+ $(MAKE) makedoc-all
>
>--all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
>-+all: mutt.1 muttrc.man
>+-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
>++makedoc-all: mutt.1 muttrc.man
>
>- install: all instdoc
>+ install: makedoc-all instdoc
> $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
>-@@ -169,8 +169,8 @@ update-doc: ../makedoc$(EXEEXT) stamp-d
>+@@ -171,8 +171,8 @@ update-doc: stamp-doc-xml stamp-doc-chun
>
>- muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h
>muttrc.man.head muttrc.man.tail
>+ muttrc.man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head
>muttrc.man.tail
> $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | \
> - cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\
> - > muttrc.man
> + cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail | \
> + /usr/bin/tbl > muttrc.man
>- touch stamp-doc-man
>
> EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
>+ -e 's,@bindir\@,$(bindir),g' \
>Index: snapshot/patches/patch-imap_browse_c
>===================================================================
>RCS file: snapshot/patches/patch-imap_browse_c
>diff -N snapshot/patches/patch-imap_browse_c
>--- snapshot/patches/patch-imap_browse_c 21 Jun 2006 08:16:45 -0000
>1.1
>+++ /dev/null 1 Jan 1970 00:00:00 -0000
>@@ -1,33 +0,0 @@
>-$OpenBSD: patch-imap_browse_c,v 1.1 2006/06/21 08:16:45 bernd Exp $
>-
>-From mutt CVS:
>-Fix browse_get_namespace() which could overflow ns[LONG_STRING].
>-(Possible remote vulnerability)
>-
>---- imap/browse.c.orig Tue Jun 20 15:40:30 2006
>-+++ imap/browse.c Tue Jun 20 15:42:34 2006
>-@@ -512,7 +512,7 @@ static int browse_get_namespace (IMAP_DA
>- if (*s == '\"')
>- {
>- s++;
>-- while (*s && *s != '\"')
>-+ while (*s && *s != '\"' && n < sizeof (ns) - 1)
>- {
>- if (*s == '\\')
>- s++;
>-@@ -523,12 +523,14 @@ static int browse_get_namespace (IMAP_DA
>- 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
>Index: snapshot/patches/patch-mutt_tunnel_c
>===================================================================
>RCS file:
>/home/OpenBSD/cvs/ports/mail/mutt/snapshot/patches/patch-mutt_tunnel_c,v
>retrieving revision 1.3
>diff -u -p -r1.3 patch-mutt_tunnel_c
>--- snapshot/patches/patch-mutt_tunnel_c 14 Sep 2005 21:00:03 -0000
>1.3
>+++ snapshot/patches/patch-mutt_tunnel_c 15 Jul 2006 09:08:44 -0000
>@@ -1,7 +1,7 @@
> $OpenBSD: patch-mutt_tunnel_c,v 1.3 2005/09/14 21:00:03 bernd Exp $
>---- mutt_tunnel.c.orig Thu Aug 11 21:37:02 2005
>-+++ mutt_tunnel.c Fri Aug 12 09:21:37 2005
>-@@ -95,7 +95,7 @@ static int tunnel_socket_open (CONNECTIO
>+--- mutt_tunnel.c.orig Tue Dec 20 10:36:02 2005
>++++ mutt_tunnel.c Sat Jul 15 11:06:15 2006
>+@@ -97,7 +97,7 @@ static int tunnel_socket_open (CONNECTIO
> /* Don't let the subprocess think it can use the controlling tty */
> setsid ();
>
>Index: snapshot/pkg/PLIST
>===================================================================
>RCS file: /home/OpenBSD/cvs/ports/mail/mutt/snapshot/pkg/PLIST,v
>retrieving revision 1.14
>diff -u -p -r1.14 PLIST
>--- snapshot/pkg/PLIST 29 Sep 2005 17:25:28 -0000 1.14
>+++ snapshot/pkg/PLIST 15 Jul 2006 09:11:45 -0000
>@@ -31,6 +31,7 @@ share/doc/mutt/configuration.html
> share/doc/mutt/devel-notes.txt
> share/doc/mutt/gettingstarted.html
> share/doc/mutt/index.html
>+share/doc/mutt/intro.html
> share/doc/mutt/manual.html
> share/doc/mutt/manual.txt
> share/doc/mutt/mimesupport.html
>@@ -80,8 +81,6 @@ share/examples/mutt/sample.muttrc-tlr
> share/examples/mutt/smime.rc
> share/examples/mutt/smime_keys_test.pl
> share/locale/bg/LC_MESSAGES/mutt.mo
>-share/locale/ca/
>-share/locale/ca/LC_MESSAGES/
> share/locale/ca/LC_MESSAGES/mutt.mo
> share/locale/cs/LC_MESSAGES/mutt.mo
> share/locale/da/LC_MESSAGES/mutt.mo
>@@ -90,7 +89,11 @@ share/locale/el/LC_MESSAGES/mutt.mo
> share/locale/eo/LC_MESSAGES/mutt.mo
> share/locale/es/LC_MESSAGES/mutt.mo
> share/locale/et/LC_MESSAGES/mutt.mo
>+share/locale/eu/
>+share/locale/eu/LC_MESSAGES/
>+share/locale/eu/LC_MESSAGES/mutt.mo
> share/locale/fr/LC_MESSAGES/mutt.mo
>+share/locale/ga/LC_MESSAGES/mutt.mo
> share/locale/gl/LC_MESSAGES/mutt.mo
> share/locale/hu/LC_MESSAGES/mutt.mo
> share/locale/id/LC_MESSAGES/mutt.mo
>Index: stable/Makefile
>===================================================================
>RCS file: /home/OpenBSD/cvs/ports/mail/mutt/stable/Makefile,v
>retrieving revision 1.29
>diff -u -p -r1.29 Makefile
>--- stable/Makefile 24 Jul 2006 09:44:20 -0000 1.29
>+++ stable/Makefile 24 Jul 2006 09:46:45 -0000
>@@ -6,6 +6,4 @@ VERSION= 1.4.2.2
> DISTNAME= mutt-${VERSION}i
> MASTER_SITES= ${MASTER_SITES_MUTT}
>
>-AUTOCONF_VERSION=2.59
>-
> .include <bsd.port.mk>
>Index: stable/distinfo
>===================================================================
>RCS file: /home/OpenBSD/cvs/ports/mail/mutt/stable/distinfo,v
>retrieving revision 1.17
>diff -u -p -r1.17 distinfo
>--- stable/distinfo 24 Jul 2006 09:44:20 -0000 1.17
>+++ stable/distinfo 24 Jul 2006 19:05:40 -0000
>@@ -1,12 +1,12 @@
> MD5 (mutt-1.4.2.2i.tar.gz) = 51a08429c5bd5c34af3f4268b8cbcda3
> MD5 (patch-1.4.2.2.rr.compressed.1.gz) = 6b61f6bf10794a33b8d2970b83bc3648
>-MD5 (patch-1.5.10i.sidebar.20050816.txt-fixed) =
>5ea280615802a0b95c1460021d85cbec
>+MD5 (patch-1.5.12.sidebar.20060720.txt-fixed) =
>0f9d206c2d63b29581a934f6aedffbc2
> RMD160 (mutt-1.4.2.2i.tar.gz) = a749c13e9b56b0f3cf09ce5eabae3fd2edce4c0a
> RMD160 (patch-1.4.2.2.rr.compressed.1.gz) =
> 0ae34b049db504071d88089610ddf59f3a66d8e0
>-RMD160 (patch-1.5.10i.sidebar.20050816.txt-fixed) =
>8a0db3dd9f368f0685739ef995d06bc69c9885d4
>+RMD160 (patch-1.5.12.sidebar.20060720.txt-fixed) =
>bea87a7cbbff8389912dbd95231619f5d2d027ee
> SHA1 (mutt-1.4.2.2i.tar.gz) = 0ee12f734f21186b143fa96a5ea79f72397747fb
> SHA1 (patch-1.4.2.2.rr.compressed.1.gz) =
> f6379734199055ad4abc9821bbe6d96356fbb75e
>-SHA1 (patch-1.5.10i.sidebar.20050816.txt-fixed) =
>43372798b01357ab7162ab7051a556d378e34e4f
>+SHA1 (patch-1.5.12.sidebar.20060720.txt-fixed) =
>dedf1e370c08c224d562b52493598a34a7b61cff
> SIZE (mutt-1.4.2.2i.tar.gz) = 2676306
> SIZE (patch-1.4.2.2.rr.compressed.1.gz) = 13567
>-SIZE (patch-1.5.10i.sidebar.20050816.txt-fixed) = 47269
>+SIZE (patch-1.5.12.sidebar.20060720.txt-fixed) = 47421
>
>
