Skip to contentSkip to conversation

go: Upgrade 1.11.1 -> 1.11.4 minor release

PATCH In review Khem Raj 2 participants 4 messages Dec 17, 2018

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 go: Upgrade 1.11.1 -> 1.11.4 minor release

Changes: https://golang.org/doc/devel/release.html#go1.11

---
 meta/recipes-devtools/go/go-1.11.inc                |  7 +++----
 ...007-cmd-go-make-GOROOT-precious-by-default.patch |  6 +++---
 .../0008-use-GOBUILDMODE-to-set-buildmode.patch     | 13 +++++--------
 3 files changed, 11 insertions(+), 15 deletions(-)
meta/recipes-devtools/go/go-1.11.inc +3 -4
index d626514ae6..d03e26cea0 100644
@@ -1,7 +1,7 @@
 require go-common.inc
 
 GO_BASEVERSION = "1.11"
-GO_MINOR = ".1"
+GO_MINOR = ".4"
 PV .= "${GO_MINOR}"
 FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
 
@@ -17,8 +17,7 @@ SRC_URI += "\
     file://0007-cmd-go-make-GOROOT-precious-by-default.patch \
     file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
 "
-
 SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
 
-SRC_URI[main.md5sum] = "eb9e9792247143705a7aacea9398cde0"
-SRC_URI[main.sha256sum] = "558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117"
+SRC_URI[main.md5sum] = "a77697673215be465d1b583680ef2318"
+SRC_URI[main.sha256sum] = "4cfd42720a6b1e79a8024895fa6607b69972e8e32446df76d6ce79801bbadb15"
meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch +3 -3
index f317e48a33..29ef947abd 100644
@@ -65,8 +65,8 @@ Index: go/src/cmd/go/internal/work/exec.go
 ===================================================================
 --- go.orig/src/cmd/go/internal/work/exec.go
 +++ go/src/cmd/go/internal/work/exec.go
