updates

Author: yebyen

urbinit-base/Dockerfile

@@ -1,4 +1,3 @@
 FROM yebyen/baseimage:i386
-RUN /usr/bin/apt-get update
-RUN /usr/bin/apt-get -y dist-upgrade
-RUN /usr/bin/apt-get -y install apt-utils dialog libterm-readline-perl-perl libgmp3-dev libsigsegv-dev openssl libssl-dev libncurses5-dev git make exuberant-ctags wget screen tmux unzip gcc g++ automake libtool autoconf cmake
+RUN /usr/bin/apt-get update && /usr/bin/apt-get -y install apt-utils dialog libterm-readline-perl-perl libgmp3-dev libsigsegv-dev openssl libssl-dev libncurses5-dev git make exuberant-ctags wget screen tmux unzip gcc g++ automake libtool autoconf cmake
+#RUN /usr/bin/apt-get -y dist-upgrade

urbinit-src/Dockerfile

@@ -1,4 +1,5 @@
 FROM yebyen/urbinit:base-i686
 RUN /usr/bin/apt-get clean
 ADD urbit-i386.diff /
-RUN git clone https://github.com/urbit/urbit /urbit && cd /urbit && patch -p1 < /urbit-i386.diff
+RUN git clone https://github.com/urbit/urbit /urbit && cd /urbit && git clone https://github.com/urbit/arvo && patch -p1 < /urbit-i386.diff
+RUN curl -o urbit.pill https://bootstrap.urbit.org/latest.pill

urbinit-src/urbit-i386.diff

@@ -1,36 +1,52 @@
 diff --git a/Makefile b/Makefile
-index e692e9d..15e051f 100644
+index 83ea4eb..894be2c 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -35,7 +35,7 @@ BIN=bin
- 
- LIB=$(shell pwd)/urb
+@@ -49,7 +49,7 @@ ifneq (,$(wildcard /usr/local/opt/openssl/.))
+   OPENSSLLIB=-L/usr/local/opt/openssl/lib
+ endif
 
 -RM=rm -f
 +RM=rm -rf
  ifneq ($(UNAME),FreeBSD)
  CC=gcc
  CXX=g++
-@@ -459,6 +459,7 @@ debinstall:
+@@ -485,8 +485,10 @@ osxpackage:
+ 	$(MAKE) $(BIN)/urbit LIB=/usr/local/lib/urb STATIC=yes
+ 	mkdir -p inst/usr/local/lib/urb inst/usr/local/bin
+ 	cp $(BIN)/urbit inst/usr/local/bin
+-	cp urb/urbit.pill inst/usr/local/lib/urb
+-	cp -R urb/zod inst/usr/local/lib/urb
++	cp urbit.pill inst/usr/local/lib/urb
++	#cp -R urb/zod inst/usr/local/lib/urb
++	mkdir -p inst/usr/local/lib/urb
++	cp -R arvo inst/usr/local/lib/urb/arvo
+ 	pkgbuild --root inst --identifier org.urbit.urbit --version 0.2 urbit.pkg
+ 
+ debbuild:
+@@ -495,12 +497,14 @@ debbuild:
+ debinstall:
+ 	mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/share/urb
+ 	install -m755 $(BIN)/urbit $(DESTDIR)/usr/bin
+-	cp urb/urbit.pill $(DESTDIR)/usr/share/urb
+-	cp -R urb/zod $(DESTDIR)/usr/share/urb
++	cp urbit.pill $(DESTDIR)/usr/share/urb
++	#cp -R urb/zod $(DESTDIR)/usr/share/urb
++	mkdir -p $(DESTDIR)/usr/share/urb
++	cp -R arvo $(DESTDIR)/usr/share/urb/arvo
 
  clean:
- 	$(RM) $(VERE_OFILES) $(BIN)/urbit urbit.pkg $(VERE_DFILES)
-+	$(RM) debian/files debian/urbit*
+ 	$(RM) $(VERE_OFILES) $(BIN)/urbit urbit.pkg $(VERE_DFILES) $(TAGS)
+-	$(RM) -r debian/files debian/urbit*
++	$(RM) -r debian/files debian/urbit* debian/.debhelper debian/debhelper-build-stamp
 
  # 'make distclean all -jn' ∀ n>1 still does not work because it is possible
  # Make will attempt to build urbit while it is also cleaning urbit..
-@@ -468,5 +469,6 @@ distclean: clean $(LIBUV_MAKEFILE)
- 	$(MAKE) -C outside/ed25519 clean
- 	$(MAKE) -C outside/anachronism clean
- 	$(MAKE) -C outside/scrypt clean
-+	$(RM) debian/files debian/urbit*
- 
- .PHONY: clean debbuild debinstalldistclean etags osxpackage tags
 diff --git a/include/noun/allocate.h b/include/noun/allocate.h
-index 26423f9..d6e1aff 100644
+index 7ab6b21..4a1310e 100644
 --- a/include/noun/allocate.h
 +++ b/include/noun/allocate.h
-@@ -19,7 +19,7 @@
+@@ -23,7 +23,7 @@
    **/
      /* u3a_bits: number of bits in word-addressed pointer.  29 == 2GB.
      */