[Pkg-ceph-commits] [ceph] 03/08: d/p/disable-openssl-linking.patch: Dropped, no longer required.

[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 e8690fd00830dcedc55330ab38530b22b763b357
Author: James Page <james.page at ubuntu.com>
Date:   Thu Apr 20 10:33:16 2017 +0100

    d/p/disable-openssl-linking.patch: Dropped, no longer required.
---
 debian/changelog                             |  3 ++-
 debian/patches/disable-openssl-linking.patch | 19 -------------------
 debian/patches/series                        |  1 -
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 709297b..0045e65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,8 @@ ceph (10.2.7-0ubuntu0.16.04.1) UNRELEASED; urgency=medium
       the static-network-up event before starting ceph-all.
 
   [ James Page ]
-  * New upstream point release (LP: #1684527).
+  * New upstream point release (LP: #1684527):
+    - d/p/disable-openssl-linking.patch: Dropped, no longer required.
 
  -- James Page <james.page at ubuntu.com>  Thu, 20 Apr 2017 14:40:28 +0100
 
diff --git a/debian/patches/disable-openssl-linking.patch b/debian/patches/disable-openssl-linking.patch
deleted file mode 100644
index 844938d..0000000
--- a/debian/patches/disable-openssl-linking.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-@@ -136,8 +136,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 fe2b824..b943585 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,5 +15,4 @@ tests-disable.patch
 fix-argparse-defaults.patch
 fix-cycles-arch.patch
 skip-setup.py-makefiles.patch
-disable-openssl-linking.patch
 start-ceph-all-after-network.patch

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