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

Bug#246096: marked as done (dpkg: [patch] support for DOS-format input in utils/md5sum.c)



Your message dated Thu, 06 May 2004 22:36:58 +0100
with message-id <1083879418.2803.20.camel@localhost>
and subject line Bug#246096: dpkg: [patch] support for DOS-format input in utils/md5sum.c
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 27 Apr 2004 07:55:53 +0000
>From andrew@neep.com.au Tue Apr 27 00:55:53 2004
Return-path: <andrew@neep.com.au>
Received: from 203-59-30-173.dyn.iinet.net.au (harp.internal.neep.com.au) [203.59.30.173] 
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1BINRY-0002ge-00; Tue, 27 Apr 2004 00:55:52 -0700
Received: from harp.internal.neep.com.au (andrew@localhost [127.0.0.1])
	by harp.internal.neep.com.au (8.12.3/8.12.3/Debian-6.6) with ESMTP id i3R7thZM012293
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=FAIL)
	for <submit@bugs.debian.org>; Tue, 27 Apr 2004 15:55:46 +0800
Received: (from andrew@localhost)
	by harp.internal.neep.com.au (8.12.3/8.12.3/Debian-6.6) id i3R7tgSn012291
	for submit@bugs.debian.org; Tue, 27 Apr 2004 15:55:42 +0800
Date: Tue, 27 Apr 2004 15:55:41 +0800
From: Andrew Shugg <andrew@neep.com.au>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: dpkg: [patch] support for DOS-format input in utils/md5sum.c
Message-ID: <20040427075541.GA12239@neep.com.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="ReaqsoxgOBHFXBhH"
Content-Disposition: inline
User-Agent: Mutt/1.3.28i
X-Reportbug-Version: 1.50
X-URL: http://www.neep.com.au/
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-7.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 
X-CrossAssassin-Score: 1


--ReaqsoxgOBHFXBhH
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Package: dpkg
Version: 1.9.21
Severity: minor
Tags: patch woody

The following patch adds support for DOS-format lines in the -c (check)
input to md5sum, and amends the md5sum man page to remove the 'bug'
about there being no --help option (because there is!).

This patch is against the md5sum provided with dpkg 1.9.21 (woody).

Andrew.

--=20
Andrew Shugg <andrew@neep.com.au>                   http://www.neep.com.au/

"Just remember, Mr Fawlty, there's always someone worse off than yourself."
"Is there?  Well I'd like to meet him.  I could do with a good laugh."

-- System Information
Debian Release: 3.0
Architecture: i386
Kernel: Linux harp 2.4.25 #1 Thu Apr 15 12:04:19 WST 2004 i586
Locale: LANG=3DC, LC_CTYPE=3DC

Versions of packages dpkg depends on:
ii  libc6                  2.2.5-11.5        GNU C Library: Shared librarie=
s an
ii  libncurses5            5.2.20020112a-7   Shared libraries for terminal =
hand
ii  libstdc++2.10-glibc2.2 1:2.95.4-11woody1 The GNU stdc++ library


--- md5sum.1.orig	Thu Nov 25 10:25:40 1999
+++ md5sum.1	Tue Apr 27 14:08:26 2004
@@ -30,7 +30,8 @@
 .TP
 .B -b
 Use binary mode. In unix environment, only difference between this and
-the normal mode is an asterix preceding the filename in the output.
+the normal mode is an asterix preceding the filename in the output. In=20
+a DOS environment it will force handling of DOS line endings.
 .TP
 .B -c
 Check md5sum of all files listed in
@@ -63,13 +64,10 @@
 This manpage is not quite accurate and has formatting inconsistent
 with other manpages.
=20
-.B md5sum
-does not accept standard options like
-.BR --help .
-
 .SH AUTHOR
=20
 .B md5sum
 was originally written by Branko Lankester, and modified afterwards by
 Colin Plumb and Ian Jackson (ijackson@gnu.ai.mit.edu). Manual page was
