=== modified file 'debian/control'
--- debian/control	2019-02-10 03:50:20 +0000
+++ debian/control	2019-02-11 06:14:29 +0000
@@ -6,9 +6,8 @@
 	   Björn Påhlsson <belorn@recompile.se>
 Build-Depends: debhelper (>= 10), docbook-xml, docbook-xsl,
 	libavahi-core-dev, libgpgme-dev | libgpgme11-dev,
-	libgnutls28-dev (>= 3.3.0) | gnutls-dev (>= 3.3.0),
-	libgnutls28-dev (<< 3.6.0) | libgnutls30 (<< 3.6.0)
-	| libgnutls30 (>= 3.6.6),
+	libgnutls28-dev (>= 3.3.0),
+	libgnutls28-dev (>= 3.6.6) | libgnutls28-dev (<< 3.6.0),
 	xsltproc, pkg-config, libnl-route-3-dev
 Build-Depends-Indep: systemd, python (>= 2.7), python (<< 3),
 	python-dbus, python-gi
@@ -21,13 +20,13 @@
 Package: mandos
 Architecture: all
 Depends: ${misc:Depends}, python (>= 2.7), python (<< 3),
-	libgnutls28-dev (>= 3.3.0) | libgnutls30 (>= 3.3.0),
-	libgnutls28-dev (<< 3.6.0) | libgnutls30 (<< 3.6.0)
-	| libgnutls30 (>= 3.6.6),
+	libgnutls30 (>= 3.3.0),
+	libgnutls30 (>= 3.6.6) | libgnutls30 (<< 3.6.0),
 	python-dbus, python-gi, avahi-daemon, adduser, python-urwid,
 	gnupg2 | gnupg, systemd-sysv | lsb-base (>= 3.0-6),
 	debconf (>= 1.5.5) | debconf-2.0
 Recommends: ssh-client | fping
+Suggests: libc6-dev | libc-dev, c-compiler
 Description: server giving encrypted passwords to Mandos clients
  This is the server part of the Mandos system, which allows
  computers to have encrypted root file systems and at the
@@ -48,7 +47,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
 	cryptsetup (<< 2:2.0.3-1) | cryptsetup-initramfs,
 	initramfs-tools (>= 0.99), dpkg-dev (>=1.16.0),
-	gnutls-bin (>= 3.6.6) | openssl (>= 1.1.0),
+	gnutls-bin (>= 3.6.6) | libgnutls30 (<< 3.6.0),
 	debconf (>= 1.5.5) | debconf-2.0
 Recommends: ssh
 Breaks: dropbear (<= 0.53.1-1)

=== modified file 'debian/watch'
--- debian/watch	2018-02-08 10:02:51 +0000
+++ debian/watch	2019-02-11 05:15:24 +0000
@@ -1,3 +1,3 @@
 version=4
 opts=pgpmode=auto \
- https://ftp.recompile.se/pub/@PACKAGE@/@PACKAGE@@ANY_VERSION@(?:\.orig)?@ARCHIVE_EXT@
+ https://ftp.recompile.se/pub/@PACKAGE@/@PACKAGE@@ANY_VERSION@\.orig@ARCHIVE_EXT@

=== modified file 'plugin-runner.c'
--- plugin-runner.c	2018-08-19 01:03:28 +0000
+++ plugin-runner.c	2019-02-11 05:14:10 +0000
@@ -564,10 +564,12 @@
     case '?':			/* --help */
       state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
       argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
+      __builtin_unreachable();
     case -3:			/* --usage */
       state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
       argp_state_help(state, state->out_stream,
 		      ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
+      __builtin_unreachable();
     case 'V':			/* --version */
       fprintf(state->out_stream, "%s\n", argp_program_version);
       exit(EXIT_SUCCESS);

=== modified file 'plugins.d/askpass-fifo.c'
--- plugins.d/askpass-fifo.c	2018-02-08 10:23:55 +0000
+++ plugins.d/askpass-fifo.c	2019-02-11 05:14:10 +0000
@@ -65,10 +65,16 @@
     fprintf(stderr, ": ");
     fprintf(stderr, "%s\n", strerror(errnum));
     error(status, errno, "vasprintf while printing error");
+    if(status){
+      __builtin_unreachable();
+    }
     return;
   }
   fprintf(stderr, "Mandos plugin ");
   error(status, errnum, "%s", text);
+  if(status){
+    __builtin_unreachable();
+  }
   free(text);
 }
 
@@ -90,14 +96,17 @@
     case ENOTDIR:
     case ELOOP:
       error_plus(EX_OSFILE, errno, "mkfifo");
+      __builtin_unreachable();
     case ENAMETOOLONG:
     case ENOSPC:
     case EROFS:
     default:
       error_plus(EX_OSERR, errno, "mkfifo");
+      __builtin_unreachable();
     case ENOENT:
       /* no "/lib/cryptsetup"? */
       error_plus(EX_UNAVAILABLE, errno, "mkfifo");
+      __builtin_unreachable();
     case EEXIST:
       break;			/* not an error */
     }

=== modified file 'plugins.d/mandos-client.c'
--- plugins.d/mandos-client.c	2019-02-10 04:20:26 +0000
+++ plugins.d/mandos-client.c	2019-02-11 05:14:10 +0000
@@ -2672,9 +2672,11 @@
 	argp_state_help(state, state->out_stream,
 			(ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR)
 			& ~(unsigned int)ARGP_HELP_EXIT_OK);
+	__builtin_unreachable();
       case -3:			/* --usage */
 	argp_state_help(state, state->out_stream,
 			ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR);
+	__builtin_unreachable();
       case 'V':			/* --version */
 	fprintf_plus(state->out_stream, "%s\n", argp_program_version);
 	exit(argp_err_exit_status);

=== modified file 'plugins.d/password-prompt.c'
--- plugins.d/password-prompt.c	2018-02-08 10:23:55 +0000
+++ plugins.d/password-prompt.c	2019-02-11 05:14:10 +0000
@@ -274,9 +274,11 @@
 	argp_state_help(state, state->out_stream,
 			(ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR)
 			& ~(unsigned int)ARGP_HELP_EXIT_OK);
+	__builtin_unreachable();
       case -3:			/* --usage */
 	argp_state_help(state, state->out_stream,
 			ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR);
+	__builtin_unreachable();
       case 'V':			/* --version */
 	fprintf(state->out_stream, "%s\n", argp_program_version);
 	exit(argp_err_exit_status);