From: Max Kanat-Alexander Date: Mon, 1 Feb 2010 21:51:39 +0000 (-0800) Subject: Fix the data in the bzr repo to match the data in the CVS repo. X-Git-Tag: bugzilla-3.0.11~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39e9241f6568e3be4551c6373a17c5a7f5ea0be9;p=thirdparty%2Fbugzilla.git Fix the data in the bzr repo to match the data in the CVS repo. During the CVS imports into Bzr, there were some inconsistencies introduced (mostly that files that were deleted in CVS weren't being deleted in Bzr). So this checkin makes the bzr repo actually consistent with the CVS repo, including fixing permissions of files. --- diff --git a/Bugzilla/User/Setting/Skin.pm b/Bugzilla/User/Setting/Skin.pm old mode 100755 new mode 100644 diff --git a/Bugzilla/WebService.pm b/Bugzilla/WebService.pm old mode 100755 new mode 100644 diff --git a/Bugzilla/WebService/Bugzilla.pm b/Bugzilla/WebService/Bugzilla.pm old mode 100755 new mode 100644 diff --git a/Bugzilla/WebService/Constants.pm b/Bugzilla/WebService/Constants.pm old mode 100755 new mode 100644 diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm old mode 100755 new mode 100644 diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm old mode 100755 new mode 100644 diff --git a/contrib/bugzilla-submit/bugdata.txt b/contrib/bugzilla-submit/bugdata.txt old mode 100644 new mode 100755 diff --git a/contrib/bugzilla-submit/bugzilla-submit.xml b/contrib/bugzilla-submit/bugzilla-submit.xml old mode 100644 new mode 100755 diff --git a/contrib/cmdline/query.conf b/contrib/cmdline/query.conf old mode 100644 new mode 100755 diff --git a/contrib/cvs-update.pl b/contrib/cvs-update.pl old mode 100644 new mode 100755 diff --git a/contrib/gnats2bz.pl b/contrib/gnats2bz.pl old mode 100644 new mode 100755 diff --git a/contrib/gnatsparse/README b/contrib/gnatsparse/README old mode 100755 new mode 100644 diff --git a/contrib/jb2bz.py b/contrib/jb2bz.py old mode 100644 new mode 100755 diff --git a/contrib/merge-users.pl b/contrib/merge-users.pl old mode 100644 new mode 100755 diff --git a/contrib/sendbugmail.pl b/contrib/sendbugmail.pl old mode 100644 new mode 100755 diff --git a/contrib/sendunsentbugmail.pl b/contrib/sendunsentbugmail.pl old mode 100644 new mode 100755 diff --git a/contrib/yp_nomail.sh b/contrib/yp_nomail.sh old mode 100644 new mode 100755 diff --git a/docs/makedocs.pl b/docs/makedocs.pl old mode 100644 new mode 100755 diff --git a/docs/xml/Bugzilla-Guide.xml b/docs/xml/Bugzilla-Guide.xml index 8da2cae9aa..8f287edbc8 100644 --- a/docs/xml/Bugzilla-Guide.xml +++ b/docs/xml/Bugzilla-Guide.xml @@ -1,6 +1,5 @@ - %myents; @@ -36,7 +35,7 @@ - + diff --git a/docs/xml/administration.xml b/docs/xml/administration.xml index c24ca40f32..b4de07390f 100644 --- a/docs/xml/administration.xml +++ b/docs/xml/administration.xml @@ -645,7 +645,7 @@ port) of your LDAP server. If no port is specified, it assumes the default LDAP port of 389. - Ex. ldap.company.com + For example: ldap.company.com or ldap.company.com:3268 You can also specify a LDAP URI, so as to use other @@ -653,9 +653,16 @@ the URI, the default is either 389 or 636 for 'LDAP' and 'LDAPS' schemes respectively. - Ex. ldap://ldap.company.com, - ldaps://ldap.company.com or - ldapi://%2fvar%2flib%2fldap_sock + + + In order to use SSL with LDAP, specify a URI with "ldaps://". + This will force the use of SSL over port 636. + + + For example, normal LDAP: + ldap://ldap.company.com, LDAP over SSL: + ldaps://ldap.company.com or LDAP over a UNIX + domain socket ldapi://%2fvar%2flib%2fldap_sock. @@ -2828,7 +2835,6 @@ ReadOnly: ENTRY, NA/NA, CANEDIT -
@@ -2864,349 +2870,6 @@ ReadOnly: ENTRY, NA/NA, CANEDIT
-
- Upgrading to New Releases - - - Upgrading Bugzilla is something we all want to do from time to time, - be it to get new features or pick up the latest security fix. How easy - it is to update depends on a few factors: - - - - - - If the new version is a revision or a new point release - - - - - How many local changes (if any) have been made - - - - -
- Version Definitions - - - Bugzilla displays the version you are using at the top of the home - page index.cgi. It looks something like - '2.20.3', '2.22.1' or '3.0rc1'. The first number in this series is - the Major Version. This does not change very often; - Bugzilla was 1.x.x when it was first created, and went to 2.x.x - when it was re-written in perl in Sept 1998. The major version - 3.x.x, released in early 2007, is pretty far from what the 2.x.x - series looked like, both about its UI and its code. - - - - The second number in the version is called the 'minor number', and - a release that changes the minor number is called a 'point release'. - An even number in this position (2.18, 2.20, 2.22, 3.0, 3.2, etc.) - represents a stable version, while an odd number (2.19, 2.21, 2.23, etc.) - represents a development version. In the past, stable point releases - were feature-based, coming when certain enhancements had been - completed, or the Bugzilla development team felt that enough - progress had been made overall. As of version 2.18, however, - Bugzilla has moved to a time-based release schedule; current plans - are to create a stable point release every 6 months or so after - 2.18 is deployed. - - - - The third number in the Bugzilla version represents a bugfix version. - Bugfix Revisions are released only to address security vulnerabilities - and, for a limited period, bug fixes. Once enough of these - bugfixes have accumulated (or a new security vulnerability is - identified and closed), a bugfix release is made. As an - example, 2.20.3 was a bugfix release, and improved on 2.20.2. - - - - - When reading version numbers, everything separated by a point ('.') - should be read as a single number. It is not - the same as decimal. 2.22 is newer than 2.8 because minor version - 22 is greater than minor version 8. The now unsupported release 2.16.11 - was newer than 2.16.9 (because bugfix 11 is greater than bugfix 9. This is - confusing to some people who aren't used to dealing with software. - - -
- -
- Upgrading - Notifications - - - Bugzilla 3.0 introduces the ability to automatically notify - administrators when new releases are available, based on the - upgrade_notification parameter, see - . Administrators will see these - notifications when they access the index.cgi - page, i.e. generally when logging in. Bugzilla will check once per - day for new releases, unless the parameter is set to - disabled. If you are behind a proxy, you may have to set - the proxy_url parameter accordingly. If the proxy - requires authentication, use the - http://user:pass@proxy_url/ syntax. - -
- -
- Upgrading - Methods and Procedure - - There are three different ways to upgrade your installation. - - - - - - Using CVS () - - - - - Downloading a new tarball () - - - - - Applying the relevant patches () - - - - - - Each of these options has its own pros and cons; the one that's - right for you depends on how long it has been since you last - installed, the degree to which you have customized your installation, - and/or your network configuration. (Some discussion of the various - methods of updating compared with degree and methods of local - customization can be found in .) - - - - The larger the jump you are trying to make, the more difficult it - is going to be to upgrade if you have made local customizations. - Upgrading from 2.22 to 2.22.1 should be fairly painless even if - you are heavily customized, but going from 2.18 to 3.0 is going - to mean a fair bit of work re-writing your local changes to use - the new files, logic, templates, etc. If you have done no local - changes at all, however, then upgrading should be approximately - the same amount of work regardless of how long it has been since - your version was released. - - - - - Upgrading is a one-way process. You should backup your database - and current Bugzilla directory before attempting the upgrade. If - you wish to revert to the old Bugzilla version for any reason, you - will have to restore from these backups. - - - - - The examples in the following sections are written as though the - user were updating to version 2.22.1, but the procedures are the - same regardless of whether one is updating to a new point release - or simply trying to obtain a new bugfix release. Also, in the - examples the user's Bugzilla installation is found at - /var/www/html/bugzilla. If that is not the - same as the location of your Bugzilla installation, simply - substitute the proper paths where appropriate. - - -
- Upgrading using CVS - - - Every release of Bugzilla, whether it is a point release or a bugfix, - is tagged in CVS. Also, every tarball that has been distributed since - version 2.12 has been created in such a way that it can be used with - CVS once it is unpacked. Doing so, however, requires that you are able - to access cvs-mirror.mozilla.org on port 2401, which may not be an - option or a possibility for some users, especially those behind a - highly restrictive firewall. - - - - - If you can, updating using CVS is probably the most painless - method, especially if you have a lot of local changes. - - - - - The following shows the sequence of commands needed to update a - Bugzilla installation via CVS, and a typical series of results. - - - -bash$ cd /var/www/html/bugzilla -bash$ cvs login -Logging in to :pserver:anonymous@cvs-mirror.mozilla.org:2401/cvsroot -CVS password: ('anonymous', or just leave it blank) -bash$ cvs -q update -r BUGZILLA-2_22_1 -dP -P checksetup.pl -P collectstats.pl -P docs/rel_notes.txt -P template/en/default/list/quips.html.tmpl -(etc.) - - - - - If a line in the output from cvs update begins - with a C, then that represents a - file with local changes that CVS was unable to properly merge. You - need to resolve these conflicts manually before Bugzilla (or at - least the portion using that file) will be usable. - - -
- -
- Upgrading using the tarball - - - If you are unable (or unwilling) to use CVS, another option that's - always available is to obtain the latest tarball from the Download Page and - create a new Bugzilla installation from that. - - - - This sequence of commands shows how to get the tarball from the - command-line; it is also possible to download it from the site - directly in a web browser. If you go that route, save the file - to the /var/www/html - directory (or its equivalent, if you use something else) and - omit the first three lines of the example. - - - -bash$ cd /var/www/html -bash$ wget http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-2.22.1.tar.gz -(Output omitted) -bash$ tar xzvf bugzilla-2.22.1.tar.gz -bugzilla-2.22.1/ -bugzilla-2.22.1/.cvsignore -(Output truncated) -bash$ cd bugzilla-2.22.1 -bash$ cp ../bugzilla/localconfig* . -bash$ cp -r ../bugzilla/data . -bash$ cd .. -bash$ mv bugzilla bugzilla.old -bash$ mv bugzilla-2.22.1 bugzilla - - - - - The cp commands both end with periods which - is a very important detail, it tells the shell that the destination - directory is the current working directory. - - - - - This upgrade method will give you a clean install of Bugzilla with the - same version as the tarball. That's fine if you don't have any local - customizations that you want to maintain, but if you do then you will - need to reapply them by hand to the appropriate files. - - - - It's worth noting that since 2.12, the Bugzilla tarballs come - CVS-ready, so if you decide at a later date that you'd rather use - CVS as an upgrade method, your code will already be set up for it. - -
- -
- Upgrading using patches - - - If you are doing a bugfix upgrade -- that is, one where only the - last number of the revision changes, such as from 2.22 to 2.22.1 - -- then you have the option of obtaining and applying a patch file - from the Download Page. - This file is made available by the Bugzilla - Development Team, and is a collection of all the bug fixes - and security patches that have been made since the last bugfix - release. If you are planning to upgrade via patches, it is safer - to grab this developer-made patch file than to read the patch - notes and apply all (or even just some of) the patches oneself, - as sometimes patches on bugs get changed before they get checked in. - - - - As above, this example starts with obtaining the file via the - command line. If you have already downloaded it, you can omit the - first two commands. - - - -bash$ cd /var/www/html/bugzilla -bash$ wget http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-2.22-to-2.22.1.diff.gz -(Output omitted) -bash$ gunzip bugzilla-2.22-to-2.22.1.diff.gz -bash$ patch -p1 < bugzilla-2.22-to-2.22.1.diff -patching file checksetup.pl -patching file collectstats.pl -(etc.) - - - - - Be aware that upgrading from a patch file does not change the - entries in your CVS directory. - This could make it more difficult to upgrade using CVS - () in the future. - - - -
-
- -
- Completing Your Upgrade - - - Regardless of which upgrade method you choose, you will need to - run ./checksetup.pl before your Bugzilla - upgrade will be complete. - - - -bash$ cd bugzilla -bash$ ./checksetup.pl - - - - - The period at the beginning of the command - ./checksetup.pl is important and can not - be omitted. - - - - - If you have done a lot of local modifications, it wouldn't hurt - to run the Bugzilla Testing suite. This is not a required step, - but it isn't going to hurt anything, and might help point out - some areas that could be improved. (More information on the - test suite can be had by following this link to the appropriate - section in the Developers' - Guide.) - - -
-
- + Installing Bugzilla @@ -21,14 +21,6 @@ instructions. - - As an alternative to following these instructions, you may wish to - try Arne Schirmacher's unofficial and unsupported - Bugzilla - Installer, which installs Bugzilla and all its prerequisites - on Linux or Solaris systems. - - This guide assumes that you have administrative access to the Bugzilla machine. It not possible to install and run Bugzilla itself without administrative access except @@ -287,7 +279,7 @@ - CGI &min-cgi-ver; or CGI &min-mp-cgi-ver; if using mod_perl + CGI &min-cgi-ver; @@ -464,7 +456,7 @@ CGI - (&min-cgi-ver;) for mod_perl + (&min-mp-cgi-ver;) for mod_perl @@ -1042,6 +1034,14 @@ when granting extra access. + + + + On Windows, you may have to also add the + ScriptInterpreterSource Registry-Strict + line, see Windows specific notes. + + @@ -1344,19 +1344,6 @@ c:\perl\bin\perl.exe -xc:\bugzilla -wT "%s" %s the Reports page. - - When upgrading Bugzilla, this format may change. - To create new status data, (re)move old data and run the following - commands: - - - - bash$ - cd <your-bugzilla-directory> - bash$ - ./collectstats.pl --regenerate - - Windows does not have 'cron', but it does have the Task @@ -1569,7 +1556,7 @@ AddType application/rdf+xml .rdf based system such as GNU/Linux. That said, if you do want to get Bugzilla running on Windows, you will need to make the following adjustments. A detailed step-by-step - + installation guide for Windows is also available if you need more help with your installation. @@ -1659,16 +1646,6 @@ C:\perl> ppm install <module name> -
- Code changes required to run on Win32 - - - Bugzilla on Win32 is supported out of the box from version 2.20; this - means that no code changes are required to get Bugzilla running. - - -
-
Serving the web pages @@ -1684,14 +1661,16 @@ C:\perl> ppm install <module name> - If using Apache on windows, you can set the ScriptInterpreterSource - directive in your Apache config to avoid having to modify - the first line of every script to contain your path to Perl - instead of /usr/bin/perl. When setting - ScriptInterpreterSource, do not forget - to specify the -T flag to enable the taint - mode. For example: C:\Perl\bin\perl.exe -T. + The web server looks at /usr/bin/perl to + call Perl. If you are using Apache on windows, you can set the + ScriptInterpreterSource + directive in your Apache config file to make it look at the + right place: insert the line + ScriptInterpreterSource Registry-Strict + into your httpd.conf file, and create the key + HKEY_CLASSES_ROOT\.cgi\Shell\ExecCGI\Command + with as value (adapt to your + path if needed) in the registry. When this is done, restart Apache. @@ -2187,6 +2166,424 @@ pid-file=/home/foo/mymysql/the.pid
+ +
+ Upgrading to New Releases + + Upgrading to new Bugzilla releases is very simple. There is + a script included with Bugzilla that will automatically + do all of the database migration for you. + + The following sections explain how to upgrade from one + version of Bugzilla to another. Whether you are upgrading + from one bug-fix version to another (such as 3.0.1 to 3.0.2) + or from one major version to another (such as from 3.0 to 3.2), + the instructions are always the same. + + + + Any examples in the following sections are written as though the + user were updating to version 2.22.1, but the procedures are the + same no matter what version you're updating to. Also, in the + examples, the user's Bugzilla installation is found at + /var/www/html/bugzilla. If that is not the + same as the location of your Bugzilla installation, simply + substitute the proper paths where appropriate. + + + +
+ Before You Upgrade + + Before you start your upgrade, there are a few important + steps to take: + + + + + Read the Release + Notes of the version you're upgrading to, + particularly the "Notes for Upgraders" section. + + + + + + View the Sanity Check () page + on your installation before upgrading. Attempt to fix all warnings + that the page produces before you go any further, or you may + experience problems during your upgrade. + + + + + + Shut down your Bugzilla installation by putting some HTML or + text in the shutdownhtml parameter + (see ). + + + + + + Make a backup of the Bugzilla database. + THIS IS VERY IMPORTANT. If + anything goes wrong during the upgrade, your installation + can be corrupted beyond recovery. Having a backup keeps you safe. + + + + + Upgrading is a one-way process. You cannot "downgrade" an + upgraded Bugzilla. If you wish to revert to the old Bugzilla + version for any reason, you will have to restore your database + from this backup. + + + + Here are some sample commands you could use to backup + your database, depending on what database system you're + using. You may have to modify these commands for your + particular setup. + + + + MySQL: + + + mysqldump --opt -u bugs -p bugs > bugs.sql + + + + + + PostgreSQL: + + + pg_dump --no-privileges --no-owner -h localhost -U bugs + > bugs.sql + + + + + + +
+ +
+ Getting The New Bugzilla + + There are three ways to get the new version of Bugzilla. + We'll list them here briefly and then explain them + more later. + + + + CVS () + + + If have cvs installed on your machine + and you have Internet access, this is the easiest way to + upgrade, particularly if you have made modifications + to the code or templates of Bugzilla. + + + + + + Download the tarball () + + + This is a very simple way to upgrade, and good if you + haven't made many (or any) modifications to the code or + templates of your Bugzilla. + + + + + + Patches () + + + If you have made modifications to your Bugzilla, and + you don't have Internet access or you don't want to use + cvs, then this is the best way to upgrade. + + + + You can only do minor upgrades (such as 3.0 to 3.0.1 or + 3.0.1 to 3.0.2) with patches. + + + + + +
+ If you have modified your Bugzilla + + + If you have modified the code or templates of your Bugzilla, + then upgrading requires a bit more thought and effort. + A discussion of the various methods of updating compared with + degree and methods of local customization can be found in + . + + + + The larger the jump you are trying to make, the more difficult it + is going to be to upgrade if you have made local customizations. + Upgrading from 3.0 to 3.0.1 should be fairly painless even if + you are heavily customized, but going from 2.18 to 3.0 is going + to mean a fair bit of work re-writing your local changes to use + the new files, logic, templates, etc. If you have done no local + changes at all, however, then upgrading should be approximately + the same amount of work regardless of how long it has been since + your version was released. + +
+ +
+ Upgrading using CVS + + + This requires that you have cvs installed (most Unix machines do), + and requires that you are able to access cvs-mirror.mozilla.org + on port 2401, which may not be an option if you are behind a + highly restrictive firewall or don't have Internet access. + + + + The following shows the sequence of commands needed to update a + Bugzilla installation via CVS, and a typical series of results. + + + +bash$ cd /var/www/html/bugzilla +bash$ cvs login +Logging in to :pserver:anonymous@cvs-mirror.mozilla.org:2401/cvsroot +CVS password: ('anonymous', or just leave it blank) +bash$ cvs -q update -r BUGZILLA-2_22_1 -dP +P checksetup.pl +P collectstats.pl +P docs/rel_notes.txt +P template/en/default/list/quips.html.tmpl +(etc.) + + + + + If a line in the output from cvs update begins + with a C, then that represents a + file with local changes that CVS was unable to properly merge. You + need to resolve these conflicts manually before Bugzilla (or at + least the portion using that file) will be usable. + + +
+ +
+ Upgrading using the tarball + + + If you are unable (or unwilling) to use CVS, another option that's + always available is to obtain the latest tarball from the Download Page and + create a new Bugzilla installation from that. + + + + This sequence of commands shows how to get the tarball from the + command-line; it is also possible to download it from the site + directly in a web browser. If you go that route, save the file + to the /var/www/html + directory (or its equivalent, if you use something else) and + omit the first three lines of the example. + + + +bash$ cd /var/www/html +bash$ wget http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-2.22.1.tar.gz +(Output omitted) +bash$ tar xzvf bugzilla-2.22.1.tar.gz +bugzilla-2.22.1/ +bugzilla-2.22.1/.cvsignore +(Output truncated) +bash$ cd bugzilla-2.22.1 +bash$ cp ../bugzilla/localconfig* . +bash$ cp -r ../bugzilla/data . +bash$ cd .. +bash$ mv bugzilla bugzilla.old +bash$ mv bugzilla-2.22.1 bugzilla + + + + + The cp commands both end with periods which + is a very important detail--it means that the destination + directory is the current working directory. + + + + + This upgrade method will give you a clean install of Bugzilla. + That's fine if you don't have any local customizations that you + want to maintain. If you do have customizations, then you will + need to reapply them by hand to the appropriate files. + +
+ +
+ Upgrading using patches + + + A patch is a collection of all the bug fixes that have been made + since the last bug-fix release. + + + + If you are doing a bug-fix upgrade—that is, one where only the + last number of the revision changes, such as from 2.22 to + 2.22.1—then you have the option of obtaining and applying a + patch file from the Download Page. + + + + As above, this example starts with obtaining the file via the + command line. If you have already downloaded it, you can omit the + first two commands. + + + +bash$ cd /var/www/html/bugzilla +bash$ wget http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-2.22-to-2.22.1.diff.gz +(Output omitted) +bash$ gunzip bugzilla-2.22-to-2.22.1.diff.gz +bash$ patch -p1 < bugzilla-2.22-to-2.22.1.diff +patching file checksetup.pl +patching file collectstats.pl +(etc.) + + + + + Be aware that upgrading from a patch file does not change the + entries in your CVS directory. + This could make it more difficult to upgrade using CVS + () in the future. + + + +
+
+ +
+ Completing Your Upgrade + + + Now that you have the new Bugzilla code, there are a few final + steps to complete your upgrade. + + + + + + If your new Bugzilla installation is in a different + directory or on a different machine than your old Bugzilla + installation, make sure that you have copied the + data directory and the + localconfig file from your old Bugzilla + installation. (If you followed the tarball instructions + above, this has already happened.) + + + + + + If this is a major update, check that the configuration + () for your new Bugzilla is + up-to-date. Sometimes the configuration requirements change + between major versions. + + + + + + If you didn't do it as part of the above configuration step, + now you need to run checksetup.pl, which + will do everything required to convert your existing database + and settings for the new version: + + + +bash$ cd /var/www/html/bugzilla +bash$ ./checksetup.pl + + + + + The period at the beginning of the command + ./checksetup.pl is important and can not + be omitted. + + + + + + If this is a major upgrade (say, 2.22 to 3.0 or similar), + running checksetup.pl on a large + installation (75,000 or more bugs) can take a long time, + possibly several hours. + + + + + + + Clear any HTML or text that you put into the shutdownhtml + parameter, to re-activate Bugzilla. + + + + + + View the Sanity Check () page in your + upgraded Bugzilla. + + + It is recommended that, if possible, you fix any problems + you see, immediately. Failure to do this may mean that Bugzilla + will not work correctly. Be aware that if the sanity check page + contains more errors after an upgrade, it doesn't necessarily + mean there are more errors in your database than there were + before, as additional tests are added to the sanity check over + time, and it is possible that those errors weren't being + checked for in the old version. + + + + +
+ +
+ Automatic Notifications of New Releases + + + Bugzilla 3.0 introduced the ability to automatically notify + administrators when new releases are available, based on the + upgrade_notification parameter, see + . Administrators will see these + notifications when they access the index.cgi + page, i.e. generally when logging in. Bugzilla will check once per + day for new releases, unless the parameter is set to + disabled. If you are behind a proxy, you may have to set + the proxy_url parameter accordingly. If the proxy + requires authentication, use the + http://user:pass@proxy_url/ syntax. + +
+
+