* [Buildroot] [V2 1/2] dropbear: bump to version 2018.76
@ 2018-03-20 19:56 Francois Perrad
2018-03-20 19:56 ` [Buildroot] [V2 2/2] dropbear: unbundle libtomath & libtomcrypt Francois Perrad
2018-03-21 5:39 ` [Buildroot] [V2 1/2] dropbear: bump to version 2018.76 Baruch Siach
0 siblings, 2 replies; 5+ messages in thread
From: Francois Perrad @ 2018-03-20 19:56 UTC (permalink / raw)
To: buildroot
with this new version:
- "configure --enable-static" should now be used instead of
"make STATIC=1"
- any customised options should be put in localoptions.h
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/dropbear/dropbear.hash | 2 +-
package/dropbear/dropbear.mk | 24 +++++++++---------------
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash
index 98776e717..ef2011d90 100644
--- a/package/dropbear/dropbear.hash
+++ b/package/dropbear/dropbear.hash
@@ -1,2 +1,2 @@
# From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc
-sha256 6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c dropbear-2017.75.tar.bz2
+sha256 f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65 dropbear-2018.76.tar.bz2
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 01a1a07b7..c6716f90d 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DROPBEAR_VERSION = 2017.75
+DROPBEAR_VERSION = 2018.76
DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause
@@ -23,32 +23,26 @@ DROPBEAR_MAKE = \
PROGRAMS="$(DROPBEAR_PROGRAMS)"
ifeq ($(BR2_STATIC_LIBS),y)
-DROPBEAR_MAKE += STATIC=1
+DROPBEAR_CONF_OPTS += --enable-static
endif
-define DROPBEAR_FIX_XAUTH
- $(SED) 's,^#define XAUTH_COMMAND.*/xauth,#define XAUTH_COMMAND "/usr/bin/xauth,g' $(@D)/options.h
-endef
-
-DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_XAUTH
-
define DROPBEAR_ENABLE_REVERSE_DNS
- $(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h
+ echo '#define DO_HOST_LOOKUP 1' >> $(@D)/localoptions.h
endef
define DROPBEAR_BUILD_SMALL
- $(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h
+ echo '#define DROPBEAR_SMALL_CODE 1' >> $(@D)/localoptions.h
endef
define DROPBEAR_BUILD_FEATURED
- $(SED) 's:^#define DROPBEAR_SMALL_CODE::' $(@D)/options.h
- $(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h
- $(SED) 's:.*\(#define DROPBEAR_TWOFISH128\).*:\1:' $(@D)/options.h
- $(SED) 's:.*\(#define DROPBEAR_TWOFISH256\).*:\1:' $(@D)/options.h
+ echo '#define DROPBEAR_SMALL_CODE 0' >> $(@D)/localoptions.h
+ echo '#define DROPBEAR_BLOWFISH 1' >> $(@D)/localoptions.h
+ echo '#define DROPBEAR_TWOFISH128 1' >> $(@D)/localoptions.h
+ echo '#define DROPBEAR_TWOFISH256 1' >> $(@D)/localoptions.h
endef
define DROPBEAR_DISABLE_STANDALONE
- $(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h
+ echo '#define NON_INETD_MODE 0' >> $(@D)/localoptions.h
endef
define DROPBEAR_INSTALL_INIT_SYSTEMD
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [V2 2/2] dropbear: unbundle libtomath & libtomcrypt
2018-03-20 19:56 [Buildroot] [V2 1/2] dropbear: bump to version 2018.76 Francois Perrad
@ 2018-03-20 19:56 ` Francois Perrad
2018-03-21 6:53 ` Baruch Siach
2018-03-21 5:39 ` [Buildroot] [V2 1/2] dropbear: bump to version 2018.76 Baruch Siach
1 sibling, 1 reply; 5+ messages in thread
From: Francois Perrad @ 2018-03-20 19:56 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/dropbear/Config.in | 1 +
package/dropbear/dropbear.mk | 2 ++
2 files changed, 3 insertions(+)
diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
index 670077816..3fa8473e4 100644
--- a/package/dropbear/Config.in
+++ b/package/dropbear/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_DROPBEAR
bool "dropbear"
select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL
+ select BR2_PACKAGE_LIBTOMCRYPT
help
A small SSH 2 server designed for small memory environments.
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index c6716f90d..b1818ea5e 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -9,6 +9,8 @@ DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause
DROPBEAR_LICENSE_FILES = LICENSE
+DROPBEAR_DEPENDENCIES = libtomcrypt
+DROPBEAR_CONF_OPTS = --disable-bundled-libtom
DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp
DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS)
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [V2 2/2] dropbear: unbundle libtomath & libtomcrypt
2018-03-20 19:56 ` [Buildroot] [V2 2/2] dropbear: unbundle libtomath & libtomcrypt Francois Perrad
@ 2018-03-21 6:53 ` Baruch Siach
0 siblings, 0 replies; 5+ messages in thread
From: Baruch Siach @ 2018-03-21 6:53 UTC (permalink / raw)
To: buildroot
Hi Francois,
On Tue, Mar 20, 2018 at 08:56:49PM +0100, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/dropbear/Config.in | 1 +
> package/dropbear/dropbear.mk | 2 ++
> 2 files changed, 3 insertions(+)
>
> diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
> index 670077816..3fa8473e4 100644
> --- a/package/dropbear/Config.in
> +++ b/package/dropbear/Config.in
> @@ -1,6 +1,7 @@
> config BR2_PACKAGE_DROPBEAR
> bool "dropbear"
> select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL
> + select BR2_PACKAGE_LIBTOMCRYPT
> help
> A small SSH 2 server designed for small memory environments.
>
> diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
> index c6716f90d..b1818ea5e 100644
> --- a/package/dropbear/dropbear.mk
> +++ b/package/dropbear/dropbear.mk
> @@ -9,6 +9,8 @@ DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
> DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
> DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause
> DROPBEAR_LICENSE_FILES = LICENSE
> +DROPBEAR_DEPENDENCIES = libtomcrypt
> +DROPBEAR_CONF_OPTS = --disable-bundled-libtom
Since both libraries are static only, this does not reduce the binary size. On
the other hand, bundled libraries are more likely to work correctly with any
give version of dropbear. The only benefit of using external libraries is when
there is a security update to the libraries. But unless there is a known issue
now, I'm not sure it's worth it.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [V2 1/2] dropbear: bump to version 2018.76
2018-03-20 19:56 [Buildroot] [V2 1/2] dropbear: bump to version 2018.76 Francois Perrad
2018-03-20 19:56 ` [Buildroot] [V2 2/2] dropbear: unbundle libtomath & libtomcrypt Francois Perrad
@ 2018-03-21 5:39 ` Baruch Siach
2018-03-21 15:42 ` François Perrad
1 sibling, 1 reply; 5+ messages in thread
From: Baruch Siach @ 2018-03-21 5:39 UTC (permalink / raw)
To: buildroot
Hi Francois,
On Tue, Mar 20, 2018 at 08:56:48PM +0100, Francois Perrad wrote:
> with this new version:
> - "configure --enable-static" should now be used instead of
> "make STATIC=1"
> - any customised options should be put in localoptions.h
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Reviewed-by: Baruch Siach <baruch@tkos.co.il>
One small nit below.
[...]
> define DROPBEAR_ENABLE_REVERSE_DNS
> - $(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h
> + echo '#define DO_HOST_LOOKUP 1' >> $(@D)/localoptions.h
> endef
>
> define DROPBEAR_BUILD_SMALL
> - $(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h
> + echo '#define DROPBEAR_SMALL_CODE 1' >> $(@D)/localoptions.h
This is the default. Since we already rely on the default in the
DO_HOST_LOOKUP case above, maybe we can do the same here.
But that's for another patch, anyway.
> endef
>
> define DROPBEAR_BUILD_FEATURED
> - $(SED) 's:^#define DROPBEAR_SMALL_CODE::' $(@D)/options.h
> - $(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h
> - $(SED) 's:.*\(#define DROPBEAR_TWOFISH128\).*:\1:' $(@D)/options.h
> - $(SED) 's:.*\(#define DROPBEAR_TWOFISH256\).*:\1:' $(@D)/options.h
> + echo '#define DROPBEAR_SMALL_CODE 0' >> $(@D)/localoptions.h
> + echo '#define DROPBEAR_BLOWFISH 1' >> $(@D)/localoptions.h
> + echo '#define DROPBEAR_TWOFISH128 1' >> $(@D)/localoptions.h
> + echo '#define DROPBEAR_TWOFISH256 1' >> $(@D)/localoptions.h
> endef
>
> define DROPBEAR_DISABLE_STANDALONE
> - $(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h
> + echo '#define NON_INETD_MODE 0' >> $(@D)/localoptions.h
> endef
>
> define DROPBEAR_INSTALL_INIT_SYSTEMD
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [V2 1/2] dropbear: bump to version 2018.76
2018-03-21 5:39 ` [Buildroot] [V2 1/2] dropbear: bump to version 2018.76 Baruch Siach
@ 2018-03-21 15:42 ` François Perrad
0 siblings, 0 replies; 5+ messages in thread
From: François Perrad @ 2018-03-21 15:42 UTC (permalink / raw)
To: buildroot
2018-03-21 6:39 GMT+01:00 Baruch Siach <baruch@tkos.co.il>:
> Hi Francois,
>
> On Tue, Mar 20, 2018 at 08:56:48PM +0100, Francois Perrad wrote:
> > with this new version:
> > - "configure --enable-static" should now be used instead of
> > "make STATIC=1"
> > - any customised options should be put in localoptions.h
> >
> > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>
> Reviewed-by: Baruch Siach <baruch@tkos.co.il>
>
> One small nit below.
>
> [...]
>
> > define DROPBEAR_ENABLE_REVERSE_DNS
> > - $(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h
> > + echo '#define DO_HOST_LOOKUP 1' >> $(@D)/localoptions.h
> > endef
> >
> > define DROPBEAR_BUILD_SMALL
> > - $(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h
> > + echo '#define DROPBEAR_SMALL_CODE 1' >> $(@D)/localoptions.h
>
> This is the default. Since we already rely on the default in the
> DO_HOST_LOOKUP case above, maybe we can do the same here.
>
>
So, DROPBEAR_BUILD_SMALL could be fully removed.
Fran?ois
> But that's for another patch, anyway.
>
> > endef
> >
> > define DROPBEAR_BUILD_FEATURED
> > - $(SED) 's:^#define DROPBEAR_SMALL_CODE::' $(@D)/options.h
> > - $(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h
> > - $(SED) 's:.*\(#define DROPBEAR_TWOFISH128\).*:\1:' $(@D)/options.h
> > - $(SED) 's:.*\(#define DROPBEAR_TWOFISH256\).*:\1:' $(@D)/options.h
> > + echo '#define DROPBEAR_SMALL_CODE 0' >> $(@D)/localoptions.h
> > + echo '#define DROPBEAR_BLOWFISH 1' >> $(@D)/localoptions.h
> > + echo '#define DROPBEAR_TWOFISH128 1' >> $(@D)/localoptions.h
> > + echo '#define DROPBEAR_TWOFISH256 1' >> $(@D)/localoptions.h
> > endef
> >
> > define DROPBEAR_DISABLE_STANDALONE
> > - $(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h
> > + echo '#define NON_INETD_MODE 0' >> $(@D)/localoptions.h
> > endef
> >
> > define DROPBEAR_INSTALL_INIT_SYSTEMD
>
> baruch
>
> --
> http://baruch.siach.name/blog/ ~. .~ Tk Open
> Systems
> =}------------------------------------------------ooO--U--
> Ooo------------{=
> - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180321/29b7b343/attachment.html>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-21 15:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-20 19:56 [Buildroot] [V2 1/2] dropbear: bump to version 2018.76 Francois Perrad
2018-03-20 19:56 ` [Buildroot] [V2 2/2] dropbear: unbundle libtomath & libtomcrypt Francois Perrad
2018-03-21 6:53 ` Baruch Siach
2018-03-21 5:39 ` [Buildroot] [V2 1/2] dropbear: bump to version 2018.76 Baruch Siach
2018-03-21 15:42 ` François Perrad
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.