[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Patch for dpkg-scansources / Packages without sources



On Thu, 29 Jul 1999 14:41:32 +0200 (CEST), Richard Braakman <dark@xs4all.nl> said:
>
> Instead of looking specifically for Hash:, you should skip until after
> the first empty line.

James forwarded your report about this to me a few weeks ago, and that's
how the patch I sent him operates.  Here's a copy of it.

To: James Troup <james@nocrew.org>
From: Roderick Schertler <roderick@argon.org>
Subject: Re: [Richard Braakman <dark@xs4all.nl>] Re: Cron <maor@master> public/bin/with-lock masterfiles/lock masterfiles/cron.daily
In-reply-to: Your message of "12 Jul 1999 22:24:21 BST."
References: <87wvw58su2.fsf@nocrew.org>
Date: Tue, 13 Jul 1999 10:52:49 -0400
Message-ID: <18921.931877569@eeyore.ibcinc.com>
Sender: roderick@eeyore.ibcinc.com

On 12 Jul 1999 22:24:21 +0100, James Troup <james@nocrew.org> said:
>
> The .dsc files in question have been signed with GnuPG thus have a
> `Hash: SHA1\n\n" after the "-----Begin PGP signed message----" line.

Here's a fix for that.  I looked at the way dinstall handles this and
I think it might have a bug here.  Judging from ParseChanges() in
~maor/dinstall/di.pl I think it's treating that "Hash: SHA1" line as
part of the Debian changes file (I think it ends up in the %changes
hash).

diff -u -r1.8 -r1.9
--- dpkg-scansources	1999/02/06 17:03:47	1.8
+++ dpkg-scansources	1999/07/13 14:48:46	1.9
@@ -232,7 +232,7 @@
 
 sub de_pgp {
     my ($file, $s) = @_;
-    if ($s =~ s/^-----BEGIN PGP SIGNED MESSAGE-----\n\n//) {
+    if ($s =~ s/^-----BEGIN PGP SIGNED MESSAGE-----.*?\n\n//s) {
 	unless ($s =~ s/\n
 			-----BEGIN\040PGP\040SIGNATURE-----\n
 			.*?\n

-- 
Roderick Schertler
roderick@argon.org


Reply to: