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

Bug#45642: marked as done (dpkg-dev: dpkg-source can't handle lines in .diff.gz beginning with \)



Your message dated Sat, 25 Sep 1999 15:43:24 +0200
with message-id <19990925154324.A32470@mors.net>
and subject line [wakkerma@debian.org: Fixed in NMU dpkg 1.4.1.11]
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.)

Darren Benham
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 21 Sep 1999 07:00:57 +0000
Received: (qmail 10578 invoked from network); 21 Sep 1999 07:00:57 -0000
Received: from jhuml2.hcf.jhu.edu (128.220.2.87)
  by master.debian.org with SMTP; 21 Sep 1999 07:00:57 -0000
Received: from cush.dyn.ez-ip.net (ppp18.hcf.jhu.edu [128.220.222.18])
 by jhmail.hcf.jhu.edu (PMDF V5.2-29 #37929)
 with ESMTP id <01JG7TGX4R8AF869JF@jhmail.hcf.jhu.edu> for
 submit@bugs.debian.org; Tue, 21 Sep 1999 03:00:46 EDT
Received: from martind by localhost with local (Exim 3.03 #1 (Debian))
	id 11TIME-0002SA-00; Tue, 21 Sep 1999 01:20:50 -0400
Date: Tue, 21 Sep 1999 01:20:50 -0400
From: Daniel Martin <Daniel.Martin@jhu.edu>
Subject: dpkg-dev: dpkg-source can't handle lines in .diff.gz beginning with \
To: submit@bugs.debian.org
Message-id: <E11TIME-0002SA-00@localhost>
X-Mailer: bug 3.2.2

Package: dpkg-dev
Version: 1.4.1.9
Severity: normal

Some diffs (for example, netbase 3.16-2) contain sections like this:
@@ -17,4 +21,5 @@
        patch -p1 < ../ipautofw-2.0.0.diff
 
 archive:
-       cd ../.. && tar -cf - ipautofw/ | gzip -9 > /root/scootdir/rlynch.ftp/ip
autofw-`date +%y%m%d`.tar.gz
\ No newline at end of file
+       cd ../.. && tar -cf - ipautofw/ | gzip -9 > /root/scootdir/rlynch.ftp/ip
autofw-`date +%y%m%d`.tar.gz
+

dpkg-source chokes on the line that begins with a backslash.  The
issue is in lines 535 to 551 of dpkg-source.  The following diff is
one way to fix this (I assume that the "No newline" string doesn't
vary with the locale of the person building the source package)

--- dpkg-source.old     Tue Sep 21 01:17:45 1999
+++ dpkg-source Tue Sep 21 01:18:53 1999
@@ -535,6 +535,7 @@
            while (($_ = <GZIP>) && !/^--- /) {
                # read hunk header (@@)
                s/\n$// or &error("diff is missing trailing newline");
+               next if /^\\ No newline/;
                /^@@ -\d+(,(\d+))? \+\d+(,(\d+))? @\@$/ or
                    &error("Expected ^@@ in line $. of diff");
                my ($olines, $nlines) = ($1 ? $2 : 1, $3 ? $4 : 1);
@@ -543,6 +544,7 @@
                while ($olines || $nlines) {
                    $_ = <GZIP> or &error("unexpected end of diff");
                    s/\n$// or &error("diff is missing trailing newline");
+                   next if /^\\ No newline/;
                    if (/^ /) { --$olines; --$nlines; }
                    elsif (/^-/) { --$olines; }
                    elsif (/^\+/) { --$nlines; }


-- System Information
Debian Release: potato
Kernel Version: Linux cush 2.2.12 #1 Thu Sep 2 22:55:25 EDT 1999 i586 unknown

Versions of the packages dpkg-dev depends on:
ii  perl-5.005-base 5.005.03-3     The Pathologically Eclectic Rubbish Lister
	^^^ (Provides virtual package perl5)
---------------------------------------
Received: (at 45642-done) by bugs.debian.org; 25 Sep 1999 13:51:55 +0000
Received: (qmail 14529 invoked from network); 25 Sep 1999 13:51:54 -0000
Received: from zeus.wi.leidenuniv.nl (132.229.128.1)
  by master.debian.org with SMTP; 25 Sep 1999 13:51:54 -0000
Received: from lightning.mors.net (root@home034.wi.leidenuniv.nl [132.229.210.162])
	by zeus.wi.leidenuniv.nl (8.9.3/8.9.3/LIACS 1.0) with ESMTP id PAA22060
	for <45642-done@bugs.debian.org>; Sat, 25 Sep 1999 15:51:50 +0200 (MET DST)
Received: (from wichert@localhost)
	by lightning.mors.net (8.9.3/8.9.3/Debian/GNU) id PAA01886
	for 45642-done@bugs.debian.org; Sat, 25 Sep 1999 15:43:25 +0200
Date: Sat, 25 Sep 1999 15:43:24 +0200
From: Wichert Akkerman <wichert@cs.leidenuniv.nl>
To: 45642-done@bugs.debian.org
Subject: [wakkerma@debian.org: Fixed in NMU dpkg 1.4.1.11]
Message-ID: <19990925154324.A32470@mors.net>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="DocE+STaALJfprDB"
User-Agent: Mutt/1.0pre2i


--DocE+STaALJfprDB
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: quoted-printable

----- Forwarded message from Wichert Akkerman <wakkerma@debian.org> -----

Date: 24 Sep 1999 14:41:53 -0000
From: Wichert Akkerman <wakkerma@debian.org>
To: control@bugs.debian.org
Subject: Fixed in NMU dpkg 1.4.1.11

severity 45642 fixed

quit

This message was generated automatically in response to a
non-maintainer upload.  The .changes file follows.

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

Format: 1.6
Date: Fri, 24 Sep 1999 03:23:54 +0200
Source: dpkg
Binary: dpkg dpkg-dev
Architecture: source i386 all
Version: 1.4.1.11
Distribution: unstable
Urgency: low
Maintainer: Wichert Akkerman <wakkerma@debian.org>
Description:=20
 dpkg       - Package maintenance system for Debian
 dpkg-dev   - Package building tools for Debian
Closes: 45642
Changes:=20
 dpkg (1.4.1.11) unstable; urgency=3Dlow
 .
   * Non-maintainer release.
   * Added sparc64 to archtable
   * Added entries for newer alpha architectures to the archtable
   * Always run patch and diff with LANG set to C.
   * Handle diff warning for files with no newline at the end of file
     Closes: Bug#45642
Files:=20
 9f2b4be5b37b9cfd9e4e362d860e8cd5 528 base required dpkg_1.4.1.11.dsc
 88dd77722d10cc374a55187422c51359 799979 base required dpkg_1.4.1.11.tar.gz
 6a6b4c565cd72fddf4aca5525ae6f01e 369956 base required dpkg_1.4.1.11_i386.d=
eb
 51dec54b864fd8e866c393835476b2d1 359987 byhand - dpkg_1.4.1.11_i386.nondeb=
bin.tar.gz
 c8dc2226badb94fe4bd3bf552c0f58bc 78530 devel important dpkg-dev_1.4.1.11_a=
ll.deb
 c39d51c3f03f1c6da5ff6da313286053 46419 byhand - internals.ps.gz
 eeb1f3a99355cd204cc7a361e030da6f 6703 byhand - internals.html.tar.gz
 7818810de9aafcb179463206c5f775c1 847025 byhand - dpkg-1.4.1.11.tar.gz

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

iEYEARECAAYFAjfq07EACgkQPLiSUC+jvC0poACfZ9hUpVf797tQ03yeqHKzv4BE
H7QAn0G3ALcSlzD0c8t2ar7yK+TsS/Gv
=3DakUm
-----END PGP SIGNATURE-----

----- End forwarded message -----

--=20
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
This combination of bytes forms a message written to you by Wichert Akkerma=
n.
E-Mail: wichert@cs.leidenuniv.nl
WWW: http://www.wi.leidenuniv.nl/~wichert/

--DocE+STaALJfprDB
Content-Type: application/pgp-signature

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

iEYEARECAAYFAjfs0XwACgkQPLiSUC+jvC1RRQCfTKgT2GDWNy1zSmYPXewmthr5
pcsAmQFl7be095/Y9crvPfdNTSmes8Lf
=lrvE
-----END PGP SIGNATURE-----

--DocE+STaALJfprDB--


Reply to: