* [PATCH 0/1] Restore proper attributions to libsolv patch
@ 2017-04-10 20:58 Mark Hatle
2017-04-10 20:58 ` [PATCH 1/1] libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix attribution Mark Hatle
2017-04-11 8:13 ` [PATCH 0/1] Restore proper attributions to libsolv patch Maxin B. John
0 siblings, 2 replies; 5+ messages in thread
From: Mark Hatle @ 2017-04-10 20:58 UTC (permalink / raw)
To: openembedded-core
Per the email: http://lists.openembedded.org/pipermail/openembedded-core/2017-April/135460.html
Neal's attribution to the original code was lost. In addition the original
two patches were squashed together. This was not indicated in any change
information. Again, making it unclear the proper history of the patches.
The associated change has no technical content change to the patches, it
is purely cosmetic. The attempt is to restore the original unmodified
patches, including all attributions. Maxim's patch to the if clause
in one hunk was then restored on top.
Let me know if there are any questions or concerns with this set.
(Note, Neal has not provided a signed-off-by line, which is his right as
an external author. Since I modified the code, I did not add Maxim's either
as I do not have the right to add a signed-off-by line by someone else
without their express permission.)
Mark Hatle (1):
libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix
attribution
...1-Add-fallback-fopencookie-implementation.patch | 186 +++++++++++++++++----
1 file changed, 150 insertions(+), 36 deletions(-)
--
2.11.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix attribution
2017-04-10 20:58 [PATCH 0/1] Restore proper attributions to libsolv patch Mark Hatle
@ 2017-04-10 20:58 ` Mark Hatle
2017-04-10 21:29 ` Khem Raj
2017-04-11 8:13 ` [PATCH 0/1] Restore proper attributions to libsolv patch Maxin B. John
1 sibling, 1 reply; 5+ messages in thread
From: Mark Hatle @ 2017-04-10 20:58 UTC (permalink / raw)
To: openembedded-core
This patch has no technical change, but attempts to properly restore the
attribution of the original patch to Neal Gompa.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
...1-Add-fallback-fopencookie-implementation.patch | 186 +++++++++++++++++----
1 file changed, 150 insertions(+), 36 deletions(-)
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 851fe57569..c75611cfd8 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,30 +1,48 @@
-From 0a8e50f7322832efdaf33da87839fbba05a755de Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" <maxin.john@intel.com>
-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
+Add the following patch to fix build with musl:
+
+Original patch from:
+ https://patch-diff.githubusercontent.com/raw/openSUSE/libsolv/pull/112.patch
+
+Patch was original integrated (dcc5d6bc2e3e5848f36fe1001b8cb65576047b7d)
+ by Maxin B. John <maxin.john@intel.com>:
+ 0.6.19 -> 0.6.20
+
+ Added the following patch to fix build with musl:
+ 0001-Add-fallback-fopencookie-implementation.patch
+
+Later updated (60d6c0018c6855e669ced66c420b761d9e7ddd78)
+ by Maxin B. John <maxin.john@intel.com>:
+ libsolv: upgrade to 0.6.24
+ Refreshed the following patch:
+ a) 0001-Add-fallback-fopencookie-implementation.patch
+
+The later update modified the ext/CMakeLists.txt.
+
+Upstream-Status: Submitted [ https://github.com/openSUSE/libsolv/pull/112 ]
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+From 63ab8d928ab38f9686405d186d427f2496a9cce5 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?=
+ <ngompa13@gmail.com>
+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 ]
-
-Signed-off-by: Neal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
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
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
-index 586eda8..477a2ef 100644
+index ad52495..4f282ce 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -4,6 +4,13 @@ SET (libsolvext_SRCS
@@ -38,7 +56,8 @@ index 586eda8..477a2ef 100644
+ solv_xfopen_fallback_fopencookie.h)
+ENDIF (NOT HAVE_FOPENCOOKIE AND NOT HAVE_FUNOPEN)
+
- IF (ENABLE_RPMDB OR ENABLE_RPMPKG)
+-IF (ENABLE_RPMDB)
++IF (ENABLE_RPMDB OR ENABLE_RPMPKG)
SET (libsolvext_SRCS ${libsolvext_SRCS}
pool_fileconflicts.c repo_rpmdb.c)
diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c
@@ -85,17 +104,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 0000000..89426a9
+index 0000000..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 +143,7 @@ index 0000000..89426a9
+{
+ struct ctx *ctx = arg;
+ ssize_t r;
-+ size_t n, k;
++ size_t n;
+
+ pthread_detach(pthread_self());
+
@@ -138,18 +157,17 @@ index 0000000..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 +187,8 @@ index 0000000..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 +233,20 @@ index 0000000..89426a9
+}
diff --git a/ext/solv_xfopen_fallback_fopencookie.h b/ext/solv_xfopen_fallback_fopencookie.h
new file mode 100644
-index 0000000..7223e3f
+index 0000000..6a7bfee
--- /dev/null
+++ b/ext/solv_xfopen_fallback_fopencookie.h
@@ -0,0 +1,28 @@
-+/*
++/*
+ * 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.
-+ *
++ *
+ */
+
+#ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H
@@ -247,6 +265,102 @@ index 0000000..7223e3f
+FILE *fopencookie(void *cookie, const char *mode, struct cookie_io_functions_t io);
+
+#endif
---
-2.4.0
+From 18987b909007435ca878289d0e7d516052710f73 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?=
+ <ngompa13@gmail.com>
+Date: Mon, 23 Nov 2015 18:19:41 -0500
+Subject: [PATCH 2/2] Fixes to internal fopencookie() implementation
+
+Credits to the fixes go to nsz on #musl on Freenode,
+who gloriously fixed the implementation such that
+the tests all pass.
+---
+ ext/solv_xfopen_fallback_fopencookie.c | 19 ++++++++++---------
+ ext/solv_xfopen_fallback_fopencookie.h | 10 +++++-----
+ 2 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/ext/solv_xfopen_fallback_fopencookie.c b/ext/solv_xfopen_fallback_fopencookie.c
+index 0ce2571..89426a9 100644
+--- a/ext/solv_xfopen_fallback_fopencookie.c
++++ b/ext/solv_xfopen_fallback_fopencookie.c
+@@ -1,10 +1,10 @@
+-/*
++/*
+ * Provides a very limited fopencookie() for environments with a libc
+ * that lacks it.
+- *
+- * Author: zhasha
++ *
++ * Authors: zhasha & nsz
+ * Modified for libsolv by Neal Gompa
+- *
++ *
+ * This program is licensed under the BSD license, read LICENSE.BSD
+ * for further information.
+ *
+@@ -33,7 +33,7 @@ static void *proxy(void *arg)
+ {
+ struct ctx *ctx = arg;
+ ssize_t r;
+- size_t n;
++ size_t n, k;
+
+ pthread_detach(pthread_self());
+
+@@ -47,17 +47,18 @@ static void *proxy(void *arg)
+ }
+ if (r == 0) { break; }
+
++ n = r, k = 0;
+ while (n > 0) {
+ r = ctx->io.write ?
+- (ctx->io.write)(ctx->cookie, ctx->buf + ((size_t)r - n), n) :
+- write(ctx->fd, ctx->buf + ((size_t)r - n), n);
++ (ctx->io.write)(ctx->cookie, ctx->buf + k, n) :
++ write(ctx->fd, ctx->buf + k, n);
+ if (r < 0) {
+ if (errno != EINTR) { break; }
+ continue;
+ }
+ if (r == 0) { break; }
+
+- n -= (size_t)r;
++ n -= r, k += r;
+ }
+ if (n > 0) { break; }
+ }
+@@ -77,8 +78,8 @@ FILE *fopencookie(void *cookie, const char *mode, struct cookie_io_functions_t i
+
+ switch (mode[0]) {
+ case 'a':
+- case 'r': rd = 1; break;
+ case 'w': wr = 1; break;
++ case 'r': rd = 1; break;
+ default:
+ errno = EINVAL;
+ return NULL;
+diff --git a/ext/solv_xfopen_fallback_fopencookie.h b/ext/solv_xfopen_fallback_fopencookie.h
+index 6a7bfee..7223e3f 100644
+--- a/ext/solv_xfopen_fallback_fopencookie.h
++++ b/ext/solv_xfopen_fallback_fopencookie.h
+@@ -1,13 +1,13 @@
+-/*
++/*
+ * Provides a very limited fopencookie() for environments with a libc
+ * that lacks it.
+- *
+- * Author: zhasha
++ *
++ * Authors: zhasha & nsz
+ * Modified for libsolv by Neal Gompa
+- *
++ *
+ * This program is licensed under the BSD license, read LICENSE.BSD
+ * for further information.
+- *
++ *
+ */
+
+ #ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix attribution
2017-04-10 20:58 ` [PATCH 1/1] libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix attribution Mark Hatle
@ 2017-04-10 21:29 ` Khem Raj
2017-04-10 21:38 ` Mark Hatle
0 siblings, 1 reply; 5+ messages in thread
From: Khem Raj @ 2017-04-10 21:29 UTC (permalink / raw)
To: Mark Hatle, openembedded-core
[-- Attachment #1.1: Type: text/plain, Size: 10482 bytes --]
On 4/10/17 1:58 PM, Mark Hatle wrote:
> This patch has no technical change, but attempts to properly restore the
> attribution of the original patch to Neal Gompa.
>
I think it will be good to add some guidelines for OE devs around this
kind of situation, since there will be cases where patches are imported
from other locations than upstream.
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> ...1-Add-fallback-fopencookie-implementation.patch | 186 +++++++++++++++++----
> 1 file changed, 150 insertions(+), 36 deletions(-)
>
> 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 851fe57569..c75611cfd8 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,30 +1,48 @@
> -From 0a8e50f7322832efdaf33da87839fbba05a755de Mon Sep 17 00:00:00 2001
> -From: "Maxin B. John" <maxin.john@intel.com>
> -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
> +Add the following patch to fix build with musl:
> +
> +Original patch from:
> + https://patch-diff.githubusercontent.com/raw/openSUSE/libsolv/pull/112.patch
> +
> +Patch was original integrated (dcc5d6bc2e3e5848f36fe1001b8cb65576047b7d)
> + by Maxin B. John <maxin.john@intel.com>:
> + 0.6.19 -> 0.6.20
> +
> + Added the following patch to fix build with musl:
> + 0001-Add-fallback-fopencookie-implementation.patch
> +
> +Later updated (60d6c0018c6855e669ced66c420b761d9e7ddd78)
> + by Maxin B. John <maxin.john@intel.com>:
> + libsolv: upgrade to 0.6.24
> + Refreshed the following patch:
> + a) 0001-Add-fallback-fopencookie-implementation.patch
> +
> +The later update modified the ext/CMakeLists.txt.
> +
> +Upstream-Status: Submitted [ https://github.com/openSUSE/libsolv/pull/112 ]
> +
> +Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> +
> +From 63ab8d928ab38f9686405d186d427f2496a9cce5 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?=
> + <ngompa13@gmail.com>
> +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 ]
> -
> -Signed-off-by: Neal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
> -Signed-off-by: Maxin B. John <maxin.john@intel.com>
> ---
> 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
>
> diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
> -index 586eda8..477a2ef 100644
> +index ad52495..4f282ce 100644
> --- a/ext/CMakeLists.txt
> +++ b/ext/CMakeLists.txt
> @@ -4,6 +4,13 @@ SET (libsolvext_SRCS
> @@ -38,7 +56,8 @@ index 586eda8..477a2ef 100644
> + solv_xfopen_fallback_fopencookie.h)
> +ENDIF (NOT HAVE_FOPENCOOKIE AND NOT HAVE_FUNOPEN)
> +
> - IF (ENABLE_RPMDB OR ENABLE_RPMPKG)
> +-IF (ENABLE_RPMDB)
> ++IF (ENABLE_RPMDB OR ENABLE_RPMPKG)
> SET (libsolvext_SRCS ${libsolvext_SRCS}
> pool_fileconflicts.c repo_rpmdb.c)
> diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c
> @@ -85,17 +104,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 0000000..89426a9
> +index 0000000..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 +143,7 @@ index 0000000..89426a9
> +{
> + struct ctx *ctx = arg;
> + ssize_t r;
> -+ size_t n, k;
> ++ size_t n;
> +
> + pthread_detach(pthread_self());
> +
> @@ -138,18 +157,17 @@ index 0000000..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 +187,8 @@ index 0000000..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 +233,20 @@ index 0000000..89426a9
> +}
> diff --git a/ext/solv_xfopen_fallback_fopencookie.h b/ext/solv_xfopen_fallback_fopencookie.h
> new file mode 100644
> -index 0000000..7223e3f
> +index 0000000..6a7bfee
> --- /dev/null
> +++ b/ext/solv_xfopen_fallback_fopencookie.h
> @@ -0,0 +1,28 @@
> -+/*
> ++/*
> + * 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.
> -+ *
> ++ *
> + */
> +
> +#ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H
> @@ -247,6 +265,102 @@ index 0000000..7223e3f
> +FILE *fopencookie(void *cookie, const char *mode, struct cookie_io_functions_t io);
> +
> +#endif
> ---
> -2.4.0
>
> +From 18987b909007435ca878289d0e7d516052710f73 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?=
> + <ngompa13@gmail.com>
> +Date: Mon, 23 Nov 2015 18:19:41 -0500
> +Subject: [PATCH 2/2] Fixes to internal fopencookie() implementation
> +
> +Credits to the fixes go to nsz on #musl on Freenode,
> +who gloriously fixed the implementation such that
> +the tests all pass.
> +---
> + ext/solv_xfopen_fallback_fopencookie.c | 19 ++++++++++---------
> + ext/solv_xfopen_fallback_fopencookie.h | 10 +++++-----
> + 2 files changed, 15 insertions(+), 14 deletions(-)
> +
> +diff --git a/ext/solv_xfopen_fallback_fopencookie.c b/ext/solv_xfopen_fallback_fopencookie.c
> +index 0ce2571..89426a9 100644
> +--- a/ext/solv_xfopen_fallback_fopencookie.c
> ++++ b/ext/solv_xfopen_fallback_fopencookie.c
> +@@ -1,10 +1,10 @@
> +-/*
> ++/*
> + * Provides a very limited fopencookie() for environments with a libc
> + * that lacks it.
> +- *
> +- * Author: zhasha
> ++ *
> ++ * Authors: zhasha & nsz
> + * Modified for libsolv by Neal Gompa
> +- *
> ++ *
> + * This program is licensed under the BSD license, read LICENSE.BSD
> + * for further information.
> + *
> +@@ -33,7 +33,7 @@ static void *proxy(void *arg)
> + {
> + struct ctx *ctx = arg;
> + ssize_t r;
> +- size_t n;
> ++ size_t n, k;
> +
> + pthread_detach(pthread_self());
> +
> +@@ -47,17 +47,18 @@ static void *proxy(void *arg)
> + }
> + if (r == 0) { break; }
> +
> ++ n = r, k = 0;
> + while (n > 0) {
> + r = ctx->io.write ?
> +- (ctx->io.write)(ctx->cookie, ctx->buf + ((size_t)r - n), n) :
> +- write(ctx->fd, ctx->buf + ((size_t)r - n), n);
> ++ (ctx->io.write)(ctx->cookie, ctx->buf + k, n) :
> ++ write(ctx->fd, ctx->buf + k, n);
> + if (r < 0) {
> + if (errno != EINTR) { break; }
> + continue;
> + }
> + if (r == 0) { break; }
> +
> +- n -= (size_t)r;
> ++ n -= r, k += r;
> + }
> + if (n > 0) { break; }
> + }
> +@@ -77,8 +78,8 @@ FILE *fopencookie(void *cookie, const char *mode, struct cookie_io_functions_t i
> +
> + switch (mode[0]) {
> + case 'a':
> +- case 'r': rd = 1; break;
> + case 'w': wr = 1; break;
> ++ case 'r': rd = 1; break;
> + default:
> + errno = EINVAL;
> + return NULL;
> +diff --git a/ext/solv_xfopen_fallback_fopencookie.h b/ext/solv_xfopen_fallback_fopencookie.h
> +index 6a7bfee..7223e3f 100644
> +--- a/ext/solv_xfopen_fallback_fopencookie.h
> ++++ b/ext/solv_xfopen_fallback_fopencookie.h
> +@@ -1,13 +1,13 @@
> +-/*
> ++/*
> + * Provides a very limited fopencookie() for environments with a libc
> + * that lacks it.
> +- *
> +- * Author: zhasha
> ++ *
> ++ * Authors: zhasha & nsz
> + * Modified for libsolv by Neal Gompa
> +- *
> ++ *
> + * This program is licensed under the BSD license, read LICENSE.BSD
> + * for further information.
> +- *
> ++ *
> + */
> +
> + #ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix attribution
2017-04-10 21:29 ` Khem Raj
@ 2017-04-10 21:38 ` Mark Hatle
0 siblings, 0 replies; 5+ messages in thread
From: Mark Hatle @ 2017-04-10 21:38 UTC (permalink / raw)
To: Khem Raj, openembedded-core
On 4/10/17 4:29 PM, Khem Raj wrote:
>
>
> On 4/10/17 1:58 PM, Mark Hatle wrote:
>> This patch has no technical change, but attempts to properly restore the
>> attribution of the original patch to Neal Gompa.
>>
>
> I think it will be good to add some guidelines for OE devs around this
> kind of situation, since there will be cases where patches are imported
> from other locations than upstream.
My expectations for this type of thing is at least mostly covered on the wiki.
I think this addresses all of Neal's concerns, and also follows my expectation
of best practices.
You take in the upstream patch as you find it, and you attribute it as such. If
you pull from site XYZ and THEY misrepresented it, that is not your fault and
something we can fix. The problem is this patch came from a site, it was
originally attributed properly (but with a signed-off-by line that was
improper), it was then modified and the attributions were removed.
Below is the sections from the wiki,
http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Importing from Elsewhere
------------------------
If you are importing work from somewhere else, such as a cherry-pick from
another repository or a code patch pulled from a mailing list, the minimum patch
header or commit message is not enough. It does not clearly establish the
provenance of the code.
The following specifies the additional guidelines required for importing changes
from elsewhere.
By default you should keep the original author's summary and description, along
with any tag lines such as, "Signed-off-by:". If the original change that was
imported does not have a summary and/or commit message from the original author,
it is still your responsibility to add the summary and commit message to the
patch header. Just as if you wrote the code, you should be able to clearly
explain what the change does. It is also necessary to document the original
author of the change. You should indicate the original author by simply stating
"written by" or "posted to the ... mailing list by". You must not add a
Signed-off-by: tag line with their name, only the original author may add their
own Signed-off-by: tag line.
It is also required that the origin of the work be fully documented. The origin
should be specified as part of the commit message in a way that an average
developer would be able to track down the original code. URLs should reference
original authoritative sources and not mirrors.
If changes were required to resolve conflicts, they should be documented as
well. When incorporating a commit or patch from an external source, changes to
the functionality not related to resolving conflicts should be made in a second
commit or patch. This preserves the original external commit, and makes the
modifications clearly visible, and prevents confusion over the author of the code.
Finally you must add a "Signed-off-by:" tag line to indicate that you worked
with the patch.
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> ---
>> ...1-Add-fallback-fopencookie-implementation.patch | 186 +++++++++++++++++----
>> 1 file changed, 150 insertions(+), 36 deletions(-)
>>
>> 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 851fe57569..c75611cfd8 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,30 +1,48 @@
>> -From 0a8e50f7322832efdaf33da87839fbba05a755de Mon Sep 17 00:00:00 2001
>> -From: "Maxin B. John" <maxin.john@intel.com>
>> -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
>> +Add the following patch to fix build with musl:
>> +
>> +Original patch from:
>> + https://patch-diff.githubusercontent.com/raw/openSUSE/libsolv/pull/112.patch
>> +
>> +Patch was original integrated (dcc5d6bc2e3e5848f36fe1001b8cb65576047b7d)
>> + by Maxin B. John <maxin.john@intel.com>:
>> + 0.6.19 -> 0.6.20
>> +
>> + Added the following patch to fix build with musl:
>> + 0001-Add-fallback-fopencookie-implementation.patch
>> +
>> +Later updated (60d6c0018c6855e669ced66c420b761d9e7ddd78)
>> + by Maxin B. John <maxin.john@intel.com>:
>> + libsolv: upgrade to 0.6.24
>> + Refreshed the following patch:
>> + a) 0001-Add-fallback-fopencookie-implementation.patch
>> +
>> +The later update modified the ext/CMakeLists.txt.
>> +
>> +Upstream-Status: Submitted [ https://github.com/openSUSE/libsolv/pull/112 ]
>> +
>> +Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> +
>> +From 63ab8d928ab38f9686405d186d427f2496a9cce5 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?=
>> + <ngompa13@gmail.com>
>> +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 ]
>> -
>> -Signed-off-by: Neal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
>> -Signed-off-by: Maxin B. John <maxin.john@intel.com>
>> ---
>> 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
>>
>> diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
>> -index 586eda8..477a2ef 100644
>> +index ad52495..4f282ce 100644
>> --- a/ext/CMakeLists.txt
>> +++ b/ext/CMakeLists.txt
>> @@ -4,6 +4,13 @@ SET (libsolvext_SRCS
>> @@ -38,7 +56,8 @@ index 586eda8..477a2ef 100644
>> + solv_xfopen_fallback_fopencookie.h)
>> +ENDIF (NOT HAVE_FOPENCOOKIE AND NOT HAVE_FUNOPEN)
>> +
>> - IF (ENABLE_RPMDB OR ENABLE_RPMPKG)
>> +-IF (ENABLE_RPMDB)
>> ++IF (ENABLE_RPMDB OR ENABLE_RPMPKG)
>> SET (libsolvext_SRCS ${libsolvext_SRCS}
>> pool_fileconflicts.c repo_rpmdb.c)
>> diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c
>> @@ -85,17 +104,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 0000000..89426a9
>> +index 0000000..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 +143,7 @@ index 0000000..89426a9
>> +{
>> + struct ctx *ctx = arg;
>> + ssize_t r;
>> -+ size_t n, k;
>> ++ size_t n;
>> +
>> + pthread_detach(pthread_self());
>> +
>> @@ -138,18 +157,17 @@ index 0000000..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 +187,8 @@ index 0000000..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 +233,20 @@ index 0000000..89426a9
>> +}
>> diff --git a/ext/solv_xfopen_fallback_fopencookie.h b/ext/solv_xfopen_fallback_fopencookie.h
>> new file mode 100644
>> -index 0000000..7223e3f
>> +index 0000000..6a7bfee
>> --- /dev/null
>> +++ b/ext/solv_xfopen_fallback_fopencookie.h
>> @@ -0,0 +1,28 @@
>> -+/*
>> ++/*
>> + * 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.
>> -+ *
>> ++ *
>> + */
>> +
>> +#ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H
>> @@ -247,6 +265,102 @@ index 0000000..7223e3f
>> +FILE *fopencookie(void *cookie, const char *mode, struct cookie_io_functions_t io);
>> +
>> +#endif
>> ---
>> -2.4.0
>>
>> +From 18987b909007435ca878289d0e7d516052710f73 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?=
>> + <ngompa13@gmail.com>
>> +Date: Mon, 23 Nov 2015 18:19:41 -0500
>> +Subject: [PATCH 2/2] Fixes to internal fopencookie() implementation
>> +
>> +Credits to the fixes go to nsz on #musl on Freenode,
>> +who gloriously fixed the implementation such that
>> +the tests all pass.
>> +---
>> + ext/solv_xfopen_fallback_fopencookie.c | 19 ++++++++++---------
>> + ext/solv_xfopen_fallback_fopencookie.h | 10 +++++-----
>> + 2 files changed, 15 insertions(+), 14 deletions(-)
>> +
>> +diff --git a/ext/solv_xfopen_fallback_fopencookie.c b/ext/solv_xfopen_fallback_fopencookie.c
>> +index 0ce2571..89426a9 100644
>> +--- a/ext/solv_xfopen_fallback_fopencookie.c
>> ++++ b/ext/solv_xfopen_fallback_fopencookie.c
>> +@@ -1,10 +1,10 @@
>> +-/*
>> ++/*
>> + * Provides a very limited fopencookie() for environments with a libc
>> + * that lacks it.
>> +- *
>> +- * Author: zhasha
>> ++ *
>> ++ * Authors: zhasha & nsz
>> + * Modified for libsolv by Neal Gompa
>> +- *
>> ++ *
>> + * This program is licensed under the BSD license, read LICENSE.BSD
>> + * for further information.
>> + *
>> +@@ -33,7 +33,7 @@ static void *proxy(void *arg)
>> + {
>> + struct ctx *ctx = arg;
>> + ssize_t r;
>> +- size_t n;
>> ++ size_t n, k;
>> +
>> + pthread_detach(pthread_self());
>> +
>> +@@ -47,17 +47,18 @@ static void *proxy(void *arg)
>> + }
>> + if (r == 0) { break; }
>> +
>> ++ n = r, k = 0;
>> + while (n > 0) {
>> + r = ctx->io.write ?
>> +- (ctx->io.write)(ctx->cookie, ctx->buf + ((size_t)r - n), n) :
>> +- write(ctx->fd, ctx->buf + ((size_t)r - n), n);
>> ++ (ctx->io.write)(ctx->cookie, ctx->buf + k, n) :
>> ++ write(ctx->fd, ctx->buf + k, n);
>> + if (r < 0) {
>> + if (errno != EINTR) { break; }
>> + continue;
>> + }
>> + if (r == 0) { break; }
>> +
>> +- n -= (size_t)r;
>> ++ n -= r, k += r;
>> + }
>> + if (n > 0) { break; }
>> + }
>> +@@ -77,8 +78,8 @@ FILE *fopencookie(void *cookie, const char *mode, struct cookie_io_functions_t i
>> +
>> + switch (mode[0]) {
>> + case 'a':
>> +- case 'r': rd = 1; break;
>> + case 'w': wr = 1; break;
>> ++ case 'r': rd = 1; break;
>> + default:
>> + errno = EINVAL;
>> + return NULL;
>> +diff --git a/ext/solv_xfopen_fallback_fopencookie.h b/ext/solv_xfopen_fallback_fopencookie.h
>> +index 6a7bfee..7223e3f 100644
>> +--- a/ext/solv_xfopen_fallback_fopencookie.h
>> ++++ b/ext/solv_xfopen_fallback_fopencookie.h
>> +@@ -1,13 +1,13 @@
>> +-/*
>> ++/*
>> + * Provides a very limited fopencookie() for environments with a libc
>> + * that lacks it.
>> +- *
>> +- * Author: zhasha
>> ++ *
>> ++ * Authors: zhasha & nsz
>> + * Modified for libsolv by Neal Gompa
>> +- *
>> ++ *
>> + * This program is licensed under the BSD license, read LICENSE.BSD
>> + * for further information.
>> +- *
>> ++ *
>> + */
>> +
>> + #ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/1] Restore proper attributions to libsolv patch
2017-04-10 20:58 [PATCH 0/1] Restore proper attributions to libsolv patch Mark Hatle
2017-04-10 20:58 ` [PATCH 1/1] libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix attribution Mark Hatle
@ 2017-04-11 8:13 ` Maxin B. John
1 sibling, 0 replies; 5+ messages in thread
From: Maxin B. John @ 2017-04-11 8:13 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-core
Hi Mark,
On Mon, Apr 10, 2017 at 03:58:27PM -0500, Mark Hatle wrote:
>
> Per the email: http://lists.openembedded.org/pipermail/openembedded-core/2017-April/135460.html
>
> Neal's attribution to the original code was lost. In addition the original
> two patches were squashed together. This was not indicated in any change
> information. Again, making it unclear the proper history of the patches.
My apologies to Neal. I thought preserving the signed-off-by and link to github was
a way to credit the original author, which is technically not correct.
> The associated change has no technical content change to the patches, it
> is purely cosmetic. The attempt is to restore the original unmodified
> patches, including all attributions. Maxim's patch to the if clause
> in one hunk was then restored on top.
>
> Let me know if there are any questions or concerns with this set.
>
> (Note, Neal has not provided a signed-off-by line, which is his right as
> an external author. Since I modified the code, I did not add Maxim's either
> as I do not have the right to add a signed-off-by line by someone else
> without their express permission.)
>
> Mark Hatle (1):
> libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix
> attribution
>
> ...1-Add-fallback-fopencookie-implementation.patch | 186 +++++++++++++++++----
> 1 file changed, 150 insertions(+), 36 deletions(-)
>
Best Regards,
Maxin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-11 8:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-10 20:58 [PATCH 0/1] Restore proper attributions to libsolv patch Mark Hatle
2017-04-10 20:58 ` [PATCH 1/1] libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix attribution Mark Hatle
2017-04-10 21:29 ` Khem Raj
2017-04-10 21:38 ` Mark Hatle
2017-04-11 8:13 ` [PATCH 0/1] Restore proper attributions to libsolv patch Maxin B. John
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.