dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-bugzilla-2.22.2.tar.gz

.gitignore

@@ -0,0 +1 @@
+bugzilla-3.2.4.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: bugzilla
-# $Id$
-NAME := bugzilla
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

README.fedora.bugzilla

@@ -14,3 +14,12 @@ database setting modifications.
 
 Lastly, simply re-run checksetup.pl to populate the database tables, set up
 the templates, and add the administrator ID.  You should be done at this point.
+
+There are two useful cron jobs which are included with Bugzilla which should be
+put in place after configuration is done.  The first is a daily cron job for 
+statistics collection.  This is in the file "cron.daily" and can be enabled by
+simply copying this file to /etc/cron.daily/bugzilla (or any other file name
+in the /etc/cron.daily/ directory).  The second is the "whine" cron job,
+designed to run every 15 minutes.  To enable this job, simply coopy the
+cron.whine file to /etc/cron.d/bugzilla (or any othe filename within the
+/etc/cron.d/ directory).

bugzilla-EL5-perl-versions.patch

@@ -0,0 +1,42 @@
+diff -ruNp a/bugzilla-3.2.4/Bugzilla/Constants.pm b/bugzilla-3.2.4/Bugzilla/Constants.pm
+--- a/bugzilla-3.2.4/Bugzilla/Constants.pm	2009-07-08 10:58:27.000000000 -0300
++++ b/bugzilla-3.2.4/Bugzilla/Constants.pm	2009-08-04 00:37:30.852896189 -0300
+@@ -387,7 +387,7 @@ use constant DB_MODULE => {
+                     # Disallow development versions
+                     blacklist => ['_'],
+                     # For UTF-8 support
+-                    version => '4.00',
++                    version => '3.00',
+                 },
+                 name => 'MySQL'},
+     'pg'    => {db => 'Bugzilla::DB::Pg', db_version => '8.00.0000',
+diff -ruNp a/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm b/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm
+--- a/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm	2009-04-17 18:53:49.000000000 -0300
++++ b/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm	2009-08-04 00:38:23.376893996 -0300
+@@ -62,7 +62,7 @@ sub REQUIRED_MODULES {
+         # Perl 5.10 requires CGI 3.33 due to a taint issue when
+         # uploading attachments, see bug 416382.
+         # Require CGI 3.21 for -httponly support, see bug 368502.
+-        version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.33' : '3.21'
++        version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.15' : '3.15'
+     },
+     {
+         package => 'TimeDate',
+@@ -92,7 +92,7 @@ sub REQUIRED_MODULES {
+     {
+         package => 'Email-MIME',
+         module  => 'Email::MIME',
+-        version => '1.861'
++        version => '1.859'
+     },
+     {
+         package => 'Email-MIME-Encodings',
+@@ -103,7 +103,7 @@ sub REQUIRED_MODULES {
+     {
+         package => 'Email-MIME-Modifier',
+         module  => 'Email::MIME::Modifier',
+-        version => '1.442'
++        version => '1.441'
+     },
+     );
+ 

bugzilla-config-path.patch

@@ -1,16 +0,0 @@
-diff -ruN bugzilla-neworig/Bugzilla/Config.pm bugzilla-2.22/Bugzilla/Config.pm
---- bugzilla-neworig/Bugzilla/Config.pm	2006-06-19 16:29:00.000000000 -0400
-+++ bugzilla-2.22/Bugzilla/Config.pm	2006-06-25 10:20:02.000000000 -0400
-@@ -61,10 +61,10 @@
- our $datadir;
- if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) {
-     $project = $1;
--    $localconfig = "$libpath/localconfig.$project";
-+    $localconfig = "/etc/bugzilla/localconfig.$project";
-     $datadir = "/var/lib/bugzilla/data/$project";
- } else {
--    $localconfig = "$libpath/localconfig";
-+    $localconfig = "/etc/bugzilla/localconfig";
-     $datadir = "/var/lib/bugzilla/data";
- }
- our $attachdir = "$datadir/attachments";

bugzilla-data-dir.patch

@@ -1,16 +0,0 @@
-diff -ruN bugzilla-orig/Bugzilla/Config.pm bugzilla-2.22/Bugzilla/Config.pm
---- bugzilla-orig/Bugzilla/Config.pm	2006-04-22 22:45:09.000000000 -0400
-+++ bugzilla-2.22/Bugzilla/Config.pm	2006-06-19 16:29:00.000000000 -0400
-@@ -62,10 +62,10 @@
- if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) {
-     $project = $1;
-     $localconfig = "$libpath/localconfig.$project";
--    $datadir = "$libpath/data/$project";
-+    $datadir = "/var/lib/bugzilla/data/$project";
- } else {
-     $localconfig = "$libpath/localconfig";
--    $datadir = "$libpath/data";
-+    $datadir = "/var/lib/bugzilla/data";
- }
- our $attachdir = "$datadir/attachments";
- our $webdotdir = "$datadir/webdot";

bugzilla-httpd-conf

@@ -4,5 +4,5 @@ Alias /bugzilla /usr/share/bugzilla
   AddHandler cgi-script .cgi
   Options +Indexes +ExecCGI +FollowSymLinks
   DirectoryIndex index.cgi
-  AllowOverride Limit
+  AllowOverride Limit Options FileInfo
 </Directory>

bugzilla-rw-paths.patch

@@ -0,0 +1,24 @@
+--- bugzilla-3.4/Bugzilla/Constants.pm        2009-02-03 10:02:53.000000000 +0000
++++ bugzilla-3.4-rw/Bugzilla/Constants.pm     2009-02-18 17:59:52.000000000 +0000
+@@ -499,9 +499,9 @@ sub bz_locations {
+         'cgi_path'    => $libpath,
+         'templatedir' => "$libpath/template",
+         'project'     => $project,
+-        'localconfig' => "$libpath/$localconfig",
+-        'datadir'     => "$libpath/$datadir",
+-        'attachdir'   => "$libpath/$datadir/attachments",
++        'localconfig' => "/etc/bugzilla/$localconfig",
++        'datadir'     => "/var/lib/bugzilla/$datadir",
++        'attachdir'   => "/var/lib/bugzilla/$datadir/attachments",
+         'skinsdir'    => "$libpath/skins",
+         # $webdotdir must be in the web server's tree somewhere. Even if you use a 
+         # local dot, we output images to there. Also, if $webdotdir is 
+@@ -509,7 +509,7 @@ sub bz_locations {
+         # change showdependencygraph.cgi to set image_url to the correct 
+         # location.
+         # The script should really generate these graphs directly...
+-        'webdotdir'   => "$libpath/$datadir/webdot",
++        'webdotdir'   => "/var/lib/bugzilla/$datadir/webdot",
+         'extensionsdir' => "$libpath/extensions",
+     };
+ }

bugzilla.spec

@@ -4,18 +4,19 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 2.22.2
+Version: 3.2.4
 Group: Applications/Publishing
-Release: 1%{?dist}
-License: MPL
+Release: 2%{?dist}
+License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
-Patch0: bugzilla-data-dir.patch
-Patch1: bugzilla-config-path.patch
+Patch0: bugzilla-rw-paths.patch
+Patch1: bugzilla-EL5-perl-versions.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Requires: smtpdaemon, webserver, graphviz, patchutils
+Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which
 
 %package doc
 Summary: Bugzilla documentation
@@ -24,11 +25,13 @@ Group: Documentation
 %package contrib
 Summary: Bugzilla contributed scripts
 Group: Applications/Publishing
+BuildRequires: python
 
 %description
-Bugzilla is a popular bug tracking system used by multiple open source 
-projects.  It requires a database engine installed - either MySQL or 
-PostgreSQL.  Without one of these database engines, Bugzilla will not work.
+Bugzilla is a popular bug tracking system used by multiple open source projects
+It requires a database engine installed - either MySQL, PostgreSQL or Oracle.
+Without one of these database engines (local or remote), Bugzilla will not work
+- see the Release Notes for details.
 
 %description doc
 Documentation distributed with the Bugzilla bug tracking system
@@ -39,15 +42,18 @@ Contributed scripts and functions for Bugzilla
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
+%patch1 -p2
 
-# Filter unwanted Requires:
+# Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
+# create a wrapper script which runs the original perl_requires
+# command and strips some of the output
 cat << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
-  sed -e '/perl(globals.pl)/d;/perl(BugzillaEmail)/d'
+sed -e '/perl(Authen::Radius)/d;/perl(DBD::Pg)/d;/perl(DBD::Oracle)/d;/perl(sanitycheck.cgi)/d'
 EOF
 
+# use that wrapper script instead of the original perl_requires script
 %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
@@ -77,15 +83,13 @@ done
 %install
 mkdir -p ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
 cp -pr * ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.daily
-cat << EOM > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.daily/bugzilla
+cat << EOM > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.daily
 #!/bin/bash
 # Daily Bugzilla collectstats cron job run
 cd %{bzinstallprefix}/bugzilla
 ./collectstats.pl
 EOM
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d
-echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d/bugzilla
+echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.whine
 rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,QUICKSTART,UPGRADING,UPGRADING-pre-2.8}
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version}
 cp %{SOURCE2} ./README.fedora
