Your message dated Sat, 30 Jun 2012 05:17:51 +0000
with message-id <[email protected]>
and subject line Bug#652970: fixed in dpkg 1.16.5
has caused the Debian Bug report #652970,
regarding dpkg-source should clean up after failing to apply a patch
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 this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
652970: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652970
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dpkg-dev
Version: 1.16.1.2
Severity: normal
File: /usr/bin/dpkg-buildpackage
Building a quilt (3.0) package with fuzzy patch fails although quilt
aplies and unapplies the patch just fine. Worse, the package source may
be broken by dpk-buildpackage. It looks like the patch is applied but not
recorded as applied by quilt in the end.
$ quilt import ../qemu-kvm-0.14.1+dfsg/debian/patches/nops2.patch
Importing patch ../qemu-kvm-0.14.1+dfsg/debian/patches/nops2.patch (stored as
debian/patches/nops2.patch)
$ quilt push -a
Applying patch debian/patches/nops2.patch
patching file hw/isa.h
Hunk #1 succeeded at 36 (offset 1 line).
patching file hw/pckbd.c
patching file vl.c
Hunk #1 succeeded at 2327 with fuzz 2 (offset 148 lines).
patching file qemu-options.hx
Hunk #1 succeeded at 2451 (offset 85 lines).
Now at patch debian/patches/nops2.patch
$ quilt pop -a
Removing patch debian/patches/nops2.patch
Restoring hw/isa.h
Restoring hw/pckbd.c
Restoring qemu-options.hx
Restoring vl.c
Removing patch
debian/patches/scsi-disk-lazily-allocate-bounce-buffer-7285477ab1-CVE-2011-3346.diff
Restoring hw/scsi-disk.c
Removing patch
debian/patches/scsi-disk-commonize-iovec-creation-between-reads-and-writes-103b40f51e-CVE-2011-3346.diff
Restoring hw/scsi-disk.c
Removing patch
debian/patches/build-move-QEMU_INCLUDES-before-QEMU_CFLAGS-76dc3cf82c.diff
Restoring rules.mak
Removing patch debian/patches/05_report_debian_package_version.patch
Restoring configure
Removing patch debian/patches/04_use_etc_kvm_kvm-ifup.patch
Restoring net.h
Restoring net/tap.h
Removing patch debian/patches/03_use_etc_kvm_not_etc_qemu.patch
Restoring configure
Removing patch debian/patches/02_use_usr_share_kvm_fixed.patch
Restoring os-posix.c
No patches applied
$ quilt push -a
Applying patch debian/patches/02_use_usr_share_kvm_fixed.patch
patching file os-posix.c
Applying patch debian/patches/03_use_etc_kvm_not_etc_qemu.patch
patching file configure
Applying patch debian/patches/04_use_etc_kvm_kvm-ifup.patch
patching file net.h
patching file net/tap.h
Applying patch debian/patches/05_report_debian_package_version.patch
patching file configure
Applying patch
debian/patches/build-move-QEMU_INCLUDES-before-QEMU_CFLAGS-76dc3cf82c.diff
patching file rules.mak
Applying patch
debian/patches/scsi-disk-commonize-iovec-creation-between-reads-and-writes-103b40f51e-CVE-2011-3346.diff
patching file hw/scsi-disk.c
Applying patch
debian/patches/scsi-disk-lazily-allocate-bounce-buffer-7285477ab1-CVE-2011-3346.diff
patching file hw/scsi-disk.c
Applying patch debian/patches/nops2.patch
patching file hw/isa.h
Hunk #1 succeeded at 36 (offset 1 line).
patching file hw/pckbd.c
patching file vl.c
Hunk #1 succeeded at 2327 with fuzz 2 (offset 148 lines).
patching file qemu-options.hx
Hunk #1 succeeded at 2451 (offset 85 lines).
Now at patch debian/patches/nops2.patch
$ dpkg-buildpackage -j6
dpkg-buildpackage: source package qemu-kvm
dpkg-buildpackage: source version 0.15.1+dfsg-1nopsaux1
dpkg-buildpackage: source changed by Michal Suchanek <[email protected]>
dpkg-buildpackage: host architecture amd64
dpkg-source --before-build qemu-kvm-0.15.1+dfsg
fakeroot debian/rules clean
dh_testdir
rm -rf build/
# clean up upstream leftovers
rm -f scripts/*.pyc
dh_clean
dpkg-source -b qemu-kvm-0.15.1+dfsg
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building qemu-kvm using existing
./qemu-kvm_0.15.1+dfsg.orig.tar.gz
patching file hw/isa.h
Hunk #1 succeeded at 36 (offset 1 line).
patching file hw/pckbd.c
patching file vl.c
Hunk #1 FAILED at 2179.
1 out of 1 hunk FAILED -- saving rejects to file vl.c.rej
patching file qemu-options.hx
Hunk #1 succeeded at 2451 (offset 85 lines).
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E -b -B
.pc/nops2.patch/ < qemu-kvm-0.15.1+dfsg.orig.2OmAtg/debian/patches/nops2.patch
gav
e error exit status 1
dpkg-buildpackage: error: dpkg-source -b qemu-kvm-0.15.1+dfsg gave error exit
status 2
$ quilt pop -a
Removing patch debian/patches/nops2.patch
Restoring hw/isa.h
Restoring hw/pckbd.c
Restoring qemu-options.hx
Restoring vl.c
Removing patch
debian/patches/scsi-disk-lazily-allocate-bounce-buffer-7285477ab1-CVE-2011-3346.diff
Restoring hw/scsi-disk.c
Removing patch
debian/patches/scsi-disk-commonize-iovec-creation-between-reads-and-writes-103b40f51e-CVE-2011-3346.diff
Restoring hw/scsi-disk.c
Removing patch
debian/patches/build-move-QEMU_INCLUDES-before-QEMU_CFLAGS-76dc3cf82c.diff
Restoring rules.mak
Removing patch debian/patches/05_report_debian_package_version.patch
Restoring configure
Removing patch debian/patches/04_use_etc_kvm_kvm-ifup.patch
Restoring net.h
Restoring net/tap.h
Removing patch debian/patches/03_use_etc_kvm_not_etc_qemu.patch
Restoring configure
Removing patch debian/patches/02_use_usr_share_kvm_fixed.patch
Restoring os-posix.c
No patches applied
$ dpkg-buildpackage -j6
dpkg-buildpackage: source package qemu-kvm
dpkg-buildpackage: source version 0.15.1+dfsg-1nopsaux1
dpkg-buildpackage: source changed by Michal Suchanek <[email protected]>
dpkg-buildpackage: host architecture amd64
dpkg-source --before-build qemu-kvm-0.15.1+dfsg
dpkg-source: info: patches are not applied, applying them now
dpkg-source: info: applying 02_use_usr_share_kvm_fixed.patch
dpkg-source: info: applying 03_use_etc_kvm_not_etc_qemu.patch
dpkg-source: info: applying 04_use_etc_kvm_kvm-ifup.patch
dpkg-source: info: applying 05_report_debian_package_version.patch
dpkg-source: info: applying
build-move-QEMU_INCLUDES-before-QEMU_CFLAGS-76dc3cf82c.diff
dpkg-source: info: applying
scsi-disk-commonize-iovec-creation-between-reads-and-writes-103b40f51e-CVE-2011-3346.diff
dpkg-source: info: applying
scsi-disk-lazily-allocate-bounce-buffer-7285477ab1-CVE-2011-3346.diff
dpkg-source: info: applying nops2.patch
patching file hw/isa.h
Hunk #1 succeeded at 36 (offset 1 line).
patching file hw/pckbd.c
patching file vl.c
Hunk #1 FAILED at 2179.
1 out of 1 hunk FAILED -- saving rejects to file vl.c.rej
patching file qemu-options.hx
Hunk #1 succeeded at 2451 (offset 85 lines).
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E -b -B
.pc/nops2.patch/ < qemu-kvm-0.15.1+dfsg/debian/patches/nops2.patch gave error
exit
status 1
dpkg-buildpackage: error: dpkg-source --before-build qemu-kvm-0.15.1+dfsg gave
error exit status 1
$ quilt push -a
Applying patch debian/patches/nops2.patch
patching file hw/isa.h
Hunk #1 FAILED at 35.
1 out of 1 hunk FAILED -- rejects in file hw/isa.h
patching file hw/pckbd.c
Hunk #1 succeeded at 128 with fuzz 2 (offset 2 lines).
Hunk #2 FAILED at 171.
Hunk #3 FAILED at 207.
Hunk #4 FAILED at 313.
Hunk #5 FAILED at 344.
Hunk #6 FAILED at 422.
Hunk #7 FAILED at 431.
Hunk #8 FAILED at 471.
Hunk #9 FAILED at 481.
8 out of 9 hunks FAILED -- rejects in file hw/pckbd.c
patching file vl.c
Hunk #1 succeeded at 2327 with fuzz 2 (offset 148 lines).
patching file qemu-options.hx
Hunk #1 succeeded at 2462 with fuzz 2 (offset 96 lines).
Patch debian/patches/nops2.patch does not apply (enforce with -f)
$ quilt pop -a
Removing patch
debian/patches/scsi-disk-lazily-allocate-bounce-buffer-7285477ab1-CVE-2011-3346.diff
Restoring hw/scsi-disk.c
Removing patch
debian/patches/scsi-disk-commonize-iovec-creation-between-reads-and-writes-103b40f51e-CVE-2011-3346.diff
Restoring hw/scsi-disk.c
Removing patch
debian/patches/build-move-QEMU_INCLUDES-before-QEMU_CFLAGS-76dc3cf82c.diff
Restoring rules.mak
Removing patch debian/patches/05_report_debian_package_version.patch
Restoring configure
Removing patch debian/patches/04_use_etc_kvm_kvm-ifup.patch
Restoring net.h
Restoring net/tap.h
Removing patch debian/patches/03_use_etc_kvm_not_etc_qemu.patch
Restoring configure
Removing patch debian/patches/02_use_usr_share_kvm_fixed.patch
Restoring os-posix.c
No patches applied
$ quilt push -a
Applying patch debian/patches/02_use_usr_share_kvm_fixed.patch
patching file os-posix.c
Applying patch debian/patches/03_use_etc_kvm_not_etc_qemu.patch
patching file configure
Applying patch debian/patches/04_use_etc_kvm_kvm-ifup.patch
patching file net.h
patching file net/tap.h
Applying patch debian/patches/05_report_debian_package_version.patch
patching file configure
Applying patch
debian/patches/build-move-QEMU_INCLUDES-before-QEMU_CFLAGS-76dc3cf82c.diff
patching file rules.mak
Applying patch
debian/patches/scsi-disk-commonize-iovec-creation-between-reads-and-writes-103b40f51e-CVE-2011-3346.diff
patching file hw/scsi-disk.c
Applying patch
debian/patches/scsi-disk-lazily-allocate-bounce-buffer-7285477ab1-CVE-2011-3346.diff
patching file hw/scsi-disk.c
Applying patch debian/patches/nops2.patch
patching file hw/isa.h
Hunk #1 FAILED at 35.
1 out of 1 hunk FAILED -- rejects in file hw/isa.h
patching file hw/pckbd.c
Hunk #1 succeeded at 128 with fuzz 2 (offset 2 lines).
Hunk #2 FAILED at 171.
Hunk #3 FAILED at 207.
Hunk #4 FAILED at 313.
Hunk #5 FAILED at 344.
Hunk #6 FAILED at 422.
Hunk #7 FAILED at 431.
Hunk #8 FAILED at 471.
Hunk #9 FAILED at 481.
8 out of 9 hunks FAILED -- rejects in file hw/pckbd.c
patching file vl.c
Hunk #1 succeeded at 2327 with fuzz 2 (offset 148 lines).
patching file qemu-options.hx
Hunk #1 succeeded at 2462 with fuzz 2 (offset 96 lines).
Patch debian/patches/nops2.patch does not apply (enforce with -f)
-- System Information:
Debian Release: wheezy/sid
APT prefers stable
APT policy: (900, 'stable'), (500, 'testing'), (410, 'unstable'), (200,
'experimental'), (111, 'oldstable'), (107, 'natty-updates'), (107, 'natty')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-rc3 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages dpkg-dev depends on:
ii base-files 6.5 Debian base system miscellaneous f
ii binutils 2.22-2 GNU assembler, linker and binary u
ii bzip2 1.0.5-6 high-quality block-sorting file co
ii libdpkg-perl 1.16.1.2 Dpkg perl modules
ii make 3.81-8.1 An utility for Directing compilati
ii patch 2.6-2 Apply a diff file to an original
ii xz-utils 5.0.0-2 XZ-format compression utilities
Versions of packages dpkg-dev recommends:
ii bcc [c-compiler] 0.16.17-3.1 16-bit x86 C compiler
ii build-essential 11.5 Informational list of build-essent
ii fakeroot 1.14.4-1 Gives a fake root environment
ii gcc [c-compiler] 4:4.6.1-3 GNU C compiler
ii gcc-4.4 [c-compiler] 4.4.6-14 GNU C compiler
ii gcc-4.5 [c-compiler] 4.5.3-9 The GNU C compiler
ii gcc-4.6 [c-compiler] 4.6.2-7 GNU C compiler
ii gnupg 1.4.10-4 GNU privacy guard - a free PGP rep
ii gpgv 1.4.10-4 GNU privacy guard - signature veri
ii libalgorithm-merge-perl 0.08-2 Perl module for three-way merge of
Versions of packages dpkg-dev suggests:
ii debian-keyring 2010.12.29 GnuPG keys of Debian Developers
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: dpkg
Source-Version: 1.16.5
We believe that the bug you reported is fixed in the latest version of
dpkg, which is due to be installed in the Debian FTP archive:
dpkg-dev_1.16.5_all.deb
to main/d/dpkg/dpkg-dev_1.16.5_all.deb
dpkg_1.16.5.dsc
to main/d/dpkg/dpkg_1.16.5.dsc
dpkg_1.16.5.tar.xz
to main/d/dpkg/dpkg_1.16.5.tar.xz
dpkg_1.16.5_amd64.deb
to main/d/dpkg/dpkg_1.16.5_amd64.deb
dselect_1.16.5_amd64.deb
to main/d/dpkg/dselect_1.16.5_amd64.deb
libdpkg-dev_1.16.5_amd64.deb
to main/d/dpkg/libdpkg-dev_1.16.5_amd64.deb
libdpkg-perl_1.16.5_all.deb
to main/d/dpkg/libdpkg-perl_1.16.5_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Guillem Jover <[email protected]> (supplier of updated dpkg package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sat, 30 Jun 2012 04:28:51 +0200
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source amd64 all
Version: 1.16.5
Distribution: unstable
Urgency: low
Maintainer: Dpkg Developers <[email protected]>
Changed-By: Guillem Jover <[email protected]>
Description:
dpkg - Debian package management system
dpkg-dev - Debian package development tools
dselect - Debian package management front-end
libdpkg-dev - Debian package management static library
libdpkg-perl - Dpkg perl modules
Closes: 64642 440094 558095 621763 624000 627333 640676 643043 652970 664058
672723 673190 675333 676232 677631 678933 679010
Changes:
dpkg (1.16.5) unstable; urgency=low
.
[ Raphaël Hertzog ]
* dpkg-source will now clean up after a failed application of a quilt
patch. Closes: #652970
And it will display a message explaining the most likely cause of
failure (patch applying with fuzz).
* When dpkg-source regenerates the automatic patch (with formats "2.0"
or "3.0 (quilt)") it will keep the current patch header to avoid
losing changes made by the maintainer.
* Modify dpkg-source --commit to auto-whitelist modified binary files.
That way the same command can be used whatever kind of upstream files
has been modified.
* dpkg-source now supports a new option --no-unapply-patches to force
patches to be kept applied after build (used by formats "2.0" and "3.0
(quilt)"). Closes: #643043
.
[ Guillem Jover ]
* Add a dpkg-buildflags --status action to describe the flag settings.
Thanks to Bernhard R. Link <[email protected]>. Closes: #664058
* Add support for “binary-only” key-value option in changelogs, to allow
marking changelog entries as part of a binary only upload, having a
different version from the source package. Closes: #440094, #672723
* Minimize source architecture list on «dpkg-source -b» by removing
architectures already covered by architecture wildcards. Closes: #675333
* Do not assume $ENV{'HOME'} is defined in Dpkg::Source::Package.
Thanks to Niels Thykier <[email protected]>. Closes: #677631
* Document in more detail in deb(5) the supported ar archive format.
* Document in deb-src-control(5) the “Private-” field prefix.
* Add new start-stop-daemon --no-close option to disable closing file
descriptors on --background. Closes: #627333, #64642
* Switch source compression to xz.
* Detect ar header fields truncation due to too long member names or too
large member sizes. Closes: #678933
* Add new dpkg-query --control-list and --control-show commands, which
replace the now deprecated --control-path.
* Print master and slave alternarive link names in update-alternatives
--query and always print alternative link in --config. Closes: #679010
* Cleanup and clarify buffer I/O error reporting. Closes: #621763
* Avoid full stop and double newline at the end of errors and warnings.
Thanks to Jonathan Nieder <[email protected]>. Closes: #624000
* Change all programs to accept -? instead of -h for help output.
* Add support for specific arch-qualified dependencies. Closes: #676232
Thanks to Thibaut Girka <[email protected]>.
* Accept “:native” arch-qualified Build-Dependencies. Closes: #558095
Thanks to Thibaut Girka <[email protected]>.
* Do not use undefined values returned form deps_parse() in dpkg-shlibdeps.
Closes: #640676
* Add an Architecture column to «dpkg-query -l» before the Description
column. Suggested by Jonathan Nieder <[email protected]>. Closes: #673190
.
[ Updated dpkg translations ]
* Swedish (Peter Krefting).
.
[ Updated dselect translations ]
* Swedish (Peter Krefting).
.
[ Updated scripts translations ]
* German (Helge Kreutzmann).
.
[ Updated man page translations ]
* German (Helge Kreutzmann).
* Swedish (Peter Krefting).
Checksums-Sha1:
5e256018148d50da61a19da0cbce49f65cd03169 1372 dpkg_1.16.5.dsc
e3aaf08015bab5c40980f36514152102556b76b2 3546160 dpkg_1.16.5.tar.xz
d826663e329d140f38ddfc4353b937cb270c6688 666932 libdpkg-dev_1.16.5_amd64.deb
c078e1861151da90049e7ce788cb513b769e2e0f 2266848 dpkg_1.16.5_amd64.deb
ea065b58a7aa49771a275e4e26a7603b65becadf 1100228 dselect_1.16.5_amd64.deb
c1e214b79282fb56eaa54ad8f2a1dc2daad64eef 1142828 dpkg-dev_1.16.5_all.deb
085f8ee024365882d641e60e209cc3bfca43bd36 852954 libdpkg-perl_1.16.5_all.deb
Checksums-Sha256:
3a4eec53e585abcb15c71f08331da63610150f4858793bc68ee2df006d1da8a6 1372
dpkg_1.16.5.dsc
fcd8d846479f3f955e1f1facc4422aed6c3173b6c5acd904d9db60f24bc18e7b 3546160
dpkg_1.16.5.tar.xz
aba88af2256caef0fdd345ba9eeacff8d2013a07b045d5b7c93162bd0893c10b 666932
libdpkg-dev_1.16.5_amd64.deb
1a56e13f5fc11eabb5ea7d17852cb1b3b09a117b16803e5b9a64ec14b3f37a62 2266848
dpkg_1.16.5_amd64.deb
50ac49b8115e6d19148031ecec7f976c69a084504c42b860abd1470e63b1f5d0 1100228
dselect_1.16.5_amd64.deb
7a23dd256195eec9f1ce2297737747a27a8c6d3beba5c9e8e9ac8d8734f07f54 1142828
dpkg-dev_1.16.5_all.deb
d77dc62deb89a923952c533b2320130d9573e8c3ebfa09fbdf80c835ca30ef65 852954
libdpkg-perl_1.16.5_all.deb
Files:
571bd79d38407d605f7559cf65347c01 1372 admin required dpkg_1.16.5.dsc
c70412c8b0f3609680104585ddb4ba5c 3546160 admin required dpkg_1.16.5.tar.xz
49221981d6f3490ddc87c8a03bbe332d 666932 libdevel optional
libdpkg-dev_1.16.5_amd64.deb
d9128c702529b095fda97b205bf03398 2266848 admin required dpkg_1.16.5_amd64.deb
3eed99660309c9fba61b490c057deb78 1100228 admin optional
dselect_1.16.5_amd64.deb
3c7266174c297984846a6eb88ae3730f 1142828 utils optional dpkg-dev_1.16.5_all.deb
848633279951281c6213f877251081e3 852954 perl optional
libdpkg-perl_1.16.5_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEARECAAYFAk/uhA4ACgkQuW9ciZ2SjJvLqACgvBBdkE81qC2iEsdk4lhVoilv
hd8AoI/JlSVaR2i+DU9dLBBvCWo9RvWC
=xtFu
-----END PGP SIGNATURE-----
--- End Message ---
