[Pkg-mongodb-maintainers] [pkg-mongodb] 297/394: Imported Debian patch 1:2.4.8-1
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Wed Sep 21 13:59:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository pkg-mongodb.
commit a8435e094ae756f6f8dd903b05eabcdcf989408b
Author: Laszlo Boszormenyi (GCS) <gcs at debian.org>
Date: Wed Nov 13 07:55:06 2013 +0000
Imported Debian patch 1:2.4.8-1
---
.gitignore | 1 -
buildscripts/emr/lib/hadoop-core-0.20.205.0.jar | Bin 0 -> 3700955 bytes
debian/changelog | 19 ++++++++++++++++++
debian/control | 8 +++++---
debian/copyright | 24 +++++++++++++++++++++++
debian/mongodb-server.mongodb.service | 10 ++++++++++
debian/mongodb-server.mongodb.upstart | 25 ++++++++++++++++++++++++
debian/mongodb.conf | 7 +++++++
debian/rules | 2 +-
9 files changed, 91 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8a132d6..79548b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,4 +159,3 @@ src/third_party/js-1.7/jskwgen
src/mongo/buildinfo.cpp
buildinfo.cpp
/.settings/
-/.pc
diff --git a/buildscripts/emr/lib/hadoop-core-0.20.205.0.jar b/buildscripts/emr/lib/hadoop-core-0.20.205.0.jar
new file mode 100644
index 0000000..de82ad5
Binary files /dev/null and b/buildscripts/emr/lib/hadoop-core-0.20.205.0.jar differ
diff --git a/debian/changelog b/debian/changelog
index 24c91ac..6df334c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+mongodb (1:2.4.8-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add armhf architecture to the supported build systems.
+ * Build with SSL enabled.
+ * Update Standards-Version to 3.9.5 .
+
+ [ Viktar Vauchkevich <victorenator at gmail.com> ]
+ * Add systemd support (closes: #717321).
+
+ [ James Page <james.page at ubuntu.com> ]
+ * d/copyright: Add details of MongoDB AGPL+OpenSSL license exception
+ to support continued use of MongoDB with SSL support enabled
+ (LP: #1175028).
+ * d/mongodb.conf: Add example SSL configuration options.
+ * d/mongodb-server.mongodb.upstart: Add upstart configuration.
+
+ -- Laszlo Boszormenyi (GCS) <gcs at debian.org> Wed, 13 Nov 2013 07:55:06 +0000
+
mongodb (1:2.4.6-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 8a3af92..f074ffc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Laszlo Boszormenyi (GCS) <gcs at debian.org>
Uploaders: Jérémy Lal <kapouer at melix.org>
Build-Depends:
debhelper (>= 9),
+ dh-systemd (>= 1.5),
libboost-date-time-dev,
libboost-dev (>> 1.50),
libboost-filesystem-dev,
@@ -16,10 +17,11 @@ Build-Depends:
libreadline-dev,
libsnappy-dev,
libstemmer-dev,
+ libssl-dev,
libv8-dev (>= 3.12),
python-pymongo,
scons
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Vcs-Git: git://anonscm.debian.org/collab-maint/mongodb.git
Vcs-Browser: http://anonscm.debian.org/git/collab-maint/mongodb.git
Homepage: http://www.mongodb.org
@@ -78,7 +80,7 @@ Description: object/document-oriented database (server package)
This package contains the server itself.
Package: mongodb-clients
-Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf
Depends:
${misc:Depends},
${shlibs:Depends}
@@ -104,7 +106,7 @@ Description: object/document-oriented database (client apps)
Package: mongodb-dev
Section: libdevel
-Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf
Depends:
libboost-dev,
${misc:Depends}
diff --git a/debian/copyright b/debian/copyright
index b50c6e7..e86554e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -236,3 +236,27 @@ License for md5 implementation
L. Peter Deutsch
ghost at aladdin.com
+
+
+License exception for linking MongoDB with OpenSSL
+--------------------------------------------------
+
+MongoDB have granted the following license exception for the AGPL licensed
+components of MongoDB to support use with OpenSSL; AGPL and OpenSSL are not
+compatible licenses without this exception.
+
+ As a special exception, the copyright holders give permission to link the
+ code of portions of this program with the OpenSSL library under certain
+ conditions as described in each individual source file and distribute
+ linked combinations including the program with the OpenSSL library. You
+ must comply with the GNU Affero General Public License in all respects
+ for all of the code used other than as permitted herein. If you modify
+ file(s) with this exception, you may extend this exception to your
+ version of the file(s), but you are not obligated to do so. If you do not
+ wish to do so, delete this exception statement from your version. If you
+ delete this exception statement from all source files in the program,
+ then also delete it here.
+
+See the following upstream commit for full details:
+
+ https://github.com/mongodb/mongo/commit/5a282cc42c381c6103b1c903c745c64ea6af9f5b
diff --git a/debian/mongodb-server.mongodb.service b/debian/mongodb-server.mongodb.service
new file mode 100644
index 0000000..a73d760
--- /dev/null
+++ b/debian/mongodb-server.mongodb.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=An object/document-oriented database
+Documentation=man:mongod(1)
+
+[Service]
+User=mongodb
+ExecStart=/usr/bin/mongod --config /etc/mongodb.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/mongodb-server.mongodb.upstart b/debian/mongodb-server.mongodb.upstart
new file mode 100644
index 0000000..e953feb
--- /dev/null
+++ b/debian/mongodb-server.mongodb.upstart
@@ -0,0 +1,25 @@
+# vim: set ft=upstart ts=4 et:
+description "MongoDB"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+limit nofile 20000 20000
+
+kill timeout 300 # wait 300s between SIGTERM and SIGKILL.
+
+pre-start script
+ mkdir -p /var/lib/mongodb/
+ mkdir -p /var/log/mongodb/
+end script
+
+script
+ ENABLE_MONGODB="yes"
+ if [ -f /etc/default/mongodb ]; then
+ . /etc/default/mongodb
+ fi
+ if [ "x$ENABLE_MONGODB" = "xyes" ]; then
+ exec start-stop-daemon --start --quiet --chuid mongodb \
+ --exec /usr/bin/mongod -- --config /etc/mongodb.conf
+ fi
+end script
diff --git a/debian/mongodb.conf b/debian/mongodb.conf
index 087ea8d..33d068d 100644
--- a/debian/mongodb.conf
+++ b/debian/mongodb.conf
@@ -91,3 +91,10 @@ journal=true
#oplogSize = <MB>
# Size limit for in-memory storage of op ids.
#opIdMem = <bytes>
+
+# SSL options
+# Enable SSL on normal ports
+#sslOnNormalPorts = true
+# SSL Key file and password
+#sslPEMKeyFile = /etc/ssl/mongodb.pem
+#sslPEMKeyPassword = pass
diff --git a/debian/rules b/debian/rules
index d8f0a70..0f89afe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ endif
HARDENING_OPTIONS = CC="$(CC)" CFLAGS="$(CFLAGS)" \
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)"
COMMON_OPTIONS = --use-system-snappy --use-system-tcmalloc --use-system-pcre \
- --use-system-boost --use-system-v8 $(DEB_SCONS_OPTIONS)
+ --use-system-boost --use-system-v8 --ssl $(DEB_SCONS_OPTIONS)
DEB_SCONS_CLEAN = --directory="." $(HARDENING_OPTIONS) . --keep-going --clean \
$(COMMON_OPTIONS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git
More information about the Pkg-mongodb-maintainers
mailing list