1.2.1 release

Signed-off-by: A. Jesse Jiryu Davis <jesse@mongodb.com>

CMakeLists.txt

@@ -20,9 +20,9 @@ set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/")
 set (MONGOC_MAJOR_VERSION 1)
 set (MONGOC_MINOR_VERSION 2)
 set (MONGOC_MICRO_VERSION 1)
-set (MONGOC_PRERELEASE_VERSION dev)
+set (MONGOC_PRERELEASE_VERSION )
 set (MONGOC_API_VERSION 1.0)
-set (MONGOC_VERSION 1.2.1-dev)
+set (MONGOC_VERSION 1.2.1)
 
 set (CPACK_RESOURCE_FILE_LICENSE "${SOURCE_DIR}/COPYING")
 set (CPACK_PACKAGE_VERSION_MAJOR ${MONGOC_MAJOR_VERSION})

NEWS

@@ -1,10 +1,31 @@
 mongo-c-driver 1.2.1
 ====================
 
- * mongoc_client_set_ssl_opts and mongoc_client_pool_set_ssl_opts now configure
-   the driver to require an SSL connection to the server, even if "ssl=true" is
-   omitted from the MongoDB URI. Before, SSL options were ignored unless
-   "ssl=true" was included in the URI.
+It is my pleasure to announce to you the MongoDB C driver 1.2.1.
+
+This release includes critical bugfixes for SSL connections with
+mongoc_client_pool_t, and for Unix domain socket connections.
+
+The documentation is updated for a change introduced in version 1.2.0:
+mongoc_client_set_ssl_opts and mongoc_client_pool_set_ssl_opts now configure
+the driver to require an SSL connection to the server, even if "ssl=true" is
+omitted from the MongoDB URI. Before, SSL options were ignored unless
+"ssl=true" was included in the URI.
+
+The build instructions are improved, including the steps to build with OpenSSL
+on OS X El Capitan. Build errors and warnings are fixed for clang in gnu99
+mode and MinGW.
+
+Thanks to everyone who contributed to this version of libmongoc.
+
+ * A. Jesse Jiryu Davis
+ * Hannes Magnusson
+ * Tamas Nagy
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
 
 mongo-c-driver 1.2.0
 ====================

README.rst

@@ -41,7 +41,7 @@ the `mongodb-user list`_ to ask for help. Please include in your email all of th
 information:
 
 - The version of the driver you are trying to build (branch or tag).
-    - Examples: master branch, 1.2.0 tag
+    - Examples: master branch, 1.2.1 tag
 - Host OS, version, and architecture.
     - Examples: Windows 8 64-bit x86, Ubuntu 12.04 32-bit x86, OS X Mavericks
 - C Compiler and version.
@@ -56,7 +56,7 @@ communications to ascertain the necessary details, delaying a useful response.
 Here is a made-up example of a help request that provides the relevant
 information:
 
-  Hello, I'm trying to build the C driver with SSL, from mongo-c-driver-1.2.0.tar.gz. I'm on Ubuntu
+  Hello, I'm trying to build the C driver with SSL, from mongo-c-driver-1.2.1.tar.gz. I'm on Ubuntu
   14.04, 64-bit Intel, with gcc 4.8.2. I run configure like::
 
     $ ./configure --enable-sasl=yes

build/autotools/Versions.m4

@@ -1,7 +1,7 @@
 m4_define([mongoc_major_version], [1])
 m4_define([mongoc_minor_version], [2])
 m4_define([mongoc_micro_version], [1])
-m4_define([mongoc_prerelease_version], [dev])
+m4_define([mongoc_prerelease_version], [])
 
 m4_define(
     [mongoc_version],
@@ -12,13 +12,13 @@ m4_define(
 
 # 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], [0])
+m4_define([mongoc_interface_age], [1])
 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.2.0])
+m4_define([libbson_required_version], [1.2.1])
 
 m4_define([sasl_required_version], [2.1.6])

build/rpm/mongo-c-driver.spec

@@ -1,9 +1,9 @@
 # norootforbuild
 
 %define DriverName    mongo-c-driver
-%define DriverVersion 1.2.0
+%define DriverVersion 1.2.1
 %define BsonName      libbson
-%define BsonVersion   1.2.0
+%define BsonVersion   1.2.1
 Name:           %{DriverName}
 Version:        %{DriverVersion}
 Release:        1%{?dist}
