Merge branch 'stretch' of https://github.com/bashrc/freedombone

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

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

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_REPO="http://github.com/bashrc/Sharings"
-SHARINGS_COMMIT='d5c6c7f855d9afff9086c09ea706f38c859bc0d4'
+SHARINGS_COMMIT='0d30fe7d153c7ab44e8459970b8f2b5dec06e43c'
-SHARINGS_THEME_REPO="http://git.lasindias.club/manuel/SharingsTheme"
+SHARINGS_THEME_REPO="http://github.com/bashrc/SharingsTheme"
-SHARINGS_THEME_COMMIT='7106c7ef03'
+SHARINGS_THEME_COMMIT='a46ef375d19e8ef6889653668a7e697b0ba2013c'
 
 GNUSOCIAL_MARKDOWN_REPO="https://git.gnu.io/chimo/markdown.git"
 GNUSOCIAL_MARKDOWN_COMMIT='03c53942f94b3376f0946e6e1fe566cc21ccf232'

src/freedombone-utils-nodejs

@@ -35,8 +35,8 @@ 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'
+NODEJS_N_VERSION='2.1.8'
 NPM_VERSION='4.0.5'
 
 # This file keeps track of the apps needing 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'
@@ -68,40 +68,65 @@ 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 -yq install libxext-dev libxtst-dev libxkbfile-dev
 
-    if [ ! -f ${rootdir}/usr/bin/nodejs ]; then
+    $mesh_install_nodejs_prefix apt-get -yq install wget curl g++ m4 libtool automake
-        echo $'nodejs was not installed'
+    $mesh_install_nodejs_prefix apt-get -yq install libxext-dev libxtst-dev libxkbfile-dev
-        exit 63962
+    $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'
+        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
+
+    $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
         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
     fi
 
-    wget https://www.npmjs.com/install.sh -O $rootdir/root/npm_install.sh
+    get_npm_arch
-    if [ ! -f $rootdir/root/npm_install.sh ]; then
-        echo $'Unable to download npm installer'
-        exit 8793636
-    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 /root/npm_install.sh
 
-    if [ ! -f $rootdir/usr/bin/npm ]; then
+    $mesh_install_nodejs_prefix npm config set unsafe-perm true
-        echo $'npm was not installed'
+    $mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g npm@${NPM_VERSION} --save
-        exit 5290462
+    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
@@ -182,55 +207,7 @@ function install_nodejs {
     rootdir=
     mesh_install_nodejs
 
-
+    # verify nodejs versions are what we expect
-    #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
-    #    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
-    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
     CURR_NODE_VERSION=$(node --version)
     CURR_NPM_VERSION=$(npm --version)
     CURR_N_VERSION=$(n --version)

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"