From 469f55cd55efee684da645dcb980b2221a29db33 Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Fri, 11 Jul 2014 09:33:37 +0200
Subject: [PATCH] Imported Bugzilla 2.14.3.

---
 CVS/Entries                      | 150 +++++++++++++++----------------
 CVS/Tag                          |   2 +-
 buglist.cgi                      |   4 +-
 contrib/CVS/Entries              |  22 ++---
 contrib/CVS/Entries.Log          |   2 +
 contrib/CVS/Tag                  |   2 +-
 contrib/bug_email.pl             |  28 +++---
 contrib/bugzilla_email_append.pl |  11 ++-
 docs/CVS/Entries                 |   4 +-
 docs/CVS/Tag                     |   2 +-
 docs/html/CVS/Entries            | 138 ++++++++++++++--------------
 docs/html/CVS/Tag                |   2 +-
 docs/images/CVS/Entries          |  12 +--
 docs/images/CVS/Tag              |   2 +-
 docs/rel_notes.txt               |  45 +++++++---
 docs/sgml/CVS/Entries            |  34 +++----
 docs/sgml/CVS/Tag                |   2 +-
 docs/txt/CVS/Entries             |   2 +-
 docs/txt/CVS/Tag                 |   2 +-
 globals.pl                       |   2 +-
 t/CVS/Entries                    |   4 +-
 t/CVS/Tag                        |   2 +-
 t/Support/CVS/Entries            |   4 +-
 t/Support/CVS/Tag                |   2 +-
 24 files changed, 258 insertions(+), 222 deletions(-)
 create mode 100644 contrib/CVS/Entries.Log

