Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

subversion: Rebuild.

Browse Source
This commit is contained in:
Alexpux
2014-11-05 23:30:55 +03:00
parent 0ab2479b86
commit 773dc7c2d0
18 changed files with 111 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
subversion/01-make-build-directories.patch
View File

@@ -5,13 +5,13 @@ From: David Rothenberger <d.rothenberger@entomo.com>
---
configure.ac | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
index e3dd4ac..5f9f3fa 100644
index e93d7a3..5f6e0d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1497,6 +1497,11 @@ AC_DEFINE_UNQUOTED([SVN_BUILD_TARGET], "${target}",
@@ -1508,6 +1508,11 @@ AC_DEFINE_UNQUOTED([SVN_BUILD_TARGET], "${target}",
[Defined to the config.guess name of the build target])
AC_OUTPUT

4
subversion/02-fix-linking.patch
View File

@@ -5,10 +5,10 @@ From: David Rothenberger <daveroth@acm.org>
---
build.conf | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/build.conf b/build.conf
index 39630c2..5136b41 100644
index 74defd0..885db3c 100644
--- a/build.conf
+++ b/build.conf
@@ -360,7 +360,7 @@ type = apache-mod

6
subversion/03-fix-linking-perl.patch
View File

@@ -10,10 +10,10 @@ From: David Rothenberger <daveroth@acm.org>
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 5ad1ecb..127b825 100644
index 4681a7d..0423782 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -137,6 +137,7 @@ SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
@@ -138,6 +138,7 @@ SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
SWIG_PY_LINK = @SWIG_PY_LINK@
SWIG_PY_LIBS = @SWIG_PY_LIBS@
SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
@@ -22,7 +22,7 @@ index 5ad1ecb..127b825 100644
SWIG_RB_COMPILE = @SWIG_RB_COMPILE@
SWIG_RB_LINK = @SWIG_RB_LINK@
diff --git a/build.conf b/build.conf
index 5136b41..73b925d 100644
index 885db3c..8cf7184 100644
--- a/build.conf
+++ b/build.conf
@@ -514,7 +514,8 @@ msvc-static = no

2
subversion/04-fix-switch-tests.patch
View File

@@ -5,7 +5,7 @@ From: David Rothenberger <d.rothenberger@entomo.com>
doesn't because the user has Administrator privileges.
---
subversion/tests/cmdline/switch_tests.py | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
1 file changed, 7 insertions(+)
diff --git a/subversion/tests/cmdline/switch_tests.py b/subversion/tests/cmdline/switch_tests.py
index 3f1e7ab..1881d9e 100755

12
subversion/05-retry-loop.patch
View File

@@ -5,10 +5,10 @@ From: David Rothenberger <d.rothenberger@entomo.com>
---
subversion/libsvn_subr/io.c | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/subversion/libsvn_subr/io.c b/subversion/libsvn_subr/io.c
index 7c17169..1b62056 100644
index f0956e2..e9e3d37 100644
--- a/subversion/libsvn_subr/io.c
+++ b/subversion/libsvn_subr/io.c
@@ -29,6 +29,10 @@
@@ -35,7 +35,7 @@ index 7c17169..1b62056 100644
#else
#define WIN32_RETRY_LOOP(err, expr) ((void)0)
#endif
@@ -2268,6 +2278,7 @@ svn_io_remove_file2(const char *path,
@@ -2263,6 +2273,7 @@ svn_io_remove_file2(const char *path,
|| SVN__APR_STATUS_IS_ENOTDIR(apr_err))))
return SVN_NO_ERROR;
@@ -43,7 +43,7 @@ index 7c17169..1b62056 100644
#ifdef WIN32
/* If the target is read only NTFS reports EACCESS and FAT/FAT32
reports EEXIST */
@@ -2281,11 +2292,15 @@ svn_io_remove_file2(const char *path,
@@ -2276,11 +2287,15 @@ svn_io_remove_file2(const char *path,
if (!apr_err)
return SVN_NO_ERROR;
}
@@ -60,7 +60,7 @@ index 7c17169..1b62056 100644
{
apr_finfo_t finfo;
@@ -3618,20 +3633,22 @@ svn_io_file_rename(const char *from_path, const char *to_path,
@@ -3620,20 +3635,22 @@ svn_io_file_rename(const char *from_path, const char *to_path,
status = apr_file_rename(from_path_apr, to_path_apr, pool);
@@ -85,7 +85,7 @@ index 7c17169..1b62056 100644
if (status)
return svn_error_wrap_apr(status, _("Can't move '%s' to '%s'"),
@@ -3746,7 +3763,7 @@ dir_make(const char *path, apr_fileperms_t perm,
@@ -3748,7 +3765,7 @@ dir_make(const char *path, apr_fileperms_t perm,
/* Windows does not implement sgid. Skip here because retrieving
the file permissions via APR_FINFO_PROT | APR_FINFO_OWNER is documented
to be 'incredibly expensive'. */

8
subversion/06-svnadmin-binary-mode.patch
View File

@@ -5,10 +5,10 @@ From: David Rothenberger <d.rothenberger@entomo.com>
---
subversion/svnadmin/svnadmin.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
1 file changed, 6 insertions(+)
diff --git a/subversion/svnadmin/svnadmin.c b/subversion/svnadmin/svnadmin.c
index 84da948..db6eaa1 100644
index d40525e..c3a7fad 100644
--- a/subversion/svnadmin/svnadmin.c
+++ b/subversion/svnadmin/svnadmin.c
@@ -49,6 +49,10 @@
@@ -22,7 +22,7 @@ index 84da948..db6eaa1 100644
/*** Code. ***/
@@ -998,6 +1002,7 @@ subcommand_dump(apr_getopt_t *os, void *baton, apr_pool_t *pool)
@@ -1010,6 +1014,7 @@ subcommand_dump(apr_getopt_t *os, void *baton, apr_pool_t *pool)
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("First revision cannot be higher than second"));
@@ -30,7 +30,7 @@ index 84da948..db6eaa1 100644
SVN_ERR(svn_stream_for_stdout(&stdout_stream, pool));
/* Progress feedback goes to STDERR, unless they asked to suppress it. */
@@ -1183,6 +1188,7 @@ subcommand_load(apr_getopt_t *os, void *baton, apr_pool_t *pool)
@@ -1195,6 +1200,7 @@ subcommand_load(apr_getopt_t *os, void *baton, apr_pool_t *pool)
SVN_ERR(open_repos(&repos, opt_state->repository_path, pool));
/* Read the stream from STDIN. Users can redirect a file. */

44
subversion/07-fix-path-tests.patch
View File

@@ -10,7 +10,7 @@ From: David Rothenberger <daveroth@acm.org>
3 files changed, 181 insertions(+), 43 deletions(-)
diff --git a/subversion/libsvn_subr/dirent_uri.c b/subversion/libsvn_subr/dirent_uri.c
index 2b51e7a..323f886 100644
index 4801f8c..7ae97c0 100644
--- a/subversion/libsvn_subr/dirent_uri.c
+++ b/subversion/libsvn_subr/dirent_uri.c
@@ -54,7 +54,7 @@
@@ -168,7 +168,7 @@ index 2b51e7a..323f886 100644
/* Check for UNC paths */
if (*ptr == '/')
{
@@ -2335,7 +2338,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
@@ -2337,7 +2340,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
/* Duplicate the URL, starting at the top of the path.
At the same time, we URI-decode the path. */
@@ -177,7 +177,7 @@ index 2b51e7a..323f886 100644
/* On Windows, we'll typically have to skip the leading / if the
path starts with a drive letter. Like most Web browsers, We
support two variants of this scheme:
@@ -2352,10 +2355,11 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
@@ -2354,10 +2357,11 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
even if the path looks like it starts with a drive letter.
*/
{
@@ -191,7 +191,7 @@ index 2b51e7a..323f886 100644
/* This check assumes ':' and '|' are already decoded! */
if (!hostname && dup_path[1] && strchr(valid_drive_letters, dup_path[1])
@@ -2383,6 +2387,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
@@ -2385,6 +2389,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
}
}
}
@@ -199,7 +199,7 @@ index 2b51e7a..323f886 100644
if (hostname)
{
if (dup_path[0] == '/' && dup_path[1] == '\0')
@@ -2396,7 +2401,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
@@ -2398,7 +2403,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
else
*dirent = dup_path;
}
@@ -208,7 +208,7 @@ index 2b51e7a..323f886 100644
/* Currently, the only hostnames we are allowing on non-Win32 platforms
are the empty string and 'localhost'. */
if (hostname)
@@ -2424,7 +2429,15 @@ svn_uri_get_file_url_from_dirent(const char **url,
@@ -2426,7 +2431,15 @@ svn_uri_get_file_url_from_dirent(const char **url,
if (dirent[0] == '/' && dirent[1] == '\0')
dirent = NULL; /* "file://" is the canonical form of "file:///" */
@@ -225,7 +225,7 @@ index 2b51e7a..323f886 100644
if (dirent[0] == '/')
{
diff --git a/subversion/tests/libsvn_subr/dirent_uri-test.c b/subversion/tests/libsvn_subr/dirent_uri-test.c
index 1ebf55c..d21d414 100644
index b2c7e53..6240685 100644
--- a/subversion/tests/libsvn_subr/dirent_uri-test.c
+++ b/subversion/tests/libsvn_subr/dirent_uri-test.c
@@ -43,7 +43,7 @@
@@ -408,7 +408,7 @@ index 1ebf55c..d21d414 100644
};
for (t = tests; t < tests + COUNT_OF(tests); t++)
@@ -1042,7 +1097,7 @@ test_dirent_is_canonical(apr_pool_t *pool)
@@ -1045,7 +1100,7 @@ test_dirent_is_canonical(apr_pool_t *pool)
{ "X:foo", TRUE },
{ "X:foo/", FALSE },
{ "file with spaces", TRUE },
@@ -417,7 +417,7 @@ index 1ebf55c..d21d414 100644
{ "X:/", TRUE },
{ "X:/foo", TRUE },
{ "X:", TRUE },
@@ -1061,6 +1116,22 @@ test_dirent_is_canonical(apr_pool_t *pool)
@@ -1064,6 +1119,22 @@ test_dirent_is_canonical(apr_pool_t *pool)
{ "//server/SHare", TRUE },
{ "//SERVER/SHare", FALSE },
{ "//srv/SH RE", TRUE },
@@ -440,7 +440,7 @@ index 1ebf55c..d21d414 100644
#else /* !SVN_USE_DOS_PATHS */
{ "X:/", FALSE },
/* Some people use colons in their filenames. */
@@ -1237,13 +1308,18 @@ test_dirent_split(apr_pool_t *pool)
@@ -1240,13 +1311,18 @@ test_dirent_split(apr_pool_t *pool)
{ "/", "/", "" },
{ "X:/foo/bar", "X:/foo", "bar" },
{ "X:foo/bar", "X:foo", "bar" },
@@ -460,7 +460,7 @@ index 1ebf55c..d21d414 100644
#else /* !SVN_USE_DOS_PATHS */
{ "X:foo", SVN_EMPTY_PATH, "X:foo" },
#endif /* SVN_USE_DOS_PATHS */
@@ -1383,7 +1459,7 @@ static const testcase_ancestor_t dirent_ancestor_tests[] =
@@ -1386,7 +1462,7 @@ static const testcase_ancestor_t dirent_ancestor_tests[] =
{ "/foo/bar/zig", "/foo", NULL },
{ "/foo/bar/zig", "/foo/ba", NULL },
{ "/foo/bar/zig", "/foo/bar/zi", NULL },
@@ -469,7 +469,7 @@ index 1ebf55c..d21d414 100644
{ "", "C:", NULL },
{ "", "C:foo", NULL },
{ "", "C:/", NULL },
@@ -1417,6 +1493,21 @@ static const testcase_ancestor_t dirent_ancestor_tests[] =
@@ -1420,6 +1496,21 @@ static const testcase_ancestor_t dirent_ancestor_tests[] =
{ "//srv/shr/fld", "//srv2/shr/fld", NULL },
{ "//srv/shr/fld", "//srv/shr/f", NULL },
{ "/", "//srv/share", NULL },
@@ -491,7 +491,7 @@ index 1ebf55c..d21d414 100644
#else /* !SVN_USE_DOS_PATHS */
{ "", "C:", "C:" },
{ "", "C:/foo", "C:/foo" },
@@ -1604,7 +1695,7 @@ test_dirent_get_longest_ancestor(apr_pool_t *pool)
@@ -1607,7 +1698,7 @@ test_dirent_get_longest_ancestor(apr_pool_t *pool)
{ "/", "/", "/"},
{ "X:foo", "Y:foo", SVN_EMPTY_PATH},
{ "X:/folder1", "Y:/folder2", SVN_EMPTY_PATH},
@@ -500,7 +500,7 @@ index 1ebf55c..d21d414 100644
{ "X:/", "X:/", "X:/"},
{ "X:/foo/bar/A/D/H/psi", "X:/foo/bar/A/B", "X:/foo/bar/A" },
{ "X:/foo/bar/boo", "X:/foo/bar/baz/boz", "X:/foo/bar"},
@@ -1618,6 +1709,14 @@ test_dirent_get_longest_ancestor(apr_pool_t *pool)
@@ -1621,6 +1712,14 @@ test_dirent_get_longest_ancestor(apr_pool_t *pool)
{ "X:", "X:foo", "X:"},
{ "X:", "X:/", SVN_EMPTY_PATH},
{ "X:foo", "X:bar", "X:"},
@@ -515,7 +515,7 @@ index 1ebf55c..d21d414 100644
#else /* !SVN_USE_DOS_PATHS */
{ "X:/foo", "X:", "X:"},
{ "X:/folder1", "X:/folder2", "X:"},
@@ -1763,11 +1862,13 @@ test_dirent_is_child(apr_pool_t *pool)
@@ -1766,11 +1865,13 @@ test_dirent_is_child(apr_pool_t *pool)
".foo",
"/",
"foo2",
@@ -530,7 +530,7 @@ index 1ebf55c..d21d414 100644
"H:/foo/bar",
"H:/foo/baz",
"H:/foo/bar/baz",
@@ -1809,7 +1910,7 @@ test_dirent_is_child(apr_pool_t *pool)
@@ -1812,7 +1913,7 @@ test_dirent_is_child(apr_pool_t *pool)
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -539,7 +539,7 @@ index 1ebf55c..d21d414 100644
/* //srv paths */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, "shr", "shr/fld", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -1819,6 +1920,8 @@ test_dirent_is_child(apr_pool_t *pool)
@@ -1822,6 +1923,8 @@ test_dirent_is_child(apr_pool_t *pool)
0, 0, 0, "fld", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -548,7 +548,7 @@ index 1ebf55c..d21d414 100644
/* H:/ paths */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, "baz", 0, "baz/bing/boom", 0, 0, 0, 0, 0 },
@@ -2187,13 +2290,19 @@ test_dirent_local_style(apr_pool_t *pool)
@@ -2190,13 +2293,19 @@ test_dirent_local_style(apr_pool_t *pool)
} tests[] = {
{ "", "." },
{ ".", "." },
@@ -569,7 +569,7 @@ index 1ebf55c..d21d414 100644
#else
{ "a:/file", "a:/file" },
{ "dir/file", "dir/file" },
@@ -2229,7 +2338,7 @@ test_dirent_internal_style(apr_pool_t *pool)
@@ -2232,7 +2341,7 @@ test_dirent_internal_style(apr_pool_t *pool)
{ "file", "file" },
{ "dir/file", "dir/file" },
{ "dir/file/./.", "dir/file" },
@@ -578,7 +578,7 @@ index 1ebf55c..d21d414 100644
{ "A:\\", "A:/" },
{ "A:\\file", "A:/file" },
{ "A:file", "A:file" },
@@ -2244,6 +2353,14 @@ test_dirent_internal_style(apr_pool_t *pool)
@@ -2247,6 +2356,14 @@ test_dirent_internal_style(apr_pool_t *pool)
{ "//srv/shr", "//srv/shr" },
{ "//srv/s r", "//srv/s r" },
{ "//srv/s r", "//srv/s r" },
@@ -593,7 +593,7 @@ index 1ebf55c..d21d414 100644
#else
{ "a:/", "a:" }, /* Wrong but expected for svn_path_*() */
{ "a:/file", "a:/file" },
@@ -2315,9 +2432,11 @@ test_dirent_from_file_url(apr_pool_t *pool)
@@ -2318,9 +2435,11 @@ test_dirent_from_file_url(apr_pool_t *pool)
{ "file://localhost", "/" },
{ "file://localhost/dir", "/dir" },
{ "file://localhost/dir/path", "/dir/path" },
@@ -606,7 +606,7 @@ index 1ebf55c..d21d414 100644
{ "file:///A:", "A:/" },
{ "file:///A:/dir", "A:/dir" },
{ "file:///A:dir", "A:dir" },
@@ -2351,7 +2470,7 @@ test_dirent_from_file_url_errors(apr_pool_t *pool)
@@ -2354,7 +2473,7 @@ test_dirent_from_file_url_errors(apr_pool_t *pool)
/* error if scheme is not "file" */
"http://localhost/dir",
"file+ssh://localhost/dir",

2
subversion/08-ruby-test-fix.patch
View File

@@ -5,7 +5,7 @@ From: David Rothenberger <d.rothenberger@entomo.com>
---
subversion/bindings/swig/ruby/svn/util.rb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/subversion/bindings/swig/ruby/svn/util.rb b/subversion/bindings/swig/ruby/svn/util.rb
index 8e05367..7fdf9ec 100644

18
subversion/09-wincrypt.patch
View File

@@ -13,7 +13,7 @@ From: David Rothenberger <daveroth@acm.org>
6 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/build.conf b/build.conf
index 73b925d..c66d3bd 100644
index 8cf7184..e6e1c5e 100644
--- a/build.conf
+++ b/build.conf
@@ -323,7 +323,7 @@ description = Subversion General Utility Library
@@ -23,7 +23,7 @@ index 73b925d..c66d3bd 100644
-libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic
+libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic wincrypt
msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
crypt32.lib version.lib psapi.lib
crypt32.lib version.lib
msvc-export =
@@ -1218,6 +1218,10 @@ type = lib
external-lib = -lhttpd2core
@@ -37,10 +37,10 @@ index 73b925d..c66d3bd 100644
type = project
path = build/win32
diff --git a/subversion/include/svn_auth.h b/subversion/include/svn_auth.h
index 5f59d6d..6ee4b50 100644
index 3e9f45e..155c063 100644
--- a/subversion/include/svn_auth.h
+++ b/subversion/include/svn_auth.h
@@ -859,7 +859,7 @@ svn_auth_get_platform_specific_client_providers(
@@ -865,7 +865,7 @@ svn_auth_get_platform_specific_client_providers(
svn_config_t *config,
apr_pool_t *pool);
@@ -50,10 +50,10 @@ index 5f59d6d..6ee4b50 100644
* Set @a *provider to an authentication provider of type @c
* svn_auth_cred_simple_t that gets/sets information from the user's
diff --git a/subversion/libsvn_subr/auth.c b/subversion/libsvn_subr/auth.c
index 5406358..b2b8a11 100644
index 3c874cf..a999711 100644
--- a/subversion/libsvn_subr/auth.c
+++ b/subversion/libsvn_subr/auth.c
@@ -522,7 +522,7 @@ svn_auth_get_platform_specific_provider(svn_auth_provider_object_t **provider,
@@ -525,7 +525,7 @@ svn_auth_get_platform_specific_provider(svn_auth_provider_object_t **provider,
}
#endif
@@ -63,10 +63,10 @@ index 5406358..b2b8a11 100644
strcmp(provider_type, "simple") == 0)
{
diff --git a/subversion/libsvn_subr/config_file.c b/subversion/libsvn_subr/config_file.c
index 9d15f6b..627b666 100644
index c705b14..a0a3847 100644
--- a/subversion/libsvn_subr/config_file.c
+++ b/subversion/libsvn_subr/config_file.c
@@ -1028,7 +1028,7 @@ svn_config_ensure(const char *config_dir, apr_pool_t *pool)
@@ -1058,7 +1058,7 @@ svn_config_ensure(const char *config_dir, apr_pool_t *pool)
"### windows-cryptoapi (Windows)" NL
#ifdef SVN_HAVE_KEYCHAIN_SERVICES
"# password-stores = keychain" NL
@@ -76,7 +76,7 @@ index 9d15f6b..627b666 100644
#else
"# password-stores = gpg-agent,gnome-keyring,kwallet" NL
diff --git a/subversion/libsvn_subr/win32_crypto.c b/subversion/libsvn_subr/win32_crypto.c
index a7e3828..f74c634 100644
index e16866a..96eaa93 100644
--- a/subversion/libsvn_subr/win32_crypto.c
+++ b/subversion/libsvn_subr/win32_crypto.c
@@ -26,7 +26,7 @@ typedef int win32_crypto__dummy;

6
subversion/10-perl-vendors.patch
View File

@@ -5,13 +5,13 @@ From: David Rothenberger <d.rothenberger@entomo.com>
---
Makefile.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 127b825..b23a284 100644
index 0423782..da67876 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -761,7 +761,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in
@@ -778,7 +778,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in
./config.status subversion/bindings/swig/perl/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL

6
subversion/11-XFAIL-case-sensitive-move-tests.patch
View File

@@ -10,7 +10,7 @@ From: David Rothenberger <d.rothenberger@entomo.com>
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/subversion/tests/cmdline/copy_tests.py b/subversion/tests/cmdline/copy_tests.py
index a4284b8..6670715 100755
index 460e716..01276ae 100755
--- a/subversion/tests/cmdline/copy_tests.py
+++ b/subversion/tests/cmdline/copy_tests.py
@@ -5199,6 +5199,7 @@ def copy_base_of_deleted(sbox):
@@ -39,10 +39,10 @@ index f73b98e..6a9e863 100644
def is_threaded_python():
return True
diff --git a/subversion/tests/libsvn_wc/op-depth-test.c b/subversion/tests/libsvn_wc/op-depth-test.c
index a191ac5..1470e87 100644
index 4f7f70c..7fc4ed1 100644
--- a/subversion/tests/libsvn_wc/op-depth-test.c
+++ b/subversion/tests/libsvn_wc/op-depth-test.c
@@ -8198,11 +8198,11 @@ struct svn_test_descriptor_t test_funcs[] =
@@ -8390,11 +8390,11 @@ struct svn_test_descriptor_t test_funcs[] =
"test_shadowed_update"),
SVN_TEST_OPTS_PASS(test_copy_of_deleted,
"test_copy_of_deleted (issue #3873)"),

2
subversion/12-fix-svnlook-test.patch
View File

@@ -5,7 +5,7 @@ From: David Rothenberger <d.rothenberger@entomo.com>
---
subversion/tests/cmdline/svnlook_tests.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subversion/tests/cmdline/svnlook_tests.py b/subversion/tests/cmdline/svnlook_tests.py
index f7c620b..027251c 100755

10
subversion/14-dso_open.patch → subversion/13-dso_open.patch
View File

@@ -12,10 +12,10 @@ http://cygwin.com/ml/cygwin/2012-03/msg00835.html
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/subversion/libsvn_fs/fs-loader.c b/subversion/libsvn_fs/fs-loader.c
index 01d6ba1..984a22f 100644
index 336b84f..63ef3cc 100644
--- a/subversion/libsvn_fs/fs-loader.c
+++ b/subversion/libsvn_fs/fs-loader.c
@@ -120,7 +120,12 @@ load_module(fs_init_func_t *initfunc, const char *name, apr_pool_t *pool)
@@ -121,7 +121,12 @@ load_module(fs_init_func_t *initfunc, const char *name, apr_pool_t *pool)
_("Invalid name for FS type '%s'"),
name);
@@ -30,7 +30,7 @@ index 01d6ba1..984a22f 100644
funcname = apr_psprintf(pool, "svn_fs_%s__init", name);
diff --git a/subversion/libsvn_ra/ra_loader.c b/subversion/libsvn_ra/ra_loader.c
index 4afcb59..16b38dc 100644
index d9cb96b..ae17d84 100644
--- a/subversion/libsvn_ra/ra_loader.c
+++ b/subversion/libsvn_ra/ra_loader.c
@@ -141,7 +141,12 @@ load_ra_module(svn_ra__init_func_t *func,
@@ -48,10 +48,10 @@ index 4afcb59..16b38dc 100644
funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name);
compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name);
diff --git a/subversion/libsvn_subr/auth.c b/subversion/libsvn_subr/auth.c
index b2b8a11..6dc0f18 100644
index a999711..6f88853 100644
--- a/subversion/libsvn_subr/auth.c
+++ b/subversion/libsvn_subr/auth.c
@@ -453,7 +453,11 @@ svn_auth_get_platform_specific_provider(svn_auth_provider_object_t **provider,
@@ -455,7 +455,11 @@ svn_auth_get_platform_specific_provider(svn_auth_provider_object_t **provider,
const char *library_label, *library_name;
const char *provider_function_name, *version_function_name;
library_name = apr_psprintf(pool,

2
subversion/14-fix_svnauthz_tests.patch
View File

@@ -5,7 +5,7 @@ From: David Rothenberger <daveroth@acm.org>
---
subversion/tests/cmdline/svnauthz_tests.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subversion/tests/cmdline/svnauthz_tests.py b/subversion/tests/cmdline/svnauthz_tests.py
index fc93b23..68b79c0 100755

2
subversion/15-XFAIL_case_sensitive_tree_conflict.patch
View File

@@ -6,7 +6,7 @@ It depends on Windows code that can get the canonical case for an on
disk item, but that has not been implemented for Cygwin.
---
subversion/tests/cmdline/basic_tests.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
1 file changed, 1 insertion(+)
diff --git a/subversion/tests/cmdline/basic_tests.py b/subversion/tests/cmdline/basic_tests.py
index c51d80a..b2209dd 100755

20
subversion/16-XFAIL_sqlite3_temp_table_tests.patch
View File

@@ -5,25 +5,25 @@ From: David Rothenberger <daveroth@acm.org>
The sqlite3 library (3.7.16.2-1) has a known problem with temporary
tables, and the wc-queries-test tests rely on this, so XFAIL them.
---
subversion/tests/libsvn_wc/wc-queries-test.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
subversion/tests/libsvn_wc/wc-queries-test.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/subversion/tests/libsvn_wc/wc-queries-test.c b/subversion/tests/libsvn_wc/wc-queries-test.c
index cd55a1c..c1f01f8 100644
index 74ad439..16dcdbc 100644
--- a/subversion/tests/libsvn_wc/wc-queries-test.c
+++ b/subversion/tests/libsvn_wc/wc-queries-test.c
@@ -712,10 +712,10 @@ struct svn_test_descriptor_t test_funcs[] =
@@ -886,11 +886,11 @@ struct svn_test_descriptor_t test_funcs[] =
SVN_TEST_NULL,
SVN_TEST_PASS2(test_sqlite_version,
"sqlite up-to-date"),
- SVN_TEST_PASS2(test_parsable,
- "queries are parsable"),
- SVN_TEST_PASS2(test_query_expectations,
- "test query expectations"),
+ SVN_TEST_XFAIL2(test_parsable,
+ "queries are parsable"),
"queries are parsable"),
- SVN_TEST_PASS2(test_query_expectations,
+ SVN_TEST_XFAIL2(test_query_expectations,
+ "test query expectations"),
SVN_TEST_PASS2(test_schema_statistics,
"test query expectations"),
- SVN_TEST_PASS2(test_schema_statistics,
+ SVN_TEST_XFAIL2(test_schema_statistics,
"test schema statistics"),
SVN_TEST_NULL
};

11
subversion/17-dont-build-tests.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/configure.ac
+++ b/configure.ac
@@ -812,7 +812,7 @@
INSTALL_STATIC_RULES="install-bin install-docs"
INSTALL_RULES="install-fsmod-lib install-ramod-lib install-lib install-include install-static"
INSTALL_RULES="$INSTALL_RULES $INSTALL_APACHE_RULE"
-BUILD_RULES="fsmod-lib ramod-lib lib bin test sub-test $BUILD_APACHE_RULE tools"
+BUILD_RULES="fsmod-lib ramod-lib lib bin sub-test $BUILD_APACHE_RULE tools"
if test "$svn_lib_berkeley_db" = "yes"; then
BUILD_RULES="$BUILD_RULES bdb-lib bdb-test"

45
subversion/PKGBUILD
View File

@@ -30,32 +30,34 @@ source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc
10-perl-vendors.patch
11-XFAIL-case-sensitive-move-tests.patch
12-fix-svnlook-test.patch
14-dso_open.patch
13-dso_open.patch
14-fix_svnauthz_tests.patch
15-XFAIL_case_sensitive_tree_conflict.patch
16-XFAIL_sqlite3_temp_table_tests.patch
17-dont-build-tests.patch
subversion-1.8.0-msys2.patch
remove-checking-symlink.patch
fix-autogen.patch)
md5sums=('3068256761b40863df96128834d6b71b'
'SKIP'
'07ee0cb01bdf8468cb8d4c22c0d6bc04'
'42faeb019c65be928a90d0cf4203d65c'
'0a858a775000407676900d23d9e717ac'
'ff627c4baa06c04fbccfd2e06189ab5f'
'2ba451721e676ea689d3538b9c436479'
'72a774fab01ea2f5c83f4d68b0dea0ab'
'3a45dc619d830e6efef90d8ef2782923'
'f307b3c8d0ffe2967aa30cdbc6d22b0a'
'232c54625c9c4fd4f060d7b735da0315'
'66e52cdefc037c05163fc89a289b2578'
'2b54f0bc7ebb43d933d57ed565fd02cc'
'69ef6bf65f26916a29f80fcabe480491'
'8c73463534e1005cd0a8e562f7de69c9'
'8baab01eb6847d162abe3d43a9ed07e2'
'ca7fb78bcd33a12845168e603128aa5d'
'19ebc3da4d7735c86195e5c0907ff3cf'
'7bde0022868c254023aaca3f4dd671b2'
'dbf63cb39ddea409a37bc6647065fae9'
'779ba1926eb4ae336c82a3bb7c7d9405'
'e72377cfd487e747802d3cac4791446a'
'3dd9bd4c57c117feb47a5b031fd8963d'
'4baa242af00a44ff7336f673b5ae6cb0'
'74cd0f3f6e1690446d9045af4a329283'
'87c5714962fe0aa2f681a74ea65b858e'
'5c9424fa51cb6b45de95d977e468809c'
'62d78ade3ac905df83591f084ae8d279'
'0ed12264773291d1816790855edb8143'
'8e0e89f7b5d8b270c381503323ee83e2'
'da2379bad17a4a8d9058ee77585a844b'
'f8517036988cc78f881a9e016a3997d0'
'405c1bd35472a789c01ee2997da38af1'
'70ea60f69961e2282a28f3bbf2772d0a'
'906757eb7d836d91d8659621a2a8e6e8'
'75e6f9210afa69d1838d85169012a59f'
'4fa20fd521213811d038783f6576ca4a'
'be151d5feeab94774c1366382044f821'
'cb3d1901919d4038dc0b4cffc73c7fa9')
@@ -88,10 +90,11 @@ prepare() {
patch -p1 -i ${srcdir}/10-perl-vendors.patch
patch -p1 -i ${srcdir}/11-XFAIL-case-sensitive-move-tests.patch
patch -p1 -i ${srcdir}/12-fix-svnlook-test.patch
patch -p1 -i ${srcdir}/14-dso_open.patch
patch -p1 -i ${srcdir}/13-dso_open.patch
patch -p1 -i ${srcdir}/14-fix_svnauthz_tests.patch
patch -p1 -i ${srcdir}/15-XFAIL_case_sensitive_tree_conflict.patch
patch -p1 -i ${srcdir}/16-XFAIL_sqlite3_temp_table_tests.patch
patch -p1 -i ${srcdir}/17-dont-build-tests.patch
patch -p1 -i ${srcdir}/subversion-1.8.0-msys2.patch
patch -p1 -i ${srcdir}/remove-checking-symlink.patch
patch -p1 -i ${srcdir}/fix-autogen.patch
@@ -106,13 +109,15 @@ build() {
--build=${CHOST} \
--with-apr=/usr \
--with-apr-util=/usr \
--with-zlib=/usr --with-serf=/usr --without-apxs \
--with-zlib=/usr \
--with-serf=/usr \
--with-sqlite=/usr \
--without-apxs \
--without-gnome-keyring \
--enable-shared --disable-static \
--with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \
--enable-disallowing-of-undefined-references \
--enable-local-library-preloading \
--enable-local-library-preloading
#make LT_LDFLAGS="-L$Fdestdir/usr/lib"
# make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \