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

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu-xenial
in repository ceph.

commit 9301800328d5ed71785bcef49572ef817b61c83d
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/changelog                             |  2 ++
 debian/patches/disable-openssl-linking.patch | 19 +++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 14f1935..76b5321 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ceph (10.1.0-0ubuntu1) UNRELEASED; urgency=medium
       included upstream.
     - d/p/*: Refresh remaining patches.
     - d/control: Add BD on libldap2-dev for rados gateway.
+    - d/p/disable-openssl-linking.patch: Disable build time linking
+      with OpenSSL due to licensing incompatibilities.
   * d/rules: Strip rbd-mirror package correctly.
   * d/rules: Install upstart and systemd configurations for rbd-mirror.
   * d/copyright: Ensure that jerasure and gf-complete are not stripped
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 aa23f8e..1f934af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ fix-argparse-defaults.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