diff --git a/CMakeLists.txt b/CMakeLists.txt index 239ebafc56..84b6a11827 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,10 +12,10 @@ include(FindBSON REQUIRED) set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/") set (MONGOC_MAJOR_VERSION 1) -set (MONGOC_MINOR_VERSION 0) -set (MONGOC_MICRO_VERSION 3) +set (MONGOC_MINOR_VERSION 1) +set (MONGOC_MICRO_VERSION 0) set (MONGOC_API_VERSION 1.0) -set (MONGOC_VERSION 1.0.3) +set (MONGOC_VERSION 1.1.0-rc0) set (CPACK_RESOURCE_FILE_LICENSE "${SOURCE_DIR}/COPYING") set (CPACK_PACKAGE_VERSION_MAJOR ${MONGOC_MAJOR_VERSION}) diff --git a/NEWS b/NEWS index 888e37caec..d03d005e9a 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,61 @@ -TODO: Existing complex index names may contain a zero instead of a type due to +mongo-c-driver 1.1.0-rc0 +======================== + +It is my pleasure to announce to you the 1.1.0-rc0 release of the MongoDB C driver. + +This release is a release candidate with additive ABI changes and bugfixes. + +Changes include: + * ABI versioning for 1.1 versus 1.0 symbols + * additional geo index options + * authMechanismProperties in URI + * fixes for OS X Yosemite + * removal of replica set member limit + * SCRAM-SHA-1 SASL mechanism + * updated dependency on libbson 1.1 abi + * validation for bulk insert + * various memory leak fixes + +Additions to the ABI include: + * support for extra option in count + - mongoc_collection_count_with_opts + * extra index and collection info + - mongoc_collection_get_index_info + - mongoc_database_get_collection_info + * additional geo options + - mongoc_index_opt_geo_get_default + - mongoc_index_opt_geo_init + * rand interface to seed and verify the strong random number generation needed + by some auth mechanisms + - mongoc_rand_seed + - mongoc_rand_add + - mongoc_rand_status + * URI additions to support more complicated auth credentials + - mongoc_uri_get_credentials + - mongoc_uri_get_mechanism_properties + +Additional Notes: + Existing complex index names may contain a zero instead of a type due to a bug in mongoc_collection_keys_to_index_string. As a result those indexes may be hard to drop from the driver as they have a name you would not expect. --- Ask Tyler if you need more info. +Thanks to everyone who contributed to the development of this point release for +libmongoc. + + * Adam Midvidy + * aherlihy + * alexeyvo + * Christian Hergert + * Jason Carey + * Jérôme Lebel + * Samantha Ritter + * Spencer Jackson + * Tyler Brock + + +Enjoy! + +-- Jason Carey mongo-c-driver 1.0.2 ==================== diff --git a/README.rst b/README.rst index d2b7055697..5bc9dee2bc 100644 --- a/README.rst +++ b/README.rst @@ -53,13 +53,13 @@ Building from Release Tarball Unless you intend on contributing to the mongo-c-driver, you will want to build from a release tarball. -The most current release is 1.0.2 which you can download here. -`mongo-c-driver-1.0.2.tar.gz `_. +The most current release is 1.1.0-rc0 which you can download here. +`mongo-c-driver-1.1.0-rc0.tar.gz `_. To build on UNIX-like systems, do the following:: - $ tar xzf mongo-c-driver-1.0.2.tar.gz - $ cd mongo-c-driver-1.0.2 + $ tar xzf mongo-c-driver-1.1.0-rc0.tar.gz + $ cd mongo-c-driver-1.1.0-rc0 $ ./configure $ make $ sudo make install @@ -70,7 +70,7 @@ To see all of the options available to you during configuration, run:: To build on Windows Vista or newer with Visual Studio 2010, do the following:: - cd mongo-c-driver-1.0.2 + cd mongo-c-driver-1.1.0-rc0 cd src\libbson cmake -DCMAKE_INSTALL_PREFIX=C:\usr -G "Visual Studio 10 Win64" . msbuild.exe ALL_BUILD.vcxproj diff --git a/build/autotools/Versions.m4 b/build/autotools/Versions.m4 index 880ebdf21d..34105fd166 100644 --- a/build/autotools/Versions.m4 +++ b/build/autotools/Versions.m4 @@ -1,17 +1,17 @@ m4_define([mongoc_major_version], [1]) -m4_define([mongoc_minor_version], [0]) -m4_define([mongoc_micro_version], [3]) +m4_define([mongoc_minor_version], [1]) +m4_define([mongoc_micro_version], [0]) m4_define([mongoc_version], [mongoc_major_version.mongoc_minor_version.mongoc_micro_version]) # bump up by 1 for every micro release with no API changes, otherwise # set to 0. after release, bump up by 1 -m4_define([mongoc_interface_age], [3]) +m4_define([mongoc_interface_age], [0]) m4_define([mongoc_binary_age], [m4_eval(100 * mongoc_minor_version + mongoc_micro_version)]) m4_define([lt_current], [m4_eval(100 * mongoc_minor_version + mongoc_micro_version - mongoc_interface_age)]) m4_define([lt_revision], [mongoc_interface_age]) m4_define([lt_age], [m4_eval(mongoc_binary_age - mongoc_interface_age)]) -m4_define([libbson_required_version], [1.0.0]) +m4_define([libbson_required_version], [1.1.0]) m4_define([sasl_required_version], [2.1.6]) diff --git a/build/rpm/mongo-c-driver.spec b/build/rpm/mongo-c-driver.spec index 6415f27385..d5e3272156 100644 --- a/build/rpm/mongo-c-driver.spec +++ b/build/rpm/mongo-c-driver.spec @@ -1,9 +1,9 @@ # norootforbuild %define DriverName mongo-c-driver -%define DriverVersion 1.0.3 +%define DriverVersion 1.1.0-rc0 %define BsonName libbson -%define BsonVersion 1.0.3 +%define BsonVersion 1.1.0-rc0 Name: %{DriverName} Version: %{DriverVersion} @@ -117,6 +117,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog -n %{DriverName} +* Thu Nov 13 2014 Jason Carey - 1.1.0-rc0-1 +- Release 1.1.0-rc0. + * Thu Oct 09 2014 Jason Carey - 1.0.3-1 - Post-release bump for 1.0.3. @@ -158,6 +161,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog -n %{BsonName} +* Thu Nov 13 2014 Jason Carey - 1.1.0-rc0-1 +- Release 1.1.0-rc0. + * Thu Oct 09 2014 Jason Carey - 1.0.3-1 - Post-release bump for 1.0.3. diff --git a/debian/changelog b/debian/changelog index c96bafd8e5..7c359741a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mongo-c-driver (1.1.0-rc0-0) unstable; urgency=low + + * Release 1.1.0-rc0 + + -- Jason Carey Thu, 13 Nov 2014 13:57:43 -0500 + mongo-c-driver (1.0.3-0) unstable; urgency=low * Post-release bump to 1.0.3. diff --git a/doc/installing.page b/doc/installing.page index c595567e0e..0b0e4d970e 100644 --- a/doc/installing.page +++ b/doc/installing.page @@ -58,11 +58,11 @@

