diff --git a/docx2txt/PKGBUILD b/docx2txt/PKGBUILD new file mode 100644 index 00000000000..89eb1a0da3d --- /dev/null +++ b/docx2txt/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: Matthias Aßhauer + +_realname=docx2txt + +pkgname=("${_realname}") +pkgver=1.4 +pkgrel=1 +pkgdesc="docx2txt is a perl based command line utility to convert Microsoft Office(Tm) Docx documents to equivalent Text documents." +arch=('i686' 'x86_64') +license=('GPL3+') +url="http://${_realname}.sourceforge.net/" +source=("http://sourceforge.net/projects/${_realname}/files/${_realname}/v${pkgver}/${_realname}-${pkgver}.tgz/download") +sha1sums=('a23f83ec5e1d479888815255e81063c02c932c2f') +provides=('${_realname}') +depends=('perl' 'unzip') + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make BINDIR=$pkgdir/usr/bin installbin + make CONFIGDIR=$pkgdir/etc installconfig + mv -f $pkgdir/usr/bin/docx2txt.sh $pkgdir/usr/bin/docx2txt +} diff --git a/git-flow/PKGBUILD b/git-flow/PKGBUILD new file mode 100644 index 00000000000..ef721c95823 --- /dev/null +++ b/git-flow/PKGBUILD @@ -0,0 +1,45 @@ +# Maintainer: Johannes Schindelin + +_realname=git-flow +pkgname=("${_realname}") +pkgver=0.4.1.108.g15aab26 +pkgrel=1 +pkgdesc="Git extensions to provide high-level repository operations for Vincent Driessen's branching model" +arch=('i686' 'x86_64') +license=('BSD') +depends=('git' 'util-linux') +url="http://nvie.com/posts/a-successful-git-branching-model/" +source=("${_realname}"::"git+https://github.com/nvie/gitflow.git#branch=develop") +sha1sums=('SKIP') + +pkgver() { + cd "${srcdir}/${_realname}" + + # Need to create sane tags to allow `git describe` to work + for t in $(git tag -l | grep '^[0-9]') + do + git rev-parse --quiet --verify v$t >/dev/null || + git tag v$t $t^2 + done + + git describe --tags | + sed -e 's/^v//' -e 'y/-/./' +} + +prepare () { + cd "${srcdir}/${_realname}" + + git submodule update --init + + # Make sure that gitflow-shFlags is handled properly + test true = "$(git config core.symlinks)" || { + git config core.symlinks true + git reset --hard + } +} + +package() { + cd "${srcdir}/${_realname}" + + make prefix="${pkgdir}/usr/" install +} diff --git a/git/PKGBUILD b/git/PKGBUILD index 87bb81d4635..cab251cf90b 100644 --- a/git/PKGBUILD +++ b/git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=git -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc="The fast distributed version control system" arch=('i686' 'x86_64') @@ -47,7 +47,7 @@ source=("${pkgname}-${pkgver}.tar.gz"::https://github.com/git/git/archive/v${pkg git-1.9.0-manifest-msys2.patch git-1.8.4-msys2.patch git-2.3.5-mingw-pwd.patch) -md5sums=('7aefd2f2f1268f2ffbf5091a3cf5c909' +md5sums=('9f71427cc9c78d5dc21f382ac90ef423' 'c33c9dfa2944a0de9151a7af7a63a27b' 'f5975b367aa0979006bb07b297ef081b' '9f9170a30dfb7643df4948cdae5bb864' diff --git a/gnutls/PKGBUILD b/gnutls/PKGBUILD index 830215072f2..0272de29ff7 100644 --- a/gnutls/PKGBUILD +++ b/gnutls/PKGBUILD @@ -2,7 +2,7 @@ pkgbase=gnutls pkgname=('gnutls' 'libgnutls' 'libgnutls-devel') -pkgver=3.4.4.1 +pkgver=3.4.5 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('x86_64' 'i686') @@ -17,9 +17,9 @@ makedepends=('gettext-devel' 'libtasn1-devel' 'zlib-devel') #optdepends=('guile: for use with Guile bindings') -source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v${pkgver%.*.*}/${pkgname}-${pkgver}.tar.xz{,.sig} +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v${pkgver%.*}/${pkgname}-${pkgver}.tar.xz{,.sig} gnutls-3.4.0-msysize.patch) -md5sums=('474efaba6fd6c6c6c0ebac2a3f431946' +md5sums=('f5dae0e0ecda28aab12386e6c0705d4c' 'SKIP' '5a7e8599b152ecef6b1103cbf0652167') validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F' diff --git a/help2man/PKGBUILD b/help2man/PKGBUILD index 7d774134ba3..f5318875051 100644 --- a/help2man/PKGBUILD +++ b/help2man/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=help2man -pkgver=1.47.1 +pkgver=1.47.2 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('perl-Locale-Gettext' 'libintl') install=help2man.install source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} 1.40.4-cygwin-nls.patch) -sha256sums=('c59b26f60cb06e45b00e729dea721e7a17220e2c17d800eb428271a750382b06' +sha256sums=('c4c5606773e51039a06b7328ed4934913df142747a9a185d2a6ab9300d7f3f7c' 'SKIP' '6cf5541d6233b6c0ce0248ecb6376682646ee56f795b19906f0acc63d83de482') diff --git a/mercurial/PKGBUILD b/mercurial/PKGBUILD index edeef8c2e88..0fb58f381c8 100644 --- a/mercurial/PKGBUILD +++ b/mercurial/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=mercurial -pkgver=3.5 +pkgver=3.5.1 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -11,10 +11,11 @@ groups=('VCS') depends=('python2') #optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') -source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" +source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"{,.asc} 'mercurial.profile' 'mercurial-2.6.1-msys2.patch') -md5sums=('3e3010e12759d3783ab7ed93de627da1' +md5sums=('796a778075ec6358235e9258f9a54224' + 'SKIP' '43e1d36564d4c7fbe9a091d3ea370a44' 'c4fe47468f6fef63ce1c72d14307d312') diff --git a/msys2-runtime/0001-dcrt0.cc-Untangle-allow_glob-from-winshell.patch b/msys2-runtime/0001-dcrt0.cc-Untangle-allow_glob-from-winshell.patch index 3639e4c790d..d3266aaa86b 100644 --- a/msys2-runtime/0001-dcrt0.cc-Untangle-allow_glob-from-winshell.patch +++ b/msys2-runtime/0001-dcrt0.cc-Untangle-allow_glob-from-winshell.patch @@ -1,4 +1,4 @@ -From 0681f64468e3966e179abf5fbe9e6d702a7ae777 Mon Sep 17 00:00:00 2001 +From 1964c47b6ebe0b554c3f027c1734c79b92328a34 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 21 Aug 2015 12:52:09 +0100 Subject: [PATCH 1/5] dcrt0.cc: Untangle allow_glob from winshell @@ -7,13 +7,39 @@ Otherwise if globbing is allowed and we get called from a Windows program, build_argv thinks we've been called from a Cygwin program. --- - winsup/cygwin/dcrt0.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + winsup/cygwin/dcrt0.cc | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc -index 5bd1f1d..b7600b6 100644 +index 5bd1f1d..2dbc562 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc +@@ -157,12 +157,12 @@ isquote (char c) + + /* Step over a run of characters delimited by quotes */ + static /*__inline*/ char * +-quoted (char *cmd, int winshell) ++quoted (char *cmd, int winshell, int glob) + { + char *p; + char quote = *cmd; + +- if (!winshell) ++ if (!winshell || !glob) + { + char *p; + strcpy (cmd, cmd + 1); +@@ -172,8 +172,8 @@ quoted (char *cmd, int winshell) + } + + const char *s = quote == '\'' ? "'" : "\\\""; +- /* This must have been run from a Windows shell, so preserve +- quotes for globify to play with later. */ ++ /* This must have been run from a Windows shell and globbing is enabled, ++ so preserve quotes for globify to play with later. */ + while (*cmd && *++cmd) + if ((p = strpbrk (cmd, s)) == NULL) + { @@ -294,7 +294,7 @@ globify (char *word, char **&argv, int &argc, int &argvlen) /* Build argv, argc from string passed from Windows. */ @@ -23,6 +49,15 @@ index 5bd1f1d..b7600b6 100644 { int argvlen = 0; int nesting = 0; // monitor "nesting" from insert_file +@@ -328,7 +328,7 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell) + a Cygwin process, or if the word starts with a '@'. + In this case, the insert_file function needs an unquoted + DOS filename and globbing isn't performed anyway. */ +- cmd = quoted (cmd, winshell && argc > 0 && *word != '@'); ++ cmd = quoted (cmd, winshell && argc > 0 && *word != '@', glob); + } + if (issep (*cmd)) // End of argument if space + break; @@ -354,7 +354,7 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell) } @@ -41,5 +76,5 @@ index 5bd1f1d..b7600b6 100644 /* Convert argv[0] to posix rules if it's currently blatantly -- -2.5.0 +2.5.1 diff --git a/msys2-runtime/0002-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch b/msys2-runtime/0002-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch index 67e5469c3ec..134df2288c1 100644 --- a/msys2-runtime/0002-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch +++ b/msys2-runtime/0002-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch @@ -1,4 +1,4 @@ -From b918037c52b21913054f1e7b62ba8ca2d79b6ee9 Mon Sep 17 00:00:00 2001 +From 8086cdb2e8112e101e8ee934c0bf6b54db79975f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 24 Aug 2015 00:48:06 +0100 Subject: [PATCH 2/5] dcrt0.cc (globify): Don't quote literal strings @@ -30,7 +30,7 @@ the expense of sensible forward-slash-containing input. 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc -index b7600b6..89e095e 100644 +index 2dbc562..395c8c9 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -239,10 +239,20 @@ globify (char *word, char **&argv, int &argc, int &argvlen) @@ -56,5 +56,5 @@ index b7600b6..89e095e 100644 size_t cnt = isascii (*s) ? 1 : mbtowc (NULL, s, MB_CUR_MAX); if (cnt <= 1 || cnt == (size_t)-1) -- -2.5.0 +2.5.1 diff --git a/msys2-runtime/0003-strace.cc-Don-t-set-MSYS-noglob.patch b/msys2-runtime/0003-strace.cc-Don-t-set-MSYS-noglob.patch index 526b5ca9073..4e2377a16e9 100644 --- a/msys2-runtime/0003-strace.cc-Don-t-set-MSYS-noglob.patch +++ b/msys2-runtime/0003-strace.cc-Don-t-set-MSYS-noglob.patch @@ -1,4 +1,4 @@ -From c928f9023fd5576cfc627f2b0ad31324c8241b0f Mon Sep 17 00:00:00 2001 +From a53e129f1deabd70a9ed3d5c47219fe61deda09c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 23 Aug 2015 20:47:30 +0100 Subject: [PATCH 3/5] strace.cc: Don't set MSYS=noglob @@ -63,5 +63,5 @@ index 6d9d727..dc3ef55 100644 NULL, /* Security */ NULL, /* thread */ -- -2.5.0 +2.5.1 diff --git a/msys2-runtime/0004-Add-debugging-for-build_argv.patch b/msys2-runtime/0004-Add-debugging-for-build_argv.patch index 7200538147a..efc3f9e6df0 100644 --- a/msys2-runtime/0004-Add-debugging-for-build_argv.patch +++ b/msys2-runtime/0004-Add-debugging-for-build_argv.patch @@ -1,4 +1,4 @@ -From 86e1a43670375071a6285cf89c647063418456ab Mon Sep 17 00:00:00 2001 +From 5d3c7782f022d47f2d063613813d926692b0f7e9 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 21 Aug 2015 12:18:52 +0100 Subject: [PATCH 4/5] Add debugging for build_argv @@ -8,7 +8,7 @@ Subject: [PATCH 4/5] Add debugging for build_argv 1 file changed, 2 insertions(+) diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc -index 89e095e..621d469 100644 +index 395c8c9..1006c3e 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -313,6 +313,8 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell, int glob) @@ -21,5 +21,5 @@ index 89e095e..621d469 100644 while (*cmd) { -- -2.5.0 +2.5.1 diff --git a/msys2-runtime/0005-Add-debugging-for-strace-make_command_line.patch b/msys2-runtime/0005-Add-debugging-for-strace-make_command_line.patch index 54062c3e206..efb0c07f4af 100644 --- a/msys2-runtime/0005-Add-debugging-for-strace-make_command_line.patch +++ b/msys2-runtime/0005-Add-debugging-for-strace-make_command_line.patch @@ -1,4 +1,4 @@ -From 8d4c1ebb7911c49c927cf1d2ad88397cb6cba2e1 Mon Sep 17 00:00:00 2001 +From 97d948be568720249cad1571454eab74513952ee Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 21 Aug 2015 09:52:47 +0100 Subject: [PATCH 5/5] Add debugging for strace make_command_line @@ -20,5 +20,5 @@ index dc3ef55..ead4c04 100644 SetConsoleCtrlHandler (NULL, 0); /* Commit message for this code was: -- -2.5.0 +2.5.1 diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD index 67f28f7411e..304465b24e4 100644 --- a/msys2-runtime/PKGBUILD +++ b/msys2-runtime/PKGBUILD @@ -32,17 +32,16 @@ source=('msys2-runtime'::'git+https://github.com/git-for-windows/msys2-runtime.g '0004-Add-debugging-for-build_argv.patch' '0005-Add-debugging-for-strace-make_command_line.patch') md5sums=('SKIP' - 'c3c22297f0402edf02843e09d3ee9733' - '1d6f11e1106395671e861f372fe1e5de' - '4653f7d0dc64e872400346b02164d1e6' - 'cc78a30ea8b6ba377bc1cd6ee23ea146' - 'a3b123ebbf961a79815ecad574591a19') + '6b959c674a687709d93fb562143c2cbc' + '8666904817991a621b64e3382a53f452' + '923b7800812f2654c395e8c07ad404bd' + '5055fa5115d611d8501989d0e345199e' + '77b4c20306527ad2e5a8845c4c37e386') pkgver() { - cd "${srcdir}/msys2-runtime" + cd "${srcdir}"/msys2-runtime local gitver=$(git describe --tags | sed 's|cygwin-||g' | sed 's|_|.|g') gitver=${gitver//-*} - #printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" printf "%s.%s.%s" "${gitver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } @@ -52,7 +51,7 @@ prepare() { git am "${srcdir}"/0002-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch git am "${srcdir}"/0003-strace.cc-Don-t-set-MSYS-noglob.patch git am "${srcdir}"/0004-Add-debugging-for-build_argv.patch -# git am "${srcdir}"/0005-Add-debugging-for-strace-make_command_line.patch + git am "${srcdir}"/0005-Add-debugging-for-strace-make_command_line.patch } build() { diff --git a/p11-kit/PKGBUILD b/p11-kit/PKGBUILD index 88bafe78ada..4edc1d253b1 100644 --- a/p11-kit/PKGBUILD +++ b/p11-kit/PKGBUILD @@ -1,16 +1,17 @@ # Maintainer: Alexey Pavlov # Contributor: Ray Donnelly +pkgbase=p11-kit pkgname=('p11-kit' 'libp11-kit' 'libp11-kit-devel') pkgver=0.23.1 -pkgrel=1 +pkgrel=2 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64) url="http://p11-glue.freedesktop.org" license=('BSD') makedepends=('gettext-devel' 'libiconv-devel' 'libtasn1-devel' 'libffi-devel') # options=('debug' '!strip') -source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig} +source=(${url}/releases/${pkgname}-${pkgver}.tar.gz{,.sig} 0.19.1-trust-shrext.patch p11-kit-fix-readlink.patch 0.18.7-win8-x64.patch @@ -25,13 +26,13 @@ md5sums=('96f073270c489c9a594e1c9413f42db8' '3e82adae02a89474990709783cbb5f5d') prepare() { - cd $pkgname-$pkgver + cd ${pkgname}-${pkgver} - patch -p2 -i $srcdir/0.19.1-trust-shrext.patch - patch -p1 -i $srcdir/p11-kit-fix-readlink.patch - patch -p2 -i $srcdir/0.18.7-win8-x64.patch - patch -p1 -i $srcdir/0.18.7-parallel-make.patch - patch -p1 -i $srcdir/p11-kit-0.20.3-msysize.patch + patch -p2 -i ${srcdir}/0.19.1-trust-shrext.patch + patch -p1 -i ${srcdir}/p11-kit-fix-readlink.patch + patch -p2 -i ${srcdir}/0.18.7-win8-x64.patch + patch -p1 -i ${srcdir}/0.18.7-parallel-make.patch + patch -p1 -i ${srcdir}/p11-kit-0.20.3-msysize.patch autoreconf -fi } @@ -45,7 +46,7 @@ build() { extra_config+=( --enable-debug=no ) fi - cd $pkgname-$pkgver + cd ${pkgname}-${pkgver} ./configure \ --build=${CHOST} \ --prefix=/usr \ @@ -57,35 +58,35 @@ build() { "${extra_config[@]}" make - make DESTDIR="$srcdir/dest" install - install -Dm644 COPYING $srcdir/dest/usr/share/licenses/$pkgname/COPYING + make DESTDIR="${srcdir}/dest" install + install -Dm644 COPYING ${srcdir}/dest/usr/share/licenses/${pkgname}/COPYING } check() { - cd $pkgname-$pkgver + cd ${pkgname}-${pkgver} #make check } package_p11-kit() { depends=('libffi' 'libp11-kit' 'libtasn1') - mkdir -p $pkgdir/usr/{bin,lib,share} - cp -rf $srcdir/dest/etc $pkgdir/ - cp -f $srcdir/dest/usr/bin/*.exe $pkgdir/usr/bin/ - mkdir -p $pkgdir/usr/lib/pkcs11 - mkdir -p $pkgdir/usr/share/p11-kit/modules - cp -f $srcdir/dest/usr/lib/pkcs11/*trust.so $pkgdir/usr/lib/pkcs11/ - cp -rf $srcdir/dest/usr/lib/p11-kit $pkgdir/usr/lib/ - cp -f $srcdir/dest/usr/share/p11-kit/modules/*trust* $pkgdir/usr/share/p11-kit/modules/ - cp -rf $srcdir/dest/usr/share/licenses $pkgdir/usr/share/ + mkdir -p ${pkgdir}/usr/{bin,lib,share} + cp -rf ${srcdir}/dest/etc ${pkgdir}/ + cp -f ${srcdir}/dest/usr/bin/*.exe ${pkgdir}/usr/bin/ + mkdir -p ${pkgdir}/usr/lib/pkcs11 + mkdir -p ${pkgdir}/usr/share/p11-kit/modules + cp -f ${srcdir}/dest/usr/lib/pkcs11/*trust.so ${pkgdir}/usr/lib/pkcs11/ + cp -rf ${srcdir}/dest/usr/lib/p11-kit ${pkgdir}/usr/lib/ + cp -f ${srcdir}/dest/usr/share/p11-kit/modules/*trust* ${pkgdir}/usr/share/p11-kit/modules/ + cp -rf ${srcdir}/dest/usr/share/licenses ${pkgdir}/usr/share/ } package_libp11-kit() { depends=('libintl' 'libtasn1') groups=('libraries') - mkdir -p $pkgdir/usr/bin - cp -f $srcdir/dest/usr/bin/*.dll $pkgdir/usr/bin/ + mkdir -p ${pkgdir}/usr/bin + cp -f ${srcdir}/dest/usr/bin/*.dll ${pkgdir}/usr/bin/ } package_libp11-kit-devel() { @@ -93,8 +94,8 @@ package_libp11-kit-devel() { groups=('development') depends=("libp11-kit=${pkgver}") - mkdir -p $pkgdir/usr/lib - cp -rf $srcdir/dest/usr/include $pkgdir/usr/ - cp -rf $srcdir/dest/usr/lib/pkgconfig $pkgdir/usr/lib/ - cp -f $srcdir/dest/usr/lib/*.a $pkgdir/usr/lib/ + mkdir -p ${pkgdir}/usr/lib + cp -rf ${srcdir}/dest/usr/include ${pkgdir}/usr/ + cp -rf ${srcdir}/dest/usr/lib/pkgconfig ${pkgdir}/usr/lib/ + cp -f ${srcdir}/dest/usr/lib/*.a ${pkgdir}/usr/lib/ } diff --git a/subversion/01-make-build-directories.patch b/subversion/01-make-build-directories.patch index ce01b3ac124..1eb5e2a0ffc 100644 --- a/subversion/01-make-build-directories.patch +++ b/subversion/01-make-build-directories.patch @@ -8,10 +8,10 @@ From: David Rothenberger 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index e93d7a3..5f6e0d3 100644 +index 4ed66d4..4abcf41 100644 --- a/configure.ac +++ b/configure.ac -@@ -1508,6 +1508,11 @@ AC_DEFINE_UNQUOTED([SVN_BUILD_TARGET], "${target}", +@@ -1573,6 +1573,11 @@ AC_DEFINE_UNQUOTED([SVN_BUILD_TARGET], "${target}", [Defined to the config.guess name of the build target]) AC_OUTPUT diff --git a/subversion/02-fix-linking.patch b/subversion/02-fix-linking.patch index e1002891435..3f2b51a01f9 100644 --- a/subversion/02-fix-linking.patch +++ b/subversion/02-fix-linking.patch @@ -4,80 +4,62 @@ From: David Rothenberger --- - build.conf | 26 +++++++++++++++++++++----- - 1 file changed, 21 insertions(+), 5 deletions(-) + build.conf | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/build.conf b/build.conf -index 74defd0..885db3c 100644 +index 4f020da..a22bdaf 100644 --- a/build.conf +++ b/build.conf -@@ -360,7 +360,7 @@ type = apache-mod +@@ -403,7 +403,7 @@ type = apache-mod path = subversion/mod_dav_svn sources = *.c reports/*.c posts/*.c - libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr + libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr libhttpd mod_dav -nonlibs = apr aprutil -+ mod_dav httpd aprutil apr ++ httpd apr aprutil install = apache-mod - msvc-libs = mod_dav.lib libhttpd.lib -@@ -369,8 +369,9 @@ description = Subversion path-based authorization module for Apache + [mod_authz_svn] +@@ -411,8 +411,9 @@ description = Subversion path-based authorization module for Apache when = INSTALL_APACHE_MODS type = apache-mod path = subversion/mod_authz_svn -nonlibs = mod_dav_svn apr aprutil - libs = libsvn_repos libsvn_subr -+ mod_dav httpd aprutil apr + libs = libsvn_repos libsvn_subr libhttpd ++ httpd aprutil apr + mod_dav_svn install = apache-mod - msvc-libs = libhttpd.lib -@@ -379,8 +380,9 @@ description = Apache Httpd module to block certain kinds of Apache Subversion re + [mod_dontdothat] +@@ -420,8 +421,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 -+ mod_dav httpd aprutil apr + libs = libsvn_subr xml libhttpd ++ httpd aprutil apr + mod_dav_svn install = tools - msvc-libs = libhttpd.lib -@@ -501,7 +503,7 @@ type = swig_lib - lang = python + # The Subversion FSFS repository manipulation tool +@@ -561,7 +563,7 @@ lang = python path = subversion/bindings/swig/python/libsvn_swig_py - libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr + libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr + apriconv apr python swig -link-cmd = $(LINK) +link-cmd = $(LINK) $(SWIG_PY_LIBS) install = swig-py-lib # need special build rule to include -DSWIGPYTHON compile-cmd = $(COMPILE_SWIG_PY) -@@ -512,7 +514,7 @@ msvc-static = no - type = swig_lib - lang = perl - path = subversion/bindings/swig/perl/libsvn_swig_perl --libs = libsvn_delta libsvn_subr apriconv apr -+libs = libsvn_delta libsvn_subr apriconv apr perl - install = swig-pl-lib - # need special build rule to include - compile-cmd = $(COMPILE_SWIG_PL) -@@ -1205,6 +1207,20 @@ type = lib - external-lib = $(SVN_FS_LIB_LINK) - libs = libsvn_fs_base libsvn_fs_fs +@@ -1456,6 +1458,11 @@ external-lib = $(SVN_SWIG_LIBS) + type = lib + external-lib = $(SVN_PERL_LIBS) -+[perl] -+type = lib -+external-lib = -L/usr/lib/perl5/5.14/i686-cygwin-threads-64int/CORE -lperl -+ -+[mod_dav] -+type = lib -+external-lib = -Wl,`$(APXS) -q libexecdir`/mod_dav.so -+libs = httpd aprutil apr -+ +[httpd] +type = lib -+external-lib = -lhttpd2core ++external-lib = -lhttpd +libs = aprutil apr + - [__ALL__] - type = project - path = build/win32 + [python] + type = lib + external-lib = $(SVN_PYTHON_LIBS) diff --git a/subversion/03-fix-linking-perl.patch b/subversion/03-fix-linking-perl.patch index 6b8d57b8b64..a0001749670 100644 --- a/subversion/03-fix-linking-perl.patch +++ b/subversion/03-fix-linking-perl.patch @@ -5,15 +5,15 @@ From: David Rothenberger --- Makefile.in | 1 + - build.conf | 7 ++----- + build.conf | 3 ++- build/ac-macros/swig.m4 | 6 ++++++ - 3 files changed, 9 insertions(+), 5 deletions(-) + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 4681a7d..0423782 100644 +index 183448c..b8eb9be 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -138,6 +138,7 @@ SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ +@@ -145,6 +145,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,35 +22,24 @@ index 4681a7d..0423782 100644 SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ SWIG_RB_LINK = @SWIG_RB_LINK@ diff --git a/build.conf b/build.conf -index 885db3c..8cf7184 100644 +index a22bdaf..2795c23 100644 --- a/build.conf +++ b/build.conf -@@ -514,7 +514,8 @@ msvc-static = no +@@ -575,7 +575,8 @@ msvc-export = ../bindings/swig/python/libsvn_swig_py/swigutil_py.h type = swig_lib lang = perl path = subversion/bindings/swig/perl/libsvn_swig_perl --libs = libsvn_delta libsvn_subr apriconv apr perl -+libs = libsvn_delta libsvn_subr apriconv apr +-libs = libsvn_delta libsvn_subr apriconv apr perl swig ++libs = libsvn_delta libsvn_subr apriconv apr swig +link-cmd = $(LINK) $(SWIG_PL_LIBS) install = swig-pl-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_PL) -@@ -1207,10 +1208,6 @@ type = lib - external-lib = $(SVN_FS_LIB_LINK) - libs = libsvn_fs_base libsvn_fs_fs - --[perl] --type = lib --external-lib = -L/usr/lib/perl5/5.14/i686-cygwin-threads-64int/CORE -lperl -- - [mod_dav] - type = lib - external-lib = -Wl,`$(APXS) -q libexecdir`/mod_dav.so diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4 -index 70b829d..b73a935 100644 +index 7d1a406..8a3cdb6 100644 --- a/build/ac-macros/swig.m4 +++ b/build/ac-macros/swig.m4 -@@ -174,6 +174,11 @@ AC_DEFUN(SVN_FIND_SWIG, +@@ -175,6 +175,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`" @@ -62,7 +51,7 @@ index 70b829d..b73a935 100644 else AC_MSG_WARN([perl bindings require perl 5.8.0 or newer.]) fi -@@ -294,6 +299,7 @@ int main() +@@ -301,6 +306,7 @@ int main() AC_SUBST(SWIG_PY_LINK) AC_SUBST(SWIG_PY_LIBS) AC_SUBST(SWIG_PL_INCLUDES) diff --git a/subversion/04-fix-switch-tests.patch b/subversion/04-fix-switch-tests.patch index d3bac35dba1..2b44f94c240 100644 --- a/subversion/04-fix-switch-tests.patch +++ b/subversion/04-fix-switch-tests.patch @@ -8,10 +8,10 @@ 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 3f1e7ab..1881d9e 100755 +index 8712723..c7cfa50 100755 --- a/subversion/tests/cmdline/switch_tests.py +++ b/subversion/tests/cmdline/switch_tests.py -@@ -967,6 +967,13 @@ def refresh_read_only_attribute(sbox): +@@ -773,6 +773,13 @@ def refresh_read_only_attribute(sbox): if os.geteuid() == 0: raise svntest.Skip diff --git a/subversion/05-retry-loop.patch b/subversion/05-retry-loop.patch index 7dd82ffee69..42c194deca0 100644 --- a/subversion/05-retry-loop.patch +++ b/subversion/05-retry-loop.patch @@ -1,6 +1,6 @@ Use WIN32 retry loop on Cygwin, too. -From: David Rothenberger +From: David Rothenberger --- @@ -8,7 +8,7 @@ From: David Rothenberger 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/subversion/libsvn_subr/io.c b/subversion/libsvn_subr/io.c -index f0956e2..e9e3d37 100644 +index db2e341..d49463d 100644 --- a/subversion/libsvn_subr/io.c +++ b/subversion/libsvn_subr/io.c @@ -29,6 +29,10 @@ @@ -22,7 +22,7 @@ index f0956e2..e9e3d37 100644 #ifndef APR_STATUS_IS_EPERM #include #ifdef EPERM -@@ -134,6 +138,12 @@ +@@ -136,6 +140,12 @@ || os_err == ERROR_SHARING_VIOLATION \ || os_err == ERROR_DIR_NOT_EMPTY), \ 1) @@ -35,32 +35,31 @@ index f0956e2..e9e3d37 100644 #else #define WIN32_RETRY_LOOP(err, expr) ((void)0) #endif -@@ -2263,6 +2273,7 @@ svn_io_remove_file2(const char *path, - || SVN__APR_STATUS_IS_ENOTDIR(apr_err)))) - return SVN_NO_ERROR; +@@ -2477,6 +2487,7 @@ svn_io_remove_file2(const char *path, + + apr_err = apr_file_remove(path_apr, scratch_pool); +#if defined(WIN32) || defined(__CYGWIN__) #ifdef WIN32 /* If the target is read only NTFS reports EACCESS and FAT/FAT32 reports EEXIST */ -@@ -2276,11 +2287,15 @@ svn_io_remove_file2(const char *path, +@@ -2490,10 +2501,14 @@ svn_io_remove_file2(const char *path, if (!apr_err) return SVN_NO_ERROR; } - +#endif - { - apr_status_t os_err = APR_TO_OS_ERROR(apr_err); - /* Check to make sure we aren't trying to delete a directory */ + /* Check to make sure we aren't trying to delete a directory */ +#ifdef WIN32 - if (os_err == ERROR_ACCESS_DENIED || os_err == ERROR_SHARING_VIOLATION) + if (apr_err == APR_FROM_OS_ERROR(ERROR_ACCESS_DENIED) + || apr_err == APR_FROM_OS_ERROR(ERROR_SHARING_VIOLATION)) +#else -+ if (os_err == EACCES) ++ if (apr_err == APR_FROM_OS_ERROR(EACCES)) +#endif - { - apr_finfo_t finfo; + { + apr_finfo_t finfo; -@@ -3620,20 +3635,22 @@ svn_io_file_rename(const char *from_path, const char *to_path, +@@ -4018,20 +4033,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 +84,7 @@ index f0956e2..e9e3d37 100644 if (status) return svn_error_wrap_apr(status, _("Can't move '%s' to '%s'"), -@@ -3748,7 +3765,7 @@ dir_make(const char *path, apr_fileperms_t perm, +@@ -4156,7 +4173,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'. */ diff --git a/subversion/06-svnadmin-binary-mode.patch b/subversion/06-svnadmin-binary-mode.patch index fb5a7bf1bc0..01f46bc6c63 100644 --- a/subversion/06-svnadmin-binary-mode.patch +++ b/subversion/06-svnadmin-binary-mode.patch @@ -8,10 +8,10 @@ From: David Rothenberger 1 file changed, 6 insertions(+) diff --git a/subversion/svnadmin/svnadmin.c b/subversion/svnadmin/svnadmin.c -index d40525e..c3a7fad 100644 +index 062e653..f2a250e 100644 --- a/subversion/svnadmin/svnadmin.c +++ b/subversion/svnadmin/svnadmin.c -@@ -49,6 +49,10 @@ +@@ -51,6 +51,10 @@ #include "svn_private_config.h" @@ -22,7 +22,7 @@ index d40525e..c3a7fad 100644 /*** Code. ***/ -@@ -1010,6 +1014,7 @@ subcommand_dump(apr_getopt_t *os, void *baton, apr_pool_t *pool) +@@ -1213,6 +1217,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 d40525e..c3a7fad 100644 SVN_ERR(svn_stream_for_stdout(&stdout_stream, pool)); /* Progress feedback goes to STDERR, unless they asked to suppress it. */ -@@ -1195,6 +1200,7 @@ subcommand_load(apr_getopt_t *os, void *baton, apr_pool_t *pool) +@@ -1402,6 +1407,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. */ diff --git a/subversion/07-fix-path-tests.patch b/subversion/07-fix-path-tests.patch index e8471d20c44..77cb92fda94 100644 --- a/subversion/07-fix-path-tests.patch +++ b/subversion/07-fix-path-tests.patch @@ -5,15 +5,15 @@ From: David Rothenberger * But do support a little UNC. --- subversion/libsvn_subr/dirent_uri.c | 55 +++++--- - subversion/tests/libsvn_subr/dirent_uri-test.c | 159 +++++++++++++++++++++--- + subversion/tests/libsvn_subr/dirent_uri-test.c | 158 +++++++++++++++++++++--- subversion/tests/libsvn_subr/path-test.c | 10 +- - 3 files changed, 181 insertions(+), 43 deletions(-) + 3 files changed, 181 insertions(+), 42 deletions(-) diff --git a/subversion/libsvn_subr/dirent_uri.c b/subversion/libsvn_subr/dirent_uri.c -index 4801f8c..7ae97c0 100644 +index a009145..9b83a7e 100644 --- a/subversion/libsvn_subr/dirent_uri.c +++ b/subversion/libsvn_subr/dirent_uri.c -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ /* This check must match the check on top of dirent_uri-tests.c and path-tests.c */ @@ -22,7 +22,7 @@ index 4801f8c..7ae97c0 100644 #define SVN_USE_DOS_PATHS #endif -@@ -123,6 +123,7 @@ canonicalize_to_upper(char c) +@@ -124,6 +124,7 @@ canonicalize_to_upper(char c) static apr_size_t dirent_root_length(const char *dirent, apr_size_t len) { @@ -30,7 +30,7 @@ index 4801f8c..7ae97c0 100644 #ifdef SVN_USE_DOS_PATHS if (len >= 2 && dirent[1] == ':' && ((dirent[0] >= 'A' && dirent[0] <= 'Z') || -@@ -130,6 +131,7 @@ dirent_root_length(const char *dirent, apr_size_t len) +@@ -131,6 +132,7 @@ dirent_root_length(const char *dirent, apr_size_t len) { return (len > 2 && dirent[2] == '/') ? 3 : 2; } @@ -38,7 +38,7 @@ index 4801f8c..7ae97c0 100644 if (len > 2 && dirent[0] == '/' && dirent[1] == '/') { -@@ -139,7 +141,7 @@ dirent_root_length(const char *dirent, apr_size_t len) +@@ -140,7 +142,7 @@ dirent_root_length(const char *dirent, apr_size_t len) i++; if (i == len) @@ -47,7 +47,7 @@ index 4801f8c..7ae97c0 100644 i++; /* Skip '/' */ -@@ -437,7 +439,7 @@ canonicalize(path_type_t type, const char *path, apr_pool_t *pool) +@@ -438,7 +440,7 @@ canonicalize(path_type_t type, const char *path, apr_pool_t *pool) { *(dst++) = *(src++); @@ -56,7 +56,7 @@ index 4801f8c..7ae97c0 100644 /* On Windows permit two leading separator characters which means an * UNC path. */ if ((type == type_dirent) && *src == '/') -@@ -533,7 +535,7 @@ canonicalize(path_type_t type, const char *path, apr_pool_t *pool) +@@ -534,7 +536,7 @@ canonicalize(path_type_t type, const char *path, apr_pool_t *pool) *dst = '\0'; @@ -65,7 +65,7 @@ index 4801f8c..7ae97c0 100644 /* 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] == '/') -@@ -667,7 +669,7 @@ get_longest_ancestor_length(path_type_t types, +@@ -668,7 +670,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; @@ -74,7 +74,7 @@ index 4801f8c..7ae97c0 100644 svn_boolean_t unc = FALSE; #endif -@@ -700,7 +702,7 @@ get_longest_ancestor_length(path_type_t types, +@@ -701,7 +703,7 @@ get_longest_ancestor_length(path_type_t types, return 0; /* Handle some windows specific cases */ @@ -83,7 +83,7 @@ index 4801f8c..7ae97c0 100644 if (types == type_dirent) { /* don't count the '//' from UNC paths */ -@@ -710,6 +712,7 @@ get_longest_ancestor_length(path_type_t types, +@@ -711,6 +713,7 @@ get_longest_ancestor_length(path_type_t types, unc = TRUE; } @@ -91,7 +91,7 @@ index 4801f8c..7ae97c0 100644 /* X:/ and X:/foo */ if (i == 3 && path1[2] == '/' && path1[1] == ':') return i; -@@ -727,8 +730,9 @@ get_longest_ancestor_length(path_type_t types, +@@ -728,8 +731,9 @@ get_longest_ancestor_length(path_type_t types, /* X: and X:foo */ if (path1[i - 1] == ':' || path2[i - 1] == ':') return i; @@ -102,7 +102,7 @@ index 4801f8c..7ae97c0 100644 /* last_dirsep is now the offset of the last directory separator we crossed before reaching a non-matching byte. i is the offset of -@@ -743,18 +747,20 @@ get_longest_ancestor_length(path_type_t types, +@@ -744,18 +748,20 @@ get_longest_ancestor_length(path_type_t types, { /* Nothing in common but the root folder '/' or 'X:/' for Windows dirents. */ @@ -125,7 +125,7 @@ index 4801f8c..7ae97c0 100644 } #endif } -@@ -912,7 +918,8 @@ svn_relpath__internal_style(const char *relpath, +@@ -913,7 +919,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 4801f8c..7ae97c0 100644 /* On Windows and Cygwin, 'H:' or 'H:/' (where 'H' is any letter) are also root directories */ if ((len == 2 || ((len == 3) && (dirent[2] == '/'))) && -@@ -920,9 +927,9 @@ svn_dirent_is_root(const char *dirent, apr_size_t len) +@@ -921,9 +928,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 4801f8c..7ae97c0 100644 if (len >= 2 && dirent[0] == '/' && dirent[1] == '/' && dirent[len - 1] != '/') { -@@ -937,11 +944,7 @@ svn_dirent_is_root(const char *dirent, apr_size_t len) +@@ -938,11 +945,7 @@ svn_dirent_is_root(const char *dirent, apr_size_t len) return FALSE; } } @@ -159,7 +159,7 @@ index 4801f8c..7ae97c0 100644 } #endif -@@ -1655,7 +1658,7 @@ svn_dirent_is_canonical(const char *dirent, apr_pool_t *scratch_pool) +@@ -1679,7 +1682,7 @@ svn_dirent_is_canonical(const char *dirent, apr_pool_t *scratch_pool) if (*ptr == '/') { ptr++; @@ -168,7 +168,7 @@ index 4801f8c..7ae97c0 100644 /* Check for UNC paths */ if (*ptr == '/') { -@@ -2337,7 +2340,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent, +@@ -2366,7 +2369,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 4801f8c..7ae97c0 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: -@@ -2354,10 +2357,11 @@ svn_uri_get_dirent_from_file_url(const char **dirent, +@@ -2383,10 +2386,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 4801f8c..7ae97c0 100644 /* This check assumes ':' and '|' are already decoded! */ if (!hostname && dup_path[1] && strchr(valid_drive_letters, dup_path[1]) -@@ -2385,6 +2389,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent, +@@ -2414,6 +2418,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent, } } } @@ -199,7 +199,7 @@ index 4801f8c..7ae97c0 100644 if (hostname) { if (dup_path[0] == '/' && dup_path[1] == '\0') -@@ -2398,7 +2403,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent, +@@ -2427,7 +2432,7 @@ svn_uri_get_dirent_from_file_url(const char **dirent, else *dirent = dup_path; } @@ -208,7 +208,7 @@ index 4801f8c..7ae97c0 100644 /* Currently, the only hostnames we are allowing on non-Win32 platforms are the empty string and 'localhost'. */ if (hostname) -@@ -2426,7 +2431,15 @@ svn_uri_get_file_url_from_dirent(const char **url, +@@ -2455,7 +2460,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:///" */ @@ -219,16 +219,16 @@ index 4801f8c..7ae97c0 100644 + else + *url = apr_pstrcat(pool, "file://", dirent, (char *)NULL); +#else - *url = apr_pstrcat(pool, "file://", dirent, (char *)NULL); + *url = apr_pstrcat(pool, "file://", dirent, SVN_VA_NULL); +#endif #else if (dirent[0] == '/') { diff --git a/subversion/tests/libsvn_subr/dirent_uri-test.c b/subversion/tests/libsvn_subr/dirent_uri-test.c -index b2c7e53..6240685 100644 +index 61d9e24..5de91c3 100644 --- a/subversion/tests/libsvn_subr/dirent_uri-test.c +++ b/subversion/tests/libsvn_subr/dirent_uri-test.c -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ #define SVN_EMPTY_PATH "" /* This check must match the check on top of dirent_uri.c and path-tests.c */ @@ -237,7 +237,7 @@ index b2c7e53..6240685 100644 #define SVN_USE_DOS_PATHS #endif -@@ -63,7 +63,7 @@ test_dirent_is_root(apr_pool_t *pool) +@@ -64,7 +64,7 @@ test_dirent_is_root(apr_pool_t *pool) { "/foo/bar", FALSE }, { "/foo", FALSE }, { "", FALSE }, @@ -246,7 +246,7 @@ index b2c7e53..6240685 100644 { "X:/foo", FALSE }, { "X:/", TRUE }, { "X:foo", FALSE }, /* Based on non absolute root */ -@@ -72,6 +72,14 @@ test_dirent_is_root(apr_pool_t *pool) +@@ -73,6 +73,14 @@ test_dirent_is_root(apr_pool_t *pool) { "//srv/shr/fld", FALSE }, { "//srv/s r", TRUE }, { "//srv/s r/fld", FALSE }, @@ -261,7 +261,7 @@ index b2c7e53..6240685 100644 #else /* !SVN_USE_DOS_PATHS */ { "/", TRUE }, { "/X:foo", FALSE }, -@@ -143,7 +151,7 @@ test_dirent_is_absolute(apr_pool_t *pool) +@@ -144,7 +152,7 @@ test_dirent_is_absolute(apr_pool_t *pool) { "foo/bar", FALSE }, { "foo", FALSE }, { "", FALSE }, @@ -270,7 +270,7 @@ index b2c7e53..6240685 100644 { "/foo/bar", FALSE }, { "/foo", FALSE }, { "/", FALSE }, -@@ -155,6 +163,18 @@ test_dirent_is_absolute(apr_pool_t *pool) +@@ -156,6 +164,18 @@ test_dirent_is_absolute(apr_pool_t *pool) { "//srv/shr/fld", TRUE }, { "//srv/s r", TRUE }, { "//srv/s r/fld", TRUE }, @@ -289,7 +289,7 @@ index b2c7e53..6240685 100644 #else /* !SVN_USE_DOS_PATHS */ { "/foo/bar", TRUE }, { "/foo", TRUE }, -@@ -226,7 +246,7 @@ test_dirent_join(apr_pool_t *pool) +@@ -227,7 +247,7 @@ test_dirent_join(apr_pool_t *pool) { SVN_EMPTY_PATH, "/abc", "/abc" }, { SVN_EMPTY_PATH, SVN_EMPTY_PATH, SVN_EMPTY_PATH }, { "/", "/", "/" }, @@ -298,7 +298,7 @@ index b2c7e53..6240685 100644 { "X:/", SVN_EMPTY_PATH, "X:/" }, { "X:/", "abc", "X:/abc" }, { "X:/", "/def", "X:/def" }, -@@ -249,6 +269,14 @@ test_dirent_join(apr_pool_t *pool) +@@ -250,6 +270,14 @@ test_dirent_join(apr_pool_t *pool) { "aa", "A:", "A:" }, { "aa", "A:file", "A:file"}, { "A:", "/", "A:/" }, @@ -313,35 +313,34 @@ index b2c7e53..6240685 100644 #else /* !SVN_USE_DOS_PATHS */ { "X:abc", "X:/def", "X:abc/X:/def" }, { "X:","abc", "X:/abc" }, -@@ -317,7 +345,7 @@ test_dirent_join(apr_pool_t *pool) - TEST_MANY((pool, SVN_EMPTY_PATH, "/", SVN_EMPTY_PATH, NULL), "/"); - TEST_MANY((pool, SVN_EMPTY_PATH, SVN_EMPTY_PATH, "/", NULL), "/"); +@@ -318,7 +346,7 @@ test_dirent_join(apr_pool_t *pool) + TEST_MANY((pool, SVN_EMPTY_PATH, "/", SVN_EMPTY_PATH, SVN_VA_NULL), "/"); + TEST_MANY((pool, SVN_EMPTY_PATH, SVN_EMPTY_PATH, "/", SVN_VA_NULL), "/"); -#ifdef SVN_USE_DOS_PATHS +#if defined(SVN_USE_DOS_PATHS) - TEST_MANY((pool, "X:/", "def", "ghi", NULL), "X:/def/ghi"); - TEST_MANY((pool, "abc", "X:/", "ghi", NULL), "X:/ghi"); - TEST_MANY((pool, "abc", "def", "X:/", NULL), "X:/"); -@@ -345,7 +373,17 @@ test_dirent_join(apr_pool_t *pool) + TEST_MANY((pool, "X:/", "def", "ghi", SVN_VA_NULL), "X:/def/ghi"); + TEST_MANY((pool, "abc", "X:/", "ghi", SVN_VA_NULL), "X:/ghi"); + TEST_MANY((pool, "abc", "def", "X:/", SVN_VA_NULL), "X:/"); +@@ -347,6 +375,17 @@ test_dirent_join(apr_pool_t *pool) + 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"); - TEST_MANY((pool, "abcd", "/dir", "A:", "file", NULL), "A:file"); - TEST_MANY((pool, "abcd", "A:", "/dir", "file", NULL), "A:/dir/file"); -- +#elif defined(CYGWIN) -+ TEST_MANY((pool, "X:", "def", "ghi", NULL), "X:/def/ghi"); -+ TEST_MANY((pool, "X:", SVN_EMPTY_PATH, "ghi", NULL), "X:/ghi"); -+ TEST_MANY((pool, "X:", "def", SVN_EMPTY_PATH, NULL), "X:/def"); -+ TEST_MANY((pool, SVN_EMPTY_PATH, "X:", "ghi", NULL), "X:/ghi"); -+ TEST_MANY((pool, "//srv/shr", "def", "ghi", NULL), "//srv/shr/def/ghi"); -+ TEST_MANY((pool, "//srv/shr/fld", "def", "ghi", NULL), "//srv/shr/fld/def/ghi"); -+ TEST_MANY((pool, "//srv/shr/fld", "def", "//srv/shr", NULL), "//srv/shr"); -+ TEST_MANY((pool, "//srv/s r/fld", "def", "//srv/s r", NULL), "//srv/s r"); -+ TEST_MANY((pool, SVN_EMPTY_PATH, "//srv/shr/fld", "def", "ghi", NULL), "//srv/shr/fld/def/ghi"); -+ TEST_MANY((pool, SVN_EMPTY_PATH, "//srv/shr/fld", "def", "//srv/shr", NULL), "//srv/shr"); ++ 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"); ++ TEST_MANY((pool, SVN_EMPTY_PATH, "X:", "ghi", SVN_VA_NULL), "X:/ghi"); ++ TEST_MANY((pool, "//srv/shr", "def", "ghi", SVN_VA_NULL), "//srv/shr/def/ghi"); ++ TEST_MANY((pool, "//srv/shr/fld", "def", "ghi", SVN_VA_NULL), "//srv/shr/fld/def/ghi"); ++ TEST_MANY((pool, "//srv/shr/fld", "def", "//srv/shr", SVN_VA_NULL), "//srv/shr"); ++ TEST_MANY((pool, "//srv/s r/fld", "def", "//srv/s r", SVN_VA_NULL), "//srv/s r"); ++ TEST_MANY((pool, SVN_EMPTY_PATH, "//srv/shr/fld", "def", "ghi", SVN_VA_NULL), "//srv/shr/fld/def/ghi"); ++ TEST_MANY((pool, SVN_EMPTY_PATH, "//srv/shr/fld", "def", "//srv/shr", SVN_VA_NULL), "//srv/shr"); #else /* !SVN_USE_DOS_PATHS */ - TEST_MANY((pool, "X:", "def", "ghi", NULL), "X:/def/ghi"); - TEST_MANY((pool, "X:", SVN_EMPTY_PATH, "ghi", NULL), "X:/ghi"); -@@ -421,7 +459,7 @@ test_dirent_basename(apr_pool_t *pool) + 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"); +@@ -422,7 +461,7 @@ test_dirent_basename(apr_pool_t *pool) { "/", "" }, { SVN_EMPTY_PATH, SVN_EMPTY_PATH }, { "X:/abc", "abc" }, @@ -350,7 +349,7 @@ index b2c7e53..6240685 100644 { "X:", "" }, { "X:/", "" }, { "X:abc", "abc" }, -@@ -429,6 +467,13 @@ test_dirent_basename(apr_pool_t *pool) +@@ -430,6 +469,13 @@ test_dirent_basename(apr_pool_t *pool) { "//srv/shr/fld", "fld" }, { "//srv/shr/fld/subfld", "subfld" }, { "//srv/s r/fld", "fld" }, @@ -364,7 +363,7 @@ index b2c7e53..6240685 100644 #else /* !SVN_USE_DOS_PATHS */ { "X:", "X:" }, { "X:abc", "X:abc" }, -@@ -538,7 +583,7 @@ test_dirent_dirname(apr_pool_t *pool) +@@ -539,7 +585,7 @@ test_dirent_dirname(apr_pool_t *pool) { "/", "/" }, { SVN_EMPTY_PATH, SVN_EMPTY_PATH }, { "X:abc/def", "X:abc" }, @@ -373,7 +372,7 @@ index b2c7e53..6240685 100644 { "X:/", "X:/" }, { "X:/abc", "X:/" }, { "X:abc", "X:" }, -@@ -547,6 +592,14 @@ test_dirent_dirname(apr_pool_t *pool) +@@ -548,6 +594,14 @@ test_dirent_dirname(apr_pool_t *pool) { "//srv/shr/fld", "//srv/shr" }, { "//srv/shr/fld/subfld", "//srv/shr/fld" }, { "//srv/s r/fld", "//srv/s r" }, @@ -388,7 +387,7 @@ index b2c7e53..6240685 100644 #else /* !SVN_USE_DOS_PATHS */ /* on non-Windows platforms, ':' is allowed in pathnames */ { "X:", "" }, -@@ -693,7 +746,9 @@ test_dirent_canonicalize(apr_pool_t *pool) +@@ -694,7 +748,9 @@ test_dirent_canonicalize(apr_pool_t *pool) { "x:/", "X:/" }, { "x:", "X:" }, { "x:AAAAA", "X:AAAAA" }, @@ -399,7 +398,7 @@ index b2c7e53..6240685 100644 * dirents must have two components so we should remove the * double slash if there is only one component. */ { "//hst/foo", "//hst/foo" }, -@@ -704,7 +759,7 @@ test_dirent_canonicalize(apr_pool_t *pool) +@@ -705,7 +761,7 @@ test_dirent_canonicalize(apr_pool_t *pool) { "//SERVER/SHare/", "//server/SHare" }, { "//srv/s r", "//srv/s r" }, { "//srv/s r/qq", "//srv/s r/qq" }, @@ -408,7 +407,7 @@ index b2c7e53..6240685 100644 }; for (t = tests; t < tests + COUNT_OF(tests); t++) -@@ -1045,7 +1100,7 @@ test_dirent_is_canonical(apr_pool_t *pool) +@@ -1049,7 +1105,7 @@ test_dirent_is_canonical(apr_pool_t *pool) { "X:foo", TRUE }, { "X:foo/", FALSE }, { "file with spaces", TRUE }, @@ -417,7 +416,7 @@ index b2c7e53..6240685 100644 { "X:/", TRUE }, { "X:/foo", TRUE }, { "X:", TRUE }, -@@ -1064,6 +1119,22 @@ test_dirent_is_canonical(apr_pool_t *pool) +@@ -1068,6 +1124,22 @@ test_dirent_is_canonical(apr_pool_t *pool) { "//server/SHare", TRUE }, { "//SERVER/SHare", FALSE }, { "//srv/SH RE", TRUE }, @@ -440,7 +439,7 @@ index b2c7e53..6240685 100644 #else /* !SVN_USE_DOS_PATHS */ { "X:/", FALSE }, /* Some people use colons in their filenames. */ -@@ -1240,13 +1311,18 @@ test_dirent_split(apr_pool_t *pool) +@@ -1245,13 +1317,18 @@ test_dirent_split(apr_pool_t *pool) { "/", "/", "" }, { "X:/foo/bar", "X:/foo", "bar" }, { "X:foo/bar", "X:foo", "bar" }, @@ -460,7 +459,7 @@ index b2c7e53..6240685 100644 #else /* !SVN_USE_DOS_PATHS */ { "X:foo", SVN_EMPTY_PATH, "X:foo" }, #endif /* SVN_USE_DOS_PATHS */ -@@ -1386,7 +1462,7 @@ static const testcase_ancestor_t dirent_ancestor_tests[] = +@@ -1391,7 +1468,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 +468,7 @@ index b2c7e53..6240685 100644 { "", "C:", NULL }, { "", "C:foo", NULL }, { "", "C:/", NULL }, -@@ -1420,6 +1496,21 @@ static const testcase_ancestor_t dirent_ancestor_tests[] = +@@ -1425,6 +1502,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 +490,7 @@ index b2c7e53..6240685 100644 #else /* !SVN_USE_DOS_PATHS */ { "", "C:", "C:" }, { "", "C:/foo", "C:/foo" }, -@@ -1607,7 +1698,7 @@ test_dirent_get_longest_ancestor(apr_pool_t *pool) +@@ -1612,7 +1704,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 +499,7 @@ index b2c7e53..6240685 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"}, -@@ -1621,6 +1712,14 @@ test_dirent_get_longest_ancestor(apr_pool_t *pool) +@@ -1626,6 +1718,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 +514,7 @@ index b2c7e53..6240685 100644 #else /* !SVN_USE_DOS_PATHS */ { "X:/foo", "X:", "X:"}, { "X:/folder1", "X:/folder2", "X:"}, -@@ -1766,11 +1865,13 @@ test_dirent_is_child(apr_pool_t *pool) +@@ -1771,11 +1871,13 @@ test_dirent_is_child(apr_pool_t *pool) ".foo", "/", "foo2", @@ -530,7 +529,7 @@ index b2c7e53..6240685 100644 "H:/foo/bar", "H:/foo/baz", "H:/foo/bar/baz", -@@ -1812,7 +1913,7 @@ test_dirent_is_child(apr_pool_t *pool) +@@ -1817,7 +1919,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 +538,7 @@ index b2c7e53..6240685 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 }, -@@ -1822,6 +1923,8 @@ test_dirent_is_child(apr_pool_t *pool) +@@ -1827,6 +1929,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 +547,7 @@ index b2c7e53..6240685 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 }, -@@ -2190,13 +2293,19 @@ test_dirent_local_style(apr_pool_t *pool) +@@ -2195,13 +2299,19 @@ test_dirent_local_style(apr_pool_t *pool) } tests[] = { { "", "." }, { ".", "." }, @@ -569,7 +568,7 @@ index b2c7e53..6240685 100644 #else { "a:/file", "a:/file" }, { "dir/file", "dir/file" }, -@@ -2232,7 +2341,7 @@ test_dirent_internal_style(apr_pool_t *pool) +@@ -2237,7 +2347,7 @@ test_dirent_internal_style(apr_pool_t *pool) { "file", "file" }, { "dir/file", "dir/file" }, { "dir/file/./.", "dir/file" }, @@ -578,7 +577,7 @@ index b2c7e53..6240685 100644 { "A:\\", "A:/" }, { "A:\\file", "A:/file" }, { "A:file", "A:file" }, -@@ -2247,6 +2356,14 @@ test_dirent_internal_style(apr_pool_t *pool) +@@ -2252,6 +2362,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 +592,7 @@ index b2c7e53..6240685 100644 #else { "a:/", "a:" }, /* Wrong but expected for svn_path_*() */ { "a:/file", "a:/file" }, -@@ -2318,9 +2435,11 @@ test_dirent_from_file_url(apr_pool_t *pool) +@@ -2323,9 +2441,11 @@ test_dirent_from_file_url(apr_pool_t *pool) { "file://localhost", "/" }, { "file://localhost/dir", "/dir" }, { "file://localhost/dir/path", "/dir/path" }, @@ -606,7 +605,7 @@ index b2c7e53..6240685 100644 { "file:///A:", "A:/" }, { "file:///A:/dir", "A:/dir" }, { "file:///A:dir", "A:dir" }, -@@ -2354,7 +2473,7 @@ test_dirent_from_file_url_errors(apr_pool_t *pool) +@@ -2359,7 +2479,7 @@ test_dirent_from_file_url_errors(apr_pool_t *pool) /* error if scheme is not "file" */ "http://localhost/dir", "file+ssh://localhost/dir", @@ -616,7 +615,7 @@ index b2c7e53..6240685 100644 #endif }; diff --git a/subversion/tests/libsvn_subr/path-test.c b/subversion/tests/libsvn_subr/path-test.c -index ec35176..6d1471b 100644 +index 6f0a996..91850cb 100644 --- a/subversion/tests/libsvn_subr/path-test.c +++ b/subversion/tests/libsvn_subr/path-test.c @@ -53,7 +53,7 @@ @@ -628,7 +627,7 @@ index ec35176..6d1471b 100644 #define SVN_USE_DOS_PATHS #endif -@@ -1437,12 +1437,18 @@ test_path_internal_style(apr_pool_t *pool) +@@ -1438,12 +1438,18 @@ test_path_internal_style(apr_pool_t *pool) { ".", "" }, { "http://host/dir", "http://host/dir" }, { "/", "/" }, diff --git a/subversion/09-wincrypt.patch b/subversion/09-wincrypt.patch index 5efc81fa8b4..3585a3c1f7e 100644 --- a/subversion/09-wincrypt.patch +++ b/subversion/09-wincrypt.patch @@ -13,21 +13,21 @@ From: David Rothenberger 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/build.conf b/build.conf -index 8cf7184..e6e1c5e 100644 +index 2795c23..e6007cb 100644 --- a/build.conf +++ b/build.conf -@@ -323,7 +323,7 @@ description = Subversion General Utility Library +@@ -364,7 +364,7 @@ description = Subversion General Utility Library type = lib install = fsmod-lib path = subversion/libsvn_subr --libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic -+libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic wincrypt +-libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl ++libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl wincrypt msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib crypt32.lib version.lib msvc-export = -@@ -1218,6 +1218,10 @@ type = lib - external-lib = -lhttpd2core - libs = aprutil apr +@@ -1486,6 +1486,10 @@ type = lib + external-lib = $(SVN_FS_LIB_LINK) + libs = libsvn_fs_base libsvn_fs_fs libsvn_fs_x +[wincrypt] +type = lib @@ -37,7 +37,7 @@ index 8cf7184..e6e1c5e 100644 type = project path = build/win32 diff --git a/subversion/include/svn_auth.h b/subversion/include/svn_auth.h -index 3e9f45e..155c063 100644 +index 3a78ba6..3f40d32 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 3e9f45e..155c063 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 3c874cf..a999711 100644 +index 2cd83c4..81d29fe 100644 --- a/subversion/libsvn_subr/auth.c +++ b/subversion/libsvn_subr/auth.c -@@ -525,7 +525,7 @@ svn_auth_get_platform_specific_provider(svn_auth_provider_object_t **provider, +@@ -579,7 +579,7 @@ svn_auth_get_platform_specific_provider(svn_auth_provider_object_t **provider, } #endif @@ -63,10 +63,10 @@ index 3c874cf..a999711 100644 strcmp(provider_type, "simple") == 0) { diff --git a/subversion/libsvn_subr/config_file.c b/subversion/libsvn_subr/config_file.c -index c705b14..a0a3847 100644 +index eede717..24b1fc9 100644 --- a/subversion/libsvn_subr/config_file.c +++ b/subversion/libsvn_subr/config_file.c -@@ -1058,7 +1058,7 @@ svn_config_ensure(const char *config_dir, apr_pool_t *pool) +@@ -1162,7 +1162,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 c705b14..a0a3847 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 e16866a..96eaa93 100644 +index 74bda1c..ebb8b4d 100644 --- a/subversion/libsvn_subr/win32_crypto.c +++ b/subversion/libsvn_subr/win32_crypto.c @@ -26,7 +26,7 @@ typedef int win32_crypto__dummy; @@ -88,7 +88,7 @@ index e16866a..96eaa93 100644 /*** Includes. ***/ -@@ -44,6 +44,9 @@ typedef int win32_crypto__dummy; +@@ -45,6 +45,9 @@ typedef int win32_crypto__dummy; #include "svn_private_config.h" @@ -99,7 +99,7 @@ index e16866a..96eaa93 100644 diff --git a/subversion/tests/libsvn_subr/auth-test.c b/subversion/tests/libsvn_subr/auth-test.c -index 9d7d866..58ff760 100644 +index bbe7933..e9f361a 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) @@ -108,10 +108,10 @@ index 9d7d866..58ff760 100644 #endif -#if defined(WIN32) && !defined(__MINGW32__) +#if (defined(WIN32) && !defined(__MINGW32__)) || defined(__CYGWIN__) - number_of_providers += 2; + number_of_providers += 4; #endif if (providers->nelts != number_of_providers) -@@ -103,7 +103,7 @@ test_platform_specific_auth_providers(apr_pool_t *pool) +@@ -104,7 +104,7 @@ test_platform_specific_auth_providers(apr_pool_t *pool) #endif /* Test Windows auth providers */ @@ -120,7 +120,7 @@ index 9d7d866..58ff760 100644 svn_auth_get_platform_specific_provider(&provider, "windows", "simple", pool); -@@ -164,6 +164,7 @@ test_platform_specific_auth_providers(apr_pool_t *pool) +@@ -165,6 +165,7 @@ test_platform_specific_auth_providers(apr_pool_t *pool) "'ssl_client_cert_pw') should not return NULL"); /* Make sure you do not get a Windows auth provider */ @@ -128,7 +128,7 @@ index 9d7d866..58ff760 100644 SVN_ERR(svn_auth_get_platform_specific_provider(&provider, "windows", "simple", pool)); -@@ -173,6 +174,7 @@ test_platform_specific_auth_providers(apr_pool_t *pool) +@@ -174,6 +175,7 @@ test_platform_specific_auth_providers(apr_pool_t *pool) "svn_auth_get_platform_specific_provider('windows', 'simple') should " \ "return NULL"); #endif diff --git a/subversion/10-perl-vendors.patch b/subversion/10-perl-vendors.patch index 5e317ba81a3..9c75f878f27 100644 --- a/subversion/10-perl-vendors.patch +++ b/subversion/10-perl-vendors.patch @@ -8,15 +8,15 @@ From: David Rothenberger 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 0423782..da67876 100644 +index b8eb9be..de7d9f2 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -778,7 +778,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in +@@ -838,7 +838,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 -- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL -+ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL INSTALLDIRS=vendor +- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix) ++ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor # There is a "readlink -f" command on some systems for the same purpose, # but it's not as portable (e.g. Mac OS X doesn't have it). These should diff --git a/subversion/11-XFAIL-case-sensitive-move-tests.patch b/subversion/11-XFAIL-case-sensitive-move-tests.patch index 985c0c45c39..1891451e64e 100644 --- a/subversion/11-XFAIL-case-sensitive-move-tests.patch +++ b/subversion/11-XFAIL-case-sensitive-move-tests.patch @@ -10,10 +10,10 @@ From: David Rothenberger 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/subversion/tests/cmdline/copy_tests.py b/subversion/tests/cmdline/copy_tests.py -index 460e716..01276ae 100755 +index e873ea2..81008b2 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): +@@ -5149,6 +5149,7 @@ def copy_base_of_deleted(sbox): @Issue(3702) # APR's apr_filepath_merge() with APR_FILEPATH_TRUENAME is broken on OS X. @XFail(svntest.main.is_os_darwin) @@ -22,10 +22,10 @@ index 460e716..01276ae 100755 """case-only rename""" diff --git a/subversion/tests/cmdline/svntest/main.py b/subversion/tests/cmdline/svntest/main.py -index f73b98e..6a9e863 100644 +index 4703158..001a6c5 100644 --- a/subversion/tests/cmdline/svntest/main.py +++ b/subversion/tests/cmdline/svntest/main.py -@@ -1326,8 +1326,11 @@ def is_posix_os(): +@@ -1481,8 +1481,11 @@ def is_posix_os(): def is_os_darwin(): return sys.platform == 'darwin' @@ -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 4f7f70c..7fc4ed1 100644 +index c0ec24b..26a4069 100644 --- a/subversion/tests/libsvn_wc/op-depth-test.c +++ b/subversion/tests/libsvn_wc/op-depth-test.c -@@ -8390,11 +8390,11 @@ struct svn_test_descriptor_t test_funcs[] = +@@ -11922,11 +11922,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)"), diff --git a/subversion/12-fix-svnlook-test.patch b/subversion/12-fix-svnlook-test.patch index f48544ca076..07c2c57c47c 100644 --- a/subversion/12-fix-svnlook-test.patch +++ b/subversion/12-fix-svnlook-test.patch @@ -8,10 +8,10 @@ From: David Rothenberger 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 +index d6c49c0..859125c 100755 --- a/subversion/tests/cmdline/svnlook_tests.py +++ b/subversion/tests/cmdline/svnlook_tests.py -@@ -649,7 +649,7 @@ svnlook_bin=%s +@@ -639,7 +639,7 @@ svnlook_bin=%s fp = open(os.path.join(sys.argv[1], 'hooks.log'), 'wb') def output_command(fp, cmd, opt): command = [svnlook_bin, cmd, '-t', sys.argv[2], sys.argv[1]] + opt diff --git a/subversion/13-dso_open.patch b/subversion/13-dso_open.patch index 79d281ac4f0..947b7e5472c 100644 --- a/subversion/13-dso_open.patch +++ b/subversion/13-dso_open.patch @@ -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 336b84f..63ef3cc 100644 +index ba90554..66e0ccb 100644 --- a/subversion/libsvn_fs/fs-loader.c +++ b/subversion/libsvn_fs/fs-loader.c -@@ -121,7 +121,12 @@ load_module(fs_init_func_t *initfunc, const char *name, apr_pool_t *pool) +@@ -140,7 +140,12 @@ load_module(fs_init_func_t *initfunc, const char *name, apr_pool_t *pool) _("Invalid name for FS type '%s'"), name); @@ -30,10 +30,10 @@ index 336b84f..63ef3cc 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 d9cb96b..ae17d84 100644 +index 3a782f2..936d88f 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, +@@ -143,7 +143,12 @@ load_ra_module(svn_ra__init_func_t *func, const char *compat_funcname; apr_status_t status; @@ -48,10 +48,10 @@ index d9cb96b..ae17d84 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 a999711..6f88853 100644 +index 81d29fe..d83fa78 100644 --- a/subversion/libsvn_subr/auth.c +++ b/subversion/libsvn_subr/auth.c -@@ -455,7 +455,11 @@ svn_auth_get_platform_specific_provider(svn_auth_provider_object_t **provider, +@@ -509,7 +509,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, diff --git a/subversion/14-fix_svnauthz_tests.patch b/subversion/14-fix_svnauthz_tests.patch index e38102b7e5e..95bf2cc4344 100644 --- a/subversion/14-fix_svnauthz_tests.patch +++ b/subversion/14-fix_svnauthz_tests.patch @@ -8,7 +8,7 @@ From: David Rothenberger 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 +index 7c1396c..230c4d9 100755 --- a/subversion/tests/cmdline/svnauthz_tests.py +++ b/subversion/tests/cmdline/svnauthz_tests.py @@ -48,7 +48,7 @@ svnauthz_bin=%s diff --git a/subversion/15-XFAIL_case_sensitive_tree_conflict.patch b/subversion/15-XFAIL_case_sensitive_tree_conflict.patch index 8213df43bd2..4faf0724b9b 100644 --- a/subversion/15-XFAIL_case_sensitive_tree_conflict.patch +++ b/subversion/15-XFAIL_case_sensitive_tree_conflict.patch @@ -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 c51d80a..b2209dd 100755 +index 58f7554..660a4ba 100755 --- a/subversion/tests/cmdline/basic_tests.py +++ b/subversion/tests/cmdline/basic_tests.py -@@ -2958,6 +2958,7 @@ def quiet_commits(sbox): +@@ -2956,6 +2956,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) diff --git a/subversion/16-XFAIL_sqlite3_temp_table_tests.patch b/subversion/16-XFAIL_sqlite3_temp_table_tests.patch deleted file mode 100644 index b4fed58769f..00000000000 --- a/subversion/16-XFAIL_sqlite3_temp_table_tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -XFAIL sqlite3 tests that use temp tables - -From: David Rothenberger - -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 | 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 74ad439..16dcdbc 100644 ---- a/subversion/tests/libsvn_wc/wc-queries-test.c -+++ b/subversion/tests/libsvn_wc/wc-queries-test.c -@@ -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, -+ SVN_TEST_XFAIL2(test_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, -+ SVN_TEST_XFAIL2(test_schema_statistics, - "test schema statistics"), - SVN_TEST_NULL - }; diff --git a/subversion/16-fix-swig3.patch b/subversion/16-fix-swig3.patch new file mode 100644 index 00000000000..88ffb813a48 --- /dev/null +++ b/subversion/16-fix-swig3.patch @@ -0,0 +1,69 @@ +Support swig3 + +From: David Rothenberger + +Fugly hack to fix build with SWIG 3.0.x. The pre-processor seems to +expand the %define correctly with only the change to %{..%}, but +%extend still breaks somehow. + +https://github.com/swig/swig/issues/379 +--- + subversion/bindings/swig/include/proxy.swg | 10 ++-------- + subversion/bindings/swig/svn_delta.i | 2 -- + 2 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/subversion/bindings/swig/include/proxy.swg b/subversion/bindings/swig/include/proxy.swg +index d16afc2..4dda9a2 100644 +--- a/subversion/bindings/swig/include/proxy.swg ++++ b/subversion/bindings/swig/include/proxy.swg +@@ -62,7 +62,7 @@ + + /* Default code for all wrapped proxy classes in Python */ + %define %proxy_pythoncode(TYPE) +-%pythoncode { ++%pythoncode %{ + def set_parent_pool(self, parent_pool=None): + """Create a new proxy object for TYPE""" + import libsvn.core, weakref +@@ -83,13 +83,10 @@ + + value = _swig_getattr(self, self.__class__, name) + +- # If we got back a different object than we have, we need to copy all our +- # metadata into it, so that it looks identical + members = self.__dict__.get("_members") + if members is not None: + _copy_metadata_deep(value, members.get(name)) + +- # Verify that the new object is good + _assert_valid_deep(value) + + return value +@@ -98,13 +95,10 @@ + """Set an attribute on this object""" + self.assert_valid() + +- # Save a copy of the object, so that the garbage +- # collector won't kill the object while it's in +- # SWIG-land + self.__dict__.setdefault("_members",{})[name] = value + + return _swig_setattr(self, self.__class__, name, value) +-} ++%} + %enddef + + /* Define a proxy for wrapping an existing struct */ +diff --git a/subversion/bindings/swig/svn_delta.i b/subversion/bindings/swig/svn_delta.i +index f69b76e..4ad2718 100644 +--- a/subversion/bindings/swig/svn_delta.i ++++ b/subversion/bindings/swig/svn_delta.i +@@ -206,8 +206,6 @@ void _ops_get(int *num_ops, const svn_txdelta_op_t **ops) + + #ifdef SWIGPYTHON + %pythoncode %{ +-# This function is for backwards compatibility only. +-# Use svn_txdelta_window_t.ops instead. + svn_txdelta_window_t_ops_get = svn_txdelta_window_t._ops_get + %} + #endif diff --git a/subversion/17-dont-build-tests.patch b/subversion/17-dont-build-tests.patch deleted file mode 100644 index 373953d15ac..00000000000 --- a/subversion/17-dont-build-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" diff --git a/subversion/17-fix-test-link.patch b/subversion/17-fix-test-link.patch new file mode 100644 index 00000000000..b4ddf531745 --- /dev/null +++ b/subversion/17-fix-test-link.patch @@ -0,0 +1,717 @@ +Fix linking of the test programs. + +From: David Rothenberger + +The libsvn_test library contains undefined references, so it can't +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(-) + +diff --git a/build.conf b/build.conf +index e6007cb..a0bedc4 100644 +--- a/build.conf ++++ b/build.conf +@@ -771,13 +771,14 @@ link-cmd = $(LINK_CXX_LIB) + # + + # general library: our C testing framework +-[libsvn_test] +-type = lib +-path = subversion/tests +-install = test +-libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr +-msvc-static = yes +-undefined-lib-symbols = yes ++#[libsvn_test] ++#type = lib ++#path = subversion/tests ++#sources = svn_test_fs.c ++#install = test ++#libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr ++#msvc-static = yes ++#undefined-lib-symbols = yes + + # ---------------------------------------------------------------------------- + # Tests for libsvn_fs_base +@@ -785,28 +786,28 @@ undefined-lib-symbols = yes + [fs-base-test] + description = Tests for *public* fs API (svn_fs.h) + type = exe +-path = subversion/tests/libsvn_fs_base +-sources = fs-base-test.c ++path = subversion/tests ++sources = libsvn_fs_base/fs-base-test.c svn_test_fs.c svn_test_main.c + install = bdb-test +-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 + + [strings-reps-test] + description = Test strings/reps in libsvn_fs_base + type = exe +-path = subversion/tests/libsvn_fs_base +-sources = strings-reps-test.c ++path = subversion/tests ++sources = libsvn_fs_base/strings-reps-test.c svn_test_fs.c svn_test_main.c + install = bdb-test +-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 + + [changes-test] + description = Test changes in libsvn_fs_base + type = exe +-path = subversion/tests/libsvn_fs_base +-sources = changes-test.c ++path = subversion/tests ++sources = libsvn_fs_base/changes-test.c svn_test_fs.c svn_test_main.c + install = bdb-test +-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 + + # ---------------------------------------------------------------------------- +@@ -814,28 +815,28 @@ libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta + [fs-fs-pack-test] + description = Test fsfs packing in libsvn_fs_fs + type = exe +-path = subversion/tests/libsvn_fs_fs +-sources = fs-fs-pack-test.c ++path = subversion/tests ++sources = libsvn_fs_fs/fs-fs-pack-test.c svn_test_fs.c svn_test_main.c + install = test +-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 + + [fs-fs-fuzzy-test] + description = Use fuzzying to test FSFS corruption resilience + type = exe +-path = subversion/tests/libsvn_fs_fs +-sources = fs-fs-fuzzy-test.c ++path = subversion/tests ++sources = libsvn_fs_fs/fs-fs-fuzzy-test.c svn_test_fs.c svn_test_main.c + install = sub-test +-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 + + [fs-fs-private-test] + description = Test FSSF private API + type = exe +-path = subversion/tests/libsvn_fs_fs +-sources = fs-fs-private-test.c ++path = subversion/tests ++sources = libsvn_fs_fs/fs-fs-private-test.c svn_test_fs.c svn_test_main.c + install = test +-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 + + # ---------------------------------------------------------------------------- +@@ -843,19 +844,19 @@ libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta + [fs-x-pack-test] + description = Test fsx packing in libsvn_fs_x + type = exe +-path = subversion/tests/libsvn_fs_x +-sources = fs-x-pack-test.c ++path = subversion/tests ++sources = libsvn_fs_x/fs-x-pack-test.c svn_test_fs.c svn_test_main.c + install = test +-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 + + [string-table-test] + description = Test fsfs string tables + type = exe +-path = subversion/tests/libsvn_fs_x +-sources = string-table-test.c ++path = subversion/tests ++sources = libsvn_fs_x/string-table-test.c svn_test_fs.c svn_test_main.c + 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 + + # ---------------------------------------------------------------------------- + # Tests for libsvn_fs +@@ -863,19 +864,19 @@ libs = libsvn_test libsvn_fs_x libsvn_subr apr + [locks-test] + description = Test locks in libsvn_fs + type = exe +-path = subversion/tests/libsvn_fs +-sources = locks-test.c ++path = subversion/tests ++sources = libsvn_fs/locks-test.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr apriconv apr ++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs libsvn_delta libsvn_subr apriconv apr + msvc-force-static = yes + + [fs-test] + description = Test locks in libsvn_fs + type = exe +-path = subversion/tests/libsvn_fs +-sources = fs-test.c ++path = subversion/tests ++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 + + # ---------------------------------------------------------------------------- +@@ -884,18 +885,18 @@ libs = libsvn_test libsvn_fs libsvn_delta + [repos-test] + description = Test delta editor in libsvn_repos + type = exe +-path = subversion/tests/libsvn_repos +-sources = repos-test.c dir-delta-editor.c ++path = subversion/tests ++sources = libsvn_repos/repos-test.c libsvn_repos/dir-delta-editor.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_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr + + [dump-load-test] + description = Test dumping/loading repositories in libsvn_repos + type = exe +-path = subversion/tests/libsvn_repos +-sources = dump-load-test.c ++path = subversion/tests ++sources = libsvn_repos/dump-load-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_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr + + # ---------------------------------------------------------------------------- + # Tests for libsvn_subr +@@ -903,244 +904,244 @@ libs = libsvn_test libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr + [auth-test] + description = Test platform-specific auth provider access + type = exe +-path = subversion/tests/libsvn_subr +-sources = auth-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_subr apr ++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_subr apr + + [bit-array-test] + description = Test packed bit arrays + type = exe +-path = subversion/tests/libsvn_subr +-sources = bit-array-test.c ++path = subversion/tests ++sources = libsvn_subr/bit-array-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 + + [cache-test] + description = Test in-memory cache + type = exe +-path = subversion/tests/libsvn_subr +-sources = cache-test.c ++path = subversion/tests ++sources = libsvn_subr/cache-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 + + [checksum-test] + description = Test checksum functions + type = exe +-path = subversion/tests/libsvn_subr +-sources = checksum-test.c ++path = subversion/tests ++sources = libsvn_subr/checksum-test.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_test libsvn_subr apr zlib ++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_subr apr zlib + msvc-force-static = yes + + [compat-test] + description = Test compatibility functions + type = exe +-path = subversion/tests/libsvn_subr +-sources = compat-test.c ++path = subversion/tests ++sources = libsvn_subr/compat-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 + + [config-test] + description = Test svn_config utilities + type = exe +-path = subversion/tests/libsvn_subr +-sources = config-test.c ++path = subversion/tests ++sources = libsvn_subr/config-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 apriconv apr + + [crypto-test] + description = Test svn_crypto utilities + type = exe +-path = subversion/tests/libsvn_subr +-sources = crypto-test.c ++path = subversion/tests ++sources = libsvn_subr/crypto-test.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_test libsvn_subr aprutil apr ++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_subr aprutil apr + msvc-force-static = yes + + [dirent_uri-test] + description = Test dirent_uri library + type = exe +-path = subversion/tests/libsvn_subr +-sources = dirent_uri-test.c ++path = subversion/tests ++sources = libsvn_subr/dirent_uri-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 apriconv apr + + [error-test] + description = Test error library + type = exe +-path = subversion/tests/libsvn_subr +-sources = error-test.c ++path = subversion/tests ++sources = libsvn_subr/error-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 apriconv apr + + [error-code-test] + description = Test error library + type = exe +-path = subversion/tests/libsvn_subr +-sources = error-code-test.c ++path = subversion/tests ++sources = libsvn_subr/error-code-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 apriconv apr + + [hashdump-test] + description = Test hashfile format for props + type = exe +-path = subversion/tests/libsvn_subr +-sources = hashdump-test.c ++path = subversion/tests ++sources = libsvn_subr/hashdump-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 apriconv apr + + [io-test] + description = Test I/O Operations + type = exe +-path = subversion/tests/libsvn_subr +-sources = io-test.c ++path = subversion/tests ++sources = libsvn_subr/io-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 apriconv apr + + [opt-test] + description = Test options library + type = exe +-path = subversion/tests/libsvn_subr +-sources = opt-test.c ++path = subversion/tests ++sources = libsvn_subr/opt-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 + + [mergeinfo-test] + description = Test mergeinfo library + type = exe +-path = subversion/tests/libsvn_subr +-sources = mergeinfo-test.c ++path = subversion/tests ++sources = libsvn_subr/mergeinfo-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 + + [packed-data-test] + description = Test path library + type = exe +-path = subversion/tests/libsvn_subr +-sources = packed-data-test.c ++path = subversion/tests ++sources = libsvn_subr/packed-data-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 + + [path-test] + description = Test path library + type = exe +-path = subversion/tests/libsvn_subr +-sources = path-test.c ++path = subversion/tests ++sources = libsvn_subr/path-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 + + [prefix-string-test] + description = Test path library + type = exe +-path = subversion/tests/libsvn_subr +-sources = prefix-string-test.c ++path = subversion/tests ++sources = libsvn_subr/prefix-string-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 + + [priority-queue-test] + description = Test path library + type = exe +-path = subversion/tests/libsvn_subr +-sources = priority-queue-test.c ++path = subversion/tests ++sources = libsvn_subr/priority-queue-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 + + [revision-test] + description = Test revision library + type = exe +-path = subversion/tests/libsvn_subr +-sources = revision-test.c ++path = subversion/tests ++sources = libsvn_subr/revision-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 + + [root-pools-test] + description = Test time functions + type = exe +-path = subversion/tests/libsvn_subr +-sources = root-pools-test.c ++path = subversion/tests ++sources = libsvn_subr/root-pools-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 + + [skel-test] + description = Test skels in libsvn_subr + type = exe +-path = subversion/tests/libsvn_subr +-sources = skel-test.c ++path = subversion/tests ++sources = libsvn_subr/skel-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 + + [spillbuf-test] + description = Test spillbuf in libsvn_subr + type = exe +-path = subversion/tests/libsvn_subr +-sources = spillbuf-test.c ++path = subversion/tests ++sources = libsvn_subr/spillbuf-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 + + [stream-test] + description = Test stream library + type = exe +-path = subversion/tests/libsvn_subr +-sources = stream-test.c ++path = subversion/tests ++sources = libsvn_subr/stream-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 + + [string-test] + description = Test svn_stringbuf_t utilities + type = exe +-path = subversion/tests/libsvn_subr +-sources = string-test.c ++path = subversion/tests ++sources = libsvn_subr/string-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 + + [sqlite-test] + description = Test stream library + type = exe +-path = subversion/tests/libsvn_subr +-sources = sqlite-test.c ++path = subversion/tests ++sources = libsvn_subr/sqlite-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 + + [time-test] + description = Test time functions + type = exe +-path = subversion/tests/libsvn_subr +-sources = time-test.c ++path = subversion/tests ++sources = libsvn_subr/time-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 + + [utf-test] + description = Test UTF-8 functions + type = exe +-path = subversion/tests/libsvn_subr +-sources = utf-test.c ++path = subversion/tests ++sources = libsvn_subr/utf-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 + + [subst_translate-test] + description = Test the svn_subst_translate* functions + type = exe +-path = subversion/tests/libsvn_subr +-sources = subst_translate-test.c ++path = subversion/tests ++sources = libsvn_subr/subst_translate-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 + + [translate-test] + description = Test eol conversion and keyword substitution routines + type = exe +-path = subversion/tests/libsvn_subr +-sources = translate-test.c ++path = subversion/tests ++sources = libsvn_subr/translate-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 + + [x509-test] + description = Test x509 parser + type = exe +-path = subversion/tests/libsvn_subr +-sources = x509-test.c ++path = subversion/tests ++sources = libsvn_subr/x509-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 + + + # ---------------------------------------------------------------------------- +@@ -1149,18 +1150,18 @@ libs = libsvn_test libsvn_subr apriconv apr + [random-test] + description = Use random data to test delta processing + type = exe +-path = subversion/tests/libsvn_delta +-sources = random-test.c ++path = subversion/tests ++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 + + [window-test] + description = Test delta window generation + type = exe +-path = subversion/tests/libsvn_delta +-sources = window-test.c ++path = subversion/tests ++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 + + # ---------------------------------------------------------------------------- + # Tests for libsvn_client +@@ -1168,19 +1169,19 @@ libs = libsvn_test libsvn_delta libsvn_subr apriconv apr + [client-test] + description = Test low-level functionality in libsvn_client + type = exe +-path = subversion/tests/libsvn_client +-sources = client-test.c ++path = subversion/tests ++sources = libsvn_client/client-test.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 + + [mtcc-test] + description = Test Multi Command Context + type = exe +-path = subversion/tests/libsvn_client +-sources = mtcc-test.c ++path = subversion/tests ++sources = libsvn_client/mtcc-test.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 + + # ---------------------------------------------------------------------------- + # Tests for libsvn_diff +@@ -1188,18 +1189,18 @@ libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libs + [diff-diff3-test] + description = Test the diff/diff3 library + type = exe +-path = subversion/tests/libsvn_diff +-sources = diff-diff3-test.c ++path = subversion/tests ++sources = libsvn_diff/diff-diff3-test.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_test libsvn_diff libsvn_subr apriconv apr ++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_diff libsvn_subr apriconv apr + + [parse-diff-test] + description = Test unidiff parsing + type = exe +-path = subversion/tests/libsvn_diff +-sources = parse-diff-test.c ++path = subversion/tests ++sources = libsvn_diff/parse-diff-test.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_test libsvn_diff libsvn_subr apriconv apr ++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_diff libsvn_subr apriconv apr + + # ---------------------------------------------------------------------------- + # Tests for libsvn_ra +@@ -1207,11 +1208,11 @@ libs = libsvn_test libsvn_diff libsvn_subr apriconv apr + [ra-test] + description = Test a few things in libsvn_ra + type = exe +-path = subversion/tests/libsvn_ra +-sources = ra-test.c ++path = subversion/tests ++sources = libsvn_ra/ra-test.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_test libsvn_ra libsvn_ra_svn libsvn_fs libsvn_delta libsvn_subr +- apriconv apr ++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_ra libsvn_fs libsvn_delta libsvn_subr ++ apriconv apr + + # ---------------------------------------------------------------------------- + # Tests for libsvn_ra_local +@@ -1219,10 +1220,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 +-path = subversion/tests/libsvn_ra_local +-sources = ra-local-test.c ++path = subversion/tests ++sources = libsvn_ra_local/ra-local-test.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_test libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr ++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr + apriconv apr + + # ---------------------------------------------------------------------------- +@@ -1231,63 +1232,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 +-path = subversion/tests/libsvn_wc +-sources = conflict-data-test.c utils.c ++path = subversion/tests ++sources = libsvn_wc/conflict-data-test.c libsvn_wc/utils.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr ++libs = libsvn_client libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_wc libsvn_subr apriconv apr + msvc-force-static = yes + + [db-test] + description = Test the wc-ng database subsystem + type = exe +-path = subversion/tests/libsvn_wc +-sources = db-test.c utils.c ++path = subversion/tests ++sources = libsvn_wc/db-test.c libsvn_wc/utils.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr ++libs = libsvn_client libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_wc libsvn_subr apriconv apr + msvc-force-static = yes + + [pristine-store-test] + description = Test the wc-ng pristine text storage subsystem + type = exe +-path = subversion/tests/libsvn_wc +-sources = pristine-store-test.c utils.c ++path = subversion/tests ++sources = libsvn_wc/pristine-store-test.c libsvn_wc/utils.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr ++libs = libsvn_client libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_wc libsvn_subr apriconv apr + msvc-force-static = yes + + [entries-compat-test] + description = Test backwards compat for the entry interface + type = exe +-path = subversion/tests/libsvn_wc +-sources = entries-compat.c utils.c ++path = subversion/tests ++sources = libsvn_wc/entries-compat.c libsvn_wc/utils.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr ++libs = libsvn_client libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_wc libsvn_subr apriconv apr + msvc-force-static = yes + + [op-depth-test] + description = Test layered tree changes + type = exe +-path = subversion/tests/libsvn_wc +-sources = op-depth-test.c utils.c ++path = subversion/tests ++sources = libsvn_wc/op-depth-test.c libsvn_wc/utils.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr ++libs = libsvn_client libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_wc libsvn_subr apriconv apr + msvc-force-static = yes + + [wc-queries-test] + description = Test Sqlite query evaluation + type = exe +-path = subversion/tests/libsvn_wc +-sources = wc-queries-test.c ../../libsvn_subr/sqlite3wrapper.c ++path = subversion/tests ++sources = libsvn_wc/wc-queries-test.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_test libsvn_subr apriconv apr sqlite ++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_subr apriconv apr sqlite + + [wc-test] + description = Test the main WC API functions + type = exe +-path = subversion/tests/libsvn_wc +-sources = wc-test.c utils.c ++path = subversion/tests ++sources = libsvn_wc/wc-test.c libsvn_wc/utils.c svn_test_fs.c svn_test_main.c + install = test +-libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr ++libs = libsvn_client libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr libsvn_wc libsvn_subr apriconv apr + msvc-force-static = yes + + # ---------------------------------------------------------------------------- diff --git a/subversion/18-fix-comment-quotes.patch b/subversion/18-fix-comment-quotes.patch deleted file mode 100644 index 9ac4e282faf..00000000000 --- a/subversion/18-fix-comment-quotes.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur subversion-1.8.13-orig/subversion/bindings/swig/core.i subversion-1.8.13/subversion/bindings/swig/core.i ---- subversion-1.8.13-orig/subversion/bindings/swig/core.i 2014-01-06 08:04:07.000000000 +0400 -+++ subversion-1.8.13/subversion/bindings/swig/core.i 2015-04-09 09:52:00.443000000 +0300 -@@ -788,11 +788,13 @@ - %ignore svn_opt_parse_all_args; - #endif - -+/* -+ * The auth baton depends on the providers, so we preserve a -+ * reference to them inside the wrapper. This way, if all external -+ * references to the providers are gone, they will still be alive, -+ * keeping the baton valid. -+ */ - #ifdef SWIGPYTHON --# The auth baton depends on the providers, so we preserve a --# reference to them inside the wrapper. This way, if all external --# references to the providers are gone, they will still be alive, --# keeping the baton valid. - %feature("pythonappend") svn_auth_open %{ - val.__dict__["_deps"] = list(args[0]) - %} -diff -Naur subversion-1.8.13-orig/subversion/bindings/swig/include/proxy.swg subversion-1.8.13/subversion/bindings/swig/include/proxy.swg ---- subversion-1.8.13-orig/subversion/bindings/swig/include/proxy.swg 2010-02-10 02:12:51.000000000 +0300 -+++ subversion-1.8.13/subversion/bindings/swig/include/proxy.swg 2015-04-09 09:54:13.273600000 +0300 -@@ -83,13 +83,14 @@ - - value = _swig_getattr(self, self.__class__, name) - -- # If we got back a different object than we have, we need to copy all our -- # metadata into it, so that it looks identical -+ /* If we got back a different object than we have, we need to copy all our -+ * metadata into it, so that it looks identical -+ */ - members = self.__dict__.get("_members") - if members is not None: - _copy_metadata_deep(value, members.get(name)) - -- # Verify that the new object is good -+ /* Verify that the new object is good */ - _assert_valid_deep(value) - - return value -@@ -98,9 +99,10 @@ - """Set an attribute on this object""" - self.assert_valid() - -- # Save a copy of the object, so that the garbage -- # collector won't kill the object while it's in -- # SWIG-land -+ /* Save a copy of the object, so that the garbage -+ * collector won't kill the object while it's in -+ * SWIG-land -+ */ - self.__dict__.setdefault("_members",{})[name] = value - - return _swig_setattr(self, self.__class__, name, value) -diff -Naur subversion-1.8.13-orig/subversion/bindings/swig/svn_delta.i subversion-1.8.13/subversion/bindings/swig/svn_delta.i ---- subversion-1.8.13-orig/subversion/bindings/swig/svn_delta.i 2012-09-23 18:12:33.000000000 +0400 -+++ subversion-1.8.13/subversion/bindings/swig/svn_delta.i 2015-04-09 09:55:21.553200000 +0300 -@@ -209,8 +209,9 @@ - - #ifdef SWIGPYTHON - %pythoncode { --# This function is for backwards compatibility only. --# Use svn_txdelta_window_t.ops instead. -+/* This function is for backwards compatibility only. -+ * Use svn_txdelta_window_t.ops instead. -+ */ - svn_txdelta_window_t_ops_get = svn_txdelta_window_t._ops_get - } - #endif diff --git a/subversion/18-fix-serf-config.patch b/subversion/18-fix-serf-config.patch new file mode 100644 index 00000000000..e8b70b20fc7 --- /dev/null +++ b/subversion/18-fix-serf-config.patch @@ -0,0 +1,23 @@ + + +From: David Rothenberger + + +--- + build/ac-macros/serf.m4 | 3 +-- + 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 +--- 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_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'`"] ++ LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs-only-L`"] + break + else + AC_MSG_RESULT([no]) diff --git a/subversion/19-remove-contrib-from-configure.patch b/subversion/19-remove-contrib-from-configure.patch new file mode 100644 index 00000000000..b6ada8a40e7 --- /dev/null +++ b/subversion/19-remove-contrib-from-configure.patch @@ -0,0 +1,22 @@ + + +From: David Rothenberger + + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4abcf41..89b7171 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1576,7 +1576,7 @@ AC_OUTPUT + if test "$abs_srcdir" != "$abs_builddir" + then + AC_MSG_NOTICE([Creating build directories]) +- (cd "$abs_srcdir"; find subversion tools contrib -type d) | xargs $MKDIR ++ (cd "$abs_srcdir"; find subversion tools -type d) | xargs $MKDIR + fi + + # ==== Print final messages to user ========================================== diff --git a/subversion/90-use-copy-instead-symlink.patch b/subversion/90-use-copy-instead-symlink.patch new file mode 100644 index 00000000000..7d92ad9ef0b --- /dev/null +++ b/subversion/90-use-copy-instead-symlink.patch @@ -0,0 +1,14 @@ +--- 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 @@ + INSTALL_EXTRA_TOOLS=\ + $(MKDIR) $(DESTDIR)$(bindir); \ + test -n "$$SVN_SVNMUCC_IS_SVNSYITF" && \ +- ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \ ++ cp -f svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \ + if test "$(DESTDIR)$(bindir)" != "$(DESTDIR)$(toolsdir)"; then \ +- ln -sf $(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \ +- 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 diff --git a/subversion/PKGBUILD b/subversion/PKGBUILD index eb461f396f1..b059f755dd5 100644 --- a/subversion/PKGBUILD +++ b/subversion/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Alexey Pavlov pkgname=subversion -pkgver=1.8.13 -pkgrel=2 +pkgver=1.9.1 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') url="http://subversion.apache.org/" @@ -33,34 +33,38 @@ source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc 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 - 18-fix-comment-quotes.patch - subversion-1.8.0-msys2.patch - remove-checking-symlink.patch) -md5sums=('4413417b529d7bdf82f74e50df02e88b' + 16-fix-swig3.patch + 17-fix-test-link.patch + 18-fix-serf-config.patch + 19-remove-contrib-from-configure.patch + subversion-1.9.1-msys2.patch + remove-checking-symlink.patch + 90-use-copy-instead-symlink.patch) +md5sums=('8e879b61fffe3ac0cf16aeae1e8eda32' 'SKIP' '07ee0cb01bdf8468cb8d4c22c0d6bc04' - 'dbf63cb39ddea409a37bc6647065fae9' - '779ba1926eb4ae336c82a3bb7c7d9405' - 'e72377cfd487e747802d3cac4791446a' - '3dd9bd4c57c117feb47a5b031fd8963d' - '4baa242af00a44ff7336f673b5ae6cb0' - '74cd0f3f6e1690446d9045af4a329283' - '87c5714962fe0aa2f681a74ea65b858e' + 'e5e1cdfc8a9a517ec26f53cf5b1092d1' + 'd5a64fa7b1ace1a170ee2de97de81763' + '47a6d32d3381b9f1c92a078e011f9e3c' + 'c36191a793567eb7f8228e6ae8e35981' + '03a0661dea16504bc3bd75abe5d30df5' + '31104af7c81202c9ab9da1053ccbdf11' + 'd2f9597e99e75cf24bc14dc45863aa13' '5c9424fa51cb6b45de95d977e468809c' - '62d78ade3ac905df83591f084ae8d279' - '0ed12264773291d1816790855edb8143' - '8e0e89f7b5d8b270c381503323ee83e2' - 'da2379bad17a4a8d9058ee77585a844b' - 'f8517036988cc78f881a9e016a3997d0' - '405c1bd35472a789c01ee2997da38af1' - '70ea60f69961e2282a28f3bbf2772d0a' - '906757eb7d836d91d8659621a2a8e6e8' - '75e6f9210afa69d1838d85169012a59f' - '7c608350472b2a398d861fc7fe139c75' - '97df6f58cc6b2d27d7870a5f7d5378f2' - 'be151d5feeab94774c1366382044f821') + '92a940b8bc107dbf92e00de6ba5500d2' + 'ad1452557f17bb9f187fcccc016de37c' + 'a77cffd068c482ca398444ab0c47bbe0' + '37d72c8e15b29372d0defa04b9660a8e' + '678c88e7e11d6a0a94d92cd0c89dad9d' + '017b144c3ed6da5108d7ffdbca4d0aa1' + '40e2da64e71a91c3cfa034e002c81566' + '662e8a845529ef82d90996ac27173fa4' + '02981c812b6d5dfa558144ac9c08f978' + '930c4d2b8e93f5c422db7a3be6f5ca93' + '097e41e35870212a2dd1d0a40b72da79' + '89b5ddbb3e49cedefc3f3187a124dd3e' + 'be151d5feeab94774c1366382044f821' + 'c02191c936e226cdbef25af9e5aac257') PYTHON_SITELIB=/usr/lib/python2.7/site-packages @@ -93,11 +97,13 @@ prepare() { 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}/18-fix-comment-quotes.patch - patch -p1 -i ${srcdir}/subversion-1.8.0-msys2.patch + patch -p1 -i ${srcdir}/16-fix-swig3.patch + patch -p1 -i ${srcdir}/17-fix-test-link.patch + patch -p1 -i ${srcdir}/18-fix-serf-config.patch + patch -p1 -i ${srcdir}/19-remove-contrib-from-configure.patch + patch -p1 -i ${srcdir}/subversion-1.9.1-msys2.patch patch -p1 -i ${srcdir}/remove-checking-symlink.patch + patch -p1 -i ${srcdir}/90-use-copy-instead-symlink.patch PYTHON=/usr/bin/python2 ./autogen.sh } @@ -116,6 +122,7 @@ build() { --without-gnome-keyring \ --enable-shared --disable-static \ --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \ + --disable-mod-activation \ --enable-disallowing-of-undefined-references \ --enable-local-library-preloading @@ -146,7 +153,7 @@ build() { package() { cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ + make -j1 DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ swig_pydir=${PYTHON_SITELIB}/libsvn \ swig_pydir_extra=${PYTHON_SITELIB}/svn \ install install-tools install-swig-py install-swig-pl install-swig-rb diff --git a/subversion/subversion-1.8.0-msys2.patch b/subversion/subversion-1.9.1-msys2.patch similarity index 95% rename from subversion/subversion-1.8.0-msys2.patch rename to subversion/subversion-1.9.1-msys2.patch index cf682c537d7..5ba9c605a3a 100644 --- a/subversion/subversion-1.8.0-msys2.patch +++ b/subversion/subversion-1.9.1-msys2.patch @@ -69,15 +69,6 @@ diff -Naur subversion-1.8.0-orig/configure.ac subversion-1.8.0/configure.ac AC_MSG_RESULT([yes]) LT_NO_UNDEFINED="-no-undefined" ;; -@@ -326,7 +326,7 @@ - - AC_MSG_CHECKING([whether to avoid circular linkage at all costs]) - case $host in -- *-*-cygwin*) -+ *-*-cygwin* | *-*-msys*) - AC_MSG_RESULT([yes]) - AC_DEFINE([SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK], 1, - [Define if circular linkage is not possible on this platform.]) diff -Naur subversion-1.8.0-orig/subversion/bindings/ctypes-python/test/remoterepos.py subversion-1.8.0/subversion/bindings/ctypes-python/test/remoterepos.py --- subversion-1.8.0-orig/subversion/bindings/ctypes-python/test/remoterepos.py 2011-08-12 00:56:26.000000000 +0400 +++ subversion-1.8.0/subversion/bindings/ctypes-python/test/remoterepos.py 2013-06-24 09:18:54.928711000 +0400 diff --git a/unrar/PKGBUILD b/unrar/PKGBUILD index 0b86beceb29..0ae9ab55320 100644 --- a/unrar/PKGBUILD +++ b/unrar/PKGBUILD @@ -2,7 +2,7 @@ pkgbase=unrar pkgname=('unrar' 'libunrar') -pkgver=5.2.7 +pkgver=5.3.4 pkgrel=1 arch=('i686' 'x86_64') groups=('base-devel') @@ -12,7 +12,7 @@ options=('staticlibs' '!makeflags') depends=('gcc-libs') source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz" 'build-dll.patch') -md5sums=('0c145e1ac47d428553123462c0740279' +md5sums=('60afbc74a97eff512a6c42425ec43bbf' '3f1c51c2ae7e0bd1ea02aaf904d61bd0') prepare() { diff --git a/zsh/PKGBUILD b/zsh/PKGBUILD index 2277455821a..95096d68dbf 100644 --- a/zsh/PKGBUILD +++ b/zsh/PKGBUILD @@ -2,14 +2,14 @@ pkgbase=zsh pkgname=('zsh' 'zsh-doc') -pkgver=5.0.7 -pkgrel=4 +pkgver=5.1.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.zsh.org/' license=('custom') makedepends=('ncurses-devel' 'pcre-devel' 'libiconv-devel' 'libgdbm-devel') -source=("http://www.zsh.org/pub/zsh-${pkgver}.tar.bz2" - "http://www.zsh.org/pub/zsh-${pkgver}-doc.tar.bz2" +source=("http://www.zsh.org/pub/zsh-${pkgver}.tar.gz" + "http://www.zsh.org/pub/zsh-${pkgver}-doc.tar.gz" 'config.guess::http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' 'config.sub::http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' 'zprofile' @@ -18,14 +18,14 @@ source=("http://www.zsh.org/pub/zsh-${pkgver}.tar.bz2" msysize.patch zsh-5.0.6-1.patch msys-symlink-hack.patch) -md5sums=('1cd396ce17952de50b8a89980d617f0a' - 'ec04d46211a20281778ddbbde9aa680f' - 'SKIP' - 'SKIP' +md5sums=('8ba28a9ef82e40c3a271602f18343b2f' + '6f961a67b21f15cfbd735639af25cab5' + '08478727a5b38779bc62b632166b9f7f' + 'b4b24b88055910a6b4dbb0f436af648e' '24a9335edf77252a7b5f52e079f7aef7' 'ca9d481e1aa03e864734734d2267afb0' - 'df6860fd5b5b46d59ad03220e9125c9d' - '72860740c3722a27daaea164db0e478e' + '51a8f2979ce99db238bc38c2f477df74' + 'edcafce2abb584422877327a9ca7b9de' '2b3f986cccd301534909b399557973a5' '79419542f6c2c33cb1a1e209fcd7e98c') diff --git a/zsh/add-pwd-W-option.patch b/zsh/add-pwd-W-option.patch index 4281c01e47b..ad575d04b9e 100644 --- a/zsh/add-pwd-W-option.patch +++ b/zsh/add-pwd-W-option.patch @@ -7,9 +7,9 @@ diff -rupN zsh-5.0.6/Src/builtin.c zsh-5.0.6-patch/Src/builtin.c BUILTIN("pushln", 0, bin_print, 0, -1, BIN_PRINT, NULL, "-nz"), - BUILTIN("pwd", 0, bin_pwd, 0, 0, 0, "rLP", NULL), + BUILTIN("pwd", 0, bin_pwd, 0, 0, 0, "rLPW", NULL), - BUILTIN("r", 0, bin_fc, 0, -1, BIN_R, "nrl", NULL), + BUILTIN("r", 0, bin_fc, 0, -1, BIN_R, "IlLnr", NULL), BUILTIN("read", 0, bin_read, 0, -1, 0, "cd:ek:%lnpqrst:%zu:AE", NULL), - BUILTIN("readonly", BINF_PLUSOPTS | BINF_MAGICEQUALS | BINF_PSPECIAL, bin_typeset, 0, -1, 0, "AE:%F:%HL:%R:%TUZ:%afghi:%lptux", "r"), + BUILTIN("readonly", BINF_PLUSOPTS | BINF_MAGICEQUALS | BINF_PSPECIAL | BINF_ASSIGN, (HandlerFunc)bin_typeset, 0, -1, 0, "AE:%F:%HL:%R:%TUZ:%afghi:%lptux", "r"), @@ -672,7 +672,21 @@ int doprintdir = 0; /* set in exec.c (f int bin_pwd(UNUSED(char *name), UNUSED(char **argv), Options ops, UNUSED(int func)) diff --git a/zsh/msysize.patch b/zsh/msysize.patch index 69df1c36d5d..7c5a00c78bb 100644 --- a/zsh/msysize.patch +++ b/zsh/msysize.patch @@ -112,10 +112,10 @@ diff -Naur zsh-5.0.7-orig/Src/mkmakemod.sh zsh-5.0.7/Src/mkmakemod.sh ;; * ) mdll="\$(dir_top)/$loc/${depbase}.\$(DL_EXT) " -diff -Naur zsh-5.0.7-orig/Test/C02cond.ztst zsh-5.0.7/Test/C02cond.ztst ---- zsh-5.0.7-orig/Test/C02cond.ztst 2014-05-16 22:21:25.000000000 +0300 -+++ zsh-5.0.7/Test/C02cond.ztst 2014-11-04 18:45:27.454400000 +0300 -@@ -94,7 +94,7 @@ +diff -Naur zsh-5.1.1-orig/Test/C02cond.ztst zsh-5.1.1/Test/C02cond.ztst +--- zsh-5.1.1-orig/Test/C02cond.ztst 2014-05-16 22:21:25.000000000 +0300 ++++ zsh-5.1.1/Test/C02cond.ztst 2014-11-04 18:45:27.454400000 +0300 +@@ -111,7 +111,7 @@ if (( EUID == 0 )); then print -u$ZTST_fd 'Warning: Not testing [[ ! -r file ]] (root reads anything)' [[ -r zerolength && -r unmodish ]] @@ -124,12 +124,12 @@ diff -Naur zsh-5.0.7-orig/Test/C02cond.ztst zsh-5.0.7/Test/C02cond.ztst print -u$ZTST_fd 'Warning: Not testing [[ ! -r file ]] (all files created by user may be readable)' [[ -r zerolength ]] -@@ -133,7 +133,7 @@ +@@ -150,7 +150,7 @@ sleep 2 - cat unmodified - touch newnewnew + cat $unmodified + touch $newnewnew - if [[ $OSTYPE == "cygwin" ]]; then + if [[ $OSTYPE == "cygwin" || $OSTYPE = msys ]]; then - print -u$ZTST_fd "Warning: not testing [[ -N file ]] (not supported on Cygwin)" - true - elif [[ "$(find . -prune -fstype nfs 2>/dev/null)" == "." ]]; then + ZTST_skip="[[ -N file ]] not supported on Cygwin" + elif (( isnfs )); then + ZTST_skip="[[ -N file ]] not supported with NFS"