Added header to patch refrencing the trousers mailing list posting. -- Mike Gerow ge...@google.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 03:15:23.000000000 -0700 +++ tpm-tools-1.3.8/debian/changelog 2016-07-04 07:49:41.000000000 -0700 @@ -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 1969-12-31 16:00:00.000000000 -0800 +++ tpm-tools-1.3.8/debian/patches/05-fix-FTBFS-gcc-6.patch 2016-07-04 07:49:41.000000000 -0700 @@ -0,0 +1,24 @@ +Description: Fix FTBFS with GCC 6 due to confusing indentation +Author: Mike Gerow <ge...@mgerow.com> +Bug: https://sourceforge.net/p/trousers/mailman/message/35261553/ +--- 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 03:11:26.000000000 -0700 +++ tpm-tools-1.3.8/debian/patches/series 2016-07-04 07:49:41.000000000 -0700 @@ -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: Digital signature
