SERVER-43407 Move mongocryptd to separate deb/rpms

5 files changed, 75 insertions, 22 deletions

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index cca95094b77..f0c59eb8229 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,6 +1,7 @@
 # Agreed with upstream, that redefining rpath is necessary as xulrunner used to
 # change API without changing so-name
 mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongo /usr/lib64/xulrunner-1.9.1
+mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongocryptd /usr/lib64/xulrunner-1.9.1
 mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongod /usr/lib64/xulrunner-1.9.1
 mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongodump /usr/lib64/xulrunner-1.9.1
 mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongoexport /usr/lib64/xulrunner-1.9.1
diff --git a/debian/mongodb-enterprise-unstable.control b/debian/mongodb-enterprise-unstable.control
index 930429874de..0c719025656 100644
--- a/debian/mongodb-enterprise-unstable.control
+++ b/debian/mongodb-enterprise-unstable.control
@@ -2,14 +2,14 @@ Source: mongodb-enterprise-unstable
 Section: database
 Priority: optional
 Maintainer: Ernie Hershey <ernie.hershey@mongodb.com>
-Build-Depends: 
+Build-Depends:
 Standards-Version: 3.8.0
 Homepage: http://www.mongodb.org
 
 Package: mongodb-enterprise-unstable
 Conflicts: mongo-10gen, mongo-10gen-enterprise, mongo-10gen-enterprise-server, mongo-10gen-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-shell, mongodb-enterprise-tools, mongodb-org-unstable, mongodb-org-unstable-mongos, mongodb-org-unstable-shell, mongodb-org-unstable-tools, mongodb-org-unstable-server, mongodb-nightly, mongodb-org, mongodb-org-mongos, mongodb-org-server, mongodb-org-shell, mongodb-org-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen
 Architecture: any
-Depends: mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-tools
+Depends: mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-tools, mongodb-enterprise-unstable-cryptd
 Description: MongoDB open source document-oriented database system (enterprise metapackage)
  MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
  .
@@ -115,3 +115,25 @@ Description: MongoDB tools (enterprise)
  * Aggregation Framework & Native MapReduce
  .
  This package contains standard utilities for interacting with MongoDB.
+
+Package: mongodb-enterprise-unstable-cryptd
+Conflicts: mongo-enterprise-cryptd
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: MongoDB Client Side Field Level Encryption Support Daemon (enterprise)
+ MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
+ .
+ MongoDB is an open-source database used by companies of all sizes, across all industries and for a wide variety of applications. It is an agile database that allows schemas to change quickly as applications evolve, while still providing the functionality developers expect from traditional databases, such as secondary indexes, a full query language and strict consistency.
+ .
+ MongoDB has a rich client ecosystem including hadoop integration, officially supported drivers for 10 programming languages and environments, as well as 40 drivers supported by the user community.
+ .
+ MongoDB features:
+ * JSON Data Model with Dynamic Schemas
+ * Auto-Sharding for Horizontal Scalability
+ * Built-In Replication for High Availability
+ * Rich Secondary Indexes, including geospatial
+ * TTL indexes
+ * Text Search
+ * Aggregation Framework & Native MapReduce
+ .
+ This package contains standard utilities for interacting with MongoDB.
diff --git a/debian/mongodb-enterprise-unstable.rules b/debian/mongodb-enterprise-unstable.rules
index 548a3807aab..d7e8924d70e 100644
--- a/debian/mongodb-enterprise-unstable.rules
+++ b/debian/mongodb-enterprise-unstable.rules
@@ -15,11 +15,11 @@ configure-stamp:
 
 build: build-stamp
 
-build-stamp: configure-stamp  
+build-stamp: configure-stamp
 	dh_testdir
 
-	# THE FOLLOWING LINE IS INTENTIONALLY COMMENTED. 
-	# scons 
+	# THE FOLLOWING LINE IS INTENTIONALLY COMMENTED.
+	# scons
 	#docbook-to-man debian/mongodb.sgml > mongodb.1
 
 	echo -n > debian/mongodb-enterprise-unstable-tools.manpages
@@ -37,7 +37,7 @@ build-stamp: configure-stamp
 
 	touch $@
 
-clean: 
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -53,6 +53,7 @@ clean:
 	rm -rf $(CURDIR)/debian/mongodb-enterprise-unstable-server
 	rm -rf $(CURDIR)/debian/mongodb-enterprise-unstable-mongos
 	rm -rf $(CURDIR)/debian/mongodb-enterprise-unstable-tools
+	rm -rf $(CURDIR)/debian/mongodb-enterprise-unstable-cryptd
 	rm -f config.log
 	rm -f mongo
 	rm -f mongod
