Skip to contentSkip to conversation

package/git: bump version to 2.39.1

PATCH In review Peter Seiderer 3 participants 6 messages Jan 18, 2023 – Feb 5, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/git: bump version to 2.39.1

- fixes CVE-2022-41903 and CVE-2022-23521

For details see [1].

[1] https://lore.kernel.org/git/[email protected]/

---
 package/git/git.hash | 2 +-
 package/git/git.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/git/git.hash +1 -1
index 57a77b2810..75398896e5 100644
@@ -1,5 +1,5 @@
 # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
-sha256  ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b  git-2.39.0.tar.xz
+sha256  40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161  git-2.39.1.tar.xz
 # Locally calculated
 sha256  5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e  COPYING
 sha256  1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a  LGPL-2.1
package/git/git.mk +1 -1
index 9918d4c1ef..1d728e1964 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GIT_VERSION = 2.39.0
+GIT_VERSION = 2.39.1
 GIT_SOURCE = git-$(GIT_VERSION).tar.xz
 GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
 GIT_LICENSE = GPL-2.0, LGPL-2.1+
Signature · 6 lines
2.39.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Tested-by on v1 1/1
#1 lore raw
Quoted 6 lines · Peter Seiderer

- fixes CVE-2022-41903 and CVE-2022-23521

For details see [1].

[1] https://lore.kernel.org/git/[email protected]/

Ah! I'm about to submit the same bump. My bump builds fine, so I think it is also applicable to yours.

Quoted 22 lines
---
 package/git/git.hash | 2 +-
 package/git/git.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/git/git.hash +1 -1
index 57a77b2810..75398896e5 100644
@@ -1,5 +1,5 @@
 # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
-sha256  ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b  git-2.39.0.tar.xz
+sha256  40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161  git-2.39.1.tar.xz
 # Locally calculated
 sha256  5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e  COPYING
 sha256  1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a  LGPL-2.1
package/git/git.mk +0 -0
index 9918d4c1ef..1d728e1964 100644

package/git/git.mk line 10

Quoted 8 lines
package/git/git.mk +1 -1
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GIT_VERSION = 2.39.0
+GIT_VERSION = 2.39.1
 GIT_SOURCE = git-$(GIT_VERSION).tar.xz
 GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
 GIT_LICENSE = GPL-2.0, LGPL-2.1+

The package patches apply here (with fuzz), so you need to refresh these against v2.39.1:

---- >8 ----

package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch +4 -4
index dbde87940a..cb6c3a6dbb 100644
@@ -1,4 +1,4 @@
-From 385f67eb2254edb1fb4cf523e5e3d5a8f123d72c Mon Sep 17 00:00:00 2001
+From a70fa5257ee347fa3a21734b7066803064657445 Mon Sep 17 00:00:00 2001
 From: Jeff King <[email protected]>
 Date: Wed, 30 Nov 2022 16:15:14 -0500
 Subject: [PATCH] git-compat-util: avoid redefining system function names
@@ -57,14 +57,14 @@ but without redeclaring the system function names.
 
 Signed-off-by: Jeff King <[email protected]>
 Signed-off-by: Junio C Hamano <[email protected]>