diff --git a/CVS/Entries b/CVS/Entries
index 5143a408f..917395088 100644
--- a/CVS/Entries
+++ b/CVS/Entries
@@ -1,78 +1,78 @@
-/.cvsignore/1.4/Wed Jul 25 07:26:42 2001//TBUGZILLA-2_14_2
-/1x1.gif/1.1/Wed Aug 26 06:14:15 1998/-kb/TBUGZILLA-2_14_2
-/Bug.pm/1.6.6.1/Sat Nov 17 07:41:52 2001//TBUGZILLA-2_14_2
-/CGI.pl/1.100.2.3/Mon Jun  3 23:04:44 2002//TBUGZILLA-2_14_2
-/README/1.50/Sat Aug 11 19:56:40 2001//TBUGZILLA-2_14_2
-/RelationSet.pm/1.5/Fri Jun  1 02:14:23 2001//TBUGZILLA-2_14_2
-/Token.pm/1.3/Fri Aug 17 08:38:54 2001//TBUGZILLA-2_14_2
-/UPGRADING/1.1/Fri Aug 10 22:35:21 2001//TBUGZILLA-2_14_2
-/UPGRADING-pre-2.8/1.1/Fri Aug 10 22:35:22 2001//TBUGZILLA-2_14_2
-/ant.jpg/1.2/Wed Aug 26 22:36:05 1998/-kb/TBUGZILLA-2_14_2
-/booleanchart.html/1.3/Wed Aug 16 23:07:37 2000//TBUGZILLA-2_14_2
-/bug_form.pl/1.70.2.4/Tue May 28 04:01:20 2002//TBUGZILLA-2_14_2
-/bug_status.html/1.11/Mon Aug 28 17:48:56 2000//TBUGZILLA-2_14_2
-/buglist.cgi/1.139.2.3/Fri Jun  7 23:31:40 2002//TBUGZILLA-2_14_2
-/bugwritinghelp.html/1.1/Tue Mar  7 17:59:38 2000//TBUGZILLA-2_14_2
-/bugzilla.dtd/1.2/Fri May 26 06:34:45 2000//TBUGZILLA-2_14_2
-/changepassword.cgi/1.19/Tue Jan 25 07:53:29 2000//TBUGZILLA-2_14_2
-/checksetup.pl/1.99.2.1/Mon May 13 15:05:41 2002//TBUGZILLA-2_14_2
-/colchange.cgi/1.17/Fri Jun  1 02:07:28 2001//TBUGZILLA-2_14_2
-/collectstats.pl/1.20/Wed Jun  6 21:17:40 2001//TBUGZILLA-2_14_2
-/confirmhelp.html/1.2/Mon Aug 28 17:48:58 2000//TBUGZILLA-2_14_2
-/createaccount.cgi/1.11/Wed Jul 11 05:29:18 2001//TBUGZILLA-2_14_2
-/createattachment.cgi/1.13/Tue Apr  3 20:42:58 2001//TBUGZILLA-2_14_2
-/defparams.pl/1.56.2.1/Sat May 25 20:43:49 2002//TBUGZILLA-2_14_2
-/describecomponents.cgi/1.6/Wed Jun  6 04:32:45 2001//TBUGZILLA-2_14_2
-/describekeywords.cgi/1.4/Sat Jan 22 16:51:49 2000//TBUGZILLA-2_14_2
-/doeditparams.cgi/1.15/Mon Aug 13 19:11:33 2001//TBUGZILLA-2_14_2
-/doeditvotes.cgi/1.12.2.1/Mon Nov 26 04:53:28 2001//TBUGZILLA-2_14_2
-/duplicates.cgi/1.13/Tue Aug 21 00:36:54 2001//TBUGZILLA-2_14_2
-/editcomponents.cgi/1.17/Sat Jun 16 14:51:15 2001//TBUGZILLA-2_14_2
-/editgroups.cgi/1.12/Wed Jun  6 03:16:49 2001//TBUGZILLA-2_14_2
-/editkeywords.cgi/1.7/Mon Feb 26 23:25:22 2001//TBUGZILLA-2_14_2
-/editmilestones.cgi/1.5/Sat Jun 16 14:51:16 2001//TBUGZILLA-2_14_2
-/editparams.cgi/1.12/Mon Aug 13 19:11:33 2001//TBUGZILLA-2_14_2
-/editproducts.cgi/1.18/Sat Jun 16 14:51:16 2001//TBUGZILLA-2_14_2
-/editusers.cgi/1.23.2.3/Wed May 29 18:13:34 2002//TBUGZILLA-2_14_2
-/editversions.cgi/1.8/Tue Jun 19 01:37:02 2001//TBUGZILLA-2_14_2
-/enter_bug.cgi/1.50/Sun Jul  1 02:00:56 2001//TBUGZILLA-2_14_2
-/globals.pl/1.110.2.7/Mon Jun  3 13:34:29 2002//TBUGZILLA-2_14_2
-/help.html/1.4/Fri Jan 21 22:01:11 2000//TBUGZILLA-2_14_2
-/helpemailquery.html/1.1/Tue Jan 19 00:07:45 1999//TBUGZILLA-2_14_2
-/how_to_mail.html/1.2/Mon Nov  1 23:33:16 1999//TBUGZILLA-2_14_2
-/importxml.pl/1.18.2.1/Sat May 25 20:43:51 2002//TBUGZILLA-2_14_2
-/index.html/1.12/Wed Feb 28 23:07:24 2001//TBUGZILLA-2_14_2
-/localconfig.js/1.1/Wed Feb 28 23:07:25 2001//TBUGZILLA-2_14_2
-/long_list.cgi/1.15.2.1/Sat Nov 17 08:34:46 2001//TBUGZILLA-2_14_2
-/move.pl/1.6.10.1/Sat May 25 20:43:51 2002//TBUGZILLA-2_14_2
-/new_comment.cgi/1.5/Thu Jul 27 20:10:16 2000//TBUGZILLA-2_14_2
-/notargetmilestone.html/1.2/Mon Aug 28 17:48:59 2000//TBUGZILLA-2_14_2
-/post_bug.cgi/1.34.2.1/Sat Nov 17 08:01:54 2001//TBUGZILLA-2_14_2
-/process_bug.cgi/1.96.2.2/Tue May 28 04:32:38 2002//TBUGZILLA-2_14_2
-/processmail/1.68/Mon Aug 13 17:06:38 2001//TBUGZILLA-2_14_2
-/query.cgi/1.85/Mon Aug 13 19:11:35 2001//TBUGZILLA-2_14_2
-/queryhelp.cgi/1.4.2.1/Sat May 11 10:01:29 2002//TBUGZILLA-2_14_2
-/quicksearch.html/1.1/Wed Feb 28 23:07:26 2001//TBUGZILLA-2_14_2
-/quicksearch.js/1.7/Fri Jul 20 08:25:30 2001//TBUGZILLA-2_14_2
-/quicksearchhack.html/1.2/Wed Feb 28 23:08:52 2001//TBUGZILLA-2_14_2
-/quips.cgi/1.1/Tue May 29 04:01:48 2001//TBUGZILLA-2_14_2
-/relogin.cgi/1.10/Tue Jan 18 14:41:00 2000//TBUGZILLA-2_14_2
-/reports.cgi/1.47/Sun Jul  1 19:09:29 2001//TBUGZILLA-2_14_2
-/robots.txt/1.1/Fri Jul 28 21:28:39 2000//TBUGZILLA-2_14_2
-/runtests.sh/1.4.6.1/Sat Nov 17 07:41:52 2001//TBUGZILLA-2_14_2
-/sanitycheck.cgi/1.33/Wed Jul 11 05:29:20 2001//TBUGZILLA-2_14_2
-/show_activity.cgi/1.6/Fri Jun  1 13:38:01 2001//TBUGZILLA-2_14_2
-/show_bug.cgi/1.15/Sat Jun  2 22:02:02 2001//TBUGZILLA-2_14_2
-/showattachment.cgi/1.7/Wed Jun  6 18:36:25 2001//TBUGZILLA-2_14_2
-/showdependencygraph.cgi/1.10/Thu May 31 15:52:24 2001//TBUGZILLA-2_14_2
-/showdependencytree.cgi/1.8/Thu May 31 15:52:24 2001//TBUGZILLA-2_14_2
-/showvotes.cgi/1.9/Thu May 31 15:52:25 2001//TBUGZILLA-2_14_2
-/syncshadowdb/1.12/Sun Jun 10 17:38:15 2001//TBUGZILLA-2_14_2
-/token.cgi/1.2/Fri Aug 17 12:42:34 2001//TBUGZILLA-2_14_2
-/userprefs.cgi/1.20.2.1/Sat Nov 17 08:24:08 2001//TBUGZILLA-2_14_2
-/votehelp.html/1.5/Thu Jan 25 04:56:14 2001//TBUGZILLA-2_14_2
-/whineatnews.pl/1.4/Mon Nov  1 23:33:22 1999//TBUGZILLA-2_14_2
-/xml.cgi/1.2/Mon Jun 12 06:52:41 2000//TBUGZILLA-2_14_2
+/.cvsignore/1.4/Wed Jul 25 07:26:42 2001//TBUGZILLA-2_14_3
+/1x1.gif/1.1/Wed Aug 26 06:14:15 1998/-kb/TBUGZILLA-2_14_3
+/Bug.pm/1.6.6.1/Sat Nov 17 07:41:52 2001//TBUGZILLA-2_14_3
+/CGI.pl/1.100.2.3/Mon Jun  3 23:04:44 2002//TBUGZILLA-2_14_3
+/README/1.50/Sat Aug 11 19:56:40 2001//TBUGZILLA-2_14_3
+/RelationSet.pm/1.5/Fri Jun  1 02:14:23 2001//TBUGZILLA-2_14_3
+/Token.pm/1.3/Fri Aug 17 08:38:54 2001//TBUGZILLA-2_14_3
+/UPGRADING/1.1/Fri Aug 10 22:35:21 2001//TBUGZILLA-2_14_3
+/UPGRADING-pre-2.8/1.1/Fri Aug 10 22:35:22 2001//TBUGZILLA-2_14_3
+/ant.jpg/1.2/Wed Aug 26 22:36:05 1998/-kb/TBUGZILLA-2_14_3
+/booleanchart.html/1.3/Wed Aug 16 23:07:37 2000//TBUGZILLA-2_14_3
+/bug_form.pl/1.70.2.4/Tue May 28 04:01:20 2002//TBUGZILLA-2_14_3
+/bug_status.html/1.11/Mon Aug 28 17:48:56 2000//TBUGZILLA-2_14_3
+/buglist.cgi/1.139.2.4/Sat Jun 29 01:59:21 2002//TBUGZILLA-2_14_3
+/bugwritinghelp.html/1.1/Tue Mar  7 17:59:38 2000//TBUGZILLA-2_14_3
+/bugzilla.dtd/1.2/Fri May 26 06:34:45 2000//TBUGZILLA-2_14_3
+/changepassword.cgi/1.19/Tue Jan 25 07:53:29 2000//TBUGZILLA-2_14_3
+/checksetup.pl/1.99.2.1/Mon May 13 15:05:41 2002//TBUGZILLA-2_14_3
+/colchange.cgi/1.17/Fri Jun  1 02:07:28 2001//TBUGZILLA-2_14_3
+/collectstats.pl/1.20/Wed Jun  6 21:17:40 2001//TBUGZILLA-2_14_3
+/confirmhelp.html/1.2/Mon Aug 28 17:48:58 2000//TBUGZILLA-2_14_3
+/createaccount.cgi/1.11/Wed Jul 11 05:29:18 2001//TBUGZILLA-2_14_3
+/createattachment.cgi/1.13/Tue Apr  3 20:42:58 2001//TBUGZILLA-2_14_3
+/defparams.pl/1.56.2.1/Sat May 25 20:43:49 2002//TBUGZILLA-2_14_3
+/describecomponents.cgi/1.6/Wed Jun  6 04:32:45 2001//TBUGZILLA-2_14_3
+/describekeywords.cgi/1.4/Sat Jan 22 16:51:49 2000//TBUGZILLA-2_14_3
+/doeditparams.cgi/1.15/Mon Aug 13 19:11:33 2001//TBUGZILLA-2_14_3
+/doeditvotes.cgi/1.12.2.1/Mon Nov 26 04:53:28 2001//TBUGZILLA-2_14_3
+/duplicates.cgi/1.13/Tue Aug 21 00:36:54 2001//TBUGZILLA-2_14_3
+/editcomponents.cgi/1.17/Sat Jun 16 14:51:15 2001//TBUGZILLA-2_14_3
+/editgroups.cgi/1.12/Wed Jun  6 03:16:49 2001//TBUGZILLA-2_14_3
+/editkeywords.cgi/1.7/Mon Feb 26 23:25:22 2001//TBUGZILLA-2_14_3
+/editmilestones.cgi/1.5/Sat Jun 16 14:51:16 2001//TBUGZILLA-2_14_3
+/editparams.cgi/1.12/Mon Aug 13 19:11:33 2001//TBUGZILLA-2_14_3
+/editproducts.cgi/1.18/Sat Jun 16 14:51:16 2001//TBUGZILLA-2_14_3
+/editusers.cgi/1.23.2.3/Wed May 29 18:13:34 2002//TBUGZILLA-2_14_3
+/editversions.cgi/1.8/Tue Jun 19 01:37:02 2001//TBUGZILLA-2_14_3
+/enter_bug.cgi/1.50/Sun Jul  1 02:00:56 2001//TBUGZILLA-2_14_3
+/globals.pl/1.110.2.8/Sat Jul 27 23:51:40 2002//TBUGZILLA-2_14_3
+/help.html/1.4/Fri Jan 21 22:01:11 2000//TBUGZILLA-2_14_3
+/helpemailquery.html/1.1/Tue Jan 19 00:07:45 1999//TBUGZILLA-2_14_3
+/how_to_mail.html/1.2/Mon Nov  1 23:33:16 1999//TBUGZILLA-2_14_3
+/importxml.pl/1.18.2.1/Sat May 25 20:43:51 2002//TBUGZILLA-2_14_3
+/index.html/1.12/Wed Feb 28 23:07:24 2001//TBUGZILLA-2_14_3
+/localconfig.js/1.1/Wed Feb 28 23:07:25 2001//TBUGZILLA-2_14_3
+/long_list.cgi/1.15.2.1/Sat Nov 17 08:34:46 2001//TBUGZILLA-2_14_3
+/move.pl/1.6.10.1/Sat May 25 20:43:51 2002//TBUGZILLA-2_14_3
+/new_comment.cgi/1.5/Thu Jul 27 20:10:16 2000//TBUGZILLA-2_14_3
+/notargetmilestone.html/1.2/Mon Aug 28 17:48:59 2000//TBUGZILLA-2_14_3
+/post_bug.cgi/1.34.2.1/Sat Nov 17 08:01:54 2001//TBUGZILLA-2_14_3
+/process_bug.cgi/1.96.2.2/Tue May 28 04:32:38 2002//TBUGZILLA-2_14_3
+/processmail/1.68/Mon Aug 13 17:06:38 2001//TBUGZILLA-2_14_3
+/query.cgi/1.85/Mon Aug 13 19:11:35 2001//TBUGZILLA-2_14_3
+/queryhelp.cgi/1.4.2.1/Sat May 11 10:01:29 2002//TBUGZILLA-2_14_3
+/quicksearch.html/1.1/Wed Feb 28 23:07:26 2001//TBUGZILLA-2_14_3
+/quicksearch.js/1.7/Fri Jul 20 08:25:30 2001//TBUGZILLA-2_14_3
+/quicksearchhack.html/1.2/Wed Feb 28 23:08:52 2001//TBUGZILLA-2_14_3
+/quips.cgi/1.1/Tue May 29 04:01:48 2001//TBUGZILLA-2_14_3
+/relogin.cgi/1.10/Tue Jan 18 14:41:00 2000//TBUGZILLA-2_14_3
+/reports.cgi/1.47/Sun Jul  1 19:09:29 2001//TBUGZILLA-2_14_3
+/robots.txt/1.1/Fri Jul 28 21:28:39 2000//TBUGZILLA-2_14_3
+/runtests.sh/1.4.6.1/Sat Nov 17 07:41:52 2001//TBUGZILLA-2_14_3
+/sanitycheck.cgi/1.33/Wed Jul 11 05:29:20 2001//TBUGZILLA-2_14_3
+/show_activity.cgi/1.6/Fri Jun  1 13:38:01 2001//TBUGZILLA-2_14_3
+/show_bug.cgi/1.15/Sat Jun  2 22:02:02 2001//TBUGZILLA-2_14_3
+/showattachment.cgi/1.7/Wed Jun  6 18:36:25 2001//TBUGZILLA-2_14_3
+/showdependencygraph.cgi/1.10/Thu May 31 15:52:24 2001//TBUGZILLA-2_14_3
+/showdependencytree.cgi/1.8/Thu May 31 15:52:24 2001//TBUGZILLA-2_14_3
+/showvotes.cgi/1.9/Thu May 31 15:52:25 2001//TBUGZILLA-2_14_3
+/syncshadowdb/1.12/Sun Jun 10 17:38:15 2001//TBUGZILLA-2_14_3
+/token.cgi/1.2/Fri Aug 17 12:42:34 2001//TBUGZILLA-2_14_3
+/userprefs.cgi/1.20.2.1/Sat Nov 17 08:24:08 2001//TBUGZILLA-2_14_3
+/votehelp.html/1.5/Thu Jan 25 04:56:14 2001//TBUGZILLA-2_14_3
+/whineatnews.pl/1.4/Mon Nov  1 23:33:22 1999//TBUGZILLA-2_14_3
+/xml.cgi/1.2/Mon Jun 12 06:52:41 2000//TBUGZILLA-2_14_3
 D/contrib////
 D/docs////
 D/t////
