diff mbox series

[kirkstone] libpcap: upgrade 1.10.1 -> 1.10.5

Message ID 20240912131711.243389-1-vanusuri@mvista.com
State Rejected
Delegated to: Steve Sakoman
Headers show
Series [kirkstone] libpcap: upgrade 1.10.1 -> 1.10.5 | expand

Commit Message

Vijay Anusuri Sept. 12, 2024, 1:17 p.m. UTC 
From: Vijay Anusuri <vanusuri@mvista.com>

Changelog:
https://git.tcpdump.org/libpcap/blob/HEAD:/CHANGES

Includes Security fixes
CVE-2023-7256, CVE-2024-8006

Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
---
 .../libpcap/{libpcap_1.10.1.bb => libpcap_1.10.5.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/libpcap/{libpcap_1.10.1.bb => libpcap_1.10.5.bb} (92%)

Comments

Martin Jansa Sept. 14, 2024, 6:41 a.m. UTC | #1 
This update seems to break nmap build from meta-oe:

nse_nsock.cc:36:3: error: expected identifier before 'int'
   36 |   PCAP_SOCKET = lua_upvalueindex(3), /* pcap socket metatable */
      |   ^~~~~~~~~~~
nse_nsock.cc:36:3: error: expected '}' before 'int'
nse_nsock.cc:33:6: note: to match this '{'
   33 | enum {
      |      ^
nse_nsock.cc:36:15: error: expected unqualified-id before '=' token
   36 |   PCAP_SOCKET = lua_upvalueindex(3), /* pcap socket metatable */
      |               ^
nse_nsock.cc:40:1: error: expected declaration before '}' token
   40 | };
      | ^
nse_nsock.cc: In function 'int socket_lock(lua_State*, int)':
nse_nsock.cc:181:17: error: 'THREAD_SOCKETS' was not declared in this
scope; did you mean 'MAX_SOCKETS'?
  181 |   lua_rawget(L, THREAD_SOCKETS);
      |                 ^~~~~~~~~~~~~~
      |                 MAX_SOCKETS
nse_nsock.cc:203:19: error: 'CONNECT_WAITING' was not declared in this scope
  203 |     lua_rawset(L, CONNECT_WAITING);
      |                   ^~~~~~~~~~~~~~~

I don't think this upgrade from
470 Wednesday, June 9, 2021:
471 Summary for 1.10.1 libpcap release:
to
70 Friday, August 30, 2024 / The Tcpdump Group
71 Summary for 1.10.5 libpcap release

is suitable for stable branch, please cherry-pick just the security fixes.

On Thu, Sep 12, 2024 at 3:17 PM Vijay Anusuri via
lists.openembedded.org <vanusuri=mvista.com@lists.openembedded.org>
wrote:
>
> From: Vijay Anusuri <vanusuri@mvista.com>
>
> Changelog:
> https://git.tcpdump.org/libpcap/blob/HEAD:/CHANGES
>
> Includes Security fixes
> CVE-2023-7256, CVE-2024-8006
>
> Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
> ---
>  .../libpcap/{libpcap_1.10.1.bb => libpcap_1.10.5.bb}          | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-connectivity/libpcap/{libpcap_1.10.1.bb => libpcap_1.10.5.bb} (92%)
>
> diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
> similarity index 92%
> rename from meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb
> rename to meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
> index dbe2fd8157..94b6466722 100644
> --- a/meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb
> +++ b/meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
> @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 \
>                      file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
>  DEPENDS = "flex-native bison-native"
>
> -SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz"
> -SRC_URI[sha256sum] = "ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4"
> +SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.xz"
> +SRC_URI[sha256sum] = "84fa89ac6d303028c1c5b754abff77224f45eca0a94eb1a34ff0aa9ceece3925"
>
>  inherit autotools binconfig-disabled pkgconfig
>
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#204443): https://lists.openembedded.org/g/openembedded-core/message/204443
> Mute This Topic: https://lists.openembedded.org/mt/108412577/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Vijay Anusuri Sept. 14, 2024, 10:13 a.m. UTC | #2 
Thanks Martin for letting me know.

Hi Steve,
Could you please ignore this upgrade patch. I will send another patch with
security fixes.

Thanks & Regards,
Vijay

On Sat, Sep 14, 2024 at 12:12 PM Martin Jansa <martin.jansa@gmail.com>
wrote:

> This update seems to break nmap build from meta-oe:
>
> nse_nsock.cc:36:3: error: expected identifier before 'int'
>    36 |   PCAP_SOCKET = lua_upvalueindex(3), /* pcap socket metatable */
>       |   ^~~~~~~~~~~
> nse_nsock.cc:36:3: error: expected '}' before 'int'
> nse_nsock.cc:33:6: note: to match this '{'
>    33 | enum {
>       |      ^
> nse_nsock.cc:36:15: error: expected unqualified-id before '=' token
>    36 |   PCAP_SOCKET = lua_upvalueindex(3), /* pcap socket metatable */
>       |               ^
> nse_nsock.cc:40:1: error: expected declaration before '}' token
>    40 | };
>       | ^
> nse_nsock.cc: In function 'int socket_lock(lua_State*, int)':
> nse_nsock.cc:181:17: error: 'THREAD_SOCKETS' was not declared in this
> scope; did you mean 'MAX_SOCKETS'?
>   181 |   lua_rawget(L, THREAD_SOCKETS);
>       |                 ^~~~~~~~~~~~~~
>       |                 MAX_SOCKETS
> nse_nsock.cc:203:19: error: 'CONNECT_WAITING' was not declared in this
> scope
>   203 |     lua_rawset(L, CONNECT_WAITING);
>       |                   ^~~~~~~~~~~~~~~
>
> I don't think this upgrade from
> 470 Wednesday, June 9, 2021:
> 471 Summary for 1.10.1 libpcap release:
> to
> 70 Friday, August 30, 2024 / The Tcpdump Group
> 71 Summary for 1.10.5 libpcap release
>
> is suitable for stable branch, please cherry-pick just the security fixes.
>
> On Thu, Sep 12, 2024 at 3:17 PM Vijay Anusuri via
> lists.openembedded.org <vanusuri=mvista.com@lists.openembedded.org>
> wrote:
> >
> > From: Vijay Anusuri <vanusuri@mvista.com>
> >
> > Changelog:
> > https://git.tcpdump.org/libpcap/blob/HEAD:/CHANGES
> >
> > Includes Security fixes
> > CVE-2023-7256, CVE-2024-8006
> >
> > Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
> > ---
> >  .../libpcap/{libpcap_1.10.1.bb => libpcap_1.10.5.bb}          | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >  rename meta/recipes-connectivity/libpcap/{libpcap_1.10.1.bb =>
> libpcap_1.10.5.bb} (92%)
> >
> > diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb
> b/meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
> > similarity index 92%
> > rename from meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb
> > rename to meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
> > index dbe2fd8157..94b6466722 100644
> > --- a/meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb
> > +++ b/meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
> > @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 \
> >
> file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
> >  DEPENDS = "flex-native bison-native"
> >
> > -SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz"
> > -SRC_URI[sha256sum] =
> "ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4"
> > +SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.xz"
> > +SRC_URI[sha256sum] =
> "84fa89ac6d303028c1c5b754abff77224f45eca0a94eb1a34ff0aa9ceece3925"
> >
> >  inherit autotools binconfig-disabled pkgconfig
> >
> > --
> > 2.25.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#204443):
> https://lists.openembedded.org/g/openembedded-core/message/204443
> > Mute This Topic: https://lists.openembedded.org/mt/108412577/3617156
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> martin.jansa@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
Steve Sakoman Sept. 16, 2024, 2:51 p.m. UTC | #3 
On Sat, Sep 14, 2024 at 3:14 AM Vijay Anusuri <vanusuri@mvista.com> wrote:
>
> Thanks Martin for letting me know.
>
> Hi Steve,
> Could you please ignore this upgrade patch. I will send another patch with security fixes.

I've dropped it, thanks!

Steve

> On Sat, Sep 14, 2024 at 12:12 PM Martin Jansa <martin.jansa@gmail.com> wrote:
>>
>> This update seems to break nmap build from meta-oe:
>>
>> nse_nsock.cc:36:3: error: expected identifier before 'int'
>>    36 |   PCAP_SOCKET = lua_upvalueindex(3), /* pcap socket metatable */
>>       |   ^~~~~~~~~~~
>> nse_nsock.cc:36:3: error: expected '}' before 'int'
>> nse_nsock.cc:33:6: note: to match this '{'
>>    33 | enum {
>>       |      ^
>> nse_nsock.cc:36:15: error: expected unqualified-id before '=' token
>>    36 |   PCAP_SOCKET = lua_upvalueindex(3), /* pcap socket metatable */
>>       |               ^
>> nse_nsock.cc:40:1: error: expected declaration before '}' token
>>    40 | };
>>       | ^
>> nse_nsock.cc: In function 'int socket_lock(lua_State*, int)':
>> nse_nsock.cc:181:17: error: 'THREAD_SOCKETS' was not declared in this
>> scope; did you mean 'MAX_SOCKETS'?
>>   181 |   lua_rawget(L, THREAD_SOCKETS);
>>       |                 ^~~~~~~~~~~~~~
>>       |                 MAX_SOCKETS
>> nse_nsock.cc:203:19: error: 'CONNECT_WAITING' was not declared in this scope
>>   203 |     lua_rawset(L, CONNECT_WAITING);
>>       |                   ^~~~~~~~~~~~~~~
>>
>> I don't think this upgrade from
>> 470 Wednesday, June 9, 2021:
>> 471 Summary for 1.10.1 libpcap release:
>> to
>> 70 Friday, August 30, 2024 / The Tcpdump Group
>> 71 Summary for 1.10.5 libpcap release
>>
>> is suitable for stable branch, please cherry-pick just the security fixes.
>>
>> On Thu, Sep 12, 2024 at 3:17 PM Vijay Anusuri via
>> lists.openembedded.org <vanusuri=mvista.com@lists.openembedded.org>
>> wrote:
>> >
>> > From: Vijay Anusuri <vanusuri@mvista.com>
>> >
>> > Changelog:
>> > https://git.tcpdump.org/libpcap/blob/HEAD:/CHANGES
>> >
>> > Includes Security fixes
>> > CVE-2023-7256, CVE-2024-8006
>> >
>> > Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
>> > ---
>> >  .../libpcap/{libpcap_1.10.1.bb => libpcap_1.10.5.bb}          | 4 ++--
>> >  1 file changed, 2 insertions(+), 2 deletions(-)
>> >  rename meta/recipes-connectivity/libpcap/{libpcap_1.10.1.bb => libpcap_1.10.5.bb} (92%)
>> >
>> > diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
>> > similarity index 92%
>> > rename from meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb
>> > rename to meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
>> > index dbe2fd8157..94b6466722 100644
>> > --- a/meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb
>> > +++ b/meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
>> > @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 \
>> >                      file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
>> >  DEPENDS = "flex-native bison-native"
>> >
>> > -SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz"
>> > -SRC_URI[sha256sum] = "ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4"
>> > +SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.xz"
>> > +SRC_URI[sha256sum] = "84fa89ac6d303028c1c5b754abff77224f45eca0a94eb1a34ff0aa9ceece3925"
>> >
>> >  inherit autotools binconfig-disabled pkgconfig
>> >
>> > --
>> > 2.25.1
>> >
>> >
>> > -=-=-=-=-=-=-=-=-=-=-=-
>> > Links: You receive all messages sent to this group.
>> > View/Reply Online (#204443): https://lists.openembedded.org/g/openembedded-core/message/204443
>> > Mute This Topic: https://lists.openembedded.org/mt/108412577/3617156
>> > Group Owner: openembedded-core+owner@lists.openembedded.org
>> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com]
>> > -=-=-=-=-=-=-=-=-=-=-=-
>> >
diff mbox series

Patch

diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
similarity index 92%
rename from meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb
rename to meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
index dbe2fd8157..94b6466722 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.10.5.bb
@@ -10,8 +10,8 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 \
                     file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
 DEPENDS = "flex-native bison-native"
 
-SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz"
-SRC_URI[sha256sum] = "ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4"
+SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.xz"
+SRC_URI[sha256sum] = "84fa89ac6d303028c1c5b754abff77224f45eca0a94eb1a34ff0aa9ceece3925"
 
 inherit autotools binconfig-disabled pkgconfig