diff -Nru ppc64-diag-2.7.4/debian/changelog ppc64-diag-2.7.4/debian/changelog --- ppc64-diag-2.7.4/debian/changelog 2017-09-05 17:01:26.000000000 +0000 +++ ppc64-diag-2.7.4/debian/changelog 2017-11-28 17:14:54.000000000 +0000 @@ -1,8 +1,16 @@ -ppc64-diag (2.7.4-1~14.04) trusty-proposed; urgency=medium +ppc64-diag (2.7.4-2~14.04) trusty; urgency=medium - * SRU: LP: #1708494. Update to version found in 17.10. + * SRU: LP: #1708494. Update to the version found in 17.10. - -- Matthias Klose Tue, 05 Sep 2017 19:01:26 +0200 + -- Dimitri John Ledkov Tue, 28 Nov 2017 16:59:36 +0000 + +ppc64-diag (2.7.4-2) unstable; urgency=medium + + * d/patches/fix-rtas_errd-unit.patch : fix rtas_errd being started where it + should not and being reported by systemd as failing whereas the daemon + exits as it should (LP: #1715397) + + -- Frédéric Bonnard Fri, 08 Sep 2017 11:08:42 +0000 ppc64-diag (2.7.4-1) unstable; urgency=medium diff -Nru ppc64-diag-2.7.4/debian/control ppc64-diag-2.7.4/debian/control --- ppc64-diag-2.7.4/debian/control 2017-08-24 11:48:47.000000000 +0000 +++ ppc64-diag-2.7.4/debian/control 2017-11-28 17:00:08.000000000 +0000 @@ -1,7 +1,8 @@ Source: ppc64-diag Section: misc Priority: extra -Maintainer: Frédéric Bonnard +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Frédéric Bonnard Build-Depends: debhelper (>= 9.0.0), dh-autoreconf, dh-systemd, flex, bison, librtas-dev, librtasevent-dev, libservicelog-dev, libncurses5-dev, libvpd-dev, libudev-dev, doxygen Standards-Version: 4.0.1 Homepage: http://sourceforge.net/projects/linux-diag/files/ppc64-diag/ diff -Nru ppc64-diag-2.7.4/debian/patches/fix-rtas_errd-unit.patch ppc64-diag-2.7.4/debian/patches/fix-rtas_errd-unit.patch --- ppc64-diag-2.7.4/debian/patches/fix-rtas_errd-unit.patch 1970-01-01 00:00:00.000000000 +0000 +++ ppc64-diag-2.7.4/debian/patches/fix-rtas_errd-unit.patch 2017-09-08 11:08:42.000000000 +0000 @@ -0,0 +1,23 @@ +Description: Fix rtas_errd unit file + On powerNV, rtas_errd is not supported and the daemon will exit which happens + on LP #1715101 being interpreted as a failure by systemd. + This should be caught properly by a conditional start but there is a typo in + the two ConditionPathExists that are used : "=|!" should be "=|" +Author: Frederic Bonnard +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/debian-installer/+bug/1715101 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: ppc64-diag-2.7.4/scripts/rtas_errd.service +=================================================================== +--- ppc64-diag-2.7.4.orig/scripts/rtas_errd.service 2017-09-08 11:06:41.000000000 +0000 ++++ ppc64-diag-2.7.4/scripts/rtas_errd.service 2017-09-08 11:16:28.497172001 +0000 +@@ -1,7 +1,7 @@ + [Unit] + Description=ppc64-diag rtas_errd (platform error handling) Service +-ConditionPathExists=|!/proc/ppc64/rtas/error_log +-ConditionPathExists=|!/proc/ppc64/error_log ++ConditionPathExists=|/proc/ppc64/rtas/error_log ++ConditionPathExists=|/proc/ppc64/error_log + Documentation=man:rtas_errd(8) + + [Service] diff -Nru ppc64-diag-2.7.4/debian/patches/series ppc64-diag-2.7.4/debian/patches/series --- ppc64-diag-2.7.4/debian/patches/series 2017-08-24 11:48:47.000000000 +0000 +++ ppc64-diag-2.7.4/debian/patches/series 2017-09-08 11:08:42.000000000 +0000 @@ -4,3 +4,4 @@ manpage-space-character-is-not-allowed-in-an-escape-name.patch CVE-2014-4038.patch CVE-2014-4039.patch +fix-rtas_errd-unit.patch