Please merge cdebootstrap 0.5.8 (universe) from debian unstable

FTBFS:

i686-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../../src -I.. -I../../include -Wall -W -Werror -ggdb -O2 -std=gnu99 -MT check.o -MD -MP -MF .deps/check.Tpo -c -o check.o ../../src/check.c
../../src/check.c: In function 'check_sum':
../../src/check.c:51:9: error: ignoring return value of 'fgets', declared with attribute warn_unused_result [-Werror=unused-result]
cc1: all warnings being treated as errors

make[4]: *** [check.o] Error 1

cdebootstrap (0.5.8ubuntu1) precise; urgency=low

  * Merge from debian unstable (LP: #884185). Remaining changes:
    - Patch 0001-Add-ubuntu-last-releases.patch adding support for Ubuntu
      Oneiric and Precise
    - Add "-Wno-error=unused-result" at CFLAGS_* in debian/rules against FTBFS

 -- Leo Iannacone <email address hidden> Wed, 27 Jul 2011 05:30:14 +0000

Sorry..

This patch contains NO_PKG_MANGLE set. Use it instead.

Thanks!

cdebootstrap (0.5.8ubuntu1) precise; urgency=low

  * Merge from debian unstable (LP: #884185). Remaining changes:
    - Patch 0001-Add-ubuntu-last-releases.patch adding support for Ubuntu
      Oneiric and Precise
    - Patch 002-Fix-netsted-packages.patch setting NO_PKG_MANGLE while building
      nested package
    - Add "-Wno-error=unused-result" at CFLAGS_* in debian/rules against FTBFS

 -- Leo Iannacone <email address hidden> Wed, 27 Jul 2011 05:30:14 +0000

There's a problem with quilt.
Quilt is not used in debian package, so in debdiff appears the ".pc" directory.

I moved patches to inline changes... Is it better now or have I to add
quilt support in debian files?

Leo.

Hi L3on,

Thanks for your work on that merge!

As a general rule, Ubuntu have to respect the patching system in place in Debian and we shouldn't be adding a patch system, except if we feel that the patch is complex and will be there for a long time.
In this case, the changes should be done inline as this is how it's done in Debian

Also, when merging a package from Debian, we should always challenge existing changes, meaning that we need to check if they still make sense or not.
In this case, without having a deep look, I feel like the NO_PKG_MANGLE may not be required anymore (it comes from feisty and is more than 4 years old). If you checked it already, then document it in the merge request.

Also, the changelog should clearly reflect what comes from older versions (under the "remaining changes" section) and what is new, that appear at the same level as the * line, like that:
  * Merge from debian unstable (LP: #884185). Remaining changes:
    - Add support for Ubuntu Oneiric and Precise in config/suites
    - Set NO_PKG_MANGLE while building nested package in helper/Makefile.{in,am}
  * Add "-Wno-error=unused-result" at CFLAGS_* in debian/rules against FTBFS
This makes clearer for next merger what has been introduced and when.
Also, I like to specify what has been dropped and why, so if you dropped the -U_FORTIFY_SOURCE change, an entry like this one make it clearer:
  * Dropped changes:
     - -U-FORTIFY: applied upstream.. (or whatever: I didnd't checked it :-) )

Please attach a new debdiff with those changes.

thanks again for your work!

Fabrice

Hi Fabrice

> In this case, without having a deep look, I feel like the NO_PKG_MANGLE may not be required anymore (it comes from feisty and is more than 4 years old). If you checked it already, then document it in the merge request.

I don't know how to investigate it... could you help me?

I found this: http://bugs.debian.org/486899

> Also, the changelog should clearly reflect what comes from older version ...

Sorry... this is the new debdiff. Note that I reused
"-U_FORTIFY_SOURCE" instead of "-Wno-error=unused-result".

cdebootstrap (0.5.8ubuntu1) precise; urgency=low

  * Merge from debian unstable (LP: #884185). Remaining changes:
    - Add support for Ubuntu Oneiric and Precise in config/suites
    - Set NO_PKG_MANGLE while building nested package in helper/Makefile.{in,am}
    - build with -U_FORTIFY_SOURCE to fix FTBFS caused by the Ubuntu toolchain
  * Drop changes:
    - Fix FTBFS in src/check.c. Now in upstream (closes: #622056)

Best regards,
Leo.

Hi Leo,

This debdiff looks better.

To check the NO_PKG_MANGLE part, please try to build it without the patch, using a ppa or using a local build tool where pkgbinarymangler is installed. You can also try to reproduce it in an old chroot (intrepid or older).

Thanks!

Fabrice

Leo, can you actually switch back to -Wno-warn=unused-result instead of -U_FORTIFY_SOURCE?

_FORTIFY_SOURCE enables a lot more compiler features than just unused result checks, and the package still builds if you just disable the unused result warnings.

Even better would be actually properly checking the results of functions that are throwing the warn_unused_result warnings - there aren't that many of them:

x86_64-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../../src -I.. -I../../include -Wall -W -Werror -Wno-error=unused-result -Os -fomit-frame-pointer -std=gnu99 -MT check.o -MD -MP -MF .deps/check.Tpo -c -o check.o ../../src/check.c
../../src/check.c: In function ‘check_md5’:
../../src/check.c:50:9: warning: ignoring return value of ‘fgets’, declared with attribute warn_unused_result [-Wunused-result]
[...]
x86_64-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../../src -I.. -I../../include -Wall -W -Werror -Wno-error=unused-result -Os -fomit-frame-pointer -std=gnu99 -MT execute.o -MD -MP -MF .deps/execute.Tpo -c -o execute.o ../../src/execute.c
../../src/execute.c: In function ‘internal_di_exec’:
../../src/execute.c:88:8: warning: ignoring return value of ‘pipe’, declared with attribute warn_unused_result [-Wunused-result]
../../src/execute.c:93:10: warning: ignoring return value of ‘pipe’, declared with attribute warn_unused_result [-Wunused-result]
../../src/execute.c:101:10: warning: ignoring return value of ‘pipe’, declared with attribute warn_unused_result [-Wunused-result]
../../src/execute.c:157:12: warning: ignoring return value of ‘read’, declared with attribute warn_unused_result [-Wunused-result]
../../src/execute.c: In function ‘internal_di_exec_child’:
../../src/execute.c:67:13: warning: ignoring return value of ‘write’, declared with attribute warn_unused_result [-Wunused-result]
../../src/execute.c:74:9: warning: ignoring return value of ‘write’, declared with attribute warn_unused_result [-Wunused-result]

Here the debdiff includes "-Wno-error=unused-result" and drops NO_PKG_MANGLE.

I've sent a email to developer about handling unused results... I
still wait for a reply.

Uploaded. Thanks for your work!

Please forward the -Wno-error=unused-result t oDebian and update the existing Debian bug on Oneiric to add Precise support.

Also, as soon as the package is available for Precise, could you test it, just to be sure that the NO_PKG_MANGLE change has no effect on the official builder?

thanks!
Fabrice

This bug was fixed in the package cdebootstrap - 0.5.8ubuntu1

---------------
cdebootstrap (0.5.8ubuntu1) precise; urgency=low

  * Merge from debian unstable (LP: #884185). Remaining changes:
    - Add support for Ubuntu Oneiric in config/suites
  * Add support for Ubuntu Precise in config/suites
  * Add "-Wno-error=unused-result" at CFLAGS_* in debian/rules against FTBFS
  * Drop changes:
    - Fix FTBFS in src/check.c: Now in upstream (closes: #622056)
    - build with -U_FORTIFY_SOURCE to fix FTBFS, caused by the Ubuntu toolchain:
      Replaced by -wno-error=unused-result
    - Setting NO_PKG_MANGLE while building nested package: no longer required
 -- Leo Iannacone <email address hidden> Wed, 27 Jul 2011 05:30:14 +0000