diff options
author | Fabian Groffen <grobian@gentoo.org> | 2007-07-19 17:47:28 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2007-07-19 17:47:28 +0000 |
commit | 4e8ccbe32647fc3d873aad05b8942f2049e8bfbb (patch) | |
tree | 48aa9bcd47a23031a1b41e5b4335883cc785e414 /mail-client | |
parent | Dropped ppc-macos keyword, see you in prefix (diff) | |
download | gentoo-2-4e8ccbe32647fc3d873aad05b8942f2049e8bfbb.tar.gz gentoo-2-4e8ccbe32647fc3d873aad05b8942f2049e8bfbb.tar.bz2 gentoo-2-4e8ccbe32647fc3d873aad05b8942f2049e8bfbb.zip |
Removed mail-client/muttng
Diffstat (limited to 'mail-client')
-rw-r--r-- | mail-client/muttng/ChangeLog | 135 | ||||
-rw-r--r-- | mail-client/muttng/Manifest | 42 | ||||
-rw-r--r-- | mail-client/muttng/files/digest-muttng-20060619-r1 | 3 | ||||
-rw-r--r-- | mail-client/muttng/files/muttng-20060309-nodoc.patch | 11 | ||||
-rw-r--r-- | mail-client/muttng/files/muttng-20060309-smarttime.patch | 125 | ||||
-rw-r--r-- | mail-client/muttng/files/muttng-20060317-sigremovereply.patch | 184 | ||||
-rw-r--r-- | mail-client/muttng/files/muttng-20060619-imap-browse.patch | 38 | ||||
-rw-r--r-- | mail-client/muttng/metadata.xml | 8 | ||||
-rw-r--r-- | mail-client/muttng/muttng-20060619-r1.ebuild | 154 |
9 files changed, 0 insertions, 700 deletions
diff --git a/mail-client/muttng/ChangeLog b/mail-client/muttng/ChangeLog deleted file mode 100644 index ece9fa8558c9..000000000000 --- a/mail-client/muttng/ChangeLog +++ /dev/null @@ -1,135 +0,0 @@ -# ChangeLog for mail-client/muttng -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.25 2007/03/18 02:14:40 genone Exp $ - - 18 Mar 2007; Marius Mauch <genone@gentoo.org> muttng-20060619-r1.ebuild: - Replacing einfo with elog - - 17 Mar 2007; Timothy Redaelli <drizzt@gentoo.org> - muttng-20060619-r1.ebuild: - Add ~x86-fbsd keyword - - 04 Oct 2006; Fabian Groffen <grobian@gentoo.org> -muttng-20060329.ebuild, - -muttng-20060415.ebuild, -muttng-20060619.ebuild, - muttng-20060619-r1.ebuild: - Drop old, add message to use mutt instead. Dropped ppc-macos keyword. - - 28 Jul 2006; Fabian Groffen <grobian@gentoo.org> muttng-20060329.ebuild, - muttng-20060415.ebuild, muttng-20060619.ebuild, muttng-20060619-r1.ebuild: - Fixed dependencies on slang-1.4.* for bug #141947. Note: 1.4* also matches - ! >=1.4.2, but that's not in portage, so should be ok - -*muttng-20060619-r1 (27 Jun 2006) - - 27 Jun 2006; Fabian Groffen <grobian@gentoo.org> - +files/muttng-20060619-imap-browse.patch, +muttng-20060619-r1.ebuild: - Add ported Mutt 1.5.11 IMAP buffer overflow patch (bug #138125) - -*muttng-20060619 (20 Jun 2006) - - 20 Jun 2006; Fabian Groffen <grobian@gentoo.org> - -files/muttng-20060309-break_thread.patch, - -files/muttng-20060309-statusbar_length.patch, -muttng-20060309.ebuild, - muttng-20060415.ebuild, +muttng-20060619.ebuild: - Bump to recent snapshot (two commits since last one), cleanup of old snapshot - - 14 Jun 2006; Fabian Groffen <grobian@gentoo.org> muttng-20060309.ebuild, - muttng-20060329.ebuild, muttng-20060415.ebuild: - Changing depend from app-text/tetex to virtual/tetex, bug #136557 - - 26 Apr 2006; Fabian Groffen <grobian@gentoo.org> - files/muttng-20060309-smarttime.patch: - Fix of smarttime patch that screwed up the { } time - -*muttng-20060415 (22 Apr 2006) - - 22 Apr 2006; Fabian Groffen <grobian@gentoo.org> -muttng-20060212.ebuild, - +muttng-20060415.ebuild: - New snapshot, removal of old snapshot - -*muttng-20060329 (30 Mar 2006) - - 30 Mar 2006; Fabian Groffen <grobian@gentoo.org> - +files/muttng-20060317-sigremovereply.patch, +muttng-20060329.ebuild: - New snapshot; upstream included three of our patches. Added sigremovereply - patch from upstream patch-repo, see strip_sig var. - -*muttng-20060309 (18 Mar 2006) - - 18 Mar 2006; Fabian Groffen <grobian@gentoo.org> - -files/muttng-20050809-nodoc.patch, - +files/muttng-20060309-break_thread.patch, - +files/muttng-20060309-nodoc.patch, - +files/muttng-20060309-smarttime.patch, - +files/muttng-20060309-statusbar_length.patch, -muttng-20050809-r1.ebuild, - -muttng-20050814.ebuild, +muttng-20060309.ebuild: - Adding a new snapshot with some homebrewn bugfixes. Removing anchient - snapshots. Adding ~ppc-macos keyword. - - 14 Feb 2006; Fabian Groffen <grobian@gentoo.org> muttng-20060212.ebuild: - remove accidental ppc-macos keyword: it's not ready yet - -*muttng-20060212 (13 Feb 2006) - - 13 Feb 2006; Fabian Groffen <grobian@gentoo.org> metadata.xml, - +muttng-20060212.ebuild: - Take over maintainership from agriffis and bump to a recent snapshot fixing - bugs #102945 and #105434 - -*muttng-20050814 (15 Aug 2005) - - 15 Aug 2005; Aron Griffis <agriffis@gentoo.org> +muttng-20050814.ebuild: - Bump to 20050814 to fix PGP inline #102485 and libesmtp #102129 - - 12 Aug 2005; Aron Griffis <agriffis@gentoo.org> muttng-20050809-r1.ebuild: - Disable building with libesmtp since it doesn't link #102129 - - 11 Aug 2005; Aron Griffis <agriffis@gentoo.org> muttng-20050809-r1.ebuild: - Don't enable sasl unless pop or imap is in USE, same as gnutls or ssl in - that regard #102129. Use --with-mailpath instead of --with-maildir - -*muttng-20050809-r1 (11 Aug 2005) - - 11 Aug 2005; Aron Griffis <agriffis@gentoo.org> - +muttng-20050809-r1.ebuild: - Sync with mutt-1.5.9 ebuild: - - inherit flag-o-matic and restrict optimization on some arches - - honor buffysize, cjk and smime USE-flags - - use --enable-nfs-fix - - 10 Aug 2005; Aron Griffis <agriffis@gentoo.org> muttng-20050809.ebuild: - Add berkdb to USE. Honor local USE=pop as well. Fix building when USE='-gdbm - -qdbm -berkdb' - -*muttng-20050809 (10 Aug 2005) - - 10 Aug 2005; Aron Griffis <agriffis@gentoo.org> - +files/muttng-20050809-nodoc.patch, +muttng-20050809.ebuild: - Bump to current snapshot #101431 - Honor USE=qdbm; prioritize qdbm > gdbm > db-4. - Don't attempt to build docs until sgml2html issues are sorted. - - 18 Jun 2005; Michael Cummings <mcummings@gentoo.org> - muttng-20050325.ebuild: - Keywording ~sparc - - 05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> - muttng-20050325.ebuild: - Added to ~ppc. - -*muttng-20050325 (25 Mar 2005) - - 25 Mar 2005; Aron Griffis <agriffis@gentoo.org> muttng-20050317.ebuild, - +muttng-20050325.ebuild: - Update snapshot to fix compilation with gpgme, thanks to Stelian Ionescu in - #85771. Include ebuild overhaul from Torsten Veller in the same bug - - 18 Mar 2005; Sven Wegener <swegener@gentoo.org> muttng-20050317.ebuild: - Fixed invalid atoms in *DEPEND. - -*muttng-20050317 (17 Mar 2005) - - 17 Mar 2005; Aron Griffis <agriffis@gentoo.org> +metadata.xml, - +muttng-20050317.ebuild: - Add muttng, thanks to Christopher Korn #81900 - diff --git a/mail-client/muttng/Manifest b/mail-client/muttng/Manifest deleted file mode 100644 index 07d9d36ff5f8..000000000000 --- a/mail-client/muttng/Manifest +++ /dev/null @@ -1,42 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX muttng-20060309-nodoc.patch 478 RMD160 4094dc10a297e4d65e4d13233f4c0640dc76db74 SHA1 0e4214e6b22eb267d4fad7138c684e66fb52f596 SHA256 0a76b63c30a893b82ab34b12f9d6f096479fdbd73d4449f62f1a8adb96c1940b -MD5 773e2d1ebb9519fb4c8e84d99cd0c214 files/muttng-20060309-nodoc.patch 478 -RMD160 4094dc10a297e4d65e4d13233f4c0640dc76db74 files/muttng-20060309-nodoc.patch 478 -SHA256 0a76b63c30a893b82ab34b12f9d6f096479fdbd73d4449f62f1a8adb96c1940b files/muttng-20060309-nodoc.patch 478 -AUX muttng-20060309-smarttime.patch 3741 RMD160 5ec2b9d3920f416aaa0e5e56aee3c835baf4e655 SHA1 b6d6a7287c124826e08270e051d7bf7e8c067465 SHA256 f659c9794c41fca9a3c1d79b393f27c1910000777a8f3143e4d36802ed6dba8f -MD5 006cbd177e94c8fe6cf70bc896fbd905 files/muttng-20060309-smarttime.patch 3741 -RMD160 5ec2b9d3920f416aaa0e5e56aee3c835baf4e655 files/muttng-20060309-smarttime.patch 3741 -SHA256 f659c9794c41fca9a3c1d79b393f27c1910000777a8f3143e4d36802ed6dba8f files/muttng-20060309-smarttime.patch 3741 -AUX muttng-20060317-sigremovereply.patch 5676 RMD160 7aa2296fa0892b584a707361a3b2ae9ddc169227 SHA1 5b005cbf7f01474290129aad3088f11b8dcbbf3e SHA256 0b9f29d8e038d150863009f0cbfc6daadd2857ceb674a1f7d10100f4bd666bdd -MD5 65b707b3a6eeaafec18588ab59e0249e files/muttng-20060317-sigremovereply.patch 5676 -RMD160 7aa2296fa0892b584a707361a3b2ae9ddc169227 files/muttng-20060317-sigremovereply.patch 5676 -SHA256 0b9f29d8e038d150863009f0cbfc6daadd2857ceb674a1f7d10100f4bd666bdd files/muttng-20060317-sigremovereply.patch 5676 -AUX muttng-20060619-imap-browse.patch 1215 RMD160 265d1dc69342106ec73d39600a902415f6fc179e SHA1 dab4dbd44ef06e6e11d995c04c6e7d8d2a252dd1 SHA256 0ae3b65b74d6aa187ba8c61a8539e77de71dc3baae620edd04fb6d1265be962f -MD5 fa22e29a66971b7ebc38c3aae7f7e017 files/muttng-20060619-imap-browse.patch 1215 -RMD160 265d1dc69342106ec73d39600a902415f6fc179e files/muttng-20060619-imap-browse.patch 1215 -SHA256 0ae3b65b74d6aa187ba8c61a8539e77de71dc3baae620edd04fb6d1265be962f files/muttng-20060619-imap-browse.patch 1215 -DIST muttng-20060619.tar.gz 2734131 RMD160 d482eddb7ac5e1998faa570a496b14f85ff1eef1 SHA1 0060dec0d66f041b885090600b66514c0059ac2c SHA256 151a99dd4c2b91805885c13b78e35e0f2f24ff01ff459945ca5d783a11c293a2 -EBUILD muttng-20060619-r1.ebuild 4464 RMD160 3555a0a8f4775166e89fc3a9bc97b43acdf9a948 SHA1 94af581c130cf2c66ed22b4038082adbccf29306 SHA256 d3c5f94f1c8c6a0d1abc175a22e63b85c86e1873a9086ea87b519f10f02daed6 -MD5 bf40457447cac5de0606e8ed0bf54bae muttng-20060619-r1.ebuild 4464 -RMD160 3555a0a8f4775166e89fc3a9bc97b43acdf9a948 muttng-20060619-r1.ebuild 4464 -SHA256 d3c5f94f1c8c6a0d1abc175a22e63b85c86e1873a9086ea87b519f10f02daed6 muttng-20060619-r1.ebuild 4464 -MISC ChangeLog 5204 RMD160 3695a6ad7e556b04a1ef723df3bbfaf2306e18c9 SHA1 c5b8c6ef5d4933f9437bdcd2a2936d51f0efadf1 SHA256 6fa7d19e9547973a6b46f03242876bda63b30695885d5cd9ed5002658a7567eb -MD5 b5facb212eb8d7324f991cf70f567ceb ChangeLog 5204 -RMD160 3695a6ad7e556b04a1ef723df3bbfaf2306e18c9 ChangeLog 5204 -SHA256 6fa7d19e9547973a6b46f03242876bda63b30695885d5cd9ed5002658a7567eb ChangeLog 5204 -MISC metadata.xml 227 RMD160 616aff994f5c341874112505920241b3d4d9cbfa SHA1 92fca333b3271f892dafdd5f990b146a6e5d713e SHA256 1c5377e37b9c43ed35a6528e7240e31408fa418ee710e571afe23e37a132e09c -MD5 856e89d80001e53a31845405dfef7f03 metadata.xml 227 -RMD160 616aff994f5c341874112505920241b3d4d9cbfa metadata.xml 227 -SHA256 1c5377e37b9c43ed35a6528e7240e31408fa418ee710e571afe23e37a132e09c metadata.xml 227 -MD5 24e6c07d7b38658bd3f6d3ece25be7d9 files/digest-muttng-20060619-r1 250 -RMD160 3191fb7fbbcd3240526a05a9c398a426d72d132a files/digest-muttng-20060619-r1 250 -SHA256 00800190007a2d06b9c1d255b3981425cd162bab41f27f6007907bda127afc24 files/digest-muttng-20060619-r1 250 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFF/KGj6J2i8a8J4okRArZMAKCa/HUjcRPODcWIPEE56VgHfD5lMACeJbDU -sR9gBiboFXBRXqlie1b/3o0= -=wyQt ------END PGP SIGNATURE----- diff --git a/mail-client/muttng/files/digest-muttng-20060619-r1 b/mail-client/muttng/files/digest-muttng-20060619-r1 deleted file mode 100644 index 84316cfe55d5..000000000000 --- a/mail-client/muttng/files/digest-muttng-20060619-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7bc0c3fc4f1bfb28ec20c256e92cc41c muttng-20060619.tar.gz 2734131 -RMD160 d482eddb7ac5e1998faa570a496b14f85ff1eef1 muttng-20060619.tar.gz 2734131 -SHA256 151a99dd4c2b91805885c13b78e35e0f2f24ff01ff459945ca5d783a11c293a2 muttng-20060619.tar.gz 2734131 diff --git a/mail-client/muttng/files/muttng-20060309-nodoc.patch b/mail-client/muttng/files/muttng-20060309-nodoc.patch deleted file mode 100644 index 55c9bc3e10bc..000000000000 --- a/mail-client/muttng/files/muttng-20060309-nodoc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in -+++ Makefile.in -@@ -365,7 +365,7 @@ - @BUILD_POP_TRUE@POP_INCLUDES = -I$(top_srcdir)/pop - @BUILD_NNTP_TRUE@NNTP_SUBDIR = nntp - @BUILD_NNTP_TRUE@NNTP_INCLUDES = -I$(top_srcdir)/nntp --SUBDIRS = m4 po intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR) -+SUBDIRS = m4 po intl contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR) - bin_SCRIPTS = muttngbug fleang - BUILT_SOURCES = keymap_defs.h patchlist.c version.h - muttng_SOURCES = $(BUILT_SOURCES) \ diff --git a/mail-client/muttng/files/muttng-20060309-smarttime.patch b/mail-client/muttng/files/muttng-20060309-smarttime.patch deleted file mode 100644 index 0927aac8a0f0..000000000000 --- a/mail-client/muttng/files/muttng-20060309-smarttime.patch +++ /dev/null @@ -1,125 +0,0 @@ -Index: hdrline.c -=================================================================== ---- hdrline.c (revision 802) -+++ hdrline.c (working copy) -@@ -302,11 +302,11 @@ - case '(': - case '<': - -- /* preprocess $date_format to handle %Z */ -+ /* preprocess $date_format to handle %Z and %Q,%q */ - { - const char *cp; -- struct tm *tm; -- time_t T; -+ struct tm *tm, *TM; -+ time_t t, T; - - p = dest; - -@@ -318,6 +318,28 @@ - else - do_locales = 1; - -+ if (do_locales && Locale) -+ setlocale (LC_TIME, Locale); -+ -+ tm = alloca(sizeof(struct tm)); -+ if (op == '[' || op == 'D') -+ tm = localtime_r (&hdr->date_sent, tm); -+ else if (op == '(') -+ tm = localtime_r (&hdr->received, tm); -+ else if (op == '<') { -+ T = time (NULL); -+ tm = localtime_r (&T, tm); -+ } -+ else { -+ /* restore sender's time zone */ -+ T = hdr->date_sent; -+ if (hdr->zoccident) -+ T -= (hdr->zhours * 3600 + hdr->zminutes * 60); -+ else -+ T += (hdr->zhours * 3600 + hdr->zminutes * 60); -+ tm = gmtime_r (&T, tm); -+ } -+ - len = destlen - 1; - while (len > 0 && (((op == 'd' || op == 'D') && *cp) || - (op == '{' && *cp != '}') || -@@ -335,6 +357,43 @@ - } - else - break; /* not enough space left */ -+ } else if (*cp == 'Q' || *cp == 'q') { -+ t = mktime (tm); -+ T = time (NULL); -+ TM = localtime (&T); -+ -+ if (len < 6) -+ break; /* not enough space left */ -+ -+ /* figure out what the date format should be: -+ * if the message is in the future: treat as if it were in -+ * the past -+ * if the message was within the last 12 hours: "%k:%M " -+ * if the message was within the last 7 days: "%a-%d" -+ * if the message was within the last 12 months: "%d-%b" -+ * if the message is older than a year: "%b-%y" -+ */ -+ -+ if (t > T) /* future: reverse */ -+ t -= 2 * (t - T); -+ -+ if (t > T - 43200) { /* 12 hours */ -+ sprintf (p, "%s", "%H:%M "); -+ p += 1; -+ len -= 1; -+ } -+ else if (t >= T - 518400) { /* 6 days */ -+ sprintf (p, "%s", "%a-%d"); -+ } -+ else if (((TM->tm_year - tm->tm_year) * 12 + TM->tm_mon) - -+ tm->tm_mon < 12) { /* last 11 months */ -+ sprintf (p, "%s", "%d-%b"); -+ } -+ else { /* older than a year */ -+ sprintf (p, "%s", "%b-%y"); -+ } -+ p += 5; -+ len -= 5; - } - else { - if (len >= 2) { -@@ -354,27 +413,6 @@ - } - *p = 0; - -- if (do_locales && Locale) -- setlocale (LC_TIME, Locale); -- -- if (op == '[' || op == 'D') -- tm = localtime (&hdr->date_sent); -- else if (op == '(') -- tm = localtime (&hdr->received); -- else if (op == '<') { -- T = time (NULL); -- tm = localtime (&T); -- } -- else { -- /* restore sender's time zone */ -- T = hdr->date_sent; -- if (hdr->zoccident) -- T -= (hdr->zhours * 3600 + hdr->zminutes * 60); -- else -- T += (hdr->zhours * 3600 + hdr->zminutes * 60); -- tm = gmtime (&T); -- } -- - strftime (buf2, sizeof (buf2), dest, tm); - - if (do_locales) -@@ -751,3 +789,4 @@ - mutt_FormatString (dest, destlen, s, hdr_format_str, (unsigned long) &hfi, - flags); - } -+/* vim:set expandtab sw=2 ts=2: */ diff --git a/mail-client/muttng/files/muttng-20060317-sigremovereply.patch b/mail-client/muttng/files/muttng-20060317-sigremovereply.patch deleted file mode 100644 index 782a0148442b..000000000000 --- a/mail-client/muttng/files/muttng-20060317-sigremovereply.patch +++ /dev/null @@ -1,184 +0,0 @@ -Index: mutt.h -=================================================================== ---- mutt.h (revision 537) -+++ mutt.h (working copy) -@@ -413,6 +413,7 @@ - OPTSTRICTMAILTO, - OPTSTRICTMIME, - OPTSTRICTTHREADS, -+ OPTSTRIPSIG, - OPTSTRIPWAS, - OPTSTUFFQUOTED, - OPTSUSPEND, -Index: state.c -=================================================================== ---- state.c (revision 537) -+++ state.c (working copy) -@@ -67,6 +67,9 @@ - - void state_prefix_putc (char c, STATE * s) - { -+ if (s->flags & M_FINISHED) -+ return; -+ - if (s->flags & M_PENDINGPREFIX) { - int i; - -@@ -77,46 +80,54 @@ - char buf[2 * SHORT_STRING]; - int j = 0, offset = 0; - regmatch_t pmatch[1]; --#ifdef DEBUG - unsigned char save = '\0'; --#endif - -- state_reset_prefix (s); -- while (regexec -- ((regex_t *) QuoteRegexp.rx, &Quotebuf[offset], 1, pmatch, -- 0) == 0) -- offset += pmatch->rm_eo; -+ /* quotebuf may be '^-- \n$' which fails to match $strip_sig */ -+ if (Quotebuf[i-1] == '\n') { -+ save = Quotebuf[i-1]; -+ Quotebuf[i-1] = '\0'; -+ } - -- if (!option (OPTQUOTEEMPTY) && Quotebuf[offset] == '\n') { -- buf[0] = '\n'; -- buf[1] = '\0'; -+ debug_print (1, ("quote == '%s\n", Quotebuf)); -+ -+ if (option (OPTSTRIPSIG) && (s->flags & M_REPLYING) && -+ regexec ((regex_t*) StripSigRegexp.rx, Quotebuf, 1, pmatch, 0) == 0) { -+ debug_print (1, ("seen sig dashes, finishing\n")); -+ s->flags |= M_FINISHED; - } -- else if (!option (OPTTEXTFLOWED) && option (OPTQUOTEQUOTED) && offset) { -- for (i = 0; i < offset; i++) -- if (Quotebuf[i] != ' ') -- j = i; -- strncpy (buf, Quotebuf, j + 1); -- strcpy (buf + j + 1, Quotebuf + j); -- } -- else -- snprintf (buf, sizeof (buf), "%s%s", NONULL (s->prefix), Quotebuf); -+ else { - --#ifdef DEBUG -- if (str_len (buf) >= 2) { -- save = buf[str_len (buf) - 1]; -- buf[str_len (buf) - 1] = '\0'; -- debug_print (2, ("buf = '%s'\n", buf)); -- buf[str_len (buf)] = save; -+ if (save != '\0') -+ Quotebuf[i-1] = save; -+ -+ state_reset_prefix (s); -+ while (regexec -+ ((regex_t *) QuoteRegexp.rx, &Quotebuf[offset], 1, pmatch, -+ 0) == 0) -+ offset += pmatch->rm_eo; -+ -+ if (!option (OPTQUOTEEMPTY) && Quotebuf[offset] == '\n') { -+ buf[0] = '\n'; -+ buf[1] = '\0'; -+ } -+ else if (!option (OPTTEXTFLOWED) && option (OPTQUOTEQUOTED) && offset) { -+ for (i = 0; i < offset; i++) -+ if (Quotebuf[i] != ' ') -+ j = i; -+ strncpy (buf, Quotebuf, j + 1); -+ strcpy (buf + j + 1, Quotebuf + j); -+ } -+ else -+ snprintf (buf, sizeof (buf), "%s%s", NONULL (s->prefix), Quotebuf); -+ -+ state_puts (buf, s); - } --#endif -- -- state_puts (buf, s); - } - } - else - state_putc (c, s); - -- if (c == '\n') { -+ if (c == '\n' && !(s->flags & M_FINISHED)) { - state_set_prefix (s); - Quotebuf[0] = '\0'; - } -Index: state.h -=================================================================== ---- state.h (revision 537) -+++ state.h (working copy) -@@ -30,6 +30,7 @@ - #define M_PRINTING (1<<5) /* are we printing? - M_DISPLAY "light" */ - #define M_REPLYING (1<<6) /* are we replying? */ - #define M_FIRSTDONE (1<<7) /* the first attachment has been done */ -+#define M_FINISHED (1<<8) /* premature end? */ - - #define state_set_prefix(s) ((s)->flags |= M_PENDINGPREFIX) - #define state_reset_prefix(s) ((s)->flags &= ~M_PENDINGPREFIX) -Index: rfc3676.c -=================================================================== ---- rfc3676.c (revision 537) -+++ rfc3676.c (working copy) -@@ -142,6 +142,7 @@ - quotelevel = 0, newql = 0; - int buf_off, buf_len; - int delsp = 0, fixed = 0; -+ regmatch_t pmatch[1]; - - /* respect DelSP of RfC3676 only with f=f parts */ - if ((t = (char*) mutt_get_parameter ("delsp", a->parameter))) { -@@ -201,6 +202,13 @@ - continue; - } - -+ if (option (OPTSTRIPSIG) && (s->flags & M_REPLYING) && -+ regexec ((regex_t*) StripSigRegexp.rx, buf, 1, pmatch, 0) == 0) { -+ debug_print (1, ("f=f: seen sig dashes, finishing\n")); -+ s->flags |= M_FINISHED; -+ break; -+ } -+ - /* signature separator also flushes the previous paragraph */ - if (strcmp(buf + buf_off, "-- ") == 0 && curline && *curline) { - print_flowed_line (curline, s, quotelevel); -Index: globals.h -=================================================================== ---- globals.h (revision 537) -+++ globals.h (working copy) -@@ -92,6 +92,7 @@ - WHERE rx_t Smileys; - WHERE rx_t GecosMask; - WHERE rx_t StripWasRegexp; -+WHERE rx_t StripSigRegexp; - - #ifdef USE_SOCKET - WHERE char *Preconnect INITVAL (NULL); -Index: init.h -=================================================================== ---- init.h (revision 537) -+++ init.h (working copy) -@@ -3563,6 +3563,19 @@ - ** trailing part of the ``Subject'' line when replying if it won't be empty - ** afterwards. - **/ -+ {"strip_sig", DT_BOOL, R_NONE, OPTSTRIPSIG, "no" }, -+ /** -+ ** .pp -+ ** When \fIset\fP, Mutt-ng will remove signatures when preparing replies. -+ ** .pp -+ ** Signature separators are detected by $$$strip_sig_regex. -+ **/ -+ {"strip_sig_regex", DT_RX, R_NONE, UL &StripSigRegexp, "^-- $"}, -+ /** -+ ** .pp -+ ** When non-empty, this regular expression specifies a signature delimiter after -+ ** which to ignore content if $$$strip_sig is \fIset\fP. -+ **/ - {"stuff_quoted", DT_BOOL, R_BOTH, OPTSTUFFQUOTED, "no" }, - /* - ** .pp diff --git a/mail-client/muttng/files/muttng-20060619-imap-browse.patch b/mail-client/muttng/files/muttng-20060619-imap-browse.patch deleted file mode 100644 index 001a218869b9..000000000000 --- a/mail-client/muttng/files/muttng-20060619-imap-browse.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 850d4a6b78730344ad7bb1d2a04cfcd35def3fec -Author: brendan <brendan> -Date: Mon Jun 19 18:14:03 2006 +0000 - - From: TAKAHASHI Tamotsu <tamo@momonga-linux.org> - - Fix browse_get_namespace() which could overflow ns[LONG_STRING]. - (Possible remote vulnerability) - -Fabian Groffen <grobian@gentoo.org>: -* ported Mutt 1.5.11 patch to muttng-r804 (20060619) - ---- imap/browse.c -+++ imap/browse.c -@@ -481,7 +481,7 @@ - - if (*s == '\"') { - s++; -- while (*s && *s != '\"') { -+ while (*s && *s != '\"' && n < (sizeof(ns) - 1)) { - if (*s == '\\') - s++; - ns[n++] = *s; -@@ -491,11 +491,13 @@ - 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)) -+ debug_print (1, ("browse_get_namespace: too long: [%s]\n", ns)); - /* delim? */ - s = imap_next_word (s); - /* delimiter is meaningless if namespace is "". Why does diff --git a/mail-client/muttng/metadata.xml b/mail-client/muttng/metadata.xml deleted file mode 100644 index 9d7440ee720e..000000000000 --- a/mail-client/muttng/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-mail</herd> - <maintainer> - <email>grobian@gentoo.org</email> - </maintainer> -</pkgmetadata> diff --git a/mail-client/muttng/muttng-20060619-r1.ebuild b/mail-client/muttng/muttng-20060619-r1.ebuild deleted file mode 100644 index 88e0b5f8a09a..000000000000 --- a/mail-client/muttng/muttng-20060619-r1.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/muttng-20060619-r1.ebuild,v 1.5 2007/03/18 02:14:40 genone Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="mutt-ng -- fork of mutt with added features" -HOMEPAGE="http://www.muttng.org/" -SRC_URI="http://nion.modprobe.de/mutt-ng/snapshots/${P}.tar.gz" -IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl slang smime smtp ssl doc" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" -RDEPEND="nls? ( sys-devel/gettext ) - >=sys-libs/ncurses-5.2 - idn? ( net-dns/libidn ) - qdbm? ( dev-db/qdbm ) - !qdbm? ( - gdbm? ( sys-libs/gdbm ) - !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) - ) - slang? ( =sys-libs/slang-1.4* ) - smtp? ( net-libs/libesmtp ) - imap? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - pop? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - gpgme? ( >=app-crypt/gpgme-0.9.0 ) - doc? ( - www-client/lynx - dev-libs/libxslt - app-text/htmltidy - app-text/openjade - virtual/tetex - )" -DEPEND="${RDEPEND} - net-mail/mailbase" - -src_unpack() { - unpack ${A} || die "unpack failed" - cd "${S}" - epatch "${FILESDIR}/${PN}"-20060309-smarttime.patch - epatch "${FILESDIR}/${PN}"-20060317-sigremovereply.patch - - # Fix possible vulnerability see bug #138125 - epatch "${FILESDIR}/${P}"-imap-browse.patch - - use doc || epatch "${FILESDIR}/${PN}"-20060309-nodoc.patch -} - -src_compile() { - declare myconf=" - $(use_enable nls) \ - $(use_enable gpgme) \ - $(use_enable imap) \ - $(use_enable pop) \ - $(use_enable crypt pgp) \ - $(use_enable smime) \ - $(use_enable cjk default-japanese) \ - $(use_enable debug) \ - $(use_enable nntp) \ - $(use_with idn) \ - $(use_with smtp libesmtp) \ - --enable-compressed \ - --sysconfdir=/etc/${PN} \ - --with-docdir=/usr/share/doc/${PN}-${PVR} \ - --with-regex \ - --disable-fcntl --enable-flock --enable-nfs-fix \ - --with-mixmaster \ - --without-sasl \ - --enable-external-dotlock" - - # muttng prioritizes qdbm over gdbm, so we will too. - # hcache feature requires at least one database is in USE. - if use qdbm; then - myconf="${myconf} --enable-hcache \ - --with-qdbm --without-gdbm --without-bdb" - elif use gdbm; then - myconf="${myconf} --enable-hcache \ - --with-gdbm --without-qdbm --without-bdb" - elif use berkdb; then - myconf="${myconf} --enable-hcache \ - --with-bdb --without-gdbm --without-qdbm" - else - myconf="${myconf} --disable-hcache \ - --without-gdbm --without-qdbm --without-bdb" - fi - - # there's no need for gnutls or ssl without either pop or imap. - # in fact mutt's configure will bail if you do: - # --without-pop --without-imap --with-ssl - if use pop || use imap; then - if use gnutls; then - myconf="${myconf} --with-gnutls" - elif use ssl; then - myconf="${myconf} --with-ssl" - fi - # not sure if this should be mutually exclusive with the other two - myconf="${myconf} $(use_with sasl sasl2)" - else - myconf="${myconf} --without-gnutls --without-ssl --without-sasl2" - fi - - # See Bug #11170 - case ${ARCH} in - alpha|ppc) replace-flags "-O[3-9]" "-O2" ;; - esac - - if use buffysize; then - ewarn "USE=buffy-size is just a workaround. Disable it if you don't need it." - myconf="${myconf} --enable-buffy-size" - fi - - if use slang; then - myconf="${myconf} --with-slang" - ewarn "If you want a transparent background, merge ${PN} with USE=-slang." - else - # --without-slang doesn't work; - # specify --with-curses if you don't want slang - # (26 Sep 2001 agriffis) - myconf="${myconf} --with-curses" - fi - - if use mbox; then - myconf="${myconf} --with-mailpath=/var/spool/mail" - else - myconf="${myconf} --with-homespool=Maildir" - fi - - econf ${myconf} - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - find "${D}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip - - dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO -} - -pkg_postinst() { - echo - elog "NOTE: muttng is not under development any more, and suffers" - elog " from serious stability problems. It lacks behind with" - elog " respect to mutt, which it is based on." - elog "Please consider switching to mail-client/mutt instead." - echo -} |