The following instructions are for UNIX-like systems such as GNU/Linux, FreeBSD, and Solaris. To build on Windows, see the instructions for Building on Windows.

-

The most recent release of the mongo-c-driver is 1.0.2 and can be downloaded here. The following snippet will download and extract the current release of the driver.

+

The most recent release of the mongo-c-driver is 1.1.0-rc0 and can be downloaded here. The following snippet will download and extract the current release of the driver.

- $ wget https://github.com/mongodb/mongo-c-driver/releases/download/1.0.2/mongo-c-driver-1.0.2.tar.gz -$ tar -xzf mongo-c-driver-1.0.2.tar.gz -$ cd mongo-c-driver-1.0.2/ + $ wget https://github.com/mongodb/mongo-c-driver/releases/download/1.1.0-rc0/mongo-c-driver-1.1.0-rc0.tar.gz +$ tar -xzf mongo-c-driver-1.1.0-rc0.tar.gz +$ cd mongo-c-driver-1.1.0-rc0/

Minimal dependencies are needed to build the MongoDB C driver. Optionally, if you want Kerberos (GSSAPI) or SSL support, you need to install libsasl2 and OpenSSL libraries and development headers respectively.

@@ -129,8 +129,8 @@ Install man pages : yes

The following commands will download the most recent MongoDB binary release and install it using the pkgadd command on Solaris 10.

$ bash bash-3.2$ export ARCH=`uname -m` -bash-3.2$ /usr/sfw/bin/wget --no-check-certificate "https://github.com/mongodb/mongo-c-driver/releases/download/1.0.2/MONGOmongo-c-driver-1.0.2.${ARCH}.pkg.tar.gz" -bash-3.2$ gunzip -c "MONGOmongo-c-driver-1.0.2.${ARCH}.pkg.tar.gz" | tar -xf - +bash-3.2$ /usr/sfw/bin/wget --no-check-certificate "https://github.com/mongodb/mongo-c-driver/releases/download/1.1.0-rc0/MONGOmongo-c-driver-1.1.0-rc0.${ARCH}.pkg.tar.gz" +bash-3.2$ gunzip -c "MONGOmongo-c-driver-1.1.0-rc0.${ARCH}.pkg.tar.gz" | tar -xf - bash-3.2$ pkgadd -d . MONGOmongo-c-driver @@ -142,7 +142,7 @@ Install man pages : yes

Let's start by generating Visual Studio project files for libbson, a dependency of the C driver. The following assumes we are compiling for 64-bit Windows using Visual Studio 2010 Express which can be freely downloaded from Microsoft.

- cd mongo-c-driver-1.0.2\src\libbson + cd mongo-c-driver-1.1.0-rc0\src\libbson cmake -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"

Now that we have project files generated, we can either open the project in Visual Studio or compile from the command line. Let's build using the command line program msbuild.exe

@@ -157,7 +157,7 @@ cmake -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"Now let's do the same for the MongoDB C driver.

- cd mongo-c-driver-1.0.2 + cd mongo-c-driver-1.1.0-rc0 cmake -G "Visual Studio 2010 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver" "-DBSON_ROOT_DIR=C:\mongo-c-driver" msbuild.exe ALL_BUILD.vcxproj msbuild.exe INSTALL.vcxproj diff --git a/doc/mongoc_version.page b/doc/mongoc_version.page index 5d79ea2631..b1464ae587 100644 --- a/doc/mongoc_version.page +++ b/doc/mongoc_version.page @@ -16,9 +16,9 @@ #define MONGOC_MAJOR_VERSION (1) -#define MONGOC_MINOR_VERSION (0) -#define MONGOC_MICRO_VERSION (2) -#define MONGOC_VERSION_S "1.0.2" +#define MONGOC_MINOR_VERSION (1) +#define MONGOC_MICRO_VERSION (0) +#define MONGOC_VERSION_S "1.1.0-rc0" #define MONGOC_VERSION_HEX ((1 << 24) | (0 << 16) | (0 << 8) | 0) #define MONGOC_CHECK_VERSION(major, minor, micro) ]]> @@ -26,8 +26,8 @@ MongoDB C Driver version check - Only compile a block on MongoDB C Driver 1.0.2 and newer. - Only compile a block on MongoDB C Driver 1.1.0-rc0 and newer. + diff --git a/src/libbson b/src/libbson index d028a28c47..2715f97d28 160000 --- a/src/libbson +++ b/src/libbson @@ -1 +1 @@ -Subproject commit d028a28c471b3a948551b4451e3b6a4957107941 +Subproject commit 2715f97d28f3cd79a908180521cedfa0ed76c370