Merge remote-tracking branch 'upstream/master' into zope4py2

software/beremiz-ide/software.cfg

@@ -47,6 +47,13 @@ part = python2.7
 [open62541]
 # Beremiz need it to be in folder parts/open62541
 # as Beremiz search for open62541 to BEREMIZ_PATH/../open62541
+configure-options =
+  -DBUILD_SHARED_LIBS=OFF
+  -DCMAKE_BUILD_TYPE=Release
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DUA_ENABLE_PUBSUB=ON
+  -DUA_ENABLE_SUBSCRIPTIONS=ON
+  -DUA_NAMESPACE_ZERO=REDUCED
 shared = false
 post-install =
   mkdir -p @@LOCATION@@/build/bin

software/erp5testnode/testsuite/deploy-test/standalone-local-playbook

@@ -1950,10 +1950,10 @@ function download_playbook {
     if [ ! -f /etc/opt/slapcache.cfg ]; then
       slapcache-conf
     fi
-    DFILE="/tmp/tmpplaybook$(basename $0).$$/"
+    DFILE=$(mktemp -d -t "$(basename "$0")"-XXXXXXXXXXXX)
     TFILE="archive.tar.gz"
     mkdir -p $DFILE
-    cd $DFILE
+    cd "$DFILE" || exit 1
     slapcache-download --destination=$TFILE
     tar -xzvf $TFILE
     rm $TFILE
@@ -2198,10 +2198,11 @@ if [ ! -f /etc/opt/slapcache.cfg ]; then
 fi
 sed -i "s/key = slapos-global-key/key = slapos-global-official-vifib-key/g" /etc/opt/slapcache.cfg 
 
-DFILE="/tmp/tmpplaybook_unstable$(basename $0).$$/"
+
+DFILE=$(mktemp -d -t "$(basename "$0")"-XXXXXXXXXXXX)
 TFILE="archive.tar.gz"
 mkdir -p $DFILE
-cd $DFILE
+cd "$DFILE" || exit 1
 wget -O $TFILE http://10.0.2.100/playbook.tar.gz
 tar -xzvf $TFILE
 rm $TFILE