diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-10-14 16:42:45 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-10-14 16:47:15 +0200 |
| commit | 759f111f8d7f2d9f5f12713fc6f48ce6422997ec (patch) | |
| tree | 6509a8d142669fe5c3ef2afe3365f9c33f234c69 /tools/patch/patches/020-CVE-2018-6952.patch | |
| parent | 07e8c217cb79a19c59fcb34ea6de39aa91a625b6 (diff) | |
| download | upstream-759f111f8d7f2d9f5f12713fc6f48ce6422997ec.tar.gz upstream-759f111f8d7f2d9f5f12713fc6f48ce6422997ec.tar.bz2 upstream-759f111f8d7f2d9f5f12713fc6f48ce6422997ec.zip | |
tools: patch: Fix build by not modifing Makefile.am
A new test case was adding in one of the patches fixing a problem, this
also included a change in the test/Makefile.am to add this test case.
The build system detected a change in the Makefile.am and wants to
regenerate the Makefile.in, but this fails because automake-1.15 is not
installed yet. As automake depends on patch being build first, make sure
we do not modify the Makefile.am.
This fixes build problem seen by the build bots.
Fixes: 4797dddfde6 ("patch: apply upstream cve fixes")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'tools/patch/patches/020-CVE-2018-6952.patch')
| -rw-r--r-- | tools/patch/patches/020-CVE-2018-6952.patch | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/patch/patches/020-CVE-2018-6952.patch b/tools/patch/patches/020-CVE-2018-6952.patch index e3e4020e50..e72a8cbc27 100644 --- a/tools/patch/patches/020-CVE-2018-6952.patch +++ b/tools/patch/patches/020-CVE-2018-6952.patch @@ -12,8 +12,6 @@ Fixes: https://savannah.gnu.org/bugs/index.php?53133 src/pch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/pch.c b/src/pch.c -index 8150493..6994ab2 100644 --- a/src/pch.c +++ b/src/pch.c @@ -2114,7 +2114,7 @@ pch_swap (void) @@ -25,6 +23,3 @@ index 8150493..6994ab2 100644 else n = -i; p_efake += n; --- -2.19.1 - |