X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..d946e67c5b86dd990ffa0e5654b2a514b787aeb9:/packages/openssh/servconf.c.patch

diff --git a/packages/openssh/servconf.c.patch b/packages/openssh/servconf.c.patch
index deb04e0b..3bf53822 100644
--- a/packages/openssh/servconf.c.patch
+++ b/packages/openssh/servconf.c.patch
@@ -1,16 +1,31 @@
-diff -u -r ../openssh-6.6p1/servconf.c ./servconf.c
---- ../openssh-6.6p1/servconf.c	2014-02-04 01:12:57.000000000 +0100
-+++ ./servconf.c	2014-06-04 13:18:34.672668616 +0200
-@@ -185,7 +185,7 @@
+diff -u -r ../openssh-7.5p1/servconf.c ./servconf.c
+--- ../openssh-7.5p1/servconf.c	2017-03-20 03:39:27.000000000 +0100
++++ ./servconf.c	2017-03-24 00:08:05.880913398 +0100
+@@ -212,7 +212,7 @@
  	}
  	/* No certificates by default */
  	if (options->num_ports == 0)
 -		options->ports[options->num_ports++] = SSH_DEFAULT_PORT;
 +		options->ports[options->num_ports++] = 8022 /*SSH_DEFAULT_PORT*/;
+ 	if (options->address_family == -1)
+ 		options->address_family = AF_UNSPEC;
  	if (options->listen_addrs == NULL)
- 		add_listen_addr(options, NULL, 0);
- 	if (options->pid_file == NULL)
-@@ -530,7 +530,7 @@
+@@ -336,9 +336,13 @@
+ 
+ 	assemble_algorithms(options);
+ 
+-	/* Turn privilege separation and sandboxing on by default */
+ 	if (use_privsep == -1)
++#ifdef __ANDROID__
++		use_privsep = PRIVSEP_OFF;
++#else
++		/* Turn privilege separation and sandboxing on by default */
+ 		use_privsep = PRIVSEP_ON;
++#endif
+ 
+ #define CLEAR_ON_NONE(v) \
+ 	do { \
+@@ -675,7 +679,7 @@
  	u_int i;
  
  	if (options->num_ports == 0)
@@ -18,4 +33,4 @@ diff -u -r ../openssh-6.6p1/servconf.c ./servconf.c
 +		options->ports[options->num_ports++] = 8022 /*SSH_DEFAULT_PORT*/;
  	if (options->address_family == -1)
  		options->address_family = AF_UNSPEC;
- 	if (port == 0)
+