On Fri, 01 Jul 2016 08:27:48 +0200 Robert Bihlmeyer <ro...@orcus.priv.at> wrote: > Package: tpm-tools > Followup-For: Bug #811576 > > The indentation is wrong. Attaching a patch, if reportbug allows me to do it. Looking at the problem again the whole issue seems to be with some confusing mixing of tabs and spaces in just this one area. The attached patch just replaces these with tabs and puts it in a quilt patch.
I'll go ahead and post the patch on the trousers development list too. -- Mike Gerow ge...@mgerow.com
diff -Nru tpm-tools-1.3.8/debian/changelog tpm-tools-1.3.8/debian/changelog --- tpm-tools-1.3.8/debian/changelog 2015-06-28 12:15:23.000000000 +0200 +++ tpm-tools-1.3.8/debian/changelog 2016-07-04 17:05:26.000000000 +0200 @@ -1,3 +1,11 @@ +tpm-tools (1.3.8-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix confusing indentation in tpm_present.c that fails build with GCC 6 + (Closes: #811576). + + -- Mike Gerow <ge...@mgerow.com> Mon, 04 Jul 2016 16:49:41 +0200 + tpm-tools (1.3.8-2) unstable; urgency=medium * Add patch 03 to fix FTBFS with gcc-5 (Closes: #778147) diff -Nru tpm-tools-1.3.8/debian/patches/05-fix-FTBFS-gcc-6.patch tpm-tools-1.3.8/debian/patches/05-fix-FTBFS-gcc-6.patch --- tpm-tools-1.3.8/debian/patches/05-fix-FTBFS-gcc-6.patch 1970-01-01 02:00:00.000000000 +0200 +++ tpm-tools-1.3.8/debian/patches/05-fix-FTBFS-gcc-6.patch 2016-07-04 16:56:36.000000000 +0200 @@ -0,0 +1,21 @@ +--- a/src/tpm_mgmt/tpm_present.c ++++ b/src/tpm_mgmt/tpm_present.c +@@ -349,13 +349,13 @@ + } + } while (flags[++i].name); + +- out_success: ++out_success: + logSuccess(argv[0]); + iRc = 0; +- out_close: ++out_close: + contextClose(hContext); +- out: +- if (szTpmPasswd && !isWellKnown) +- shredPasswd( szTpmPasswd ); ++out: ++ if (szTpmPasswd && !isWellKnown) ++ shredPasswd( szTpmPasswd ); + return iRc; + } diff -Nru tpm-tools-1.3.8/debian/patches/series tpm-tools-1.3.8/debian/patches/series --- tpm-tools-1.3.8/debian/patches/series 2015-06-28 12:11:26.000000000 +0200 +++ tpm-tools-1.3.8/debian/patches/series 2016-07-04 16:57:31.000000000 +0200 @@ -2,3 +2,4 @@ 02-cflags-errors-unused.patch 03-fix-bool-error-parseStringWithValues.patch 04-fix-FTBFS-clang.patch +05-fix-FTBFS-gcc-6.patch
signature.asc
Description: PGP signature
