summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonin Kral <a.kral@bobek.cz>2013-07-18 19:18:59 +0200
committerAntonin Kral <a.kral@bobek.cz>2013-07-18 19:18:59 +0200
commite2579b923ecf3a2d5e864faba7be548d4d18a8dc (patch)
treeba550199d63e1032e4e8210490bb1b3aa7627c4a
parent0f01a8b145b96905ef1b4dd5c4b5933767e83136 (diff)
-rw-r--r--debian/changelog15
-rw-r--r--debian/control3
-rwxr-xr-xdebian/rules14
3 files changed, 28 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index acdcf972ff5..886a32a945c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+mongodb (1:2.4.5-1) unstable; urgency=critical
+
+ * new upstream release
+ https://jira.mongodb.org/browse/SERVER/fixforversion/12519
+ * CVE-2013-4650 - fix allows remote authenticated users to obtain
+ internal system privileges (Closes: #715007).
+ * CVE-2013-2132 and CVE-2013-4142 - Remotely triggered segmentation
+ fault in Javascript engine (Closes: #717173).
+ * Force use of TIME_UTC_ boost macro (Closes: #710639).
+ * Use gcc and g++ 4.7 to avoid #701324 which is still pending.
+ * Remove build directory (Closes: #715015).
+ * Currently uses embedded V8 as the one in Debian is too old.
+
+ -- Antonin Kral <A.Kral@sh.cvut.cz> Wed, 17 Jul 2013 16:23:43 +0200
+
mongodb (1:2.4.3-1) unstable; urgency=low
[ Jeff Epler ]
diff --git a/debian/control b/debian/control
index f722c80698d..9e535a9b876 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,8 @@ Build-Depends:
libstemmer-dev,
libv8-dev,
python-pymongo,
- scons
+ scons,
+ g++-4.7
Standards-Version: 3.9.3
Vcs-Git: git://github.com/bobek/mongo-debian.git
Vcs-Browser: https://github.com/bobek/mongo-debian
diff --git a/debian/rules b/debian/rules
index c792626e1ce..cbab8074e2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,14 +18,22 @@ ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
DEB_SCONS_OPTIONS += -j$(PROCS)
endif
+
+CC=gcc-4.7
+CXX=g++-4.7
+
+#COMMON_OPTIONS = --use-system-all --cc=gcc-4.7 --cxx=g++-4.7
+COMMON_OPTIONS = --use-system-snappy --use-system-tcmalloc --use-system-pcre --use-system-boost --cc=gcc-4.7 --cxx=g++-4.7
+
DEB_SCONS_BUILD_TARGET = all
-DEB_SCONS_BUILD_OPTIONS = --use-system-all
-DEB_SCONS_INSTALL_OPTIONS += --prefix=$(CURDIR)/debian/tmp/usr --full --use-system-all
-DEB_SCONS_CHECK_TARGET = --smokedbprefix=$(CURDIR)/debian/tmp-test smoke --use-system-all
+DEB_SCONS_BUILD_OPTIONS = $(COMMON_OPTIONS)
+DEB_SCONS_INSTALL_OPTIONS += --prefix=$(CURDIR)/debian/tmp/usr --full $(COMMON_OPTIONS)
+DEB_SCONS_CHECK_TARGET = --smokedbprefix=$(CURDIR)/debian/tmp-test smoke $(COMMON_OPTIONS)
clean::
find . -name "*.pyc" -delete
rm -f buildinfo.cpp
rm -rf debian/tmp-test
rm -rf .scons
+ rm -rf build