Tags: patch I've attached a debdiff that pushes more of what's in debian/export.diff into sed commands run by debian/apply-export-patch.
Actually, the vast majority of the contents of debian/export.diff are _already_ rendered unnecessary by the existing sed expressions in debian/apply-export-patch, as they mainly represent name changes from libfoo.la to libfoo-export.la, which is already handled by sed commands. I replaced one additional chunk - the one that was failing when libjson-c-dev is installed inthe build environment - with a sed command, leaving just a single chunk still remaining in debian/export.diff: the addition of an "ln -sf" line. That chunk needed a slight adjustment to the context, as the libfoo.la -> libfoo-export.la substitution will not have taken place yet at the time that patch hunk is applied. The result is expected to be more resilient in the face of varying Makefiles output by the ./configure process. I performed the following tests: - I confirmed that, with these adjustments, bind9 builds fine even with libjson-c-dev installed. - I confirmed that, with these adjustments, but with libjson-c-dev NOT installed, there is no change in output results. I confirmed the latter verifying that the contents of ./build-udeb/ after debian/apply-export-patch has been run, do not differ in any way from the contents of ./build-udeb/ after the same has been run in an unaltered build of 9.10.3.dfsg.P4-10.1, save for temporary names found in ./build-udeb/config.log, and the non-existence of various Makefile.orig files corresponding to Makefiles no longer appearing in debian/export.diff. If you wish to repeat this test for yourself, just add an "exit 1" after the invocation of "sh debian/apply-export-patch" in debian/rules to cause building to halt afterwards, and ensure also that the path to the build directory is the same when running the unaltered build, and the altered build, as otherwise these path differences will show up in a number places in any diff between ./build-udeb directories.
harden-export-diff.debdiff
Description: harden-export-diff.debdiff
