Merge lp:~fginther/fake-juju/fix-i386-builds into lp:~landscape/fake-juju/trunk-old

[Francis Ginther]

Add a 2.0.0 patch for integer overflow error, https://github.com/go-mgo/mgo/pull/311.

Add a 2.0.0 patch for integer overflow error, https://github.com/go-mgo/mgo/pull/311.

i386 builds are failing on launchpad [1]. Googling uncovered the problem [2] and fix [3] which has been added to the juju 2.0.0 patch.

Testing instructions:
 - Build amd64 and i386 packages for xenial
   $ sbuild --arch i386 -d xenial-i386
   $ sbuild -d xenial-amd64

[1] - https://i294040893.restricted.launchpadlibrarian.net/294040893/buildlog_ubuntu-xenial-i386.fake-juju_0.18-0~56~ubuntu16.04.1_BUILDING.txt.gz?token=WDsSvGF8mmMKMsvbm4HTq5KB3ZdRt7Fp
[2] - https://github.com/go-mgo/mgo/issues/310
[3] - https://github.com/go-mgo/mgo/pull/311

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 58
Branch: lp:~fginther/fake-juju/fix-i386-builds
Jenkins: https://ci.lscape.net/job/latch-test-xenial/975/

review: Approve (test results)

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

=== modified file 'patches/juju-core_2.0.0.patch'
--- patches/juju-core_2.0.0.patch	2016-11-03 15:58:55 +0000
+++ patches/juju-core_2.0.0.patch	2016-11-21 14:39:24 +0000
@@ -63,3 +63,16 @@
  	var hostnames []string
  	srvCert, srvKey, err := cert.NewServer(CACert, CAKey, time.Now().AddDate(10, 0, 0), hostnames)
  	if err != nil {
+diff -U 3 -r --no-dereference ./2.0.0/.unpacked-clean/src/gopkg.in/mgo.v2/bson/json.go ./2.0.0/src/gopkg.in/mgo.v2/bson/json.go
+--- ./2.0.0/.unpacked-clean/src/gopkg.in/mgo.v2/bson/json.go	2016-10-13 09:32:16.000000000 -0500
++++ ./2.0.0/src/gopkg.in/mgo.v2/bson/json.go	2016-11-21 07:55:31.696036251 -0600
+@@ -317,7 +317,8 @@
+ func jencInt(v interface{}) ([]byte, error) {
+ 	n := v.(int)
+ 	f := `{"$numberLong":"%d"}`
+-	if n <= 1<<53 {
++	// fake-juju apply https://github.com/go-mgo/mgo/pull/311
++	if int64(n) <= 1<<53 {
+ 		f = `%d`
+ 	}
+ 	return fbytes(f, n), nil