diff --git a/webtools/bugzilla/checksetup.pl b/webtools/bugzilla/checksetup.pl index 68dd308e6b2..6b9b1042cfa 100755 --- a/webtools/bugzilla/checksetup.pl +++ b/webtools/bugzilla/checksetup.pl @@ -151,6 +151,12 @@ if ($ARGV[0] && ($ARGV[0] !~ /^--/)) { # print "\nChecking perl modules ...\n" unless $silent; +if ($^O =~ /MSWin32/i) { + unless ($] >= 5.008001) { + die "Sorry, you need at least ActiveState Perl build 5.8.1\n"; + # for CGI 2.93 or higher + } +} unless ($] >= 5.006) { die "Sorry, you need at least Perl 5.6\n"; } @@ -315,26 +321,11 @@ my $patchreader = have_vers("PatchReader","0.9.4"); print "\n" unless $silent; if ($^O =~ /MSWin32/i && !$silent) { - if ($^V lt pack('U*',5,8,0)) { - # If something older than 5.8 is detected, then point to the oi - # repository using ppm version 2 commands (which is the default - # for Perl 5.6) - - print "The required ActivePerl modules are available at OpenInteract's ppm repository.\n"; - print "You can add the repository with the following command:\n"; - print " ppm set rep oi http://openinteract.sourceforge.net/ppmpackages/\n"; - print "You can then save the changes by typing:\n"; - print " ppm set save\n\n"; - } else { - # For Perl 5.8 or higher, point the user to a 5.8 repository, - # using ppm version 3 commands (which is the default for Perl 5.8) - - print "Most ActivePerl modules are available at Apache's ppm repository.\n"; - print "A list of mirrors is available at\n"; - print " http://www.apache.org/dyn/closer.cgi/perl/win32-bin/ppms/\n"; - print "You can add the repository with the following command:\n"; - print " ppm rep add apache http://www.apache.org/dist/perl/win32-bin/ppms/\n\n"; - } + print "Most ActivePerl modules are available at Apache's ppm repository.\n"; + print "A list of mirrors is available at\n"; + print " http://www.apache.org/dyn/closer.cgi/perl/win32-bin/ppms/\n"; + print "You can add the repository with the following command:\n"; + print " ppm rep add apache http://www.apache.org/dist/perl/win32-bin/ppms/\n\n"; } if ((!$gd || !$chartbase) && !$silent) { diff --git a/webtools/bugzilla/docs/rel_notes.txt b/webtools/bugzilla/docs/rel_notes.txt index 055c4866a90..3c53d609d68 100644 --- a/webtools/bugzilla/docs/rel_notes.txt +++ b/webtools/bugzilla/docs/rel_notes.txt @@ -24,7 +24,8 @@ Dependency Requirements Minimum software requirements: MySQL v3.23.41 (changed from 2.16) - Perl v5.6.0 (changed from 2.16) + Perl v5.6.0 (changed from 2.16) (Non-Windows platforms) + ActiveState Perl v5.8.1 (Windows only) Required Perl modules: diff --git a/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml b/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml index af7553e7fe1..9b848e9be63 100644 --- a/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml +++ b/webtools/bugzilla/docs/xml/Bugzilla-Guide.xml @@ -44,6 +44,7 @@ + diff --git a/webtools/bugzilla/docs/xml/administration.xml b/webtools/bugzilla/docs/xml/administration.xml index 56de1e9bf7a..12c72dd847e 100644 --- a/webtools/bugzilla/docs/xml/administration.xml +++ b/webtools/bugzilla/docs/xml/administration.xml @@ -951,7 +951,7 @@ Support: ENTRY, DEFAULT/MANDATORY, CANEDIT Revisions are normally released to fix security vulnerabilities and are distinguished by an increase in the third number. For example, - when 2.16.2 was released, it was a revision to 2.16.1. + when 2.16.6 was released, it was a revision to 2.16.5. Point releases are normally released when the Bugzilla team feels @@ -960,12 +960,12 @@ Support: ENTRY, DEFAULT/MANDATORY, CANEDIT stabilization period and release candidates, however the use of development versions or release candidates is beyond the scope of this document. Point releases can be distinguished by an increase in the - second number, or minor version. For example, 2.16.2 is a newer point - release than 2.14.5. + second number, or minor version. For example, 2.18.0 is a newer point + release than 2.16.5. The examples in this section are written as if you were updating - to version 2.16.2. The procedures are the same regardless if you are + to version 2.18.1. The procedures are the same regardless if you are updating to a new point release or a new revision. However, the chance of running into trouble increases when upgrading to a new point release, escpecially if you've made local changes. @@ -997,7 +997,7 @@ bash$ cd /var/www/html/bugzilla bash$ cvs login Logging in to :pserver:anonymous@cvs-mirror.mozilla.org:2401/cvsroot CVS password: anonymous -bash$ cvs -q update -r BUGZILLA-2_16_2 -dP +bash$ cvs -q update -r BUGZILLA-2_18_1 -dP P checksetup.pl P collectstats.pl P globals.pl @@ -1033,19 +1033,19 @@ P template/en/default/list/quips.html.tmpl bash$ cd /var/www/html -bash$ wget ftp://ftp.mozilla.org/pub/webtools/bugzilla-2.16.2.tar.gz +bash$ wget ftp://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-2.18.1.tar.gz Output omitted -bash$ tar xzvf bugzilla-2.16.2.tar.gz -bugzilla-2.16.2/ -bugzilla-2.16.2/.cvsignore -bugzilla-2.16.2/1x1.gif +bash$ tar xzvf bugzilla-2.18.1.tar.gz +bugzilla-2.18.1/ +bugzilla-2.18.1/.cvsignore +bugzilla-2.18.1/1x1.gif Output truncated -bash$ cd bugzilla-2.16.2 +bash$ cd bugzilla-2.18.1 bash$ cp ../bugzilla/localconfig* . bash$ cp -r ../bugzilla/data . bash$ cd .. bash$ mv bugzilla bugzilla.old -bash$ mv bugzilla-2.16.2 bugzilla +bash$ mv bugzilla-2.18.1 bugzilla bash$ cd bugzilla bash$ ./checksetup.pl Output omitted @@ -1086,10 +1086,10 @@ bash$ ./checksetup.pl bash$ cd /var/www/html/bugzilla -bash$ wget ftp://ftp.mozilla.org/pub/webtools/bugzilla-2.16.1-to-2.16.2.diff.gz +bash$ wget ftp://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-2.18.0-to-2.18.1.diff.gz Output omitted -bash$ gunzip bugzilla-2.16.1-to-2.16.2.diff.gz -bash$ patch -p1 < bugzilla-2.16.1-to-2.16.2.diff +bash$ gunzip bugzilla-2.18.0-to-2.18.1.diff.gz +bash$ patch -p1 < bugzilla-2.18.0-to-2.18.1.diff patching file checksetup.pl patching file collectstats.pl patching file globals.pl diff --git a/webtools/bugzilla/docs/xml/installation.xml b/webtools/bugzilla/docs/xml/installation.xml index 1b8c506e946..7310b1f0fd7 100644 --- a/webtools/bugzilla/docs/xml/installation.xml +++ b/webtools/bugzilla/docs/xml/installation.xml @@ -1,5 +1,5 @@ - + Installing Bugzilla @@ -54,7 +54,8 @@ Install Perl - (&min-perl-ver; or above) + (&min-perl-ver; or above for non-Windows platforms; &min-perl-ver-win; + for Windows)