Update Release Candidate

component/macros/virtual-env.cfg

+[buildout]
+extends =
+	../pygolang/buildout.cfg
+
+[virtual-env-base]
+recipe = slapos.recipe.build
+_name = ${:_buildout_section_name_}
+init =
+  from zc.buildout.easy_install import working_set
+  import os
+  name = options['_name']
+  eggs = options['eggs']
+  try:
+    scripts = "scripts = " + options['scripts']
+  except KeyError:
+    scripts = ""
+
+  self.buildout.parse("""
+  [.%(name)s.install-eggs]
+  recipe = zc.recipe.egg
+  eggs = %(eggs)s
+  %(scripts)s
+
+  [.%(name)s.install-interpreter]
+  <= python-interpreter
+  eggs += %(eggs)s
+  """ % locals())
+install =
+  with open(location, "w") as f:
+    f.write(options['template'] % {
+      "path" : self.buildout['buildout']['bin-directory'],
+      "name" : self.name,
+    })
+
+# Template virtual env for bash shell in posix
+[virtual-env-base:posix]
+template =
+  deactivate () {
+    set PATH PS1
+    while [ "$1" ]; do
+      eval "if [ \"\$_OLD_VENV_$1\" ]; then $1=\$_OLD_VENV_$1; else unset $1; fi; unset \$_OLD_VENV_$1"
+      shift
+    done
+    unset -f deactivate
+  }
+
+
+  VENV_PATH=%(path)s
+  _OLD_VENV_PATH=$PATH
+  _OLD_VENV_PS1=$PS1
+  PATH=$VENV_PATH:$PATH
+  PS1='(%(name)s) '$PS1

component/mariadb/buildout.cfg

@@ -81,7 +81,7 @@ environment =
   PATH=${patch:location}/bin:%(PATH)s
 patch-options = -p1
 patches =
-  https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.22-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
+  https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.34-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
 post-install = 
   ldd=`ldd %(location)s/lib/plugin/ha_rocksdb.so`
   for x in ${lz4:location} ${snappy:location} ${zstd:location}

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.236'
+version = '1.0.237'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 

slapos/recipe/generic_mysql/mysql.py

@@ -8,7 +8,7 @@ import pytz
 
 def updateMysql(mysql_upgrade_binary, mysql_binary, mysql_script_file):
   sleep = 0
-  with open(mysql_script_file, 'rb') as script_file:
+  with open(mysql_script_file, 'r') as script_file:
     mysql_script = script_file.read()
   mysql_list = mysql_binary, '-B'
   mysql_tzinfo_to_sql_list = (

software/django-dev/software.cfg

+[buildout]
+extends =
+  ../../stack/slapos.cfg
+  ../../component/macros/virtual-env.cfg
+
+parts =
+  instance
+  slapos-cookbook
+
+[python]
+part = python3
+
+[django-env]
+<= virtual-env-base
+location = ${buildout:directory}/activate
+eggs = Django
+
+[instance]
+recipe = slapos.recipe.template
+output = ${buildout:directory}/instance.cfg
+inline =
+  [buildout]
+  parts = publish
+
+  eggs-directory = ${buildout:eggs-directory}
+  develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+  [publish]
+  recipe = slapos.cookbook:publish
+  activate-script = ${django-env:location}
+
+[versions]
+Django = 3.2.12
+sqlparse = 0.4.2
+pytz = 2021.3
+asgiref = 3.3.2
+typing-extensions = 4.1.1:whl

stack/slapos.cfg

@@ -132,7 +132,7 @@ eggs =
 [versions]
 setuptools = 44.1.1
 # Use SlapOS patched zc.buildout
-zc.buildout = 2.7.1+slapos016
+zc.buildout = 2.7.1+slapos017
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
 zc.recipe.egg = 2.0.3+slapos003
 
@@ -189,11 +189,11 @@ setproctitle = 1.1.10
 setuptools-dso = 1.7
 rubygemsrecipe  = 0.4.3
 six = 1.12.0
-slapos.cookbook = 1.0.226
+slapos.cookbook = 1.0.236
 slapos.core = 1.7.5
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
-slapos.libnetworkcache = 0.22
+slapos.libnetworkcache = 0.23
 slapos.rebootstrap = 4.5
 slapos.recipe.build = 0.54
 slapos.recipe.cmmi = 0.19