Bug 257534: Require Perl 5.8.1 or later when running on Windows with ActiveState...

Patch by Byron Jones <bugzilla@glob.com.au>
r=justdave, a=justdave

diff --git a/checksetup.pl b/checksetup.pl
index 68dd308e6b2b3f6d9ec4aff2ed5268c8b0ba9e59..6b9b1042cfae3ad17fc70e8f1c126ced561b5e89 100755 (executable)
--- a/checksetup.pl
+++ b/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/docs/rel_notes.txt b/docs/rel_notes.txt
index 055c4866a905da63f3e2068d2e595ef534968e97..3c53d609d689cbbb88b34642e5083a5526c5d0fb 100644 (file)
--- a/docs/rel_notes.txt
+++ b/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/docs/xml/Bugzilla-Guide.xml b/docs/xml/Bugzilla-Guide.xml
index af7553e7fe1481b9c9261fadb2922a3e7482d725..9b848e9be639e74077571a8cf11e7049b7dc61be 100644 (file)
--- a/docs/xml/Bugzilla-Guide.xml
+++ b/docs/xml/Bugzilla-Guide.xml
@@ -44,6 +44,7 @@
 <!-- For minimum versions -->
 <!ENTITY min-mysql-ver "3.23.41">
 <!ENTITY min-perl-ver "5.6.0">
+<!ENTITY min-perl-ver-win "5.8.1">
 <!ENTITY min-template-ver "2.08">
 <!ENTITY min-file-temp-ver "any">
 <!ENTITY min-appconfig-ver "1.52">

diff --git a/docs/xml/administration.xml b/docs/xml/administration.xml
index 56de1e9bf7a9e72dc89eed7b073c13f66d72d84b..12c72dd847ea510f16d763b2160d1e5633d01ca0 100644 (file)
--- a/docs/xml/administration.xml
+++ b/docs/xml/administration.xml
@@ -951,7 +951,7 @@ Support: ENTRY, DEFAULT/MANDATORY, CANEDIT
 
     <para>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.
     </para>
 
     <para>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.
     </para>
 
     <para>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$ <command>cd /var/www/html/bugzilla</command>
 bash$ <command>cvs login</command>
 Logging in to :pserver:anonymous@cvs-mirror.mozilla.org:2401/cvsroot
 CVS password: <command>anonymous</command>
-bash$ <command>cvs -q update -r BUGZILLA-2_16_2 -dP</command>
+bash$ <command>cvs -q update -r BUGZILLA-2_18_1 -dP</command>
 P checksetup.pl
 P collectstats.pl
 P globals.pl
@@ -1033,19 +1033,19 @@ P template/en/default/list/quips.html.tmpl
 
       <programlisting>
 bash$ <command>cd /var/www/html</command>
-bash$ <command>wget ftp://ftp.mozilla.org/pub/webtools/bugzilla-2.16.2.tar.gz</command>
+bash$ <command>wget ftp://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-2.18.1.tar.gz</command>
 <emphasis>Output omitted</emphasis>
-bash$ <command>tar xzvf bugzilla-2.16.2.tar.gz</command>
-bugzilla-2.16.2/
-bugzilla-2.16.2/.cvsignore
-bugzilla-2.16.2/1x1.gif
+bash$ <command>tar xzvf bugzilla-2.18.1.tar.gz</command>
+bugzilla-2.18.1/
+bugzilla-2.18.1/.cvsignore
+bugzilla-2.18.1/1x1.gif
 <emphasis>Output truncated</emphasis>
-bash$ <command>cd bugzilla-2.16.2</command>
+bash$ <command>cd bugzilla-2.18.1</command>
 bash$ <command>cp ../bugzilla/localconfig* .</command>
 bash$ <command>cp -r ../bugzilla/data .</command>
 bash$ <command>cd ..</command>
 bash$ <command>mv bugzilla bugzilla.old</command>
-bash$ <command>mv bugzilla-2.16.2 bugzilla</command>
+bash$ <command>mv bugzilla-2.18.1 bugzilla</command>
 bash$ <command>cd bugzilla</command>
 bash$ <command>./checksetup.pl</command>
 <emphasis>Output omitted</emphasis>
@@ -1086,10 +1086,10 @@ bash$ <command>./checksetup.pl</command>
 
       <programlisting>
 bash$ <command>cd /var/www/html/bugzilla</command>
-bash$ <command>wget ftp://ftp.mozilla.org/pub/webtools/bugzilla-2.16.1-to-2.16.2.diff.gz</command>
+bash$ <command>wget ftp://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-2.18.0-to-2.18.1.diff.gz</command>
 <emphasis>Output omitted</emphasis>
-bash$ <command>gunzip bugzilla-2.16.1-to-2.16.2.diff.gz</command>
-bash$ <command>patch -p1 &lt; bugzilla-2.16.1-to-2.16.2.diff</command>
+bash$ <command>gunzip bugzilla-2.18.0-to-2.18.1.diff.gz</command>
+bash$ <command>patch -p1 &lt; bugzilla-2.18.0-to-2.18.1.diff</command>
 patching file checksetup.pl
 patching file collectstats.pl
 patching file globals.pl

diff --git a/docs/xml/installation.xml b/docs/xml/installation.xml
index cc0499968f1e5a376e13e1fdbd691c6d07737999..92e50cc72724a87347e2efc8bbb037c88bee075c 100644 (file)
--- a/docs/xml/installation.xml
+++ b/docs/xml/installation.xml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
-<!-- $Id: installation.xml,v 1.74 2004/07/23 22:02:37 bugreport%peshkin.net Exp $ -->
+<!-- $Id: installation.xml,v 1.75 2004/09/14 05:48:54 justdave%bugzilla.org Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
@@ -54,7 +54,8 @@
     <procedure>
       <step>
         <para><link linkend="install-perl">Install Perl</link>
-        (&min-perl-ver; or above)
+        (&min-perl-ver; or above for non-Windows platforms; &min-perl-ver-win;
+        for Windows)
         </para>
       </step>
       <step>