diff --git a/CVS/Tag b/CVS/Tag
index 3695fbab3..d67c6bdf9 100644
--- a/CVS/Tag
+++ b/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_14_2
+NBUGZILLA-2_14_3
diff --git a/buglist.cgi b/buglist.cgi
index d6e98fdd1..4e34ae511 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -1072,7 +1072,7 @@ if (defined $::FORM{'order'} && $::FORM{'order'} ne "") {
             # A custom list of columns.  Make sure each column is valid.
             foreach my $fragment (split(/,/, $::FORM{'order'})) {
                 my $ident_iregexp = "[a-z_][0-9a-z_]*";
-                if (trim($fragment) !~ /^${ident_iregexp}\.${ident_iregexp}(\s+(asc|desc))?$/i) {
+                if ($fragment !~ /^\s*${ident_iregexp}\.${ident_iregexp}(\s+(asc|desc))?\s*$/i) {
                     my $qfragment = html_quote($fragment);
                     my $error = "The custom sort order you specified in your "
                               . "form submission contains an invalid column "
@@ -1095,7 +1095,7 @@ if (defined $::FORM{'order'} && $::FORM{'order'} ne "") {
             last ORDER;
         };
         /Assign/ && do {
-            $::FORM{'order'} = "map_assigned_to.login_name, bugs.bug_status, priority, bugs.bug_id";
+            $::FORM{'order'} = "map_assigned_to.login_name, bugs.bug_status, bugs.priority, bugs.bug_id";
             last ORDER;
         };
         # DEFAULT
diff --git a/contrib/CVS/Entries b/contrib/CVS/Entries
index 3f1ac68e6..ff338d036 100644
--- a/contrib/CVS/Entries
+++ b/contrib/CVS/Entries
@@ -1,12 +1,12 @@
-/BugzillaEmail.pm/1.1/Wed Mar 15 22:29:44 2000//TBUGZILLA-2_14_2
-/README/1.4/Sun Apr 22 18:13:40 2001//TBUGZILLA-2_14_2
-/README.Mailif/1.3/Wed Mar 15 23:39:03 2000//TBUGZILLA-2_14_2
-/bug_email.pl/1.9/Fri May 25 12:48:47 2001//TBUGZILLA-2_14_2
-/bugmail_help.html/1.1/Tue Mar  7 17:36:48 2000//TBUGZILLA-2_14_2
-/bugzilla.procmailrc/1.1/Wed Mar 15 23:39:09 2000//TBUGZILLA-2_14_2
-/bugzilla_email_append.pl/1.2/Wed Mar 15 23:39:11 2000//TBUGZILLA-2_14_2
-/cvs-update.sh/1.1/Wed Apr 18 18:01:28 2001//TBUGZILLA-2_14_2
-/gnats2bz.pl/1.5/Thu Nov 18 17:29:58 1999//TBUGZILLA-2_14_2
-/mysqld-watcher.pl/1.2/Fri Jun  1 08:34:45 2001//TBUGZILLA-2_14_2
-/yp_nomail.sh/1.1/Tue Sep 12 23:50:31 2000//TBUGZILLA-2_14_2
+/BugzillaEmail.pm/1.1/Wed Mar 15 22:29:44 2000//TBUGZILLA-2_14_3
+/README/1.4/Sun Apr 22 18:13:40 2001//TBUGZILLA-2_14_3
+/README.Mailif/1.3/Wed Mar 15 23:39:03 2000//TBUGZILLA-2_14_3
+/bug_email.pl/1.9.10.1/Thu Jul 25 01:47:50 2002//TBUGZILLA-2_14_3
+/bugmail_help.html/1.1/Tue Mar  7 17:36:48 2000//TBUGZILLA-2_14_3
+/bugzilla.procmailrc/1.1/Wed Mar 15 23:39:09 2000//TBUGZILLA-2_14_3
+/bugzilla_email_append.pl/1.2.12.1/Thu Jul 25 01:47:50 2002//TBUGZILLA-2_14_3
+/cvs-update.sh/1.1/Wed Apr 18 18:01:28 2001//TBUGZILLA-2_14_3
+/gnats2bz.pl/1.5/Thu Nov 18 17:29:58 1999//TBUGZILLA-2_14_3
+/mysqld-watcher.pl/1.2/Fri Jun  1 08:34:45 2001//TBUGZILLA-2_14_3
+/yp_nomail.sh/1.1/Tue Sep 12 23:50:31 2000//TBUGZILLA-2_14_3
 D
diff --git a/contrib/CVS/Entries.Log b/contrib/CVS/Entries.Log
new file mode 100644
index 000000000..867bdc5c2
--- /dev/null
+++ b/contrib/CVS/Entries.Log
@@ -0,0 +1,2 @@
+A D/cmdline////
+R D/cmdline////
diff --git a/contrib/CVS/Tag b/contrib/CVS/Tag
index 3695fbab3..d67c6bdf9 100644
--- a/contrib/CVS/Tag
+++ b/contrib/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_14_2
+NBUGZILLA-2_14_3
diff --git a/contrib/bug_email.pl b/contrib/bug_email.pl
index da0f11308..27b6098d0 100755
--- a/contrib/bug_email.pl
+++ b/contrib/bug_email.pl
@@ -37,7 +37,7 @@
 #
 # You need to work with bug_email.pl the MIME::Parser installed.
 # 
-# $Id: bug_email.pl,v 1.9 2001/05/25 12:48:47 jake%acutex.net Exp $
+# $Id: bug_email.pl,v 1.9.10.1 2002/07/25 01:47:50 justdave%syndicomm.com Exp $
 ###############################################################
 
 # 02/12/2000 (SML)
@@ -70,7 +70,9 @@ use diagnostics;
 use strict;
 use MIME::Parser;
 
-push @INC, "../."; # this script now lives in contrib
+chdir '..';        # this script lives in contrib
+push @INC, "contrib/.";
+push @INC, ".";
 
 require "globals.pl";
 require "BugzillaEmail.pm";
@@ -736,10 +738,10 @@ my $parser = new MIME::Parser;
 
 # Create and set the output directory:
 # FIXME: There should be a $BUGZILLA_HOME variable (SML)
-(-d "../data/mimedump-tmp") or mkdir "../data/mimedump-tmp",0755 or die "mkdir: $!";
-(-w "../data/mimedump-tmp") or die "can't write to directory";
+(-d "data/mimedump-tmp") or mkdir "data/mimedump-tmp",0755 or die "mkdir: $!";
+(-w "data/mimedump-tmp") or die "can't write to directory";
 
-$parser->output_dir("../data/mimedump-tmp");
+$parser->output_dir("data/mimedump-tmp");
     
 # Read the MIME message:
 my $entity = $parser->read(\*STDIN) or die "couldn't parse MIME stream";
@@ -1230,11 +1232,17 @@ END
 	SendSQL("select LAST_INSERT_ID()");
 	$id = FetchOneColumn();
 
-	my $long_desc_query = "INSERT INTO longdescs SET bug_id=$id, who=$userid, bug_when=\'$bug_when\', thetext=" . SqlQuote($comment);
-	SendSQL($long_desc_query);
-
-	# Cool, the mail was successfull
-	system("cd .. ; ./processmail $id '$Sender'");
+        my $long_desc_query = "INSERT INTO longdescs SET bug_id=$id, who=$userid, bug_when=\'$bug_when\', thetext=" . SqlQuote($comment);
+        SendSQL($long_desc_query);
+
+        # Cool, the mail was successful
+        # chdir back to the main directory which has the processmail script
+        # Oh, for a processmail module....
+        use Cwd;
+        my $old_cwd = getcwd();
+        chdir("..");
+        system("./processmail", $id, $SenderShort);
+        chdir($old_cwd);
     } else {
 	$id = 0xFFFF;  # TEST !
 	print "\n-------------------------------------------------------------------------\n";
diff --git a/contrib/bugzilla_email_append.pl b/contrib/bugzilla_email_append.pl
index b10d8e030..826b49198 100755
--- a/contrib/bugzilla_email_append.pl
+++ b/contrib/bugzilla_email_append.pl
@@ -32,7 +32,9 @@ use diagnostics;
 use strict;
 use MIME::Parser;
 
-push @INC, "../."; # this script lives in contrib
+chdir "..";        # this script lives in contrib, change to main
+push @INC, "contrib";
+push @INC, "."; # this script lives in contrib
 require "globals.pl";
 require "BugzillaEmail.pm";
 
@@ -43,10 +45,10 @@ my $Comment = "";
 
 # Create and set the output directory:
 # FIXME: There should be a $BUGZILLA_HOME variable (SML)
-(-d "../data/mimedump-tmp") or mkdir "../data/mimedump-tmp",0755 or die "mkdir: $!";
-(-w "../data/mimedump-tmp") or die "can't write to directory";
+(-d "data/mimedump-tmp") or mkdir "data/mimedump-tmp",0755 or die "mkdir: $!";
+(-w "data/mimedump-tmp") or die "can't write to directory";
 
-$parser->output_dir("../data/mimedump-tmp");
+$parser->output_dir("data/mimedump-tmp");
     
 # Read the MIME message:
 my $entity = $parser->read(\*STDIN) or die "couldn't parse MIME stream";
@@ -120,6 +122,7 @@ system("cd .. ; ./processmail $found_id '$SenderShort'");
 sub DealWithError {
   my ($reason) = @_;
   print $reason . "\n";
+  exit 100;
 }
 
 # Yanking this wholesale from bug_email, 'cause I know this works.  I'll
diff --git a/docs/CVS/Entries b/docs/CVS/Entries
index 5e60886a3..0c2d0a605 100644
--- a/docs/CVS/Entries
+++ b/docs/CVS/Entries
@@ -1,5 +1,5 @@
-/README.docs/1.3/Wed Aug 22 03:44:14 2001//TBUGZILLA-2_14_2
-/rel_notes.txt/1.5.10.6/Fri Jun  7 23:45:33 2002//TBUGZILLA-2_14_2
+/README.docs/1.3/Wed Aug 22 03:44:14 2001//TBUGZILLA-2_14_3
+/rel_notes.txt/1.5.10.7/Sat Jul 27 23:50:45 2002//TBUGZILLA-2_14_3
 D/html////
 D/images////
 D/sgml////
diff --git a/docs/CVS/Tag b/docs/CVS/Tag
index 3695fbab3..d67c6bdf9 100644
--- a/docs/CVS/Tag
+++ b/docs/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_14_2
+NBUGZILLA-2_14_3
diff --git a/docs/html/CVS/Entries b/docs/html/CVS/Entries
index dd87c980c..e3983ca27 100644
--- a/docs/html/CVS/Entries
+++ b/docs/html/CVS/Entries
@@ -1,70 +1,70 @@
-/Bugzilla-Guide.html/1.9/Wed Aug 29 18:13:38 2001//TBUGZILLA-2_14_2
-/about.html/1.4/Fri Aug 10 22:26:40 2001//TBUGZILLA-2_14_2
-/aboutthisguide.html/1.6/Wed Aug 29 17:25:25 2001//TBUGZILLA-2_14_2
-/administration.html/1.5/Wed Aug 22 03:44:17 2001//TBUGZILLA-2_14_2
-/bonsai.html/1.5/Wed Aug 22 03:44:17 2001//TBUGZILLA-2_14_2
-/bsdinstall.html/1.1/Fri Aug 10 22:26:42 2001//TBUGZILLA-2_14_2
-/bzhacking.html/1.1/Wed Aug 29 17:25:25 2001//TBUGZILLA-2_14_2
-/cmdline.html/1.5/Wed Aug 22 03:44:18 2001//TBUGZILLA-2_14_2
-/contributors.html/1.5/Wed Aug 29 17:25:25 2001//TBUGZILLA-2_14_2
-/conventions.html/1.5/Wed Aug 22 03:44:18 2001//TBUGZILLA-2_14_2
-/copyright.html/1.6/Wed Aug 29 17:25:26 2001//TBUGZILLA-2_14_2
-/credits.html/1.5/Wed Aug 29 17:25:26 2001//TBUGZILLA-2_14_2
-/cvs.html/1.6/Wed Aug 29 17:25:26 2001//TBUGZILLA-2_14_2
-/database.html/1.4/Fri Aug 10 22:26:44 2001//TBUGZILLA-2_14_2
-/dbdoc.html/1.6/Wed Aug 29 17:25:26 2001//TBUGZILLA-2_14_2
-/dbschema.html/1.5/Wed Aug 29 17:25:26 2001//TBUGZILLA-2_14_2
-/disclaimer.html/1.4/Fri Aug 10 22:26:46 2001//TBUGZILLA-2_14_2
-/downloadlinks.html/1.3/Fri Aug 10 22:26:46 2001//TBUGZILLA-2_14_2
-/errata.html/1.1/Fri Aug 10 22:26:47 2001//TBUGZILLA-2_14_2
-/faq.html/1.7/Wed Aug 29 17:25:27 2001//TBUGZILLA-2_14_2
-/feedback.html/1.4/Fri Aug 10 22:26:48 2001//TBUGZILLA-2_14_2
-/future.html/1.6/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_2
-/geninstall.html/1.3/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_2
-/gfdl.html/1.7/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_2
-/gfdl_0.html/1.4/Fri Aug 10 22:26:49 2001//TBUGZILLA-2_14_2
-/gfdl_1.html/1.4/Fri Aug 10 22:26:49 2001//TBUGZILLA-2_14_2
-/gfdl_10.html/1.4/Fri Aug 10 22:26:50 2001//TBUGZILLA-2_14_2
-/gfdl_2.html/1.4/Fri Aug 10 22:26:50 2001//TBUGZILLA-2_14_2
-/gfdl_3.html/1.4/Fri Aug 10 22:26:51 2001//TBUGZILLA-2_14_2
-/gfdl_4.html/1.4/Fri Aug 10 22:26:51 2001//TBUGZILLA-2_14_2
-/gfdl_5.html/1.4/Fri Aug 10 22:26:52 2001//TBUGZILLA-2_14_2
-/gfdl_6.html/1.4/Fri Aug 10 22:26:52 2001//TBUGZILLA-2_14_2
-/gfdl_7.html/1.4/Fri Aug 10 22:26:52 2001//TBUGZILLA-2_14_2
-/gfdl_8.html/1.4/Fri Aug 10 22:26:53 2001//TBUGZILLA-2_14_2
-/gfdl_9.html/1.4/Fri Aug 10 22:26:53 2001//TBUGZILLA-2_14_2
-/gfdl_howto.html/1.7/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_2
-/glossary.html/1.7/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_2
-/granttables.html/1.6/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_2
-/how.html/1.7/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_2
-/index.html/1.7/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_2
-/init4me.html/1.5/Wed Aug 22 03:44:20 2001//TBUGZILLA-2_14_2
-/installation.html/1.7/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_2
-/integration.html/1.5/Wed Aug 22 03:44:20 2001//TBUGZILLA-2_14_2
-/newversions.html/1.5/Wed Aug 22 03:44:20 2001//TBUGZILLA-2_14_2
-/osx.html/1.1/Fri Aug 10 22:26:58 2001//TBUGZILLA-2_14_2
-/patches.html/1.6/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_2
-/postinstall-check.html/1.5/Wed Aug 22 03:44:21 2001//TBUGZILLA-2_14_2
-/programadmin.html/1.7/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_2
-/quicksearch.html/1.6/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_2
-/rewrite.html/1.1/Wed Aug 22 03:44:21 2001//TBUGZILLA-2_14_2
-/rhbugzilla.html/1.5/Wed Aug 22 03:44:22 2001//TBUGZILLA-2_14_2
-/scm.html/1.5/Wed Aug 22 03:44:22 2001//TBUGZILLA-2_14_2
-/security.html/1.6/Fri Aug 10 22:27:01 2001//TBUGZILLA-2_14_2
-/setperl.html/1.7/Wed Aug 29 17:25:30 2001//TBUGZILLA-2_14_2
-/stepbystep.html/1.4/Wed Aug 29 18:13:39 2001//TBUGZILLA-2_14_2
-/tinderbox.html/1.5/Wed Aug 22 03:44:23 2001//TBUGZILLA-2_14_2
-/translations.html/1.4/Fri Aug 10 22:27:03 2001//TBUGZILLA-2_14_2
-/useradmin.html/1.5/Wed Aug 22 03:44:23 2001//TBUGZILLA-2_14_2
-/using.html/1.5/Wed Aug 22 03:44:23 2001//TBUGZILLA-2_14_2
-/usingbz-conc.html/1.5/Wed Aug 22 03:44:23 2001//TBUGZILLA-2_14_2
-/variant_fenris.html/1.1/Wed Aug 22 03:44:23 2001//TBUGZILLA-2_14_2
-/variant_issuezilla.html/1.1/Wed Aug 22 03:44:24 2001//TBUGZILLA-2_14_2
-/variant_perforce.html/1.1/Wed Aug 22 03:44:24 2001//TBUGZILLA-2_14_2
-/variant_scarab.html/1.1/Wed Aug 22 03:44:24 2001//TBUGZILLA-2_14_2
-/variant_sourceforge.html/1.2/Wed Aug 29 17:25:30 2001//TBUGZILLA-2_14_2
-/variants.html/1.5/Wed Aug 29 17:25:30 2001//TBUGZILLA-2_14_2
-/whatis.html/1.5/Wed Aug 22 03:44:25 2001//TBUGZILLA-2_14_2
-/why.html/1.5/Wed Aug 22 03:44:26 2001//TBUGZILLA-2_14_2
-/win32.html/1.3/Wed Aug 29 17:25:30 2001//TBUGZILLA-2_14_2
+/Bugzilla-Guide.html/1.9/Wed Aug 29 18:13:38 2001//TBUGZILLA-2_14_3
+/about.html/1.4/Fri Aug 10 22:26:40 2001//TBUGZILLA-2_14_3
+/aboutthisguide.html/1.6/Wed Aug 29 17:25:25 2001//TBUGZILLA-2_14_3
+/administration.html/1.5/Wed Aug 22 03:44:17 2001//TBUGZILLA-2_14_3
+/bonsai.html/1.5/Wed Aug 22 03:44:17 2001//TBUGZILLA-2_14_3
+/bsdinstall.html/1.1/Fri Aug 10 22:26:42 2001//TBUGZILLA-2_14_3
+/bzhacking.html/1.1/Wed Aug 29 17:25:25 2001//TBUGZILLA-2_14_3
+/cmdline.html/1.5/Wed Aug 22 03:44:18 2001//TBUGZILLA-2_14_3
+/contributors.html/1.5/Wed Aug 29 17:25:25 2001//TBUGZILLA-2_14_3
+/conventions.html/1.5/Wed Aug 22 03:44:18 2001//TBUGZILLA-2_14_3
+/copyright.html/1.6/Wed Aug 29 17:25:26 2001//TBUGZILLA-2_14_3
+/credits.html/1.5/Wed Aug 29 17:25:26 2001//TBUGZILLA-2_14_3
+/cvs.html/1.6/Wed Aug 29 17:25:26 2001//TBUGZILLA-2_14_3
+/database.html/1.4/Fri Aug 10 22:26:44 2001//TBUGZILLA-2_14_3
+/dbdoc.html/1.6/Wed Aug 29 17:25:26 2001//TBUGZILLA-2_14_3
+/dbschema.html/1.5/Wed Aug 29 17:25:26 2001//TBUGZILLA-2_14_3
+/disclaimer.html/1.4/Fri Aug 10 22:26:46 2001//TBUGZILLA-2_14_3
+/downloadlinks.html/1.3/Fri Aug 10 22:26:46 2001//TBUGZILLA-2_14_3
+/errata.html/1.1/Fri Aug 10 22:26:47 2001//TBUGZILLA-2_14_3
+/faq.html/1.7/Wed Aug 29 17:25:27 2001//TBUGZILLA-2_14_3
+/feedback.html/1.4/Fri Aug 10 22:26:48 2001//TBUGZILLA-2_14_3
+/future.html/1.6/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_3
+/geninstall.html/1.3/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_3
+/gfdl.html/1.7/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_3
+/gfdl_0.html/1.4/Fri Aug 10 22:26:49 2001//TBUGZILLA-2_14_3
+/gfdl_1.html/1.4/Fri Aug 10 22:26:49 2001//TBUGZILLA-2_14_3
+/gfdl_10.html/1.4/Fri Aug 10 22:26:50 2001//TBUGZILLA-2_14_3
+/gfdl_2.html/1.4/Fri Aug 10 22:26:50 2001//TBUGZILLA-2_14_3
+/gfdl_3.html/1.4/Fri Aug 10 22:26:51 2001//TBUGZILLA-2_14_3
+/gfdl_4.html/1.4/Fri Aug 10 22:26:51 2001//TBUGZILLA-2_14_3
+/gfdl_5.html/1.4/Fri Aug 10 22:26:52 2001//TBUGZILLA-2_14_3
+/gfdl_6.html/1.4/Fri Aug 10 22:26:52 2001//TBUGZILLA-2_14_3
+/gfdl_7.html/1.4/Fri Aug 10 22:26:52 2001//TBUGZILLA-2_14_3
+/gfdl_8.html/1.4/Fri Aug 10 22:26:53 2001//TBUGZILLA-2_14_3
+/gfdl_9.html/1.4/Fri Aug 10 22:26:53 2001//TBUGZILLA-2_14_3
+/gfdl_howto.html/1.7/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_3
+/glossary.html/1.7/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_3
+/granttables.html/1.6/Wed Aug 29 17:25:28 2001//TBUGZILLA-2_14_3
+/how.html/1.7/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_3
+/index.html/1.7/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_3
+/init4me.html/1.5/Wed Aug 22 03:44:20 2001//TBUGZILLA-2_14_3
+/installation.html/1.7/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_3
+/integration.html/1.5/Wed Aug 22 03:44:20 2001//TBUGZILLA-2_14_3
+/newversions.html/1.5/Wed Aug 22 03:44:20 2001//TBUGZILLA-2_14_3
+/osx.html/1.1/Fri Aug 10 22:26:58 2001//TBUGZILLA-2_14_3
+/patches.html/1.6/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_3
+/postinstall-check.html/1.5/Wed Aug 22 03:44:21 2001//TBUGZILLA-2_14_3
+/programadmin.html/1.7/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_3
+/quicksearch.html/1.6/Wed Aug 29 17:25:29 2001//TBUGZILLA-2_14_3
+/rewrite.html/1.1/Wed Aug 22 03:44:21 2001//TBUGZILLA-2_14_3
+/rhbugzilla.html/1.5/Wed Aug 22 03:44:22 2001//TBUGZILLA-2_14_3
+/scm.html/1.5/Wed Aug 22 03:44:22 2001//TBUGZILLA-2_14_3
+/security.html/1.6/Fri Aug 10 22:27:01 2001//TBUGZILLA-2_14_3
+/setperl.html/1.7/Wed Aug 29 17:25:30 2001//TBUGZILLA-2_14_3
+/stepbystep.html/1.4/Wed Aug 29 18:13:39 2001//TBUGZILLA-2_14_3
+/tinderbox.html/1.5/Wed Aug 22 03:44:23 2001//TBUGZILLA-2_14_3
+/translations.html/1.4/Fri Aug 10 22:27:03 2001//TBUGZILLA-2_14_3
+/useradmin.html/1.5/Wed Aug 22 03:44:23 2001//TBUGZILLA-2_14_3
+/using.html/1.5/Wed Aug 22 03:44:23 2001//TBUGZILLA-2_14_3
+/usingbz-conc.html/1.5/Wed Aug 22 03:44:23 2001//TBUGZILLA-2_14_3
+/variant_fenris.html/1.1/Wed Aug 22 03:44:23 2001//TBUGZILLA-2_14_3
+/variant_issuezilla.html/1.1/Wed Aug 22 03:44:24 2001//TBUGZILLA-2_14_3
+/variant_perforce.html/1.1/Wed Aug 22 03:44:24 2001//TBUGZILLA-2_14_3
+/variant_scarab.html/1.1/Wed Aug 22 03:44:24 2001//TBUGZILLA-2_14_3
+/variant_sourceforge.html/1.2/Wed Aug 29 17:25:30 2001//TBUGZILLA-2_14_3
+/variants.html/1.5/Wed Aug 29 17:25:30 2001//TBUGZILLA-2_14_3
+/whatis.html/1.5/Wed Aug 22 03:44:25 2001//TBUGZILLA-2_14_3
+/why.html/1.5/Wed Aug 22 03:44:26 2001//TBUGZILLA-2_14_3
+/win32.html/1.3/Wed Aug 29 17:25:30 2001//TBUGZILLA-2_14_3
 D
diff --git a/docs/html/CVS/Tag b/docs/html/CVS/Tag
index 3695fbab3..d67c6bdf9 100644
--- a/docs/html/CVS/Tag
+++ b/docs/html/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_14_2
+NBUGZILLA-2_14_3
diff --git a/docs/images/CVS/Entries b/docs/images/CVS/Entries
index 48e51e60b..181cf7da1 100644
--- a/docs/images/CVS/Entries
+++ b/docs/images/CVS/Entries
@@ -1,7 +1,7 @@
-/caution.gif/1.1/Thu Aug 23 14:30:18 2001/-kb/TBUGZILLA-2_14_2
-/dbschema.jpg/1.1/Wed Aug 29 17:25:34 2001/-kb/TBUGZILLA-2_14_2
-/dbschema.ps/1.1/Wed Aug 29 17:25:34 2001/-kb/TBUGZILLA-2_14_2
-/note.gif/1.1/Thu Aug 23 14:30:18 2001/-kb/TBUGZILLA-2_14_2
-/tip.gif/1.1/Thu Aug 23 14:30:19 2001/-kb/TBUGZILLA-2_14_2
-/warning.gif/1.1/Thu Aug 23 14:30:20 2001/-kb/TBUGZILLA-2_14_2
+/caution.gif/1.1/Thu Aug 23 14:30:18 2001/-kb/TBUGZILLA-2_14_3
+/dbschema.jpg/1.1/Wed Aug 29 17:25:34 2001/-kb/TBUGZILLA-2_14_3
+/dbschema.ps/1.1/Wed Aug 29 17:25:34 2001/-kb/TBUGZILLA-2_14_3
+/note.gif/1.1/Thu Aug 23 14:30:18 2001/-kb/TBUGZILLA-2_14_3
+/tip.gif/1.1/Thu Aug 23 14:30:19 2001/-kb/TBUGZILLA-2_14_3
+/warning.gif/1.1/Thu Aug 23 14:30:20 2001/-kb/TBUGZILLA-2_14_3
 D
diff --git a/docs/images/CVS/Tag b/docs/images/CVS/Tag
index 3695fbab3..d67c6bdf9 100644
--- a/docs/images/CVS/Tag
+++ b/docs/images/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_14_2
+NBUGZILLA-2_14_3
diff --git a/docs/rel_notes.txt b/docs/rel_notes.txt
index baac142c4..5ea59dbac 100644
--- a/docs/rel_notes.txt
+++ b/docs/rel_notes.txt
@@ -1,14 +1,19 @@
-The 2.14.2 release fixes several security issues that became known
-to us after the Bugzilla 2.14.1 release.  Please see the upgrade
-procedure below for details on how to upgrade to 2.14.2.
-
-Please note that the upcoming release of 2.16 will incorporate
-various rearchitectures that will make failure-to-validate
-and failure-to-filter errors harder to insert and easier to
-spot.  In particular this means there may be holes in the 2.14
-line that have not been discovered, yet are fixed in 2.16.  If
-such holes exist they probably won't be fixed in 2.14 point
-releases, unless they are discovered.
+The 2.14.3 release fixes a regression in the ability to sort
+buglists on more than one field, which was caused by the 2.14.2
+security update.  Also fixed in this release is a possible
+misuse of a system() call in contrib/bug_email.pl (which is
+not supported at this time, but we felt it would be useful to
+fix as long as we knew about it).  Please see the upgrade
+procedure below for details on how to upgrade to 2.14.3.
+
+Regarding security issues, please note that the release of 2.16
+(simultaneous with 2.14.3) incorporates various rearchitectures
+that make failure-to-validate and failure-to-filter errors
+harder to insert and easier to spot.  In particular this means
+there may be holes in the 2.14 line that have not been
+discovered, yet are fixed in 2.16.  If such holes exist they
+probably won't be fixed in 2.14 point releases, unless they are
+discovered.
 
 There may be future point releases of 2.14, even after the
 release of 2.16, however support for 2.14 will likely be
@@ -124,6 +129,24 @@ fix the problem on your installation.
   option "The bug is resolved or verified" to achieve part of this.
   (bug 130821)
 
+
+
+***********************************************
+*** USERS UPGRADING FROM 2.14.2 OR EARLIER  ***
+***********************************************
+
+- The fix for bug 130821 in 2.14.2 broke being able to sort
+  bug lists on more than one field.  buglist.cgi now allows
+  you to sort on more than one field again.
+  (bug 152138)
+
+- Basic maintenance on contrib/bug_email.pl and
+  contrib/bugzilla_email_append.pl which also fixes a
+  possible security hole with a misuse of a system() call.
+  These files are not supported at this time, but as long
+  as we knew about the problem, we couldn't overlook it.
+  (bug 154008)
+
 ***********************************************
 *** USERS UPGRADING FROM 2.14.1 OR EARLIER  ***
 ***********************************************
diff --git a/docs/sgml/CVS/Entries b/docs/sgml/CVS/Entries
index 187965d15..1252f8fe7 100644
--- a/docs/sgml/CVS/Entries
+++ b/docs/sgml/CVS/Entries
@@ -1,18 +1,18 @@
-/Bugzilla-Guide.sgml/1.6/Wed Aug 29 17:25:36 2001//TBUGZILLA-2_14_2
-/about.sgml/1.5/Wed Aug 29 17:25:36 2001//TBUGZILLA-2_14_2
-/administration.sgml/1.7/Wed Aug 29 17:25:36 2001//TBUGZILLA-2_14_2
-/conventions.sgml/1.2/Fri Aug 10 22:13:50 2001//TBUGZILLA-2_14_2
-/database.sgml/1.4/Wed Aug 29 17:25:36 2001//TBUGZILLA-2_14_2
-/dbschema.mysql/1.1/Fri Aug 10 22:13:50 2001//TBUGZILLA-2_14_2
-/faq.sgml/1.6/Wed Aug 29 17:25:38 2001//TBUGZILLA-2_14_2
-/future.sgml/1.5/Wed Aug 29 17:25:38 2001//TBUGZILLA-2_14_2
-/gfdl.sgml/1.2/Fri Aug 10 22:13:52 2001//TBUGZILLA-2_14_2
-/glossary.sgml/1.3/Wed Aug 22 03:44:31 2001//TBUGZILLA-2_14_2
-/index.sgml/1.2/Fri Aug 10 22:13:53 2001//TBUGZILLA-2_14_2
-/installation.sgml/1.7/Wed Aug 29 18:13:41 2001//TBUGZILLA-2_14_2
-/integration.sgml/1.5/Wed Aug 29 17:25:38 2001//TBUGZILLA-2_14_2
-/patches.sgml/1.5/Wed Aug 29 17:25:39 2001//TBUGZILLA-2_14_2
-/requiredsoftware.sgml/1.2/Fri Aug 10 22:13:54 2001//TBUGZILLA-2_14_2
-/using.sgml/1.5/Wed Aug 29 17:25:39 2001//TBUGZILLA-2_14_2
-/variants.sgml/1.4/Wed Aug 22 03:44:32 2001//TBUGZILLA-2_14_2
+/Bugzilla-Guide.sgml/1.6/Wed Aug 29 17:25:36 2001//TBUGZILLA-2_14_3
+/about.sgml/1.5/Wed Aug 29 17:25:36 2001//TBUGZILLA-2_14_3
+/administration.sgml/1.7/Wed Aug 29 17:25:36 2001//TBUGZILLA-2_14_3
+/conventions.sgml/1.2/Fri Aug 10 22:13:50 2001//TBUGZILLA-2_14_3
+/database.sgml/1.4/Wed Aug 29 17:25:36 2001//TBUGZILLA-2_14_3
+/dbschema.mysql/1.1/Fri Aug 10 22:13:50 2001//TBUGZILLA-2_14_3
+/faq.sgml/1.6/Wed Aug 29 17:25:38 2001//TBUGZILLA-2_14_3
+/future.sgml/1.5/Wed Aug 29 17:25:38 2001//TBUGZILLA-2_14_3
+/gfdl.sgml/1.2/Fri Aug 10 22:13:52 2001//TBUGZILLA-2_14_3
+/glossary.sgml/1.3/Wed Aug 22 03:44:31 2001//TBUGZILLA-2_14_3
+/index.sgml/1.2/Fri Aug 10 22:13:53 2001//TBUGZILLA-2_14_3
+/installation.sgml/1.7/Wed Aug 29 18:13:41 2001//TBUGZILLA-2_14_3
+/integration.sgml/1.5/Wed Aug 29 17:25:38 2001//TBUGZILLA-2_14_3
+/patches.sgml/1.5/Wed Aug 29 17:25:39 2001//TBUGZILLA-2_14_3
+/requiredsoftware.sgml/1.2/Fri Aug 10 22:13:54 2001//TBUGZILLA-2_14_3
+/using.sgml/1.5/Wed Aug 29 17:25:39 2001//TBUGZILLA-2_14_3
+/variants.sgml/1.4/Wed Aug 22 03:44:32 2001//TBUGZILLA-2_14_3
 D
diff --git a/docs/sgml/CVS/Tag b/docs/sgml/CVS/Tag
index 3695fbab3..d67c6bdf9 100644
--- a/docs/sgml/CVS/Tag
+++ b/docs/sgml/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_14_2
+NBUGZILLA-2_14_3
diff --git a/docs/txt/CVS/Entries b/docs/txt/CVS/Entries
index 4e5e42e7c..87161286b 100644
--- a/docs/txt/CVS/Entries
+++ b/docs/txt/CVS/Entries
@@ -1,2 +1,2 @@
-/Bugzilla-Guide.txt/1.8/Wed Aug 29 18:13:42 2001//TBUGZILLA-2_14_2
+/Bugzilla-Guide.txt/1.8/Wed Aug 29 18:13:42 2001//TBUGZILLA-2_14_3
 D
diff --git a/docs/txt/CVS/Tag b/docs/txt/CVS/Tag
index 3695fbab3..d67c6bdf9 100644
--- a/docs/txt/CVS/Tag
+++ b/docs/txt/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_14_2
+NBUGZILLA-2_14_3
diff --git a/globals.pl b/globals.pl
index 87d07d14c..b8b064cc6 100644
--- a/globals.pl
+++ b/globals.pl
@@ -76,7 +76,7 @@ use RelationSet;
 delete $ENV{PATH};
 
 # Contains the version string for the current running Bugzilla.
-$::param{'version'} = '2.14.2';
+$::param{'version'} = '2.14.3';
 
 $::dontchange = "--do_not_change--";
 $::chooseone = "--Choose_one:--";
diff --git a/t/CVS/Entries b/t/CVS/Entries
index e947fbf19..7a732a89d 100644
--- a/t/CVS/Entries
+++ b/t/CVS/Entries
@@ -1,3 +1,3 @@
-/001compile.t/1.6.6.1/Sat Nov 17 07:41:55 2001//TBUGZILLA-2_14_2
-/003safesys.t/1.3.6.1/Sat Nov 17 07:41:57 2001//TBUGZILLA-2_14_2
+/001compile.t/1.6.6.1/Sat Nov 17 07:41:55 2001//TBUGZILLA-2_14_3
+/003safesys.t/1.3.6.1/Sat Nov 17 07:41:57 2001//TBUGZILLA-2_14_3
 D/Support////
diff --git a/t/CVS/Tag b/t/CVS/Tag
index 3695fbab3..d67c6bdf9 100644
--- a/t/CVS/Tag
+++ b/t/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_14_2
+NBUGZILLA-2_14_3
diff --git a/t/Support/CVS/Entries b/t/Support/CVS/Entries
index 1f6019bb2..ad03b3e0a 100644
--- a/t/Support/CVS/Entries
+++ b/t/Support/CVS/Entries
@@ -1,3 +1,3 @@
-/Files.pm/1.9.4.1/Sat Nov 17 07:41:59 2001//TBUGZILLA-2_14_2
-/Systemexec.pm/1.2.8.1/Sat Nov 17 07:41:59 2001//TBUGZILLA-2_14_2
+/Files.pm/1.9.4.1/Sat Nov 17 07:41:59 2001//TBUGZILLA-2_14_3
+/Systemexec.pm/1.2.8.1/Sat Nov 17 07:41:59 2001//TBUGZILLA-2_14_3
 D
diff --git a/t/Support/CVS/Tag b/t/Support/CVS/Tag
index 3695fbab3..d67c6bdf9 100644
--- a/t/Support/CVS/Tag
+++ b/t/Support/CVS/Tag
@@ -1 +1 @@
-NBUGZILLA-2_14_2
+NBUGZILLA-2_14_3
-- 
GitLab