From 7f44f8b19454437f668fe859dadfa90b6e67c2b3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 7 Oct 2017 12:55:48 +0100
Subject: [PATCH 01/17] Update profanity commits

---
 src/freedombone-app-profanity | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/freedombone-app-profanity b/src/freedombone-app-profanity
index 6ad9bdae..ba2cf822 100755
--- a/src/freedombone-app-profanity
+++ b/src/freedombone-app-profanity
@@ -37,10 +37,10 @@ LIBMESODE_REPO="https://github.com/boothj5/libmesode"
 LIBMESODE_COMMIT='b91872cf7e7ed4d2443ab5c622f4cdb395d64dbe'
 
 PROFANITY_REPO="https://github.com/boothj5/profanity"
-PROFANITY_COMMIT='f8b855b09f2c4e9b461b0b7854afabbecf6d5b4a'
+PROFANITY_COMMIT='ca1dcdda6cd6114061ff99963e59c76bd92e4603'
 
 PROFANITY_OMEMO_PLUGIN_REPO="https://github.com/ReneVolution/profanity-omemo-plugin"
-PROFANITY_OMEMO_PLUGIN_COMMIT='78be0c8367c6379829986755c0d1da287c031234'
+PROFANITY_OMEMO_PLUGIN_COMMIT='982612f9a16068366434771d8f55bbfc3e8d6822'
 
 xmpp_variables=(ONION_ONLY
                 INSTALLED_WITHIN_DOCKER

From 283c470d2189e6e5182f508645c3726fff6b9d28 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 7 Oct 2017 13:02:53 +0100
Subject: [PATCH 02/17] Deprecated mac

---
 src/freedombone-utils-ssh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedombone-utils-ssh b/src/freedombone-utils-ssh
index a261c5e5..67367b7b 100755
--- a/src/freedombone-utils-ssh
+++ b/src/freedombone-utils-ssh
@@ -32,7 +32,7 @@ SSH_PORT=2222
 
 # Settings from bettercrypto.org openssh 6.6+
 SSH_CIPHERS="chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes128-ctr"
-SSH_MACS="hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,hmac-ripemd160"
+SSH_MACS="hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256"
 SSH_KEX="curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256,diffie-hellman-group14-sha1,diffie-hellman-group-exchange-sha1"
 SSH_HOST_KEY_ALGORITHMS="ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-rsa-cert-v00@openssh.com,ssh-ed25519,ssh-rsa"
 

From c770026d472e481925e8df8e0f750d4dde0c7bf5 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 13 Oct 2017 17:56:59 +0100
Subject: [PATCH 03/17] Improve handling of npm install script

---
 src/freedombone-utils-nodejs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 37b23e2c..6b1e4fe7 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -85,13 +85,17 @@ function mesh_install_nodejs {
         exit 7235728
     fi
 
-    wget https://www.npmjs.com/install.sh -O $rootdir/root/npm_install.sh
+    $mesh_install_nodejs_prefix wget https://www.npmjs.com/install.sh -O /root/npm_install.sh
     if [ ! -f $rootdir/root/npm_install.sh ]; then
         echo $'Unable to download npm installer'
         exit 8793636
     fi
+    if ! grep -q "t=\"\${npm_install}\"" $rootdir/root/npm_install.sh; then
+        echo $'Unable to set npm version within npm_install.sh'
+        exit 629052
+    fi
     $mesh_install_nodejs_prefix chmod +x /root/npm_install.sh
-    sed -i "s|t=\"\${npm_install}\"|t=\"$NPM_VERSION\"|g" $rootdir/root/npm_install.sh
+    $mesh_install_nodejs_prefix sed -i "s|t=\"\${npm_install}\"|t=\"$NPM_VERSION\"|g" /root/npm_install.sh
     $mesh_install_nodejs_prefix /root/npm_install.sh
 
     if [ ! -f $rootdir/usr/bin/npm ]; then

From d2e907e5e217f49bb77090f88fed5d6938484bbb Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 13 Oct 2017 18:22:22 +0100
Subject: [PATCH 04/17] wget needed

---
 src/freedombone-utils-nodejs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 6b1e4fe7..ae0d8080 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -85,6 +85,7 @@ function mesh_install_nodejs {
         exit 7235728
     fi
 
+    $mesh_install_nodejs_prefix apt-get -qy install wget
     $mesh_install_nodejs_prefix wget https://www.npmjs.com/install.sh -O /root/npm_install.sh
     if [ ! -f $rootdir/root/npm_install.sh ]; then
         echo $'Unable to download npm installer'

From 2ae9c79f9d000150d9d8ac24716d94bca5985d8d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 13 Oct 2017 19:28:43 +0100
Subject: [PATCH 05/17] Make mesh npm install similar to previous methos

---
 src/freedombone-utils-nodejs | 71 +++++++++++++++++++++++-------------
 1 file changed, 46 insertions(+), 25 deletions(-)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index ae0d8080..ea4c719d 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -68,8 +68,31 @@ function mesh_install_nodejs {
         fi
         mesh_install_nodejs_prefix="chroot $rootdir"
     fi
-    $mesh_install_nodejs_prefix apt-get -yq install g++ m4 libtool automake nodejs curl
+
+    $mesh_install_nodejs_prefix apt-get -qy install wget curl g++ m4 libtool automake
     $mesh_install_nodejs_prefix apt-get -yq install libxext-dev libxtst-dev libxkbfile-dev
+    $mesh_install_nodejs_prefix wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key > /root/node.gpg.key
+    $mesh_install_nodejs_prefix apt-key add /root/node.gpg.key
+    echo "deb https://deb.nodesource.com/node_6.x stretch main" > $rootdir/etc/apt/sources.list.d/nodesource.list
+    echo "deb-src https://deb.nodesource.com/node_6.x stretch main" >> $rootdir/etc/apt/sources.list.d/nodesource.list
+
+    $mesh_install_nodejs_prefix apt-get update
+    $mesh_install_nodejs_prefix apt-get -yq remove --purge nodejs
+
+    if [ -d $rootdir/usr/local/lib/node_modules ]; then
+        rm -rf $rootdir/usr/local/lib/node_modules
+    fi
+    if [ -f $rootdir/usr/local/bin/node ]; then
+        rm $rootdir/usr/local/bin/node
+    fi
+    if [ -f $rootdir/usr/bin/node ]; then
+        rm /usr/bin/node
+    fi
+    if [ -f $rootdir/usr/bin/nodejs ]; then
+        rm $rootdir/usr/bin/nodejs
+    fi
+
+    $mesh_install_nodejs_prefix apt-get -yq install nodejs
 
     if [ ! -f ${rootdir}/usr/bin/nodejs ]; then
         echo $'nodejs was not installed'
@@ -85,28 +108,33 @@ function mesh_install_nodejs {
         exit 7235728
     fi
 
-    $mesh_install_nodejs_prefix apt-get -qy install wget
-    $mesh_install_nodejs_prefix wget https://www.npmjs.com/install.sh -O /root/npm_install.sh
-    if [ ! -f $rootdir/root/npm_install.sh ]; then
-        echo $'Unable to download npm installer'
-        exit 8793636
-    fi
-    if ! grep -q "t=\"\${npm_install}\"" $rootdir/root/npm_install.sh; then
-        echo $'Unable to set npm version within npm_install.sh'
-        exit 629052
-    fi
-    $mesh_install_nodejs_prefix chmod +x /root/npm_install.sh
-    $mesh_install_nodejs_prefix sed -i "s|t=\"\${npm_install}\"|t=\"$NPM_VERSION\"|g" /root/npm_install.sh
-    $mesh_install_nodejs_prefix /root/npm_install.sh
+    #$mesh_install_nodejs_prefix wget https://www.npmjs.com/install.sh -O /root/npm_install.sh
+    #if [ ! -f $rootdir/root/npm_install.sh ]; then
+    #    echo $'Unable to download npm installer'
+    #    exit 8793636
+    #fi
+    #if ! grep -q "t=\"\${npm_install}\"" $rootdir/root/npm_install.sh; then
+    #    echo $'Unable to set npm version within npm_install.sh'
+    #    exit 629052
+    #fi
+    #$mesh_install_nodejs_prefix chmod +x /root/npm_install.sh
+    #$mesh_install_nodejs_prefix sed -i "s|t=\"\${npm_install}\"|t=\"$NPM_VERSION\"|g" /root/npm_install.sh
+    #$mesh_install_nodejs_prefix /root/npm_install.sh
+    #
+    #if [ ! -f $rootdir/usr/bin/npm ]; then
+    #    echo $'npm was not installed'
+    #    exit 5290462
+    #fi
+    #cp $rootdir/usr/bin/npm $rootdir/root/npm
 
-    if [ ! -f $rootdir/usr/bin/npm ]; then
-        echo $'npm was not installed'
-        exit 5290462
+    get_npm_arch
+    $mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g npm@${NPM_VERSION} --save
+    if [ -f $rootdir/usr/local/bin/npm ]; then
+        cp $rootdir/usr/local/bin/npm /usr/bin/npm
     fi
     cp $rootdir/usr/bin/npm $rootdir/root/npm
 
     # update from the old debian nodejs version
-    get_npm_arch
     $mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g n@${NODEJS_N_VERSION} --save
     $mesh_install_nodejs_prefix n --arch $N_ARCH ${NODEJS_VERSION}
     cp $rootdir/root/npm $rootdir/usr/bin/npm
@@ -189,7 +217,6 @@ function install_nodejs {
 
 
     #if [ ! -f /usr/bin/nodejs ]; then
-        # Note: this has to be jessie for now
     #    wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key > /root/node.gpg.key
     #    apt-key add /root/node.gpg.key
     #    echo "deb https://deb.nodesource.com/node_6.x stretch main" > /etc/apt/sources.list.d/nodesource.list
@@ -227,12 +254,6 @@ function install_nodejs {
     #npm install -g pug@2.0.0-beta6 --save
     #npm install -g graceful-fs@4.1.10 --save
     #npm install -g minimatch@3.0.3 --save
-    npm install -g npm@${NPM_VERSION} --save
-
-    #cp /usr/local/bin/node /usr/bin/nodejs
-    if [ -f /usr/local/bin/npm ]; then
-        cp /usr/local/bin/npm /usr/bin/npm
-    fi
 
     # node seems tricky so here we're going to double check
     # that the versions we expect did get installed

From 146d88d3cf4deeda31fefc1f024b208cfdc7124d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 13 Oct 2017 19:56:31 +0100
Subject: [PATCH 06/17] Fix wget for nodejs repo key

---
 src/freedombone-utils-nodejs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index ea4c719d..11d8b853 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -71,7 +71,11 @@ function mesh_install_nodejs {
 
     $mesh_install_nodejs_prefix apt-get -qy install wget curl g++ m4 libtool automake
     $mesh_install_nodejs_prefix apt-get -yq install libxext-dev libxtst-dev libxkbfile-dev
-    $mesh_install_nodejs_prefix wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key > /root/node.gpg.key
+    $mesh_install_nodejs_prefix wget https://deb.nodesource.com/gpgkey/nodesource.gpg.key -O /root/node.gpg.key
+    if [ ! -f $rootdir/root/node.gpg.key ]; then
+        echo $'Unable to obtain gpg key for nodejs repo'
+        exit 6389252
+    fi
     $mesh_install_nodejs_prefix apt-key add /root/node.gpg.key
     echo "deb https://deb.nodesource.com/node_6.x stretch main" > $rootdir/etc/apt/sources.list.d/nodesource.list
     echo "deb-src https://deb.nodesource.com/node_6.x stretch main" >> $rootdir/etc/apt/sources.list.d/nodesource.list

From be43cf38a3c752f014080896340d1b7a54c0dde1 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 13 Oct 2017 20:22:12 +0100
Subject: [PATCH 07/17] https transport needed for nodejs install

---
 src/freedombone-utils-nodejs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 11d8b853..032e0ac2 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -69,8 +69,9 @@ function mesh_install_nodejs {
         mesh_install_nodejs_prefix="chroot $rootdir"
     fi
 
-    $mesh_install_nodejs_prefix apt-get -qy install wget curl g++ m4 libtool automake
+    $mesh_install_nodejs_prefix apt-get -yq install wget curl g++ m4 libtool automake
     $mesh_install_nodejs_prefix apt-get -yq install libxext-dev libxtst-dev libxkbfile-dev
+    $mesh_install_nodejs_prefix apt-get -yq install apt-transport-https
     $mesh_install_nodejs_prefix wget https://deb.nodesource.com/gpgkey/nodesource.gpg.key -O /root/node.gpg.key
     if [ ! -f $rootdir/root/node.gpg.key ]; then
         echo $'Unable to obtain gpg key for nodejs repo'

From c23cd4aee5800dfac1d4bb276bf20d0a949218aa Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 13 Oct 2017 20:50:21 +0100
Subject: [PATCH 08/17] Check multiple possible nodes

---
 src/freedombone-utils-nodejs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 032e0ac2..7e06fa79 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -98,16 +98,25 @@ function mesh_install_nodejs {
     fi
 
     $mesh_install_nodejs_prefix apt-get -yq install nodejs
-
-    if [ ! -f ${rootdir}/usr/bin/nodejs ]; then
-        echo $'nodejs was not installed'
-        exit 63962
+    CURR_NODE_VERSION=$(node --version)
+    if [[ "$CURR_NODE_VERSION" != "v${NODEJS_VERSION}" ]]; then
+        echo $"Expected node version $NODEJS_VERSION but actually have $CURR_NODE_VERSION"
+        exit 5274527
     fi
 
     if [ -f $rootdir/usr/bin/nodejs ]; then
         cp $rootdir/usr/bin/nodejs $rootdir/usr/bin/node
     fi
 
+    if [ ! -f ${rootdir}/usr/bin/node ]; then
+        if [ ! -f ${rootdir}/usr/local/bin/node ]; then
+            if [ ! -f ${rootdir}/usr/bin/nodejs ]; then
+                echo $'nodejs was not installed'
+                exit 63962
+            fi
+        fi
+    fi
+
     if [ ! -f $rootdir/usr/bin/node ]; then
         echo $'/usr/bin/node not found'
         exit 7235728

From 4055590fccfc014317bba6804013776141adbfe0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 13 Oct 2017 21:55:22 +0100
Subject: [PATCH 09/17] Try n without arch

---
 src/freedombone-app-ipfs     | 3 ---
 src/freedombone-utils-nodejs | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs
index 2c0cdac2..9f7d7e2b 100755
--- a/src/freedombone-app-ipfs
+++ b/src/freedombone-app-ipfs
@@ -221,7 +221,6 @@ function mesh_install_ipfs_js {
         return
     fi
 
-    chroot ${rootdir} apt-get -yq install nodejs curl
     chroot ${rootdir} apt-get -yq install libpam0g-dev fuse
 
     if [ ! -f ${rootdir}/usr/bin/nodejs ]; then
@@ -300,8 +299,6 @@ function install_ipfs_js {
         return
     fi
 
-    apt-get -yq install nodejs
-    apt-get -yq install npm
     apt-get -yq install libpam0g-dev fuse
 
     if [ ! -f /usr/bin/nodejs ]; then
diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 7e06fa79..6d543888 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -150,7 +150,7 @@ function mesh_install_nodejs {
 
     # update from the old debian nodejs version
     $mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g n@${NODEJS_N_VERSION} --save
-    $mesh_install_nodejs_prefix n --arch $N_ARCH ${NODEJS_VERSION}
+    $mesh_install_nodejs_prefix n ${NODEJS_VERSION}
     cp $rootdir/root/npm $rootdir/usr/bin/npm
 }
 

From 2ff74be3997b0e66482490510bc79c9aa30b20e4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 13 Oct 2017 22:31:45 +0100
Subject: [PATCH 10/17] Don't check nodejs version right away

---
 src/freedombone-utils-nodejs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 6d543888..0a7666f6 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -98,11 +98,6 @@ function mesh_install_nodejs {
     fi
 
     $mesh_install_nodejs_prefix apt-get -yq install nodejs
-    CURR_NODE_VERSION=$(node --version)
-    if [[ "$CURR_NODE_VERSION" != "v${NODEJS_VERSION}" ]]; then
-        echo $"Expected node version $NODEJS_VERSION but actually have $CURR_NODE_VERSION"
-        exit 5274527
-    fi
 
     if [ -f $rootdir/usr/bin/nodejs ]; then
         cp $rootdir/usr/bin/nodejs $rootdir/usr/bin/node

From 007c1cb898d5c44cf74f2fd9384233d505068117 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 13 Oct 2017 22:34:48 +0100
Subject: [PATCH 11/17] Return of the n_arch

---
 src/freedombone-utils-nodejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 0a7666f6..8599b937 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -145,7 +145,7 @@ function mesh_install_nodejs {
 
     # update from the old debian nodejs version
     $mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g n@${NODEJS_N_VERSION} --save
-    $mesh_install_nodejs_prefix n ${NODEJS_VERSION}
+    $mesh_install_nodejs_prefix n --arch $N_ARCH ${NODEJS_VERSION}
     cp $rootdir/root/npm $rootdir/usr/bin/npm
 }
 

From 6ec336da062d1a3c8620a5c79a34eb8f00ff4d4d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 13 Oct 2017 23:06:27 +0100
Subject: [PATCH 12/17] Attempt npm install fix

---
 src/freedombone-utils-nodejs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 8599b937..c6648fc6 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -137,6 +137,8 @@ function mesh_install_nodejs {
     #cp $rootdir/usr/bin/npm $rootdir/root/npm
 
     get_npm_arch
+
+    $mesh_install_nodejs_prefix npm config set unsafe-perm true
     $mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g npm@${NPM_VERSION} --save
     if [ -f $rootdir/usr/local/bin/npm ]; then
         cp $rootdir/usr/local/bin/npm /usr/bin/npm

From 4a8491e76b46e3fce190a369bc0091af41bd9565 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 14 Oct 2017 10:36:03 +0100
Subject: [PATCH 13/17] nodejs version

---
 src/freedombone-utils-nodejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index c6648fc6..030b18b8 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -35,7 +35,7 @@ VARIANTS='mesh'
 
 # change these versions at your peril. Things will often crash if you don't
 # have specifically the correct versions
-NODEJS_VERSION='6.11.3'
+NODEJS_VERSION='6.11.4'
 NODEJS_N_VERSION='2.1.7'
 NPM_VERSION='4.0.5'
 

From d01ca752248ccc9bd012926852fc6a8079e847fa Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 14 Oct 2017 11:17:24 +0100
Subject: [PATCH 14/17] node n version

---
 src/freedombone-utils-nodejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 030b18b8..48568c63 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -36,7 +36,7 @@ VARIANTS='mesh'
 # change these versions at your peril. Things will often crash if you don't
 # have specifically the correct versions
 NODEJS_VERSION='6.11.4'
-NODEJS_N_VERSION='2.1.7'
+NODEJS_N_VERSION='2.1.8'
 NPM_VERSION='4.0.5'
 
 # This file keeps track of the apps needing nodejs

From bd795f62e54c5fc3396d72987278de99115f051f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 14 Oct 2017 11:58:02 +0100
Subject: [PATCH 15/17] n architecture for arm

---
 src/freedombone-utils-nodejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 48568c63..1eb7e70e 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -48,7 +48,7 @@ function get_npm_arch {
     NPM_ARCH='ia32'
     if [[ $ARCHITECTURE == 'arm'* ]]; then
         NPM_ARCH='armv7l'
-        N_ARCH='arm'
+        N_ARCH='armv7l'
     fi
     if [[ $ARCHITECTURE == *"aarch"* ]]; then
         NPM_ARCH='arm64'

From 08e772eed53f65e2006b35f9bba98bad32fc2afb Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 14 Oct 2017 12:29:20 +0100
Subject: [PATCH 16/17] Tidying of nodejs install

---
 src/freedombone-utils-nodejs | 62 +-----------------------------------
 1 file changed, 1 insertion(+), 61 deletions(-)

diff --git a/src/freedombone-utils-nodejs b/src/freedombone-utils-nodejs
index 1eb7e70e..6ec4451c 100755
--- a/src/freedombone-utils-nodejs
+++ b/src/freedombone-utils-nodejs
@@ -117,25 +117,6 @@ function mesh_install_nodejs {
         exit 7235728
     fi
 
-    #$mesh_install_nodejs_prefix wget https://www.npmjs.com/install.sh -O /root/npm_install.sh
-    #if [ ! -f $rootdir/root/npm_install.sh ]; then
-    #    echo $'Unable to download npm installer'
-    #    exit 8793636
-    #fi
-    #if ! grep -q "t=\"\${npm_install}\"" $rootdir/root/npm_install.sh; then
-    #    echo $'Unable to set npm version within npm_install.sh'
-    #    exit 629052
-    #fi
-    #$mesh_install_nodejs_prefix chmod +x /root/npm_install.sh
-    #$mesh_install_nodejs_prefix sed -i "s|t=\"\${npm_install}\"|t=\"$NPM_VERSION\"|g" /root/npm_install.sh
-    #$mesh_install_nodejs_prefix /root/npm_install.sh
-    #
-    #if [ ! -f $rootdir/usr/bin/npm ]; then
-    #    echo $'npm was not installed'
-    #    exit 5290462
-    #fi
-    #cp $rootdir/usr/bin/npm $rootdir/root/npm
-
     get_npm_arch
 
     $mesh_install_nodejs_prefix npm config set unsafe-perm true
@@ -226,48 +207,7 @@ function install_nodejs {
     rootdir=
     mesh_install_nodejs
 
-
-    #if [ ! -f /usr/bin/nodejs ]; then
-    #    wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key > /root/node.gpg.key
-    #    apt-key add /root/node.gpg.key
-    #    echo "deb https://deb.nodesource.com/node_6.x stretch main" > /etc/apt/sources.list.d/nodesource.list
-    #    echo "deb-src https://deb.nodesource.com/node_6.x stretch main" >> /etc/apt/sources.list.d/nodesource.list
-
-    #    apt-get update
-
-    #    apt-get -yq remove --purge nodejs
-
-    #    if [ -d /usr/local/lib/node_modules ]; then
-    #        rm -rf /usr/local/lib/node_modules
-    #    fi
-    #    if [ -f /usr/local/bin/node ]; then
-    #        rm /usr/local/bin/node
-    #    fi
-    #    if [ -f /usr/bin/node ]; then
-    #        rm /usr/bin/node
-    #    fi
-    #    if [ -f /usr/bin/nodejs ]; then
-    #        rm /usr/bin/nodejs
-    #    fi
-
-    #    apt-get -yq install nodejs
-    #    apt-get -yq install curl
-
-    #    if [ ! -f /usr/bin/nodejs ]; then
-    #        echo $'nodejs was not installed'
-    #        exit 63962
-    #    fi
-    #fi
-
-    #npm install -g npm@${NPM_VERSION} --save
-    #npm install -g n@${NODEJS_N_VERSION} --save
-    #n ${NODEJS_VERSION}
-    #npm install -g pug@2.0.0-beta6 --save
-    #npm install -g graceful-fs@4.1.10 --save
-    #npm install -g minimatch@3.0.3 --save
-
-    # node seems tricky so here we're going to double check
-    # that the versions we expect did get installed
+    # verify nodejs versions are what we expect
     CURR_NODE_VERSION=$(node --version)
     CURR_NPM_VERSION=$(npm --version)
     CURR_N_VERSION=$(n --version)

From 5ee805326526f9df902769b6a950be7fcdff55f6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 14 Oct 2017 14:42:11 +0100
Subject: [PATCH 17/17] Move Sharings plugin repos to github

---
 src/freedombone-utils-gnusocialtools | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools
index 6b96a779..231238a4 100755
--- a/src/freedombone-utils-gnusocialtools
+++ b/src/freedombone-utils-gnusocialtools
@@ -35,10 +35,10 @@ QVITTER_THEME_COMMIT='c6f09bda4e45be4290cf7409fa5efb4420538032'
 PLEROMA_REPO="https://gitgud.io/lambadalambda/pleroma-fe"
 PLEROMA_COMMIT='cbe652f2d94d81fa54a37378b7ff014c4391ca5e'
 
-SHARINGS_REPO="http://git.lasindias.club/bashrc/Sharings"
-SHARINGS_COMMIT='d5c6c7f855d9afff9086c09ea706f38c859bc0d4'
-SHARINGS_THEME_REPO="http://git.lasindias.club/manuel/SharingsTheme"
-SHARINGS_THEME_COMMIT='7106c7ef03'
+SHARINGS_REPO="http://github.com/bashrc/Sharings"
+SHARINGS_COMMIT='0d30fe7d153c7ab44e8459970b8f2b5dec06e43c'
+SHARINGS_THEME_REPO="http://github.com/bashrc/SharingsTheme"
+SHARINGS_THEME_COMMIT='a46ef375d19e8ef6889653668a7e697b0ba2013c'
 
 GNUSOCIAL_MARKDOWN_REPO="https://git.gnu.io/chimo/markdown.git"
 GNUSOCIAL_MARKDOWN_COMMIT='03c53942f94b3376f0946e6e1fe566cc21ccf232'