ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-04-16 07:26:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bump dropbear version to 2018.76

Browse Source
This commit is contained in:
Trammell Hudson 2018-10-25 16:00:33 -04:00
parent 520fcb0390
commit c7c4ed5fbe
Failed to extract signature
3 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/dropbear
View File

@ -1,11 +1,11 @@
# dropbear is a tiny ssh client
modules-$(CONFIG_DROPBEAR) += dropbear
dropbear_version := 2016.74
dropbear_version := 2018.76
dropbear_dir := dropbear-$(dropbear_version)
dropbear_tar := dropbear-$(dropbear_version).tar.bz2
dropbear_url := http://matt.ucc.asn.au/dropbear/releases/$(dropbear_tar)
dropbear_hash := 2720ea54ed009af812701bcc290a2a601d5c107d12993e5d92c0f5f81f718891
dropbear_hash := f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65
dropbear_configure := ./configure \
$(CROSS_TOOLS) \

16
patches/dropbear-2016.74.patch
View File

@ -1,16 +0,0 @@
diff --recursive -u ../clean/dropbear-2016.74/svr-chansession.c ./dropbear-2016.74/svr-chansession.c
--- ../clean/dropbear-2016.74/svr-chansession.c 2016-07-21 11:17:09.000000000 -0400
+++ dropbear-2016.74/svr-chansession.c 2017-09-19 11:01:34.889121503 -0400
@@ -925,10 +925,10 @@
if ((setgid(ses.authstate.pw_gid) < 0) ||
(initgroups(ses.authstate.pw_name,
ses.authstate.pw_gid) < 0)) {
- dropbear_exit("Error changing user group");
+ //dropbear_exit("Error changing user group");
}
if (setuid(ses.authstate.pw_uid) < 0) {
- dropbear_exit("Error changing user");
+ //dropbear_exit("Error changing user");
}
} else {
/* ... but if the daemon is the same uid as the requested uid, we don't

37
patches/dropbear-2018.76.patch Normal file
View File

@ -0,0 +1,37 @@
diff -u --recursive clean/dropbear-2018.76/configure dropbear-2018.76/configure
--- clean/dropbear-2018.76/configure 2018-02-27 09:25:13.000000000 -0500
+++ dropbear-2018.76/configure 2018-10-25 15:55:37.785000000 -0400
@@ -3302,7 +3302,7 @@
fi # non-static
# stack protector. -strong is good but only in gcc 4.9 or later
OLDCFLAGS="$CFLAGS"
- TESTFLAGS="-fstack-protector-strong"
+ TESTFLAGS=""
CFLAGS="$CFLAGS $TESTFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3321,7 +3321,7 @@
else
CFLAGS="$OLDCFLAGS"
- TESTFLAGS="-fstack-protector --param=ssp-buffer-size=4"
+ TESTFLAGS=""
CFLAGS="$CFLAGS $TESTFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
diff -u --recursive clean/dropbear-2018.76/svr-chansession.c dropbear-2018.76/svr-chansession.c
--- clean/dropbear-2018.76/svr-chansession.c 2018-02-27 09:25:12.000000000 -0500
+++ dropbear-2018.76/svr-chansession.c 2018-10-25 15:57:18.002000000 -0400
@@ -938,10 +938,10 @@
if ((setgid(ses.authstate.pw_gid) < 0) ||
(initgroups(ses.authstate.pw_name,
ses.authstate.pw_gid) < 0)) {
- dropbear_exit("Error changing user group");
+ //dropbear_exit("Error changing user group");
}
if (setuid(ses.authstate.pw_uid) < 0) {
- dropbear_exit("Error changing user");
+ //dropbear_exit("Error changing user");
}
} else {
/* ... but if the daemon is the same uid as the requested uid, we don't