From 83f457fbefbcc6957c2d2b86446dd38cca85a3b8 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Jun 18 2013 15:36:04 +0000 Subject: update to 1.8.0; switch to serf --- diff --git a/subversion-1.6.12-disable-client-test.patch b/subversion-1.6.12-disable-client-test.patch deleted file mode 100644 index 2d5da02..0000000 --- a/subversion-1.6.12-disable-client-test.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up subversion-1.6.12/subversion/bindings/swig/python/tests/run_all.py.disable-client-test subversion-1.6.12/subversion/bindings/swig/python/tests/run_all.py ---- subversion-1.6.12/subversion/bindings/swig/python/tests/run_all.py.disable-client-test 2010-07-23 09:30:31.951996475 -0400 -+++ subversion-1.6.12/subversion/bindings/swig/python/tests/run_all.py 2010-07-23 09:30:46.953930404 -0400 -@@ -9,7 +9,6 @@ def suite(): - suite = unittest.TestSuite() - suite.addTest(core.suite()) - suite.addTest(mergeinfo.suite()) -- suite.addTest(client.suite()) - suite.addTest(delta.suite()) - suite.addTest(pool.suite()) - suite.addTest(ra.suite()) diff --git a/subversion-1.6.5-newlines.patch b/subversion-1.6.5-newlines.patch deleted file mode 100644 index c127665..0000000 --- a/subversion-1.6.5-newlines.patch +++ /dev/null @@ -1,273 +0,0 @@ -diff -up svn2cl-0.11/svn2cl.xsl~ svn2cl-0.11/svn2cl.xsl ---- svn2cl-0.11/svn2cl.xsl~ 2008-12-21 17:41:20.000000000 +0200 -+++ svn2cl-0.11/svn2cl.xsl 2009-11-02 22:29:34.000000000 +0200 -@@ -55,12 +55,6 @@ - - --> - -- -- -- --]> -- - -@@ -119,7 +113,7 @@ - - - -- &newl; -+ - - - -@@ -149,33 +143,33 @@ - - - -- &newl; -+ - - - - -- &space;&space; -+ - - - -- &newl; -- &newl; -+ -+ - - - - - - -- &newl; -+ - - - - -- &space;&space; -+ - - - -- &newl;&newl; -+ - - - -@@ -187,7 +181,7 @@ - - [r - -- ]&space; -+ ] - - - -@@ -195,7 +189,7 @@ - - - -- &newl; -+ - - - -@@ -208,14 +202,14 @@ - - - -- &newl; -+ - -- &tab;*&space; -+ * - - - - -- -+ - - - -@@ -232,7 +226,7 @@ - - - -- &space; -+ - - - -@@ -306,7 +300,7 @@ - - - -- ,&space; -+ , - - - -@@ -324,7 +318,7 @@ - - - -- ,&space; -+ , - - - -@@ -382,23 +376,23 @@ - - - -- -+ - - -- -+ - - -- &tab;&space;&space; -+ - - -- -+ - - - - - - -- &newl; -+ - - - -@@ -420,7 +414,7 @@ - - - -- &newl;&tab;&space;&space; -+ - - - -@@ -449,26 +443,26 @@ - - - -- -+ - - - - - -- -+ - - - - - -- -+ - -- -+ - -- &newl;&newl; -+ - - -- -+ - - - -@@ -485,7 +479,7 @@ - - - -- &newl; -+ - - - -diff -up svn2cl-0.11/svn2html.xsl~ svn2cl-0.11/svn2html.xsl ---- svn2cl-0.11/svn2html.xsl~ 2008-12-21 17:41:20.000000000 +0200 -+++ svn2cl-0.11/svn2html.xsl 2009-11-02 22:30:11.000000000 +0200 -@@ -47,11 +47,6 @@ - - --> - -- -- --]> -- - - - -- &space; -+ - - - -@@ -145,7 +140,7 @@ -
  • - - -- &space; -+ - - -
    • -@@ -167,10 +162,10 @@ - - [r] - -- &space; -+ - - -- &space; -+ - - - -@@ -189,14 +184,14 @@ - - - -- -+ - -- -+ - -
    - - -- -+ - -     - diff --git a/subversion-1.7.0-kwallet.patch b/subversion-1.7.0-kwallet.patch deleted file mode 100644 index 624641e..0000000 --- a/subversion-1.7.0-kwallet.patch +++ /dev/null @@ -1,26 +0,0 @@ - -The first half of this is certainly upstream-worthy, but the second half is presumably -some Fedora-specific KDE packaging thing. It's not obvious how to get -kde4-config to report the directory which contains the .so files. - ---- subversion-1.7.0/build/ac-macros/kwallet.m4.kwallet 2010-11-01 19:29:16.000000000 +0000 -+++ subversion-1.7.0/build/ac-macros/kwallet.m4 2011-10-12 09:32:55.129561537 +0100 -@@ -64,15 +64,14 @@ AC_DEFUN(SVN_LIB_KWALLET, - fi - done - qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`" -- kde_dir="`$KDE4_CONFIG --prefix`" -- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include" -+ kde_include_dirs="-I`$KDE4_CONFIG --path include`" -+ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_include_dirs" - qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`" - SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options" - CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES" - LIBS="$LIBS $SVN_KWALLET_LIBS" - qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`" -- kde_lib_suffix="`$KDE4_CONFIG --libsuffix`" -- LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`" -+ LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs)` -L$libdir/kde4/devel" - AC_LANG(C++) - AC_LINK_IFELSE([AC_LANG_SOURCE([[ - #include diff --git a/subversion-1.7.10-aarch64.patch b/subversion-1.7.10-aarch64.patch deleted file mode 100644 index 646fbb8..0000000 --- a/subversion-1.7.10-aarch64.patch +++ /dev/null @@ -1,1111 +0,0 @@ - -https://bugzilla.redhat.com/show_bug.cgi?id=926578 - ---- subversion-1.7.10/build/config.guess.aarch64 -+++ subversion-1.7.10/build/config.guess -@@ -1,10 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2010-08-21' -+timestamp='2012-09-25' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,9 +17,7 @@ timestamp='2010-08-21' - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -57,8 +55,8 @@ GNU config.guess ($timestamp) - - Originally written by Per Bothner. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free --Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -+Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -92,7 +90,7 @@ if test $# != 0; then - exit 1 - fi - --trap 'exit 1' HUP INT TERM -+trap 'exit 1' 1 2 15 - - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a - # compiler to aid in system detection is discouraged as it requires -@@ -106,7 +104,7 @@ trap 'exit 1' HUP INT TERM - - set_cc_for_build=' - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; --trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ; -+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` | - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -181,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -202,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -224,7 +226,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -270,7 +272,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -296,12 +301,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -395,23 +400,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -481,8 +486,8 @@ EOF - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -495,7 +500,7 @@ EOF - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -595,52 +600,52 @@ EOF - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c -+ -+ #define _HPUX_SOURCE -+ #include -+ #include - -- #define _HPUX_SOURCE -- #include -- #include -- -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -- -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); -+ -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -731,22 +736,22 @@ EOF - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -770,14 +775,14 @@ EOF - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -789,30 +794,35 @@ EOF - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- case ${UNAME_MACHINE} in -- pc98) -- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) -- case ${UNAME_MACHINE} in -+ case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; -@@ -858,6 +868,13 @@ EOF - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -867,7 +884,7 @@ EOF - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -+ esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -@@ -879,20 +896,29 @@ EOF - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu -@@ -934,7 +960,7 @@ EOF - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu -@@ -960,7 +986,7 @@ EOF - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -969,16 +995,16 @@ EOF - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - tile*:Linux:*:*) -- echo ${UNAME_MACHINE}-tilera-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -987,11 +1013,11 @@ EOF - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1023,7 +1049,7 @@ EOF - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; -@@ -1051,13 +1077,13 @@ EOF - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i586. -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp -- exit ;; -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1092,8 +1118,8 @@ EOF - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ -@@ -1136,10 +1162,10 @@ EOF - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1165,11 +1191,11 @@ EOF - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1182,6 +1208,9 @@ EOF - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1234,7 +1263,10 @@ EOF - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1279,13 +1311,13 @@ EOF - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1303,11 +1335,11 @@ EOF - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c < - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - ---- subversion-1.7.10/build/config.sub.aarch64 -+++ subversion-1.7.10/build/config.sub -@@ -1,10 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2010-09-11' -+timestamp='2012-10-10' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,9 +21,7 @@ timestamp='2010-09-11' - # GNU General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -76,8 +74,8 @@ version="\ - GNU config.sub ($timestamp) - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free --Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -+Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -125,13 +123,17 @@ esac - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -154,12 +156,12 @@ case $os in - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray | -microblaze) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -- -bluegene*) -- os=-cnk -+ -bluegene*) -+ os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= -@@ -175,10 +177,10 @@ case $os in - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -@@ -223,6 +225,12 @@ case $os in - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -247,20 +255,25 @@ case $basic_machine in - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | be32 | be64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -+ | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -+ | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | mcore | mep | metag \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -286,22 +299,23 @@ case $basic_machine in - | nds32 | nds32le | nds32be \ - | nios | nios2 \ - | ns16k | ns32k \ -+ | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -- | rx \ -+ | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu | strongarm \ -- | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ -- | v850 | v850e \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ -- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -@@ -314,8 +328,7 @@ case $basic_machine in - c6x) - basic_machine=tic6x-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | picochip) -- # Motorola 68HC11/12. -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -325,6 +338,21 @@ case $basic_machine in - basic_machine=mt-unknown - ;; - -+ strongarm | thumb | xscale) -+ basic_machine=arm-unknown -+ ;; -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ xscaleeb) -+ basic_machine=armeb-unknown -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; -+ - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -@@ -339,11 +367,13 @@ case $basic_machine in - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -+ | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ -@@ -352,12 +382,15 @@ case $basic_machine in - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -+ | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -382,24 +415,26 @@ case $basic_machine in - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | romp-* | rs6000-* | rx-* \ -+ | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile-* | tilegx-* \ -+ | tile*-* \ - | tron-* \ - | ubicom32-* \ -- | v850-* | v850e-* | vax-* \ -+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -+ | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) -@@ -424,7 +459,7 @@ case $basic_machine in - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -507,7 +542,7 @@ case $basic_machine in - basic_machine=c90-cray - os=-unicos - ;; -- cegcc) -+ cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; -@@ -539,7 +574,7 @@ case $basic_machine in - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16) -+ cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; -@@ -697,7 +732,6 @@ case $basic_machine in - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; --# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -755,9 +789,13 @@ case $basic_machine in - basic_machine=ns32k-utek - os=-sysv - ;; -- microblaze) -+ microblaze*) - basic_machine=microblaze-xilinx - ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 -@@ -794,10 +832,18 @@ case $basic_machine in - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; -+ msys) -+ basic_machine=i386-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -862,10 +908,10 @@ case $basic_machine in - np1) - basic_machine=np1-gould - ;; -- neo-tandem) -+ neo-tandem) - basic_machine=neo-tandem - ;; -- nse-tandem) -+ nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) -@@ -950,9 +996,10 @@ case $basic_machine in - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -+ ppc | ppcbe) basic_machine=powerpc-unknown - ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -@@ -1046,6 +1093,9 @@ case $basic_machine in - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1102,13 +1152,8 @@ case $basic_machine in - basic_machine=t90-cray - os=-unicos - ;; -- # This must be matched before tile*. -- tilegx*) -- basic_machine=tilegx-unknown -- os=-linux-gnu -- ;; - tile*) -- basic_machine=tile-unknown -+ basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) -@@ -1178,6 +1223,9 @@ case $basic_machine in - xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; - ymp) - basic_machine=ymp-cray - os=-unicos -@@ -1275,11 +1323,11 @@ esac - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -- -auroraux) -- os=-auroraux -+ -auroraux) -+ os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` -@@ -1309,15 +1357,15 @@ case $os in - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- | -openbsd* | -solidbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-android* \ -- | -linux-newlib* | -linux-uclibc* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -@@ -1364,7 +1412,7 @@ case $os in - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; - -wince*) -@@ -1413,7 +1461,7 @@ case $os in - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1458,8 +1506,8 @@ case $os in - -dicos*) - os=-dicos - ;; -- -nacl*) -- ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1482,10 +1530,10 @@ else - # system, and we'll never get to this point. - - case $basic_machine in -- score-*) -+ score-*) - os=-elf - ;; -- spu-*) -+ spu-*) - os=-elf - ;; - *-acorn) -@@ -1497,8 +1545,11 @@ case $basic_machine in - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ hexagon-*) -+ os=-elf - ;; - tic54x-*) - os=-coff -@@ -1527,14 +1578,11 @@ case $basic_machine in - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -- mep-*) -+ mep-*) - os=-elf - ;; - mips*-cisco) -@@ -1561,7 +1609,7 @@ case $basic_machine in - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec) diff --git a/subversion-1.7.2-ruby19.patch b/subversion-1.7.2-ruby19.patch deleted file mode 100644 index 794c663..0000000 --- a/subversion-1.7.2-ruby19.patch +++ /dev/null @@ -1,365 +0,0 @@ -Date: Tue, 20 Dec 2011 21:08:00 -0800 -From: Vincent Batts -Subject: Re: [PATCH] enabling ruby in the subversion build -Message-ID: <20111221050800.GA17350@slackware.com> - ---- subversion-1.7.2/configure.ac.ruby19 -+++ subversion-1.7.2/configure.ac -@@ -1130,13 +1130,6 @@ if test "$RUBY" != "none"; then - - AC_SUBST(RUBY_MAJOR) - AC_SUBST(RUBY_MINOR) -- if test ! \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "8" \); then -- # Disallow Ruby 1.9 or later until the binding tests get fixed -- # to run with those versions. -- RUBY="none" -- AC_MSG_WARN([The detected Ruby is too new for Subversion to use]) -- AC_MSG_WARN([Only 1.8.x releases are supported at this time]) -- fi - else - AC_MSG_RESULT([no]) - RUBY="none" ---- subversion-1.7.2/Makefile.in.ruby19 -+++ subversion-1.7.2/Makefile.in -@@ -318,7 +318,7 @@ INSTALL_EXTRA_SWIG_RB=\ - $(INSTALL_DATA) "$$i" $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \ - done - --APXS = @APXS@ -+APXS = @APXS@ - - PYTHON = @PYTHON@ - PERL = @PERL@ -@@ -818,9 +818,14 @@ swig-rb: autogen-swig-rb - - check-swig-rb: swig-rb svnserve - cd $(SWIG_RB_DIR); \ -- $(RUBY) -I $(SWIG_RB_SRC_DIR) \ -- $(SWIG_RB_SRC_DIR)/test/run-test.rb \ -- --verbose=$(SWIG_RB_TEST_VERBOSE) -+ if [ "$(RUBY_MAJOR)" -eq 1 -a "$(RUBY_MINOR)" -lt 9 ] ; then \ -+ $(RUBY) -I $(SWIG_RB_SRC_DIR) \ -+ $(SWIG_RB_SRC_DIR)/test/run-test.rb \ -+ --verbose=$(SWIG_RB_TEST_VERBOSE); \ -+ else \ -+ $(RUBY) -I $(SWIG_RB_SRC_DIR) \ -+ $(SWIG_RB_SRC_DIR)/test/run-test.rb; \ -+ fi - - EXTRACLEAN_SWIG_RB=rm -f $(SWIG_RB_SRC_DIR)/svn_*.c $(SWIG_RB_SRC_DIR)/core.c - ---- subversion-1.7.2/subversion/bindings/swig/ruby/svn/info.rb.ruby19 -+++ subversion-1.7.2/subversion/bindings/swig/ruby/svn/info.rb -@@ -229,7 +229,9 @@ module Svn - - def parse_diff_unified(entry) - in_content = false -- entry.body.each do |line| -+ # accomodation for ruby 1.9 and 1.8 -+ each_meth = entry.body.respond_to?(:each_line) ? :each_line : :each -+ entry.body.send(each_meth) do |line| - case line - when /^@@/ - in_content = true ---- subversion-1.7.2/subversion/bindings/swig/ruby/svn/util.rb.ruby19 -+++ subversion-1.7.2/subversion/bindings/swig/ruby/svn/util.rb -@@ -36,7 +36,7 @@ module Svn - module Util #:nodoc: - module_function - def to_ruby_class_name(name) -- name.split("_").collect do |x| -+ name.to_s.split("_").collect do |x| - "#{x[0,1].upcase}#{x[1..-1].downcase}" - end.join("") - end ---- subversion-1.7.2/subversion/bindings/swig/ruby/test/my-assertions.rb.ruby19 -+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/my-assertions.rb -@@ -24,20 +24,33 @@ module Test - module Unit - module Assertions - -+ # make an intermediary assertion block handler -+ def _my_assert_block(&block) -+ if RUBY_VERSION > '1.9' -+ assert_block do -+ yield -+ end -+ else -+ _wrap_assertion do -+ yield -+ end -+ end -+ end -+ - def assert_true(boolean, message=nil) -- _wrap_assertion do -+ _my_assert_block do - assert_equal(true, boolean, message) - end - end - - def assert_false(boolean, message=nil) -- _wrap_assertion do -+ _my_assert_block do - assert_equal(false, boolean, message) - end - end - - def assert_nested_sorted_array(expected, actual, message=nil) -- _wrap_assertion do -+ _my_assert_block do - assert_equal(expected.collect {|elem| elem.sort}, - actual.collect {|elem| elem.sort}, - message) -@@ -45,7 +58,7 @@ module Test - end - - def assert_equal_log_entries(expected, actual, message=nil) -- _wrap_assertion do -+ _my_assert_block do - actual = actual.collect do |entry| - changed_paths = entry.changed_paths - changed_paths.each_key do |path| ---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_client.rb.ruby19 -+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_client.rb -@@ -2203,7 +2203,11 @@ class SvnClientTest < Test::Unit::TestCa - - make_context(log) do |ctx| - items = nil -- ctx.set_log_msg_func do |items| -+ ctx.set_log_msg_func do |l_items| -+ # ruby 1.8 magically carried the assignment of 'items' back from this Proc block, -+ # but in 1.9, we need to have names that don't conflict, and set the outside 'items'. -+ # This works in 1.8 as well -+ items = l_items - [true, log] - end - ---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_core.rb.ruby19 -+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_core.rb -@@ -1,3 +1,4 @@ -+# encoding: UTF-8 - # ==================================================================== - # Licensed to the Apache Software Foundation (ASF) under one - # or more contributor license agreements. See the NOTICE file -@@ -52,7 +53,13 @@ class SvnCoreTest < Test::Unit::TestCase - now = Time.now.gmtime - str = now.strftime("%Y-%m-%dT%H:%M:%S.") + "#{now.usec}Z" - -- assert_equal(now, Time.from_svn_format(str)) -+ if RUBY_VERSION > '1.9' -+ # ruby 1.9 Time comparison gets into the nano-seconds, that strftime -+ # shaves off. So we can compare epoch time instead -+ assert_equal(now.to_i, Time.from_svn_format(str).gmtime.to_i) -+ else -+ assert_equal(now, Time.from_svn_format(str).gmtime) -+ end - - apr_time = now.to_i * 1000000 + now.usec - assert_equal(apr_time, now.to_apr_time) -@@ -244,7 +251,11 @@ class SvnCoreTest < Test::Unit::TestCase - config_infos << [section, name, value] - end - assert_equal(infos.sort, config_infos.sort) -- assert_equal(infos.sort, config.collect {|args| args}.sort) -+ if RUBY_VERSION > '1.9' -+ assert_equal(infos.sort, config.collect {|sect,name,val| [sect,name,val]}.sort) -+ else -+ assert_equal(infos.sort, config.collect {|args| args}.sort) -+ end - end - - def test_config_find_group -@@ -532,7 +543,13 @@ EOD - date_str = now.strftime("%Y-%m-%dT%H:%M:%S") - date_str << ".#{now.usec}Z" - info.date = date_str -- assert_equal(now, info.date) -+ if RUBY_VERSION > '1.9' -+ # ruby 1.9 Time comparison gets into the nano-seconds, that strftime -+ # shaves off. So we can compare epoch time instead -+ assert_equal(now.to_i, info.date.gmtime.to_i) -+ else -+ assert_equal(now, info.date.gmtime) -+ end - end - - def test_svn_prop ---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_delta.rb.ruby19 -+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_delta.rb -@@ -17,9 +17,10 @@ - # under the License. - # ==================================================================== - -+require "my-assertions" - require "util" - require "stringio" --require 'md5' -+require 'digest/md5' - require 'tempfile' - - require "svn/info" -@@ -46,8 +47,8 @@ class SvnDeltaTest < Test::Unit::TestCas - target = StringIO.new(t) - stream = Svn::Delta::TextDeltaStream.new(source, target) - assert_nil(stream.md5_digest) -- _wrap_assertion do -- stream.each do |window| -+ _my_assert_block do -+ ret = stream.each do |window| - window.ops.each do |op| - op_size = op.offset + op.length - case op.action_code -@@ -62,8 +63,9 @@ class SvnDeltaTest < Test::Unit::TestCas - end - end - end -+ true if RUBY_VERSION > '1.9' # this block returns nil in > ruby '1.9' - end -- assert_equal(MD5.new(t).hexdigest, stream.md5_digest) -+ assert_equal(Digest::MD5.hexdigest(t), stream.md5_digest) - end - - def test_txdelta_window_compose -@@ -81,7 +83,7 @@ class SvnDeltaTest < Test::Unit::TestCas - end - end - -- _wrap_assertion do -+ assert_block do - composed_window.ops.each do |op| - op_size = op.offset + op.length - case op.action_code -@@ -169,6 +171,7 @@ - stream = Svn::Delta::TextDeltaStream.new(source, target) - - output = StringIO.new("") -+ output.set_encoding Encoding::ASCII_8BIT if output.respond_to? :set_encoding - handler = Svn::Delta.svndiff_handler(output) - - Svn::Delta.send(target_text, handler) ---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_fs.rb.ruby19 -+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_fs.rb -@@ -20,7 +20,7 @@ - require "my-assertions" - require "util" - require "time" --require "md5" -+require "digest/md5" - - require "svn/core" - require "svn/fs" -@@ -49,14 +49,15 @@ class SvnFsTest < Test::Unit::TestCase - - assert(!File.exist?(path)) - fs = nil -- callback = Proc.new do |fs| -+ callback = Proc.new do |t_fs| - assert(File.exist?(path)) - assert_equal(fs_type, Svn::Fs.type(path)) -- fs.set_warning_func do |err| -+ t_fs.set_warning_func do |err| - p err - abort - end -- assert_equal(path, fs.path) -+ assert_equal(path, t_fs.path) -+ fs = t_fs - end - yield(:create, [path, config], callback) - -@@ -162,7 +163,7 @@ class SvnFsTest < Test::Unit::TestCase - - assert_equal(src, @fs.root.file_contents(path_in_repos){|f| f.read}) - assert_equal(src.length, @fs.root.file_length(path_in_repos)) -- assert_equal(MD5.new(src).hexdigest, -+ assert_equal(Digest::MD5.hexdigest(src), - @fs.root.file_md5_checksum(path_in_repos)) - - assert_equal([path_in_repos], @fs.root.paths_changed.keys) -@@ -364,7 +365,7 @@ class SvnFsTest < Test::Unit::TestCase - - File.open(path, "w") {|f| f.print(modified)} - @fs.transaction do |txn| -- checksum = MD5.new(normalize_line_break(result)).hexdigest -+ checksum = Digest::MD5.hexdigest(normalize_line_break(result)) - stream = txn.root.apply_text(path_in_repos, checksum) - stream.write(normalize_line_break(result)) - stream.close -@@ -392,8 +393,8 @@ class SvnFsTest < Test::Unit::TestCase - - File.open(path, "w") {|f| f.print(modified)} - @fs.transaction do |txn| -- base_checksum = MD5.new(normalize_line_break(src)).hexdigest -- checksum = MD5.new(normalize_line_break(result)).hexdigest -+ base_checksum = Digest::MD5.hexdigest(normalize_line_break(src)) -+ checksum = Digest::MD5.hexdigest(normalize_line_break(result)) - handler = txn.root.apply_textdelta(path_in_repos, - base_checksum, checksum) - assert_raises(Svn::Error::ChecksumMismatch) do ---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_repos.rb.ruby19 -+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_repos.rb -@@ -98,11 +98,12 @@ class SvnReposTest < Test::Unit::TestCas - fs_type = Svn::Fs::TYPE_FSFS - fs_config = {Svn::Fs::CONFIG_FS_TYPE => fs_type} - repos = nil -- Svn::Repos.create(tmp_repos_path, {}, fs_config) do |repos| -+ Svn::Repos.create(tmp_repos_path, {}, fs_config) do |t_repos| - assert(File.exist?(tmp_repos_path)) -- fs_type_path = File.join(repos.fs.path, Svn::Fs::CONFIG_FS_TYPE) -+ fs_type_path = File.join(t_repos.fs.path, Svn::Fs::CONFIG_FS_TYPE) - assert_equal(fs_type, File.open(fs_type_path) {|f| f.read.chop}) -- repos.fs.set_warning_func(&warning_func) -+ t_repos.fs.set_warning_func(&warning_func) -+ repos = t_repos - end - - assert(repos.closed?) ---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test-unit-ext/priority.rb.ruby19 -+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test-unit-ext/priority.rb -@@ -179,7 +179,7 @@ module Test - apply_priority - !@tests.empty? - end -- end -+ end if RUBY_VERSION < '1.9.3' - - class AutoRunner - alias_method :original_options, :options ---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test-unit-ext.rb.ruby19 -+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test-unit-ext.rb -@@ -17,7 +17,7 @@ - # under the License. - # ==================================================================== - --require "test-unit-ext/always-show-result" -+require "test-unit-ext/always-show-result" if RUBY_VERSION < '1.9.3' - require "test-unit-ext/priority" --require "test-unit-ext/backtrace-filter" --require "test-unit-ext/long-display-for-emacs" -+require "test-unit-ext/backtrace-filter" if RUBY_VERSION < '1.9.3' -+require "test-unit-ext/long-display-for-emacs" if RUBY_VERSION < '1.9.3' ---- subversion-1.7.2/subversion/bindings/swig/ruby/test/test_wc.rb.ruby19 -+++ subversion-1.7.2/subversion/bindings/swig/ruby/test/test_wc.rb -@@ -530,7 +530,7 @@ EOE - ctx.ci(lf_path) - - Svn::Wc::AdmAccess.open(nil, @wc_path, true, 5) do |access| -- _wrap_assertion do -+ _my_assert_block do - File.open(src_path, "wb") {|f| f.print(source)} - args = [method_name, src_path, crlf_path, Svn::Wc::TRANSLATE_FROM_NF] - result = yield(access.send(*args), source) -@@ -1084,7 +1084,11 @@ EOE - assert_not_nil context - assert_kind_of Svn::Wc::Context, context - end -- assert_nil result; -+ if RUBY_VERSION > '1.9' -+ assert_equal(result,true) -+ else -+ assert_nil result -+ end - end - end - diff --git a/subversion-1.7.4-kwallet2.patch b/subversion-1.7.4-kwallet2.patch deleted file mode 100644 index d27df98..0000000 --- a/subversion-1.7.4-kwallet2.patch +++ /dev/null @@ -1,16 +0,0 @@ - -Possible fix/workaround for dubious pointer derefs in #810861. - ---- subversion-1.7.4/subversion/libsvn_auth_kwallet/kwallet.cpp.kwallet -+++ subversion-1.7.4/subversion/libsvn_auth_kwallet/kwallet.cpp -@@ -175,6 +175,10 @@ kwallet_terminate(void *data) - "kwallet-initialized", - APR_HASH_KEY_STRING, - NULL); -+ apr_hash_set(parameters, -+ "kwallet-wallet", -+ APR_HASH_KEY_STRING, -+ NULL); - } - return APR_SUCCESS; - } diff --git a/subversion-1.7.4-sqlitever.patch b/subversion-1.7.4-sqlitever.patch deleted file mode 100644 index 20e60cb..0000000 --- a/subversion-1.7.4-sqlitever.patch +++ /dev/null @@ -1,22 +0,0 @@ - -Patch out strict version requirements for sqlite. - -https://bugzilla.redhat.com/show_bug.cgi?id=815396 - ---- subversion-1.7.4/subversion/libsvn_subr/sqlite.c.sqlitever -+++ subversion-1.7.4/subversion/libsvn_subr/sqlite.c -@@ -740,14 +740,6 @@ static volatile svn_atomic_t sqlite_init - static svn_error_t * - init_sqlite(void *baton, apr_pool_t *pool) - { -- if (sqlite3_libversion_number() < SQLITE_VERSION_NUMBER) -- { -- return svn_error_createf( -- SVN_ERR_SQLITE_ERROR, NULL, -- _("SQLite compiled for %s, but running with %s"), -- SQLITE_VERSION, sqlite3_libversion()); -- } -- - #if APR_HAS_THREADS - - /* SQLite 3.5 allows verification of its thread-safety at runtime. diff --git a/subversion-1.7.9-rubybind.patch b/subversion-1.7.9-rubybind.patch deleted file mode 100644 index 85fd7e4..0000000 --- a/subversion-1.7.9-rubybind.patch +++ /dev/null @@ -1,24 +0,0 @@ - -Try a little harder to avoid svnserve() bind failures. - ---- subversion-1.7.9/subversion/bindings/swig/ruby/test/util.rb.rubybind -+++ subversion-1.7.9/subversion/bindings/swig/ruby/test/util.rb -@@ -41,7 +41,8 @@ module SvnTestUtil - @full_repos_path = File.expand_path(@repos_path) - @repos_uri = "file://#{@full_repos_path.sub(/^\/?/, '/')}" - @svnserve_host = "127.0.0.1" -- @svnserve_ports = (64152..64282).collect{|x| x.to_s} -+ sport = (50000 + rand(100) * 100) -+ @svnserve_ports = (sport..sport + 99).collect{|x| x.to_s} - @wc_base_dir = File.join(Dir.tmpdir, "wc-tmp") - @wc_path = File.join(@wc_base_dir, "wc") - @full_wc_path = File.expand_path(@wc_path) -@@ -249,6 +250,8 @@ realm = #{@realm} - "--listen-port", port, - "-d", "--foreground") - } -+ # wait a while for svnserve to attempt a bind() and possibly fail -+ sleep(1) - pid, status = Process.waitpid2(@svnserve_pid, Process::WNOHANG) - if status and status.exited? - if $DEBUG diff --git a/subversion-1.7.9-swighash.patch b/subversion-1.7.9-swighash.patch deleted file mode 100644 index 66ff5ec..0000000 --- a/subversion-1.7.9-swighash.patch +++ /dev/null @@ -1,23 +0,0 @@ - -http://svn.apache.org/viewvc?view=revision&revision=1327373 - ---- subversion-1.7.9/subversion/bindings/swig/ruby/test/test_wc.rb.swighash -+++ subversion-1.7.9/subversion/bindings/swig/ruby/test/test_wc.rb -@@ -326,12 +326,16 @@ class SvnWcTest < Test::Unit::TestCase - ignored_errors = [] - callbacks.ignored_errors = ignored_errors - access.walk_entries(@wc_path, callbacks) -+ sorted_ignored_errors = ignored_errors.sort_by {|path, err| path} -+ sorted_ignored_errors = sorted_ignored_errors.collect! do |path, err| -+ [path, err.class] -+ end - assert_equal([ - [@wc_path, Svn::Error::Cancelled], - [path1, Svn::Error::Cancelled], - [path2, Svn::Error::Cancelled], - ], -- ignored_errors.collect {|path, err| [path, err.class]}) -+ sorted_ignored_errors) - end - end - end diff --git a/subversion-1.8.0-aarch64.patch b/subversion-1.8.0-aarch64.patch new file mode 100644 index 0000000..c3bd313 --- /dev/null +++ b/subversion-1.8.0-aarch64.patch @@ -0,0 +1,296 @@ + +Update for aarch64. + +https://bugzilla.redhat.com/show_bug.cgi?id=926578 + +--- subversion-1.8.0/build/config.guess.aarch64 ++++ subversion-1.8.0/build/config.guess +@@ -2,9 +2,9 @@ + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +-# 2011 Free Software Foundation, Inc. ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2011-10-01' ++timestamp='2012-06-10' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ timestamp='2011-10-01' + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -57,8 +55,8 @@ GNU config.guess ($timestamp) + + Originally written by Per Bothner. + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +-Software Foundation, Inc. ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` | + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -806,6 +804,9 @@ EOF + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 +@@ -860,6 +861,13 @@ EOF + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +@@ -894,16 +902,16 @@ EOF + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) +- echo hexagon-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu +@@ -945,7 +953,7 @@ EOF + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu +@@ -986,7 +994,7 @@ EOF + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -1248,7 +1256,7 @@ EOF + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1317,6 +1325,9 @@ EOF + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 +--- subversion-1.8.0/build/config.sub.aarch64 ++++ subversion-1.8.0/build/config.sub +@@ -2,9 +2,9 @@ + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +-# 2011 Free Software Foundation, Inc. ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2011-10-08' ++timestamp='2012-04-18' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ timestamp='2011-10-08' + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -76,8 +74,8 @@ version="\ + GNU config.sub ($timestamp) + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +-Software Foundation, Inc. ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -132,6 +130,10 @@ case $maybe_os in + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -223,6 +225,12 @@ case $os in + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -247,6 +255,7 @@ case $basic_machine in + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +@@ -295,7 +304,7 @@ case $basic_machine in + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ +- | rx \ ++ | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +@@ -319,8 +328,7 @@ case $basic_machine in + c6x) + basic_machine=tic6x-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12 | picochip) +- # Motorola 68HC11/12. ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -333,7 +341,10 @@ case $basic_machine in + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; +- ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; + xscaleeb) + basic_machine=armeb-unknown + ;; +@@ -356,6 +367,7 @@ case $basic_machine in + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ +@@ -407,7 +419,7 @@ case $basic_machine in + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* | rx-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ +@@ -719,7 +731,6 @@ case $basic_machine in + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -816,6 +827,10 @@ case $basic_machine in + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs +@@ -1343,7 +1358,7 @@ case $os in + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ +@@ -1528,6 +1543,9 @@ case $basic_machine in + c4x-* | tic4x-*) + os=-coff + ;; ++ hexagon-*) ++ os=-elf ++ ;; + tic54x-*) + os=-coff + ;; +@@ -1555,9 +1573,6 @@ case $basic_machine in + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout diff --git a/subversion-1.8.0-kwallet.patch b/subversion-1.8.0-kwallet.patch new file mode 100644 index 0000000..7e1297a --- /dev/null +++ b/subversion-1.8.0-kwallet.patch @@ -0,0 +1,26 @@ + +The first half of this is certainly upstream-worthy, but the second half is presumably +some Fedora-specific KDE packaging thing. It's not obvious how to get +kde4-config to report the directory which contains the .so files. + +--- subversion-1.8.0/build/ac-macros/kwallet.m4.kwallet ++++ subversion-1.8.0/build/ac-macros/kwallet.m4 +@@ -63,15 +63,15 @@ AC_DEFUN(SVN_LIB_KWALLET, + fi + done + qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`" +- kde_dir="`$KDE4_CONFIG --prefix`" +- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include" ++ kde_include_dirs="-I`$KDE4_CONFIG --path include`" ++ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_include_dirs" + qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`" + SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options" + CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES" + LIBS="$LIBS $SVN_KWALLET_LIBS" + qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`" + kde_lib_suffix="`$KDE4_CONFIG --libsuffix`" +- LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`" ++ LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs)` -L$libdir/kde4/devel" + AC_LANG(C++) + AC_LINK_IFELSE([AC_LANG_SOURCE([[ + #include diff --git a/subversion-1.8.0-rubybind.patch b/subversion-1.8.0-rubybind.patch new file mode 100644 index 0000000..de9288a --- /dev/null +++ b/subversion-1.8.0-rubybind.patch @@ -0,0 +1,24 @@ + +Try a little harder to avoid svnserve() bind failures. + +--- subversion-1.8.0/subversion/bindings/swig/ruby/test/util.rb.rubybind ++++ subversion-1.8.0/subversion/bindings/swig/ruby/test/util.rb +@@ -39,7 +39,8 @@ module SvnTestUtil + @realm = "sample realm" + + @svnserve_host = "127.0.0.1" +- @svnserve_ports = (64152..64282).collect{|x| x.to_s} ++ sport = (50000 + rand(100) * 100) ++ @svnserve_ports = (sport..sport + 99).collect{|x| x.to_s} + + @tmp_path = Dir.mktmpdir + @wc_path = File.join(@tmp_path, "wc") +@@ -252,6 +253,8 @@ realm = #{@realm} + "--listen-port", port, + "-d", "--foreground") + } ++ # wait a while for svnserve to attempt a bind() and possibly fail ++ sleep(1) + pid, status = Process.waitpid2(@svnserve_pid, Process::WNOHANG) + if status and status.exited? + if $DEBUG diff --git a/subversion-MakeMaker.patch b/subversion-MakeMaker.patch deleted file mode 100644 index 438d0db..0000000 --- a/subversion-MakeMaker.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in.eemm subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in ---- subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in.eemm 2011-07-01 17:56:05.861063423 +0200 -+++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in 2011-07-01 17:56:28.675942207 +0200 -@@ -43,7 +43,7 @@ chomp $apr_shlib_path_var; - my %config = ( - ABSTRACT => 'Perl bindings for Subversion', - DEFINE => $cppflags, -- CCFLAGS => $cflags, -+ CCFLAGS => join(' ', $cflags, $Config{ccflags}), - INC => join(' ',$apr_cflags, $apu_cflags, - " -I$swig_srcdir/perl/libsvn_swig_perl", - " -I$svnlib_srcdir/include", diff --git a/subversion.spec b/subversion.spec index 958310a..f2df6fe 100644 --- a/subversion.spec +++ b/subversion.spec @@ -25,7 +25,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion -Version: 1.7.10 +Version: 1.8.0 Release: 1%{?dist} License: ASL 2.0 Group: Development/Tools @@ -40,22 +40,20 @@ Source7: svnserve.tmpfiles Source8: svnserve.sysconf Patch1: subversion-1.7.0-rpath.patch Patch2: subversion-1.7.0-pie.patch -Patch3: subversion-1.7.0-kwallet.patch -Patch4: subversion-1.7.2-ruby19.patch -Patch7: subversion-1.7.4-kwallet2.patch -Patch8: subversion-1.7.4-sqlitever.patch -Patch9: subversion-1.7.9-rubybind.patch -Patch10: subversion-1.7.9-swighash.patch -Patch11: subversion-1.7.10-aarch64.patch +Patch3: subversion-1.8.0-kwallet.patch +Patch9: subversion-1.8.0-rubybind.patch +Patch11: subversion-1.8.0-aarch64.patch BuildRequires: autoconf, libtool, python, python-devel, texinfo, which BuildRequires: %{dbdevel} >= 4.1.25, swig >= 1.3.24, gettext BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0 -BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel +BuildRequires: libserf-devel >= 0:0.24.7-1, cyrus-sasl-devel BuildRequires: sqlite-devel >= 3.4.0, file-devel, systemd-units BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: svn = %{version}-%{release} Requires: subversion-libs%{?_isa} = %{version}-%{release} Requires(post): systemd-sysv, /sbin/chkconfig +# For installation of any crypto backend to make tests work +Requires: apr-util-openssl %define __perl_requires %{SOURCE3} @@ -181,11 +179,7 @@ This package includes supplementary tools for use with Subversion. %patch1 -p1 -b .rpath %patch2 -p1 -b .pie %patch3 -p1 -b .kwallet -%patch4 -p1 -b .ruby -%patch7 -p1 -b .kwallet2 -%patch8 -p1 -b .sqlitever %patch9 -p1 -b .rubybind -%patch10 -p1 -b .swighash %patch11 -p1 -b .aarch64 %build @@ -209,14 +203,15 @@ export svn_cv_ruby_sitedir_archsuffix="" sed -i 's/-fpie/-fPIE/' Makefile.in %endif -export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS -DSVN_SQLITE_MIN_VERSION_NUMBER=3007012 \ + -DSVN_SQLITE_MIN_VERSION=\\\"3.7.12\\\"" +export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ - --with-swig --with-neon=%{_prefix} \ + --with-swig --with-serf=%{_prefix} \ --with-ruby-sitedir=%{ruby_vendorarchdir} \ --with-ruby-test-verbose=verbose \ --with-apxs=%{_httpd_apxs} --disable-mod-activation \ --disable-static --with-sasl=%{_prefix} \ - --disable-neon-version-check \ --with-libmagic=%{_prefix} \ --with-gnome-keyring \ %if %{with_java} @@ -473,6 +468,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Tue Jun 18 2013 Joe Orton - 1.8.0-1 +- update to 1.8.0; switch to serf + * Mon Jun 3 2013 Joe Orton - 1.7.10-1 - update to 1.7.10 (#970014) - fix aarch64 build issues (Dennis Gilmore, #926578)