diff mbox series

[mickledore] glibc: stable 2.37 branch updates.

Message ID 20230426111915.2740079-1-deepadeepthi98@gmail.com
State New
Headers show
Series [mickledore] glibc: stable 2.37 branch updates. | expand

Commit Message

Deepthi Hemraj April 26, 2023, 11:19 a.m. UTC
Below commits on glibc-2.37 stable branch are updated.
1d63573f81 stdio-common: tests: don't double-define _FORTIFY_SOURCE
590d0e089b elf: Restore ldconfig libc6 implicit soname logic [BZ #30125]
790e504a17 stdlib: Undo post review change to 16adc58e73f3 [BZ #27749]

Signed-off-by: Deepthi Hemraj <Deepthi.Hemraj@windriver.com>
---
 meta/conf/distro/include/security_flags.inc | 2 +-
 meta/recipes-core/glibc/glibc-version.inc   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Steve Sakoman April 26, 2023, 5:02 p.m. UTC | #1
Since master is still on 2.37 I think this needs to be submitted for
master first before I can take it for mickledore.

Thanks!

Steve

On Wed, Apr 26, 2023 at 1:20 AM Deepthi Hemraj <deepadeepthi98@gmail.com> wrote:
>
> Below commits on glibc-2.37 stable branch are updated.
> 1d63573f81 stdio-common: tests: don't double-define _FORTIFY_SOURCE
> 590d0e089b elf: Restore ldconfig libc6 implicit soname logic [BZ #30125]
> 790e504a17 stdlib: Undo post review change to 16adc58e73f3 [BZ #27749]
>
> Signed-off-by: Deepthi Hemraj <Deepthi.Hemraj@windriver.com>
> ---
>  meta/conf/distro/include/security_flags.inc | 2 +-
>  meta/recipes-core/glibc/glibc-version.inc   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
> index 2972f05b4e..e950e06ca7 100644
> --- a/meta/conf/distro/include/security_flags.inc
> +++ b/meta/conf/distro/include/security_flags.inc
> @@ -15,7 +15,7 @@ OPTLEVEL = "${@bb.utils.filter('SELECTED_OPTIMIZATION', '-O0 -O1 -O2 -O3 -Ofast
>  lcl_maybe_fortify ?= "${@oe.utils.conditional('OPTLEVEL','-O0','','${OPTLEVEL} -D_FORTIFY_SOURCE=2',d)}"
>
>  # Error on use of format strings that represent possible security problems
> -SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security"
> +SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security"
>
>  # Inject pie flags into compiler flags if not configured with gcc itself
>  # especially useful with external toolchains
> diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc
> index 1b8665a9d8..4e0b82f1de 100644
> --- a/meta/recipes-core/glibc/glibc-version.inc
> +++ b/meta/recipes-core/glibc/glibc-version.inc
> @@ -1,6 +1,6 @@
>  SRCBRANCH ?= "release/2.37/master"
>  PV = "2.37"
> -SRCREV_glibc ?= "d8e1a7590d375159fb5aac07ad8111ab4699e994"
> +SRCREV_glibc ?= "1d63573f81945a489ea169636fa11850bc74716b"
>  SRCREV_localedef ?= "794da69788cbf9bf57b59a852f9f11307663fa87"
>
>  GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#180430): https://lists.openembedded.org/g/openembedded-core/message/180430
> Mute This Topic: https://lists.openembedded.org/mt/98512433/3620601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index 2972f05b4e..e950e06ca7 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -15,7 +15,7 @@  OPTLEVEL = "${@bb.utils.filter('SELECTED_OPTIMIZATION', '-O0 -O1 -O2 -O3 -Ofast
 lcl_maybe_fortify ?= "${@oe.utils.conditional('OPTLEVEL','-O0','','${OPTLEVEL} -D_FORTIFY_SOURCE=2',d)}"
 
 # Error on use of format strings that represent possible security problems
-SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security"
+SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security"
 
 # Inject pie flags into compiler flags if not configured with gcc itself
 # especially useful with external toolchains
diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc
index 1b8665a9d8..4e0b82f1de 100644
--- a/meta/recipes-core/glibc/glibc-version.inc
+++ b/meta/recipes-core/glibc/glibc-version.inc
@@ -1,6 +1,6 @@ 
 SRCBRANCH ?= "release/2.37/master"
 PV = "2.37"
-SRCREV_glibc ?= "d8e1a7590d375159fb5aac07ad8111ab4699e994" 
+SRCREV_glibc ?= "1d63573f81945a489ea169636fa11850bc74716b"
 SRCREV_localedef ?= "794da69788cbf9bf57b59a852f9f11307663fa87"
 
 GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"