aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/dropbear/patches/160-lto-jobserver.patch
diff options
context:
space:
mode:
authorKonstantin Demin <rockdrilla@gmail.com>2020-06-21 15:36:47 +0300
committerHans Dedecker <dedeckeh@gmail.com>2020-06-21 21:33:23 +0200
commit29e170dbaac0091d09ae52157cd2f1f26a9c8ca4 (patch)
treea9e048b0bb284763769bc589a53c5db319de6d74 /package/network/services/dropbear/patches/160-lto-jobserver.patch
parent340de1d1545f6da3f21b06a23bb8288da6d992be (diff)
downloadupstream-29e170dbaac0091d09ae52157cd2f1f26a9c8ca4.tar.gz
upstream-29e170dbaac0091d09ae52157cd2f1f26a9c8ca4.tar.bz2
upstream-29e170dbaac0091d09ae52157cd2f1f26a9c8ca4.zip
dropbear: bump to 2020.79
- drop patches (applied upstream): * 010-backport-change-address-logging.patch * 020-backport-ed25519-support.patch * 021-backport-chacha20-poly1305-support.patch - backport patches: * 010-backport-disable-toom-and-karatsuba.patch: reduce dropbear binary size (about ~8Kb). - refresh patches. - don't bother anymore with following config options because they are disabled in upstream too: * DROPBEAR_3DES * DROPBEAR_ENABLE_CBC_MODE * DROPBEAR_SHA1_96_HMAC - explicitly disable DO_MOTD as it was before commit a1099ed: upstream has (accidentally) switched it to 0 in release 2019.77, but reverted back in release 2020.79. Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
Diffstat (limited to 'package/network/services/dropbear/patches/160-lto-jobserver.patch')
-rw-r--r--package/network/services/dropbear/patches/160-lto-jobserver.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/network/services/dropbear/patches/160-lto-jobserver.patch b/package/network/services/dropbear/patches/160-lto-jobserver.patch
index 02765335d3..dbba613ac3 100644
--- a/package/network/services/dropbear/patches/160-lto-jobserver.patch
+++ b/package/network/services/dropbear/patches/160-lto-jobserver.patch
@@ -1,11 +1,11 @@
--- a/Makefile.in
+++ b/Makefile.in
-@@ -189,17 +189,17 @@ dropbearkey: $(dropbearkeyobjs)
+@@ -199,17 +199,17 @@ dropbearkey: $(dropbearkeyobjs)
dropbearconvert: $(dropbearconvertobjs)
dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile
-- $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@
-+ +$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@
+- $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@ $(PLUGIN_LIBS)
++ +$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@ $(PLUGIN_LIBS)
dbclient: $(HEADERS) $(LIBTOM_DEPS) Makefile
- $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS)
@@ -22,7 +22,7 @@
# multi-binary compilation.
-@@ -210,7 +210,7 @@ ifeq ($(MULTI),1)
+@@ -220,7 +220,7 @@ ifeq ($(MULTI),1)
endif
dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile