瀏覽代碼

dpkg-buildpackage: Call gpg with --utf8-strings

(signfile): Call gpg with --utf8-strings since otherwise the key
lookup fails with non-ASCII UTF8-encoded names. Since Debian
changelogs should be UTF8 encoded, this is probably the more sane
default.
Frank Lichtenheld 19 年之前
父節點
當前提交
a129e78367
共有 3 個文件被更改,包括 17 次插入1 次删除
  1. 12 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 2 1
      scripts/dpkg-buildpackage.pl

+ 12 - 0
ChangeLog

@@ -1,3 +1,15 @@
+2007-09-29  Frank Lichtenheld  <djpig@debian.org>
+
+	* scripts/dpkg-buildpackage.pl (signfile): Call
+	gpg with --utf8-strings since otherwise the key
+	lookup fails with non-ASCII UTF8-encoded names.
+	Since Debian changelogs should be UTF8 encoded,
+	this is probably the more sane default. This
+	will probably break if one uses a non-UTF8 locale
+	and tries to give a uid on the commandline that
+	contains non-ASCII chars. I think we can live with
+	that.
+
 2007-09-28  Frank Lichtenheld  <djpig@debian.org>
 
 	* scripts/dpkg-buildpackage.pl (withecho): Remove

+ 3 - 0
debian/changelog

@@ -30,6 +30,9 @@ dpkg (1.14.7) UNRELEASED; urgency=low
     Jari Aalto. Closes: #440972
   * Rework documentation of dpkg-source's -i and -I options.
     Closes: #323911, #440956
+  * Add --utf8-strings to gpg call in dpkg-buildpackage since
+    that seems to be the better default. Suggested by Székelyi Szabolcs.
+    Closes: #379418
 
   [ Updated dpkg translations ]
   * Basque (Piarres Beobide). Closes: #440859

+ 2 - 1
scripts/dpkg-buildpackage.pl

@@ -300,7 +300,8 @@ sub signfile {
 
     if ($signinterface eq 'gpg') {
 	system("(cat ../$qfile ; echo '') | ".
-	       "$signcommand --local-user ".quotemeta($signkey||$maintainer).
+	       "$signcommand --utf8-strings --local-user "
+	       .quotemeta($signkey||$maintainer).
 	       " --clearsign --armor --textmode  > ../$qfile.asc");
     } else {
 	system("$signcommand -u ".quotemeta($signkey||$maintainer).