From 73d387f5699866c6d340e729855cccab9c82c602 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 13 Feb 2019 00:22:29 +0000 Subject: Wed Feb 13 00:22:29 UTC 2019 a/kernel-firmware-20190212_28f5f7d-noarch-1.txz: Upgraded. a/kernel-generic-4.19.21-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.21-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.21-x86_64-1.txz: Upgraded. ap/lxc-2.0.9_d3a03247-x86_64-1.txz: Upgraded. This update fixes a security issue where a malicious privileged container could overwrite the host binary and thus gain root-level code execution on the host. As the LXC project considers privileged containers to be unsafe no CVE has been assigned for this issue for LXC. To prevent this attack, LXC has been patched to create a temporary copy of the calling binary itself when it starts or attaches to containers. To do this LXC creates an anonymous, in-memory file using the memfd_create() system call and copies itself into the temporary in-memory file, which is then sealed to prevent further modifications. LXC then executes this sealed, in-memory file instead of the original on-disk binary. For more information, see: https://seclists.org/oss-sec/2019/q1/119 (* Security fix *) d/kernel-headers-4.19.21-x86-1.txz: Upgraded. k/kernel-source-4.19.21-noarch-1.txz: Upgraded. l/libbluray-1.1.0-x86_64-1.txz: Upgraded. l/libcap-2.26-x86_64-2.txz: Rebuilt. Don't ship static library. l/xapian-core-1.4.10-x86_64-1.txz: Upgraded. n/gnupg2-2.2.13-x86_64-1.txz: Upgraded. n/irssi-1.2.0-x86_64-1.txz: Upgraded. n/libassuan-2.5.3-x86_64-1.txz: Upgraded. x/bitmap-1.0.9-x86_64-1.txz: Upgraded. x/libXau-1.0.9-x86_64-1.txz: Upgraded. x/pixman-0.38.0-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/x/x11/build/bitmap | 2 +- source/x/x11/build/libXau | 2 +- .../pixman.remove.tests.that.fail.to.compile.diff | 243 ++++++++++++++++----- 3 files changed, 195 insertions(+), 52 deletions(-) (limited to 'source/x/x11') diff --git a/source/x/x11/build/bitmap b/source/x/x11/build/bitmap index 00750edc..d00491fd 100644 --- a/source/x/x11/build/bitmap +++ b/source/x/x11/build/bitmap @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXau b/source/x/x11/build/libXau index 00750edc..d00491fd 100644 --- a/source/x/x11/build/libXau +++ b/source/x/x11/build/libXau @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff index d2a3ed1f..113f8ca6 100644 --- a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff +++ b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff @@ -1,8 +1,16 @@ ---- ./test/Makefile.in.orig 2018-11-21 05:41:10.000000000 -0600 -+++ ./test/Makefile.in 2018-11-21 16:37:38.546566766 -0600 -@@ -111,12 +111,11 @@ - scaling-helpers-test$(EXEEXT) thread-test$(EXEEXT) \ - rotate-test$(EXEEXT) alphamap$(EXEEXT) \ +--- ./test/Makefile.in.orig 2019-02-11 06:24:53.000000000 -0600 ++++ ./test/Makefile.in 2019-02-12 13:54:42.157995706 -0600 +@@ -106,19 +106,18 @@ + region-translate-test$(EXEEXT) fetch-test$(EXEEXT) \ + a1-trap-test$(EXEEXT) prng-test$(EXEEXT) \ + radial-invalid$(EXEEXT) pdf-op-test$(EXEEXT) \ +- region-test$(EXEEXT) combiner-test$(EXEEXT) \ ++ combiner-test$(EXEEXT) \ + scaling-crash-test$(EXEEXT) alpha-loop$(EXEEXT) \ +- scaling-helpers-test$(EXEEXT) thread-test$(EXEEXT) \ +- rotate-test$(EXEEXT) alphamap$(EXEEXT) \ ++ thread-test$(EXEEXT) \ ++ alphamap$(EXEEXT) \ gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \ - matrix-test$(EXEEXT) filter-reduction-test$(EXEEXT) \ - composite-traps-test$(EXEEXT) region-contains-test$(EXEEXT) \ @@ -15,8 +23,11 @@ + cover-test$(EXEEXT) \ + scaling-test$(EXEEXT) composite$(EXEEXT) am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \ - check-formats$(EXEEXT) scaling-bench$(EXEEXT) \ +- check-formats$(EXEEXT) scaling-bench$(EXEEXT) \ ++ check-formats$(EXEEXT) \ affine-bench$(EXEEXT) + PROGRAMS = $(noinst_PROGRAMS) + LTLIBRARIES = $(noinst_LTLIBRARIES) @@ -144,12 +143,6 @@ affine_bench_DEPENDENCIES = libutils.la \ $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ @@ -56,7 +67,7 @@ oob_test_SOURCES = oob-test.c oob_test_OBJECTS = oob-test.$(OBJEXT) oob_test_LDADD = $(LDADD) -@@ -282,12 +263,6 @@ +@@ -282,48 +263,18 @@ radial_perf_test_DEPENDENCIES = libutils.la \ $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -66,10 +77,46 @@ -region_contains_test_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) - region_test_SOURCES = region-test.c - region_test_OBJECTS = region-test.$(OBJEXT) - region_test_LDADD = $(LDADD) -@@ -348,12 +323,6 @@ +-region_test_SOURCES = region-test.c +-region_test_OBJECTS = region-test.$(OBJEXT) +-region_test_LDADD = $(LDADD) +-region_test_DEPENDENCIES = libutils.la \ +- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) + region_translate_test_SOURCES = region-translate-test.c + region_translate_test_OBJECTS = region-translate-test.$(OBJEXT) + region_translate_test_LDADD = $(LDADD) + region_translate_test_DEPENDENCIES = libutils.la \ + $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +-rotate_test_SOURCES = rotate-test.c +-rotate_test_OBJECTS = rotate-test.$(OBJEXT) +-rotate_test_LDADD = $(LDADD) +-rotate_test_DEPENDENCIES = libutils.la \ +- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) +-scaling_bench_SOURCES = scaling-bench.c +-scaling_bench_OBJECTS = scaling-bench.$(OBJEXT) +-scaling_bench_LDADD = $(LDADD) +-scaling_bench_DEPENDENCIES = libutils.la \ +- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) + scaling_crash_test_SOURCES = scaling-crash-test.c + scaling_crash_test_OBJECTS = scaling-crash-test.$(OBJEXT) + scaling_crash_test_LDADD = $(LDADD) + scaling_crash_test_DEPENDENCIES = libutils.la \ + $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +-scaling_helpers_test_SOURCES = scaling-helpers-test.c +-scaling_helpers_test_OBJECTS = scaling-helpers-test.$(OBJEXT) +-scaling_helpers_test_LDADD = $(LDADD) +-scaling_helpers_test_DEPENDENCIES = libutils.la \ +- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) + scaling_test_SOURCES = scaling-test.c + scaling_test_OBJECTS = scaling-test.$(OBJEXT) + scaling_test_LDADD = $(LDADD) +@@ -348,12 +299,6 @@ thread_test_DEPENDENCIES = libutils.la \ $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -82,7 +129,7 @@ trap_crasher_SOURCES = trap-crasher.c trap_crasher_OBJECTS = trap-crasher.$(OBJEXT) trap_crasher_LDADD = $(LDADD) -@@ -376,27 +345,27 @@ +@@ -376,27 +321,24 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/a1-trap-test.Po \ @@ -103,11 +150,10 @@ ./$(DEPDIR)/prng-test.Po ./$(DEPDIR)/radial-invalid.Po \ ./$(DEPDIR)/radial-perf-test.Po \ - ./$(DEPDIR)/region-contains-test.Po ./$(DEPDIR)/region-test.Po \ -+ ./$(DEPDIR)/region-test.Po \ ./$(DEPDIR)/region-translate-test.Po \ - ./$(DEPDIR)/rotate-test.Po ./$(DEPDIR)/scaling-bench.Po \ +- ./$(DEPDIR)/rotate-test.Po ./$(DEPDIR)/scaling-bench.Po \ ./$(DEPDIR)/scaling-crash-test.Po \ - ./$(DEPDIR)/scaling-helpers-test.Po \ +- ./$(DEPDIR)/scaling-helpers-test.Po \ ./$(DEPDIR)/scaling-test.Po ./$(DEPDIR)/solid-test.Po \ ./$(DEPDIR)/stress-test.Po ./$(DEPDIR)/thread-test.Po \ - ./$(DEPDIR)/tolerance-test.Po ./$(DEPDIR)/trap-crasher.Po \ @@ -115,7 +161,7 @@ ./$(DEPDIR)/utils-prng.Plo ./$(DEPDIR)/utils.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -418,29 +387,29 @@ +@@ -418,29 +360,29 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \ @@ -129,10 +175,12 @@ + oob-test.c pdf-op-test.c pixel-test.c \ prng-test.c radial-invalid.c radial-perf-test.c \ - region-contains-test.c region-test.c region-translate-test.c \ -+ region-test.c region-translate-test.c \ - rotate-test.c scaling-bench.c scaling-crash-test.c \ - scaling-helpers-test.c scaling-test.c solid-test.c \ +- rotate-test.c scaling-bench.c scaling-crash-test.c \ +- scaling-helpers-test.c scaling-test.c solid-test.c \ - stress-test.c thread-test.c tolerance-test.c trap-crasher.c ++ region-translate-test.c \ ++ scaling-crash-test.c \ ++ scaling-test.c solid-test.c \ + stress-test.c thread-test.c trap-crasher.c DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \ - affine-test.c alpha-loop.c alphamap.c blitters-test.c \ @@ -145,15 +193,27 @@ + oob-test.c pdf-op-test.c pixel-test.c \ prng-test.c radial-invalid.c radial-perf-test.c \ - region-contains-test.c region-test.c region-translate-test.c \ -+ region-test.c region-translate-test.c \ - rotate-test.c scaling-bench.c scaling-crash-test.c \ - scaling-helpers-test.c scaling-test.c solid-test.c \ +- rotate-test.c scaling-bench.c scaling-crash-test.c \ +- scaling-helpers-test.c scaling-test.c solid-test.c \ - stress-test.c thread-test.c tolerance-test.c trap-crasher.c ++ region-translate-test.c \ ++ scaling-crash-test.c \ ++ scaling-test.c solid-test.c \ + stress-test.c thread-test.c trap-crasher.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ -@@ -844,19 +813,14 @@ +@@ -834,29 +776,21 @@ + prng-test \ + radial-invalid \ + pdf-op-test \ +- region-test \ + combiner-test \ + scaling-crash-test \ + alpha-loop \ +- scaling-helpers-test \ + thread-test \ +- rotate-test \ alphamap \ gradient-crash-test \ pixel-test \ @@ -173,7 +233,15 @@ $(NULL) -@@ -953,10 +917,6 @@ +@@ -865,7 +799,6 @@ + lowlevel-blt-bench \ + radial-perf-test \ + check-formats \ +- scaling-bench \ + affine-bench \ + $(NULL) + +@@ -957,10 +890,6 @@ @rm -f affine-bench$(EXEEXT) $(AM_V_CCLD)$(LINK) $(affine_bench_OBJECTS) $(affine_bench_LDADD) $(LIBS) @@ -184,7 +252,7 @@ alpha-loop$(EXEEXT): $(alpha_loop_OBJECTS) $(alpha_loop_DEPENDENCIES) $(EXTRA_alpha_loop_DEPENDENCIES) @rm -f alpha-loop$(EXEEXT) $(AM_V_CCLD)$(LINK) $(alpha_loop_OBJECTS) $(alpha_loop_LDADD) $(LIBS) -@@ -965,10 +925,6 @@ +@@ -969,10 +898,6 @@ @rm -f alphamap$(EXEEXT) $(AM_V_CCLD)$(LINK) $(alphamap_OBJECTS) $(alphamap_LDADD) $(LIBS) @@ -195,7 +263,7 @@ check-formats$(EXEEXT): $(check_formats_OBJECTS) $(check_formats_DEPENDENCIES) $(EXTRA_check_formats_DEPENDENCIES) @rm -f check-formats$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_formats_OBJECTS) $(check_formats_LDADD) $(LIBS) -@@ -1017,10 +973,6 @@ +@@ -1021,10 +946,6 @@ @rm -f lowlevel-blt-bench$(EXEEXT) $(AM_V_CCLD)$(LINK) $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_LDADD) $(LIBS) @@ -206,7 +274,7 @@ oob-test$(EXEEXT): $(oob_test_OBJECTS) $(oob_test_DEPENDENCIES) $(EXTRA_oob_test_DEPENDENCIES) @rm -f oob-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(oob_test_OBJECTS) $(oob_test_LDADD) $(LIBS) -@@ -1045,10 +997,6 @@ +@@ -1049,34 +970,14 @@ @rm -f radial-perf-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(radial_perf_test_OBJECTS) $(radial_perf_test_LDADD) $(LIBS) @@ -214,10 +282,34 @@ - @rm -f region-contains-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(region_contains_test_OBJECTS) $(region_contains_test_LDADD) $(LIBS) - - region-test$(EXEEXT): $(region_test_OBJECTS) $(region_test_DEPENDENCIES) $(EXTRA_region_test_DEPENDENCIES) - @rm -f region-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(region_test_OBJECTS) $(region_test_LDADD) $(LIBS) -@@ -1089,10 +1037,6 @@ +-region-test$(EXEEXT): $(region_test_OBJECTS) $(region_test_DEPENDENCIES) $(EXTRA_region_test_DEPENDENCIES) +- @rm -f region-test$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(region_test_OBJECTS) $(region_test_LDADD) $(LIBS) +- + region-translate-test$(EXEEXT): $(region_translate_test_OBJECTS) $(region_translate_test_DEPENDENCIES) $(EXTRA_region_translate_test_DEPENDENCIES) + @rm -f region-translate-test$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(region_translate_test_OBJECTS) $(region_translate_test_LDADD) $(LIBS) + +-rotate-test$(EXEEXT): $(rotate_test_OBJECTS) $(rotate_test_DEPENDENCIES) $(EXTRA_rotate_test_DEPENDENCIES) +- @rm -f rotate-test$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(rotate_test_OBJECTS) $(rotate_test_LDADD) $(LIBS) +- +-scaling-bench$(EXEEXT): $(scaling_bench_OBJECTS) $(scaling_bench_DEPENDENCIES) $(EXTRA_scaling_bench_DEPENDENCIES) +- @rm -f scaling-bench$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(scaling_bench_OBJECTS) $(scaling_bench_LDADD) $(LIBS) +- + scaling-crash-test$(EXEEXT): $(scaling_crash_test_OBJECTS) $(scaling_crash_test_DEPENDENCIES) $(EXTRA_scaling_crash_test_DEPENDENCIES) + @rm -f scaling-crash-test$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(scaling_crash_test_OBJECTS) $(scaling_crash_test_LDADD) $(LIBS) + +-scaling-helpers-test$(EXEEXT): $(scaling_helpers_test_OBJECTS) $(scaling_helpers_test_DEPENDENCIES) $(EXTRA_scaling_helpers_test_DEPENDENCIES) +- @rm -f scaling-helpers-test$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(scaling_helpers_test_OBJECTS) $(scaling_helpers_test_LDADD) $(LIBS) +- + scaling-test$(EXEEXT): $(scaling_test_OBJECTS) $(scaling_test_DEPENDENCIES) $(EXTRA_scaling_test_DEPENDENCIES) + @rm -f scaling-test$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(scaling_test_OBJECTS) $(scaling_test_LDADD) $(LIBS) +@@ -1093,10 +994,6 @@ @rm -f thread-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS) @@ -228,7 +320,7 @@ trap-crasher$(EXEEXT): $(trap_crasher_OBJECTS) $(trap_crasher_DEPENDENCIES) $(EXTRA_trap_crasher_DEPENDENCIES) @rm -f trap-crasher$(EXEEXT) $(AM_V_CCLD)$(LINK) $(trap_crasher_OBJECTS) $(trap_crasher_LDADD) $(LIBS) -@@ -1105,10 +1049,8 @@ +@@ -1109,10 +1006,8 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a1-trap-test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-bench.Po@am__quote@ # am--include-marker @@ -239,7 +331,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-formats.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combiner-test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@ # am--include-marker -@@ -1121,14 +1063,12 @@ +@@ -1125,25 +1020,18 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infinite-loop.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@ # am--include-marker @@ -251,10 +343,13 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-invalid.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radial-perf-test.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-contains-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-test.Po@am__quote@ # am--include-marker +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region-translate-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rotate-test.Po@am__quote@ # am--include-marker -@@ -1139,7 +1079,6 @@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rotate-test.Po@am__quote@ # am--include-marker +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-bench.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-crash-test.Po@am__quote@ # am--include-marker +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-helpers-test.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaling-test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solid-test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread-test.Po@am__quote@ # am--include-marker @@ -262,7 +357,49 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap-crasher.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils-prng.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ # am--include-marker -@@ -1510,13 +1449,6 @@ +@@ -1444,13 +1332,6 @@ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +-region-test.log: region-test$(EXEEXT) +- @p='region-test$(EXEEXT)'; \ +- b='region-test'; \ +- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ +- --log-file $$b.log --trs-file $$b.trs \ +- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ +- "$$tst" $(AM_TESTS_FD_REDIRECT) + combiner-test.log: combiner-test$(EXEEXT) + @p='combiner-test$(EXEEXT)'; \ + b='combiner-test'; \ +@@ -1472,13 +1353,6 @@ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +-scaling-helpers-test.log: scaling-helpers-test$(EXEEXT) +- @p='scaling-helpers-test$(EXEEXT)'; \ +- b='scaling-helpers-test'; \ +- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ +- --log-file $$b.log --trs-file $$b.trs \ +- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ +- "$$tst" $(AM_TESTS_FD_REDIRECT) + thread-test.log: thread-test$(EXEEXT) + @p='thread-test$(EXEEXT)'; \ + b='thread-test'; \ +@@ -1486,13 +1360,6 @@ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +-rotate-test.log: rotate-test$(EXEEXT) +- @p='rotate-test$(EXEEXT)'; \ +- b='rotate-test'; \ +- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ +- --log-file $$b.log --trs-file $$b.trs \ +- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ +- "$$tst" $(AM_TESTS_FD_REDIRECT) + alphamap.log: alphamap$(EXEEXT) + @p='alphamap$(EXEEXT)'; \ + b='alphamap'; \ +@@ -1514,13 +1381,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) @@ -276,7 +413,7 @@ filter-reduction-test.log: filter-reduction-test$(EXEEXT) @p='filter-reduction-test$(EXEEXT)'; \ b='filter-reduction-test'; \ -@@ -1531,13 +1463,6 @@ +@@ -1535,13 +1395,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) @@ -290,7 +427,7 @@ glyph-test.log: glyph-test$(EXEEXT) @p='glyph-test$(EXEEXT)'; \ b='glyph-test'; \ -@@ -1566,20 +1491,6 @@ +@@ -1570,20 +1423,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) @@ -311,7 +448,7 @@ scaling-test.log: scaling-test$(EXEEXT) @p='scaling-test$(EXEEXT)'; \ b='scaling-test'; \ -@@ -1594,13 +1505,6 @@ +@@ -1598,13 +1437,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) @@ -325,7 +462,7 @@ .test.log: @p='$<'; \ $(am__set_b); \ -@@ -1695,10 +1599,8 @@ +@@ -1699,10 +1531,8 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/a1-trap-test.Po -rm -f ./$(DEPDIR)/affine-bench.Po @@ -336,7 +473,7 @@ -rm -f ./$(DEPDIR)/check-formats.Po -rm -f ./$(DEPDIR)/combiner-test.Po -rm -f ./$(DEPDIR)/composite-traps-test.Po -@@ -1711,14 +1613,12 @@ +@@ -1715,25 +1545,18 @@ -rm -f ./$(DEPDIR)/gradient-crash-test.Po -rm -f ./$(DEPDIR)/infinite-loop.Po -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po @@ -348,10 +485,13 @@ -rm -f ./$(DEPDIR)/radial-invalid.Po -rm -f ./$(DEPDIR)/radial-perf-test.Po - -rm -f ./$(DEPDIR)/region-contains-test.Po - -rm -f ./$(DEPDIR)/region-test.Po +- -rm -f ./$(DEPDIR)/region-test.Po -rm -f ./$(DEPDIR)/region-translate-test.Po - -rm -f ./$(DEPDIR)/rotate-test.Po -@@ -1729,7 +1629,6 @@ +- -rm -f ./$(DEPDIR)/rotate-test.Po +- -rm -f ./$(DEPDIR)/scaling-bench.Po + -rm -f ./$(DEPDIR)/scaling-crash-test.Po +- -rm -f ./$(DEPDIR)/scaling-helpers-test.Po + -rm -f ./$(DEPDIR)/scaling-test.Po -rm -f ./$(DEPDIR)/solid-test.Po -rm -f ./$(DEPDIR)/stress-test.Po -rm -f ./$(DEPDIR)/thread-test.Po @@ -359,7 +499,7 @@ -rm -f ./$(DEPDIR)/trap-crasher.Po -rm -f ./$(DEPDIR)/utils-prng.Plo -rm -f ./$(DEPDIR)/utils.Plo -@@ -1780,10 +1679,8 @@ +@@ -1784,10 +1607,8 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/a1-trap-test.Po -rm -f ./$(DEPDIR)/affine-bench.Po @@ -370,7 +510,7 @@ -rm -f ./$(DEPDIR)/check-formats.Po -rm -f ./$(DEPDIR)/combiner-test.Po -rm -f ./$(DEPDIR)/composite-traps-test.Po -@@ -1796,14 +1693,12 @@ +@@ -1800,25 +1621,18 @@ -rm -f ./$(DEPDIR)/gradient-crash-test.Po -rm -f ./$(DEPDIR)/infinite-loop.Po -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po @@ -382,10 +522,13 @@ -rm -f ./$(DEPDIR)/radial-invalid.Po -rm -f ./$(DEPDIR)/radial-perf-test.Po - -rm -f ./$(DEPDIR)/region-contains-test.Po - -rm -f ./$(DEPDIR)/region-test.Po +- -rm -f ./$(DEPDIR)/region-test.Po -rm -f ./$(DEPDIR)/region-translate-test.Po - -rm -f ./$(DEPDIR)/rotate-test.Po -@@ -1814,7 +1709,6 @@ +- -rm -f ./$(DEPDIR)/rotate-test.Po +- -rm -f ./$(DEPDIR)/scaling-bench.Po + -rm -f ./$(DEPDIR)/scaling-crash-test.Po +- -rm -f ./$(DEPDIR)/scaling-helpers-test.Po + -rm -f ./$(DEPDIR)/scaling-test.Po -rm -f ./$(DEPDIR)/solid-test.Po -rm -f ./$(DEPDIR)/stress-test.Po -rm -f ./$(DEPDIR)/thread-test.Po -- cgit v1.2.3