- fix german bugzilla templates (security fixes)

Feature safe: yes

6 files changed, 231 insertions, 13 deletions

diff --git a/german/bugzilla/Makefile b/german/bugzilla/Makefile
index d995811bd3d2..151f080710e1 100644
--- a/german/bugzilla/Makefile
+++ b/german/bugzilla/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bugzilla
 PORTVERSION=	4.0.8
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	german
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
@@ -21,9 +21,10 @@ NO_WRKSUBDIR=	yes
 
 LANGDIR=	${WWWDIR}/template/de
 
-#post-patch:
-#	${REINPLACE_CMD} -i '' -e 's/4.0.7/4.0.8/' \
-#		${WRKDIR}/de/default/global/gzversion.html.tmpl
+post-patch:
+	@${REINPLACE_CMD} -i '' -e 's/4.0.8/4.0.9/' \
+		${WRKDIR}/de/default/global/gzversion.html.tmpl
+	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 do-install:
 	@-${MKDIR} ${LANGDIR}
diff --git a/german/bugzilla/files/patch-4.0.8_4.0.9 b/german/bugzilla/files/patch-4.0.8_4.0.9
new file mode 100644
index 000000000000..ad9ba21aec96
--- /dev/null
+++ b/german/bugzilla/files/patch-4.0.8_4.0.9
@@ -0,0 +1,55 @@
+--- ./de/default/bug/create/create.html.tmpl.orig
++++ ./de/default/bug/create/create.html.tmpl
+@@ -252,7 +252,7 @@
+       <script type="text/javascript">
+        <!--
+          [%+ INCLUDE "bug/field-events.js.tmpl"
+-                    field = bug_fields.component %]
++                    field = bug_fields.component product = product %]
+        //-->
+        </script>
+     </td>
+--- ./de/default/bug/field.html.tmpl.orig
++++ ./de/default/bug/field.html.tmpl
+@@ -156,7 +156,7 @@
+         <script type="text/javascript">
+         <!--
+           initHidingOptionsForIE('[% field.name FILTER js %]');
+-          [%+ INCLUDE "bug/field-events.js.tmpl" field = field %]
++          [%+ INCLUDE "bug/field-events.js.tmpl" field = field product = bug.product_obj %]
+         //-->
+         </script>
+ 
+--- ./de/default/filterexceptions.pl.orig
++++ ./de/default/filterexceptions.pl
+@@ -224,7 +224,6 @@
+ 
+ 'global/confirm-user-match.html.tmpl' => [
+   'script',
+-  'fields.${field_name}.flag_type.name',
+ ],
+ 
+ 'global/site-navigation.html.tmpl' => [
+--- ./de/default/global/code-error.html.tmpl.orig
++++ ./de/default/global/code-error.html.tmpl
+@@ -268,8 +268,7 @@
+     [%+ constants.bz_locations.localconfig FILTER html %].
+ 
+   [% ELSIF error == "mismatched_bug_ids_on_obsolete" %]
+-    Anhang [% attach_id FILTER html %] (<em>[% description FILTER html %]</em>)
+-    gehört zu [% terms.bug %] [%+ attach_bug_id FILTER html %],
++    Anhang [% attach_id FILTER html %] gehört zu [% terms.bug %],
+     daher ist es nicht möglich, ihn während der Anlage eines
+     Anhangs zu einem anderen [% terms.bug %] (in Ihrem
+     Fall [% terms.bug %] [%+ my_bug_id FILTER html %]) als obsolet zu markieren.
+--- ./de/default/global/confirm-user-match.html.tmpl.orig
++++ ./de/default/global/confirm-user-match.html.tmpl
+@@ -209,7 +209,7 @@
+   [% ELSIF field_labels.$field_name %]
+     [% field_labels.$field_name FILTER html %]
+   [% ELSIF field_name.match("^requestee") %]
+-    [% fields.${field_name}.flag_type.name %] Anfrager
++    [% fields.${field_name}.flag_type.name FILTER html %] Anfrager
+   [% ELSE %]
+     [% field_name FILTER html %]
+   [% END %]
diff --git a/german/bugzilla3/Makefile b/german/bugzilla3/Makefile
index 18556c8461f3..03e84d0e0c4c 100644
--- a/german/bugzilla3/Makefile
+++ b/german/bugzilla3/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bugzilla
 PORTVERSION=	3.6.11
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	german
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
@@ -21,9 +21,10 @@ NO_WRKSUBDIR=	yes
 
 LANGDIR=	${WWWDIR}/template/de
 
-#post-patch:
-#	${REINPLACE_CMD} -i '' -e 's/3.6.10/3.6.11/' \
-#		${WRKDIR}/de/default/global/gzversion.html.tmpl
+post-patch:
+	@${REINPLACE_CMD} -i '' -e 's/3.6.11/3.6.12/' \
+		${WRKDIR}/de/default/global/gzversion.html.tmpl
+	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 do-install:
 	@-${MKDIR} ${LANGDIR}
diff --git a/german/bugzilla3/files/patch-3.6.11_3.6.12 b/german/bugzilla3/files/patch-3.6.11_3.6.12
new file mode 100644
index 000000000000..4205c901b4f1
--- /dev/null
+++ b/german/bugzilla3/files/patch-3.6.11_3.6.12
@@ -0,0 +1,44 @@
+--- ./de/default/bug/field.html.tmpl.orig	2012-11-14 20:59:42.000000000 +0100
++++ ./de/default/bug/field.html.tmpl	2012-11-14 21:00:52.000000000 +0100
+@@ -173,7 +173,7 @@
+         <script type="text/javascript">
+         <!--
+           initHidingOptionsForIE('[% field.name FILTER js %]');
+-          [%+ INCLUDE "bug/field-events.js.tmpl" field = field %]
++          [%+ INCLUDE "bug/field-events.js.tmpl" field = field product = bug.product_obj %]
+         //-->
+         </script>
+ 
+--- ./de/default/filterexceptions.pl.orig	2012-11-14 20:59:42.000000000 +0100
++++ ./de/default/filterexceptions.pl	2012-11-14 21:01:14.000000000 +0100
+@@ -229,7 +229,6 @@
+ 
+ 'global/confirm-user-match.html.tmpl' => [
+   'script',
+-  'fields.${field_name}.flag_type.name',
+ ],
+ 
+ 'global/site-navigation.html.tmpl' => [
+--- ./de/default/global/code-error.html.tmpl.orig	2012-11-14 20:59:42.000000000 +0100
++++ ./de/default/global/code-error.html.tmpl	2012-11-14 21:01:59.000000000 +0100
+@@ -278,8 +278,7 @@
+     [%+ constants.bz_locations.localconfig FILTER html %].
+ 
+   [% ELSIF error == "mismatched_bug_ids_on_obsolete" %]
+-    Anhang [% attach_id FILTER html %] (<em>[% description FILTER html %]</em>)
+-    gehört zu [% terms.bug %] [%+ attach_bug_id FILTER html %],
++    Anhang [% attach_id FILTER html %] gehört zu [% terms.bug %],
+     daher ist es nicht möglich, ihn während der Anlage eines
+     Anhangs zu einem anderen [% terms.bug %] (in Ihrem
+     Fall [% terms.bug %] [%+ my_bug_id FILTER html %]) als obsolet zu markieren.
+--- ./de/default/global/confirm-user-match.html.tmpl.orig	2012-11-14 20:59:42.000000000 +0100
++++ ./de/default/global/confirm-user-match.html.tmpl	2012-11-14 21:02:55.000000000 +0100
+@@ -204,7 +204,7 @@
+   [% ELSIF field_labels.$field_name %]
+     [% field_labels.$field_name FILTER html %]
+   [% ELSIF field_name.match("^requestee") %]
+-    [% fields.${field_name}.flag_type.name %] Anfrager
++    [% fields.${field_name}.flag_type.name FILTER html %] Anfrager
+   [% ELSE %]
+     [% field_name FILTER html %]
+   [% END %]
diff --git a/german/bugzilla42/Makefile b/german/bugzilla42/Makefile
index 6d95051dd539..2dd3efc6914d 100644
--- a/german/bugzilla42/Makefile
+++ b/german/bugzilla42/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bugzilla
 PORTVERSION=	4.2.3
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	german
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=bugzilla-de/${PORTVERSION:R}/${PORTVERSION}
@@ -21,10 +21,10 @@ NO_WRKSUBDIR=	yes
 
 LANGDIR=	${WWWDIR}/template/de
 
-#post-patch:
-#	@${REINPLACE_CMD} -i '' -e 's/4.2.2/4.2.3/' \
-#		${WRKDIR}/de/default/global/gzversion.html.tmpl
-#	@${FIND} ${WRKDIR} -type f -name \*.orig -delete
+post-patch:
+	@${REINPLACE_CMD} -i '' -e 's/4.2.3/4.2.4/' \
+		${WRKDIR}/de/default/global/gzversion.html.tmpl
+	@${FIND} ${WRKDIR}/de/default/ -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 do-install:
 	@-${MKDIR} ${LANGDIR}
diff --git a/german/bugzilla42/files/patch-4.2.3_4.2.4 b/german/bugzilla42/files/patch-4.2.3_4.2.4
new file mode 100644
index 000000000000..9f296697b565
--- /dev/null
+++ b/german/bugzilla42/files/patch-4.2.3_4.2.4
@@ -0,0 +1,117 @@
+--- ./de/default/bug/edit.html.tmpl.orig
++++ ./de/default/bug/edit.html.tmpl
+@@ -32,8 +32,8 @@
+ 
+ [% PROCESS bug/time.html.tmpl %]
+ 
+-  <script type="text/javascript">
+-  <!--
++<script type="text/javascript">
++<!--
+ 
+   /* Outputs a link to call replyToComment(); used to reduce HTML output */
+   function addReplyLink(id, real_id) {
+@@ -121,6 +121,7 @@
+ 
+ [% END %]
+ 
++[% IF user.id %]
+   /* Index all classifications so we can keep track of the classification
+    * for the selected product, which could control field visibility.
+    */
+@@ -130,8 +131,9 @@
+           [%- product.classification.name FILTER js %]';
+   [%- END %]
+ 
+-  //-->
+-  </script>
++[%- END %]
++//-->
++</script>
+ 
+ <form name="changeform" id="changeform" method="post" action="process_bug.cgi">
+ 
+--- ./de/default/filterexceptions.pl.orig
++++ ./de/default/filterexceptions.pl
+@@ -108,7 +108,6 @@
+   'other_format.name',
+   'sizeurl',
+   'switchbase',
+-  'format',
+   'cumulate',
+ ],
+ 
+@@ -214,7 +213,6 @@
+ 
+ 'global/confirm-user-match.html.tmpl' => [
+   'script',
+-  'fields.${field_name}.flag_type.name',
+ ],
+ 
+ 'global/site-navigation.html.tmpl' => [
+--- ./de/default/global/code-error.html.tmpl.orig
++++ ./de/default/global/code-error.html.tmpl
+@@ -263,8 +263,7 @@
+     [%+ constants.bz_locations.localconfig FILTER html %].
+ 
+   [% ELSIF error == "mismatched_bug_ids_on_obsolete" %]
+-    Anhang [% attach_id FILTER html %] (<em>[% description FILTER html %]</em>)
+-    gehört zu [% terms.bug %] [%+ attach_bug_id FILTER html %],
++    Anhang [% attach_id FILTER html %] gehört zu [% terms.bug %],
+     daher ist es nicht möglich, ihn während der Anlage eines
+     Anhangs zu einem anderen [% terms.bug %] (in Ihrem
+     Fall [% terms.bug %] [%+ my_bug_id FILTER html %]) als obsolet zu markieren.
+--- ./de/default/global/confirm-user-match.html.tmpl.orig
++++ ./de/default/global/confirm-user-match.html.tmpl
+@@ -209,7 +209,7 @@
+   [% ELSIF field_labels.$field_name %]
+     [% field_labels.$field_name FILTER html %]
+   [% ELSIF field_name.match("^requestee") %]
+-    [% fields.${field_name}.flag_type.name %] Anfrager
++    [% fields.${field_name}.flag_type.name FILTER html %] Anfrager
+   [% ELSE %]
+     [% field_name FILTER html %]
+   [% END %]
+--- ./de/default/global/field-descs.none.tmpl.orig
++++ ./de/default/global/field-descs.none.tmpl
+@@ -134,6 +134,7 @@
+      "setting"                 => "Einstellungstyp",
+      "settings"                => "Einstellungstypen",
+      "short_desc"              => "Kurzbeschreibung",
++     "short_short_desc"        => "Kurzbeschreibung",
+      "status_whiteboard"       => "Statusnotiz",
+      "tag.name"                => "Schlagwörter",
+      "target_milestone"        => "Ziel-Meilenstein",
+--- ./de/default/global/user-error.html.tmpl.orig
++++ ./de/default/global/user-error.html.tmpl
+@@ -1970,7 +1970,7 @@
+ 
+     [% FOREACH q = Bugzilla.user.queries %]
+       [% IF q.name == namedcmd %]
+-        or <a href="query.cgi?[% q.url FILTER uri %]">bearbeiten</a>
++        or <a href="query.cgi?[% q.url FILTER html %]">bearbeiten</a>
+       [% END %]
+     [% END %].
+   </p>
+--- ./de/default/reports/report-table.html.tmpl.orig
++++ ./de/default/reports/report-table.html.tmpl
+@@ -104,7 +104,7 @@
+   var myColumnDefs = [
+         {key:"row_title", label:"", sortable:true, sortOptions: { sortFunction:totalNumberSorter }},
+         [% FOREACH col = col_names %]
+-          {key:"[% col FILTER js %]", label:"[% display_value(col_field, col) FILTER js %]", sortable:true,
++          {key:"[% col FILTER js %]", label:"[% display_value(col_field, col) FILTER html FILTER js %]", sortable:true,
+            formatter:this.Linkify, sortOptions: { defaultDir: YAHOO.widget.DataTable.CLASS_DESC, sortFunction:totalNumberSorter }},
+         [% END %]
+         {key:"total", label:"Gesamt", sortable:true, formatter:this.LinkifyTotal,
+--- ./de/default/reports/report.html.tmpl.orig
++++ ./de/default/reports/report.html.tmpl
+@@ -172,7 +172,7 @@
+       zu diesem Bericht ändern</a>
+     [% ELSE %]
+       <a href="query.cgi?[% switchbase %]&amp;chart_format=
+-        [% format %]&amp;format=report-graph&amp;cumulate=[% cumulate %]">
++        [% format FILTER uri %]&amp;format=report-graph&amp;cumulate=[% cumulate %]">
+         Abfrage zu diesem Bericht ändern
+       </a>
+     [% END %]