Author: djpig
Date: 2006-05-12 03:13:08 +0000 (Fri, 12 May 2006)
New Revision: 304
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/dpkg-source.pl
Log:
Use the Debian keyring in dpkg-source when checking signatures
of .dsc files, if available. Closes: #364726
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-05-12 03:03:18 UTC (rev 303)
+++ trunk/ChangeLog 2006-05-12 03:13:08 UTC (rev 304)
@@ -7,6 +7,13 @@
are matched by a way stricter regex. (Characters now
allowed are '+' and '.').
+2006-05-10 Robert Millan <[EMAIL PROTECTED]>,
+ Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-source.pl: When checking the
+ signature of a .dsc file, use the Debian
+ keyring if available.
+
2006-05-04 Guillem Jover <[EMAIL PROTECTED]>
* configure.ac: Bump version to 1.13.20~.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-12 03:03:18 UTC (rev 303)
+++ trunk/debian/changelog 2006-05-12 03:13:08 UTC (rev 304)
@@ -7,6 +7,8 @@
* Allow '+' and '.' in distribution names in Debian changelogs.
Based on a patch by John Wright.
Closes: #361171
+ * Use the Debian keyring in dpkg-source when checking signatures
+ of .dsc files, if available. Closes: #364726
[ Updated dpkg Translations ]
* Portuguese (Miguel Figueiredo).
Modified: trunk/scripts/dpkg-source.pl
===================================================================
--- trunk/scripts/dpkg-source.pl 2006-05-12 03:03:18 UTC (rev 303)
+++ trunk/scripts/dpkg-source.pl 2006-05-12 03:13:08 UTC (rev 304)
@@ -581,7 +581,12 @@
if ($is_signed) {
if (-x '/usr/bin/gpg') {
- my $gpg_command = 'gpg -q --verify '.quotemeta($dsc).' 2>&1';
+ my $gpg_command = 'gpg -q --verify ';
+ if (-r '/usr/share/keyrings/debian-keyring.gpg') {
+ $gpg_command = $gpg_command.'--keyring
/usr/share/keyrings/debian-keyring.gpg ';
+ }
+ $gpg_command = $gpg_command.quotemeta($dsc).' 2>&1';
+
my @gpg_output = `$gpg_command`;
my $gpg_status = $? >> 8;
if ($gpg_status) {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
