Update Release Candidate

component/findutils/buildout.cfg

@@ -7,8 +7,8 @@ parts =
 [findutils]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz
-md5sum = 351cc4adb07d54877fa15f75fb77d39f
+url = http://ftp.debian.org/debian/pool/main/f/findutils/findutils_4.6.0+git+20190510.orig.tar.xz
+md5sum = 9ae8d2b323b0b12a484abcbff1d2c486
 
 [findutils-output]
 # Shared binary location to ease migration

component/nodejs/0001-fix-execvp-printf-argument-list-too-long.patch

---- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
-+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
-@@ -144,6 +144,25 @@
- quiet_cmd_link = LINK($(TOOLSET)) $@
- cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
- 
-+define xargs
-+  $(1) $(wordlist 1,100,$(2))
-+  $(if $(word 101,$(2)),$(call xargs,$(1),$(wordlist 101,$(words $(2)),$(2))))
-+endef
-+
-+define write-to-file
-+  @echo >$(1)
-+  $(call xargs,printf "%s\\n" >>$(1),$(2))
-+endef
-+
-+OBJ_FILE_LIST_SFX := ar-file-list
-+
-+define create_archive
-+  $(eval OBJ_FILE_LIST := $(basename $(notdir $(1))).$(OBJ_FILE_LIST_SFX))
-+  rm -f $(1) $(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
-+  $(call write-to-file,$(OBJ_FILE_LIST),$(filter %.o,$(2)))
-+  $(AR.$(TOOLSET)) crs $(1) @$(OBJ_FILE_LIST)
-+endef
-+
- # We support two kinds of shared objects (.so):
- # 1) shared_library, which is just bundling together many dependent libraries
- # into a link line.
-@@ -1583,8 +1600,7 @@
-         self.WriteDoCmd([self.output_binary], link_deps, 'alink_thin',
-                         part_of_all, postbuilds=postbuilds)
-       else:
--        self.WriteDoCmd([self.output_binary], link_deps, 'alink', part_of_all,
--                        postbuilds=postbuilds)
-+        self.WriteMakeRule([self.output_binary], link_deps, actions = ['$(call create_archive,$@,$^)'])
-     elif self.type == 'shared_library':
-       self.WriteLn('%s: LD_INPUTS := %s' % (
-             QuoteSpaces(self.output_binary),
---- a/tools/gyp/pylib/gyp/generator/make.py
-+++ b/tools/gyp/pylib/gyp/generator/make.py
-@@ -144,6 +144,25 @@
- quiet_cmd_link = LINK($(TOOLSET)) $@
- cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
- 
-+define xargs
-+  $(1) $(wordlist 1,100,$(2))
-+  $(if $(word 101,$(2)),$(call xargs,$(1),$(wordlist 101,$(words $(2)),$(2))))
-+endef
-+
-+define write-to-file
-+  @echo >$(1)
-+  $(call xargs,printf "%s\\n" >>$(1),$(2))
-+endef
-+
-+OBJ_FILE_LIST_SFX := ar-file-list
-+
-+define create_archive
-+  $(eval OBJ_FILE_LIST := $(basename $(notdir $(1))).$(OBJ_FILE_LIST_SFX))
-+  rm -f $(1) $(OBJ_FILE_LIST); mkdir -p `dirname $(1)`
-+  $(call write-to-file,$(OBJ_FILE_LIST),$(filter %.o,$(2)))
-+  $(AR.$(TOOLSET)) crs $(1) @$(OBJ_FILE_LIST)
-+endef
-+
- # We support two kinds of shared objects (.so):
- # 1) shared_library, which is just bundling together many dependent libraries
- # into a link line.
-@@ -1584,8 +1601,7 @@
-         self.WriteDoCmd([self.output_binary], link_deps, 'alink_thin',
-                         part_of_all, postbuilds=postbuilds)
-       else:
--        self.WriteDoCmd([self.output_binary], link_deps, 'alink', part_of_all,
--                        postbuilds=postbuilds)
-+        self.WriteMakeRule([self.output_binary], link_deps, actions = ['$(call create_archive,$@,$^)'])
-     elif self.type == 'shared_library':
-       self.WriteLn('%s: LD_INPUTS := %s' % (
-             QuoteSpaces(self.output_binary),

component/nodejs/buildout.cfg

@@ -13,7 +13,7 @@ parts =
   nodejs
 
 [nodejs]
-<= nodejs-0.12
+<= nodejs-8.9.4
 
 [nodejs-8.9.4]
 <= nodejs-base
@@ -88,57 +88,6 @@ environment =
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
-[nodejs-0.12]
-# Server-side Javascript.
-recipe = slapos.recipe.cmmi
-version = v0.12.18
-url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
-md5sum = 1292af0584de9ba773eb06120b5ddb86
-configure-options =
-  --openssl-includes=${openssl:location}/include
-  --openssl-libpath=${openssl:location}/lib
-environment =
-  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:${patch:location}/bin:${python2.7:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/0001-fix-execvp-printf-argument-list-too-long.patch#9a7335043e1e030d623f7c624d8456f0
-
-
-[nodejs-0.10]
-# Server-side Javascript.
-recipe = slapos.recipe.cmmi
-version = v0.10.43
-url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
-md5sum = 2356f55d70a013d7952aad17c25cbcfe
-configure-options =
-  --openssl-includes=${openssl:location}/include
-  --openssl-libpath=${openssl:location}/lib
-environment =
-  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[nodejs-0.8]
-# Server-side Javascript.
-recipe = slapos.recipe.cmmi
-url = http://nodejs.org/dist/v0.8.23/node-v0.8.23.tar.gz
-md5sum = 22fe54ac365f52d3d80ecf748e7323d5
-configure-options =
-  --openssl-includes=${openssl:location}/include
-  --openssl-libpath=${openssl:location}/lib
-environment =
-  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
 [nodejs-0.6]
 # Server-side Javascript.
 recipe = slapos.recipe.cmmi

component/qemu-kvm/buildout.cfg

@@ -19,8 +19,8 @@ extends =
 [kvm]
 recipe = slapos.recipe.cmmi
 # qemu-kvm and qemu are now the same since 1.3.
-url = http://wiki.qemu-project.org/download/qemu-2.12.0.tar.xz
-md5sum = ca553eb04c933f58111c304452fc4cc5
+url = https://download.qemu.org/qemu-4.0.0.tar.xz
+md5sum = 0afeca336fd57ae3d3086ec07f59d708
 configure-options =
   --target-list="$(uname -m 2>/dev/null|sed 's,^i[456]86$,i386,')-softmmu"
   --enable-system

software/caddy-frontend/test/test.py

@@ -360,6 +360,9 @@ class TestDataMixin(object):
 
   def test_file_list_run(self):
     self._test_file_list(['var', 'run'], [
+      # can't be sure regarding its presence
+      'caddy_configuration_last_state',
+      'validate_configuration_state_signature',
       # run by cron from time to time
       'monitor/monitor-collect.pid',
     ])

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt

@@ -2,7 +2,6 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt

@@ -2,9 +2,7 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/caddy_configuration_last_state
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid
 T-2/var/run/monitor/monitor-bootstrap.pid
-T-2/var/run/validate_configuration_state_signature
\ No newline at end of file

software/kvm/software.cfg

@@ -206,9 +206,5 @@ gitdb = 0.6.4
 pycurl = 7.43.0
 slapos.recipe.template = 4.3
 smmap = 0.9.0
-# websockify = 0.8.0
-
-# Required by:
-# websockify==0.8.0
-numpy = 1.11.2rc1
+numpy = 1.16.4
 

software/nayuos/instance.cfg

@@ -99,7 +99,7 @@ context =
 recipe = slapos.recipe.template:jinja2
 template = {{ software_dir }}/scripts/cros_full_build.in
 rendered = ${directory:run}/cros_full_build
-md5sum = f10eb8863b2575e117aae070be171d76
+md5sum = 5227b64852644d9874e3f67254f243ef
 mode = 0700
 context =
   key bash_path                         bin:bash
@@ -112,8 +112,9 @@ context =
   key ebuilds_dir                       nayuos-ebuilds:location
   raw scripts_dir                       {{ software_dir }}/scripts
   raw logo_dir                          {{ software_dir }}/logo
+  raw patch_dir                         {{ software_dir }}/patch
 # packages to be copied from our overlay into ChromiuOS' overlay
 # those packages will be marked as dependency of root filesystem
   raw nayu_dev_rootfs_packages          app-misc/nayuos-chromium-policy
 # those packages will be marked as dependency of the chromium build itself
-  raw nayu_dev_packages                 net-misc/re6stnet dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup
+  raw nayu_dev_packages                 dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup

software/nayuos/patch/0001-chrome-incognito-increase-storage-quota.patch

+--- a/src/storage/browser/quota/quota_settings.cc      2018-08-30 15:11:45.052446318 +0200
++++ b/src/storage/browser/quota/quota_settings.cc      2019-07-29 17:29:49.765826330 +0200
+@@ -34,7 +34,7 @@
+   const int64_t kMBytes = 1024 * 1024;
+   const int kRandomizedPercentage = 10;
+ 
+-  if (is_incognito) {
++  /*if (is_incognito) {
+     // The incognito pool size is a fraction of the amount of system memory,
+     // and the amount is capped to a hard limit.
+     const double kIncognitoPoolSizeRatio = 0.1;  // 10%
+@@ -49,7 +49,7 @@
+     settings.session_only_per_host_quota = settings.per_host_quota;
+     settings.refresh_interval = base::TimeDelta::Max();
+     return settings;
+-  }
++  }*/
+ 
+ // The fraction of the device's storage the browser is willing to
+ // use for temporary storage.

software/nayuos/scripts/cros_full_build.in

@@ -108,20 +108,6 @@ cd {{ cros_location }}/{{ branch }}
 # create chroot environment (exit on failure)
 cros_sdk --download || { echo "Problem while entering chroot or downloading chroot environment. PATH is: '${PATH}' Exiting." ; exit 1 ; }
 
-# compile Python with sqlite support (-> change USE flag) for dev-lang/python
-# it is needed by re6st
-# just need to change -sqlite by sqlite on the right line
-# same for IPv6 support
-PACKAGE_USE_FILE="${CHROMIUM_OVERLAY}/profiles/targets/chromeos/package.use"
-line_number=$(sed -n '/dev-lang\/python/=' ${PACKAGE_USE_FILE})
-if [ $line_number ] ; then
-    echo "$line_number"
-    sed -i "${line_number}s/-sqlite/sqlite/" ${PACKAGE_USE_FILE}
-    if [[ ! $(sed -n ${line_number}p ${PACKAGE_USE_FILE} | grep ipv6) ]]; then
-        sed -i "${line_number}s/$/ ipv6/" ${PACKAGE_USE_FILE}
-    fi
-fi
-
 # add some ebuilds, specific to NayuOS
 for category in $( ls {{ ebuilds_dir }} ); do
   echo ${category}
@@ -152,6 +138,10 @@ increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/openssh-server-init/
 sed -i -n '/src_install/q;p' $(latest_ebuild ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init)
 increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init/
 
+# increase size of storage quota for chrome guest mode to make big offline apps work
+CHROME_EBUILD_DIR="${CHROMIUM_OVERLAY}/chromeos-base/chromeos-chrome"
+cp {{ patch_dir }}/0001-chrome-incognito-increase-storage-quota.patch "${CHROME_EBUILD_DIR}/files/"
+sed -i 's|^PATCHES=()$|PATCHES=( "${FILESDIR}/0001-chrome-incognito-increase-storage-quota.patch" )|' ${CHROME_EBUILD_DIR}/chromeos-chrome*.ebuild
 
 # bashrc modifications
 BASH_EBUILD_DIR="${PORTAGE_STABLE}/app-shells/bash"
@@ -282,6 +272,21 @@ safewrite() { __safewrite dd "\$@" ; }
 sudodd() { sudo dd "\$@" ; }
 sudosafewrite() { __safewrite sudodd "\$@" ; }
 
+crew() {
+  if [[ ! -x /usr/local/bin/crew ]] ; then
+    read -p "Chromebrew is not on this machine; do you want to install it? [Y/n] " -r -n 1 crew_install
+    echo ""
+    if [[ ! $crew_install =~ ^[Nn]$ ]] ; then
+        echo "Fetching installation file..."
+              curl -Ls https://lab.nexedi.com/nexedi/chromebrew/raw/nexedi/install.sh | bash
+    else
+      return 1
+    fi
+  else
+    command crew "$@"
+  fi
+}
+
 # ----- END NayuOS configuration -----
 EOF
 fi

software/nayuos/scripts/test_nayuos_image

@@ -10,8 +10,6 @@ fi
 
 BOARD=$1
 MOUNTPOINT="/tmp/${BOARD}"
-ORIGINAL_GRANDENET_SCRIPT=~/trunk/src/third_party/chromiumos-overlay/net-misc/re6stnet/files/grandenet
-GRANDENET_SCRIPT="usr/local/bin/grandenet"
 INIT_SSH_SERVER="etc/init/openssh-server.conf"
 BASHRC="etc/skel/.bashrc"
 GIT_CORE="usr/local/libexec/git-core/"
@@ -35,20 +33,18 @@ function print_result() {
 # MOUNT IMAGE AND GET INFO
 
 install -d "${MOUNTPOINT}"
-./mount_gpt_image.sh --safe -f $( ./get_latest_image.sh --board=${BOARD} ) -r ${MOUNTPOINT}
+./mount_gpt_image.sh --safe --most_recent --board ${BOARD} -r ${MOUNTPOINT}
 echo $(ls "${MOUNTPOINT}/usr/local")
 if [[ $(ls "${MOUNTPOINT}/usr/local") ]] ; then
-  my_diff=$(diff "${ORIGINAL_GRANDENET_SCRIPT}" "${MOUNTPOINT}/${GRANDENET_SCRIPT}")
   opensshd_config=$(ls "${MOUNTPOINT}/${INIT_SSH_SERVER}")
   gitcore=$(ls "${MOUNTPOINT}/${GIT_CORE}")
   gitexport=$(grep "${GIT_EXPECTED_EXPORT}" "${MOUNTPOINT}/${BASHRC}")
   virtualenvbin=$(ls "${MOUNTPOINT}/${VIRTUALENV_BIN}")
   chromium_policy=$(ls "${MOUNTPOINT}/${CHROMIUM_POLICY}")
-
 else
   is_empty=1
 fi
-./mount_gpt_image.sh --safe -f $( ./get_latest_image.sh --board=${BOARD} ) -r ${MOUNTPOINT} -u
+./mount_gpt_image.sh --safe --most_recent --board ${BOARD} -r ${MOUNTPOINT} -u
 rmdir ${MOUNTPOINT}
 
 
@@ -60,15 +56,6 @@ if [[ "${is_empty}" == "1" ]] ; then
 else
   print_result ${SUCCESS} "/usr/local is not empty."
 
-  echo "* test grandenet script existence and content"
-  if [[ ${no_grandenet_script} == 1 ]] ; then
-    print_result ${FAILURE} "grandenet script is missing (no file at ${GRANDENET_SCRIPT})."
-  elif [[ ${my_diff} != "" ]] ; then
-    print_result ${FAILURE} "grandenet scripts differs:\n${my_diff}"
-  else
-    print_result ${SUCCESS} "${GRANDENET_SCRIPT} exists and contains what is expected."
-  fi
-
   echo "* test openssh server init script absence"
   if [[ ${opensshd_config} ]] ; then
     print_result ${FAILURE} "opensshd config exists: ${opensshd_config}"

software/nayuos/software.cfg

@@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg
 rendered = ${buildout:directory}/instance.cfg
 mode = 0644
-md5sum = 73f964d73367dbf280d904e408a7f9b8
+md5sum = 462a8632f90a121029a90785a62841c4
 context =
   key software_dir            :_profile_base_location_
   key instance_dir            buildout:directory