Bug#316123: dpkg-dev: dpkg-source does not work in cygwin environment

[Ingo Saitz]

Package: dpkg-dev
Severity: normal
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

dpkg-source: failure: md5sum of debhelper_4.9.1.tar.gz gave bad output 
`9e306dd25a6a1aca054695af4923ac22 *'

This happenes on cygwins dpkg 1.10.4-2 and will still happen on current
unstables dpkg 1.13.9 (and probably but not tested on 1.13.10).

On cygwin, md5sum defaults to the -b switch, so newlines would not get
mangeled in textmode. But this changes the output from md5sum:

    $ md5sum -t <debhelper_4.9.1.tar.gz
    9e306dd25a6a1aca054695af4923ac22  -
    $ md5sum -b <debhelper_4.9.1.tar.gz
    9e306dd25a6a1aca054695af4923ac22 *-

Attached is a one line patch which fixes the parser for cygwin or other
dos/windows environments.

- -- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (800, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12-schwan20050618
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)

Versions of packages dpkg-dev depends on:
ii  binutils                      2.15-7     The GNU assembler, linker and bina
ii  cpio                          2.5-1.2    GNU cpio -- a program to manage ar
ii  dpkg                          1.13.9     Package maintenance system for Deb
ii  make                          3.80-9     The GNU version of the "make" util
ii  patch                         2.5.9-2    Apply a diff file to an original
ii  perl [perl5]                  5.8.7-3    Larry Wall's Practical Extraction 
ii  perl-modules                  5.8.7-3    Core Perl modules

Versions of packages dpkg-dev recommends:
ii  bzip2                         1.0.2-7    high-quality block-sorting file co
ii  gcc [c-compiler]              4:3.3.6-1  The GNU C compiler
ii  gcc-3.3 [c-compiler]          1:3.3.6-7  The GNU C compiler
ii  gcc-4.0 [c-compiler]          4.0.0-11   The GNU C compiler

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCwYUw4XrXtQkN2NURAvySAKCtx5mgFB8a7xgtilp1v429An7x8QCggSGE
L+tlbIfa+dfCJc9wd0Qo+O8=
=D4Xu
-----END PGP SIGNATURE-----

--- dpkg-source.orig    2005-06-28 19:03:18.411513675 +0200
+++ dpkg-source 2005-06-28 19:03:53.574505805 +0200
@@ -790,7 +790,7 @@ sub checkstats {
     (@s= stat(STDIN)) || &syserr("cannot fstat $dscdir/$f");
     $s[7] == $size{$f} || &error("file $f has size $s[7] instead of expected 
$size{$f}");
     $m= `md5sum`; $? && subprocerr("md5sum $f"); $m =~ s/\n$//;
-    $m =~ s/ *-$//; # Remove trailing spaces and -, to work with GNU md5sum
+    $m =~ s/ *\*?-$//; # Remove trailing spaces and -, to work with GNU md5sum
     $m =~ m/^[0-9a-f]{32}$/ || &failure("md5sum of $f gave bad output `$m'");
     $m eq $md5sum{$f} || &error("file $f has md5sum $m instead of expected 
$md5sum{$f}");
     open(STDIN,"</dev/null") || &syserr("reopen stdin from /dev/null");