@@ -69,7 +70,7 @@ clean:
 	rm -rf tools/*.o
 	rm -rf shell/*.o
 	rm -rf .sconf_temp
-	rm -f buildscripts/*.pyc 
+	rm -f buildscripts/*.pyc
 	rm -f *.pyc
 	rm -f buildinfo.cpp
 	dh_clean debian/files
@@ -86,11 +87,12 @@ install: build
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-unstable-server/usr/bin
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-unstable-mongos/usr/bin
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-unstable-tools/usr/bin
+	mkdir -p $(CURDIR)/debian/mongodb-enterprise-unstable-cryptd/usr/bin
 	cp -v $(CURDIR)/bin/mongo $(CURDIR)/debian/mongodb-enterprise-unstable-shell/usr/bin
 	cp -v $(CURDIR)/bin/mongod $(CURDIR)/debian/mongodb-enterprise-unstable-server/usr/bin
-	cp -v $(CURDIR)/bin/mongocryptd $(CURDIR)/debian/mongodb-enterprise-unstable-server/usr/bin
 	cp -v $(CURDIR)/bin/mongos $(CURDIR)/debian/mongodb-enterprise-unstable-mongos/usr/bin
 	cp -v $(CURDIR)/bin/install_compass $(CURDIR)/debian/mongodb-enterprise-unstable-tools/usr/bin
+	cp -v $(CURDIR)/bin/mongocryptd $(CURDIR)/debian/mongodb-enterprise-unstable-cryptd/usr/bin
 
 	for binary in ${TOOLS} ; \
 	do \
@@ -98,16 +100,18 @@ install: build
 	done
 
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-unstable-server/etc
-	cp $(CURDIR)/debian/mongod.conf $(CURDIR)/debian/mongodb-enterprise-unstable-server/etc/mongod.conf 
+	cp $(CURDIR)/debian/mongod.conf $(CURDIR)/debian/mongodb-enterprise-unstable-server/etc/mongod.conf
 
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-unstable-shell/usr/share/lintian/overrides/
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-unstable-server/usr/share/lintian/overrides/
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-unstable-mongos/usr/share/lintian/overrides/
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-unstable-tools/usr/share/lintian/overrides/
+	mkdir -p $(CURDIR)/debian/mongodb-enterprise-unstable-cryptd/usr/share/lintian/overrides/
 	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-enterprise-unstable-shell/usr/share/lintian/overrides/mongodb-enterprise-unstable-shell
 	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-enterprise-unstable-server/usr/share/lintian/overrides/mongodb-enterprise-unstable-server
 	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-enterprise-unstable-mongos/usr/share/lintian/overrides/mongodb-enterprise-unstable-mongos
 	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-enterprise-unstable-tools/usr/share/lintian/overrides/mongodb-enterprise-unstable-tools
+	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-enterprise-unstable-cryptd/usr/share/lintian/overrides/mongodb-enterprise-unstable-cryptd
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -117,12 +121,12 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
 #	dh_install
 #	dh_installmenu
-#	dh_installdebconf	
+#	dh_installdebconf
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam
diff --git a/debian/mongodb-enterprise.control b/debian/mongodb-enterprise.control
index 0151ec0a6d7..0ed22931f7b 100644
--- a/debian/mongodb-enterprise.control
+++ b/debian/mongodb-enterprise.control
@@ -2,14 +2,14 @@ Source: mongodb-enterprise
 Section: database
 Priority: optional
 Maintainer: Ernie Hershey <ernie.hershey@mongodb.com>
-Build-Depends: 
+Build-Depends:
 Standards-Version: 3.8.0
 Homepage: http://www.mongodb.org
 
 Package: mongodb-enterprise
 Conflicts: mongo-10gen, mongo-10gen-enterprise, mongo-10gen-enterprise-server, mongo-10gen-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise-unstable, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-tools, mongodb-org-unstable, mongodb-org-unstable-mongos, mongodb-org-unstable-shell, mongodb-org-unstable-tools, mongodb-org-unstable-server, mongodb-nightly, mongodb-org, mongodb-org-mongos, mongodb-org-server, mongodb-org-shell, mongodb-org-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen
 Architecture: any
-Depends: mongodb-enterprise-shell, mongodb-enterprise-server, mongodb-enterprise-mongos, mongodb-enterprise-tools
+Depends: mongodb-enterprise-shell, mongodb-enterprise-server, mongodb-enterprise-mongos, mongodb-enterprise-tools, mongodb-enterprise-cryptd
 Description: MongoDB open source document-oriented database system (enterprise metapackage)
  MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
  .
@@ -115,3 +115,25 @@ Description: MongoDB tools (enterprise)
  * Aggregation Framework & Native MapReduce
  .
  This package contains standard utilities for interacting with MongoDB.
+
+Package: mongodb-enterprise-cryptd
+Conflicts: mongo-enterprise-unstable-cryptd
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: MongoDB Client Side Field Level Encryption Support Daemon (enterprise)
+ MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
+ .
+ MongoDB is an open-source database used by companies of all sizes, across all industries and for a wide variety of applications. It is an agile database that allows schemas to change quickly as applications evolve, while still providing the functionality developers expect from traditional databases, such as secondary indexes, a full query language and strict consistency.
+ .
+ MongoDB has a rich client ecosystem including hadoop integration, officially supported drivers for 10 programming languages and environments, as well as 40 drivers supported by the user community.
+ .
+ MongoDB features:
+ * JSON Data Model with Dynamic Schemas
+ * Auto-Sharding for Horizontal Scalability
+ * Built-In Replication for High Availability
+ * Rich Secondary Indexes, including geospatial
+ * TTL indexes
+ * Text Search
+ * Aggregation Framework & Native MapReduce
+ .
+ This package contains standard utilities for interacting with MongoDB.
diff --git a/debian/mongodb-enterprise.rules b/debian/mongodb-enterprise.rules
index 95b249f9b60..59ef93495d4 100644
--- a/debian/mongodb-enterprise.rules
+++ b/debian/mongodb-enterprise.rules
@@ -15,11 +15,11 @@ configure-stamp:
 
 build: build-stamp
 
-build-stamp: configure-stamp  
+build-stamp: configure-stamp
 	dh_testdir
 
-	# THE FOLLOWING LINE IS INTENTIONALLY COMMENTED. 
-	# scons 
+	# THE FOLLOWING LINE IS INTENTIONALLY COMMENTED.
+	# scons
 	#docbook-to-man debian/mongodb.sgml > mongodb.1
 	echo -n > debian/mongodb-enterprise-tools.manpages
 	for binary in ${TOOLS} ; \
@@ -36,7 +36,7 @@ build-stamp: configure-stamp
 
 	touch $@
 
-clean: 
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -52,6 +52,7 @@ clean:
 	rm -rf $(CURDIR)/debian/mongodb-enterprise-server
 	rm -rf $(CURDIR)/debian/mongodb-enterprise-mongos
 	rm -rf $(CURDIR)/debian/mongodb-enterprise-tools
+	rm -rf $(CURDIR)/debian/mongodb-enterprise-cryptd
 	rm -f config.log
 	rm -f mongo
 	rm -f mongod
@@ -68,7 +69,7 @@ clean:
 	rm -rf tools/*.o
 	rm -rf shell/*.o
 	rm -rf .sconf_temp
-	rm -f buildscripts/*.pyc 
+	rm -f buildscripts/*.pyc
 	rm -f *.pyc
 	rm -f buildinfo.cpp
 	dh_clean debian/files
@@ -85,11 +86,12 @@ install: build
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-server/usr/bin
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-mongos/usr/bin
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-tools/usr/bin
+	mkdir -p $(CURDIR)/debian/mongodb-enterprise-cryptd/usr/bin
 	cp -v $(CURDIR)/bin/mongo $(CURDIR)/debian/mongodb-enterprise-shell/usr/bin
 	cp -v $(CURDIR)/bin/mongod $(CURDIR)/debian/mongodb-enterprise-server/usr/bin
-	cp -v $(CURDIR)/bin/mongocryptd $(CURDIR)/debian/mongodb-enterprise-server/usr/bin
 	cp -v $(CURDIR)/bin/mongos $(CURDIR)/debian/mongodb-enterprise-mongos/usr/bin
 	cp -v $(CURDIR)/bin/install_compass $(CURDIR)/debian/mongodb-enterprise-tools/usr/bin
+	cp -v $(CURDIR)/bin/mongocryptd $(CURDIR)/debian/mongodb-enterprise-cryptd/usr/bin
 
 	for binary in ${TOOLS} ; \
 	do \
@@ -97,16 +99,18 @@ install: build
 	done
 
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-server/etc
-	cp $(CURDIR)/debian/mongod.conf $(CURDIR)/debian/mongodb-enterprise-server/etc/mongod.conf 
+	cp $(CURDIR)/debian/mongod.conf $(CURDIR)/debian/mongodb-enterprise-server/etc/mongod.conf
 
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-shell/usr/share/lintian/overrides/
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-server/usr/share/lintian/overrides/
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-mongos/usr/share/lintian/overrides/
 	mkdir -p $(CURDIR)/debian/mongodb-enterprise-tools/usr/share/lintian/overrides/
+	mkdir -p $(CURDIR)/debian/mongodb-enterprise-cryptd/usr/share/lintian/overrides/
 	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-enterprise-shell/usr/share/lintian/overrides/mongodb-enterprise-shell
 	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-enterprise-server/usr/share/lintian/overrides/mongodb-enterprise-server
 	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-enterprise-mongos/usr/share/lintian/overrides/mongodb-enterprise-mongos
 	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-enterprise-tools/usr/share/lintian/overrides/mongodb-enterprise-tools
+	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-enterprise-cryptd/usr/share/lintian/overrides/mongodb-enterprise-cryptd
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -116,12 +120,12 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
 #	dh_install
 #	dh_installmenu
-#	dh_installdebconf	
+#	dh_installdebconf
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam