RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 27-Dec-2016 13:26:18
Branch: rpm-5_4 Handle: 2016122712261700
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio mongoc.h
Log:
- mongoc: disable openssl if 1.1.0.
Summary:
Revision Changes Path
1.3501.2.520+1 -0 rpm/CHANGES
1.1.2.14 +7 -2 rpm/rpmio/mongoc.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.519 -r1.3501.2.520 CHANGES
--- rpm/CHANGES 27 Dec 2016 12:23:47 -0000 1.3501.2.519
+++ rpm/CHANGES 27 Dec 2016 12:26:17 -0000 1.3501.2.520
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+ - jbj: mongoc: disable openssl if 1.1.0.
- jbj: openssl: port to 1.1.0 API, retrofit getters/setters to 1.0.2.
- jbj: make peace with gcc-6.3.1.
- jbj: make peace with F25.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/mongoc.h
============================================================================
$ cvs diff -u -r1.1.2.13 -r1.1.2.14 mongoc.h
--- rpm/rpmio/mongoc.h 7 Aug 2016 03:55:52 -0000 1.1.2.13
+++ rpm/rpmio/mongoc.h 27 Dec 2016 12:26:17 -0000 1.1.2.14
@@ -103,17 +103,22 @@
* compiled with OpenSSL support.
*/
#if defined(WITH_OPENSSL)
+/* XXX silently disable openssl while porting to openssl-1.1.0c */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define MONGOC_ENABLE_OPENSSL 1
#else
# undef MONGOC_ENABLE_OPENSSL
#endif
+#else
+# undef MONGOC_ENABLE_OPENSSL
+#endif
/*
* MONGOC_ENABLE_LIBCRYPTO is set from configure to determine if we are
* compiled with OpenSSL support.
*/
-#if defined(WITH_OPENSSL)
+#if defined(MONGOC_ENABLE_OPENSSL)
#define MONGOC_ENABLE_LIBCRYPTO 1
#else
# undef MONGOC_ENABLE_LIBCRYPTO
@@ -124,7 +129,7 @@
* MONGOC_ENABLE_SSL is set from configure to determine if we are
* compiled with any SSL support.
*/
-#if defined(WITH_OPENSSL)
+#if defined(MONGOC_ENABLE_OPENSSL)
#define MONGOC_ENABLE_SSL 1
#else
# undef MONGOC_ENABLE_SSL
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
