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

subversion: Update to 1.10.0

Browse Source
This commit is contained in:
Alexey Pavlov 2018-06-27 10:06:29 +03:00
parent e82c03f2f9
commit cfabeae1f0
19 changed files with 323 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,10 @@ From: David Rothenberger <d.rothenberger@entomo.com>
1 file changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
index 1fe0414..fae02fd 100644
index 9374d65..bc91a22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1577,6 +1577,11 @@ AC_DEFINE_UNQUOTED([SVN_BUILD_TARGET], "${target}",
@@ -1607,6 +1607,11 @@ AC_DEFINE_UNQUOTED([SVN_BUILD_TARGET], "${target}",
[Defined to the config.guess name of the build target])
AC_OUTPUT

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

@ -8,10 +8,10 @@ From: David Rothenberger <daveroth@acm.org>
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/build.conf b/build.conf
index 4f020da..a22bdaf 100644
index 8f5617b..f62e391 100644
--- a/build.conf
+++ b/build.conf
@@ -403,7 +403,7 @@ type = apache-mod
@@ -411,7 +411,7 @@ type = apache-mod
path = subversion/mod_dav_svn
sources = *.c reports/*.c posts/*.c
libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr libhttpd mod_dav
@ -20,7 +20,7 @@ index 4f020da..a22bdaf 100644
install = apache-mod
[mod_authz_svn]
@@ -411,8 +411,9 @@ description = Subversion path-based authorization module for Apache
@@ -419,8 +419,9 @@ description = Subversion path-based authorization module for Apache
when = INSTALL_APACHE_MODS
type = apache-mod
path = subversion/mod_authz_svn
@ -31,18 +31,18 @@ index 4f020da..a22bdaf 100644
install = apache-mod
[mod_dontdothat]
@@ -420,8 +421,9 @@ description = Apache Httpd module to block certain kinds of Apache Subversion re
@@ -428,8 +429,9 @@ description = Apache Httpd module to block certain kinds of Apache Subversion re
when = INSTALL_APACHE_MODS
type = apache-mod
path = tools/server-side/mod_dontdothat
-nonlibs = mod_dav_svn apr aprutil
libs = libsvn_subr xml libhttpd
libs = libsvn_subr libhttpd
+ httpd aprutil apr
+ mod_dav_svn
install = tools
# The Subversion FSFS repository manipulation tool
@@ -561,7 +563,7 @@ lang = python
@@ -568,7 +570,7 @@ lang = python
path = subversion/bindings/swig/python/libsvn_swig_py
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
apriconv apr python swig
@ -51,13 +51,13 @@ index 4f020da..a22bdaf 100644
install = swig-py-lib
# need special build rule to include -DSWIGPYTHON
compile-cmd = $(COMPILE_SWIG_PY)
@@ -1456,6 +1458,11 @@ external-lib = $(SVN_SWIG_LIBS)
@@ -1528,6 +1530,11 @@ external-lib = $(SVN_SWIG_LIBS)
type = lib
external-lib = $(SVN_PERL_LIBS)
+[httpd]
+type = lib
+external-lib = -lhttpd
+external-lib = -lmod_dav -lhttpd
+libs = aprutil apr
+
[python]

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

@ -4,58 +4,57 @@ From: David Rothenberger <daveroth@acm.org>
---
Makefile.in | 1 +
build.conf | 3 ++-
build/ac-macros/swig.m4 | 6 ++++++
3 files changed, 9 insertions(+), 1 deletion(-)
Makefile.in | 1 +
build.conf | 7 ++-----
.../bindings/swig/perl/native/Makefile.PL.in | 1 +
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index e63a09c..c6329d9 100644
index f4c6e61..30ff51b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -145,6 +145,7 @@ SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
@@ -149,6 +149,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@
+SWIG_PL_LIBS = @SWIG_PL_LIBS@
+SWIG_PL_LINK = @SWIG_PL_LINK@
SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
SWIG_RB_COMPILE = @SWIG_RB_COMPILE@
SWIG_RB_LINK = @SWIG_RB_LINK@
diff --git a/build.conf b/build.conf
index a22bdaf..2795c23 100644
index f62e391..8ab8e30 100644
--- a/build.conf
+++ b/build.conf
@@ -575,7 +575,8 @@ msvc-export = ../bindings/swig/python/libsvn_swig_py/swigutil_py.h
@@ -583,7 +583,8 @@ description = Subversion utility library for Python bindings
type = swig_lib
lang = perl
path = subversion/bindings/swig/perl/libsvn_swig_perl
-libs = libsvn_delta libsvn_subr apriconv apr perl swig
+libs = libsvn_delta libsvn_subr apriconv apr swig
+link-cmd = $(LINK) $(SWIG_PL_LIBS)
+link-cmd = $(LINK) $(SWIG_PL_LINK)
install = swig-pl-lib
# need special build rule to include
compile-cmd = $(COMPILE_SWIG_PL)
diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4
index ae6cf10..19f09db 100644
--- a/build/ac-macros/swig.m4
+++ b/build/ac-macros/swig.m4
@@ -174,6 +174,11 @@ AC_DEFUN(SVN_FIND_SWIG,
AC_MSG_RESULT([$PERL_VERSION])
if test "$PERL_VERSION" -ge "5008000"; then
SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
+
+ AC_CACHE_CHECK([how to link Perl libraries], [ac_cv_perl_libs], [
+ ac_cv_perl_libs="`$PERL -MExtUtils::Embed -e ldopts`"
+ ])
+ SWIG_PL_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_perl_libs)`"
else
AC_MSG_WARN([perl bindings require perl 5.8.0 or newer.])
fi
@@ -300,6 +305,7 @@ int main()
AC_SUBST(SWIG_PY_LINK)
AC_SUBST(SWIG_PY_LIBS)
AC_SUBST(SWIG_PL_INCLUDES)
+ AC_SUBST(SWIG_PL_LIBS)
AC_SUBST(SWIG_RB_LINK)
AC_SUBST(SWIG_RB_LIBS)
AC_SUBST(SWIG_RB_INCLUDES)
@@ -1526,10 +1527,6 @@ external-lib = $(SVN_XML_LIBS)
type = lib
external-lib = $(SVN_SWIG_LIBS)
-[perl]
-type = lib
-external-lib = $(SVN_PERL_LIBS)
-
[httpd]
type = lib
external-lib = -lmod_dav -lhttpd
diff --git a/subversion/bindings/swig/perl/native/Makefile.PL.in b/subversion/bindings/swig/perl/native/Makefile.PL.in
index 3b36901..8ec0bac 100644
--- a/subversion/bindings/swig/perl/native/Makefile.PL.in
+++ b/subversion/bindings/swig/perl/native/Makefile.PL.in
@@ -62,6 +62,7 @@ chomp($cflags);
$cflags =~ s/-ansi\s+//g;
$cflags =~ s/-std=c89\s+//g;
$cflags =~ s/-Wall//g;
+$cflags =~ s/-Werror=format-security//g;
$cflags =~ s/-Wunused//g;
$cflags =~ s/-Wshadow//g;
$cflags =~ s/-Wstrict-prototypes//g;

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

@ -8,19 +8,19 @@ doesn't because the user has Administrator privileges.
1 file changed, 7 insertions(+)
diff --git a/subversion/tests/cmdline/switch_tests.py b/subversion/tests/cmdline/switch_tests.py
index 8712723..c7cfa50 100755
index bcaaf03..506483c 100755
--- a/subversion/tests/cmdline/switch_tests.py
+++ b/subversion/tests/cmdline/switch_tests.py
@@ -773,6 +773,13 @@ def refresh_read_only_attribute(sbox):
if os.geteuid() == 0:
raise svntest.Skip
raise svntest.Skip('Test doesn\'t work as uid 0')
+ # Same test, but for Cygwin
+ if os.name == 'posix':
+ try:
+ os.getgroups.index(513)
+ except:
+ raise svntest.Skip
+ raise svntest.Skip('Test doesn\'t work as Cygwin admin')
+
sbox.build()
wc_dir = sbox.wc_dir

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

@ -4,11 +4,11 @@ From: David Rothenberger <daveroth@acm.org>
---
subversion/libsvn_subr/io.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
subversion/libsvn_subr/io.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/subversion/libsvn_subr/io.c b/subversion/libsvn_subr/io.c
index 75e8564..f47c4c2 100644
index 8c4f267..8d1d74c 100644
--- a/subversion/libsvn_subr/io.c
+++ b/subversion/libsvn_subr/io.c
@@ -29,6 +29,10 @@
@ -35,7 +35,7 @@ index 75e8564..f47c4c2 100644
#else
#define WIN32_RETRY_LOOP(err, expr) ((void)0)
#endif
@@ -2631,6 +2641,7 @@ svn_io_remove_file2(const char *path,
@@ -2642,6 +2652,7 @@ svn_io_remove_file2(const char *path,
apr_err = apr_file_remove(path_apr, scratch_pool);
@ -43,9 +43,9 @@ index 75e8564..f47c4c2 100644
#ifdef WIN32
/* If the target is read only NTFS reports EACCESS and FAT/FAT32
reports EEXIST */
@@ -2644,10 +2655,14 @@ svn_io_remove_file2(const char *path,
if (!apr_err)
return SVN_NO_ERROR;
@@ -2652,10 +2663,14 @@ svn_io_remove_file2(const char *path,
SVN_ERR(svn_io_set_file_read_write(path, ignore_enoent, scratch_pool));
apr_err = apr_file_remove(path_apr, scratch_pool);
}
-
+#endif
@ -59,32 +59,17 @@ index 75e8564..f47c4c2 100644
{
apr_finfo_t finfo;
@@ -4172,20 +4187,22 @@ svn_io_file_rename(const char *from_path, const char *to_path,
status = apr_file_rename(from_path_apr, to_path_apr, pool);
-#if defined(WIN32) || defined(__OS2__)
+#if defined(WIN32) || defined(__OS2__) || defined(__CYGWIN__)
/* If the target file is read only NTFS reports EACCESS and
FAT/FAT32 reports EEXIST */
if (APR_STATUS_IS_EACCES(status) || APR_STATUS_IS_EEXIST(status))
{
+#ifndef __CYGWIN__
/* Set the destination file writable because Windows will not
allow us to rename when to_path is read-only, but will
allow renaming when from_path is read only. */
SVN_ERR(svn_io_set_file_read_write(to_path, TRUE, pool));
+#endif
status = apr_file_rename(from_path_apr, to_path_apr, pool);
@@ -4280,6 +4295,9 @@ svn_io_file_rename2(const char *from_path, const char *to_path,
}
WIN32_RETRY_LOOP(status, apr_file_rename(from_path_apr, to_path_apr, pool));
-#endif /* WIN32 || __OS2__ */
+#endif /* WIN32 || __OS2__ || __CYGWIN__ */
#else
status = apr_file_rename(from_path_apr, to_path_apr, pool);
+#ifdef __CYGWIN__
+ WIN32_RETRY_LOOP(status, apr_file_rename(from_path_apr, to_path_apr, pool));
+#endif
#endif /* WIN32 || __OS2__ */
if (status)
return svn_error_wrap_apr(status, _("Can't move '%s' to '%s'"),
@@ -4310,7 +4327,7 @@ dir_make(const char *path, apr_fileperms_t perm,
@@ -4412,7 +4430,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'. */

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

@ -4,14 +4,14 @@ From: David Rothenberger <d.rothenberger@entomo.com>
---
subversion/svnadmin/svnadmin.c | 6 ++++++
1 file changed, 6 insertions(+)
subversion/svnadmin/svnadmin.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/subversion/svnadmin/svnadmin.c b/subversion/svnadmin/svnadmin.c
index ec98c6b..3ffbf7d 100644
index eb26c5a..6267224 100644
--- a/subversion/svnadmin/svnadmin.c
+++ b/subversion/svnadmin/svnadmin.c
@@ -51,6 +51,10 @@
@@ -52,6 +52,10 @@
#include "svn_private_config.h"
@ -22,19 +22,27 @@ index ec98c6b..3ffbf7d 100644
/*** Code. ***/
@@ -1212,6 +1216,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"));
+ setmode(STDOUT_FILENO, O_BINARY);
SVN_ERR(svn_stream_for_stdout(&stdout_stream, pool));
@@ -1359,7 +1363,10 @@ subcommand_dump(apr_getopt_t *os, void *baton, apr_pool_t *pool)
out_stream = svn_stream_from_aprfile2(file, FALSE, pool);
}
else
- SVN_ERR(svn_stream_for_stdout(&out_stream, pool));
+ {
+ setmode(STDOUT_FILENO, O_BINARY);
+ SVN_ERR(svn_stream_for_stdout(&out_stream, pool));
+ }
/* Progress feedback goes to STDERR, unless they asked to suppress it. */
@@ -1401,6 +1406,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. */
+ setmode(STDIN_FILENO, O_BINARY);
SVN_ERR(svn_stream_for_stdin(&stdin_stream, pool));
if (! opt_state->quiet)
@@ -1635,7 +1642,10 @@ subcommand_load(apr_getopt_t *os, void *baton, apr_pool_t *pool)
SVN_ERR(svn_stream_open_readonly(&in_stream, opt_state->file,
pool, pool));
else
- SVN_ERR(svn_stream_for_stdin2(&in_stream, TRUE, pool));
+ {
+ setmode(STDIN_FILENO, O_BINARY);
+ SVN_ERR(svn_stream_for_stdin2(&in_stream, TRUE, pool));
+ }
/* Progress feedback goes to STDOUT, unless they asked to suppress it. */
if (! opt_state->quiet)

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

@ -10,7 +10,7 @@ From: David Rothenberger <daveroth@acm.org>
3 files changed, 181 insertions(+), 42 deletions(-)
diff --git a/subversion/libsvn_subr/dirent_uri.c b/subversion/libsvn_subr/dirent_uri.c
index a009145..9b83a7e 100644
index b53f350..e7fc389 100644
--- a/subversion/libsvn_subr/dirent_uri.c
+++ b/subversion/libsvn_subr/dirent_uri.c
@@ -55,7 +55,7 @@
@ -26,7 +26,7 @@ index a009145..9b83a7e 100644
static apr_size_t
dirent_root_length(const char *dirent, apr_size_t len)
{
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
#ifdef SVN_USE_DOS_PATHS
if (len >= 2 && dirent[1] == ':' &&
((dirent[0] >= 'A' && dirent[0] <= 'Z') ||
@ -52,38 +52,38 @@ index a009145..9b83a7e 100644
*(dst++) = *(src++);
-#ifdef SVN_USE_DOS_PATHS
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
/* On Windows permit two leading separator characters which means an
* UNC path. */
if ((type == type_dirent) && *src == '/')
@@ -534,7 +536,7 @@ canonicalize(path_type_t type, const char *path, apr_pool_t *pool)
@@ -540,7 +542,7 @@ canonicalize(path_type_t type, const char *path, apr_pool_t *pool)
*dst = '\0';
-#ifdef SVN_USE_DOS_PATHS
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
/* Skip leading double slashes when there are less than 2
* canon segments. UNC paths *MUST* have two segments. */
if ((type == type_dirent) && canon[0] == '/' && canon[1] == '/')
@@ -668,7 +670,7 @@ get_longest_ancestor_length(path_type_t types,
@@ -674,7 +676,7 @@ get_longest_ancestor_length(path_type_t types,
apr_size_t path1_len, path2_len;
apr_size_t i = 0;
apr_size_t last_dirsep = 0;
-#ifdef SVN_USE_DOS_PATHS
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
svn_boolean_t unc = FALSE;
#endif
@@ -701,7 +703,7 @@ get_longest_ancestor_length(path_type_t types,
@@ -707,7 +709,7 @@ get_longest_ancestor_length(path_type_t types,
return 0;
/* Handle some windows specific cases */
-#ifdef SVN_USE_DOS_PATHS
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
if (types == type_dirent)
{
/* don't count the '//' from UNC paths */
@@ -711,6 +713,7 @@ get_longest_ancestor_length(path_type_t types,
@@ -717,6 +719,7 @@ get_longest_ancestor_length(path_type_t types,
unc = TRUE;
}
@ -91,23 +91,23 @@ index a009145..9b83a7e 100644
/* X:/ and X:/foo */
if (i == 3 && path1[2] == '/' && path1[1] == ':')
return i;
@@ -728,8 +731,9 @@ get_longest_ancestor_length(path_type_t types,
@@ -734,8 +737,9 @@ get_longest_ancestor_length(path_type_t types,
/* X: and X:foo */
if (path1[i - 1] == ':' || path2[i - 1] == ':')
return i;
- }
#endif /* SVN_USE_DOS_PATHS */
+ }
+#endif /* defined(SVN_USE_DOS_PATHS) || defined(CYGWIN) */
+#endif /* defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__) */
/* last_dirsep is now the offset of the last directory separator we
crossed before reaching a non-matching byte. i is the offset of
@@ -744,18 +748,20 @@ get_longest_ancestor_length(path_type_t types,
@@ -750,18 +754,20 @@ get_longest_ancestor_length(path_type_t types,
{
/* Nothing in common but the root folder '/' or 'X:/' for Windows
dirents. */
-#ifdef SVN_USE_DOS_PATHS
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
if (! unc)
{
+#ifdef SVN_USE_DOS_PATHS
@ -117,15 +117,15 @@ index a009145..9b83a7e 100644
&& path2[1] == ':' && path2[2] == '/')
return 3;
#endif /* SVN_USE_DOS_PATHS */
+#endif /* defined(SVN_USE_DOS_PATHS) || defined(CYGWIN) */
+#endif /* defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__) */
if (last_dirsep == 0 && path1[0] == '/' && path2[0] == '/')
return 1;
-#ifdef SVN_USE_DOS_PATHS
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
}
#endif
}
@@ -913,7 +919,8 @@ svn_relpath__internal_style(const char *relpath,
@@ -919,7 +925,8 @@ svn_relpath__internal_style(const char *relpath,
svn_boolean_t
svn_dirent_is_root(const char *dirent, apr_size_t len)
{
@ -135,7 +135,7 @@ index a009145..9b83a7e 100644
/* On Windows and Cygwin, 'H:' or 'H:/' (where 'H' is any letter)
are also root directories */
if ((len == 2 || ((len == 3) && (dirent[2] == '/'))) &&
@@ -921,9 +928,9 @@ svn_dirent_is_root(const char *dirent, apr_size_t len)
@@ -927,9 +934,9 @@ svn_dirent_is_root(const char *dirent, apr_size_t len)
((dirent[0] >= 'A' && dirent[0] <= 'Z') ||
(dirent[0] >= 'a' && dirent[0] <= 'z')))
return TRUE;
@ -147,7 +147,7 @@ index a009145..9b83a7e 100644
if (len >= 2 && dirent[0] == '/' && dirent[1] == '/'
&& dirent[len - 1] != '/')
{
@@ -938,11 +945,7 @@ svn_dirent_is_root(const char *dirent, apr_size_t len)
@@ -944,11 +951,7 @@ svn_dirent_is_root(const char *dirent, apr_size_t len)
return FALSE;
}
}
@ -159,25 +159,25 @@ index a009145..9b83a7e 100644
}
#endif
@@ -1679,7 +1682,7 @@ svn_dirent_is_canonical(const char *dirent, apr_pool_t *scratch_pool)
@@ -1685,7 +1688,7 @@ svn_dirent_is_canonical(const char *dirent, apr_pool_t *scratch_pool)
if (*ptr == '/')
{
ptr++;
-#ifdef SVN_USE_DOS_PATHS
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
/* Check for UNC paths */
if (*ptr == '/')
{
@@ -2366,7 +2369,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
@@ -2372,7 +2375,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. */
-#ifdef SVN_USE_DOS_PATHS
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
/* 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:
@@ -2383,10 +2386,11 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
@@ -2389,10 +2392,11 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
even if the path looks like it starts with a drive letter.
*/
{
@ -191,28 +191,28 @@ index a009145..9b83a7e 100644
/* This check assumes ':' and '|' are already decoded! */
if (!hostname && dup_path[1] && strchr(valid_drive_letters, dup_path[1])
@@ -2414,6 +2418,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
}
@@ -2425,6 +2429,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
dup_path[2] = '/'; /* Ensure not relative for '\' after drive! */
}
}
+#endif
+#endif
if (hostname)
{
if (dup_path[0] == '/' && dup_path[1] == '\0')
@@ -2427,7 +2432,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
@@ -2438,7 +2443,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent,
else
*dirent = dup_path;
}
-#else /* !SVN_USE_DOS_PATHS */
+#else /* !(defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)) */
+#else /* !(defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)) */
/* Currently, the only hostnames we are allowing on non-Win32 platforms
are the empty string and 'localhost'. */
if (hostname)
@@ -2455,7 +2460,15 @@ svn_uri_get_file_url_from_dirent(const char **url,
@@ -2466,7 +2471,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:///" */
+#ifdef CYGWIN
+#ifdef __CYGWIN__
+ if (dirent != NULL && dirent[0] == '/' && dirent[1] == '/')
+ /* Handle UNC paths //server/share -> file://server/share */
+ *url = apr_pstrcat(pool, "file:", dirent, NULL);
@ -225,7 +225,7 @@ index a009145..9b83a7e 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 61d9e24..5de91c3 100644
index 086cdbc..9d59dc5 100644
--- a/subversion/tests/libsvn_subr/dirent_uri-test.c
+++ b/subversion/tests/libsvn_subr/dirent_uri-test.c
@@ -44,7 +44,7 @@
@ -250,7 +250,7 @@ index 61d9e24..5de91c3 100644
{ "//srv/shr/fld", FALSE },
{ "//srv/s r", TRUE },
{ "//srv/s r/fld", FALSE },
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ { "/", TRUE },
+ { "/X:foo", FALSE },
+ { "/X:", FALSE },
@ -274,7 +274,7 @@ index 61d9e24..5de91c3 100644
{ "//srv/shr/fld", TRUE },
{ "//srv/s r", TRUE },
{ "//srv/s r/fld", TRUE },
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ { "/foo/bar", TRUE },
+ { "/foo", TRUE },
+ { "/", TRUE },
@ -302,7 +302,7 @@ index 61d9e24..5de91c3 100644
{ "aa", "A:", "A:" },
{ "aa", "A:file", "A:file"},
{ "A:", "/", "A:/" },
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ { "X:abc", "X:/def", "X:abc/X:/def" },
+ { "X:","abc", "X:/abc" },
+ { "X:/abc", "X:/def", "X:/abc/X:/def" },
@ -326,7 +326,7 @@ index 61d9e24..5de91c3 100644
TEST_MANY((pool, "abcd", "/dir", "A:", "file", SVN_VA_NULL), "A:file");
TEST_MANY((pool, "abcd", "A:", "/dir", "file", SVN_VA_NULL), "A:/dir/file");
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ TEST_MANY((pool, "X:", "def", "ghi", SVN_VA_NULL), "X:/def/ghi");
+ TEST_MANY((pool, "X:", SVN_EMPTY_PATH, "ghi", SVN_VA_NULL), "X:/ghi");
+ TEST_MANY((pool, "X:", "def", SVN_EMPTY_PATH, SVN_VA_NULL), "X:/def");
@ -353,7 +353,7 @@ index 61d9e24..5de91c3 100644
{ "//srv/shr/fld", "fld" },
{ "//srv/shr/fld/subfld", "subfld" },
{ "//srv/s r/fld", "fld" },
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ { "X:", "X:" },
+ { "X:abc", "X:abc" },
+ { "//srv/shr", "" },
@ -376,7 +376,7 @@ index 61d9e24..5de91c3 100644
{ "//srv/shr/fld", "//srv/shr" },
{ "//srv/shr/fld/subfld", "//srv/shr/fld" },
{ "//srv/s r/fld", "//srv/s r" },
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ /* on non-Windows platforms, ':' is allowed in pathnames */
+ { "X:", "" },
+ { "X:abc", "" },
@ -393,7 +393,7 @@ index 61d9e24..5de91c3 100644
{ "x:AAAAA", "X:AAAAA" },
- /* We permit UNC dirents on Windows. By definition UNC
+#endif /* SVN_USE_DOS_PATHS */
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
+ /* We permit UNC dirents on Windows and Cygwin. By definition UNC
* dirents must have two components so we should remove the
* double slash if there is only one component. */
@ -403,11 +403,11 @@ index 61d9e24..5de91c3 100644
{ "//srv/s r", "//srv/s r" },
{ "//srv/s r/qq", "//srv/s r/qq" },
-#endif /* SVN_USE_DOS_PATHS */
+#endif /* defined(SVN_USE_DOS_PATHS) || defined(CYGWIN) */
+#endif /* defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__) */
};
for (t = tests; t < tests + COUNT_OF(tests); t++)
@@ -1049,7 +1105,7 @@ test_dirent_is_canonical(apr_pool_t *pool)
@@ -1076,7 +1132,7 @@ test_dirent_is_canonical(apr_pool_t *pool)
{ "X:foo", TRUE },
{ "X:foo/", FALSE },
{ "file with spaces", TRUE },
@ -416,11 +416,11 @@ index 61d9e24..5de91c3 100644
{ "X:/", TRUE },
{ "X:/foo", TRUE },
{ "X:", TRUE },
@@ -1068,6 +1124,22 @@ test_dirent_is_canonical(apr_pool_t *pool)
@@ -1095,6 +1151,22 @@ test_dirent_is_canonical(apr_pool_t *pool)
{ "//server/SHare", TRUE },
{ "//SERVER/SHare", FALSE },
{ "//srv/SH RE", TRUE },
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ { "X:/", FALSE },
+ /* Some people use colons in their filenames. */
+ { ":", TRUE },
@ -439,7 +439,7 @@ index 61d9e24..5de91c3 100644
#else /* !SVN_USE_DOS_PATHS */
{ "X:/", FALSE },
/* Some people use colons in their filenames. */
@@ -1245,13 +1317,18 @@ test_dirent_split(apr_pool_t *pool)
@@ -1278,13 +1350,18 @@ test_dirent_split(apr_pool_t *pool)
{ "/", "/", "" },
{ "X:/foo/bar", "X:/foo", "bar" },
{ "X:foo/bar", "X:foo", "bar" },
@ -451,7 +451,7 @@ index 61d9e24..5de91c3 100644
{ "//srv/shr", "//srv/shr", "" },
{ "//srv/shr/fld", "//srv/shr", "fld" },
{ "//srv/s r", "//srv/s r", "" },
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ { "X:foo", SVN_EMPTY_PATH, "X:foo" },
+ { "//srv/shr", "//srv/shr", "" },
+ { "//srv/shr/fld", "//srv/shr", "fld" },
@ -459,7 +459,7 @@ index 61d9e24..5de91c3 100644
#else /* !SVN_USE_DOS_PATHS */
{ "X:foo", SVN_EMPTY_PATH, "X:foo" },
#endif /* SVN_USE_DOS_PATHS */
@@ -1391,7 +1468,7 @@ static const testcase_ancestor_t dirent_ancestor_tests[] =
@@ -1424,7 +1501,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 },
@ -468,11 +468,11 @@ index 61d9e24..5de91c3 100644
{ "", "C:", NULL },
{ "", "C:foo", NULL },
{ "", "C:/", NULL },
@@ -1425,6 +1502,21 @@ static const testcase_ancestor_t dirent_ancestor_tests[] =
@@ -1458,6 +1535,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 },
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ { "", "C:", "C:" },
+ { "", "C:/foo", "C:/foo" },
+ { "X:", "X:foo", NULL },
@ -490,7 +490,7 @@ index 61d9e24..5de91c3 100644
#else /* !SVN_USE_DOS_PATHS */
{ "", "C:", "C:" },
{ "", "C:/foo", "C:/foo" },
@@ -1612,7 +1704,7 @@ test_dirent_get_longest_ancestor(apr_pool_t *pool)
@@ -1645,7 +1737,7 @@ test_dirent_get_longest_ancestor(apr_pool_t *pool)
{ "/", "/", "/"},
{ "X:foo", "Y:foo", SVN_EMPTY_PATH},
{ "X:/folder1", "Y:/folder2", SVN_EMPTY_PATH},
@ -499,11 +499,11 @@ index 61d9e24..5de91c3 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"},
@@ -1626,6 +1718,14 @@ test_dirent_get_longest_ancestor(apr_pool_t *pool)
@@ -1659,6 +1751,14 @@ test_dirent_get_longest_ancestor(apr_pool_t *pool)
{ "X:", "X:foo", "X:"},
{ "X:", "X:/", SVN_EMPTY_PATH},
{ "X:foo", "X:bar", "X:"},
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ { "X:/foo", "X:", "X:"},
+ { "X:/folder1", "X:/folder2", "X:"},
+ { "X:", "X:foo", SVN_EMPTY_PATH},
@ -514,12 +514,12 @@ index 61d9e24..5de91c3 100644
#else /* !SVN_USE_DOS_PATHS */
{ "X:/foo", "X:", "X:"},
{ "X:/folder1", "X:/folder2", "X:"},
@@ -1771,11 +1871,13 @@ test_dirent_is_child(apr_pool_t *pool)
@@ -1804,11 +1904,13 @@ test_dirent_is_child(apr_pool_t *pool)
".foo",
"/",
"foo2",
-#ifdef SVN_USE_DOS_PATHS
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
"//srv",
"//srv2",
"//srv/shr",
@ -529,16 +529,16 @@ index 61d9e24..5de91c3 100644
"H:/foo/bar",
"H:/foo/baz",
"H:/foo/bar/baz",
@@ -1817,7 +1919,7 @@ test_dirent_is_child(apr_pool_t *pool)
@@ -1850,7 +1952,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 },
-#ifdef SVN_USE_DOS_PATHS
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
/* //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 },
@@ -1827,6 +1929,8 @@ test_dirent_is_child(apr_pool_t *pool)
@@ -1860,6 +1962,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 },
@ -547,7 +547,7 @@ index 61d9e24..5de91c3 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 },
@@ -2195,13 +2299,19 @@ test_dirent_local_style(apr_pool_t *pool)
@@ -2228,13 +2332,19 @@ test_dirent_local_style(apr_pool_t *pool)
} tests[] = {
{ "", "." },
{ ".", "." },
@ -559,7 +559,7 @@ index 61d9e24..5de91c3 100644
{ "/", "\\" },
{ "//server/share/dir", "\\\\server\\share\\dir" },
{ "//server/sh re/dir", "\\\\server\\sh re\\dir" },
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ { "a:/file", "a:/file" },
+ { "dir/file", "dir/file" },
+ { "/", "/" },
@ -568,7 +568,7 @@ index 61d9e24..5de91c3 100644
#else
{ "a:/file", "a:/file" },
{ "dir/file", "dir/file" },
@@ -2237,7 +2347,7 @@ test_dirent_internal_style(apr_pool_t *pool)
@@ -2270,7 +2380,7 @@ test_dirent_internal_style(apr_pool_t *pool)
{ "file", "file" },
{ "dir/file", "dir/file" },
{ "dir/file/./.", "dir/file" },
@ -577,11 +577,11 @@ index 61d9e24..5de91c3 100644
{ "A:\\", "A:/" },
{ "A:\\file", "A:/file" },
{ "A:file", "A:file" },
@@ -2252,6 +2362,14 @@ test_dirent_internal_style(apr_pool_t *pool)
@@ -2285,6 +2395,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" },
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ { "a:/", "a:" }, /* Wrong but expected for svn_path_*() */
+ { "a:/file", "a:/file" },
+ { "dir/file", "dir/file" },
@ -592,12 +592,12 @@ index 61d9e24..5de91c3 100644
#else
{ "a:/", "a:" }, /* Wrong but expected for svn_path_*() */
{ "a:/file", "a:/file" },
@@ -2323,9 +2441,11 @@ test_dirent_from_file_url(apr_pool_t *pool)
@@ -2356,9 +2474,11 @@ test_dirent_from_file_url(apr_pool_t *pool)
{ "file://localhost", "/" },
{ "file://localhost/dir", "/dir" },
{ "file://localhost/dir/path", "/dir/path" },
-#ifdef SVN_USE_DOS_PATHS
+#if defined(SVN_USE_DOS_PATHS) || defined(CYGWIN)
+#if defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__)
{ "file://server/share", "//server/share" },
{ "file://server/share/dir", "//server/share/dir" },
+#endif
@ -605,17 +605,17 @@ index 61d9e24..5de91c3 100644
{ "file:///A:", "A:/" },
{ "file:///A:/dir", "A:/dir" },
{ "file:///A:dir", "A:dir" },
@@ -2359,7 +2479,7 @@ test_dirent_from_file_url_errors(apr_pool_t *pool)
@@ -2416,7 +2536,7 @@ test_dirent_from_file_url_errors(apr_pool_t *pool)
/* error if scheme is not "file" */
"http://localhost/dir",
"file+ssh://localhost/dir",
-#ifndef SVN_USE_DOS_PATHS
+#if !(defined(SVN_USE_DOS_PATHS) || defined(CYGWIN))
+#if !(defined(SVN_USE_DOS_PATHS) || defined(__CYGWIN__))
"file://localhostwrongname/dir", /* error if host name not "localhost" */
#endif
};
diff --git a/subversion/tests/libsvn_subr/path-test.c b/subversion/tests/libsvn_subr/path-test.c
index 6f0a996..91850cb 100644
index 6f0a996..3a8e2fb 100644
--- a/subversion/tests/libsvn_subr/path-test.c
+++ b/subversion/tests/libsvn_subr/path-test.c
@@ -53,7 +53,7 @@
@ -638,7 +638,7 @@ index 6f0a996..91850cb 100644
{ "dir\\file", "dir/file" },
{ "\\", "/" },
{ "\\\\server/share/dir", "//server/share/dir" },
+#elif defined(CYGWIN)
+#elif defined(__CYGWIN__)
+ { "a:/", "a:" },
+ { "a:/file", "a:/file" },
+ { "dir/file", "dir/file" },

32
subversion/09-wincrypt.patch
View File

@ -13,19 +13,19 @@ From: David Rothenberger <daveroth@acm.org>
6 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/build.conf b/build.conf
index 2795c23..e6007cb 100644
index 8ab8e30..d87f66b 100644
--- a/build.conf
+++ b/build.conf
@@ -364,7 +364,7 @@ description = Subversion General Utility Library
type = lib
@@ -371,7 +371,7 @@ type = lib
install = fsmod-lib
path = subversion/libsvn_subr
-libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl
+libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl wincrypt
sources = *.c lz4/*.c
-libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl lz4 utf8proc
+libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl lz4 utf8proc wincrypt
msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
crypt32.lib version.lib
msvc-export =
@@ -1486,6 +1486,10 @@ type = lib
@@ -1554,6 +1554,10 @@ type = lib
external-lib = $(SVN_FS_LIB_LINK)
libs = libsvn_fs_base libsvn_fs_fs libsvn_fs_x
@ -37,7 +37,7 @@ index 2795c23..e6007cb 100644
type = project
path = build/win32
diff --git a/subversion/include/svn_auth.h b/subversion/include/svn_auth.h
index 3a78ba6..3f40d32 100644
index ca3b703..7c3c56b 100644
--- a/subversion/include/svn_auth.h
+++ b/subversion/include/svn_auth.h
@@ -865,7 +865,7 @@ svn_auth_get_platform_specific_client_providers(
@ -50,10 +50,10 @@ index 3a78ba6..3f40d32 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 303c41e..b346e10 100644
index 9d58c73..ae1957e 100644
--- a/subversion/libsvn_subr/auth.c
+++ b/subversion/libsvn_subr/auth.c
@@ -581,7 +581,7 @@ svn_auth_get_platform_specific_provider(svn_auth_provider_object_t **provider,
@@ -578,7 +578,7 @@ svn_auth_get_platform_specific_provider(svn_auth_provider_object_t **provider,
}
#endif
@ -63,10 +63,10 @@ index 303c41e..b346e10 100644
strcmp(provider_type, "simple") == 0)
{
diff --git a/subversion/libsvn_subr/config_file.c b/subversion/libsvn_subr/config_file.c
index 8b4d7a3..1cb105f 100644
index bd2ec82..daf65e9 100644
--- a/subversion/libsvn_subr/config_file.c
+++ b/subversion/libsvn_subr/config_file.c
@@ -1172,7 +1172,7 @@ svn_config_ensure(const char *config_dir, apr_pool_t *pool)
@@ -1373,7 +1373,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 8b4d7a3..1cb105f 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 74bda1c..ebb8b4d 100644
index 0986e5a..850d1a5 100644
--- a/subversion/libsvn_subr/win32_crypto.c
+++ b/subversion/libsvn_subr/win32_crypto.c
@@ -26,7 +26,7 @@ typedef int win32_crypto__dummy;
@ -99,7 +99,7 @@ index 74bda1c..ebb8b4d 100644
diff --git a/subversion/tests/libsvn_subr/auth-test.c b/subversion/tests/libsvn_subr/auth-test.c
index bbe7933..e9f361a 100644
index c184442..383b572 100644
--- a/subversion/tests/libsvn_subr/auth-test.c
+++ b/subversion/tests/libsvn_subr/auth-test.c
@@ -62,7 +62,7 @@ test_platform_specific_auth_providers(apr_pool_t *pool)
@ -128,11 +128,11 @@ index bbe7933..e9f361a 100644
SVN_ERR(svn_auth_get_platform_specific_provider(&provider, "windows",
"simple", pool));
@@ -174,6 +175,7 @@ test_platform_specific_auth_providers(apr_pool_t *pool)
@@ -173,6 +174,7 @@ test_platform_specific_auth_providers(apr_pool_t *pool)
(SVN_ERR_TEST_FAILED, NULL,
"svn_auth_get_platform_specific_provider('windows', 'simple') should " \
"return NULL");
#endif
+#endif
#endif
/* Test KWallet auth providers */
#ifdef SVN_HAVE_KWALLET

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

@ -8,13 +8,13 @@ From: David Rothenberger <d.rothenberger@entomo.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index c6329d9..6d8b1d6 100644
index 30ff51b..ff6dec7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -837,7 +837,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in
@@ -865,7 +865,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
$(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile.PL
- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
+ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor

10
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 e873ea2..81008b2 100755
index 3bb8599..157b163 100755
--- a/subversion/tests/cmdline/copy_tests.py
+++ b/subversion/tests/cmdline/copy_tests.py
@@ -5149,6 +5149,7 @@ def copy_base_of_deleted(sbox):
@ -22,10 +22,10 @@ index e873ea2..81008b2 100755
"""case-only rename"""
diff --git a/subversion/tests/cmdline/svntest/main.py b/subversion/tests/cmdline/svntest/main.py
index de59c06..3c0619d 100644
index eefeef6..672461c 100644
--- a/subversion/tests/cmdline/svntest/main.py
+++ b/subversion/tests/cmdline/svntest/main.py
@@ -1481,8 +1481,11 @@ def is_posix_os():
@@ -1600,8 +1600,11 @@ def is_posix_os():
def is_os_darwin():
return sys.platform == 'darwin'
@ -39,10 +39,10 @@ index de59c06..3c0619d 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 c0ec24b..26a4069 100644
index bf6592d..7385ba7 100644
--- a/subversion/tests/libsvn_wc/op-depth-test.c
+++ b/subversion/tests/libsvn_wc/op-depth-test.c
@@ -11922,11 +11922,11 @@ static struct svn_test_descriptor_t test_funcs[] =
@@ -11933,11 +11933,11 @@ static 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

@ -8,7 +8,7 @@ From: David Rothenberger <d.rothenberger@entomo.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subversion/tests/cmdline/svnlook_tests.py b/subversion/tests/cmdline/svnlook_tests.py
index d6c49c0..859125c 100755
index 4315168..7ad979b 100755
--- a/subversion/tests/cmdline/svnlook_tests.py
+++ b/subversion/tests/cmdline/svnlook_tests.py
@@ -639,7 +639,7 @@ svnlook_bin=%s

24
subversion/13-dso_open.patch
View File

@ -12,46 +12,46 @@ 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 ba90554..66e0ccb 100644
index f898d8a..6329810 100644
--- a/subversion/libsvn_fs/fs-loader.c
+++ b/subversion/libsvn_fs/fs-loader.c
@@ -140,7 +140,12 @@ load_module(fs_init_func_t *initfunc, const char *name, apr_pool_t *pool)
@@ -155,7 +155,12 @@ load_module(fs_init_func_t *initfunc, const char *name, apr_pool_t *pool)
_("Invalid name for FS type '%s'"),
name);
- libname = apr_psprintf(pool, "libsvn_fs_%s-%d.so.%d",
- libname = apr_psprintf(pool, "libsvn_fs_%s-" SVN_DSO_SUFFIX_FMT,
+ libname = apr_psprintf(pool,
+#ifdef __CYGWIN__
+ "cygsvn_fs_%s-%d-%d.dll",
+ "cygsvn_fs_%s-" SVN_DSO_SUFFIX_FMT,
+#else
+ "libsvn_fs_%s-%d.so.%d",
+ "libsvn_fs_%s-" SVN_DSO_SUFFIX_FMT,
+#endif
name, SVN_VER_MAJOR, SVN_SOVERSION);
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 3a782f2..936d88f 100644
index ac07545..4c2825c 100644
--- a/subversion/libsvn_ra/ra_loader.c
+++ b/subversion/libsvn_ra/ra_loader.c
@@ -143,7 +143,12 @@ load_ra_module(svn_ra__init_func_t *func,
const char *compat_funcname;
apr_status_t status;
- libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.%d",
- libname = apr_psprintf(pool, "libsvn_ra_%s-" SVN_DSO_SUFFIX_FMT,
+ libname = apr_psprintf(pool,
+#ifdef __CYGWIN__
+ "cygsvn_ra_%s-%d-%d.dll",
+#else
+ "libsvn_ra_%s-%d.so.%d",
+ "cygsvn_ra_%s-" SVN_DSO_SUFFIX_FMT,
+#else
+ "libsvn_ra_%s-" SVN_DSO_SUFFIX_FMT,
+#endif
ra_name, SVN_VER_MAJOR, SVN_SOVERSION);
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 b346e10..cbac48b 100644
index ae1957e..e26968e 100644
--- a/subversion/libsvn_subr/auth.c
+++ b/subversion/libsvn_subr/auth.c
@@ -511,7 +511,11 @@ svn_auth_get_platform_specific_provider(svn_auth_provider_object_t **provider,
@@ -508,7 +508,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

@ -8,7 +8,7 @@ From: David Rothenberger <daveroth@acm.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subversion/tests/cmdline/svnauthz_tests.py b/subversion/tests/cmdline/svnauthz_tests.py
index 7c1396c..230c4d9 100755
index fd1de40..4ced90d 100755
--- a/subversion/tests/cmdline/svnauthz_tests.py
+++ b/subversion/tests/cmdline/svnauthz_tests.py
@@ -48,7 +48,7 @@ svnauthz_bin=%s

4
subversion/15-XFAIL_case_sensitive_tree_conflict.patch
View File

@ -9,10 +9,10 @@ disk item, but that has not been implemented for Cygwin.
1 file changed, 1 insertion(+)
diff --git a/subversion/tests/cmdline/basic_tests.py b/subversion/tests/cmdline/basic_tests.py
index 58f7554..660a4ba 100755
index 4b0b8d5..70b7e43 100755
--- a/subversion/tests/cmdline/basic_tests.py
+++ b/subversion/tests/cmdline/basic_tests.py
@@ -2956,6 +2956,7 @@ def quiet_commits(sbox):
@@ -2955,6 +2955,7 @@ def quiet_commits(sbox):
# Regression test for issue #4023: on Windows, 'svn rm' incorrectly deletes
# on-disk file if it is case-clashing with intended (non-on-disk) target.
@Issue(4023)

118
subversion/17-fix-test-link.patch
View File

@ -7,14 +7,14 @@ be turned into a dynamic library. To fix this, remove that library
and modify all the tests so they include the sources in libsvn_test
directly.
---
build.conf | 359 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 180 insertions(+), 179 deletions(-)
build.conf | 395 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 198 insertions(+), 197 deletions(-)
diff --git a/build.conf b/build.conf
index e6007cb..a0bedc4 100644
index d87f66b..018dbb8 100644
--- a/build.conf
+++ b/build.conf
@@ -771,13 +771,14 @@ link-cmd = $(LINK_CXX_LIB)
@@ -779,13 +779,14 @@ link-cmd = $(LINK_CXX_LIB)
#
# general library: our C testing framework
@ -36,7 +36,7 @@ index e6007cb..a0bedc4 100644
# ----------------------------------------------------------------------------
# Tests for libsvn_fs_base
@@ -785,28 +786,28 @@ undefined-lib-symbols = yes
@@ -793,30 +794,30 @@ undefined-lib-symbols = yes
[fs-base-test]
description = Tests for *public* fs API (svn_fs.h)
type = exe
@ -48,6 +48,7 @@ index e6007cb..a0bedc4 100644
-libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs libsvn_fs_base libsvn_delta
libsvn_fs_util libsvn_subr apriconv apr
msvc-force-static = yes
[strings-reps-test]
description = Test strings/reps in libsvn_fs_base
@ -60,6 +61,7 @@ index e6007cb..a0bedc4 100644
-libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs libsvn_fs_base libsvn_delta
libsvn_subr apriconv apr
msvc-force-static = yes
[changes-test]
description = Test changes in libsvn_fs_base
@ -72,9 +74,9 @@ index e6007cb..a0bedc4 100644
-libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs libsvn_fs_base libsvn_delta
libsvn_subr apriconv apr
msvc-force-static = yes
# ----------------------------------------------------------------------------
@@ -814,28 +815,28 @@ libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta
@@ -825,30 +826,30 @@ msvc-force-static = yes
[fs-fs-pack-test]
description = Test fsfs packing in libsvn_fs_fs
type = exe
@ -86,6 +88,7 @@ index e6007cb..a0bedc4 100644
-libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_subr apriconv apr
msvc-force-static = yes
[fs-fs-fuzzy-test]
description = Use fuzzying to test FSFS corruption resilience
@ -98,6 +101,7 @@ index e6007cb..a0bedc4 100644
-libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_repos libsvn_subr apriconv apr
msvc-force-static = yes
[fs-fs-private-test]
description = Test FSSF private API
@ -110,9 +114,9 @@ index e6007cb..a0bedc4 100644
-libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_repos libsvn_subr apriconv apr
msvc-force-static = yes
# ----------------------------------------------------------------------------
@@ -843,19 +844,19 @@ libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
@@ -857,20 +858,20 @@ msvc-force-static = yes
[fs-x-pack-test]
description = Test fsx packing in libsvn_fs_x
type = exe
@ -124,6 +128,7 @@ index e6007cb..a0bedc4 100644
-libs = libsvn_test libsvn_fs libsvn_fs_x libsvn_delta
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs libsvn_fs_x libsvn_delta
libsvn_subr apriconv apr
msvc-force-static = yes
[string-table-test]
description = Test fsfs string tables
@ -135,10 +140,10 @@ index e6007cb..a0bedc4 100644
install = test
-libs = libsvn_test libsvn_fs_x libsvn_subr apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs_x libsvn_subr apr
msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_fs
@@ -863,19 +864,19 @@ libs = libsvn_test libsvn_fs_x libsvn_subr apr
@@ -879,28 +880,28 @@ msvc-force-static = yes
[locks-test]
description = Test locks in libsvn_fs
type = exe
@ -152,7 +157,7 @@ index e6007cb..a0bedc4 100644
msvc-force-static = yes
[fs-test]
description = Test locks in libsvn_fs
description = Tests in libsvn_fs
type = exe
-path = subversion/tests/libsvn_fs
-sources = fs-test.c
@ -160,11 +165,34 @@ index e6007cb..a0bedc4 100644
+sources = libsvn_fs/fs-test.c svn_test_fs.c svn_test_main.c
install = test
-libs = libsvn_test libsvn_fs libsvn_delta
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs libsvn_delta
libsvn_fs_util libsvn_subr aprutil apriconv apr
[fs-sequential-test]
description = Tests in libsvn_fs run sequentially
type = exe
-path = subversion/tests/libsvn_fs
-sources = fs-sequential-test.c
+path = subversion/tests
+sources = libsvn_fs/fs-sequential-test.c svn_test_fs.c svn_test_main.c
install = test
-libs = libsvn_test libsvn_fs libsvn_delta
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs libsvn_delta
libsvn_fs_util libsvn_subr aprutil apriconv apr
# ----------------------------------------------------------------------------
@@ -884,18 +885,18 @@ libs = libsvn_test libsvn_fs libsvn_delta
@@ -909,26 +910,26 @@ libs = libsvn_test libsvn_fs libsvn_delta
[authz-test]
description = Test authz parsing in libsvn_repos
type = exe
-path = subversion/tests/libsvn_repos
-sources = authz-test.c
+path = subversion/tests
+sources = libsvn_subr/auth-test.c svn_test_fs.c svn_test_main.c
install = test
-libs = libsvn_test libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_subr apr
[repos-test]
description = Test delta editor in libsvn_repos
type = exe
@ -189,7 +217,7 @@ index e6007cb..a0bedc4 100644
# ----------------------------------------------------------------------------
# Tests for libsvn_subr
@@ -903,244 +904,244 @@ libs = libsvn_test libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr
@@ -936,260 +937,260 @@ libs = libsvn_test libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr
[auth-test]
description = Test platform-specific auth provider access
type = exe
@ -522,9 +550,31 @@ index e6007cb..a0bedc4 100644
-libs = libsvn_test libsvn_subr apriconv apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_subr apr
[xml-test]
description = Test XML parser in libsvn_subr
type = exe
-path = subversion/tests/libsvn_subr
-sources = xml-test.c
+path = subversion/tests
+sources = libsvn_subr/xml-test.c svn_test_fs.c svn_test_main.c
install = test
-libs = libsvn_test libsvn_subr apriconv apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_subr apr
[compress-test]
description = Test compression functions
type = exe
-path = subversion/tests/libsvn_subr
-sources = compress-test.c
+path = subversion/tests
+sources = libsvn_subr/compress-test.c svn_test_fs.c svn_test_main.c
install = test
-libs = libsvn_test libsvn_subr apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_subr apr
# ----------------------------------------------------------------------------
@@ -1149,18 +1150,18 @@ libs = libsvn_test libsvn_subr apriconv apr
# Tests for libsvn_delta
@@ -1197,26 +1198,26 @@ libs = libsvn_test libsvn_subr apr
[random-test]
description = Use random data to test delta processing
type = exe
@ -534,7 +584,7 @@ index e6007cb..a0bedc4 100644
+sources = libsvn_delta/random-test.c svn_test_fs.c svn_test_main.c
install = test
-libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_subr apr
[window-test]
description = Test delta window generation
@ -545,11 +595,22 @@ index e6007cb..a0bedc4 100644
+sources = libsvn_delta/window-test.c svn_test_fs.c svn_test_main.c
install = test
-libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_subr apr
[svndiff-stream-test]
description = Test svndiff streams
type = exe
-path = subversion/tests/libsvn_delta
-sources = svndiff-stream-test.c
+path = subversion/tests
+sources = libsvn_delta/svndiff-stream-test.c svn_test_fs.c svn_test_main.c
install = test
-libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_subr apr
# ----------------------------------------------------------------------------
# Tests for libsvn_client
@@ -1168,19 +1169,19 @@ libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
@@ -1224,27 +1225,27 @@ libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
[client-test]
description = Test low-level functionality in libsvn_client
type = exe
@ -573,9 +634,20 @@ index e6007cb..a0bedc4 100644
-libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr
[conflicts-test]
description = Test libsvn_client conflict resolver
type = exe
-path = subversion/tests/libsvn_client
-sources = conflicts-test.c ../libsvn_wc/utils.c
+path = subversion/tests
+sources = libsvn_client/conflicts-test.c libsvn_wc/utils.c svn_test_fs.c svn_test_main.c
install = test
-libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr
msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_diff
@@ -1188,18 +1189,18 @@ libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libs
@@ -1253,18 +1254,18 @@ msvc-force-static = yes
[diff-diff3-test]
description = Test the diff/diff3 library
type = exe
@ -600,7 +672,7 @@ index e6007cb..a0bedc4 100644
# ----------------------------------------------------------------------------
# Tests for libsvn_ra
@@ -1207,11 +1208,11 @@ libs = libsvn_test libsvn_diff libsvn_subr apriconv apr
@@ -1272,11 +1273,11 @@ libs = libsvn_test libsvn_diff libsvn_subr apriconv apr
[ra-test]
description = Test a few things in libsvn_ra
type = exe
@ -616,7 +688,7 @@ index e6007cb..a0bedc4 100644
# ----------------------------------------------------------------------------
# Tests for libsvn_ra_local
@@ -1219,10 +1220,10 @@ libs = libsvn_test libsvn_ra libsvn_ra_svn libsvn_fs libsvn_delta libsvn_subr
@@ -1284,10 +1285,10 @@ libs = libsvn_test libsvn_ra libsvn_ra_svn libsvn_fs libsvn_delta libsvn_subr
[ra-local-test]
description = Test a few things in libsvn_ra_local
type = exe
@ -630,7 +702,7 @@ index e6007cb..a0bedc4 100644
apriconv apr
# ----------------------------------------------------------------------------
@@ -1231,63 +1232,63 @@ libs = libsvn_test libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr
@@ -1296,63 +1297,63 @@ libs = libsvn_test libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr
[conflict-data-test]
description = Test the storage of tree conflict data
type = exe

6
subversion/18-fix-serf-config.patch
View File

@ -1,4 +1,4 @@
Fix serf config
From: David Rothenberger <daveroth@acm.org>
@ -8,12 +8,12 @@ From: David Rothenberger <daveroth@acm.org>
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
index 902e648..436654f 100644
index 0acc7f7..4e8b500 100644
--- a/build/ac-macros/serf.m4
+++ b/build/ac-macros/serf.m4
@@ -170,8 +170,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
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'`"]

6
subversion/19-remove-contrib-from-configure.patch
View File

@ -1,4 +1,4 @@
Remove contrib
From: David Rothenberger <daveroth@acm.org>
@ -8,10 +8,10 @@ From: David Rothenberger <daveroth@acm.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index fae02fd..ec7bfbe 100644
index bc91a22..44c8a26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1580,7 +1580,7 @@ AC_OUTPUT
@@ -1610,7 +1610,7 @@ AC_OUTPUT
if test "$abs_srcdir" != "$abs_builddir"
then
AC_MSG_NOTICE([Creating build directories])

10
subversion/90-use-copy-instead-symlink.patch
View File

@ -1,6 +1,6 @@
--- subversion-1.9.1/Makefile.in.orig 2015-09-14 13:25:11.923679100 +0300
+++ subversion-1.9.1/Makefile.in 2015-09-14 13:25:27.568114500 +0300
@@ -979,8 +979,8 @@
--- subversion-1.10.1/Makefile.in.orig 2015-09-14 13:25:11.923679100 +0300
+++ subversion-1.10.1/Makefile.in 2015-09-14 13:25:27.568114500 +0300
@@ -1009,10 +1009,10 @@
INSTALL_EXTRA_TOOLS=\
$(MKDIR) $(DESTDIR)$(bindir); \
test -n "$$SVN_SVNMUCC_IS_SVNSYITF" && \
@ -11,4 +11,6 @@
- ln -sf $(bindir)/svnbench$(EXEEXT) $(DESTDIR)$(toolsdir)/svn-bench$(EXEEXT); \
+ cp -f $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
+ cp -f $(DESTDIR)$(bindir)/svnbench$(EXEEXT) $(DESTDIR)$(toolsdir)/svn-bench$(EXEEXT); \
fi
fi; \
printf '\043\041/bin/sh\n%s\n' \
'exec $(bindir)/svnfsfs stats $${2:+"-M"} $${2:+"$$2"} "$$1"' \

47
subversion/PKGBUILD
View File

@ -1,15 +1,15 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=subversion
pkgver=1.9.7
pkgrel=2
pkgver=1.10.0
pkgrel=1
pkgdesc="A Modern Concurrent Version Control System"
arch=('i686' 'x86_64')
url="https://subversion.apache.org/"
license=('APACHE')
groups=('VCS')
depends=('libsqlite' 'file' 'libserf' 'libsasl')
makedepends=('python2' 'perl' 'swig' 'ruby' 'libsqlite-devel' 'libserf-devel' 'libsasl-devel' 'gmp-devel')
depends=('libsqlite' 'file' 'liblz4' 'libserf' 'libsasl')
makedepends=('python2' 'perl' 'swig' 'ruby' 'liblz4-devel' 'libsqlite-devel' 'libserf-devel' 'libsasl-devel' 'gmp-devel')
optdepends=('bash-completion: for svn bash completion'
'python2: for some hook scripts'
'ruby: for some hook scripts')
@ -40,31 +40,31 @@ source=(https://archive.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{
subversion-1.9.1-msys2.patch
remove-checking-symlink.patch
90-use-copy-instead-symlink.patch)
sha256sums=('c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623'
sha256sums=('2cf23f3abb837dea0585a6b0ebd70e80e01f95bddef7c1aa097c18e3eaa6b584'
'SKIP'
'b09dd041aba0078c8d50df130ef2f96c3ef8486279a620532fef4fe48ef9961e'
'2df72723d073d68889e5d6a0e6f37c71ddb239f5faed696e4d5e247878217f89'
'a5d9d9c8d484c8cf71ef782d6f6a5bca1b832cad9b25e74e0bef19b170d89a3d'
'd6ae37c931793e18085f71704623a0da13ec65a9fb03bac3e2bf3291a646e193'
'43d68aa91140a78f7934e2763507f09a3e2fac0bcc62688d1d0de2e7efaa2379'
'd508133764eb648687ba292dd16de46f857c1b2c854edc82385e94d6122d96b0'
'18e13bd1b0cac71cf1aa29f73bbe2006a004f346cb7654da93596c6e7bf71248'
'8472cb53ff1235a0e0279bac22dd9c00a9fa68df6cc245863c8186dafbe0b644'
'dfbd7b00ebdb3208614dc8622a99d3b12c0fd774f3207ac4d0e3b2d8a84b2a9e'
'77fd514a60978fd9c5b2a5abfc051e22054685f4d25458f75f3c03aa5057e6aa'
'f4da4254af50ea509d8007116c8e8aa21d83621acc8136d0f2df94be2cdad1cb'
'c31590874160a3a434fedad2ce2eef8cd9580c661fe80c9f65566f0be7c900f9'
'52d727ef76a4b1081dc6fa705becdee870ff63b06398ffa0986491fa6677658b'
'c77f72a397e588d07390fe1d184cb2d54dc47d92d87019b8364a38512c2e80f3'
'827309169ecd862df04b21754fd2155b4f35e15b726089834d753ae5edcce99d'
'0da0af269761160244952d7f95ab17c5d4c35b0020044758d164df833b3e7ba9'
'28f9053d762c542b01f1f9a70cff71b107d046ddf769bdb3668393a8f8842836'
'6c3bd6f3885a08d2e5c9747bdf8d8d5daabbd3c73d035692527da72d011880b0'
'0282f2dc5e54f5743e7ca673626f0314a3a8277026746bb0370f5a7dcf8805f5'
'6662bf25c897f6550e1dce33e2e198d311120abeca9887f348e3c67159dda7c1'
'7df55097d3a82917cdfd30107ccd9ccc9e46f009ba9ab0500548b6b0274c9868'
'94a64c20edd2ae23e5e7eba3ca08b4e7e7c68d0fa47949887607c0ad19118e53'
'8d5898ac98f5d7ba3554b96eb7cdf6643ed15b547c12d6b1a0fd9fae1a6046de'
'7991226cf5380994249d00084fe9be240f881340134b628456b188cb04d87292'
'7efe22db531b5ba3fd4382378bde44416159b8d0960450d56a8d84361a17acc8'
'e36cf59aaca71fb50b433e4ee89b356ea0684a0fb97d0056231e38cd5d3057a9'
'4069a84189db7ed0d08c5fda927308d494ac9377e111d70debdbb6ad889af70b'
'766143251f358791c7c1dd2a5339663ca1f41b13d2e8cae427ed0939acdb060a'
'4d3c427c3bb423cd2a3ac244cd76694c9849035373c09018d0e0f2bffc595c54'
'd480726924809f3586d6145433efc9e1633db751c28fc7be13abfd83328f1a20'
'8682d9f7da2ba8607ed15daf3beec92e5dacda3a6e4c07baaef8991264eb44cd'
'f32780635df14f6c954d70ed7ff470ffe84edd314c881492cb811252644cae5a'
'dcec738bb21ebf640522ef36fec4a83c7a26c93090df2df857e3f2825b597954'
'3c09395bb2f269f4d403ae102c23287cdb5ad8b4051e2901a65134efe041e404'
'7152e0213f8e8e7a1b50349aaca57e7331b3eb239ada1afed617c22a7617578a'
'54ea2277cc759586c2475d80a5d3de11ab1f4087eff1c41490614fb7e5e2316f'
'c7ebf4320b0147256a6b5ebab459603cbb7b8beb32da70b2ad85e6fb33609e30'
'f3d2e7e6ca97c8310fb59ce82430005fcd9e508b4a2a3f4ec7208011bf32a0a8'
'e6e726b0121a9a2d3ce3942791478135728c13427851f5062554a8540109d634'
'5268b1136d93691df238e0cc8b7d88739931d64779fc4528b65519f7e19b2dd2')
'fc545e375d8af4ef6d8afad453453480664b6a2ff74915f94b8a7da7de14155b')
PYTHON_SITELIB=/usr/lib/python2.7/site-packages
@ -120,6 +120,7 @@ build() {
--with-sqlite=/usr \
--without-apxs \
--without-gnome-keyring \
--with-utf8proc=internal \
--enable-shared --disable-static \
--with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \
--disable-mod-activation \