From: Arkadiusz Miśkiewicz Date: Wed, 4 Apr 2001 21:14:34 +0000 (+0000) Subject: 3cfdc92612b87260c1dfb2a530a2020b mutt-1.3.17i.tar.gz X-Git-Tag: mutt-1_3_17i-1~3 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=commitdiff_plain;h=f70ebcb4ff9ab0601b6954936d66c13dafd7bd94 3cfdc92612b87260c1dfb2a530a2020b mutt-1.3.17i.tar.gz Changed files: mutt-amfix.patch -> 1.2 mutt-blanklines.patch -> 1.4 mutt-dot-lock.patch -> 1.2 mutt-imap.patch -> 1.2 mutt-md5.patch -> 1.2 mutt-nosetgid.patch -> 1.2 mutt-pl.po.patch -> 1.2 patch-0.00.sec+bonk.patchlist.1 -> 1.3 patch-0.94.7.sec.previous_jump.1 -> 1.2 patch-0.94.7.vikas.word_chars.1 -> 1.2 patch-0.95.3.bj.ed_mtime.1 -> 1.2 patch-0.95.4.bj.status-time.1 -> 1.2 patch-0.95.4.sec.keypad.1 -> 1.2 patch-0.95.4.sec.reverse_reply.1 -> 1.2 patch-0.95.4.vikas.print_index.1 -> 1.2 patch-0.95.6.as.mark-old.1 -> 1.2 patch-0.95.bj.hash_destroy.2 -> 1.2 patch-0.95.sec.condense_pgp.1 -> 1.2 patch-1.02.sec._A.1 -> 1.2 patches_bj.txt -> 1.2 patches_sec.txt -> 1.2 --- diff --git a/mutt-amfix.patch b/mutt-amfix.patch deleted file mode 100644 index bada112..0000000 --- a/mutt-amfix.patch +++ /dev/null @@ -1,461 +0,0 @@ -diff -Nur mutt-1.2.5.orig/acinclude.m4 mutt-1.2.5/acinclude.m4 ---- mutt-1.2.5.orig/acinclude.m4 Thu Jan 1 01:00:00 1970 -+++ mutt-1.2.5/acinclude.m4 Sat Mar 10 15:31:34 2001 -@@ -0,0 +1,457 @@ -+dnl --------------------------------------------------------------------------- -+dnl Check if a function is declared by including a set of include files. -+dnl Invoke the corresponding actions according to whether it is found or not. -+dnl -+dnl Gcc (unlike other compilers) will only warn about the miscast assignment -+dnl in the first test, but most compilers will oblige with an error in the -+dnl second test. -+dnl -+dnl CF_CHECK_FUNCDECL(INCLUDES, FUNCTION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -+AC_DEFUN([CF_CHECK_FUNCDECL], -+[ -+AC_MSG_CHECKING([for $2 declaration]) -+AC_CACHE_VAL(ac_cv_func_decl_$2, -+[AC_TRY_COMPILE([$1], -+[#ifndef ${ac_func} -+extern int ${ac_func}(); -+#endif],[ -+AC_TRY_COMPILE([$1], -+[#ifndef ${ac_func} -+int (*p)() = ${ac_func}; -+#endif],[ -+eval "ac_cv_func_decl_$2=yes"],[ -+eval "ac_cv_func_decl_$2=no"])],[ -+eval "ac_cv_func_decl_$2=yes"])]) -+if eval "test \"`echo '$ac_cv_func_'decl_$2`\" = yes"; then -+ AC_MSG_RESULT(yes) -+ ifelse([$3], , :, [$3]) -+else -+ AC_MSG_RESULT(no) -+ifelse([$4], , , [$4 -+])dnl -+fi -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl Check if functions are declared by including a set of include files. -+dnl and define DECL_XXX if not. -+dnl -+dnl CF_CHECK_FUNCDECLS(INCLUDES, FUNCTION... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -+AC_DEFUN([CF_CHECK_FUNCDECLS], -+[for ac_func in $2 -+do -+CF_CHECK_FUNCDECL([$1], $ac_func, -+[ -+ CF_UPPER(ac_tr_func,HAVE_$ac_func) -+ AC_DEFINE_UNQUOTED($ac_tr_func) $3], -+[$4])dnl -+dnl [$3], -+dnl [ -+dnl CF_UPPER(ac_tr_func,DECL_$ac_func) -+dnl AC_DEFINE_UNQUOTED($ac_tr_func) $4])dnl -+done -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl Make an uppercase version of a variable -+dnl $1=uppercase($2) -+AC_DEFUN([CF_UPPER], -+[ -+changequote(,)dnl -+$1=`echo $2 | tr '[a-z]' '[A-Z]'` -+changequote([,])dnl -+])dnl -+dnl --------------------------------------------------------------------------- -+ -+# Macro to add for using GNU gettext. -+# Ulrich Drepper , 1995. -+ -+# -+# Slightly modified by Thomas Roessler -+# -+ -+# -+# This file can be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. -+# Please note that the actual code is *not* freely available. -+ -+# serial 105 -+ -+AC_DEFUN(MUTT_AM_WITH_NLS, -+ [AC_MSG_CHECKING([whether NLS is requested]) -+ dnl Default is enabled NLS -+ AC_ARG_ENABLE(nls, -+ [ --disable-nls do not use Native Language Support], -+ USE_NLS=$enableval, USE_NLS=yes) -+ AC_MSG_RESULT($USE_NLS) -+ AC_SUBST(USE_NLS) -+ -+ USE_INCLUDED_LIBINTL=no -+ -+ dnl If we use NLS figure out what method -+ if test "$USE_NLS" = "yes"; then -+ AC_DEFINE(ENABLE_NLS) -+ AC_MSG_CHECKING([whether included gettext is requested]) -+ AC_ARG_WITH(included-gettext, -+ [ --with-included-gettext use the GNU gettext library included here], -+ nls_cv_force_use_gnu_gettext=$withval, -+ nls_cv_force_use_gnu_gettext=no) -+ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) -+ -+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" -+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then -+ dnl User does not insist on using GNU NLS library. Figure out what -+ dnl to use. If gettext or catgets are available (in this order) we -+ dnl use this. Else we have to fall back to GNU NLS library. -+ dnl catgets is only used if permitted by option --with-catgets. -+ nls_cv_header_intl= -+ nls_cv_header_libgt= -+ CATOBJEXT=NONE -+ -+ AC_CHECK_HEADER(libintl.h, -+ [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, -+ [AC_TRY_LINK([#include ], [return (int) gettext ("")], -+ gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) -+ -+ if test "$gt_cv_func_gettext_libc" != "yes"; then -+ AC_CHECK_LIB(intl, bindtextdomain, -+ [AC_CHECK_LIB(intl, gettext, -+ gt_cv_func_gettext_libintl=yes, -+ gt_cv_func_gettext_libintl=no)]) -+ fi -+ -+ if test "$gt_cv_func_gettext_libintl" = yes; then -+ LIBS="$LIBS -lintl" -+ fi -+ -+ if test "$gt_cv_func_gettext_libc" = "yes" \ -+ || test "$gt_cv_func_gettext_libintl" = "yes"; then -+ AC_DEFINE(HAVE_GETTEXT) -+ MUTT_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl -+ if test "$MSGFMT" != "no"; then -+ AC_CHECK_FUNCS(dcgettext) -+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -+ MUTT_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr], -+ [CATOBJEXT=.gmo -+ DATADIRNAME=share], -+ [CATOBJEXT=.mo -+ DATADIRNAME=lib]) -+ INSTOBJEXT=.mo -+ fi -+ fi -+ ]) -+ -+ if test "$CATOBJEXT" = "NONE"; then -+ AC_MSG_CHECKING([whether catgets can be used]) -+ AC_ARG_WITH(catgets, -+ [ --with-catgets use catgets functions if available], -+ nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) -+ AC_MSG_RESULT($nls_cv_use_catgets) -+ -+ if test "$nls_cv_use_catgets" = "yes"; then -+ dnl No gettext in C library. Try catgets next. -+ AC_CHECK_LIB(i, main) -+ AC_CHECK_FUNC(catgets, -+ [AC_DEFINE(HAVE_CATGETS) -+ INTLOBJS="\$(CATOBJS)" -+ AC_PATH_PROG(GENCAT, gencat, no)dnl -+ if test "$GENCAT" != "no"; then -+ AC_PATH_PROG(GMSGFMT, gmsgfmt, no) -+ if test "$GMSGFMT" = "no"; then -+ MUTT_AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) -+ fi -+ MUTT_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -+ USE_INCLUDED_LIBINTL=yes -+ CATOBJEXT=.cat -+ INSTOBJEXT=.cat -+ DATADIRNAME=lib -+ INTLDEPS='$(top_builddir)/intl/libintl.a' -+ INTLLIBS=$INTLDEPS -+ LIBS=`echo $LIBS | sed -e 's/-lintl//'` -+ nls_cv_header_intl=intl/libintl.h -+ nls_cv_header_libgt=intl/libgettext.h -+ fi]) -+ fi -+ fi -+ -+ if test "$CATOBJEXT" = "NONE"; then -+ dnl Neither gettext nor catgets in included in the C library. -+ dnl Fall back on GNU gettext library. -+ nls_cv_use_gnu_gettext=yes -+ fi -+ fi -+ -+ if test "$nls_cv_use_gnu_gettext" = "yes"; then -+ dnl Mark actions used to generate GNU NLS library. -+ INTLOBJS="\$(GETTOBJS)" -+ MUTT_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) -+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -+ MUTT_AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -+ AC_SUBST(MSGFMT) -+ USE_INCLUDED_LIBINTL=yes -+ CATOBJEXT=.gmo -+ INSTOBJEXT=.mo -+ DATADIRNAME=share -+ INTLDEPS='$(top_builddir)/intl/libintl.a' -+ INTLLIBS=$INTLDEPS -+ LIBS=`echo $LIBS | sed -e 's/-lintl//'` -+ nls_cv_header_intl=intl/libintl.h -+ nls_cv_header_libgt=intl/libgettext.h -+ fi -+ -+ dnl Test whether we really found GNU xgettext. -+ if test "$XGETTEXT" != ":"; then -+ dnl If it is no GNU xgettext we define it as : so that the -+ dnl Makefiles still can work. -+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -+ : ; -+ else -+ AC_MSG_RESULT( -+ [found xgettext program is not GNU xgettext; ignore it]) -+ XGETTEXT=":" -+ fi -+ fi -+ -+ # We need to process the po/ directory. -+ POSUB=po -+ else -+ DATADIRNAME=share -+ nls_cv_header_intl=intl/libintl.h -+ nls_cv_header_libgt=intl/libgettext.h -+ fi -+ if test -z "$nsl_cv_header_intl"; then -+ # Clean out junk possibly left behind by a previous configuration. -+ rm -f intl/libintl.h -+ fi -+ AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) -+ AC_OUTPUT_COMMANDS( -+ [case "$CONFIG_FILES" in *po/Makefile.in*) -+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -+ esac]) -+ -+ -+ # If this is used in GNU gettext we have to set USE_NLS to `yes' -+ # because some of the sources are only built for this goal. -+ if test "$PACKAGE" = gettext; then -+ USE_NLS=yes -+ USE_INCLUDED_LIBINTL=yes -+ fi -+ -+ dnl These rules are solely for the distribution goal. While doing this -+ dnl we only have to keep exactly one list of the available catalogs -+ dnl in configure.in. -+ for lang in $ALL_LINGUAS; do -+ GMOFILES="$GMOFILES $lang.gmo" -+ POFILES="$POFILES $lang.po" -+ done -+ -+ dnl Make all variables we use known to autoconf. -+ AC_SUBST(USE_INCLUDED_LIBINTL) -+ AC_SUBST(CATALOGS) -+ AC_SUBST(CATOBJEXT) -+ AC_SUBST(DATADIRNAME) -+ AC_SUBST(GMOFILES) -+ AC_SUBST(INSTOBJEXT) -+ AC_SUBST(INTLDEPS) -+ AC_SUBST(INTLLIBS) -+ AC_SUBST(INTLOBJS) -+ AC_SUBST(POFILES) -+ AC_SUBST(POSUB) -+ ]) -+ -+AC_DEFUN(MUTT_AM_GNU_GETTEXT, -+ [AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+ AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_PROG_RANLIB])dnl -+ AC_REQUIRE([AC_ISC_POSIX])dnl -+ AC_REQUIRE([AC_HEADER_STDC])dnl -+ AC_REQUIRE([AC_C_CONST])dnl -+ AC_REQUIRE([AC_C_INLINE])dnl -+ AC_REQUIRE([AC_TYPE_OFF_T])dnl -+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl -+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl -+ AC_REQUIRE([AC_FUNC_MMAP])dnl -+ -+ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ -+unistd.h sys/param.h]) -+ AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ -+strdup __argz_count __argz_stringify __argz_next]) -+ -+ if test "${ac_cv_func_stpcpy+set}" != "set"; then -+ AC_CHECK_FUNCS(stpcpy) -+ fi -+ if test "${ac_cv_func_stpcpy}" = "yes"; then -+ AC_DEFINE(HAVE_STPCPY) -+ fi -+ -+ MUTT_AM_LC_MESSAGES -+ MUTT_AM_WITH_NLS -+ -+ if test "x$CATOBJEXT" != "x"; then -+ if test "x$ALL_LINGUAS" = "x"; then -+ LINGUAS= -+ else -+ AC_MSG_CHECKING(for catalogs to be installed) -+ NEW_LINGUAS= -+ for lang in ${LINGUAS=$ALL_LINGUAS}; do -+ case "$ALL_LINGUAS" in -+ *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; -+ esac -+ done -+ LINGUAS=$NEW_LINGUAS -+ AC_MSG_RESULT($LINGUAS) -+ fi -+ -+ dnl Construct list of names of catalog files to be constructed. -+ if test -n "$LINGUAS"; then -+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ fi -+ fi -+ -+ dnl The reference to in the installed file -+ dnl must be resolved because we cannot expect the users of this -+ dnl to define HAVE_LOCALE_H. -+ if test $ac_cv_header_locale_h = yes; then -+ INCLUDE_LOCALE_H="#include " -+ else -+ INCLUDE_LOCALE_H="\ -+/* The system does not provide the header . Take care yourself. */" -+ fi -+ AC_SUBST(INCLUDE_LOCALE_H) -+ -+ dnl Determine which catalog format we have (if any is needed) -+ dnl For now we know about two different formats: -+ dnl Linux libc-5 and the normal X/Open format -+ test -d intl || mkdir intl -+ if test "$CATOBJEXT" = ".cat"; then -+ AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) -+ -+ dnl Transform the SED scripts while copying because some dumb SEDs -+ dnl cannot handle comments. -+ sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed -+ fi -+ dnl po2tbl.sed is always needed. -+ sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ -+ $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed -+ -+ dnl In the intl/Makefile.in we have a special dependency which makes -+ dnl only sense for gettext. We comment this out for non-gettext -+ dnl packages. -+ if test "$PACKAGE" = "gettext"; then -+ GT_NO="#NO#" -+ GT_YES= -+ else -+ GT_NO= -+ GT_YES="#YES#" -+ fi -+ AC_SUBST(GT_NO) -+ AC_SUBST(GT_YES) -+ -+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly -+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). -+ dnl Try to locate is. -+ MKINSTALLDIRS= -+ if test -n "$ac_aux_dir"; then -+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -+ fi -+ if test -z "$MKINSTALLDIRS"; then -+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -+ fi -+ AC_SUBST(MKINSTALLDIRS) -+ -+ dnl *** For now the libtool support in intl/Makefile is not for real. -+ l= -+ AC_SUBST(l) -+ -+ dnl Generate list of files to be processed by xgettext which will -+ dnl be included in po/Makefile. -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES -+ ]) -+ -+# Search path for a program which passes the given test. -+# Ulrich Drepper , 1996. -+# -+# This file can be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. -+# Please note that the actual code is *not* freely available. -+ -+# serial 1 -+ -+dnl MUTT_AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -+AC_DEFUN(MUTT_AM_PATH_PROG_WITH_TEST, -+[# Extract the first word of "$2", so it can be a program name with args. -+set dummy $2; ac_word=[$]2 -+AC_MSG_CHECKING([for $ac_word]) -+AC_CACHE_VAL(ac_cv_path_$1, -+[case "[$]$1" in -+ /*) -+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in ifelse([$5], , $PATH, [$5]); do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if [$3]; then -+ ac_cv_path_$1="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+dnl If no 4th arg is given, leave the cache variable unset, -+dnl so AC_PATH_PROGS will keep looking. -+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -+])dnl -+ ;; -+esac])dnl -+$1="$ac_cv_path_$1" -+if test -n "[$]$1"; then -+ AC_MSG_RESULT([$]$1) -+else -+ AC_MSG_RESULT(no) -+fi -+AC_SUBST($1)dnl -+]) -+ -+# Check whether LC_MESSAGES is available in . -+# Ulrich Drepper , 1995. -+# -+# This file can be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. -+# Please note that the actual code is *not* freely available. -+ -+# serial 1 -+ -+AC_DEFUN(MUTT_AM_LC_MESSAGES, -+ [if test $ac_cv_header_locale_h = yes; then -+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -+ [AC_TRY_LINK([#include ], [return LC_MESSAGES], -+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ AC_DEFINE(HAVE_LC_MESSAGES) -+ fi -+ fi]) -+ diff --git a/mutt-blanklines.patch b/mutt-blanklines.patch deleted file mode 100644 index c77c012..0000000 --- a/mutt-blanklines.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -ur mutt-1.1.11.orig/curs_main.c mutt-1.1.11/curs_main.c ---- mutt-1.1.11.orig/curs_main.c Sun Apr 16 16:38:52 2000 -+++ mutt-1.1.11/curs_main.c Mon Apr 17 18:54:09 2000 -@@ -399,8 +399,8 @@ - - menu = mutt_new_menu (); - menu->menu = MENU_MAIN; -- menu->offset = 1; -- menu->pagelen = LINES - 3; -+ menu->offset = 1 + BlankLines; -+ menu->pagelen = LINES - 3 - 2*BlankLines; - menu->make_entry = index_make_entry; - menu->color = index_color; - menu->current = ci_first_message (); -diff -ur mutt-1.1.11.orig/globals.h mutt-1.1.11/globals.h ---- mutt-1.1.11.orig/globals.h Fri Mar 3 11:10:08 2000 -+++ mutt-1.1.11/globals.h Mon Apr 17 18:54:09 2000 -@@ -122,6 +122,7 @@ - - WHERE unsigned short Counter INITVAL (0); - -+WHERE short BlankLines; - WHERE short HistSize; - WHERE short PagerContext; - WHERE short PagerIndexLines; -diff -ur mutt-1.1.11.orig/init.h mutt-1.1.11/init.h ---- mutt-1.1.11.orig/init.h Sun Apr 16 16:38:53 2000 -+++ mutt-1.1.11/init.h Mon Apr 17 18:54:09 2000 -@@ -254,6 +254,12 @@ - ** notifying you of new mail. This is independent of the setting of the - ** ``$$beep'' variable. - */ -+ { "blank_lines", DT_NUM, R_NONE, UL &BlankLines, 0 }, -+ /* -+ ** .pp -+ ** This variable controls the number of blank lines below help line and -+ ** above status line. Should not be set to big values. -+ */ - { "bounce_delivered", DT_BOOL, R_NONE, OPTBOUNCEDELIVERED, 1 }, - /* - ** .pp -diff -ur mutt-1.1.11.orig/menu.c mutt-1.1.11/menu.c ---- mutt-1.1.11.orig/menu.c Fri Mar 3 11:10:10 2000 -+++ mutt-1.1.11/menu.c Mon Apr 17 18:54:09 2000 -@@ -125,13 +125,13 @@ - SETCOLOR (MT_COLOR_STATUS); - mvprintw (option (OPTSTATUSONTOP) ? LINES-2 : 0, 0, "%-*.*s", COLS, COLS, menu->help); - SETCOLOR (MT_COLOR_NORMAL); -- menu->offset = 1; -- menu->pagelen = LINES - 3; -+ menu->offset = 1 + BlankLines; -+ menu->pagelen = LINES - 3 - 2*BlankLines; - } - else - { -- menu->offset = option (OPTSTATUSONTOP) ? 1 : 0; -- menu->pagelen = LINES - 2; -+ menu->offset = (option (OPTSTATUSONTOP) ? 1 : 0) + BlankLines; -+ menu->pagelen = LINES - 2 - 2*BlankLines; - } - - mutt_show_error (); -diff -ur mutt-1.1.11.orig/pager.c mutt-1.1.11/pager.c ---- mutt-1.1.11.orig/pager.c Fri Mar 3 11:10:11 2000 -+++ mutt-1.1.11/pager.c Mon Apr 17 18:55:37 2000 -@@ -1510,9 +1510,9 @@ - { - indexoffset = 0; - statusoffset = IsHeader (extra) ? indexlen : 0; -- bodyoffset = statusoffset + 1; -+ bodyoffset = statusoffset + 1 + (PagerIndexLines > 0 ? 0 : BlankLines); - helpoffset = LINES - 2; -- bodylen = helpoffset - bodyoffset; -+ bodylen = helpoffset - bodyoffset - BlankLines; - if (!option (OPTHELP)) - bodylen++; - } -@@ -1523,8 +1523,9 @@ - statusoffset = LINES - 2; - if (!option (OPTHELP)) - indexoffset = 0; -- bodyoffset = indexoffset + (IsHeader (extra) ? indexlen : 0); -- bodylen = statusoffset - bodyoffset; -+ bodyoffset = indexoffset + (IsHeader (extra) ? indexlen : 0) + -+ (PagerIndexLines > 0 ? 0 : BlankLines); -+ bodylen = statusoffset - bodyoffset - BlankLines; - } - - if (option (OPTHELP)) -diff -ur mutt-1.1.11.orig/patchlist.c mutt-1.1.11/patchlist.c ---- mutt-1.1.11.orig/patchlist.c Sun Apr 16 16:38:53 2000 -+++ mutt-1.1.11/patchlist.c Mon Apr 17 18:54:09 2000 -@@ -15,7 +15,8 @@ - /* DO NOT MODIFY BEFORE THIS LINE */ - - -- -+ printf("Feature patch: blank_lines 1.1.11 by Michal Kochanowicz\n" -+ " based on: blank_line 1.0pre3i by Ken Weingold / Claus Aßmann\n"); - - - /* DO NOT MODIFY AFTER THIS LINE */ diff --git a/mutt-dot-lock.patch b/mutt-dot-lock.patch deleted file mode 100644 index 896fb1d..0000000 --- a/mutt-dot-lock.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mutt-1.1.11/Makefile.am.wiget Mon Apr 10 11:59:06 2000 -+++ mutt-1.1.11/Makefile.am Mon Apr 10 12:02:41 2000 -@@ -115,11 +115,6 @@ - rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ - ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ - fi -- if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \ -- chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \ -- chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \ -- { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \ -- fi - - install-data-local: Muttrc - $(srcdir)/mkinstalldirs $(DESTDIR)$(sharedir) diff --git a/mutt-imap.patch b/mutt-imap.patch deleted file mode 100644 index f73c1bb..0000000 --- a/mutt-imap.patch +++ /dev/null @@ -1,29 +0,0 @@ -It looks like the 1.3 branch already has a more correct fix for this problem -(which has potential to crop up elsewhere in the source tree), but this fixes -the most obvious one. - ---- mutt-1.2.5/imap/auth_gss.c Wed Jun 21 15:21:56 2000 -+++ mutt-1.2.5/imap/auth_gss.c Mon Nov 6 13:24:27 2000 -@@ -226,13 +226,15 @@ - mutt_socket_write (idata->conn, buf1); - - /* Joy of victory or agony of defeat? */ -- if (mutt_socket_read_line_d (buf1, GSS_BUFSIZE, idata->conn) < 0) -- { -- dprint (1, (debugfile, "Error receiving server response.\n")); -- -- mutt_socket_write(idata->conn, "*\r\n"); -- return -1; -- } -+ do { -+ if (mutt_socket_read_line_d (buf1, GSS_BUFSIZE, idata->conn) < 0) -+ { -+ dprint (1, (debugfile, "Error receiving server response.\n")); -+ mutt_socket_write(idata->conn, "*\r\n"); -+ return -1; -+ } -+ } while ((mutt_strncmp (buf1, seq, SEQLEN) != 0)); -+ - if (imap_code (buf1)) - { - /* flush the security context */ diff --git a/mutt-md5.patch b/mutt-md5.patch deleted file mode 100644 index 916e2e2..0000000 --- a/mutt-md5.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- mutt-1.2/imap/md5.h.how-many-times-do-i-have-to-fix-friggin-md5-code Thu Jun 22 08:20:24 2000 -+++ mutt-1.2/imap/md5.h Thu Jun 22 08:20:56 2000 -@@ -26,14 +26,16 @@ - #ifndef MD5_H - #define MD5_H 1 - -+#include -+ - /* POINTER defines a generic pointer type */ - typedef unsigned char *POINTER; - - /* UINT2 defines a two byte word */ --typedef unsigned short int UINT2; -+typedef u_int16_t UINT2; - - /* UINT4 defines a four byte word */ --typedef unsigned long int UINT4; -+typedef u_int32_t UINT4; - - /* MD5 context. */ - typedef struct { diff --git a/mutt-nosetgid.patch b/mutt-nosetgid.patch deleted file mode 100644 index 84bb7bc..0000000 --- a/mutt-nosetgid.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- mutt-0.95-us/configure.in.nosetgid Sat Dec 12 04:22:04 1998 -+++ mutt-0.95-us/configure.in Sat Dec 12 22:31:34 1998 -@@ -302,25 +302,6 @@ - mutt_cv_setgid=no - if test $mutt_cv_worldwrite = yes; then - AC_DEFINE(USE_DOTLOCK) -- else -- -- AC_CACHE_CHECK(if $mutt_cv_mailpath is group writable, mutt_cv_groupwrite, [AC_TRY_RUN([#include --#include -- --int main (int argc, char **argv) --{ -- struct stat s; -- -- stat ("$mutt_cv_mailpath", &s); -- if (s.st_mode & S_IWGRP) exit (0); -- exit (1); --}], mutt_cv_groupwrite=yes, mutt_cv_groupwrite=no, mutt_cv_groupwrite=no)]) -- -- if test $mutt_cv_groupwrite = yes; then -- AC_DEFINE(USE_DOTLOCK) -- AC_DEFINE(USE_SETGID) -- mutt_cv_setgid=yes -- fi - fi - fi - diff --git a/mutt-pl.po.patch b/mutt-pl.po.patch deleted file mode 100644 index 24a4d3a..0000000 --- a/mutt-pl.po.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mutt-1.2.2/po/pl.po.wiget Wed Jun 21 00:23:08 2000 -+++ mutt-1.2.2/po/pl.po Tue Jun 27 14:13:03 2000 -@@ -1376,7 +1376,7 @@ - #: imap/message.c:623 - #, c-format - msgid "Copying message %d to %s..." --msgstr "Kopiowanie listu do %s..." -+msgstr "Kopiowanie listu %d do %s..." - - #: imap/socket.c:215 - #, c-format diff --git a/patch-0.00.sec+bonk.patchlist.1 b/patch-0.00.sec+bonk.patchlist.1 deleted file mode 100644 index 1ec33b2..0000000 --- a/patch-0.00.sec+bonk.patchlist.1 +++ /dev/null @@ -1,57 +0,0 @@ ---- mutt-1.0pre1/main.c.orig Mon Aug 23 14:22:20 1999 -+++ mutt-1.0pre1/main.c Wed Aug 25 15:20:48 1999 -@@ -285,6 +285,8 @@ - - puts(_(ReachingUs)); - -+ mutt_print_patchlist (); -+ - exit (0); - } - ---- mutt-1.0pre1/patchlist.c.orig Wed Aug 25 15:20:48 1999 -+++ mutt-1.0pre1/patchlist.c Wed Aug 25 15:20:48 1999 -@@ -0,0 +1,22 @@ -+#include -+ -+void mutt_print_patchlist (void) -+{ -+ /* -+ * If you add a patch, include a line identifying it within this -+ * section. It should include the type of patch (Feature, Bugfix, or -+ * Merge), the name of the patch, the version of mutt to which the -+ * patch should be applied, the version of the patch itself, and your -+ * name. This line should be a printf, terminated by a single \n, and -+ * should fit in one line of code. It should be inserted after all -+ * other patch-ID lines. It should be preceded by three blank lines, -+ * and followed by three blank lines and the DO NOT MODIFY AFTER... line. -+ */ -+ /* DO NOT MODIFY BEFORE THIS LINE */ -+ -+ -+ -+ -+ -+ /* DO NOT MODIFY AFTER THIS LINE */ -+} ---- mutt-1.0pre1/protos.h.orig Mon Jul 26 16:52:27 1999 -+++ mutt-1.0pre1/protos.h Wed Aug 25 15:20:49 1999 -@@ -180,6 +180,7 @@ - void mutt_pretty_mailbox (char *); - void mutt_pretty_size (char *, size_t, long); - void mutt_print_message (HEADER *); -+void mutt_print_patchlist (void); - void mutt_query_exit (void); - void mutt_query_menu (char *, size_t); - void mutt_safe_path (char *s, size_t l, ADDRESS *a); ---- mutt-1.1.11/Makefile.am Mon Apr 3 00:35:18 2000 -+++ mutt-1.1.11/Makefile.am.patchlist Mon Apr 3 00:38:05 2000 -@@ -30,7 +30,7 @@ - curs_main.c date.c \ - edit.c enter.c flags.c init.c filter.c from.c getdomain.c \ - handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ -- main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \ -+ main.c mbox.c menu.c mh.c mx.c pager.c parse.c patchlist.c pattern.c \ - postpone.c query.c recvattach.c recvcmd.c \ - rfc822.c rfc1524.c rfc2047.c rfc2231.c \ - score.c send.c sendlib.c signal.c sort.c \ diff --git a/patch-0.94.7.sec.previous_jump.1 b/patch-0.94.7.sec.previous_jump.1 deleted file mode 100644 index 87eedd8..0000000 --- a/patch-0.94.7.sec.previous_jump.1 +++ /dev/null @@ -1,125 +0,0 @@ ---- mutt-0.94.7i/OPS.orig Sat Sep 12 21:23:27 1998 -+++ mutt-0.94.7i/OPS Sat Sep 19 02:54:15 1998 -@@ -115,6 +115,7 @@ - OP_PAGER_TOP "jump to the top of the message" - OP_PIPE "pipe message/attachment to a shell command" - OP_PREV_ENTRY "move to the previous entry" -+OP_PREV_JUMP "jump to the previously selected message" - OP_PREV_LINE "scroll up one line" - OP_PREV_PAGE "move to the previous page" - OP_PRINT "print the current entry" ---- mutt-0.94.7i/curs_main.c.orig Wed Sep 16 07:57:23 1998 -+++ mutt-0.94.7i/curs_main.c Sat Sep 19 02:55:06 1998 -@@ -240,6 +240,7 @@ - int tag = 0; /* has the tag-prefix command been pressed? */ - int newcount = -1; - int oldcount = -1; -+ int LastJumped = -1; - int rc = -1; - MUTTMENU *menu; - char *cp; /* temporary variable. */ -@@ -627,6 +628,7 @@ - if (j >= 0) - { - menu->current = Context->hdrs[j]->virtual; -+ LastJumped=Context->v2r[menu->current]+1; - if (menu->menu == MENU_PAGER) - { - op = OP_DISPLAY_MESSAGE; -@@ -915,6 +917,7 @@ - the folder */ - menu->redraw = REDRAW_FULL; - set_option (OPTSEARCHINVALID); -+ LastJumped=-1; - break; - - case OP_DISPLAY_MESSAGE: -@@ -1043,6 +1046,29 @@ - menu->redraw = REDRAW_MOTION; - break; - -+ case OP_PREV_JUMP: -+ i=LastJumped; -+ if (i > 0 && i <= Context->msgcount) -+ { -+ if (Context->hdrs[i-1]->virtual != -1) -+ { -+ LastJumped=Context->v2r[menu->current]+1; -+ menu->current = Context->hdrs[i-1]->virtual; -+ if (menu->menu == MENU_PAGER) -+ { -+ op = OP_DISPLAY_MESSAGE; -+ continue; -+ } -+ else -+ menu->redraw = REDRAW_MOTION; -+ } -+ else -+ mutt_error ("That message is not visible."); -+ } -+ else -+ mutt_error ("No target yet."); -+ break; -+ - case OP_PREV_ENTRY: - - CHECK_MSGCOUNT; -@@ -1111,6 +1137,7 @@ - case OP_MAIN_PREV_UNREAD: - - CHECK_MSGCOUNT; -+ LastJumped=Context->v2r[menu->current]+1; - i = menu->current; - menu->current = -1; - for (j = 0; j != Context->vcount; j++) -@@ -1244,6 +1271,7 @@ - case OP_MAIN_PREV_SUBTHREAD: - - CHECK_MSGCOUNT; -+ i=Context->v2r[menu->current]+1; - switch (op) - { - case OP_MAIN_NEXT_THREAD: -@@ -1424,11 +1424,13 @@ - } - else if (menu->menu == MENU_PAGER) - { -+ LastJumped=i; - op = OP_DISPLAY_MESSAGE; - continue; - } - else - menu->redraw = REDRAW_MOTION; -+ LastJumped=i; - break; - - case OP_MAIN_SET_FLAG: ---- mutt-0.94.7i/functions.h.orig Sat Sep 12 21:23:30 1998 -+++ mutt-0.94.7i/functions.h Sat Sep 19 02:54:16 1998 -@@ -87,6 +87,7 @@ - { "display-headers", OP_DISPLAY_HEADERS, "h" }, - { "next-undeleted", OP_MAIN_NEXT_UNDELETED, "j" }, - { "previous-undeleted", OP_MAIN_PREV_UNDELETED, "k" }, -+ { "previous-jump", OP_PREV_JUMP, "\033b" }, - { "limit", OP_MAIN_LIMIT, "l" }, - { "list-reply", OP_LIST_REPLY, "L" }, - { "mail", OP_MAIL, "m" }, -@@ -163,6 +164,7 @@ - { "next-entry", OP_NEXT_ENTRY, "J" }, - { "previous-undeleted",OP_MAIN_PREV_UNDELETED, "k" }, - { "previous-entry", OP_PREV_ENTRY, "K" }, -+ { "previous-jump", OP_PREV_JUMP, "\033b" }, - { "list-reply", OP_LIST_REPLY, "L" }, - { "redraw-screen", OP_REDRAW, "\014" }, - { "mail", OP_MAIL, "m" }, ---- mutt-0.94.7i/patchlist.c.orig Sat Sep 19 02:29:51 1998 -+++ mutt-0.94.7i/patchlist.c Sat Sep 19 02:54:16 1998 -@@ -16,6 +16,8 @@ - - - -+ printf("Feature patch: previous-jump 0.94.7 by Stefan `Sec` Zehl\n"); -+ - - - /* DO NOT MODIFY AFTER THIS LINE */ diff --git a/patch-0.94.7.vikas.word_chars.1 b/patch-0.94.7.vikas.word_chars.1 deleted file mode 100644 index 252830d..0000000 --- a/patch-0.94.7.vikas.word_chars.1 +++ /dev/null @@ -1,61 +0,0 @@ -Index: enter.c -=================================================================== -RCS file: /export/home/vikas/CVS/Mutt/enter.c,v -retrieving revision 1.1.1.4 -diff -u -p -r1.1.1.4 enter.c ---- enter.c 1998/09/18 13:09:38 1.1.1.4 -+++ enter.c 1998/09/21 23:05:21 -@@ -274,9 +274,9 @@ int mutt_enter_string (unsigned char *bu - j--; - if (j > 0) - { -- if (isalnum (buf[j - 1])) -+ if (!strchr (NONULL (Wordchars), (buf[j - 1]))) - { -- for (j--; j > 0 && isalnum (buf[j - 1]); j--) -+ for (j--; j > 0 && !strchr (NONULL (Wordchars), buf[j - 1]); j--) - ; - } - else -Index: globals.h -=================================================================== -RCS file: /export/home/vikas/CVS/Mutt/globals.h,v -retrieving revision 1.1.1.2 -diff -u -p -r1.1.1.2 globals.h ---- globals.h 1998/08/24 19:42:35 1.1.1.2 -+++ globals.h 1998/09/21 23:01:27 -@@ -80,6 +80,7 @@ WHERE char *Tempdir; - WHERE char *Tochars; - WHERE char *Username; - WHERE char *Visual; -+WHERE char *Wordchars; - - WHERE char *LastFolder; - -Index: init.h -=================================================================== -RCS file: /export/home/vikas/CVS/Mutt/init.h,v -retrieving revision 1.1.1.8 -diff -Nru mutt-1.1.11.orig/init.h mutt-1.1.11/init.h ---- init.h Sun Apr 2 22:54:00 2000 -+++ init.h Sun Apr 2 22:54:46 2000 -@@ -2074,6 +2074,7 @@ - ** When set, Mutt will always ask for a key. When unset, Mutt will wait - ** for a key only if the external command returned a non-zero status. - */ -+ { "word_chars", DT_STR, R_NONE, UL &Wordchars, UL " *?_-.[]~=/&;!#$%^(){}<>@" }, - { "weed", DT_BOOL, R_NONE, OPTWEED, 1 }, - /* - ** .pp -diff -u -p -r1.1.1.8 init.h ---- patchlist.c.orig Sat Sep 19 02:29:51 1998 -+++ patchlist.c Sat Sep 19 02:54:16 1998 -@@ -16,6 +16,8 @@ - - - -+ printf("Feature patch: word_chars 0.94.7 by Vikas Agnihotri\n"); -+ - - - /* DO NOT MODIFY AFTER THIS LINE */ diff --git a/patch-0.95.3.bj.ed_mtime.1 b/patch-0.95.3.bj.ed_mtime.1 deleted file mode 100644 index 05d27c7..0000000 --- a/patch-0.95.3.bj.ed_mtime.1 +++ /dev/null @@ -1,44 +0,0 @@ ---- send.c.bak Wed Mar 3 22:11:30 1999 -+++ send.c Wed Mar 3 22:18:10 1999 -@@ -33,6 +33,9 @@ - #include - #include - #include -+#include -+#include -+#include - - #ifdef _PGPPATH - #include "pgp.h" -@@ -1072,9 +1075,20 @@ ci_send_message (int flags, /* send mod - { - struct stat st; - time_t mtime; -+ struct utimbuf utim; - - stat (msg->content->filename, &st); - mtime = st.st_mtime; -+ if (mtime == time (NULL)) -+ { -+ /* Decrease the file's modification time by 1 second so we are sure -+ * to find out if the `editor' program changes it in less than 1 second. -+ */ -+ mtime -= 1; -+ utim.actime = mtime; -+ utim.modtime = mtime; -+ utime (msg->content->filename, &utim); -+ } - - mutt_update_encoding (msg->content); - ---- patchlist.c.orig Sat Sep 19 02:29:51 1998 -+++ patchlist.c Sat Sep 19 02:54:16 1998 -@@ -16,6 +16,8 @@ - - - -+ printf("Feature patch: ed_mtime 0.95.3 by Byrial Jensen\n"); -+ - - - /* DO NOT MODIFY AFTER THIS LINE */ diff --git a/patch-0.95.4.bj.status-time.1 b/patch-0.95.4.bj.status-time.1 deleted file mode 100644 index cd21dce..0000000 --- a/patch-0.95.4.bj.status-time.1 +++ /dev/null @@ -1,197 +0,0 @@ -diff -udpr -X diff-excludes mutt-0.95.4-orig/curs_main.c mutt-0.95.4/curs_main.c ---- mutt-0.95.4-orig/curs_main.c Thu Mar 4 08:16:48 1999 -+++ mutt-0.95.4/curs_main.c Sun Mar 14 09:21:51 1999 -@@ -483,7 +483,8 @@ int mutt_index_menu (void) - menu_redraw_current (menu); - } - -- if (menu->redraw & REDRAW_STATUS) -+ if ((menu->redraw & REDRAW_STATUS) || -+ update_status_time ()) - { - menu_status_line (buf, sizeof (buf), menu, NONULL (Status)); - CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2); -diff -Nru mutt-1.1.11/doc/manual.sgml mutt-1.1.11.status_update/doc/manual.sgml ---- mutt-1.1.11/doc/manual.sgml Sun Apr 2 23:17:35 2000 -+++ mutt-1.1.11.status_update/doc/manual.sgml Sun Apr 2 23:17:27 2000 -@@ -5395,6 +5395,8 @@ - %u number of unread messages * - %v Mutt version string - %V currently active limit pattern, if any * -+%[fmt] the current date and time. `fmt'' is expanded by the system -+ call ``strftime''; a leading bang disables locales - %>X right justify the rest of the string and - pad with "X" - %|X pad to the end of the line with "X" -@@ -5441,6 +5443,17 @@ - Setting this variable causes the ``status bar'' to be displayed on - the first line of the screen rather than near the bottom. - -+status_update