cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to dropbear-2022.82

Browse Source
This commit is contained in:
sthen 2022-04-02 12:17:44 +00:00
parent dbff447a2b
commit cae0bb368c
4 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/dropbear/Makefile
View File

@ -1,7 +1,6 @@
COMMENT= small SSH server and client COMMENT= small SSH server and client
DISTNAME= dropbear-2020.81 DISTNAME= dropbear-2022.82
REVISION= 1
EXTRACT_SUFX= .tar.bz2 EXTRACT_SUFX= .tar.bz2
CATEGORIES= security net CATEGORIES= security net
@ -21,7 +20,4 @@ CONFIGURE_STYLE= gnu
USE_GMAKE= Yes USE_GMAKE= Yes
NO_TEST= Yes NO_TEST= Yes
post-configure:
${SUBST_CMD} ${WRKSRC}/default_options.h
.include <bsd.port.mk> .include <bsd.port.mk>

4
security/dropbear/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dropbear-2020.81.tar.bz2) = SCNdELN3ddvaWTQawMSyObgq1jGMMVaLmFcwx4iqxTs= SHA256 (dropbear-2022.82.tar.bz2) = OgONK7wCvyi73SDAEgkfdBo+xcvkYGkYEdcUh2qtddE=
SIZE (dropbear-2020.81.tar.bz2) = 2289644 SIZE (dropbear-2022.82.tar.bz2) = 2309514

2
security/dropbear/patches/patch-common-session_c
View File

@ -1,7 +1,7 @@
Index: common-session.c Index: common-session.c
--- common-session.c.orig --- common-session.c.orig
+++ common-session.c +++ common-session.c
@@ -628,7 +628,7 @@ void fill_passwd(const char* username) { @@ -627,7 +627,7 @@ void fill_passwd(const char* username) {
if (ses.authstate.pw_passwd) if (ses.authstate.pw_passwd)
m_free(ses.authstate.pw_passwd); m_free(ses.authstate.pw_passwd);

37
security/dropbear/patches/patch-default_options_h
View File

@ -1,22 +1,7 @@
Index: default_options.h Index: default_options.h
--- default_options.h.orig --- default_options.h.orig
+++ default_options.h +++ default_options.h
@@ -19,10 +19,10 @@ IMPORTANT: Some options will require "make clean" afte @@ -57,7 +57,7 @@ IMPORTANT: Some options will require "make clean" afte
#define DROPBEAR_DEFADDRESS ""
/* Default hostkey paths - these can be specified on the command line */
-#define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key"
-#define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_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 "${SYSCONFDIR}/dropbear/dropbear_dss_host_key"
+#define RSA_PRIV_FILENAME "${SYSCONFDIR}/dropbear/dropbear_rsa_host_key"
+#define ECDSA_PRIV_FILENAME "${SYSCONFDIR}/dropbear/dropbear_ecdsa_host_key"
+#define ED25519_PRIV_FILENAME "${SYSCONFDIR}/dropbear/dropbear_ed25519_host_key"
/* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens
* on chosen ports and keeps accepting connections. This is the default.
@@ -45,7 +45,7 @@ IMPORTANT: Some options will require "make clean" afte
* 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. */
@ -25,34 +10,30 @@ Index: default_options.h
/* Enable X11 Forwarding - server only */ /* Enable X11 Forwarding - server only */
#define DROPBEAR_X11FWD 0 #define DROPBEAR_X11FWD 0
@@ -258,11 +258,11 @@ Homedir is prepended unless path begins with / */ @@ -289,7 +289,7 @@ group1 in Dropbear server too */
/* The default file to store the daemon's process ID, for shutdown
scripts etc. This can be overridden with the -P flag */
-#define DROPBEAR_PIDFILE "/var/run/dropbear.pid"
+#define DROPBEAR_PIDFILE "${LOCALSTATEDIR}/run/dropbear.pid"
/* The command to invoke for xauth when using X11 forwarding. /* The command to invoke for xauth when using X11 forwarding.
* "-q" for quiet */ * "-q" for quiet */
-#define XAUTH_COMMAND "/usr/bin/xauth -q" -#define XAUTH_COMMAND "/usr/bin/xauth -q"
+#define XAUTH_COMMAND "${X11BASE}/bin/xauth -q" +#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q"
/* if you want to enable running an sftp server (such as the one included with /* If you want to enable running an sftp server (such as the one included with
@@ -273,7 +273,7 @@ Homedir is prepended unless path begins with / */ @@ -302,7 +302,7 @@ group1 in Dropbear server too */
/* This is used by the scp binary when used as a client binary. If you're /* This is used by the scp binary when used as a client binary. If you're
* not using the Dropbear client, you'll need to change it */ * not using the Dropbear client, you'll need to change it */
-#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient" -#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient"
+#define DROPBEAR_PATH_SSH_PROGRAM "${TRUEPREFIX}/bin/dbclient" +#define DROPBEAR_PATH_SSH_PROGRAM "/usr/local/bin/dbclient"
/* 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
@@ -309,6 +309,6 @@ be overridden at runtime with -I. 0 disables idle time @@ -338,7 +338,7 @@ be overridden at runtime with -I. 0 disables idle time
#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 */
-#define DEFAULT_PATH "/usr/bin:/bin" -#define DEFAULT_PATH "/usr/bin:/bin"
+#define DEFAULT_PATH "/usr/bin:/bin:/usr/sbin:/sbin:${X11BASE}/bin:${TRUEPREFIX}/bin:${TRUEPREFIX}/sbin" +#define DEFAULT_PATH "/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin"
#define DEFAULT_ROOT_PATH "/usr/sbin:/usr/bin:/sbin:/bin"
#endif /* DROPBEAR_DEFAULT_OPTIONS_H_ */ #endif /* DROPBEAR_DEFAULT_OPTIONS_H_ */