Merge branch 'stretch-unstable' into use_getops

data/helpers.d/user

@@ -85,7 +85,8 @@ ynh_system_user_create () {
 	local use_shell
 	# Manage arguments with getopts
 	ynh_handle_getopts_args "$@"
- 	local use_shell="${use_shell:-0}"
+ 	use_shell="${use_shell:-0}"
+ 	home_dir="${home_dir:-}"
 
 	if ! ynh_system_user_exists "$username"	# Check if the user exists on the system
 	then	# If the user doesn't exist

data/templates/nginx/server.tpl.conf

@@ -12,7 +12,7 @@ server {
     }
 
     location /.well-known/autoconfig/mail/ {
-        alias /var/www/.well-known/{{ domain }}/autoconfig/mail;
+        alias /var/www/.well-known/{{ domain }}/autoconfig/mail/;
     }
 
     access_log /var/log/nginx/{{ domain }}-access.log;

debian/changelog

@@ -1,3 +1,36 @@
+yunohost (3.4.2.2) stable; urgency=low
+
+  - Silly bug in migraton 8 :|
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Wed, 30 Jan 2019 21:17:00 +0000
+
+yunohost (3.4.2.1) stable; urgency=low
+
+  Small issues
+  - Fix parsing of the Meltdown vulnerability checker (ignore stderr :/)
+  - Mail autoconfig was broken, follow-up of #564
+  - Handle the fact that the archive folder might not exist, in migration 0008
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Wed, 30 Jan 2019 16:37:00 +0000
+
+yunohost (3.4.2) stable; urgency=low
+
+  - [fix] Do not log stretch migration in /tmp/ (#632)
+  - [fix] Some issues with ynh_handle_getopts_args (#628)
+  - [fix] Revert some stuff about separates php-ini file (c.f. #548) (#627)
+  - [fix] App conflicted with itself during change_url (#626)
+  - [fix] Improve `ynh_package_install_from_equivs` debuggability (#625)
+  - [enh] Add systemd log handling (#624)
+  - [enh] Update spectre meltdown checker (#620)
+  - [fix] Propagate HTTP2, more_set_headers and ecdh_curve changes to webadmin (#618)
+  - [enh] Control the login shell when creating users in ynh_system_user_create (#455, #629)
+  - [fix] Postgresql-9.4 was being detected as installed whereas it was in fact not (969577b)
+  - [fix] Restoring system failed because of temporary dumb password being refused (51712f9)
+
+ Thanks to all contributors (Aleks, frju365, JimboJoe, kay0u, Maniack, opi) ! <3
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Tue, 29 Jan 2019 16:42:00 +0000
+
 yunohost (3.4.1) testing; urgency=low
 
   * [fix] `_run_service_command` not properly returning False if command fails (#616)

locales/eu.json

@@ -0,0 +1 @@
+{}

src/yunohost/data_migrations/0003_migrate_to_stretch.py

@@ -35,7 +35,7 @@ class MyMigration(Migration):
 
     def migrate(self):
 
-        self.logfile = "/tmp/{}.log".format(self.name)
+        self.logfile = "/var/log/yunohost/{}.log".format(self.name)
 
         self.check_assertions()
 

src/yunohost/data_migrations/0008_ssh_conf_managed_by_yunohost_step2.py

@@ -1,3 +1,4 @@
+import os
 import re
 
 from moulinette import m18n
@@ -39,7 +40,8 @@ class MyMigration(Migration):
 
         # Update local archives folder permissions, so that
         # admin can scp archives out of the server
-        chown(ARCHIVES_PATH, uid="admin", gid="root")
+        if os.path.isdir(ARCHIVES_PATH):
+            chown(ARCHIVES_PATH, uid="admin", gid="root")
 
     def backward(self):
 

src/yunohost/tools.py

@@ -725,9 +725,14 @@ def _check_if_vulnerable_to_meltdown():
         call = subprocess.Popen("bash %s --batch json --variant 3" %
                                 SCRIPT_PATH, shell=True,
                                 stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT)
+                                stderr=subprocess.PIPE)
 
-        output, _ = call.communicate()
+        # TODO / FIXME : here we are ignoring error messages ...
+        # in particular on RPi2 and other hardware, the script complains about
+        # "missing some kernel info (see -v), accuracy might be reduced"
+        # Dunno what to do about that but we probably don't want to harass
+        # users with this warning ...
+        output, err = call.communicate()
         assert call.returncode in (0, 2, 3), "Return code: %s" % call.returncode
 
         CVEs = json.loads(output)