diff -Nru krb5-1.17/debian/changelog krb5-1.17/debian/changelog --- krb5-1.17/debian/changelog 2020-03-23 14:46:41.000000000 +0000 +++ krb5-1.17/debian/changelog 2020-04-29 23:56:45.000000000 +0000 @@ -1,3 +1,9 @@ +krb5 (1.17-7+rpi1) bullseye-staging; urgency=medium + + * Remove space after -isystem in pc files (Worksaround: #959064) + + -- Peter Michael Green Wed, 29 Apr 2020 23:56:45 +0000 + krb5 (1.17-7) unstable; urgency=medium * Use python3 for building docs; pull patch from upstream, Closes: #939483 diff -Nru krb5-1.17/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch krb5-1.17/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch --- krb5-1.17/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch 2020-03-23 14:46:41.000000000 +0000 +++ krb5-1.17/debian/patches/debian-local/0008-Use-isystem-for-include-paths.patch 2020-04-29 23:56:29.000000000 +0000 @@ -1,6 +1,6 @@ From: Jelmer Vernooij Date: Wed, 3 Sep 2014 22:41:55 -0400 -Subject: Use -isystem for include paths +Subject: Use -isystemfor include paths This is necessary so Kerberos headers files are classified as "system headers" by the compiler, and thus not subject to the same strict warnings as @@ -11,6 +11,9 @@ /usr/include/tuple/mit-krb5, as Debian is doing). (cherry picked from commit d8520c1d1c218e3c766009abc728b207c0421232) +Patch modified by Peter Michael Green to remove space after -isystem +to workaround cmake issue ( see bug 959064 ) + Author: Jelmer Vernooij Bug-Debian: http://bugs.debian.org/751760 Patch-Category: debian-local @@ -33,7 +36,7 @@ Description: GSSAPI RPC implementation Version: @KRB5_VERSION@ -Cflags: -I${includedir} -+Cflags: -isystem ${includedir} ++Cflags: -isystem${includedir} Libs: -L${libdir} -lgssrpc Requires.private: mit-krb5-gssapi diff --git a/src/build-tools/kadm-client.pc.in b/src/build-tools/kadm-client.pc.in @@ -45,7 +48,7 @@ Version: @KRB5_VERSION@ Requires.private: mit-krb5-gssapi gssrpc -Cflags: -I${includedir} -+Cflags: -isystem ${includedir} ++Cflags: -isystem${includedir} Libs: -L${libdir} -lkadm5clnt_mit diff --git a/src/build-tools/kadm-server.pc.in b/src/build-tools/kadm-server.pc.in index a73ff86..5ce4b73 100644 @@ -56,7 +59,7 @@ Version: @KRB5_VERSION@ Requires.private: kdb mit-krb5-gssapi -Cflags: -I${includedir} -+Cflags: -isystem ${includedir} ++Cflags: -isystem${includedir} Libs: -L${libdir} -lkadm5srv_mit diff --git a/src/build-tools/kdb.pc.in b/src/build-tools/kdb.pc.in index 356501d..d39eeef 100644 @@ -67,7 +70,7 @@ Version: @KRB5_VERSION@ Requires.private: mit-krb5-gssapi mit-krb5 gssrpc -Cflags: -I${includedir} -+Cflags: -isystem ${includedir} ++Cflags: -isystem${includedir} Libs: -L${libdir} -lkdb5 Libs.private: ${KDB5_DB_LIB} diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in @@ -79,7 +82,7 @@ if test -n "$do_cflags"; then if test x"$includedir" != x"/usr/include" ; then - echo "-I${includedir}" -+ echo "-isystem ${includedir}" ++ echo "-isystem${includedir}" else echo '' fi @@ -92,7 +95,7 @@ Version: @KRB5_VERSION@ Requires.private: mit-krb5 -Cflags: -I${includedir} -+Cflags: -isystem ${includedir} ++Cflags: -isystem${includedir} Libs: -L${libdir} -lgssapi_krb5 diff --git a/src/build-tools/mit-krb5.pc.in b/src/build-tools/mit-krb5.pc.in index 058e75f..455427a 100644 @@ -103,6 +106,6 @@ Description: An implementation of Kerberos network authentication Version: @KRB5_VERSION@ -Cflags: -I${includedir} -+Cflags: -isystem ${includedir} ++Cflags: -isystem${includedir} Libs: -L${libdir} -lkrb5 -lk5crypto -lcom_err Libs.private: -lkrb5support