[Pkg-ceph-commits] [ceph] 28/41: d/p/disable-openssl-linking.patch: Disable build time linking with OpenSSL due to licensing incompatibilities.

[Gaudenz Steinlin]

This is an automated email from the git hooks/post-receive script.

gaudenz pushed a commit to branch jewel-gaudenz
in repository ceph.

commit faeebb33b7dab4376a7d82b46369ccefe174f524
Author: James Page <james.page at ubuntu.com>
Date:   Thu Mar 31 11:48:31 2016 +0100

    d/p/disable-openssl-linking.patch: Disable build time linking with OpenSSL due to licensing incompatibilities.
---
 debian/patches/disable-openssl-linking.patch | 19 +++++++++++++++++++
 debian/patches/series                        |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/disable-openssl-linking.patch b/debian/patches/disable-openssl-linking.patch
new file mode 100644
index 0000000..9fe7e31
--- /dev/null
+++ b/debian/patches/disable-openssl-linking.patch
@@ -0,0 +1,19 @@
+Description: Disable build time linking with openssl
+ OpenSSL is not DFSG compatible with the rest of the Ceph
+ codebase; disable build time linking and switch back to
+ runtime use if end-users decide they want to use OpenSSL.
+Author: James Page <james.page at ubuntu.com>
+Forwarded: not-needed
+
+--- a/src/rgw/Makefile.am
++++ b/src/rgw/Makefile.am
+@@ -133,8 +133,7 @@ libcivetweb_la_SOURCES =  \
+ 
+ libcivetweb_la_CXXFLAGS = ${CIVETWEB_INCLUDE} -fPIC -Woverloaded-virtual \
+ 	${AM_CXXFLAGS}
+-libcivetweb_la_CFLAGS = -I$(srcdir)/civetweb/include ${CIVETWEB_INCLUDE} -fPIC -DNO_SSL_DL
+-LIBCIVETWEB_DEPS += -lssl -lcrypto
++libcivetweb_la_CFLAGS = -I$(srcdir)/civetweb/include ${CIVETWEB_INCLUDE} -fPIC
+ 
+ noinst_LTLIBRARIES += libcivetweb.la
+ 
diff --git a/debian/patches/series b/debian/patches/series
index bb610fe..5bb8dd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ tests-disable.patch
 fix-cycles-arch.patch
 rocksdb-flags.patch
 skip-setup.py-makefiles.patch
+disable-openssl-linking.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git