@@ -97,15 +101,14 @@ install -m 0644 -D -p %{SOURCE1}  ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/b
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-pushd %{bzinstallprefix}/bugzilla > /dev/null
+(pushd %{bzinstallprefix}/bugzilla > /dev/null
 ./checksetup.pl > /dev/null
-popd > /dev/null
+popd > /dev/null)
 
 %files
 %defattr(-,root,root,-)
 %dir %{bzinstallprefix}/bugzilla
 %{bzinstallprefix}/bugzilla/*.cgi
-%{bzinstallprefix}/bugzilla/*.js
 %{bzinstallprefix}/bugzilla/*.pl
 %{bzinstallprefix}/bugzilla/Bugzilla.pm
 %{bzinstallprefix}/bugzilla/bugzilla.dtd
@@ -117,12 +120,12 @@ popd > /dev/null
 %{bzinstallprefix}/bugzilla/skins
 %{bzinstallprefix}/bugzilla/t
 %{bzinstallprefix}/bugzilla/template
+%{bzinstallprefix}/bugzilla/extensions/example
+%{bzinstallprefix}/bugzilla/lib/README
+%{bzinstallprefix}/bugzilla/cron.daily
+%{bzinstallprefix}/bugzilla/cron.whine
 %ghost %{bzinstallprefix}/bugzilla/bugzilla-req
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
-%defattr(0755,root,root,-)
-%{_sysconfdir}/cron.daily/*
-%defattr(0600,root,root,-)
-%{_sysconfdir}/cron.d/*
 %defattr(-,root,root,-)
 %doc README
 %doc QUICKSTART
@@ -130,39 +133,121 @@ popd > /dev/null
 %doc UPGRADING-pre-2.8
 %doc README.fedora
 %dir %{bzdatadir}
+%defattr(0750,root,apache,-)
 %dir %{_sysconfdir}/bugzilla
 
 %files doc
+%defattr(-,root,root,-)
 %{bzinstallprefix}/bugzilla/docs
 
 %files contrib
+%defattr(-,root,root,-)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
-* Wed Feb 20 2007 John Berninger <jwb at redhat dot com> - 2.22.2-1
-- Update to 2.22.2 - bz 229163
+* Tue Aug 04 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 3.2.4-2
+- fix EL-5 perl dependencies bz#515158
 
-* Wed Feb 14 2007 John Berninger <jwb at redhat dot com> - 2.22.1-6
+* Wed Jul 08 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 3.2.4-1
+- fix https://bugzilla.mozilla.org/show_bug.cgi?id=495257
+
+* Mon Apr 06 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> 3.2.3-1
+- fix CVE-2009-1213
+
+* Thu Mar 05 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> 3.2.2-2
+- fix from BZ #474250 Comment #16, from Chris Eveleigh -->
+- add python BR for contrib subpackage
+- fix description
+- change Requires perl-SOAP-Lite to perl(SOAP::Lite) according guidelines
+
+* Sun Mar 01 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> 3.2.2-1
+- thanks to Chris Eveleigh <chris dot eveleigh at planningportal dot gov dot uk>
+- for contributing with patches :-)
+- Upgrade to upstream 3.2.2 to fix multiple security vulns
+- Removed old perl_requires exclusions, added new ones for RADIUS, Oracle and sanitycheck.cgi
+- Added Oracle to supported DBs in description (and moved line breaks)
+- Include a patch to fix max_allowed_packet warnin when using with mysql
+
+* Sat Feb 28 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> 3.0.8-1
+- Upgrade to 3.0.8, fix #466077 #438080
+- fix macro in changelog rpmlint warning
+- fix files-attr-not-set rpmlint warning for doc and contrib sub-packages
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb  2 2009 Stepan Kasal <skasal@redhat.com> - 3.0.4-3
+- do not require perl-Email-Simple, it is (no longer) in use
+- remove several explicit perl-* requires; the automatic dependencies
+  do handle them
+
+* Mon Jul 14 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 3.0.4-2
+- fix license tag
+
+* Fri May  9 2008 John Berninger <john at ncphotography dot com> - 3.0.4-1
+- Update to upstream 3.0.4 to fix multiple security vulns
+- Change perms on /etc/bugzilla for bz 427981
+
+* Sun May  4 2008 John Berninger <john at ncphotography dot com> - 3.0.3-0
+- Update to upstream 3.0.3 - bz 444669
+
+* Fri Dec 28 2007 John Berninger <john at ncphotography dot com> - 3.0.2-6
+- Add cron.daily, cron.whine to payload list
+
+* Fri Dec 28 2007 John Berninger <john at ncphotography dot com> - 3.0.2-5
+- Typo in spec file, rebuild
+
+* Fri Dec 28 2007 John Berninger <john at ncphotography dot com> - 3.0.2-3
+- bz 426465 - don't enable cron jobs so cron doesn't complain about
+  an unconfigured installation
+
+* Fri Oct 26 2007 John Berninger <john at ncphotography dot com> - 3.0.2-2
+- fix issue with AlowOverride Options
+
+* Mon Oct 22 2007 John Berninger <john at ncphotography dot com> - 3.0.2-1
+- updates to requires and httpd conf for BZ's 279961, 295861, 339531
+
+* Mon Sep 24 2007 John Berninger <john at ncphotography dot com> - 3.0.2-0
+- update to 3.0.2 - bz 299981
+
+* Mon Aug 27 2007 John Berninger <john at ncphotography dot com> - 3.0.1-0
+- update to 3.0.1 - bz 256021
+
+* Fri May 18 2007 John Berninger <jwb at redhat dot com> - 3.0-2
+- update Requires for bz's 241037, 241206
+
+* Fri May 18 2007 John Berninger <jwb at redhat dot com> - 3.0-1
+- update to upstream version 3.0
+- add new dependencies on mod_perl, perl-SOAP-Lite
+- refactor patch(es) to change paths for read-only /usr
+
+* Tue Feb 20 2007 John Berninger <jwb at redhat dot com> - 2.22.2-1
+- update to 2.22.2 - bz 229163
+
+* Wed Feb 14 2007 John Berninger <jwb at redhat dot com> - 2.22-12
 - More cron job fixes
 
-* Wed Jan 31 2007 John Berninger <jwb at redhat dot com> - 2.22.1-5
+* Wed Jan 31 2007 John Berninger <jwb at redhat dot com> - 2.22-11
 - Fix cron job perms
 
-* Sat Jan 27 2007 John Berninger <jwb at redhat dot com> - 2.22.1-4
-- Fix collectstats cron job, bz 224550
+* Sat Jan 27 2007 John Berninger <jwb at redhat dot com> - 2.22-10
+- Fix collectstats cron job, bx 224550
 
-* Mon Jan 22 2007 John Berninger <jwb at redhat dot com> - 2.22.1-3
+* Mon Jan 22 2007 John Berninger <jwb at redhat dot com> - 2.22-9
 - Fix linebreak issues in specfile
 
-* Mon Jan 22 2007 John Berninger <jwb at redhat dot com> - 2.22.1-2
+* Mon Jan 22 2007 John Berninger <jwb at redhat dot com> - 2.22-8
 - Put daily and hourly cronjobs in place per bz 223747
 
-* Tue Jun 26 2006 John Berninger <johnw at berningeronline dot net> - 2.22.1-1
+* Wed Nov  8 2006 John Berninger <johnw at berningeronline dot net> - 2.22-7
+- Fixes for bz # 212355
+
+* Tue Jun 26 2006 John Berninger <johnw at berningeronline dot net> - 2.22-6
 - Clean up BugzillaEmail requires (filter it out)
 
 * Mon Jun 26 2006 John Berninger <johnw at berningeronline dot net> - 2.22-5
 - License is MPL, not GPL
-- Clean up %doc specs
+- Clean up %%doc specs
 
 * Sun Jun 25 2006 John Benringer <johnw at berningeronline dot net> - 2.22-4
 - Remove localconfig file per upstream

sources

@@ -1 +1 @@
-fb7fdcaacf5efad6f3bd5a1a810c467f  bugzilla-2.22.2.tar.gz
+845c94c8a498340b244a2c36db7abd76  bugzilla-3.2.4.tar.gz