From b73cc46a1bfb42e2eb4d4b5f89bf4b233ac0d1cf Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 04:41:12 +0000 Subject: [PATCH 1/9] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 975072f08bca7ee654ad9a51e1c0c43d27c4f641 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 26 Oct 2007 15:54:12 +0000 Subject: [PATCH 2/9] cvs update for tags for F8 --- bugzilla-httpd-conf | 2 +- bugzilla.spec | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf index c251546..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 + AllowOverride Limit Options FileInfo diff --git a/bugzilla.spec b/bugzilla.spec index c669bdd..7c21276 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: 3%{?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,12 @@ 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 + * Mon Sep 24 2007 John Berninger - 3.0.2-0 - update to 3.0.2 - bz 299981 From df832b69d21dc2a19b061f520d9a99f097d9b21d Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 28 Dec 2007 17:44:08 +0000 Subject: [PATCH 3/9] cronjob fix - bz 426465 --- README.fedora.bugzilla | 9 +++++++++ bugzilla.spec | 14 ++++++-------- 2 files changed, 15 insertions(+), 8 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 7c21276..d757f25 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -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 69bc970c9235579f19da8605e4378f61b375c784 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 28 Dec 2007 17:46:34 +0000 Subject: [PATCH 4/9] tag error --- bugzilla.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index d757f25..93316f5 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: 4%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -131,7 +131,7 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog -* Fri Dec 28 2007 John Berninger - 3.0.2-3 +* Fri Dec 28 2007 John Berninger - 3.0.2-4 - bz 426465 - don't enable cron jobs so cron doesn't complain about an unconfigured installation From 7de6566a6b537cc31aaba0fa1d9153879f9bc656 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 28 Dec 2007 17:49:37 +0000 Subject: [PATCH 5/9] tag errors --- bugzilla.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bugzilla.spec b/bugzilla.spec index 93316f5..cfa927f 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: 4%{?dist} +Release: 5%{?dist} License: MPL Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz Source1: bugzilla-httpd-conf @@ -131,6 +131,9 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog +* Fri Dec 28 2007 John Berninger - 3.0.2-5 +- tag errors + * Fri Dec 28 2007 John Berninger - 3.0.2-4 - bz 426465 - don't enable cron jobs so cron doesn't complain about an unconfigured installation From cb4c7dd63413a14354a0458d585d2b414881e617 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 28 Dec 2007 18:09:51 +0000 Subject: [PATCH 6/9] spec update --- bugzilla.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/bugzilla.spec b/bugzilla.spec index cfa927f..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 @@ -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 @@ -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,10 +133,13 @@ popd > /dev/null %{bzinstallprefix}/bugzilla/contrib %changelog -* Fri Dec 28 2007 John Berninger - 3.0.2-5 -- tag errors +* 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-4 +* 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 670d47dcc3f57e88b367a8b5a7ed40e68a78c229 Mon Sep 17 00:00:00 2001 From: John Berninger Date: Fri, 9 May 2008 13:48:27 +0000 Subject: [PATCH 7/9] update to upstream 3.0.4 for sec vulns --- .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 87da90f77ecef37dd9f9e9149e585338b8bba690 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:23:55 +0000 Subject: [PATCH 8/9] 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 122e7dbb02ec82861cccfa42882465cb23804c3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:18:48 +0000 Subject: [PATCH 9/9] 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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8