Bump to nb1 for recent security issue:

https://bugzilla.mozilla.org/show_bug.cgi?id=272620

5 files changed, 40 insertions, 4 deletions

diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index daed064f3d0..f71ae7a4480 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/02 13:39:55 adrianp Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/06 13:15:27 adrianp Exp $
 #
 
 DISTNAME=	bugzilla-2.18rc3
+PKGREVISION=	1
 CATEGORIES=	www devel
 MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/webtools/
 
@@ -13,7 +14,7 @@ DEPENDS+=	p5-AppConfig>=1.52:../../devel/p5-AppConfig
 DEPENDS+=	p5-CGI>=2.93:../../www/p5-CGI
 DEPENDS+=	p5-File-Spec>=0.82:../../devel/p5-File-Spec
 DEPENDS+=	p5-File-Temp-[0-9]*:../../devel/p5-File-Temp
-DEPENDS+=	p5-Template-Toolkit>=2.08:../../www/p5-Template-Toolkit
+#DEPENDS+=	p5-Template-Toolkit>=2.08:../../www/p5-Template-Toolkit
 DEPENDS+=	p5-Text-Tabs+Wrap>=2001.0131:../../textproc/p5-Text-Tabs+Wrap
 DEPENDS+=	p5-TimeDate>=1.14:../../time/p5-TimeDate
 DEPENDS+=	p5-DBD-mysql>=2.1010:../../databases/p5-DBD-mysql
diff --git a/devel/bugzilla/distinfo b/devel/bugzilla/distinfo
index 26577abc37b..d49d4b6cd3f 100644
--- a/devel/bugzilla/distinfo
+++ b/devel/bugzilla/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/01/02 13:39:55 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2005/01/06 13:15:27 adrianp Exp $
 
 SHA1 (bugzilla-2.18rc3.tar.gz) = cf3810440a43de2d5b074270b5499c8be6da9ab3
 Size (bugzilla-2.18rc3.tar.gz) = 1234642 bytes
+SHA1 (patch-aa) = 3c3877b21028a8cae74ff05db7c30ec083ddf73c
+SHA1 (patch-ab) = c031bb35506ee667d4558256a70c94aac37ffccb
diff --git a/devel/bugzilla/patches/patch-aa b/devel/bugzilla/patches/patch-aa
new file mode 100644
index 00000000000..269c04112d3
--- /dev/null
+++ b/devel/bugzilla/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2005/01/06 13:15:27 adrianp Exp $
+
+--- template/en/default/global/code-error.html.tmpl.orig	2005-01-06 12:09:35.000000000 +0000
++++ template/en/default/global/code-error.html.tmpl	2005-01-06 12:10:39.000000000 +0000
+@@ -259,7 +259,10 @@
+     the time this message appeared.
+   </p>
+   <script type="text/javascript"> <!--
+-    document.write("<p>URL: " + document.location + "</p>");
++    document.write("<p>URL: " + 
++                    document.location.href.replace(/&/g,"&amp;")
++                                          .replace(/</g,"&lt;")
++                                          .replace(/>/g,"&gt;") + "</p>");
+   // -->
+   </script>
+ </tt>
diff --git a/devel/bugzilla/patches/patch-ab b/devel/bugzilla/patches/patch-ab
new file mode 100644
index 00000000000..4d55cee3e9c
--- /dev/null
+++ b/devel/bugzilla/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2005/01/06 13:15:27 adrianp Exp $
+
+--- Bugzilla/Error.pm.orig	2005-01-06 12:11:48.000000000 +0000
++++ Bugzilla/Error.pm	2005-01-06 12:13:13.000000000 +0000
+@@ -79,7 +79,10 @@
+             time this message appeared.
+           </p>
+           <script type="text/javascript"> <!--
+-            document.write("<p>URL: " + document.location + "</p>");
++          document.write("<p>URL: " + 
++                          document.location.href.replace(/&/g,"&amp;")
++                                                .replace(/</g,"&lt;")
++                                                .replace(/>/g,"&gt;") + "</p>");
+           // -->
+           </script>
+           <p>Template->process() failed twice.<br>
diff --git a/doc/CHANGES b/doc/CHANGES
index 54e361c4dd3..2cd60477120 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.8634 2005/01/06 13:08:43 adam Exp $
+$NetBSD: CHANGES,v 1.8635 2005/01/06 13:17:53 adrianp Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -144,3 +144,4 @@ Changes to the packages collection and infrastructure in 2005:
 	Updated xine-lib to 1rc8nb2 [tron 2005-01-06]
 	Updated nasm to 0.98.38nb1 [adrianp 2005-01-06]
 	Updated cmake to 2.0.5 [adam 2005-01-06]
+	Updated bugzilla to 2.18rc3nb1 [adrianp 2005-01-06]