From 8b20c798c76cd1a70c23496126bef612f9d8976a Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sep 18 2017 15:12:43 +0000 Subject: Bump xslt recursion limit for libxslt-1.30 --- diff --git a/0023-build-sys-bump-xslt-maxdepth-limit.patch b/0023-build-sys-bump-xslt-maxdepth-limit.patch new file mode 100644 index 0000000..f33ddb8 --- /dev/null +++ b/0023-build-sys-bump-xslt-maxdepth-limit.patch @@ -0,0 +1,26 @@ +From f2618d3474090751ae364ca326f3563797cce54a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 18 Sep 2017 17:09:52 +0200 +Subject: [PATCH] build-sys: bump xslt maxdepth limit + +With libxslt-1.30, builds were failing on some recursion depth limit +with systemd.index.xml. Bumping the limit fixes the issue. +--- + man/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/man/meson.build b/man/meson.build +index 8ddbd5557c..5b6a21fb9f 100644 +--- a/man/meson.build ++++ b/man/meson.build +@@ -11,6 +11,7 @@ want_html = want_html != 'false' and xsltproc.found() + xsltproc_flags = [ + '--nonet', + '--xinclude', ++ '--maxdepth', '9000', + '--stringparam', 'man.output.quietly', '1', + '--stringparam', 'funcsynopsis.style', 'ansi', + '--stringparam', 'man.authors.section.enabled', '0', +-- +2.13.5 + diff --git a/systemd.spec b/systemd.spec index 4f9fa7c..b499079 100644 --- a/systemd.spec +++ b/systemd.spec @@ -13,7 +13,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 234 -Release: 5%{?gitcommit:.git%{gitcommitshort}}%{?dist} +Release: 6%{?gitcommit:.git%{gitcommitshort}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -68,6 +68,7 @@ Patch0019: 0019-meson-D-remote-and-D-importd-should-be-combo-options.patch Patch0020: 0020-cryptsetup-fix-infinite-timeout-6486.patch Patch0021: 0021-rfkill-fix-erroneous-behavior-when-polling-the-udev-.patch Patch0022: 0022-core-Do-not-fail-perpetual-mount-units-without-fragm.patch +Patch0023: 0023-build-sys-bump-xslt-maxdepth-limit.patch Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -1050,6 +1051,9 @@ getent passwd systemd-journal-upload &>/dev/null || useradd -r -l -g systemd-jou %{pkgdir}/tests %changelog +* Mon Sep 18 2017 Zbigniew Jędrzejewski-Szmek - 234-6 +- Bump xslt recursion limit for libxslt-1.30 + * Mon Jul 31 2017 Zbigniew Jędrzejewski-Szmek - 234-5 - Backport more patches (#1476005, hopefully #1462378)