Merge lp:~clint-fewbar/ubuntu/maverick/mongodb/add-xulrunner-wrapper into lp:ubuntu/maverick/mongodb

[Clint Byrum]

Adds xulrunner wrapper and ensures dependencies are right for mongodb-clients.

[Clint Byrum (clint-fewbar)]

FYI, this successfully built in a PPA:

https://launchpad.net/~clint-fewbar/+archive/fixes/+build/1917295

[Micah Gersten (micahg)]

I'll look at this over the weekend.

[Chris Coulson (chrisccoulson)]

Are the lintian overrides really necessary? (ie, are the binaries really specifying a rpath to /usr/lib64/xulrunner-1.9.1? Shouldn't we fix this if that is the case?)

[Micah Gersten (micahg)]

Yeah, that's a problem too, but the bigger issue is the scons check
locally when building fails when it can't find a top level mozjs lib but
seems to work for Clint.

On 08/17/2010 03:35 PM, Chris Coulson wrote:
> Are the lintian overrides really necessary? (ie, are the binaries really specifying a rpath to /usr/lib64/xulrunner-1.9.1? Shouldn't we fix this if that is the case?)

[Clint Byrum (clint-fewbar)]

The reason for this is sort of covered in

https://bugs.launchpad.net/ubuntu/+source/xulrunner-1.9.2/+bug/286906

Basically, xulrunner's upstream does not guarantee ABI compatibility, so we're writing wrappers to find the new versions. I do find this a little counter-productive, as it will still break when ABI compatibility breaks with a wrapper in the same way it would break if we put it in /usr/lib and didn't bump soname.

I guess nobody is willing to fork xulrunner and produce stable releases though, so until that happens, we're stuck with wrappers and lintian overrides.

[Micah Gersten (micahg)]

That wasn't the question, the previous merge included some lintian
overrides which should've been dropped since we don't have those paths.

On 08/17/2010 03:45 PM, Clint Byrum wrote:
> The reason for this is sort of covered in
>
> https://bugs.launchpad.net/ubuntu/+source/xulrunner-1.9.2/+bug/286906
>
> Basically, xulrunner's upstream does not guarantee ABI compatibility, so we're writing wrappers to find the new versions. I do find this a little counter-productive, as it will still break when ABI compatibility breaks with a wrapper in the same way it would break if we put it in /usr/lib and didn't bump soname.
>
> I guess nobody is willing to fork xulrunner and produce stable releases though, so until that happens, we're stuck with wrappers and lintian overrides.

[Chris Coulson (chrisccoulson)]

I just tried building this, and the binaries are specifying a rpath to the correct location (so, it actually throws out a whole bunch of lintian errors, as the overrides are out-of-date).

I think the build system should be fixed to remove these rpath's, as they don't make sense when the directory changes so frequently and you are using LD_LIBRARY_PATH anyway

[lp:~clint-fewbar/ubuntu/maverick/mongodb/add-xulrunner-wrapper]

10. By Clint Byrum on 2010-09-09

patched SConstruct + buildscripts/hacks_ubuntu.py: removing rpath
because wrapper is used

[Clint Byrum (clint-fewbar)]

I have removed the usage of rpath from the package entirely, and patched the hacks_ubuntu.py file to set LD_LIBRARY_PATH, allowing the tests and tools to run without incident.

[lp:~clint-fewbar/ubuntu/maverick/mongodb/add-xulrunner-wrapper]

11. By Clint Byrum on 2010-09-09

Removing debian/mongodb-server.lintian -- rpath is no longer used

[Clint Byrum (clint-fewbar)]

Ugh and now I just realized the out-of-debian-dir changes came through rather than the patch that I created...

Of course, if you branch this and run

bzr-buildpackage -S

It does generate the patch properly...

Merge reviewers, please advise, would you rather a new merge proposal with the patch be submitted, or handle such a transformation yourselves on upload?

[Micah Gersten (micahg)]

In the middle of a test build, but debian/mongodb-clients.lintian is totally unnecessary now as well, so go ahead and fix that and the patch.

review: Needs Fixing

[Micah Gersten (micahg)]

Build failure:
install -m 644 /tmp/buildd/mongodb-1.4.4/debian/mongodb-server.lintian \
                /tmp/buildd/mongodb-1.4.4/debian/tmp/usr/share/lintian/overrides/mongodb-server
install: cannot stat `/tmp/buildd/mongodb-1.4.4/debian/mongodb-server.lintian': No such file or directory
make: *** [install] Error 1
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2

[lp:~clint-fewbar/ubuntu/maverick/mongodb/add-xulrunner-wrapper]

12. By Clint Byrum on 2010-09-22

Removing debian/mongodb-clients.lintian -- rpath is no longer used

13. By Clint Byrum on 2010-09-22

removing lintian overrides from .install files

[Clint Byrum (clint-fewbar)]

Hi Micah, I removed mongodb-clients.lintian and the corresponding lines for both lintian overrides from debian/rules and *.install

I had this build failure in pbuilder:

...
g++ -o tools/export.o -c -Wnon-virtual-dtor -fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -O3 -D_SCONS -DXULRUNNER -DOLDJS -DXP_UNIX -DOLDJS -I/usr/include/nspr -I/usr/include/xulrunner-1.9.2.10/stable -I/usr/include/xulrunner-1.9.2.10/unstable -I/usr/include/xulrunner-1.9.2.10 -I. tools/export.cpp
g++ -o mongoexport -fPIC -pthread -rdynamic stdafx.o buildinfo.o db/common.o db/jsobj.o db/json.o db/lasterror.o db/nonce.o db/queryutil.o shell/mongo.o util/background.o util/mmap.o util/sock.o util/util.o util/message.o util/assert_util.o util/httpclient.o util/md5main.o util/base64.o util/debug_util.o util/thread_pool.o util/md5.o client/connpool.o client/dbclient.o client/model.o client/parallel.o client/syncclusterconnection.o scripting/engine.o scripting/utils.o util/mmap_posix.o util/processinfo_linux2.o scripting/engine_spidermonkey.o db/commands.o db/query.o db/update.o db/introspect.o db/btree.o db/clientcursor.o db/tests.o db/repl.o db/btreecursor.o db/cloner.o db/namespace.o db/matcher.o db/dbeval.o db/dbwebserver.o db/dbhelpers.o db/instance.o db/database.o db/pdfile.o db/cursor.o db/security_commands.o db/client.o db/security.o util/miniwebserver.o db/storage.o db/reccache.o db/queryoptimizer.o db/extsort.o db/mr.o s/d_util.o db/cmdline.o db/index.o db/index_geo2d.o db/dbcommands.o db/dbcommands_admin.o db/stats/counters.o db/stats/snapshots.o db/stats/top.o db/driverHelpers.o s/d_logic.o db/module.o db/modules/mms.o client/gridfs.o tools/tool.o tools/export.o -L/usr/lib/xulrunner-1.9.2.10 -lstdc++ -lboost_system-mt -lboost_thread-mt -lboost_filesystem-mt -lboost_program_options-mt -lpcrecpp -lpcre -lmozjs
collect2: ld returned 1 exit status
scons: *** [mongoexport] Error 1
scons: building terminated because of errors.
make: *** [install] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2

I've uploaded it to a PPA to see if maybe there was just something wrong with my builder setup..

https://launchpad.net/~clint-fewbar/+archive/fixes/+build/1970065

[lp:~clint-fewbar/ubuntu/maverick/mongodb/add-xulrunner-wrapper]

14. By Clint Byrum on 2010-09-29

more robust way to add items to LD_LIBRARY_PATH per micahg and kees

[Clint Byrum (clint-fewbar)]

After discussing this with micahg, I just pushed a new version up that uses a more robust method to add to LD_LIBRARY_PATH.

[Micah Gersten (micahg)]

This looks, good I just need to check one thing with the security team before I upload. It now builds and will make a source build w/out issue. Thanks for all the hard work!

=== modified file 'SConstruct'
--- SConstruct	2010-07-09 21:26:05 +0000
+++ SConstruct	2010-09-29 21:59:44 +0000
@@ -672,8 +672,8 @@
     if not nojni:
         javaLibs += [ "java" , "jvm" ]
 
-    env.Append( LINKFLAGS="-Xlinker -rpath -Xlinker " + javaHome + "jre/lib/" + javaVersion + "/server" )
-    env.Append( LINKFLAGS="-Xlinker -rpath -Xlinker " + javaHome + "jre/lib/" + javaVersion  )
+    env.Append( LINKFLAGS="-Xlinker -Xlinker " + javaHome + "jre/lib/" + javaVersion + "/server" )
+    env.Append( LINKFLAGS="-Xlinker -Xlinker " + javaHome + "jre/lib/" + javaVersion  )
 
 if nix:
     env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )

=== modified file 'buildscripts/hacks_ubuntu.py'
--- buildscripts/hacks_ubuntu.py	2010-06-10 15:25:34 +0000
+++ buildscripts/hacks_ubuntu.py	2010-09-29 21:59:44 +0000
@@ -36,7 +36,6 @@
         return False
     
     env.Prepend( LIBPATH=[ libroot ] )
-    env.Prepend( RPATH=[ libroot ] )
 
     env.Prepend( CPPPATH=[ incroot + "stable/" , 
                            incroot + "unstable/" ,
@@ -44,6 +43,10 @@
     env.Prepend( CPPPATH=[ "/usr/include/nspr/" ] )
     
     env.Append( CPPDEFINES=[ "XULRUNNER" , "OLDJS" ] )
+
+    # Needed to run tests
+    env.AppendENVPath('LD_LIBRARY_PATH', libroot)
+
     if best.find( "1.9.0" ) >= 0 or best.endswith("1.9"):
         if best.endswith( "1.9.1.9" ):
             pass

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-10 06:40:58 +0000
+++ debian/changelog	2010-09-29 21:59:44 +0000
@@ -1,3 +1,19 @@
+mongodb (1:1.4.4-2ubuntu2) maverick; urgency=low
+
+  * Providing a wrapper for xulrunner (LP: #557024)
+    - Moves all binaries under /usr/lib/mongodb
+    - adds xulwrapper script to mongodb-clients
+    - Sets up symlinks to xulwrapper in /usr/bin for all binaries in
+      /usr/lib/mongodb
+    - Adding dependency on xulrunner-1.9.2 to mongodb-clients as these
+      binaries require the library as well.
+    - patched SConstruct + buildscripts/hacks_ubuntu.py: removing rpath 
+      because wrapper is used
+    - Removing debian/mongodb-server.lintian -- rpath is no longer used
+    - Removing debian/mongodb-clients.lintian -- rpath is no longer used
+
+ -- Clint Byrum <[e-mail]>  Tue, 21 Sep 2010 22:02:12 -0700
+
 mongodb (1:1.4.4-2ubuntu1) maverick; urgency=low
 
   * Merge from debian unstable (LP: #605383). Remaining changes:

=== modified file 'debian/control'
--- debian/control	2010-07-10 06:40:58 +0000
+++ debian/control	2010-09-29 21:59:44 +0000
@@ -57,7 +57,8 @@
 
 Package: mongodb-clients
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ xulrunner-1.9.2
 Replaces: mongodb (<= 1:1.4.2-2)
 Description: An object/document-oriented database (client apps)
  MongoDB is a high-performance, open source, schema-free 

=== modified file 'debian/copyright'
--- debian/copyright	2010-06-07 08:27:36 +0000
+++ debian/copyright	2010-09-29 21:59:44 +0000
@@ -228,3 +228,24 @@
 
     L. Peter Deutsch
     [e-mail]
+
+Files: debian/xulwrapper
+Copyright: Copyright (c) 2010, Canonical Ltd.
+License: GPL-2+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+  .
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  .
+  You should have received a copy of the GNU General Public License
+  along with this program; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.
+  .
+  On Debian systems the full text of the license is available at 
+  /usr/share/common-licenses/GPL-2

=== modified file 'debian/mongodb-clients.install'
--- debian/mongodb-clients.install	2010-05-11 22:21:13 +0000
+++ debian/mongodb-clients.install	2010-09-29 21:59:44 +0000
@@ -1,11 +1,11 @@
-usr/bin/mongo
-usr/bin/mongodump
-usr/bin/mongoexport
-usr/bin/mongofiles
-usr/bin/mongoimport
-usr/bin/mongorestore
-usr/bin/mongostat
-usr/share/lintian/overrides/mongodb-clients
+usr/bin/mongo usr/lib/mongodb
+usr/bin/mongodump usr/lib/mongodb
+usr/bin/mongoexport usr/lib/mongodb
+usr/bin/mongofiles usr/lib/mongodb
+usr/bin/mongoimport usr/lib/mongodb
+usr/bin/mongorestore usr/lib/mongodb
+usr/bin/mongostat usr/lib/mongodb
+debian/xulwrapper usr/lib/mongodb
 usr/share/man/man1/mongo.1
 usr/share/man/man1/mongodump.1
 usr/share/man/man1/mongoexport.1

=== removed file 'debian/mongodb-clients.lintian'
--- debian/mongodb-clients.lintian	2010-05-11 22:21:13 +0000
+++ debian/mongodb-clients.lintian	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-# Agreed with upstream, that redefining rpath is necessary as xulrunner used to
-# change API without changing so-name
-mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongo /usr/lib64/xulrunner-1.9.1
-mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongodump /usr/lib64/xulrunner-1.9.1
-mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongoexport /usr/lib64/xulrunner-1.9.1
-mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongofiles /usr/lib64/xulrunner-1.9.1
-mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongoimport /usr/lib64/xulrunner-1.9.1
-mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongorestore /usr/lib64/xulrunner-1.9.1
-mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongostat /usr/lib64/xulrunner-1.9.1

=== modified file 'debian/mongodb-server.install'
--- debian/mongodb-server.install	2010-05-11 22:21:13 +0000
+++ debian/mongodb-server.install	2010-09-29 21:59:44 +0000
@@ -1,6 +1,5 @@
 etc
-usr/bin/mongod
-usr/bin/mongos
-usr/share/lintian/overrides/mongodb-server
+usr/bin/mongod usr/lib/mongodb
+usr/bin/mongos usr/lib/mongodb
 usr/share/man/man1/mongod.1
 usr/share/man/man1/mongos.1

=== removed file 'debian/mongodb-server.lintian'
--- debian/mongodb-server.lintian	2010-05-11 22:21:13 +0000
+++ debian/mongodb-server.lintian	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-# Agreed with upstream, that redefining rpath is necessary as xulrunner used to
-# change API without changing so-name
-mongodb-server: binary-or-shlib-defines-rpath ./usr/bin/mongod /usr/lib64/xulrunner-1.9.1
-mongodb-server: binary-or-shlib-defines-rpath ./usr/bin/mongos /usr/lib64/xulrunner-1.9.1

=== modified file 'debian/rules'
--- debian/rules	2010-05-11 22:21:13 +0000
+++ debian/rules	2010-09-29 21:59:44 +0000
@@ -70,6 +70,7 @@
 	rm -f buildinfo.cpp
 	rm -rf debian/tmp-test
 	rm -f debian/mongodb.upstart
+	chmod -x debian/xulwrapper
 	dh_clean debian/files
 
 install: build
@@ -80,12 +81,6 @@
 
 	scons --prefix=$(CURDIR)/debian/tmp/usr install
 
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian/overrides/
-	install -m 644 $(CURDIR)/debian/mongodb-server.lintian \
-		$(CURDIR)/debian/tmp/usr/share/lintian/overrides/mongodb-server
-	install -m 644 $(CURDIR)/debian/mongodb-clients.lintian \
-		$(CURDIR)/debian/tmp/usr/share/lintian/overrides/mongodb-clients
-
 	mkdir -p $(CURDIR)/debian/tmp/etc
 	install -m 644 $(CURDIR)/debian/mongodb.conf \
 		$(CURDIR)/debian/tmp/etc/mongodb.conf
@@ -93,6 +88,8 @@
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/man/man1
 	install -m 644 $(CURDIR)/debian/*.1 \
 		$(CURDIR)/debian/tmp/usr/share/man/man1
+	chmod +x debian/xulwrapper
+
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -115,6 +112,8 @@
 	dh_installinit -pmongodb-server --name=mongodb
 #	dh_installinfo
 	dh_installman
+	for i in `ls debian/mongodb-server/usr/lib/mongodb` ; do dh_link -p mongodb-server usr/lib/mongodb/xulwrapper usr/bin/$$i ; done
+	for i in `ls debian/mongodb-clients/usr/lib/mongodb` ; do if [ "$$i" != "xulwrapper" ] ; then dh_link -p mongodb-clients usr/lib/mongodb/xulwrapper usr/bin/$$i ; fi ; done
 	dh_link
 	dh_strip
 	dh_compress

=== added file 'debian/xulwrapper'
--- debian/xulwrapper	1970-01-01 00:00:00 +0000
+++ debian/xulwrapper	2010-09-29 21:59:44 +0000
@@ -0,0 +1,32 @@
+#!/bin/sh
+# xulwrapper - a tiny wrapper for starting mongodb
+#
+# Copyright (c) 2010, Canonical Ltd.
+# Author: Clint Byrum <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+# This wrapper is necessary as xulrunner does not follow normal library sematics
+# Please see https://bugs.launchpad.net/ubuntu/+source/xulrunner-1.9.2/+bug/286906
+# for more information.
+#
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/lib/xulrunner-`xulrunner-1.9.2 --gre-version`
+bname=`basename $0`
+if [ "$bname" = "xulwrapper" ] ; then
+    echo xulwrapper must not be used to wrap itself. Paradox avoided.
+    exit 1
+fi
+exec "/usr/lib/mongodb/$bname" "$@"