@@ -116,6 +116,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog -n %{DriverName}
+* Thu October 29 2015 A. Jesse Jiryu Davis <jesse@mongodb.com> - 1.2.1-1
+- Release 1.2.1
+
 * Tue October 13 2015 A. Jesse Jiryu Davis <jesse@mongodb.com> - 1.2.0-1
 - Release 1.2.0
 
@@ -199,6 +202,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog -n %{BsonName}
+* Thu October 29 2015 A. Jesse Jiryu Davis <jesse@mongodb.com> - 1.2.1-1
+- Release 1.2.1
+
 * Tue October 13 2015 A. Jesse Jiryu Davis <jesse@mongodb.com> - 1.2.0-1
 - Release 1.2.0
 

debian/changelog

@@ -1,3 +1,9 @@
+mongo-c-driver (1.2.1-0) unstable; urgency=low
+
+  * Release 1.2.1
+
+ -- A. Jesse Jiryu Davis <jesse@mongodb.com>  Thu, 29 October 2015 12:00:00 -0400
+
 mongo-c-driver (1.2.0-0) unstable; urgency=low
 
   * Release 1.2.0

doc/installing.page

@@ -67,12 +67,12 @@
     <section id="unix-build">
       <title>Building from a release tarball</title>
       <p>Unless you intend on contributing to the mongo-c-driver, you will want to build from a release tarball.</p>
-      <p>The most recent release of libmongoc is 1.2.0 and can be <link href="https://github.com/mongodb/mongo-c-driver/releases/download/1.2.0/mongo-c-driver-1.2.0.tar.gz">downloaded here</link>. The following snippet will download and extract the driver, and configure it:</p>
+      <p>The most recent release of libmongoc is 1.2.1 and can be <link href="https://github.com/mongodb/mongo-c-driver/releases/download/1.2.1/mongo-c-driver-1.2.1.tar.gz">downloaded here</link>. The following snippet will download and extract the driver, and configure it:</p>
 
       <screen>
-$ wget https://github.com/mongodb/mongo-c-driver/releases/download/1.2.0/mongo-c-driver-1.2.0.tar.gz
-$ tar xzf mongo-c-driver-1.2.0.tar.gz
-$ cd mongo-c-driver-1.2.0
+$ wget https://github.com/mongodb/mongo-c-driver/releases/download/1.2.1/mongo-c-driver-1.2.1.tar.gz
+$ tar xzf mongo-c-driver-1.2.1.tar.gz
+$ cd mongo-c-driver-1.2.1
 $ ./configure
       </screen>
       <p>If <code>configure</code> completed successfully, you'll see something like the following describing your build configuration.</p>
@@ -140,9 +140,9 @@ $ export CPPFLAGS="-I/usr/local/opt/openssl/include"</screen>
       <title>Building on OS X</title>
       <p>Download the latest release tarball:</p>
       <screen>
-$ curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.2.0/mongo-c-driver-1.2.0.tar.gz
-$ tar xzf mongo-c-driver-1.2.0.tar.gz
-$ cd mongo-c-driver-1.2.0</screen>
+$ curl -LO https://github.com/mongodb/mongo-c-driver/releases/download/1.2.1/mongo-c-driver-1.2.1.tar.gz
+$ tar xzf mongo-c-driver-1.2.1.tar.gz
+$ cd mongo-c-driver-1.2.1</screen>
       <p>Build and install the driver:</p>
       <screen>
 $ ./configure
@@ -166,7 +166,7 @@ $ make man html</screen>
 
     <p>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.</p>
 
-    <screen>cd mongo-c-driver-1.2.0\src\libbson
+    <screen>cd mongo-c-driver-1.2.1\src\libbson
 cmake -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"</screen>
 
     <p>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 <code>msbuild.exe</code></p>
@@ -181,7 +181,7 @@ cmake -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"</sc
 
     <p>Now let's do the same for the MongoDB C driver.</p>
 
-    <screen>cd mongo-c-driver-1.2.0-rc0
+    <screen>cd mongo-c-driver-1.2.1
 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</screen>

doc/mongoc_version.page

@@ -17,8 +17,8 @@
 
 #define MONGOC_MAJOR_VERSION (1)
 #define MONGOC_MINOR_VERSION (2)
-#define MONGOC_MICRO_VERSION (0)
-#define MONGOC_VERSION_S     "1.2.0"
+#define MONGOC_MICRO_VERSION (1)
+#define MONGOC_VERSION_S     "1.2.1"
 #define MONGOC_VERSION_HEX   ((1 << 24) | (0 << 16) | (0 << 8) | 0)
 #define MONGOC_CHECK_VERSION(major, minor, micro)
 ]]></screen>