sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dropbear: update to 2020.79

This commit is contained in:
Henrik Grimler 2020-06-23 21:32:59 +02:00
parent 85953b95c5
commit f8f9a21ebf
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/dropbear/build.sh
View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html TERMUX_PKG_HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
TERMUX_PKG_DESCRIPTION="Small SSH server and client" TERMUX_PKG_DESCRIPTION="Small SSH server and client"
TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_VERSION=2019.78 TERMUX_PKG_VERSION=2020.79
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4 TERMUX_PKG_SHA256=084f00546b1610a3422a0773e2c04cbe1a220d984209e033b548b49f379cc441
TERMUX_PKG_DEPENDS="termux-auth, zlib" TERMUX_PKG_DEPENDS="termux-auth, zlib"
TERMUX_PKG_CONFLICTS="openssh" TERMUX_PKG_CONFLICTS="openssh"
TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_BUILD_IN_SRC=true

25
packages/dropbear/default_options.h.patch
View File

@ -1,7 +1,6 @@
diff -u -r ../dropbear-2019.77/default_options.h ./default_options.h --- ./default_options.h.orig 2020-06-15 17:38:08.000000000 +0200
--- ../dropbear-2019.77/default_options.h 2019-03-23 13:46:29.000000000 +0000 +++ ./default_options.h 2020-06-23 21:29:37.665940247 +0200
+++ ./default_options.h 2019-03-24 22:37:39.284638278 +0000 @@ -13,16 +13,16 @@
@@ -13,15 +13,15 @@
IMPORTANT: Some options will require "make clean" after changes */ IMPORTANT: Some options will require "make clean" after changes */
@ -15,13 +14,15 @@ diff -u -r ../dropbear-2019.77/default_options.h ./default_options.h
-#define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key" -#define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key"
-#define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key" -#define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key"
-#define ECDSA_PRIV_FILENAME "/etc/dropbear/dropbear_ecdsa_host_key" -#define ECDSA_PRIV_FILENAME "/etc/dropbear/dropbear_ecdsa_host_key"
-#define ED25519_PRIV_FILENAME "/etc/dropbear/dropbear_ed25519_host_key"
+#define DSS_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_dss_host_key" +#define DSS_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_dss_host_key"
+#define RSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_rsa_host_key" +#define RSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_rsa_host_key"
+#define ECDSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_ecdsa_host_key" +#define ECDSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_ecdsa_host_key"
+#define ED25519_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_ed25519_host_key"
/* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens /* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens
* on chosen ports and keeps accepting connections. This is the default. * on chosen ports and keeps accepting connections. This is the default.
@@ -44,7 +44,7 @@ @@ -45,7 +45,7 @@
* several kB in binary size however will make the symmetrical ciphers and hashes * several kB in binary size however will make the symmetrical ciphers and hashes
* slower, perhaps by 50%. Recommended for small systems that aren't doing * slower, perhaps by 50%. Recommended for small systems that aren't doing
* much traffic. */ * much traffic. */
@ -29,17 +30,17 @@ diff -u -r ../dropbear-2019.77/default_options.h ./default_options.h
+#undef DROPBEAR_SMALL_CODE +#undef DROPBEAR_SMALL_CODE
/* Enable X11 Forwarding - server only */ /* Enable X11 Forwarding - server only */
#define DROPBEAR_X11FWD 1 #define DROPBEAR_X11FWD 0
@@ -175,7 +175,7 @@ @@ -189,7 +189,7 @@
/* Whether to print the message of the day (MOTD). */ /* Whether to print the message of the day (MOTD). */
#define DO_MOTD 0 #define DO_MOTD 1
-#define MOTD_FILENAME "/etc/motd" -#define MOTD_FILENAME "/etc/motd"
+#define MOTD_FILENAME "@TERMUX_PREFIX@/etc/motd" +#define MOTD_FILENAME "@TERMUX_PREFIX@/etc/motd"
/* Authentication Types - at least one required. /* Authentication Types - at least one required.
RFC Draft requires pubkey auth, and recommends password */ RFC Draft requires pubkey auth, and recommends password */
@@ -199,7 +199,7 @@ @@ -213,7 +213,7 @@
/* Set this to 0 if your system does not have multiple user support. /* Set this to 0 if your system does not have multiple user support.
(Linux kernel CONFIG_MULTIUSER option) (Linux kernel CONFIG_MULTIUSER option)
The resulting binary will not run on a normal system. */ The resulting binary will not run on a normal system. */
@ -48,7 +49,7 @@ diff -u -r ../dropbear-2019.77/default_options.h ./default_options.h
/* Client authentication options */ /* Client authentication options */
#define DROPBEAR_CLI_PASSWORD_AUTH 1 #define DROPBEAR_CLI_PASSWORD_AUTH 1
@@ -227,7 +227,7 @@ @@ -241,7 +241,7 @@
/* Set this to use PRNGD or EGD instead of /dev/urandom */ /* Set this to use PRNGD or EGD instead of /dev/urandom */
#define DROPBEAR_USE_PRNGD 0 #define DROPBEAR_USE_PRNGD 0
@ -57,7 +58,7 @@ diff -u -r ../dropbear-2019.77/default_options.h ./default_options.h
/* Specify the number of clients we will allow to be connected but /* Specify the number of clients we will allow to be connected but
* not yet authenticated. After this limit, connections are rejected */ * not yet authenticated. After this limit, connections are rejected */
@@ -244,22 +244,22 @@ @@ -258,22 +258,22 @@
/* The default file to store the daemon's process ID, for shutdown /* The default file to store the daemon's process ID, for shutdown
scripts etc. This can be overridden with the -P flag */ scripts etc. This can be overridden with the -P flag */
@ -84,7 +85,7 @@ diff -u -r ../dropbear-2019.77/default_options.h ./default_options.h
/* Whether to log commands executed by a client. This only logs the /* Whether to log commands executed by a client. This only logs the
* (single) command sent to the server, not what a user did in a * (single) command sent to the server, not what a user did in a
@@ -295,6 +295,6 @@ @@ -309,6 +309,6 @@
#define DEFAULT_IDLE_TIMEOUT 0 #define DEFAULT_IDLE_TIMEOUT 0
/* The default path. This will often get replaced by the shell */ /* The default path. This will often get replaced by the shell */