- Move to 2.18 release

- No ChangeLog available only known change:
  Incorporate patches from last security issue

5 files changed, 25 insertions, 42 deletions

diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 5d1068525c3..42c938ff974 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/01/15 09:33:48 adrianp Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/17 23:03:17 adrianp Exp $
 #
 
-DISTNAME=	bugzilla-2.18rc3
-PKGREVISION=	1
+DISTNAME=	bugzilla-2.18
 CATEGORIES=	www devel
 MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/webtools/
 
diff --git a/devel/bugzilla/PLIST b/devel/bugzilla/PLIST
index 0e19403611d..03104e7874e 100644
--- a/devel/bugzilla/PLIST
+++ b/devel/bugzilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/02 13:39:55 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/17 23:03:17 adrianp Exp $
 share/examples/bugzilla/bugzilla.conf
 share/examples/bugzilla/localconfig
 share/bugzilla/1x1.gif
@@ -112,6 +112,25 @@ share/bugzilla/docs/html/using-intro.html
 share/bugzilla/docs/html/using.html
 share/bugzilla/docs/html/versions.html
 share/bugzilla/docs/html/voting.html
+share/bugzilla/docs/html/cmdline-bugmail.html
+share/bugzilla/docs/html/flags-overview.html
+share/bugzilla/docs/html/general-advice.html
+share/bugzilla/docs/html/lifecycle.html
+share/bugzilla/docs/html/modules-manual-optional.html
+share/bugzilla/docs/html/paranoid-security.html
+share/bugzilla/docs/html/security-bugzilla.html
+share/bugzilla/docs/html/security-mysql.html
+share/bugzilla/docs/html/security-os.html
+share/bugzilla/docs/html/security-webserver.html
+share/bugzilla/docs/html/security.html
+share/bugzilla/docs/html/trbl-index.html
+share/bugzilla/docs/html/trbl-relogin-everyone.html
+share/bugzilla/docs/html/trouble-filetemp.html
+share/bugzilla/docs/html/x2868.html
+share/bugzilla/docs/html/x2875.html
+share/bugzilla/docs/html/x2885.html
+share/bugzilla/docs/html/x2890.html
+share/bugzilla/docs/html/x2944.html
 share/bugzilla/docs/images/callouts/1.gif
 share/bugzilla/docs/images/callouts/2.gif
 share/bugzilla/docs/images/callouts/3.gif
@@ -145,7 +164,6 @@ share/bugzilla/post_bug.cgi
 share/bugzilla/process_bug.cgi
 share/bugzilla/productmenu.js
 share/bugzilla/query.cgi
-share/bugzilla/queryhelp.cgi
 share/bugzilla/quicksearch.html
 share/bugzilla/quicksearch.js
 share/bugzilla/quicksearchhack.html
diff --git a/devel/bugzilla/distinfo b/devel/bugzilla/distinfo
index d49d4b6cd3f..7a2281bbdbc 100644
--- a/devel/bugzilla/distinfo
+++ b/devel/bugzilla/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/01/06 13:15:27 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2005/01/17 23:03:17 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
+SHA1 (bugzilla-2.18.tar.gz) = 308e306309dbf1f6b284d2f3533e7c463e263558
+Size (bugzilla-2.18.tar.gz) = 1490302 bytes
diff --git a/devel/bugzilla/patches/patch-aa b/devel/bugzilla/patches/patch-aa
deleted file mode 100644
index 269c04112d3..00000000000
--- a/devel/bugzilla/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index 4d55cee3e9c..00000000000
--- a/devel/bugzilla/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$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>