-added by Juho Vuori (javuori@cc.helsinki.fi)
+added by Juho Vuori (javuori@cc.helsinki.fi).
+
--- md5sum.c.orig	Sun Apr 29 05:22:51 2001
+++ md5sum.c	Tue Apr 27 14:00:13 2004
@@ -11,6 +11,8 @@
  * Modified Feburary 1995 by Ian Jackson for use with Colin Plumb's md5.c.
  * Hacked (modified is too nice a word) January 1997 by Galen Hazelwood
  *   to support GNU gettext.
+ * Additional damage in April 2004 by Andrew Shugg to support MS-DOS style=
 line
+ *   endings on lines read for '-c' (check).
  * This file is in the public domain.
  */
 #include <stdio.h>
@@ -226,7 +228,15 @@
 	i =3D strlen(p);
 	if (i < 2 || i > 255)
 		return 0;
-	p[i-1] =3D '\0';
+	/*
+	 * If this is an "MS-DOS" file then the end of line is marked
+	 * by two characters (\r\n) and not just one (\n on Unix, \r=20
+	 * on Mac OS).
+	 */
+	if (p[i-2] =3D=3D '\r')
+		p[i-2] =3D '\0';
+	else=20
+		p[i-1] =3D '\0';
 	strcpy(file, p);
 	return rc;
 }


--ReaqsoxgOBHFXBhH
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQFAjhH8pUiZIVCapKgRAr76AJoCIJ9sI/iRdjWYxx4gcrPXSV/I8wCfWS76
Ly/4vY/JeKtNEBpWwn/8swY=
=tkcz
-----END PGP SIGNATURE-----

--ReaqsoxgOBHFXBhH--

---------------------------------------
Received: (at 246096-done) by bugs.debian.org; 6 May 2004 21:37:01 +0000
>From scott@netsplit.com Thu May 06 14:37:01 2004
Return-path: <scott@netsplit.com>
Received: from populous.netsplit.com (mailgate.netsplit.com) [62.49.129.34] (qmailr)
	by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1BLqY8-0008EM-00; Thu, 06 May 2004 14:37:00 -0700
Received: (qmail 6201 invoked from network); 6 May 2004 21:36:58 -0000
Received: from unknown (HELO syndicate.netsplit.com) (scott@62.49.129.42)
  by populous.netsplit.com with RC4-MD5 encrypted SMTP; 6 May 2004 21:36:58 -0000
Subject: Re: Bug#246096: dpkg: [patch] support for DOS-format input in
	utils/md5sum.c
From: Scott James Remnant <scott@netsplit.com>
To: Andrew Shugg <andrew@neep.com.au>, 246096-done@bugs.debian.org
In-Reply-To: <20040427075541.GA12239@neep.com.au>
References: <20040427075541.GA12239@neep.com.au>
Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-+bjHB20UY7yCq4/jSsj+"
Message-Id: <1083879418.2803.20.camel@localhost>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.5.7 
Date: Thu, 06 May 2004 22:36:58 +0100
Delivered-To: 246096-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-5.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
	autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 
X-CrossAssassin-Score: 1


--=-+bjHB20UY7yCq4/jSsj+
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

On Tue, 2004-04-27 at 15:55 +0800, Andrew Shugg wrote:

> Package: dpkg
> Version: 1.9.21
> Severity: minor
> Tags: patch woody
>=20
This is a dup of 246103 which is filed against the unstable package; the
bug is nowhere near severe enough to persuade the woody maintainer to
allow a replacement of dpkg.

Scott
--=20
Have you ever, ever felt like this?
Had strange things happen?  Are you going round the twist?

--=-+bjHB20UY7yCq4/jSsj+
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

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

iD8DBQBAmq/6IexP3IStZ2wRAk0uAJ41rTgNLRBPiZvcGDpJf3Tf8gFzeACgo2xF
++Hcvrz7sY6r3XNybNkBlco=
=ImNz
-----END PGP SIGNATURE-----

--=-+bjHB20UY7yCq4/jSsj+--



Reply to: