Re: [OE-core] [PATCH] libsolv: correctly attribute musl fixing patches

[Alexander Kanavin]

On 04/11/2017 01:15 PM, Paul Eggleton wrote:

On Tuesday, 11 April 2017 9:22:43 PM NZST Alexander Kanavin wrote:

Also, they were previously squashed into a single patch; restore
the original two-patch arrangement.


Didn't Mark H just send a patch to fix this?


Mark's patch incorrectly changes the recipe patch so that it doesn't 
apply to upstream source anymore (the stuff in CMakeLists.txt, I think).



Alex

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] libsolv: correctly attribute musl fixing patches

[Paul Eggleton]

On Tuesday, 11 April 2017 9:22:43 PM NZST Alexander Kanavin wrote:
> Also, they were previously squashed into a single patch; restore
> the original two-patch arrangement.

Didn't Mark H just send a patch to fix this?

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] libsolv: correctly attribute musl fixing patches

[Alexander Kanavin]

Also, they were previously squashed into a single patch; restore
the original two-patch arrangement.

As requested here:
http://lists.openembedded.org/pipermail/openembedded-core/2017-April/135460.html

Signed-off-by: Alexander Kanavin 
---
 ...1-Add-fallback-fopencookie-implementation.patch |  60 ++--
 ...es-to-internal-fopencookie-implementation.patch | 104 +
 meta/recipes-extended/libsolv/libsolv_0.6.26.bb|   6 +-
 3 files changed, 137 insertions(+), 33 deletions(-)
 create mode 100644 
meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch

diff --git 
a/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
 
b/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
index 851fe575695..a575d0ebce7 100644
--- 
a/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
+++ 
b/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
@@ -1,25 +1,24 @@
-From 0a8e50f7322832efdaf33da87839fbba05a755de Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" 
-Date: Mon, 21 Nov 2016 11:46:00 +0200
-Subject: [PATCH] Add fallback fopencookie() implementation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+From 4d9b6ec30b78d00ead0a22eb5d047dcdba37e99c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?=
+ =?UTF-8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?=
+ 
+Date: Wed, 11 Nov 2015 20:32:17 -0500
+Subject: [PATCH 1/2] Add fallback fopencookie() implementation
 
 In environments where neither fopencookie() nor funopen()
 are implemented, we need to provide a suitable implementation
 of fopencookie() that we can use.
 
-Upstream-Status: Denied [ https://github.com/openSUSE/libsolv/pull/112 ]
+Alex Kanavin: rebased CMakeLists.txt change to apply to latest upstream code.
 
-Signed-off-by: Neal Gompa (ニール・ゴンパ) 
-Signed-off-by: Maxin B. John 
+Upstream-Status: Denied [https://github.com/openSUSE/libsolv/pull/112]
+Signed-off-by: Alexander Kanavin 
 ---
  ext/CMakeLists.txt |   7 ++
  ext/solv_xfopen.c  |  10 +--
- ext/solv_xfopen_fallback_fopencookie.c | 124 +
+ ext/solv_xfopen_fallback_fopencookie.c | 123 +
  ext/solv_xfopen_fallback_fopencookie.h |  28 
- 4 files changed, 165 insertions(+), 4 deletions(-)
+ 4 files changed, 164 insertions(+), 4 deletions(-)
  create mode 100644 ext/solv_xfopen_fallback_fopencookie.c
  create mode 100644 ext/solv_xfopen_fallback_fopencookie.h
 
@@ -85,17 +84,17 @@ index b0421bf..31345dd 100644
  
 diff --git a/ext/solv_xfopen_fallback_fopencookie.c 
b/ext/solv_xfopen_fallback_fopencookie.c
 new file mode 100644
-index 000..89426a9
+index 000..0ce2571
 --- /dev/null
 +++ b/ext/solv_xfopen_fallback_fopencookie.c
-@@ -0,0 +1,124 @@
-+/*
+@@ -0,0 +1,123 @@
++/* 
 + *Provides a very limited fopencookie() for environments with a libc
 + *that lacks it.
-+ *
-+ *Authors: zhasha & nsz
++ *
++ *Author: zhasha
 + *Modified for libsolv by Neal Gompa
-+ *
++ *
 + *This program is licensed under the BSD license, read LICENSE.BSD
 + *for further information.
 + *
@@ -124,7 +123,7 @@ index 000..89426a9
 +{
 +struct ctx *ctx = arg;
 +ssize_t r;
-+size_t n, k;
++size_t n;
 +
 +pthread_detach(pthread_self());
 +
@@ -138,18 +137,17 @@ index 000..89426a9
 +}
 +if (r == 0) { break; }
 +
-+n = r, k = 0;
 +while (n > 0) {
 +r = ctx->io.write ?
-+(ctx->io.write)(ctx->cookie, ctx->buf + k, n) :
-+write(ctx->fd, ctx->buf + k, n);
++(ctx->io.write)(ctx->cookie, ctx->buf + ((size_t)r - n), n) :
++write(ctx->fd, ctx->buf + ((size_t)r - n), n);
 +if (r < 0) {
 +if (errno != EINTR) { break; }
 +continue;
 +}
 +if (r == 0) { break; }
 +
-+n -= r, k += r;
++n -= (size_t)r;
 +}
 +if (n > 0) { break; }
 +}
@@ -169,8 +167,8 @@ index 000..89426a9
 +
 +switch (mode[0]) {
 +case 'a':
-+case 'w': wr = 1; break;
 +case 'r': rd = 1; break;
++case 'w': wr = 1; break;
 +default:
 +errno = EINVAL;
 +return NULL;
@@ -215,20 +213,20 @@ index 000..89426a9
 +}
 diff --git a/ext/solv_xfopen_fallback_fopencookie.h 
b/ext/solv_xfopen_fallback_fopencookie.h
 new file mode 100644
-index 000..7223e3f
+index 000..6a7bfee
 --- /dev/null
 +++ b/ext/solv_xfopen_fallback_fopencookie.h
 @@ -0,0 +1,28 @@
-+/*
++/* 
 + *Provides a