Skip to contentSkip to conversation

package/capnproto: bump version to 0.7.0

PATCH Superseded Koen Martens 2 participants 4 messages Aug 15, 2019 – Aug 16, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/capnproto: bump version to 0.7.0

The patch against 0.6.1 has been merged upstream,
and has been removed from this package.

---
 ...01-Do-not-use-execinfo-h-with-uclibc.patch | 30 -------------------
 package/capnproto/capnproto.hash              |  2 +-
 package/capnproto/capnproto.mk                |  2 +-
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch
package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch deleted +0 -30
deleted file mode 100644
index 6bb7702a58..0000000000
@@ -1,30 +0,0 @@
-From e651ac5febc59e3e2b5d3365ededbe5362756da2 Mon Sep 17 00:00:00 2001
-From: Koen Martens <[email protected]>
-Date: Wed, 12 Jul 2017 18:49:32 +0200
-Subject: [PATCH] Do not use execinfo.h with uclibc (#511)
-
-Upstream commit: https://github.com/capnproto/capnproto/commit/e651ac5febc59e3e2b5d3365ededbe5362756da2
-
-Signed-off-by: Koen Martens <[email protected]>
-Signed-off-by: Joel Carlson <[email protected]>
-
----
- c++/src/kj/exception.c++ | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/c++/src/kj/exception.c++ b/c++/src/kj/exception.c++
-index 218f1db..339601a 100644
---- a/c++/src/kj/exception.c++
-+++ b/c++/src/kj/exception.c++
-@@ -33,7 +33,7 @@
- #endif
- #include "io.h"
- 
--#if (__linux__ && __GLIBC__) || __APPLE__
-+#if (__linux__ && __GLIBC__ && !__UCLIBC__) || __APPLE__
- #define KJ_HAS_BACKTRACE 1
- #include <execinfo.h>
- #endif
--- 
-2.7.4
-
package/capnproto/capnproto.hash +1 -1
index bc6a27684b..869390f2c3 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	85210424c09693d8fe158c1970a2bca37af3a0424f02b263f566a1b8a5451a2d  capnproto-0.6.1.tar.gz
+sha256	76c7114a3d142ad08b7208b3964a26e72a6320ee81331d3f0b87569fc9c47a28  capnproto-0.7.0.tar.gz
 sha256	16194222e9412c3aa14d2287953f7fc89a1dcbcdd266d1534ba35060d4cde5b6  LICENSE
package/capnproto/capnproto.mk +1 -1
index 3c7965d60c..34fb885914 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CAPNPROTO_VERSION = 0.6.1
+CAPNPROTO_VERSION = 0.7.0
 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION))
 CAPNPROTO_LICENSE = MIT
 CAPNPROTO_LICENSE_FILES = LICENSE
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 package/capnproto: bump version to 0.7.0

Hello Koen,

Quoted 4 lines · On Thu, 15 Aug 2019 11:58:04 +0200 Koen Martens <[email protected]> wrote:

The patch against 0.6.1 has been merged upstream,
and has been removed from this package.

This patch breaks legal-info for the package, because the license file hash has changed:

ERROR: LICENSE has wrong sha256 hash:
ERROR: expected: 16194222e9412c3aa14d2287953f7fc89a1dcbcdd266d1534ba35060d4cde5b6
ERROR: got : 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10

Notice that when such a thing happen, you shouldn't just silently change the license file hash: the commit log must include an explanation as to what changed in the license file. Typically doing a diff between the old and the new license file allows to check what changed.

Could you fix this and submit an updated version ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 package/capnproto: bump version to 0.7.0

The patch against 0.6.1 has been merged upstream,
and has been removed from this package.

A small change has been made to the LICENSE file:
"Cloudflare, Inc." was added in the copyright
declaration.

---
Changes v1 -> v2:
- changed hash of LICENSE as suggested by Thomas Petazzoni

 ...01-Do-not-use-execinfo-h-with-uclibc.patch | 30 -------------------
 package/capnproto/capnproto.hash              |  4 +--
 package/capnproto/capnproto.mk                |  2 +-
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch
package/capnproto/0001-Do-not-use-execinfo-h-with-uclibc.patch deleted +0 -30
deleted file mode 100644
index 6bb7702a58..0000000000
@@ -1,30 +0,0 @@
-From e651ac5febc59e3e2b5d3365ededbe5362756da2 Mon Sep 17 00:00:00 2001
-From: Koen Martens <[email protected]>
-Date: Wed, 12 Jul 2017 18:49:32 +0200
-Subject: [PATCH] Do not use execinfo.h with uclibc (#511)
-
-Upstream commit: https://github.com/capnproto/capnproto/commit/e651ac5febc59e3e2b5d3365ededbe5362756da2
-
-Signed-off-by: Koen Martens <[email protected]>
-Signed-off-by: Joel Carlson <[email protected]>
-
----
- c++/src/kj/exception.c++ | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/c++/src/kj/exception.c++ b/c++/src/kj/exception.c++
-index 218f1db..339601a 100644
---- a/c++/src/kj/exception.c++
-+++ b/c++/src/kj/exception.c++
-@@ -33,7 +33,7 @@
- #endif
- #include "io.h"
- 
--#if (__linux__ && __GLIBC__) || __APPLE__
-+#if (__linux__ && __GLIBC__ && !__UCLIBC__) || __APPLE__
- #define KJ_HAS_BACKTRACE 1
- #include <execinfo.h>
- #endif
--- 
-2.7.4
-
package/capnproto/capnproto.hash +2 -2
index bc6a27684b..98467f8634 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	85210424c09693d8fe158c1970a2bca37af3a0424f02b263f566a1b8a5451a2d  capnproto-0.6.1.tar.gz
-sha256	16194222e9412c3aa14d2287953f7fc89a1dcbcdd266d1534ba35060d4cde5b6  LICENSE
+sha256	76c7114a3d142ad08b7208b3964a26e72a6320ee81331d3f0b87569fc9c47a28  capnproto-0.7.0.tar.gz
+sha256	9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10  LICENSE
package/capnproto/capnproto.mk +1 -1
index 3c7965d60c..34fb885914 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CAPNPROTO_VERSION = 0.6.1
+CAPNPROTO_VERSION = 0.7.0
 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION))
 CAPNPROTO_LICENSE = MIT
 CAPNPROTO_LICENSE_FILES = LICENSE
Signature · 1 line
2.17.1
#3 lore raw

PATCH v2 1/1 package/capnproto: bump version to 0.7.0

Hi,

Quoted 11 lines · Koen Martens

The patch against 0.6.1 has been merged upstream,
and has been removed from this package.

A small change has been made to the LICENSE file:
"Cloudflare, Inc." was added in the copyright
declaration.

---
Changes v1 -> v2:
- changed hash of LICENSE as suggested by Thomas Petazzoni

Is it ok like this, or should I repost as a new thread? It's been a while since I did anything buildroot related, so I might have forgotten some of the hoops to jump through.

Cheers,

Koen