diff options
-rw-r--r-- | po/de.po | 8 | ||||
-rw-r--r-- | po/fr.po | 8 | ||||
-rw-r--r-- | po/ja.po | 8 | ||||
-rw-r--r-- | po/quilt.pot | 8 | ||||
-rw-r--r-- | quilt.changes | 5 | ||||
-rw-r--r-- | quilt/push.in | 3 |
6 files changed, 24 insertions, 16 deletions
@@ -896,7 +896,7 @@ msgstr "Kein Patch entfernt\\n" msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" -#: quilt/pop.in:273 quilt/push.in:368 +#: quilt/pop.in:273 quilt/push.in:371 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" @@ -998,15 +998,15 @@ msgstr "Patch %s scheint leer zu sein; angewandt\\n" msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Patch %s angewandt (erzwungen, muss aufgefrischt werden (Refresh))\\n" -#: quilt/push.in:226 +#: quilt/push.in:228 msgid "Patch %s can be reverse-applied\\n" msgstr "Patch %s kann verkehrt angewandt werden\\n" -#: quilt/push.in:229 +#: quilt/push.in:231 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "Patch %s lässt sich nicht anwenden (erzwingen mit -f)\\n" -#: quilt/push.in:348 +#: quilt/push.in:351 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" @@ -903,7 +903,7 @@ msgstr "Aucun patch retir\\n" msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqu\\n" -#: quilt/pop.in:273 quilt/push.in:368 +#: quilt/pop.in:273 quilt/push.in:371 msgid "Now at patch %s\\n" msgstr "Le patch %s est maintenant au sommet\\n" @@ -1012,16 +1012,16 @@ msgstr "Le patch %s semble vide. Il a t appliqu.\\n" msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "%s a t appliqu (forc ; vous devriez le rafrachir)\\n" -#: quilt/push.in:226 +#: quilt/push.in:228 msgid "Patch %s can be reverse-applied\\n" msgstr "Le patch %s peut tre appliqu l'envers\\n" -#: quilt/push.in:229 +#: quilt/push.in:231 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" "Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n" -#: quilt/push.in:348 +#: quilt/push.in:351 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Le patch au sommet %s doit tre rafraichi au pralable.\\n" @@ -877,7 +877,7 @@ msgstr "適用されているパッチはありません\\n" msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:273 quilt/push.in:368 +#: quilt/pop.in:273 quilt/push.in:371 msgid "Now at patch %s\\n" msgstr "現在位置はパッチ %s です\\n" @@ -982,15 +982,15 @@ msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" "パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n" -#: quilt/push.in:226 +#: quilt/push.in:228 msgid "Patch %s can be reverse-applied\\n" msgstr "パッチ %s は、反転して適用することができます\\n" -#: quilt/push.in:229 +#: quilt/push.in:231 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n" -#: quilt/push.in:348 +#: quilt/push.in:351 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "最上位パッチのリフレッシュが最初に必要です。\\n" diff --git a/po/quilt.pot b/po/quilt.pot index f744765..2dfd7d4 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -607,7 +607,7 @@ msgstr "" msgid "No patches applied\\n" msgstr "" -#: quilt/pop.in:273 quilt/push.in:368 +#: quilt/pop.in:273 quilt/push.in:371 msgid "Now at patch %s\\n" msgstr "" @@ -679,15 +679,15 @@ msgstr "" msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" -#: quilt/push.in:226 +#: quilt/push.in:228 msgid "Patch %s can be reverse-applied\\n" msgstr "" -#: quilt/push.in:229 +#: quilt/push.in:231 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" -#: quilt/push.in:348 +#: quilt/push.in:351 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index ffc7e94..73a4e74 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Jan 29 12:19:24 CET 2006 - khali@linux-fr.org + +- quilt/push.in: Fix a temporary file leak and vulnerability. + +------------------------------------------------------------------- Sun Jan 29 10:48:48 CET 2006 - khali@linux-fr.org - quilt/scripts/patchfns.in: Drop an unused local variable in diff --git a/quilt/push.in b/quilt/push.in index 7413782..bbf3310 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -219,6 +219,8 @@ add_patch() fi else rollback_patch $patch + tmp="$(gen_tempfile)" + no_reject_files="-r $tmp" opt_reverse=1 if apply_patch $patch "$patch_file" > /dev/null 2> /dev/null then @@ -229,6 +231,7 @@ add_patch() printf $"Patch %s does not apply (enforce with -f)\n" \ "$(print_patch $patch)" fi + rm -f $tmp status=1 fi trap - SIGINT |