summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-12-07 19:46:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-12 23:42:54 +0000
commit21e35df191a88635b6cb829ebed52f5b94d5542c (patch)
treefdde4158333460be588305835de0aff5251850e3 /meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch
parent39260c39e54e7b56a45c1d98e56541d072420a83 (diff)
downloadpoky-21e35df191a88635b6cb829ebed52f5b94d5542c.tar.gz
subversion: update to 1.9.2
Drop backported CVE fix patches libtool2.patch has been rebased and renamed to 0001-Fix-libtool-name-in-configure.ac.patch LICENSE checksum has been updated because more 3rd party attributions have been added to it, it's otherwise still Apache 2. (From OE-Core rev: b57f57ea092f93bd7e1268b04c7d3c4af2149a77) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch')
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch b/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch
deleted file mode 100644
index 140e522627..0000000000
--- a/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From f1b6e49f12a18eabe88eb732b578a16281d09499 Mon Sep 17 00:00:00 2001
2From: Jose Lamego <jose.a.lamego@linux.intel.com>
3Date: Thu, 2 Jul 2015 11:37:43 +0000
4Subject: [PATCH] serf.m4: Regex modified to allow '-D' in paths
5
6Upstream-Status: Accepted
7
8The patch is merged by subversion upstream with replacing '[[:space:]]' with ' '.
9
10http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?r1=1594156&r2=1689824
11
12Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
13---
14 build/ac-macros/serf.m4 | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
18index ae11e75..ff8cbae 100644
19--- a/build/ac-macros/serf.m4
20+++ b/build/ac-macros/serf.m4
21@@ -143,7 +143,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
22 if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then
23 AC_MSG_RESULT([yes])
24 serf_found=yes
25- SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`]
26+ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/[[:space:]]-D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
27 SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs`
28 break
29 else
30--
311.8.4.5
32