mirror of
https://git.yoctoproject.org/poky
synced 2026-09-12 06:49:32 +02:00
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>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
39260c39e5
commit
21e35df191
@@ -0,0 +1,29 @@
|
||||
From cbcfe0399347989e45a8fb695f55c855d6b3da72 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 7 Dec 2015 17:11:02 +0200
|
||||
Subject: [PATCH] Fix libtool name in configure.ac
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4ed66d4..ceb64f9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -221,8 +221,8 @@ if test "$experimental_libtool" = "yes"; then
|
||||
LIBTOOL="$sh_libtool"
|
||||
SVN_LIBTOOL="$sh_libtool"
|
||||
else
|
||||
- sh_libtool="$abs_builddir/libtool"
|
||||
- SVN_LIBTOOL="\$(SHELL) \"$sh_libtool\""
|
||||
+ sh_libtool="$abs_builddir/$host_alias-libtool"
|
||||
+ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
|
||||
fi
|
||||
AC_SUBST(SVN_LIBTOOL)
|
||||
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
These tests don't work in cross compiling, just disable them for now, we don't
|
||||
build subversion on OS-X at this time.
|
||||
|
||||
RP 1014/7/16
|
||||
|
||||
Upstream-Status: Pending [needs a rewrite to support a cache value]
|
||||
|
||||
Index: subversion-1.8.9/build/ac-macros/macosx.m4
|
||||
===================================================================
|
||||
--- subversion-1.8.9.orig/build/ac-macros/macosx.m4 2012-11-26 03:04:27.000000000 +0000
|
||||
+++ subversion-1.8.9/build/ac-macros/macosx.m4 2014-07-16 12:28:58.357300403 +0000
|
||||
@@ -24,21 +24,7 @@
|
||||
AC_DEFUN(SVN_LIB_MACHO_ITERATE,
|
||||
[
|
||||
AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
|
||||
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
|
||||
- #include <mach-o/dyld.h>
|
||||
- #include <mach-o/loader.h>
|
||||
- ]],[[
|
||||
- const struct mach_header *header = _dyld_get_image_header(0);
|
||||
- const char *name = _dyld_get_image_name(0);
|
||||
- if (name && header) return 0;
|
||||
- return 1;
|
||||
- ]])],[
|
||||
- AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1],
|
||||
- [Is Mach-O low-level _dyld API available?])
|
||||
- AC_MSG_RESULT([yes])
|
||||
- ],[
|
||||
AC_MSG_RESULT([no])
|
||||
- ])
|
||||
])
|
||||
|
||||
dnl SVN_LIB_MACOS_PLIST
|
||||
@@ -46,34 +32,7 @@
|
||||
AC_DEFUN(SVN_LIB_MACOS_PLIST,
|
||||
[
|
||||
AC_MSG_CHECKING([for Mac OS property list utilities])
|
||||
-
|
||||
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
- #include <AvailabilityMacros.h>
|
||||
- #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
|
||||
- || !defined(MAC_OS_X_VERSION_10_0) \
|
||||
- || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0)
|
||||
- #error ProperyList API unavailable.
|
||||
- #endif
|
||||
- ]],[[]])],[
|
||||
- dnl ### Hack. We should only need to pass the -framework options when
|
||||
- dnl linking libsvn_subr, since it is the only library that uses Keychain.
|
||||
- dnl
|
||||
- dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for
|
||||
- dnl OS X frameworks like it does for normal libraries, so we need to
|
||||
- dnl explicitly pass the option to all the users of libsvn_subr to allow
|
||||
- dnl static builds to link successfully.
|
||||
- dnl
|
||||
- dnl This does mean that all executables we link will be linked directly
|
||||
- dnl to these frameworks - even when building shared libraries - but that
|
||||
- dnl shouldn't cause any problems.
|
||||
-
|
||||
- LIBS="$LIBS -framework CoreFoundation"
|
||||
- AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1],
|
||||
- [Is Mac OS property list API available?])
|
||||
- AC_MSG_RESULT([yes])
|
||||
- ],[
|
||||
AC_MSG_RESULT([no])
|
||||
- ])
|
||||
])
|
||||
|
||||
dnl SVN_LIB_MACOS_KEYCHAIN
|
||||
@@ -0,0 +1,32 @@
|
||||
From f1b6e49f12a18eabe88eb732b578a16281d09499 Mon Sep 17 00:00:00 2001
|
||||
From: Jose Lamego <jose.a.lamego@linux.intel.com>
|
||||
Date: Thu, 2 Jul 2015 11:37:43 +0000
|
||||
Subject: [PATCH] serf.m4: Regex modified to allow '-D' in paths
|
||||
|
||||
Upstream-Status: Accepted
|
||||
|
||||
The patch is merged by subversion upstream with replacing '[[:space:]]' with ' '.
|
||||
|
||||
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?r1=1594156&r2=1689824
|
||||
|
||||
Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
|
||||
---
|
||||
build/ac-macros/serf.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
|
||||
index ae11e75..ff8cbae 100644
|
||||
--- a/build/ac-macros/serf.m4
|
||||
+++ b/build/ac-macros/serf.m4
|
||||
@@ -168,7 +168,7 @@
|
||||
if $PKG_CONFIG $serf_pc_arg --atleast-version=$serf_check_version; then
|
||||
AC_MSG_RESULT([yes])
|
||||
serf_found=yes
|
||||
- SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/-D[^ ]*//g'`]
|
||||
+ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
|
||||
SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l`
|
||||
dnl don't use --libs-only-L because then we might miss some options
|
||||
LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"]
|
||||
--
|
||||
1.8.4.5
|
||||
|
||||
Reference in New Issue
Block a user