From 5a392072980b1afc9976a55f6c7ba65c0b96bed6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 03:08:08 +0000 Subject: [PATCH 01/16] Initialize branch F-7 for bugzilla --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From d79af85c2189781a4c0d80ad3447c5b0c60a668a Mon Sep 17 00:00:00 2001 From: John Berninger Date: Thu, 31 May 2007 17:50:24 +0000 Subject: [PATCH 02/16] Update to BZ 3.0 --- .cvsignore | 2 +- bugzilla.spec | 39 ++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.cvsignore b/.cvsignore index b648a23..e2adb8c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-2.22.2.tar.gz +bugzilla-3.0.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index 454f1e6..20096a9 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,18 +4,17 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 2.22.2 +Version: 3.0 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: MPL 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: smtpdaemon, webserver, graphviz, patchutils +Requires: smtpdaemon, webserver, graphviz, patchutils, mod_perl, perl-SOAP-Lite, perl-Email-Simple, perl-Email-MIME-Modifier, perl-Template-Toolkit, perl-MIME-tools, perl-Email-MIME-Attachment-Stripper, perl-Email-Send, perl-Email-Reply, perl-Email-MIME, perl-Email-Address %package doc Summary: Bugzilla documentation @@ -39,7 +38,6 @@ Contributed scripts and functions for Bugzilla %prep %setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 # Filter unwanted Requires: cat << \EOF > %{name}-req @@ -139,25 +137,36 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog -* Wed Feb 20 2007 John Berninger - 2.22.2-1 -- Update to 2.22.2 - bz 229163 +* Fri May 18 2007 John Berninger - 3.0-2 +- update Requires for bz's 241037, 241206 -* Wed Feb 14 2007 John Berninger - 2.22.1-6 +* Fri May 18 2007 John Berninger - 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 - 2.22.2-1 +- update to 2.22.2 - bz 229163 + +* Wed Feb 14 2007 John Berninger - 2.22-12 - More cron job fixes -* Wed Jan 31 2007 John Berninger - 2.22.1-5 +* Wed Jan 31 2007 John Berninger - 2.22-11 - Fix cron job perms -* Sat Jan 27 2007 John Berninger - 2.22.1-4 -- Fix collectstats cron job, bz 224550 +* Sat Jan 27 2007 John Berninger - 2.22-10 +- Fix collectstats cron job, bx 224550 -* Mon Jan 22 2007 John Berninger - 2.22.1-3 +* Mon Jan 22 2007 John Berninger - 2.22-9 - Fix linebreak issues in specfile -* Mon Jan 22 2007 John Berninger - 2.22.1-2 +* Mon Jan 22 2007 John Berninger - 2.22-8 - Put daily and hourly cronjobs in place per bz 223747 -* Tue Jun 26 2006 John Berninger - 2.22.1-1 +* Wed Nov 8 2006 John Berninger - 2.22-7 +- Fixes for bz # 212355 + +* Tue Jun 26 2006 John Berninger - 2.22-6 - Clean up BugzillaEmail requires (filter it out) * Mon Jun 26 2006 John Berninger - 2.22-5 diff --git a/sources b/sources index 3a8fa13..dc101de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb7fdcaacf5efad6f3bd5a1a810c467f bugzilla-2.22.2.tar.gz +9a56a47cdbfcb70a85ad73d923ac7e9d bugzilla-3.0.tar.gz From c277aab0be80140e2c8fbb45bcbf26361744af5b Mon Sep 17 00:00:00 2001 From: John Berninger Date: Thu, 31 May 2007 17:56:26 +0000 Subject: [PATCH 03/16] update tag for f-7 branch --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 20096a9..56d5da1 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.0 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -137,6 +137,9 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog +* Thu May 31 2007 John Berninger - 3.0-3 +- Update tag for F-7 branch + * Fri May 18 2007 John Berninger - 3.0-2 - update Requires for bz's 241037, 241206 From 3b182f5b86fc33cf9b6b59773dd6edd8ec7c59a4 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Thu, 31 May 2007 18:06:42 +0000 Subject: [PATCH 04/16] file maintenance - remove old patches, add new --- bugzilla-config-path.patch | 16 ---------------- bugzilla-data-dir.patch | 16 ---------------- 2 files changed, 32 deletions(-) delete mode 100644 bugzilla-config-path.patch delete mode 100644 bugzilla-data-dir.patch diff --git a/bugzilla-config-path.patch b/bugzilla-config-path.patch deleted file mode 100644 index 1ee006e..0000000 --- a/bugzilla-config-path.patch +++ /dev/null @@ -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"; diff --git a/bugzilla-data-dir.patch b/bugzilla-data-dir.patch deleted file mode 100644 index b8e2943..0000000 --- a/bugzilla-data-dir.patch +++ /dev/null @@ -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"; From 3e87db6f8c07e6947cd7aaddd40a203c3ab60ae6 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Thu, 31 May 2007 18:08:28 +0000 Subject: [PATCH 05/16] let's not forget to actually cvs add when we want to add a file... --- bugzilla-rw-paths.patch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 bugzilla-rw-paths.patch diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch new file mode 100644 index 0000000..cb80387 --- /dev/null +++ b/bugzilla-rw-paths.patch @@ -0,0 +1,28 @@ +diff -ru bugzilla-orig/Bugzilla/Constants.pm bugzilla-3.0/Bugzilla/Constants.pm +--- bugzilla-orig/Bugzilla/Constants.pm 2007-05-09 18:47:17.000000000 -0400 ++++ bugzilla-3.0/Bugzilla/Constants.pm 2007-05-19 15:56:02.000000000 -0400 +@@ -423,18 +423,18 @@ + 'cgi_path' => $libpath, + 'templatedir' => "$libpath/template", + 'project' => $project, +- 'localconfig' => "$libpath/$localconfig", +- 'datadir' => "$libpath/$datadir", +- 'attachdir' => "$libpath/$datadir/attachments", +- 'skinsdir' => "$libpath/skins/contrib", ++ 'localconfig' => "/etc/bugzilla/$localconfig", ++ 'datadir' => "/var/lib/bugzilla/$datadir", ++ 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", ++ 'skinsdir' => "$libpath/skins", + # $webdotdir must be in the webtree somewhere. Even if you use a + # local dot, we output images to there. Also, if $webdotdir is + # not relative to the bugzilla root directory, you'll need to + # change showdependencygraph.cgi to set image_url to the correct + # location. + # The script should really generate these graphs directly... +- 'webdotdir' => "$libpath/$datadir/webdot", +- 'extensionsdir' => "$libpath/extensions", ++ 'webdotdir' => "/var/lib/bugzilla/$datadir/webdot", ++ 'extensionsdir' => "/var/lib/bugzilla/extensions", + }; + } + From 1b4eaab81e9d35f360856286d2a3be116aeb4e3a Mon Sep 17 00:00:00 2001 From: John Berninger Date: Mon, 27 Aug 2007 13:12:18 +0000 Subject: [PATCH 06/16] update to 3.0.1 - bz 256021 --- .cvsignore | 2 +- bugzilla-rw-paths.patch | 13 ++++++------- bugzilla.spec | 8 ++++---- sources | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index e2adb8c..7c0b694 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.0.tar.gz +bugzilla-3.0.1.tar.gz diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch index cb80387..d6441e9 100644 --- a/bugzilla-rw-paths.patch +++ b/bugzilla-rw-paths.patch @@ -1,21 +1,20 @@ -diff -ru bugzilla-orig/Bugzilla/Constants.pm bugzilla-3.0/Bugzilla/Constants.pm ---- bugzilla-orig/Bugzilla/Constants.pm 2007-05-09 18:47:17.000000000 -0400 -+++ bugzilla-3.0/Bugzilla/Constants.pm 2007-05-19 15:56:02.000000000 -0400 -@@ -423,18 +423,18 @@ +diff -ru bugzilla-orig/Bugzilla/Constants.pm bugzilla-3.0.1/Bugzilla/Constants.pm +--- bugzilla-orig/Bugzilla/Constants.pm 2007-08-23 14:42:23.000000000 -0400 ++++ bugzilla-3.0.1/Bugzilla/Constants.pm 2007-08-27 08:50:50.000000000 -0400 +@@ -423,9 +423,9 @@ 'cgi_path' => $libpath, 'templatedir' => "$libpath/template", 'project' => $project, - 'localconfig' => "$libpath/$localconfig", - 'datadir' => "$libpath/$datadir", - 'attachdir' => "$libpath/$datadir/attachments", -- 'skinsdir' => "$libpath/skins/contrib", + 'localconfig' => "/etc/bugzilla/$localconfig", + 'datadir' => "/var/lib/bugzilla/$datadir", + 'attachdir' => "/var/lib/bugzilla/$datadir/attachments", -+ 'skinsdir' => "$libpath/skins", + 'skinsdir' => "$libpath/skins", # $webdotdir must be in the webtree somewhere. Even if you use a # local dot, we output images to there. Also, if $webdotdir is - # not relative to the bugzilla root directory, you'll need to +@@ -433,8 +433,8 @@ # change showdependencygraph.cgi to set image_url to the correct # location. # The script should really generate these graphs directly... diff --git a/bugzilla.spec b/bugzilla.spec index 56d5da1..d9cd5ec 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.0 +Version: 3.0.1 Group: Applications/Publishing -Release: 3%{?dist} +Release: 0%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -137,8 +137,8 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog -* Thu May 31 2007 John Berninger - 3.0-3 -- Update tag for F-7 branch +* Mon Aug 27 2007 John Berninger - 3.0.1-0 +- update to 3.0.1 - bz 256021 * Fri May 18 2007 John Berninger - 3.0-2 - update Requires for bz's 241037, 241206 diff --git a/sources b/sources index dc101de..7ccceea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a56a47cdbfcb70a85ad73d923ac7e9d bugzilla-3.0.tar.gz +9793a01c1b53ec09fe42de8d62381176 bugzilla-3.0.1.tar.gz From 588d6a4927ef11cca0d7f90e4b0ff839e1092ec6 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Mon, 24 Sep 2007 17:09:02 +0000 Subject: [PATCH 07/16] update to 3.0.2 - bz 299981 --- .cvsignore | 2 +- bugzilla.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7c0b694..e678f58 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.0.1.tar.gz +bugzilla-3.0.2.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index d9cd5ec..c669bdd 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,7 +4,7 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.0.1 +Version: 3.0.2 Group: Applications/Publishing Release: 0%{?dist} License: MPL @@ -137,6 +137,9 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog +* Mon Sep 24 2007 John Berninger - 3.0.2-0 +- update to 3.0.2 - bz 299981 + * Mon Aug 27 2007 John Berninger - 3.0.1-0 - update to 3.0.1 - bz 256021 diff --git a/sources b/sources index 7ccceea..d4f2fda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9793a01c1b53ec09fe42de8d62381176 bugzilla-3.0.1.tar.gz +53afb2c5d4c105ed2f4b2ba4ccfcedc7 bugzilla-3.0.2.tar.gz From 1297054ec4a632288934b0dbcb871e033d1b2eec Mon Sep 17 00:00:00 2001 From: John Berninger Date: Mon, 22 Oct 2007 14:54:10 +0000 Subject: [PATCH 08/16] updates for BZ's 279961, 295861, 339531 --- bugzilla-httpd-conf | 2 +- bugzilla.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf index c251546..e8406ca 100644 --- a/bugzilla-httpd-conf +++ b/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 Option FileInfo diff --git a/bugzilla.spec b/bugzilla.spec index c669bdd..ddcfedb 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.0.2 Group: Applications/Publishing -Release: 0%{?dist} +Release: 1%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -14,7 +14,7 @@ Source2: README.fedora.bugzilla Patch0: bugzilla-rw-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: smtpdaemon, webserver, graphviz, patchutils, mod_perl, perl-SOAP-Lite, perl-Email-Simple, perl-Email-MIME-Modifier, perl-Template-Toolkit, perl-MIME-tools, perl-Email-MIME-Attachment-Stripper, perl-Email-Send, perl-Email-Reply, perl-Email-MIME, perl-Email-Address +Requires: smtpdaemon, webserver, patchutils, mod_perl, perl-SOAP-Lite, perl-Email-Simple, perl-Email-MIME-Modifier, perl-Template-Toolkit, perl-MIME-tools, perl-Email-MIME-Attachment-Stripper, perl-Email-Send, perl-Email-Reply, perl-Email-MIME, perl-Email-Address, which %package doc Summary: Bugzilla documentation @@ -137,6 +137,9 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog +* Mon Oct 22 2007 John Berninger - 3.0.2-1 +- updates to requires and httpd conf for BZ's 279961, 295861, 339531 + * Mon Sep 24 2007 John Berninger - 3.0.2-0 - update to 3.0.2 - bz 299981 From 7bc64c2307628450777d9cc267641fcd144d088a Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 26 Oct 2007 15:41:03 +0000 Subject: [PATCH 09/16] fix http startup big with AllowOverride Options --- bugzilla-httpd-conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf index e8406ca..e8fbb38 100644 --- a/bugzilla-httpd-conf +++ b/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 Option FileInfo + AllowOverride Limit Options FileInfo From 82e5cbaacbc46df34d8cebc093d6e0a0f64bf99d Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 26 Oct 2007 15:44:32 +0000 Subject: [PATCH 10/16] update release --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index ddcfedb..0f735a0 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.0.2 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -137,6 +137,9 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog +* Fri Oct 26 2007 John Berninger - 3.0.2-2 +- fix issue with AlowOverride Options + * Mon Oct 22 2007 John Berninger - 3.0.2-1 - updates to requires and httpd conf for BZ's 279961, 295861, 339531 From 8e698f25d767460fc7f35fb9ca1b277fa32251f0 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 28 Dec 2007 17:44:02 +0000 Subject: [PATCH 11/16] cronjob fix - bz 426465 --- README.fedora.bugzilla | 9 +++++++++ bugzilla.spec | 16 +++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/README.fedora.bugzilla b/README.fedora.bugzilla index ea9b201..2611a75 100644 --- a/README.fedora.bugzilla +++ b/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). diff --git a/bugzilla.spec b/bugzilla.spec index 0f735a0..d757f25 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.0.2 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -75,15 +75,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}/%{bzintallprefix}/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 @@ -117,10 +115,6 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/template %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 @@ -137,6 +131,10 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog +* Fri Dec 28 2007 John Berninger - 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 - 3.0.2-2 - fix issue with AlowOverride Options From df297c1239013f4e0f71432097b90b3d2c9fd8d4 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 28 Dec 2007 17:52:59 +0000 Subject: [PATCH 12/16] typo in spec file --- bugzilla.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index d757f25..b62bd69 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.0.2 Group: Applications/Publishing -Release: 3%{?dist} +Release: 5%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -81,7 +81,7 @@ cat << EOM > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.daily cd %{bzinstallprefix}/bugzilla ./collectstats.pl EOM -echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{bzintallprefix}/bugzilla/cron.whine +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 @@ -131,6 +131,9 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog +* Fri Dec 28 2007 John Berninger - 3.0.2-5 +- Typo in spec file, rebuild + * Fri Dec 28 2007 John Berninger - 3.0.2-3 - bz 426465 - don't enable cron jobs so cron doesn't complain about an unconfigured installation From bad73d4c2bca042563fbcd402f7f7c9c7ede2fb7 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 28 Dec 2007 17:59:34 +0000 Subject: [PATCH 13/16] spec errors --- bugzilla.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index b62bd69..cbd8a7e 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/ Name: bugzilla Version: 3.0.2 Group: Applications/Publishing -Release: 5%{?dist} +Release: 6%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -113,6 +113,8 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/skins %{bzinstallprefix}/bugzilla/t %{bzinstallprefix}/bugzilla/template +%{bzinstallprefix}/bugzilla/cron.daily +%{bzinstallprefix}/bugzilla/cron.whine %ghost %{bzinstallprefix}/bugzilla/bugzilla-req %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf %defattr(-,root,root,-) @@ -131,6 +133,9 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog +* Fri Dec 28 2007 John Berninger - 3.0.2-6 +- Add cron.daily, cron.whine to payload list + * Fri Dec 28 2007 John Berninger - 3.0.2-5 - Typo in spec file, rebuild From ee29df90aff510990beed9ef733d903be08d2b78 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 9 May 2008 13:43:23 +0000 Subject: [PATCH 14/16] security update to upstream 3.0.4 --- .cvsignore | 2 +- bugzilla.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index e678f58..6a34202 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bugzilla-3.0.2.tar.gz +bugzilla-3.0.4.tar.gz diff --git a/bugzilla.spec b/bugzilla.spec index cbd8a7e..41aa472 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,9 +4,9 @@ Summary: Bug tracking system URL: http://www.bugzilla.org/ Name: bugzilla -Version: 3.0.2 +Version: 3.0.4 Group: Applications/Publishing -Release: 6%{?dist} +Release: 1%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -124,6 +124,7 @@ popd > /dev/null %doc UPGRADING-pre-2.8 %doc README.fedora %dir %{bzdatadir} +%defattr(0750,root,apache,-) %dir %{_sysconfdir}/bugzilla %files doc @@ -133,6 +134,10 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog +* Fri May 9 2008 John Berninger - 3.0.4-1 +- Update to upstream 3.0.4 to fix multiple security vulns +- Change perms on /etc/bugzilla for bz 427981 + * Fri Dec 28 2007 John Berninger - 3.0.2-6 - Add cron.daily, cron.whine to payload list diff --git a/sources b/sources index d4f2fda..e0ea8df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53afb2c5d4c105ed2f4b2ba4ccfcedc7 bugzilla-3.0.2.tar.gz +f55a3f3cde9cf1bf56492d18c8f7afe4 bugzilla-3.0.4.tar.gz From cca4cebe25052ed8b23de38094fb35c79c145c6d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:23:55 +0000 Subject: [PATCH 15/16] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c2b3080..8518ff4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 36c59fd5c4fc78dabc44990c8539f3acb05f1073 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:18:49 +0000 Subject: [PATCH 16/16] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8518ff4..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7