| Message ID | 20180318083659.3512-1-francois.perrad@gadz.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] dropbear: bump to version 2018.76 | expand |
Hi Francois, On Sun, Mar 18, 2018 at 09:36:58AM +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> > --- > package/dropbear/dropbear.hash | 2 +- > package/dropbear/dropbear.mk | 23 ++++++++--------------- > 2 files changed, 9 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..05b6bb4d4 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,25 @@ 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 You drop the DROPBEAR_SMALL_CODE removal here, which is enabled by default in default_options.h. We probably need echo '#define DROPBEAR_SMALL_CODE 0' >> $(@D)/localoptions.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_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
2018-03-20 7:51 GMT+01:00 Baruch Siach <baruch@tkos.co.il>: > Hi Francois, > > On Sun, Mar 18, 2018 at 09:36:58AM +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> > > --- > > package/dropbear/dropbear.hash | 2 +- > > package/dropbear/dropbear.mk | 23 ++++++++--------------- > > 2 files changed, 9 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..05b6bb4d4 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,25 @@ 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 > > You drop the DROPBEAR_SMALL_CODE removal here, which is enabled by default > in > default_options.h. We probably need > > echo '#define DROPBEAR_SMALL_CODE 0' >> $(@D)/localoptions.h > > You are right. With this new release, DROPBEAR_SMALL_CODE is checked with #if instead of #ifdef, see https://github.com/mkj/dropbear/blob/master/libtomcrypt/src/headers/tomcrypt_dropbear.h#L9-L11 François > - $(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_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@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > <div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">2018-03-20 7:51 GMT+01:00 Baruch Siach <span dir="ltr"><<a href="mailto:baruch@tkos.co.il" target="_blank">baruch@tkos.co.il</a>></span>:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi Francois,<br> <div><div class="gmail-h5"><br> On Sun, Mar 18, 2018 at 09:36:58AM +0100, Francois Perrad wrote:<br> > with this new version:<br> > - "configure --enable-static" should now be used instead of<br> > "make STATIC=1"<br> > - any customised options should be put in localoptions.h<br> ><br> > Signed-off-by: Francois Perrad <<a href="mailto:francois.perrad@gadz.org">francois.perrad@gadz.org</a>><br> > ---<br> > package/dropbear/dropbear.hash | 2 +-<br> > package/dropbear/<a href="http://dropbear.mk" rel="noreferrer" target="_blank">dropbear.mk</a> | 23 ++++++++---------------<br> > 2 files changed, 9 insertions(+), 16 deletions(-)<br> ><br> > diff --git a/package/dropbear/dropbear.<wbr>hash b/package/dropbear/dropbear.<wbr>hash<br> > index 98776e717..ef2011d90 100644<br> > --- a/package/dropbear/dropbear.<wbr>hash<br> > +++ b/package/dropbear/dropbear.<wbr>hash<br> > @@ -1,2 +1,2 @@<br> > # From <a href="https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc" rel="noreferrer" target="_blank">https://matt.ucc.asn.au/<wbr>dropbear/releases/SHA256SUM.<wbr>asc</a><br> > -sha256 6cbc1dcb1c9709d226dff669e56041<wbr>72a18cf5dbf9a201474d5618ae4465<wbr>098c dropbear-2017.75.tar.bz2<br> > +sha256 f2fb9167eca8cf93456a5fc1d4faf7<wbr>09902a3ab70dd44e352f3acbc3ffda<wbr>ea65 dropbear-2018.76.tar.bz2<br> > diff --git a/package/dropbear/<a href="http://dropbear.mk" rel="noreferrer" target="_blank">dropbear.mk</a> b/package/dropbear/<a href="http://dropbear.mk" rel="noreferrer" target="_blank">dropbear.mk</a><br> > index 01a1a07b7..05b6bb4d4 100644<br> > --- a/package/dropbear/<a href="http://dropbear.mk" rel="noreferrer" target="_blank">dropbear.mk</a><br> > +++ b/package/dropbear/<a href="http://dropbear.mk" rel="noreferrer" target="_blank">dropbear.mk</a><br> > @@ -4,7 +4,7 @@<br> > #<br> > ##############################<wbr>##############################<wbr>####################<br> ><br> > -DROPBEAR_VERSION = 2017.75<br> > +DROPBEAR_VERSION = 2018.76<br> > DROPBEAR_SITE = <a href="https://matt.ucc.asn.au/dropbear/releases" rel="noreferrer" target="_blank">https://matt.ucc.asn.au/<wbr>dropbear/releases</a><br> > DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).<wbr>tar.bz2<br> > DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause<br> > @@ -23,32 +23,25 @@ DROPBEAR_MAKE = \<br> > PROGRAMS="$(DROPBEAR_PROGRAMS)<wbr>"<br> ><br> > ifeq ($(BR2_STATIC_LIBS),y)<br> > -DROPBEAR_MAKE += STATIC=1<br> > +DROPBEAR_CONF_OPTS += --enable-static<br> > endif<br> ><br> > -define DROPBEAR_FIX_XAUTH<br> > - $(SED) 's,^#define XAUTH_COMMAND.*/xauth,#define XAUTH_COMMAND "/usr/bin/xauth,g' $(@D)/options.h<br> > -endef<br> > -<br> > -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_XAUTH<br> > -<br> > define DROPBEAR_ENABLE_REVERSE_DNS<br> > - $(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h<br> > + echo '#define DO_HOST_LOOKUP 1' >> $(@D)/localoptions.h<br> > endef<br> ><br> > define DROPBEAR_BUILD_SMALL<br> > - $(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h<br> > + echo '#define DROPBEAR_SMALL_CODE 1' >> $(@D)/localoptions.h<br> > endef<br> ><br> > define DROPBEAR_BUILD_FEATURED<br> > - $(SED) 's:^#define DROPBEAR_SMALL_CODE::' $(@D)/options.h<br> <br> </div></div>You drop the DROPBEAR_SMALL_CODE removal here, which is enabled by default in<br> default_options.h. We probably need<br> <br> echo '#define DROPBEAR_SMALL_CODE 0' >> $(@D)/localoptions.h<br> <div class="gmail-HOEnZb"><div class="gmail-h5"><br></div></div></blockquote><div><br></div><div>You are right.<br></div><div>With this new release, DROPBEAR_SMALL_CODE is checked with #if instead of #ifdef,<br></div><div>see <a href="https://github.com/mkj/dropbear/blob/master/libtomcrypt/src/headers/tomcrypt_dropbear.h#L9-L11">https://github.com/mkj/dropbear/blob/master/libtomcrypt/src/headers/tomcrypt_dropbear.h#L9-L11</a><br><br></div><div>François<br></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div class="gmail-HOEnZb"><div class="gmail-h5"> > - $(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h<br> > - $(SED) 's:.*\(#define DROPBEAR_TWOFISH128\).*:\1:' $(@D)/options.h<br> > - $(SED) 's:.*\(#define DROPBEAR_TWOFISH256\).*:\1:' $(@D)/options.h<br> > + echo '#define DROPBEAR_BLOWFISH 1' >> $(@D)/localoptions.h<br> > + echo '#define DROPBEAR_TWOFISH128 1' >> $(@D)/localoptions.h<br> > + echo '#define DROPBEAR_TWOFISH256 1' >> $(@D)/localoptions.h<br> > endef<br> ><br> > define DROPBEAR_DISABLE_STANDALONE<br> > - $(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h<br> > + echo '#define NON_INETD_MODE 0' >> $(@D)/localoptions.h<br> > endef<br> ><br> > define DROPBEAR_INSTALL_INIT_SYSTEMD<br> <br> </div></div><span class="gmail-HOEnZb"><font color="#888888">baruch<br> <br> --<br> <a href="http://baruch.siach.name/blog/" rel="noreferrer" target="_blank">http://baruch.siach.name/blog/</a> ~. .~ Tk Open Systems<br> =}----------------------------<wbr>--------------------ooO--U--<wbr>Ooo------------{=<br> - <a href="mailto:baruch@tkos.co.il">baruch@tkos.co.il</a> - tel: +972.52.368.4656, <a href="http://www.tkos.co.il" rel="noreferrer" target="_blank">http://www.tkos.co.il</a> -<br> ______________________________<wbr>_________________<br> buildroot mailing list<br> <a href="mailto:buildroot@busybox.net">buildroot@busybox.net</a><br> <a href="http://lists.busybox.net/mailman/listinfo/buildroot" rel="noreferrer" target="_blank">http://lists.busybox.net/<wbr>mailman/listinfo/buildroot</a><br> </font></span></blockquote></div><br></div></div>
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..05b6bb4d4 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,25 @@ 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_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
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 | 23 ++++++++--------------- 2 files changed, 9 insertions(+), 16 deletions(-)