* [Buildroot] [PATCH v2, 1/2] package/nbd: add host-pkgconf to dependencies
@ 2019-10-06 18:04 Fabrice Fontaine
2019-10-06 18:04 ` [Buildroot] [PATCH v2,2/2] package/nbd: bump to version 3.20 Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2019-10-06 18:04 UTC (permalink / raw)
To: buildroot
pkg-config is used to find libglib2 since version 3.17 and
https://github.com/NetworkBlockDevice/nbd/commit/ef86bbd9da2e2116ec0da6f9c130fb52e89fc310
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/nbd/nbd.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 484f3e695b..fa569f3224 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -8,7 +8,7 @@ NBD_VERSION = 3.19
NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz
NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
NBD_CONF_OPTS = --enable-lfs
-NBD_DEPENDENCIES = libglib2
+NBD_DEPENDENCIES = host-pkgconf libglib2
NBD_LICENSE = GPL-2.0
NBD_LICENSE_FILES = COPYING
--
2.23.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v2,2/2] package/nbd: bump to version 3.20 2019-10-06 18:04 [Buildroot] [PATCH v2, 1/2] package/nbd: add host-pkgconf to dependencies Fabrice Fontaine @ 2019-10-06 18:04 ` Fabrice Fontaine 2019-10-06 19:18 ` Yann E. MORIN 2019-10-06 18:59 ` [Buildroot] [PATCH v2, 1/2] package/nbd: add host-pkgconf to dependencies Yann E. MORIN 2019-10-08 21:06 ` Thomas Petazzoni 2 siblings, 1 reply; 5+ messages in thread From: Fabrice Fontaine @ 2019-10-06 18:04 UTC (permalink / raw) To: buildroot - Remove patch (already in version) - Add upstream patch to close the file descriptor before returning Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- Changes v1 -> v2 (after review of Yann E. Morin): - Add upstream patch ...the-file-descriptor-before-returning.patch | 25 +++++++++++++++++ package/nbd/0001-avoid-name-clashing.patch | 28 ------------------- package/nbd/nbd.hash | 8 +++--- package/nbd/nbd.mk | 2 +- 4 files changed, 30 insertions(+), 33 deletions(-) create mode 100644 package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch delete mode 100644 package/nbd/0001-avoid-name-clashing.patch diff --git a/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch b/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch new file mode 100644 index 0000000000..70330c8e91 --- /dev/null +++ b/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch @@ -0,0 +1,25 @@ +From d2480de925e83c8bf60faa96141f4198bdf7f619 Mon Sep 17 00:00:00 2001 +From: Wouter Verhelst <w@uter.be> +Date: Fri, 2 Aug 2019 10:33:00 +0200 +Subject: [PATCH] Also close the file descriptor before returning + +Coverity CID#1162721 +[Retrieved from: +https://github.com/NetworkBlockDevice/nbd/commit/d2480de925e83c8bf60faa96141f4198bdf7f619] +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + nbd-client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/nbd-client.c b/nbd-client.c +index e9ec0a86..94035886 100644 +--- a/nbd-client.c ++++ b/nbd-client.c +@@ -930,6 +930,7 @@ void disconnect(char* device) { + if (ioctl(nbd, NBD_CLEAR_SOCK)<0) + err("Ioctl failed: %m\n"); + printf("done\n"); ++ close(nbd); + } + + #if HAVE_NETLINK diff --git a/package/nbd/0001-avoid-name-clashing.patch b/package/nbd/0001-avoid-name-clashing.patch deleted file mode 100644 index b3ea9c99c5..0000000000 --- a/package/nbd/0001-avoid-name-clashing.patch +++ /dev/null @@ -1,28 +0,0 @@ -rename err() function to avoid clashing with err() form C library - -err() is a function available in the C library, so when static linking, -there is a clash at link timebecause the function is provided both by -nbd and the C library: - http://autobuild.buildroot.org/results/aa8/aa8a1ac35a93e1c8b9fddbc2b5d66ecaa921f31e/build-end.log - -Fix that by renaming err() to nbd_err() and providing a small maco -wrapper to avoid touching the many call sites. - -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> - ---- -Upstream status: hack, not submitted. - -diff -durN nbd-3.11.orig/cliserv.h nbd-3.11/cliserv.h ---- nbd-3.11.orig/cliserv.h 2015-05-25 12:27:56.000000000 +0200 -+++ nbd-3.11/cliserv.h 2015-08-13 19:28:21.609467505 +0200 -@@ -75,7 +75,8 @@ - void setmysockopt(int sock); - void err_nonfatal(const char *s); - --void err(const char *s) G_GNUC_NORETURN; -+void nbd_err(const char *s) G_GNUC_NORETURN; -+#define err(S) nbd_err(S) - - void logging(const char* name); - diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index fab14072c9..d856953c22 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.19/ -md5 162da84302abb5b9be06143c7943a642 nbd-3.19.tar.xz -sha1 97edd98f7323a2fcd0dcf441f307d348cdbbb807 nbd-3.19.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.20/ +md5 910fe6c152f8c30ad8608388e6a4ce89 nbd-3.20.tar.xz +sha1 9240430266ff4bfb2316ef6d880056a9974a59fd nbd-3.20.tar.xz # Locally calculated -sha256 b4466412f13e057659f25d35e1e8e181afd62c7179bff22a6add81445ecb8690 nbd-3.19.tar.xz +sha256 e0e1b3538ab7ae5accf56180afd1a9887d415b98d21223b8ad42592b4af7d6cd nbd-3.20.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index fa569f3224..5fd5555510 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NBD_VERSION = 3.19 +NBD_VERSION = 3.20 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs -- 2.23.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2,2/2] package/nbd: bump to version 3.20 2019-10-06 18:04 ` [Buildroot] [PATCH v2,2/2] package/nbd: bump to version 3.20 Fabrice Fontaine @ 2019-10-06 19:18 ` Yann E. MORIN 0 siblings, 0 replies; 5+ messages in thread From: Yann E. MORIN @ 2019-10-06 19:18 UTC (permalink / raw) To: buildroot Fabrice, All, On 2019-10-06 20:04 +0200, Fabrice Fontaine spake thusly: > - Remove patch (already in version) > - Add upstream patch to close the file descriptor before returning > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-by: Yann E. MORIN <yann.morin.1998@free.fr> [build-tested only] Tested-by: Yann E. MORIN <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Add upstream patch > > ...the-file-descriptor-before-returning.patch | 25 +++++++++++++++++ > package/nbd/0001-avoid-name-clashing.patch | 28 ------------------- > package/nbd/nbd.hash | 8 +++--- > package/nbd/nbd.mk | 2 +- > 4 files changed, 30 insertions(+), 33 deletions(-) > create mode 100644 package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch > delete mode 100644 package/nbd/0001-avoid-name-clashing.patch > > diff --git a/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch b/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch > new file mode 100644 > index 0000000000..70330c8e91 > --- /dev/null > +++ b/package/nbd/0001-Also-close-the-file-descriptor-before-returning.patch > @@ -0,0 +1,25 @@ > +From d2480de925e83c8bf60faa96141f4198bdf7f619 Mon Sep 17 00:00:00 2001 > +From: Wouter Verhelst <w@uter.be> > +Date: Fri, 2 Aug 2019 10:33:00 +0200 > +Subject: [PATCH] Also close the file descriptor before returning > + > +Coverity CID#1162721 > +[Retrieved from: > +https://github.com/NetworkBlockDevice/nbd/commit/d2480de925e83c8bf60faa96141f4198bdf7f619] > +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > +--- > + nbd-client.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/nbd-client.c b/nbd-client.c > +index e9ec0a86..94035886 100644 > +--- a/nbd-client.c > ++++ b/nbd-client.c > +@@ -930,6 +930,7 @@ void disconnect(char* device) { > + if (ioctl(nbd, NBD_CLEAR_SOCK)<0) > + err("Ioctl failed: %m\n"); > + printf("done\n"); > ++ close(nbd); > + } > + > + #if HAVE_NETLINK > diff --git a/package/nbd/0001-avoid-name-clashing.patch b/package/nbd/0001-avoid-name-clashing.patch > deleted file mode 100644 > index b3ea9c99c5..0000000000 > --- a/package/nbd/0001-avoid-name-clashing.patch > +++ /dev/null > @@ -1,28 +0,0 @@ > -rename err() function to avoid clashing with err() form C library > - > -err() is a function available in the C library, so when static linking, > -there is a clash at link timebecause the function is provided both by > -nbd and the C library: > - http://autobuild.buildroot.org/results/aa8/aa8a1ac35a93e1c8b9fddbc2b5d66ecaa921f31e/build-end.log > - > -Fix that by renaming err() to nbd_err() and providing a small maco > -wrapper to avoid touching the many call sites. > - > -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > - > ---- > -Upstream status: hack, not submitted. > - > -diff -durN nbd-3.11.orig/cliserv.h nbd-3.11/cliserv.h > ---- nbd-3.11.orig/cliserv.h 2015-05-25 12:27:56.000000000 +0200 > -+++ nbd-3.11/cliserv.h 2015-08-13 19:28:21.609467505 +0200 > -@@ -75,7 +75,8 @@ > - void setmysockopt(int sock); > - void err_nonfatal(const char *s); > - > --void err(const char *s) G_GNUC_NORETURN; > -+void nbd_err(const char *s) G_GNUC_NORETURN; > -+#define err(S) nbd_err(S) > - > - void logging(const char* name); > - > diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash > index fab14072c9..d856953c22 100644 > --- a/package/nbd/nbd.hash > +++ b/package/nbd/nbd.hash > @@ -1,7 +1,7 @@ > -# From http://sourceforge.net/projects/nbd/files/nbd/3.19/ > -md5 162da84302abb5b9be06143c7943a642 nbd-3.19.tar.xz > -sha1 97edd98f7323a2fcd0dcf441f307d348cdbbb807 nbd-3.19.tar.xz > +# From http://sourceforge.net/projects/nbd/files/nbd/3.20/ > +md5 910fe6c152f8c30ad8608388e6a4ce89 nbd-3.20.tar.xz > +sha1 9240430266ff4bfb2316ef6d880056a9974a59fd nbd-3.20.tar.xz > > # Locally calculated > -sha256 b4466412f13e057659f25d35e1e8e181afd62c7179bff22a6add81445ecb8690 nbd-3.19.tar.xz > +sha256 e0e1b3538ab7ae5accf56180afd1a9887d415b98d21223b8ad42592b4af7d6cd nbd-3.20.tar.xz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk > index fa569f3224..5fd5555510 100644 > --- a/package/nbd/nbd.mk > +++ b/package/nbd/nbd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -NBD_VERSION = 3.19 > +NBD_VERSION = 3.20 > NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz > NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) > NBD_CONF_OPTS = --enable-lfs > -- > 2.23.0 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2, 1/2] package/nbd: add host-pkgconf to dependencies 2019-10-06 18:04 [Buildroot] [PATCH v2, 1/2] package/nbd: add host-pkgconf to dependencies Fabrice Fontaine 2019-10-06 18:04 ` [Buildroot] [PATCH v2,2/2] package/nbd: bump to version 3.20 Fabrice Fontaine @ 2019-10-06 18:59 ` Yann E. MORIN 2019-10-08 21:06 ` Thomas Petazzoni 2 siblings, 0 replies; 5+ messages in thread From: Yann E. MORIN @ 2019-10-06 18:59 UTC (permalink / raw) To: buildroot Fabrice, All, On 2019-10-06 20:04 +0200, Fabrice Fontaine spake thusly: > pkg-config is used to find libglib2 since version 3.17 and > https://github.com/NetworkBlockDevice/nbd/commit/ef86bbd9da2e2116ec0da6f9c130fb52e89fc310 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> You forgot to propagate my: Acked-by: Yann E. MORIN <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > package/nbd/nbd.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk > index 484f3e695b..fa569f3224 100644 > --- a/package/nbd/nbd.mk > +++ b/package/nbd/nbd.mk > @@ -8,7 +8,7 @@ NBD_VERSION = 3.19 > NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz > NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) > NBD_CONF_OPTS = --enable-lfs > -NBD_DEPENDENCIES = libglib2 > +NBD_DEPENDENCIES = host-pkgconf libglib2 > NBD_LICENSE = GPL-2.0 > NBD_LICENSE_FILES = COPYING > > -- > 2.23.0 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2, 1/2] package/nbd: add host-pkgconf to dependencies 2019-10-06 18:04 [Buildroot] [PATCH v2, 1/2] package/nbd: add host-pkgconf to dependencies Fabrice Fontaine 2019-10-06 18:04 ` [Buildroot] [PATCH v2,2/2] package/nbd: bump to version 3.20 Fabrice Fontaine 2019-10-06 18:59 ` [Buildroot] [PATCH v2, 1/2] package/nbd: add host-pkgconf to dependencies Yann E. MORIN @ 2019-10-08 21:06 ` Thomas Petazzoni 2 siblings, 0 replies; 5+ messages in thread From: Thomas Petazzoni @ 2019-10-08 21:06 UTC (permalink / raw) To: buildroot On Sun, 6 Oct 2019 20:04:30 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > pkg-config is used to find libglib2 since version 3.17 and > https://github.com/NetworkBlockDevice/nbd/commit/ef86bbd9da2e2116ec0da6f9c130fb52e89fc310 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/nbd/nbd.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Series applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-08 21:06 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-10-06 18:04 [Buildroot] [PATCH v2, 1/2] package/nbd: add host-pkgconf to dependencies Fabrice Fontaine 2019-10-06 18:04 ` [Buildroot] [PATCH v2,2/2] package/nbd: bump to version 3.20 Fabrice Fontaine 2019-10-06 19:18 ` Yann E. MORIN 2019-10-06 18:59 ` [Buildroot] [PATCH v2, 1/2] package/nbd: add host-pkgconf to dependencies Yann E. MORIN 2019-10-08 21:06 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox