subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1501077 - in /subversion/branches/1.8.x: ./ STATUS build/ac-macros/berkeley-db.m4 build/generator/gen_win.py configure.ac
Date Tue, 09 Jul 2013 04:01:04 GMT
Author: svn-role
Date: Tue Jul  9 04:01:04 2013
New Revision: 1501077

URL: http://svn.apache.org/r1501077
Log:
Merge the r1499438 group from trunk:

 * r1499438, r1499447, r1499460, r1500695, r1500928
   Make building with BDB 6 an opt-in feature.
   In configure, do not warn if BDB was not found.
   Justification (r1499447):
     The BDB backend is deprecated and the check is buggy.
   Justification (r1499438, r1499460):
     License change on a dependency.  libsvn_fs_base has not been tested with
     bdb6, and is deprecated so we are unlikely to test it.
   Notes:
     Two orthogonal changes that conflict with each other.
     r1499447 removes the warning.
     r1499438 and r1499460 add an opt-in
     r1500928 fixes the help string to be consistent with our convention
   Votes:
     +1: danielsh, breser, stefan2, stsp

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/build/ac-macros/berkeley-db.m4
    subversion/branches/1.8.x/build/generator/gen_win.py
    subversion/branches/1.8.x/configure.ac   (contents, props changed)

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1499438,1499447,1499460,1500695,1500928

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1501077&r1=1501076&r2=1501077&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul  9 04:01:04 2013
@@ -120,22 +120,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1499438, r1499447, r1499460, r1500695, r1500928
-   Make building with BDB 6 an opt-in feature.
-   In configure, do not warn if BDB was not found.
-   Justification (r1499447):
-     The BDB backend is deprecated and the check is buggy.
-   Justification (r1499438, r1499460):
-     License change on a dependency.  libsvn_fs_base has not been tested with
-     bdb6, and is deprecated so we are unlikely to test it.
-   Notes:
-     Two orthogonal changes that conflict with each other.
-     r1499447 removes the warning.
-     r1499438 and r1499460 add an opt-in
-     r1500928 fixes the help string to be consistent with our convention
-   Votes:
-     +1: danielsh, breser, stefan2, stsp
-
  * r1500226
    Fixes copyfrom URL construction in Ev2 commit editor shims.
    Justification:

Modified: subversion/branches/1.8.x/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/ac-macros/berkeley-db.m4?rev=1501077&r1=1501076&r2=1501077&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/1.8.x/build/ac-macros/berkeley-db.m4 Tue Jul  9 04:01:04 2013
@@ -48,7 +48,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
   AC_ARG_WITH(berkeley-db, [AS_HELP_STRING(
                                            [[--with-berkeley-db[=HEADER:INCLUDES:LIB_SEARCH_DIRS:LIBS]]],
[
                           The Subversion Berkeley DB based filesystem library 
-                          requires Berkeley DB $db_version or newer.  If you
+                          requires Berkeley DB $db_version or $db_alt_version.  If you
                           specify `--without-berkeley-db', that library will
                           not be built.  If you omit the argument of this option
                           completely, the configure script will use Berkeley DB
@@ -126,22 +126,35 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
     svn_lib_berkeley_db=no
   else
     AC_MSG_CHECKING([for availability of Berkeley DB])
-    SVN_LIB_BERKELEY_DB_TRY($1, $2, $3)
+    AC_ARG_ENABLE(bdb6,
+      AS_HELP_STRING([--enable-bdb6],
+                     [Allow building against BDB 6+.
+                      See --with-berkeley-db for specifying the location of
+                      the Berkeley DB installation.  Using BDB 6 will fail if
+                      this option is not used.]),
+      [enable_bdb6=$enableval],[enable_bdb6=unspecified])
+
+    SVN_LIB_BERKELEY_DB_TRY($1, $2, $3, $enable_bdb6)
     if test "$svn_have_berkeley_db" = "yes"; then
       AC_MSG_RESULT([yes])
       svn_lib_berkeley_db=yes
     else
-      AC_MSG_RESULT([no])
+      if test "$svn_have_berkeley_db" = "no6"; then
+        AC_MSG_RESULT([no (found version 6, but --enable-bdb6 not specified)])
+        # A warning will be printed at the end of configure.ac.
+      else
+        AC_MSG_RESULT([no])
+      fi
       svn_lib_berkeley_db=no
       if test "$bdb_status" = "required"; then
-        AC_MSG_ERROR([Berkeley DB $db_version or newer wasn't found.])
+        AC_MSG_ERROR([Berkeley DB $db_version or $db_alt_version wasn't found.])
       fi
     fi
   fi
 ])
 
 
-dnl   SVN_LIB_BERKELEY_DB_TRY(major, minor, patch)
+dnl   SVN_LIB_BERKELEY_DB_TRY(major, minor, patch, enable_bdb6)
 dnl
 dnl   A subroutine of SVN_LIB_BERKELEY_DB.
 dnl
@@ -174,6 +187,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
     svn_check_berkeley_db_major=$1
     svn_check_berkeley_db_minor=$2
     svn_check_berkeley_db_patch=$3
+    enable_bdb6=$4
 
    if test -z "$SVN_DB_LIBS"; then
       # We pass --dbm-libs here since Debian has modified apu-config not
@@ -215,6 +229,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
 )
 
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <string.h>
 #include <stdlib.h>
 $svn_db_header
 
@@ -230,6 +245,12 @@ int main ()
       || patch != DB_VERSION_PATCH)
     exit (1);
 
+  /* Block Berkeley DB 6, because (a) we haven't tested with it, (b) 6.0.20
+     and newer are under the AGPL, and we want use of AGPL dependencies to be
+     opt-in. */
+  if (major >= 6 && strcmp("$enable_bdb6", "yes"))
+    exit(2);
+
   /* Run-time check:  ensure the library claims to be the correct version. */
 
   if (major < $svn_check_berkeley_db_major)
@@ -249,7 +270,11 @@ int main ()
 }
       ]])],
       [svn_have_berkeley_db=yes],
-      [svn_have_berkeley_db=no],
+      [rc=$?
+       svn_have_berkeley_db=no
+       if test $rc = 2; then
+         svn_have_berkeley_db=no6
+       fi],
       [svn_have_berkeley_db=yes]
     )
 

Modified: subversion/branches/1.8.x/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/generator/gen_win.py?rev=1501077&r1=1501076&r2=1501077&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/gen_win.py (original)
+++ subversion/branches/1.8.x/build/generator/gen_win.py Tue Jul  9 04:01:04 2013
@@ -212,6 +212,7 @@ class GeneratorBase(gen_base.GeneratorBa
 
   def _find_bdb(self):
     "Find the Berkeley DB library and version"
+    # Before adding "60" to this list, see build/ac-macros/berkeley-db.m4.
     for ver in ("53", "52", "51", "50", "48", "47", "46",
                 "45", "44", "43", "42", "41", "40"):
       lib = "libdb" + ver

Modified: subversion/branches/1.8.x/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/configure.ac?rev=1501077&r1=1501076&r2=1501077&view=diff
==============================================================================
--- subversion/branches/1.8.x/configure.ac (original)
+++ subversion/branches/1.8.x/configure.ac Tue Jul  9 04:01:04 2013
@@ -460,6 +460,7 @@ powerpc-apple-darwin*)
     SVN_FS_WANT_DB_PATCH=14
     ;;
 esac
+db_alt_version="5.x"
 # Look for libdb4.so first:
 SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
                     $SVN_FS_WANT_DB_PATCH, [db4 db])
@@ -1511,18 +1512,28 @@ dnl Configure is long - users tend to mi
 dnl Hence, print a warnings about what we did and didn't configure at the 
 dnl end, where people will actually see them.
 
-if test "$svn_lib_berkeley_db" = "no" && test "$with_berkeley_db" != "no"; then
-  db_version="$SVN_FS_WANT_DB_MAJOR.$SVN_FS_WANT_DB_MINOR.$SVN_FS_WANT_DB_PATCH"
-  AC_MSG_WARN([we have configured without BDB filesystem support
+if test "$svn_have_berkeley_db" = "no6" && test "$enable_bdb6" != "no"; then
+  AC_MSG_WARN([We have configured without BDB filesystem support
 
 
-You don't seem to have Berkeley DB version $db_version or newer
-installed and linked to APR-UTIL.  We have created a Makefile which will build
-Subversion without support for the Berkeley DB back-end.  You can find the
-latest version of Berkeley DB here:
+Berkeley DB 6 was found, but not used.  Please re-run configure (see
+./config.nice) with the '--enable-bdb6' flag to use it,
+or explicitly specify '--disable-bdb6' or '--without-berkeley-db'
+to silence this warning.
 
-  http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
+Please note that some versions of Berkeley DB 6+ are under the GNU Affero
+General Public License, version 3:
+https://oss.oracle.com/pipermail/bdb/2013-June/000056.html
 
-or explicitly specify --without-berkeley-db to silence this warning.
+The AGPL-3.0 licence may impose special requirements for making available
+source code of server-side software.  The text of the licence is:
+https://www.gnu.org/licenses/agpl-3.0.html
+http://opensource.org/licenses/AGPL-3.0
+
+The Berkeley DB backend to Subversion is deprecated; see
+http://subversion.apache.org/docs/release-notes/1.8#bdb-deprecated
+
+The Subversion developers have not tested Subversion with Berkeley DB 6 for
+technical problems or bugs.
 ])
 fi

Propchange: subversion/branches/1.8.x/configure.ac
------------------------------------------------------------------------------
  Merged /subversion/trunk/configure.ac:r1499438,1499447,1499460,1500695,1500928



Mime
View raw message