[v2] buildscript: Update LEDE and packages, use lede git mirror

Submitted by Adrian Schmutzler on Oct. 13, 2017, 11:17 p.m.

Details

Message ID 1507936676-2707-1-git-send-email-freifunk@adrianschmutzler.de
State Accepted
Headers show

Commit Message

Adrian Schmutzler Oct. 13, 2017, 11:17 p.m. 
- Fixes dnsmasq CVE-2017-13704
- Adds LED support to WA850RE v1

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Signed-off-by: Fabian Bläse <fabian@blaese.de>
---
 buildscript | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/buildscript b/buildscript
index 2e351ca..434b5d3 100755
--- a/buildscript
+++ b/buildscript
@@ -13,10 +13,10 @@ 
 
 builddir=./build
 
-OPENWRTREV="97ebdf93a330ef1d7ff1cf6989cfb92ac2f5a386" # LEDE 17.01.2
+OPENWRTREV="8ad1b09c6dcff814eb04084ef349f975025b7dc1" # LEDE from 2017-10-13
 OPENWRTURL="https://git.lede-project.org/source.git"
-PACKAGEREV="fa3a118de87d7600729dd07d2f24ca3138d9dd4d" # lede-17.01 from 2017-09-14
-PACKAGEURL="https://github.com/openwrt/packages.git"
+PACKAGEREV="21b2e3eb761ea79bf3a8d2b6368435887960f5c2" # lede-17.01.3
+PACKAGEURL="https://git.lede-project.org/feed/packages.git"
 
 ## Feed definition [0]: name aka directory, [1]: url, [2]: revision, [3..n]: patches
 
@@ -36,7 +36,7 @@  GLUON_PKGS="kmod-batman-adv-legacy micrond simple-tc uradvd"
 
 #official openwrt routing packages
 ROUTING=(routing
-         https://github.com/openwrt-routing/packages.git
+         https://git.lede-project.org/feed/routing.git
          d11075cd40a88602bf4ba2b275f72100ddcb4767) # lede-17.01
 ROUTING_PKGS="kmod-batman-adv batctl alfred"

Comments

Tim Niemeyer Oct. 14, 2017, 3:54 p.m. 
Hi

Am Samstag, den 14.10.2017, 01:17 +0200 schrieb Adrian Schmutzler:
> - Fixes dnsmasq CVE-2017-13704
Ich kann zwischen V1 und V2 keine Änderung am dnsmasq finden.

Tim

> - Adds LED support to WA850RE v1
> 
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> Signed-off-by: Fabian Bläse <fabian@blaese.de>
> ---
>  buildscript | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/buildscript b/buildscript
> index 2e351ca..434b5d3 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -13,10 +13,10 @@
>  
>  builddir=./build
>  
> -OPENWRTREV="97ebdf93a330ef1d7ff1cf6989cfb92ac2f5a386" # LEDE 17.01.2
> +OPENWRTREV="8ad1b09c6dcff814eb04084ef349f975025b7dc1" # LEDE from
> 2017-10-13
>  OPENWRTURL="https://git.lede-project.org/source.git"
> -PACKAGEREV="fa3a118de87d7600729dd07d2f24ca3138d9dd4d" # lede-17.01
> from 2017-09-14
> -PACKAGEURL="https://github.com/openwrt/packages.git"
> +PACKAGEREV="21b2e3eb761ea79bf3a8d2b6368435887960f5c2" # lede-17.01.3
> +PACKAGEURL="https://git.lede-project.org/feed/packages.git"
>  
>  ## Feed definition [0]: name aka directory, [1]: url, [2]: revision,
> [3..n]: patches
>  
> @@ -36,7 +36,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond simple-
> tc uradvd"
>  
>  #official openwrt routing packages
>  ROUTING=(routing
> -         https://github.com/openwrt-routing/packages.git
> +         https://git.lede-project.org/feed/routing.git
>           d11075cd40a88602bf4ba2b275f72100ddcb4767) # lede-17.01
>  ROUTING_PKGS="kmod-batman-adv batctl alfred"
>  
> -- 
> 2.7.4
>
Adrian Schmutzler Oct. 14, 2017, 3:55 p.m. 
V2 ergänzt den Patch für den WA850RE v1.

Der CVE ist bereits im v1 drin.

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
> Of Tim Niemeyer
> Sent: Samstag, 14. Oktober 2017 17:54
> To: franken-dev@freifunk.net
> Subject: Re: [PATCH v2] buildscript: Update LEDE and packages, use lede git
> mirror
> 
> Hi
> 
> Am Samstag, den 14.10.2017, 01:17 +0200 schrieb Adrian Schmutzler:
> > - Fixes dnsmasq CVE-2017-13704
> Ich kann zwischen V1 und V2 keine Änderung am dnsmasq finden.
> 
> Tim
> 
> > - Adds LED support to WA850RE v1
> >
> > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> > Signed-off-by: Fabian Bläse <fabian@blaese.de>
> > ---
> >  buildscript | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/buildscript b/buildscript index 2e351ca..434b5d3 100755
> > --- a/buildscript
> > +++ b/buildscript
> > @@ -13,10 +13,10 @@
> >
> >  builddir=./build
> >
> > -OPENWRTREV="97ebdf93a330ef1d7ff1cf6989cfb92ac2f5a386" # LEDE
> 17.01.2
> > +OPENWRTREV="8ad1b09c6dcff814eb04084ef349f975025b7dc1" # LEDE
> from
> > 2017-10-13
> >  OPENWRTURL="https://git.lede-project.org/source.git"
> > -PACKAGEREV="fa3a118de87d7600729dd07d2f24ca3138d9dd4d" # lede-
> 17.01
> > from 2017-09-14 -
> PACKAGEURL="https://github.com/openwrt/packages.git"
> > +PACKAGEREV="21b2e3eb761ea79bf3a8d2b6368435887960f5c2" # lede-
> 17.01.3
> > +PACKAGEURL="https://git.lede-project.org/feed/packages.git"
> >
> >  ## Feed definition [0]: name aka directory, [1]: url, [2]: revision,
> > [3..n]: patches
> >
> > @@ -36,7 +36,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond
> simple-
> > tc uradvd"
> >
> >  #official openwrt routing packages
> >  ROUTING=(routing
> > -         https://github.com/openwrt-routing/packages.git
> > +         https://git.lede-project.org/feed/routing.git
> >           d11075cd40a88602bf4ba2b275f72100ddcb4767) # lede-17.01
> >  ROUTING_PKGS="kmod-batman-adv batctl alfred"
> >
> > --
> > 2.7.4
> >
Tim Niemeyer Oct. 14, 2017, 4:01 p.m. 
Hi

Am Samstag, den 14.10.2017, 17:55 +0200 schrieb
mail@adrianschmutzler.de:
> V2 ergänzt den Patch für den WA850RE v1.
> 
> Der CVE ist bereits im v1 drin.
Danke fürs Klarstellen.

Reviewed und nach einem rebase applied.

Es wäre einfacher gewesen, wenn ...

> > -----Original Message-----
> > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On
> > Behalf
> > Of Tim Niemeyer
> > Sent: Samstag, 14. Oktober 2017 17:54
> > To: franken-dev@freifunk.net
> > Subject: Re: [PATCH v2] buildscript: Update LEDE and packages, use
> > lede git
> > mirror
> > 
> > Hi
> > 
> > Am Samstag, den 14.10.2017, 01:17 +0200 schrieb Adrian Schmutzler:
> > > - Fixes dnsmasq CVE-2017-13704
> > 
> > Ich kann zwischen V1 und V2 keine Änderung am dnsmasq finden.
> > 
> > Tim
> > 
> > > - Adds LED support to WA850RE v1
> > > 
> > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> > > Signed-off-by: Fabian Bläse <fabian@blaese.de>
> > > ---
[hinter der Scissors (die drei Striche)]

... genau hier eine Beschreibung drin wäre, was sich in der Patch-
Version geändert hat.

Ein Tool, was das automatisch erledigt, wäre dafür z.B. patman.

> > >  buildscript | 8 ++++----
> > >  1 file changed, 4 insertions(+), 4 deletions(-)
> > > 

[vor dem Patch]
> > > diff --git a/buildscript b/buildscript index 2e351ca..434b5d3
> > > 100755
> > > --- a/buildscript
> > > +++ b/buildscript
> > > @@ -13,10 +13,10 @@
> > > 
> > >  builddir=./build
> > > 


Tim

> > > -OPENWRTREV="97ebdf93a330ef1d7ff1cf6989cfb92ac2f5a386" # LEDE
> > 
> > 17.01.2
> > > +OPENWRTREV="8ad1b09c6dcff814eb04084ef349f975025b7dc1" # LEDE
> > 
> > from
> > > 2017-10-13
> > >  OPENWRTURL="https://git.lede-project.org/source.git"
> > > -PACKAGEREV="fa3a118de87d7600729dd07d2f24ca3138d9dd4d" # lede-
> > 
> > 17.01
> > > from 2017-09-14 -
> > 
> > PACKAGEURL="https://github.com/openwrt/packages.git"
> > > +PACKAGEREV="21b2e3eb761ea79bf3a8d2b6368435887960f5c2" # lede-
> > 
> > 17.01.3
> > > +PACKAGEURL="https://git.lede-project.org/feed/packages.git"
> > > 
> > >  ## Feed definition [0]: name aka directory, [1]: url, [2]:
> > > revision,
> > > [3..n]: patches
> > > 
> > > @@ -36,7 +36,7 @@ GLUON_PKGS="kmod-batman-adv-legacy micrond
> > 
> > simple-
> > > tc uradvd"
> > > 
> > >  #official openwrt routing packages
> > >  ROUTING=(routing
> > > -         https://github.com/openwrt-routing/packages.git
> > > +         https://git.lede-project.org/feed/routing.git
> > >           d11075cd40a88602bf4ba2b275f72100ddcb4767) # lede-17.01
> > >  ROUTING_PKGS="kmod-batman-adv batctl alfred"
> > > 
> > > --
> > > 2.7.4
> > > 
> 
>