Date: Wed, 14 Nov 2012 21:37:21 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307430 - in head/german: bugzilla bugzilla/files bugzilla3 bugzilla3/files bugzilla42 bugzilla42/files Message-ID: <201211142137.qAELbL2i056504@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Wed Nov 14 21:37:21 2012 New Revision: 307430 URL: http://svnweb.freebsd.org/changeset/ports/307430 Log: - fix german bugzilla templates (security fixes) Feature safe: yes Added: head/german/bugzilla/files/ head/german/bugzilla/files/patch-4.0.8_4.0.9 (contents, props changed) head/german/bugzilla3/files/ head/german/bugzilla3/files/patch-3.6.11_3.6.12 (contents, props changed) head/german/bugzilla42/files/ head/german/bugzilla42/files/patch-4.2.3_4.2.4 (contents, props changed) Modified: head/german/bugzilla/Makefile head/german/bugzilla3/Makefile head/german/bugzilla42/Makefile Modified: head/german/bugzilla/Makefile ============================================================================== --- head/german/bugzilla/Makefile Wed Nov 14 21:31:11 2012 (r307429) +++ head/german/bugzilla/Makefile Wed Nov 14 21:37:21 2012 (r307430) @@ -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} Added: head/german/bugzilla/files/patch-4.0.8_4.0.9 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/german/bugzilla/files/patch-4.0.8_4.0.9 Wed Nov 14 21:37:21 2012 (r307430) @@ -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 %] Modified: head/german/bugzilla3/Makefile ============================================================================== --- head/german/bugzilla3/Makefile Wed Nov 14 21:31:11 2012 (r307429) +++ head/german/bugzilla3/Makefile Wed Nov 14 21:37:21 2012 (r307430) @@ -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} Added: head/german/bugzilla3/files/patch-3.6.11_3.6.12 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/german/bugzilla3/files/patch-3.6.11_3.6.12 Wed Nov 14 21:37:21 2012 (r307430) @@ -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 %] Modified: head/german/bugzilla42/Makefile ============================================================================== --- head/german/bugzilla42/Makefile Wed Nov 14 21:31:11 2012 (r307429) +++ head/german/bugzilla42/Makefile Wed Nov 14 21:37:21 2012 (r307430) @@ -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} Added: head/german/bugzilla42/files/patch-4.2.3_4.2.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/german/bugzilla42/files/patch-4.2.3_4.2.4 Wed Nov 14 21:37:21 2012 (r307430) @@ -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 %]&chart_format= +- [% format %]&format=report-graph&cumulate=[% cumulate %]"> ++ [% format FILTER uri %]&format=report-graph&cumulate=[% cumulate %]"> + Abfrage zu diesem Bericht ändern + </a> + [% END %]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211142137.qAELbL2i056504>