-@@ -440,6 +440,23 @@ func (b *Builder) build(a *Action) (err
- 		return fmt.Errorf("module requires Go %s", p.Module.GoVersion)
+@@ -436,6 +436,23 @@ func (b *Builder) build(a *Action) (err
+ 		return fmt.Errorf("missing or invalid binary-only package; expected file %q", a.Package.Target)
  	}
  
 +	if goRootPrecious && (a.Package.Standard || a.Package.Goroot) {
@@ -89,7 +89,7 @@ Index: go/src/cmd/go/internal/work/exec.go
  	if err := b.Mkdir(a.Objdir); err != nil {
  		return err
  	}
-@@ -1435,6 +1452,14 @@ func BuildInstallFunc(b *Builder, a *Act
+@@ -1438,6 +1455,14 @@ func BuildInstallFunc(b *Builder, a *Act
  		return nil
  	}
  
meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch +5 -8
index b6ab504335..225cf439c5 100644
@@ -18,11 +18,11 @@ Signed-off-by: Hongxu Jia <[email protected]>
  src/cmd/go/internal/work/build.go | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go
-index 145b875..595d703 100644
---- a/src/cmd/go/internal/work/build.go
-+++ b/src/cmd/go/internal/work/build.go
-@@ -218,7 +218,11 @@ func AddBuildFlags(cmd *base.Command) {
+Index: go/src/cmd/go/internal/work/build.go
+===================================================================
+--- go.orig/src/cmd/go/internal/work/build.go
++++ go/src/cmd/go/internal/work/build.go
+@@ -223,7 +223,11 @@ func AddBuildFlags(cmd *base.Command) {
  
  	cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "")
  	cmd.Flag.Var(buildCompiler{}, "compiler", "")
@@ -35,6 +35,3 @@ index 145b875..595d703 100644
  	cmd.Flag.Var(&load.BuildGcflags, "gcflags", "")
  	cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "")
  	cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "")
--- 
-2.7.4
-
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH 2/3 libxcrypt: Upgrade to 4.4.1 release

License-Update: New files added to existing list

Add -Wno-error=missing-attributes to compiler flags, this helps in compiling with gcc 9.0, eventually, the code should be fixed

---
 .../libxcrypt/{libxcrypt_4.1.1.bb => libxcrypt_4.4.1.bb}   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-core/libxcrypt/{libxcrypt_4.1.1.bb => libxcrypt_4.4.1.bb} (75%)
meta/recipes-core/libxcrypt/libxcrypt_4.4.1.bb renamed from meta/recipes-core/libxcrypt/libxcrypt_4.1.1.bb +4 -3
similarity index 75%
rename from meta/recipes-core/libxcrypt/libxcrypt_4.1.1.bb
rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.1.bb
index 465aa96523..8dcda25e6d 100644
@@ -3,13 +3,14 @@ DESCRIPTION = "Forked code from glibc libary to extract only crypto part."
 HOMEPAGE = "https://github.com/besser82/libxcrypt"
 SECTION = "libs"
 LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM ?= "file://LICENSING;md5=cb3ca4cabd2447a37bf186fad6f79852 \
+LIC_FILES_CHKSUM ?= "file://LICENSING;md5=e28ba6195a4e39904919b78a92bcf27e \
       file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
 inherit autotools pkgconfig
 
-SRCREV ?= "21b455b68baad279e6a3936faced16c5e5634376"
+# v4.4.1
+SRCREV ?= "b8714d4e9e37cf0d511917bd5eea0e51e4a397d5"
 SRCBRANCH ?= "develop"
 
 SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \
@@ -22,6 +23,6 @@ FILES_${PN} = "${libdir}/libcrypt*.so.* ${libdir}/libcrypt-*.so ${libdir}/libowc
 S = "${WORKDIR}/git"
 
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE} -std=gnu99"
-TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error=missing-attributes"
 
 BBCLASSEXTEND = "nativesdk"
Signature · 1 line
2.20.1
#2 lore raw

Re: [PATCH 2/3] libxcrypt: Upgrade to 4.4.1 release

Quoted 5 lines · Khem Raj

License-Update: New files added to existing list

Add -Wno-error=missing-attributes to compiler flags, this helps in compiling with gcc 9.0, eventually, the code should be fixed

Quoted 7 lines
---
 .../libxcrypt/{libxcrypt_4.1.1.bb => libxcrypt_4.4.1.bb}   | 7 ++++-
--
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-core/libxcrypt/{libxcrypt_4.1.1.bb =>

libxcrypt_4.4.1.bb} (75%)

Fails on x32:

https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/102

Cheers,

Richard

author
#3 lore raw

PATCH 3/3 systemd: Fix memory use after free errors

In reply to Khem Raj

Found with gcc trunk

---
 ...-t-pass-null-directive-argument-to-s.patch | 31 +++++++++++++
 ...se-after-free-case-in-load_from_path.patch | 43 +++++++++++++++++++
 meta/recipes-core/systemd/systemd_239.bb      |  2 +
 3 files changed, 76 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0002-core-Fix-use-after-free-case-in-load_from_path.patch
meta/recipes-core/systemd/systemd/0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch new file +31 -0
new file mode 100644
index 0000000000..0538c7bbc8
@@ -0,0 +1,31 @@
+From bfc4183ea995f1c211385d066cdb1fe9ce89f621 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sun, 16 Dec 2018 20:53:38 -0800
+Subject: [PATCH 1/2] sysctl: Don't pass null directive argument to '%s'
+
+value pointer here is always NULL but  subsequent use of that pointer
+with a %s format will always be NULL, printing p instead would be a
+valid string
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/11179]
+ src/sysctl/sysctl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
+index 1cfe51018..c67d79032 100644
+--- a/src/sysctl/sysctl.c
++++ b/src/sysctl/sysctl.c
+@@ -115,7 +115,7 @@ static int parse_file(OrderedHashmap *sysctl_options, const char *path, bool ign
+ 
+                 value = strchr(p, '=');
+                 if (!value) {
+-                        log_error("Line is not an assignment at '%s:%u': %s", path, c, value);
++                        log_error("Line is not an assignment at '%s:%u': %s", path, c, p);
+ 
+                         if (r == 0)
+                                 r = -EINVAL;
+-- 
+2.20.1
+
meta/recipes-core/systemd/systemd/0002-core-Fix-use-after-free-case-in-load_from_path.patch new file +43 -0

43 lines not on this page · raw message

meta/recipes-core/systemd/systemd_239.bb +2 -0
index a40c89973a..03acce25b7 100644
@@ -35,6 +35,8 @@ SRC_URI += "file://touchscreen.rules \
            file://0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch \
            file://0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch \
            file://0001-timesync-changes-type-of-drift_freq-to-int64_t.patch \
+           file://0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch \
+           file://0002-core-Fix-use-after-free-case-in-load_from_path.patch \
            "
 
 # patches made for musl are only applied on TCLIBC is musl
Signature · 1 line
2.20.1