-[Bagas: cherry-picked from e0c08a4f738b3dea7a4e8fe3511c323cf1f41942 on next branch]
+[Bagas: refresh against v2.39.1]
 Signed-off-by: Bagas Sanjaya <[email protected]>
 ---
  git-compat-util.h | 13 ++++++++-----
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/git-compat-util.h b/git-compat-util.h
-index a76d0526f7..e3456bdd0d 100644
+index af05077560..f6882b9b50 100644
 --- a/git-compat-util.h
 +++ b/git-compat-util.h
 @@ -341,11 +341,12 @@ struct itimerval {
@@ -83,7 +83,7 @@ index a76d0526f7..e3456bdd0d 100644
  #endif
  
  #ifndef NO_LIBGEN_H
-@@ -1471,14 +1472,16 @@ int open_nofollow(const char *path, int flags);
+@@ -1479,14 +1480,16 @@ int open_nofollow(const char *path, int flags);
  #endif
  
  #ifndef _POSIX_THREAD_SAFE_FUNCTIONS
package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch +4 -4
index 9e3c9b662c..9a9d2362b0 100644
@@ -1,4 +1,4 @@
-From 6d406390b870fdb2cd9d18b12ebfabc12f5096df Mon Sep 17 00:00:00 2001
+From 1528273a611e331bfce4da1d4fb0f76d9463ab02 Mon Sep 17 00:00:00 2001
 From: Jeff King <[email protected]>
 Date: Fri, 2 Dec 2022 06:05:38 -0500
 Subject: [PATCH] git-compat-util: undefine system names before redeclaring
@@ -22,14 +22,14 @@ defensive about the other macro wrappers added in the previous patch.
 
 Signed-off-by: Jeff King <[email protected]>
 Signed-off-by: Junio C Hamano <[email protected]>
-[Bagas: cherry-picked from e1a95b78d8a26762ea04332de8b7c3878da51522 on next branch]
+[Bagas: refresh against v2.39.1]
 Signed-off-by: Bagas Sanjaya <[email protected]>
 ---
  git-compat-util.h | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/git-compat-util.h b/git-compat-util.h
-index e3456bdd0d..211861da0f 100644
+index f6882b9b50..dadb9e55cb 100644
 --- a/git-compat-util.h
 +++ b/git-compat-util.h
 @@ -346,6 +346,7 @@ static inline int git_setitimer(int which,
@@ -40,7 +40,7 @@ index e3456bdd0d..211861da0f 100644
  #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue)
  #endif
  
-@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh)
+@@ -1488,6 +1489,9 @@ static inline void git_funlockfile(FILE *fh)
  {
  	; /* nothing */
  }

When the refresh is applied, don't forget to add:

Thanks.

Signature · 1 line
An old man doll... just what I always wanted! - Clara

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw

Hello *,

Quoted 5 lines · Bagas Sanjaya
Quoted 4 lines · Peter Seiderer

- fixes CVE-2022-41903 and CVE-2022-23521

For details see [1].

Quoted 7 lines
Quoted 2 lines

[1] https://lore.kernel.org/git/[email protected]/

Ah! I'm about to submit the same bump. My bump builds fine, so I think it is also applicable to yours.

Thanks for confirmation...

Quoted 26 lines
Quoted 26 lines
---
 package/git/git.hash | 2 +-
 package/git/git.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/git/git.hash +1 -1
index 57a77b2810..75398896e5 100644
@@ -1,5 +1,5 @@
 # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
-sha256  ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b  git-2.39.0.tar.xz
+sha256  40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161  git-2.39.1.tar.xz
 # Locally calculated
 sha256  5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e  COPYING
 sha256  1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a  LGPL-2.1
package/git/git.mk +0 -0
index 9918d4c1ef..1d728e1964 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
Quoted 8 lines

package/git/git.mk line 10

Quoted 5 lines
package/git/git.mk +1 -1
-GIT_VERSION = 2.39.0
+GIT_VERSION = 2.39.1
 GIT_SOURCE = git-$(GIT_VERSION).tar.xz
 GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
 GIT_LICENSE = GPL-2.0, LGPL-2.1+

The package patches apply here (with fuzz), so you need to refresh these against v2.39.1:

Matter of taste (?), but for my taste unneeded code churn... as long as the patches apply unchanged...

Regards,
Peter

Quoted 75 lines

---- >8 ----

package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch +4 -4
index dbde87940a..cb6c3a6dbb 100644
@@ -1,4 +1,4 @@
-From 385f67eb2254edb1fb4cf523e5e3d5a8f123d72c Mon Sep 17 00:00:00 2001
+From a70fa5257ee347fa3a21734b7066803064657445 Mon Sep 17 00:00:00 2001
 From: Jeff King <[email protected]>
 Date: Wed, 30 Nov 2022 16:15:14 -0500
 Subject: [PATCH] git-compat-util: avoid redefining system function names
@@ -57,14 +57,14 @@ but without redeclaring the system function names.
 
 Signed-off-by: Jeff King <[email protected]>
 Signed-off-by: Junio C Hamano <[email protected]>
-[Bagas: cherry-picked from e0c08a4f738b3dea7a4e8fe3511c323cf1f41942 on next branch]
+[Bagas: refresh against v2.39.1]
 Signed-off-by: Bagas Sanjaya <[email protected]>
 ---
  git-compat-util.h | 13 ++++++++-----
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/git-compat-util.h b/git-compat-util.h
-index a76d0526f7..e3456bdd0d 100644
+index af05077560..f6882b9b50 100644
 --- a/git-compat-util.h
 +++ b/git-compat-util.h
 @@ -341,11 +341,12 @@ struct itimerval {
@@ -83,7 +83,7 @@ index a76d0526f7..e3456bdd0d 100644
  #endif
 
  #ifndef NO_LIBGEN_H
-@@ -1471,14 +1472,16 @@ int open_nofollow(const char *path, int flags);
+@@ -1479,14 +1480,16 @@ int open_nofollow(const char *path, int flags);
  #endif
 
  #ifndef _POSIX_THREAD_SAFE_FUNCTIONS
package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch +4 -4
index 9e3c9b662c..9a9d2362b0 100644
@@ -1,4 +1,4 @@
-From 6d406390b870fdb2cd9d18b12ebfabc12f5096df Mon Sep 17 00:00:00 2001
+From 1528273a611e331bfce4da1d4fb0f76d9463ab02 Mon Sep 17 00:00:00 2001
 From: Jeff King <[email protected]>
 Date: Fri, 2 Dec 2022 06:05:38 -0500
 Subject: [PATCH] git-compat-util: undefine system names before redeclaring
@@ -22,14 +22,14 @@ defensive about the other macro wrappers added in the previous patch.
 
 Signed-off-by: Jeff King <[email protected]>
 Signed-off-by: Junio C Hamano <[email protected]>
-[Bagas: cherry-picked from e1a95b78d8a26762ea04332de8b7c3878da51522 on next branch]
+[Bagas: refresh against v2.39.1]
 Signed-off-by: Bagas Sanjaya <[email protected]>
 ---
  git-compat-util.h | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/git-compat-util.h b/git-compat-util.h
-index e3456bdd0d..211861da0f 100644
+index f6882b9b50..dadb9e55cb 100644
 --- a/git-compat-util.h
 +++ b/git-compat-util.h
 @@ -346,6 +346,7 @@ static inline int git_setitimer(int which,
@@ -40,7 +40,7 @@ index e3456bdd0d..211861da0f 100644
  #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue)
  #endif
 
-@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh)
+@@ -1488,6 +1489,9 @@ static inline void git_funlockfile(FILE *fh)
  {
  	; /* nothing */
  }
Quoted 6 lines

When the refresh is applied, don't forget to add:

Thanks.

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw
Quoted 54 lines · Peter Seiderer

Hello *,

Quoted 5 lines · Bagas Sanjaya
Quoted 4 lines · Peter Seiderer

- fixes CVE-2022-41903 and CVE-2022-23521

For details see [1].

Quoted 7 lines
Quoted 2 lines

[1] https://lore.kernel.org/git/[email protected]/

Ah! I'm about to submit the same bump. My bump builds fine, so I think it is also applicable to yours.

Thanks for confirmation...

Quoted 26 lines
Quoted 26 lines
---
 package/git/git.hash | 2 +-
 package/git/git.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/git/git.hash +1 -1
index 57a77b2810..75398896e5 100644
@@ -1,5 +1,5 @@
 # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
-sha256  ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b  git-2.39.0.tar.xz
+sha256  40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161  git-2.39.1.tar.xz
 # Locally calculated
 sha256  5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e  COPYING
 sha256  1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a  LGPL-2.1
package/git/git.mk +0 -0
index 9918d4c1ef..1d728e1964 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
Quoted 8 lines

package/git/git.mk line 10

Quoted 5 lines
package/git/git.mk +1 -1
-GIT_VERSION = 2.39.0
+GIT_VERSION = 2.39.1
 GIT_SOURCE = git-$(GIT_VERSION).tar.xz
 GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
 GIT_LICENSE = GPL-2.0, LGPL-2.1+

The package patches apply here (with fuzz), so you need to refresh these against v2.39.1:

Quoted 3 lines

Matter of taste (?), but for my taste unneeded code churn... as long as the patches apply unchanged...

The fuzziness when applying the patch is due to commit 48050c42c7 (pretty:
fix integer overflow in wrapping format, 2022-12-01).

IMO, in any case, when a new upstream version is released, any out-of-tree patches (like ones Buildroot ship) should be refreshed in order for them to be applied cleanly.

Thanks.

Signature · 6 lines
An old man doll... just what I always wanted! - Clara

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw
In reply to Peter Seiderer
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

- fixes CVE-2022-41903 and CVE-2022-23521
For details see [1].

[1] https://lore.kernel.org/git/[email protected]/

Committed after adjusting the summary to make it clear that this is a security bump, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#5 lore raw
Quoted 6 lines
Quoted 5 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

"Peter" == Peter Korsgaard <[email protected]> writes:

"Peter" == Peter Seiderer <[email protected]> writes:

- fixes CVE-2022-41903 and CVE-2022-23521
For details see [1].

Quoted 6 lines
Quoted 3 lines

[1] https://lore.kernel.org/git/[email protected]/

Committed after adjusting the summary to make it clear that this is a security bump, thanks.

For 2022.02.x / 2022.11.x I have instead bumped to 2.31.6, which contains the same security fixes.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot