Index: build/ac-macros/neon.m4 =================================================================== --- build/ac-macros/neon.m4 (revision 32947) +++ build/ac-macros/neon.m4 (working copy) @@ -50,16 +50,6 @@ NEON_VERSION=`cat $abs_srcdir/neon/.version` AC_MSG_RESULT([$NEON_VERSION]) - if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-9]\.'`"] ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1], - [Define to 1 if you have Neon 0.26 or later.]) - fi - - if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-9]\.'`"] ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1], - [Define to 1 if you have Neon 0.27 or later.]) - fi - if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[8-9]\.'`"] ; then AC_DEFINE_UNQUOTED([SVN_NEON_0_28], [1], [Define to 1 if you have Neon 0.28 or later.]) @@ -133,16 +123,6 @@ NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'` AC_MSG_RESULT([$NEON_VERSION]) - if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-9]\.'`"] ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1], - [Define to 1 if you have Neon 0.26 or later.]) - fi - - if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-9]\.'`"] ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1], - [Define to 1 if you have Neon 0.27 or later.]) - fi - if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[8-9]\.'`"] ; then AC_DEFINE_UNQUOTED([SVN_NEON_0_28], [1], [Define to 1 if you have Neon 0.28 or later.]) Index: build/generator/gen_win.py =================================================================== --- build/generator/gen_win.py (revision 32947) +++ build/generator/gen_win.py (working copy) @@ -41,7 +41,7 @@ self.bdb_path = 'db4-win32' self.without_neon = False self.neon_path = 'neon' - self.neon_ver = 25005 + self.neon_ver = 27000 self.httpd_path = None self.libintl_path = None self.zlib_path = 'zlib' @@ -763,14 +763,6 @@ if self.enable_nls: fakedefines.append("ENABLE_NLS") - # check for neon 0.26.x or newer - if self.neon_ver >= 26000: - fakedefines.append("SVN_NEON_0_26=1") - - # check for neon 0.27.x or newer - if self.neon_ver >= 27000: - fakedefines.append("SVN_NEON_0_27=1") - # check for neon 0.28.x or newer if self.neon_ver >= 28000: fakedefines.append("SVN_NEON_0_28=1") @@ -1269,8 +1261,8 @@ # build/ac-macros/swig.m4 explains the next incantation self.neon_ver = int('%d%02d%03d' % version) msg = 'Found neon version %d.%d.%d\n' % version - if self.neon_ver < 25005: - msg = 'WARNING: Neon version 0.25.5 or higher is required' + if self.neon_ver < 27000: + msg = 'WARNING: Neon version 0.27.0 or higher is required' except: msg = 'WARNING: Error while determining neon version\n' self.neon_lib = None Index: subversion/libsvn_subr/config_file.c =================================================================== --- subversion/libsvn_subr/config_file.c (revision 32947) +++ subversion/libsvn_subr/config_file.c (working copy) @@ -2,7 +2,7 @@ * config_file.c : parsing configuration files * * ==================================================================== - * Copyright (c) 2000-2004 CollabNet. All rights reserved. + * Copyright (c) 2000-2004, 2008 CollabNet. All rights reserved. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -737,9 +737,7 @@ NL "### http-compression Whether to compress HTTP requests" NL "### neon-debug-mask Debug mask for Neon HTTP library" NL -#ifdef SVN_NEON_0_26 "### http-auth-types Auth types to use for HTTP library"NL -#endif "### ssl-authority-files List of files, each of a trusted CAs" NL "### ssl-trust-default-ca Trust the system 'default' CAs" NL @@ -840,9 +838,7 @@ "# http-proxy-username = blah" NL "# http-proxy-password = doubleblah" NL "# http-timeout = 60" NL -#ifdef SVN_NEON_0_26 "# http-auth-types = basic;digest;negotiate" NL -#endif "# neon-debug-mask = 130" NL "# store-plaintext-passwords = no" NL "# username = harry" NL @@ -881,9 +877,7 @@ "# http-proxy-username = defaultusername" NL "# http-proxy-password = defaultpassword" NL "# http-compression = no" NL -#ifdef SVN_NEON_0_26 "# http-auth-types = basic;digest;negotiate" NL -#endif "# No http-timeout, so just use the builtin default." NL "# No neon-debug-mask, so neon debugging is disabled." NL "# ssl-authority-files = /path/to/CAcert.pem;/path/to/CAcert2.pem" NL Index: subversion/libsvn_ra_neon/util.c =================================================================== --- subversion/libsvn_ra_neon/util.c (revision 32947) +++ subversion/libsvn_ra_neon/util.c (working copy) @@ -1,8 +1,8 @@ /* - * util.c : utility functions for the RA/DAV library + * util.c : utility functions for the RA/Neon library * * ==================================================================== - * Copyright (c) 2000-2007 CollabNet. All rights reserved. + * Copyright (c) 2000-2008 CollabNet. All rights reserved. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -568,16 +568,11 @@ } case NE_AUTH: errcode = SVN_ERR_RA_NOT_AUTHORIZED; -#ifdef SVN_NEON_0_27 - /* neon >= 0.27 gives a descriptive error message after auth - * failure; expose this since it's a useful diagnostic e.g. for - * an unsupported challenge scheme, or a local GSSAPI error due - * to an expired ticket. */ + /* Neon gives a descriptive error message after auth failure. Expose + * this since it's a useful diagnostic e.g. for an unsupported challenge + * scheme, or a local GSSAPI error due to an expired ticket. */ SVN_ERR(svn_utf_cstring_to_utf8(&msg, ne_get_error(req->ne_sess), pool)); msg = apr_psprintf(pool, _("authorization failed: %s"), msg); -#else - msg = _("authorization failed"); -#endif break; case NE_CONNECT: Index: subversion/libsvn_ra_neon/session.c =================================================================== --- subversion/libsvn_ra_neon/session.c (revision 32947) +++ subversion/libsvn_ra_neon/session.c (working copy) @@ -2,7 +2,7 @@ * session.c : routines for maintaining sessions state (to the DAV server) * * ==================================================================== - * Copyright (c) 2000-2006 CollabNet. All rights reserved. + * Copyright (c) 2000-2006, 2008 CollabNet. All rights reserved. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -486,10 +486,8 @@ SVN_CONFIG_OPTION_HTTP_COMPRESSION, TRUE)); svn_config_get(cfg, &debug_str, SVN_CONFIG_SECTION_GLOBAL, SVN_CONFIG_OPTION_NEON_DEBUG_MASK, NULL); -#ifdef SVN_NEON_0_26 svn_config_get(cfg, &http_auth_types, SVN_CONFIG_SECTION_GLOBAL, SVN_CONFIG_OPTION_HTTP_AUTH_TYPES, NULL); -#endif svn_config_get(cfg, pk11_provider, SVN_CONFIG_SECTION_GLOBAL, SVN_CONFIG_OPTION_SSL_PKCS11_PROVIDER, NULL); @@ -516,10 +514,8 @@ *compression)); svn_config_get(cfg, &debug_str, server_group, SVN_CONFIG_OPTION_NEON_DEBUG_MASK, debug_str); -#ifdef SVN_NEON_0_26 svn_config_get(cfg, &http_auth_types, server_group, SVN_CONFIG_OPTION_HTTP_AUTH_TYPES, http_auth_types); -#endif svn_config_get(cfg, pk11_provider, server_group, SVN_CONFIG_OPTION_SSL_PKCS11_PROVIDER, *pk11_provider); } @@ -578,7 +574,6 @@ else *neon_debug = 0; -#ifdef SVN_NEON_0_26 if (http_auth_types) { char *token, *last; @@ -599,7 +594,6 @@ "type '%s'"), token); } } -#endif /* SVN_NEON_0_26 */ return SVN_NO_ERROR; } @@ -681,11 +675,7 @@ } neonprogress_baton_t; static void -#ifdef SVN_NEON_0_27 ra_neon_neonprogress(void *baton, ne_off_t progress, ne_off_t total) -#else -ra_neon_neonprogress(void *baton, off_t progress, off_t total) -#endif /* SVN_NEON_0_27 */ { const neonprogress_baton_t *neonprogress_baton = baton; if (neonprogress_baton->progress_func) @@ -1080,7 +1070,6 @@ uri->host, pool)); -#ifdef SVN_NEON_0_26 if (neon_auth_types == 0) { /* If there were no auth types specified in the configuration @@ -1089,7 +1078,6 @@ if (is_ssl_session) neon_auth_types |= NE_AUTH_NEGOTIATE; } -#endif if (debug) ne_debug_init(stderr, debug); @@ -1111,7 +1099,6 @@ ne_set_proxy_auth(sess, proxy_auth, pab); ne_set_proxy_auth(sess2, proxy_auth, pab); } -#ifdef SVN_NEON_0_26 else { /* Enable (only) the Negotiate scheme for proxy @@ -1120,7 +1107,6 @@ ne_add_proxy_auth(sess, NE_AUTH_NEGOTIATE, NULL, NULL); ne_add_proxy_auth(sess2, NE_AUTH_NEGOTIATE, NULL, NULL); } -#endif } if (!timeout) @@ -1128,10 +1114,8 @@ ne_set_read_timeout(sess, timeout); ne_set_read_timeout(sess2, timeout); -#ifdef SVN_NEON_0_27 ne_set_connect_timeout(sess, timeout); ne_set_connect_timeout(sess2, timeout); -#endif } if (useragent) @@ -1176,13 +1160,8 @@ point. */ /* Register an authentication 'pull' callback with the neon sessions */ -#ifdef SVN_NEON_0_26 ne_add_server_auth(sess, neon_auth_types, request_auth, ras); ne_add_server_auth(sess2, neon_auth_types, request_auth, ras); -#else - ne_set_server_auth(sess, request_auth, ras); - ne_set_server_auth(sess2, request_auth, ras); -#endif if (is_ssl_session) { Index: configure.ac =================================================================== --- configure.ac (revision 32947) +++ configure.ac (working copy) @@ -70,7 +70,7 @@ # Either a space-separated list of allowable Neon versions, or "any" to # mean allow anything. -NEON_ALLOWED_LIST="0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4 0.27.2 0.28.0 0.28.1 0.28.2 0.28.3 0.29.0-dev" +NEON_ALLOWED_LIST="0.27.2 0.28.0 0.28.1 0.28.2 0.28.3 0.29.0-dev" NEON_RECOMMENDED_VER=0.28.3 NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz" dnl You can skip the neon version check only if you know what you are doing Index: INSTALL =================================================================== --- INSTALL (revision 32947) +++ INSTALL (working copy) @@ -326,7 +326,7 @@ (If you link against both, you can configure which one is used in your ~/.subversion/servers configuration file.) - a. Neon library 0.25, 0.26, 0.27, or 0.28 (http://www.webdav.org/neon/) + a. Neon library 0.27, or 0.28 (http://www.webdav.org/neon/) The Neon library allows a Subversion client to interact with remote repositories over the Internet via a WebDAV @@ -335,9 +335,8 @@ The source code is included with the Subversion dependencies package, and it can also be obtained from: - http://www.webdav.org/neon/neon-0.25.5.tar.gz - http://www.webdav.org/neon/neon-0.26.4.tar.gz http://www.webdav.org/neon/neon-0.27.2.tar.gz + http://www.webdav.org/neon/neon-0.28.3.tar.gz Building Neon inside the subversion build: @@ -796,11 +795,10 @@ needed to compile Apache or APR. Note that this is the actual awk program, not an installer - just rename it to awk.exe and it is ready to use. - * Neon 0.26.1 or higher, downloaded from - http://www.webdav.org/neon/neon-0.26.1.tar.gz which is required + * Neon 0.27.2 or higher, downloaded from + http://www.webdav.org/neon/neon-0.27.2.tar.gz which is required for building the client components. Neon is included in the zip file - distribution. (0.25.0+ compiles, but does not properly support all - HTTP auth types.) + distribution. * Apache apr, apr-util, and apr-iconv libraries, version 0.9.12. Included in both the Subversion dependencies ZIP file and the Apache 2.0.58 source zip. If you are building from a Subversion