From 7cf9f06d9ba7bcda54db3c668bfa0fde99abf34f Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Wed, 8 Nov 2006 23:46:58 +0100 Subject: [PATCH] remove fleang and other tools like that. Signed-off-by: Pierre Habouzit --- Makefile.am | 10 +- configure.ac | 17 --- madmuttbug | 3 - main.c | 8 -- muttbug.sh.in | 343 -------------------------------------------------- 5 files changed, 1 insertion(+), 380 deletions(-) delete mode 100755 madmuttbug delete mode 100644 muttbug.sh.in diff --git a/Makefile.am b/Makefile.am index 1692199..e859fc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,8 +13,6 @@ SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \ lib-lib lib-mime lib-crypt lib-hash lib \ pop imap $(NNTP_SUBDIR) -bin_SCRIPTS = madmuttbug fleang - BUILT_SOURCES = keymap_defs.h version.h bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng @@ -84,9 +82,7 @@ EXTRA_DIST = config.rpath COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ _regex.h OPS.MIX remailer.c remailer.h browser.h state.h \ mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h madmuttrc.head madmuttrc \ makedoc.c stamp-doc-rc README.SSL smime.h\ - madmuttbug pgppacket.h depcomp BEWARE \ - mkchangelog.sh cvslog2changelog.pl mutt_idna.h \ - regex.c mutt_libesmtp.h crypt-gpgme.h + depcomp mutt_idna.h regex.c mutt_libesmtp.h crypt-gpgme.h madmutt_dotlock_SOURCES = dotlock.c madmutt_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@ @@ -112,10 +108,6 @@ LDADD = @LIBOBJS@ @LIBINTL@ OPS=@OPS@ -fleang: muttbug.sh - cp muttbug.sh fleang - chmod +x fleang - smime_keysng: $(srcdir)/smime_keys.pl cp $(srcdir)/smime_keys.pl smime_keysng chmod +x smime_keysng diff --git a/configure.ac b/configure.ac index 34c085a..4f4021e 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,6 @@ fi AC_MSG_RESULT($mutt_cv_prefix) AC_PROG_CPP -AC_PROG_CC_STDC AC_PROG_CC_C99 AM_C_PROTOTYPES @@ -48,22 +47,6 @@ AC_SYS_LARGEFILE AC_FUNC_FSEEKO AC_CHECK_SIZEOF(off_t) -AC_PATH_PROG(DBX, dbx, no) -AC_PATH_PROG(GDB, gdb, no) -AC_PATH_PROG(SDB, sdb, no) - -if test $GDB != no ; then - DEBUGGER=$GDB -elif test $DBX != no ; then - DEBUGGER=$DBX -elif test $SDB != no ; then - DEBUGGER=$SDB -else - DEBUGGER=no -fi - -AC_SUBST([DEBUGGER]) - AH_TEMPLATE([sig_atomic_t], [Define to 'int' if doesn't define.]) AH_TEMPLATE([HAVE_START_COLOR], diff --git a/madmuttbug b/madmuttbug deleted file mode 100755 index 7ecafa5..0000000 --- a/madmuttbug +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec fleang "$@" diff --git a/main.c b/main.c index 5b1c674..ada2c8d 100644 --- a/main.c +++ b/main.c @@ -86,11 +86,6 @@ extern int optind; #include #endif -static const char *ReachingUs = N_("\ -To contact the developers, please mail to .\n\ -To visit the Madmutt homepage go to http://www.muttng.org.\n\ -To report a bug, please use the fleang(1) utility.\n"); - static const char *Notice = N_("\ Copyright (C) 1996-2002 Michael R. Elkins and others.\n\ Madmutt comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\ @@ -459,8 +454,6 @@ static void show_version (void) puts (" -MIXMASTER\n"); #endif - puts (_(ReachingUs)); - puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n")); exit (0); @@ -700,7 +693,6 @@ int main (int argc, char **argv) puts (_(Copyright_GPL_1)); puts (_(Copyright_GPL_2)); puts (_(Copyright_GPL_3)); - puts (_(ReachingUs)); exit (0); } diff --git a/muttbug.sh.in b/muttbug.sh.in deleted file mode 100644 index 2f73ab2..0000000 --- a/muttbug.sh.in +++ /dev/null @@ -1,343 +0,0 @@ -#!/bin/sh - -# -# File a bug against the Mutt mail user agent. -# - -# -# $Id: muttbug.sh.in,v 3.7 2005/01/09 15:35:51 roessler Exp $ -# - -# -# Copyright (c) 2000 Thomas Roessler -# Parts were written/modified by Nico Golde -# -# This program is free software; you can redistribute it and/or modify -# it 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. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -# USA. -# - -SUBMIT="mutt-ng-devel@lists.berlios.de" -DEBIAN_SUBMIT="submit@bugs.debian.org" - -prefix=@prefix@ - -DEBUGGER=@DEBUGGER@ -SENDMAIL=@SENDMAIL@ -sysconfdir=@sysconfdir@ -pkgdatadir=@pkgdatadir@ - -include_file () -{ - echo - echo "--- Begin $1" - sed -e 's/^-/- -/' $1 | egrep -v '^[ ]*(#|$)' - echo "--- End $1" - echo -} - -debug_gdb () -{ - cat << EOF > $SCRATCH/gdb.rc -bt -list -quit -EOF - $DEBUGGER -n -x $SCRATCH/gdb.rc -c $CORE mutt -} - -debug_dbx () -{ - cat << EOF > $SCRATCH/dbx.rc -where -list -quit -EOF - $DEBUGGER -s $SCRATCH/dbx.rc mutt $CORE -} - -debug_sdb () -{ - cat << EOF > $SCRATCH/sdb.rc -t -w -q -EOF - $DEBUGGER mutt $CORE < $SCRATCH/sdb.rc -} - -case `echo -n` in -"") n=-n; c= ;; - *) n=; c='\c' ;; -esac - - -exec > /dev/tty -exec < /dev/tty - -SCRATCH=${TMPDIR-/tmp}/`basename $0`.`hostname`.$$ - -mkdir ${SCRATCH} || \ -{ - echo "`basename $0`: Can't create temporary directory." >& 2 ; - exit 1 ; -} - -trap "rm -r -f ${SCRATCH} ; trap '' 0 ; exit" 0 1 2 - -TEMPLATE=${SCRATCH}/template.txt - -if test -z "$EMAIL" ; then - EMAIL="`muttng -Q from 2> /dev/null | sed -e 's/^from=.\(.*\).$/\1/'`" -fi - -echo "Please enter your e-mail address [$EMAIL]:" -echo $n "> $c" -read EMAILTMP - -if test -n "$EMAILTMP" ; then - EMAIL="$EMAILTMP" -fi - -echo "Please enter a one-line description of the problem you experience:" -echo $n "> $c" -read SUBJECT - -cat < $c" - read _CORE - test "$_CORE" && CORE="$_CORE" - fi -fi - -echo $n "Do you want to include your personal Mutt-ng configuration files? [Y|n] $c" -read personal -case "$personal" in -[nN]*) personal=no ;; - *) personal=yes ;; -esac - -echo $n "Do you want to include your system's global Mutt-ng configuration file? [Y|n] $c" -read global -case "$global" in -[nN]*) global=no ;; - *) global=yes ;; -esac - -if test -f /etc/debian_version ; then - DEBIAN=yes - echo $n "Checking whether Mutt-ng has been installed as a Debian package... $c" - DEBIANVERSION="`dpkg -l muttng | grep '^[ih]' | awk '{print $3}'`" 2> /dev/null - if test "$DEBIANVERSION" ; then - DPKG=yes - else - DPKG=no - unset DEBIANVERSION - fi - if [ "$DPKG" = "yes" ] ; then - echo "$DPKG" - echo $n "File this bug with Debian? [Y|n] $c" - read DPKG - case "$DPKG" in - [nN]) DPKG=no ;; - *) DPKG=yes ;; - esac - fi -else - DEBIAN=no - DPKG=no -fi -if [ "$DPKG" = "yes" ] ; then - echo "" - echo "Use reportbug muttng to report the bug to the debian bug tracking system..." - exit -fi -if rpm -q mutt-ng > /dev/null 2> /dev/null ; then - echo "Mutt-ng seems to come from an RPM package." - RPMVERSION="`rpm -q mutt-ng`" - RPMPACKAGER="`rpm -q -i mutt-ng | sed -n -e 's/^Packager *: *//p'`" -fi - -MUTTVERSION="`muttng -v | awk '{print $2 $3; exit; }'`" -test "$DPKG" = "yes" && SUBMIT="$SUBMIT, $DEBIAN_SUBMIT" - -exec > ${TEMPLATE} - -test "$EMAIL" && echo "From: $EMAIL" -test "$REPLYTO" && echo "Reply-To: $REPLYTO" -test "$ORGANIZATION" && echo "Organization: $ORGANIZATION" - -echo "Subject: Mutt-ng $MUTTVERSION: $SUBJECT" -echo "To: $SUBMIT" -test "$EMAIL" && echo "Bcc: ${EMAIL}" -echo -echo "Package: mutt-ng" -echo "Version: ${DEBIANVERSION-${RPMVERSION-$MUTTVERSION}}" -echo "Severity: $severity" -echo -echo "-- Please type your report below this line" -echo -echo -echo - -if test "$DEBIAN" = "yes" ; then - echo "Obtaining Debian-specific information..." > /dev/tty - bug -p -s dummy muttng < /dev/null 2> /dev/null | \ - sed -n -e "/^-- System Information/,/^---/p" | \ - grep -v '^---' -else - echo "-- System Information" - echo "System Version: `uname -a`" - test -z "$RPMPACKAGER" || echo "RPM Packager: $RPMPACKAGER"; - test -f /etc/redhat-release && echo "RedHat Release: `cat /etc/redhat-release`" - test -f /etc/SuSE-release && echo "SuSE Release: `sed 1q /etc/SuSE-release`" - # Please provide more of these if you have any. -fi - -echo -echo "-- Build environment information" -echo -echo "(Note: This is the build environment installed on the system" -echo "muttbug is run on. Information may or may not match the environment" -echo "used to build mutt.)" -echo -echo "- gcc version information" -echo "@CC@" -@CC@ -v 2>&1 -echo -echo "- CFLAGS" -echo @CFLAGS@ - -echo -echo "-- Mutt-ng Version Information" -echo -muttng -v - -if test "$CORE" && test -f "$CORE" ; then - echo - echo "-- Core Dump Analysis Output" - echo - - case "$DEBUGGER" in - *sdb) debug_sdb $CORE ;; - *dbx) debug_dbx $CORE ;; - *gdb) debug_gdb $CORE ;; - esac - - echo -fi - -if test "$personal" = "yes" ; then - CANDIDATES=".muttngrc-${MUTTVERSION} .muttngrc .muttng/muttngrc-${MUTTVERSION} .muttng/muttngrc" - MATCHED="none" - for f in $CANDIDATES; do - if test -f "${HOME}/$f" ; then - MATCHED="${HOME}/$f" - break - fi - done - - if test "$MATCHED" = "none" ; then - echo "Warning: Can't find your personal .muttngrc." >&2 - else - include_file $MATCHED - fi -fi - - -if test "$global" = "yes" ; then - CANDIDATES="Muttngrc-${MUTTVERSION} Muttngrc" - DIRECTORIES="$sysconfdir $pkgdatadir" - MATCHED="none" - for d in $DIRECTORIES ; do - for f in $CANDIDATES; do - if test -f $d/$f ; then - MATCHED="$d/$f" - break - fi - done - test "$MATCHED" = "none" || break - done - - if test "$MATCHED" = "none" ; then - echo "Warning: Can't find global Muttngrc." >&2 - else - include_file $MATCHED - fi -fi - -exec > /dev/tty - -cp $TEMPLATE $SCRATCH/mutt-bug.txt - -input="e" -while : ; do - if test "$input" = "e" ; then - ${VISUAL-${EDITOR-vi}} $SCRATCH/mutt-bug.txt - if cmp $SCRATCH/mutt-bug.txt ${TEMPLATE} > /dev/null ; then - echo "Warning: Bug report was not modified!" - fi - fi - - echo $n "Submit, Edit, View, Quit? [S|e|v|q] $c" - read _input - input="`echo $_input | tr EVSQ evsq`" - case $input in - e*) ;; - v*) ${PAGER-more} $SCRATCH/mutt-bug.txt ;; - s*|"") $SENDMAIL -t < $SCRATCH/mutt-bug.txt ; exit ;; - q*) exit - esac -done - -- 2.20.1