[Buildroot] [PATCH 0/5] package: bump attr and acl, fix builds of dependees

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH 0/5] package: bump attr and acl, fix builds of dependees
@ 2018-05-07 18:25 Yann E. MORIN
  2018-05-07 18:25 ` [Buildroot] [PATCH 1/5] package/lua-flu: fix to use system xattr header Yann E. MORIN
                   ` (4 more replies)
  0 siblings, 5 replies; 13+ messages in thread
From: Yann E. MORIN @ 2018-05-07 18:25 UTC (permalink / raw)
  To: buildroot

Hello All!

This series is an attempt at bumping the attr and acl packages to a
later version.

The crux of the changes is to get an attr package that no longer behaves
silly [0]. attr has had a complete overhaul of it buildsystem, making it
fully autotools-based, which fixes quite a few idiosyncracies of the
previous hand-rolled one.

However, this means that attr no longer installs its own copy of xattr.h,
on the assumption that it has been provided by glibc "for ages" [1] [2]
[3] [4]. This means that a few packages have to be fixed now, of which acl.

Speaking of acl, that one had no release for the past 5 years, and still
got quite some amount of activity in the git tree. So, we update to an
arbitrary tag from the git tree, i.e. the latest as of today.

Two packages then need fixing because they still use attr/xattr.h:
stress-ng, which we bump and fix (so that we can send the fix upstream
easily), and lua-flu, which we simply fix (after sending the patch
upstream).

Of all packages that depend on attr or acl:

    sys  -> checks for, and uses <sys/xattr.h>   => Order means order
    attr -> checks for, and uses <attr/xattr.h>  => they are tested for.
    acl  -> checks for, and uses <acl/libacl.h> and/or -lacl
    patched    -> patch added to uses <sys/xattr.h>
    no xattr.h -> does not check for <attr/xattr.h> or <sys/xattr.h>,
                  but uses other <attr/*.h> and -lattr

    acl                 ACK, sys
    coreutils           ACK, sys-attr
    host-acl            ACK, sys
    host-fakeroot       ACK, sys
    host-pseudo         ACK, sys
    libarchive          ACK, attr-sys
    logrotate           ACK, acl
    lua-flu             ACK, patched, sys
    mtd                 ACK, sys
    netatalk            ACK, acl, attr-sys
    patch               ACK, no xattr.h
    rpm                 ACK, acl
    rsync               ACK, acl, attr-sys
    samba4              ACK, attr-sys [*]
    stress-ng           ACK, patched, sys
    systemd             ACK, acl
    tar                 ACK, acl, sys
    vim                 ACK, acl [**]
    xorriso             ACK, acl, patched, sys

[*] in my testing, I had a systemd-based system, and samba4 failed to
install (I'll investigate separately). But at least, it did detect and
use <sys/xattr.h> correctly, and the build succeeded. It even installed
OK, but our SAMBA4_INSTALL_INIT_SYSTEMD is borked (missing source file.)

[**] vim uses xattr to add support for SMACK. Before this series, it did
detect xattr, but failed to deteect a feature of it [4], so it always
disabled SMACK support. Now, it does not detect xattr at all, so it
doesn't enable SMACK either. So, even though we have a regression about
the detections of xattr.h, we have no regression in functionality.

Now, let's see some test-pkg configs and results:

    $ cat attr-nommu.cfg
    BR2_PACKAGE_ACL=y
    BR2_PACKAGE_ATTR=y
    BR2_PACKAGE_LIBARCHIVE=y
    BR2_PACKAGE_MTD=y
    BR2_PACKAGE_MTD_MKFSJFFS2=y
    BR2_PACKAGE_MTD_MKFSUBIFS=y
    $ ./utils/test-pkg -c attr-nommu.cfg -d $(pwd)/test-nommu
                                 br-arm-full [1/6]: OK
                      br-arm-cortex-a9-glibc [2/6]: OK
                       br-arm-cortex-m4-full [3/6]: OK
                              br-x86-64-musl [4/6]: OK
                          br-arm-full-static [5/6]: OK
                    armv5-ctng-linux-gnueabi [6/6]: OK
    6 builds, 0 skipped, 0 build failed, 0 legal-info failed

    $ cat attr-mmu.cfg
    BR2_PACKAGE_ACL=y
    BR2_PACKAGE_ATTR=y
    BR2_PACKAGE_COREUTILS=y
    BR2_PACKAGE_LIBARCHIVE=y
    BR2_PACKAGE_LOGROTATE=y
    BR2_PACKAGE_MTD=y
    BR2_PACKAGE_MTD_MKFSJFFS2=y
    BR2_PACKAGE_MTD_MKFSUBIFS=y
    BR2_PACKAGE_NETATALK=y
    BR2_PACKAGE_PATCH=y
    BR2_PACKAGE_RPM=y
    BR2_PACKAGE_RSYNC=y
    BR2_PACKAGE_SAMBA4=y
    BR2_PACKAGE_TAR=y
    BR2_PACKAGE_VIM=y
    BR2_PACKAGE_XORRISO=y
    $ ./utils/test-pkg -c attr-mmu.cfg -d $(pwd)/test-mmu
                                 br-arm-full [1/6]: OK
                      br-arm-cortex-a9-glibc [2/6]: OK
                       br-arm-cortex-m4-full [3/6]: SKIPPED
                              br-x86-64-musl [4/6]: SKIPPED
                          br-arm-full-static [5/6]: SKIPPED
                    armv5-ctng-linux-gnueabi [6/6]: OK
    6 builds, 3 skipped, 0 build failed, 0 legal-info failed

    Notes:
      - for mtd, the two utilities that use xattr are explcitly enabled;
      - for br-arm-cortex-m4-full, that's because it is a static
        build, so a lot of packages are disabled;
      - for br-x86-64-musl, samba4 is not available for musl;
      - for br-arm-full-static, again it is a static build.

    $ cat attr-mmu-glibc.cfg
    BR2_PACKAGE_ACL=y
    BR2_PACKAGE_ATTR=y
    BR2_PACKAGE_COREUTILS=y
    BR2_PACKAGE_LIBARCHIVE=y
    BR2_PACKAGE_LUA=y
    BR2_PACKAGE_LUA_FLU=y
    BR2_PACKAGE_LOGROTATE=y
    BR2_PACKAGE_MTD=y
    BR2_PACKAGE_MTD_MKFSJFFS2=y
    BR2_PACKAGE_MTD_MKFSUBIFS=y
    BR2_PACKAGE_NETATALK=y
    BR2_PACKAGE_PATCH=y
    BR2_PACKAGE_RPM=y
    BR2_PACKAGE_RSYNC=y
    BR2_PACKAGE_SAMBA4=y
    BR2_PACKAGE_STRESS_NG=y
    BR2_PACKAGE_TAR=y
    BR2_PACKAGE_VIM=y
    BR2_PACKAGE_XORRISO=y
    $ ./utils/test-pkg -c attr-mmu-glibc.cfg  -d $(pwd)/test-mmu-glibc
                                 br-arm-full [1/6]: SKIPPED
                      br-arm-cortex-a9-glibc [2/6]: OK
                       br-arm-cortex-m4-full [3/6]: SKIPPED
                              br-x86-64-musl [4/6]: SKIPPED
                          br-arm-full-static [5/6]: SKIPPED
                    armv5-ctng-linux-gnueabi [6/6]: OK
    6 builds, 4 skipped, 0 build failed, 0 legal-info failed

    Notes:
      - br-arm-full: stress-ng only for glibc;
      - br-arm-cortex-m4-full: it's a static build;
      - br-x86-64-musl: stress-ng and smaba4 not avail on musl;
      - br-arm-full-static: static build

Now, I also build-tested systemd with a custom config (not with
test-pkg).

Note: I'll send the patches upstream asap.

[0] https://bugs.busybox.net/show_bug.cgi?id=10986
[1] https://git.savannah.gnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38)
[1] glibc: since 2.5: https://sourceware.org/git/?p=glibc.git;a=commit;h=0ecb606cb6cf65de1d9fc8a919bceb4be476c602
[2] uClibc: since 2004: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=d503d1d6c62506ba6fb51c04a9703039e71d11a9
[3] musl: since 2012 (a year after initial release): http://git.musl-libc.org/cgit/musl/commit/?id=207460d09742304941f1a010a89fc2efa46bcb29
[4] checking for XATTR_NAME_SMACKEXEC in linux/xattr.h... no


Regards,
Yann E. MORIN.


The following changes since commit ba33728bc3118a6f1d2b4233e7bddb17b2f67f1f

  uclibc: fix clock_nanosleep declaration (2018-05-06 23:19:14 +0200)


are available in the git repository at:

  git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to 6e7e5621022a8e788dc3cc8e04f123959e6de050

  package/attr: bump version (2018-05-07 20:23:33 +0200)


----------------------------------------------------------------
Yann E. MORIN (5):
      package/lua-flu: fix to use system xattr header
      package/stress-ng: bump version, fix to use system xattr header
      package/xorriso: fix to use system xattr header
      package/acl: bump version
      package/attr: bump version

 package/acl/0001-support-static-installation.patch |  29 --
 ...2-add-__acl_-prefixes-to-internal-symbols.patch | 292 ---------------------
 package/acl/acl.hash                               |   2 +-
 package/acl/acl.mk                                 |  60 ++---
 .../attr/0001-support-static-installation.patch    |  29 --
 .../0002-avoid-glibc-specific-decls-defines.patch  |  37 ---
 package/attr/0003-portability-fixes.patch          |  37 ---
 package/attr/attr.hash                             |   2 +-
 package/attr/attr.mk                               |  43 +--
 package/lua-flu/0001-use-system-xattr-h.patch      | 161 ++++++++++++
 package/stress-ng/0001-xattr-from-libc.patch       |  49 ++++
 package/stress-ng/stress-ng.hash                   |   2 +-
 package/stress-ng/stress-ng.mk                     |   3 +-
 package/xorriso/0001-use-sys-xattr.h.patch         |  30 +++
 package/xorriso/xorriso.mk                         |  10 +
 15 files changed, 283 insertions(+), 503 deletions(-)
 delete mode 100644 package/acl/0001-support-static-installation.patch
 delete mode 100644 package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch
 delete mode 100644 package/attr/0001-support-static-installation.patch
 delete mode 100644 package/attr/0002-avoid-glibc-specific-decls-defines.patch
 delete mode 100644 package/attr/0003-portability-fixes.patch
 create mode 100644 package/lua-flu/0001-use-system-xattr-h.patch
 create mode 100644 package/stress-ng/0001-xattr-from-libc.patch
 create mode 100644 package/xorriso/0001-use-sys-xattr.h.patch

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 1/5] package/lua-flu: fix to use system xattr header
  2018-05-07 18:25 [Buildroot] [PATCH 0/5] package: bump attr and acl, fix builds of dependees Yann E. MORIN
@ 2018-05-07 18:25 ` Yann E. MORIN
  2018-05-07 19:22   ` Thomas Petazzoni
  2018-05-07 18:25 ` [Buildroot] [PATCH 2/5] package/stress-ng: bump version, " Yann E. MORIN
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 13+ messages in thread
From: Yann E. MORIN @ 2018-05-07 18:25 UTC (permalink / raw)
  To: buildroot

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Marcin Niestroj <m.niestroj@grinn-global.com>
Cc: Francois Perrad <francois.perrad@gadz.org>
---
 package/lua-flu/0001-use-system-xattr-h.patch | 161 ++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100644 package/lua-flu/0001-use-system-xattr-h.patch

diff --git a/package/lua-flu/0001-use-system-xattr-h.patch b/package/lua-flu/0001-use-system-xattr-h.patch
new file mode 100644
index 0000000000..fda03b60c6
--- /dev/null
+++ b/package/lua-flu/0001-use-system-xattr-h.patch
@@ -0,0 +1,161 @@
+Use system <sys/xattr.h>
+
+The one from attr is no longer installed with latest version.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua	2018-05-06 09:22:28.499324049 +0200
+@@ -327,7 +327,7 @@
+ 				name = "fs.getxattr";
+ 				parameters = {"path", "name"};
+ 				results = {"value"};
+-				doc = [[Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
++				doc = [[Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
+ 			},
+ 			{
+ 				name = "fs.listxattr";
+@@ -338,7 +338,7 @@
+ 			{
+ 				name = "fs.removexattr";
+ 				parameters = {"path", "name"};
+-				doc = [[Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
++				doc = [[Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
+ 			},
+ 			{
+ 				name = "fs.opendir";
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua	2018-05-06 09:22:28.495324054 +0200
+@@ -222,8 +222,8 @@
+ -- :NOTE: since the filesystem is a pure tree (not a DAG), use the path to find attribs
+ 
+ function luafs.getxattr(path, name)
+-	local attrs = assert(xattrs[path], errno.ENOATTR)
+-	return assert(attrs[name], errno.ENOATTR)
++	local attrs = assert(xattrs[path], errno.ENODATA)
++	return assert(attrs[name], errno.ENODATA)
+ end
+ 
+ function luafs.setxattr(path, name, value, flags)
+@@ -236,7 +236,7 @@
+ end
+ 
+ function luafs.removexattr(path, name)
+-	local attrs = assert(xattrs[path], errno.ENOATTR)
++	local attrs = assert(xattrs[path], errno.ENODATA)
+ 	attrs[name] = nil
+ 	if next(attrs)==nil then
+ 		xattrs[path] = nil
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html	2018-05-06 09:22:28.499324049 +0200
+@@ -347,7 +347,7 @@
+ 		<div class="function">
+ 		<h3><a name="fs.getxattr"><code>value = fs.getxattr (path, name)</code></a></h3>
+ 
+-<p>Get an extended attribute. If the attribute doesn't exist <code>ENOATTR</code> should be thrown.</p>
++<p>Get an extended attribute. If the attribute doesn't exist <code>ENODATA</code> should be thrown.</p>
+ 		</div>
+ 
+ 		<div class="function">
+@@ -359,7 +359,7 @@
+ 		<div class="function">
+ 		<h3><a name="fs.removexattr"><code>fs.removexattr (path, name)</code></a></h3>
+ 
+-<p>Remove an extended attribute. If the attribute doesn't exist <code>ENOATTR</code> should be thrown.</p>
++<p>Remove an extended attribute. If the attribute doesn't exist <code>ENODATA</code> should be thrown.</p>
+ 		</div>
+ 
+ 		<div class="function">
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c lua-flu-20150331-1/doub-flu-a7daae986339/errno.c
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/errno.c	2018-05-06 09:23:06.323282527 +0200
+@@ -3,7 +3,7 @@
+ #include <lua.h>
+ #include <lauxlib.h>
+ #include <stdlib.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "compat.h"
+ 
+ /****************************************************************************/
+@@ -103,7 +103,7 @@
+ 	REGISTER_ERROR(EDOM)
+ 	REGISTER_ERROR(ERANGE)
+ 	REGISTER_ERROR(ENOSYS)
+-	REGISTER_ERROR(ENOATTR)
++	REGISTER_ERROR(ENODATA)
+ 	#undef REGISTER_ERROR
+ }
+ 
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec	2018-05-06 09:22:04.123351349 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec	2018-05-06 09:23:06.323282527 +0200
+@@ -14,7 +14,7 @@
+ 		library = 'fuse',
+ 	},
+ 	ATTR = {
+-		header = 'attr/xattr.h',
++		header = 'sys/xattr.h',
+ 	},
+ }
+ dependencies = {
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c lua-flu-20150331-1/doub-flu-a7daae986339/flu.c
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.c	2018-05-06 09:23:06.323282527 +0200
+@@ -15,7 +15,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <fuse.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include <lua.h>
+ #include <lauxlib.h>
+ 
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in	2018-05-06 09:23:06.323282527 +0200
+@@ -14,7 +14,7 @@
+ 		library = 'fuse',
+ 	},
+ 	ATTR = {
+-		header = 'attr/xattr.h',
++		header = 'sys/xattr.h',
+ 	},
+ }
+ dependencies = {
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md lua-flu-20150331-1/doub-flu-a7daae986339/README.md
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/README.md	2018-05-06 09:22:28.495324054 +0200
+@@ -345,7 +345,7 @@
+ 
+ ### `value = fs.getxattr (path, name)`
+ 
+-Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.
++Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.
+ 
+ ---
+ 
+@@ -357,7 +357,7 @@
+ 
+ ### `fs.removexattr (path, name)`
+ 
+-Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.
++Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.
+ 
+ ---
+ 
+diff -durN lua-flu-20150331-1.orig/flu-20150331-1.rockspec lua-flu-20150331-1/flu-20150331-1.rockspec
+--- lua-flu-20150331-1.orig/flu-20150331-1.rockspec	2015-04-02 23:44:11.000000000 +0200
++++ lua-flu-20150331-1/flu-20150331-1.rockspec	2018-05-06 09:23:06.323282527 +0200
+@@ -14,7 +14,7 @@
+ 		library = 'fuse',
+ 	},
+ 	ATTR = {
+-		header = 'attr/xattr.h',
++		header = 'sys/xattr.h',
+ 	},
+ }
+ dependencies = {
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 1/5] package/lua-flu: fix to use system xattr header
  2018-05-07 18:25 ` [Buildroot] [PATCH 1/5] package/lua-flu: fix to use system xattr header Yann E. MORIN
@ 2018-05-07 19:22   ` Thomas Petazzoni
  2018-05-07 20:29     ` Yann E. MORIN
  2018-05-07 20:43     ` Yann E. MORIN
  0 siblings, 2 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2018-05-07 19:22 UTC (permalink / raw)
  To: buildroot

Hello Yann,

On Mon,  7 May 2018 20:25:16 +0200, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Marcin Niestroj <m.niestroj@grinn-global.com>
> Cc: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/lua-flu/0001-use-system-xattr-h.patch | 161 ++++++++++++++++++++++++++
>  1 file changed, 161 insertions(+)
>  create mode 100644 package/lua-flu/0001-use-system-xattr-h.patch
> 
> diff --git a/package/lua-flu/0001-use-system-xattr-h.patch b/package/lua-flu/0001-use-system-xattr-h.patch
> new file mode 100644
> index 0000000000..fda03b60c6
> --- /dev/null
> +++ b/package/lua-flu/0001-use-system-xattr-h.patch
> @@ -0,0 +1,161 @@
> +Use system <sys/xattr.h>
> +
> +The one from attr is no longer installed with latest version.
> +
> +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

This could have been a Mercurial-formatted patch. I think you know how
to use Mercurial :-)

> +diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua
> +--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua	2015-03-31 18:54:19.000000000 +0200
> ++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua	2018-05-06 09:22:28.499324049 +0200
> +@@ -327,7 +327,7 @@
> + 				name = "fs.getxattr";
> + 				parameters = {"path", "name"};
> + 				results = {"value"};
> +-				doc = [[Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
> ++				doc = [[Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];

I do understand all the attr/xattr.h -> sys/xattr.h changes, but I
don't understand the ENOATTR -> ENODATA changes. Has the ENOATTR error
code disappeared ? What makes ENODATA a suitable replacement ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 1/5] package/lua-flu: fix to use system xattr header
  2018-05-07 19:22   ` Thomas Petazzoni
@ 2018-05-07 20:29     ` Yann E. MORIN
  2018-05-07 20:51       ` Thomas Petazzoni
  2018-05-07 20:43     ` Yann E. MORIN
  1 sibling, 1 reply; 13+ messages in thread
From: Yann E. MORIN @ 2018-05-07 20:29 UTC (permalink / raw)
  To: buildroot

Thomas,All,

On 2018-05-07 21:22 +0200, Thomas Petazzoni spake thusly:
> On Mon,  7 May 2018 20:25:16 +0200, Yann E. MORIN wrote:
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: Marcin Niestroj <m.niestroj@grinn-global.com>
> > Cc: Francois Perrad <francois.perrad@gadz.org>
> > ---
> >  package/lua-flu/0001-use-system-xattr-h.patch | 161 ++++++++++++++++++++++++++
> >  1 file changed, 161 insertions(+)
> >  create mode 100644 package/lua-flu/0001-use-system-xattr-h.patch
> > 
> > diff --git a/package/lua-flu/0001-use-system-xattr-h.patch b/package/lua-flu/0001-use-system-xattr-h.patch
> > new file mode 100644
> > index 0000000000..fda03b60c6
> > --- /dev/null
> > +++ b/package/lua-flu/0001-use-system-xattr-h.patch
> > @@ -0,0 +1,161 @@
> > +Use system <sys/xattr.h>
> > +
> > +The one from attr is no longer installed with latest version.
> > +
> > +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> This could have been a Mercurial-formatted patch. I think you know how
> to use Mercurial :-)

Well, to be hionest,m I was indeed preparing the patch for submission
upstream (now done: https://bitbucket.org/doub/flu/pull-requests/1) and
I really struggled using hg... :-/

> > +diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua
> > +--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua	2015-03-31 18:54:19.000000000 +0200
> > ++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua	2018-05-06 09:22:28.499324049 +0200
> > +@@ -327,7 +327,7 @@
> > + 				name = "fs.getxattr";
> > + 				parameters = {"path", "name"};
> > + 				results = {"value"};
> > +-				doc = [[Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
> > ++				doc = [[Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
> 
> I do understand all the attr/xattr.h -> sys/xattr.h changes, but I
> don't understand the ENOATTR -> ENODATA changes. Has the ENOATTR error
> code disappeared ? What makes ENODATA a suitable replacement ?

Oh, right; I forgot to explain that one.

attr, in <attr/xattr.h>, was doing:

    #ifndef ENOATTR
    # define ENOATTR ENODATA
    #endif

Ergo, ENOATTR is just ENODATA.

Regards,
Yann E. MORIN.

> Thanks!
> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
> Embedded Linux and Kernel engineering
> https://bootlin.com

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 1/5] package/lua-flu: fix to use system xattr header
  2018-05-07 20:29     ` Yann E. MORIN
@ 2018-05-07 20:51       ` Thomas Petazzoni
  0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2018-05-07 20:51 UTC (permalink / raw)
  To: buildroot

Hello,

On Mon, 7 May 2018 22:29:34 +0200, Yann E. MORIN wrote:

> > > diff --git a/package/lua-flu/0001-use-system-xattr-h.patch b/package/lua-flu/0001-use-system-xattr-h.patch
> > > new file mode 100644
> > > index 0000000000..fda03b60c6
> > > --- /dev/null
> > > +++ b/package/lua-flu/0001-use-system-xattr-h.patch
> > > @@ -0,0 +1,161 @@
> > > +Use system <sys/xattr.h>
> > > +
> > > +The one from attr is no longer installed with latest version.
> > > +
> > > +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>  
> > 
> > This could have been a Mercurial-formatted patch. I think you know how
> > to use Mercurial :-)  
> 
> Well, to be hionest,m I was indeed preparing the patch for submission
> upstream (now done: https://bitbucket.org/doub/flu/pull-requests/1) and
> I really struggled using hg... :-/

Can I say: "ha ha" ? :-)

> > I do understand all the attr/xattr.h -> sys/xattr.h changes, but I
> > don't understand the ENOATTR -> ENODATA changes. Has the ENOATTR error
> > code disappeared ? What makes ENODATA a suitable replacement ?  
> 
> Oh, right; I forgot to explain that one.
> 
> attr, in <attr/xattr.h>, was doing:
> 
>     #ifndef ENOATTR
>     # define ENOATTR ENODATA
>     #endif
> 
> Ergo, ENOATTR is just ENODATA.

OK, makes sense. Explaining it in the patch description would help,
then.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 1/5] package/lua-flu: fix to use system xattr header
  2018-05-07 19:22   ` Thomas Petazzoni
  2018-05-07 20:29     ` Yann E. MORIN
@ 2018-05-07 20:43     ` Yann E. MORIN
  1 sibling, 0 replies; 13+ messages in thread
From: Yann E. MORIN @ 2018-05-07 20:43 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2018-05-07 21:22 +0200, Thomas Petazzoni spake thusly:
> On Mon,  7 May 2018 20:25:16 +0200, Yann E. MORIN wrote:
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: Marcin Niestroj <m.niestroj@grinn-global.com>
> > Cc: Francois Perrad <francois.perrad@gadz.org>
> > ---
> >  package/lua-flu/0001-use-system-xattr-h.patch | 161 ++++++++++++++++++++++++++
> >  1 file changed, 161 insertions(+)
> >  create mode 100644 package/lua-flu/0001-use-system-xattr-h.patch
> > 
> > diff --git a/package/lua-flu/0001-use-system-xattr-h.patch b/package/lua-flu/0001-use-system-xattr-h.patch
> > new file mode 100644
> > index 0000000000..fda03b60c6
> > --- /dev/null
> > +++ b/package/lua-flu/0001-use-system-xattr-h.patch
> > @@ -0,0 +1,161 @@
> > +Use system <sys/xattr.h>
> > +
> > +The one from attr is no longer installed with latest version.
> > +
> > +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> This could have been a Mercurial-formatted patch. I think you know how
> to use Mercurial :-)

And no, this can't be a mercurial patch, because the luarocks infra
downloads archives from the lua package repositrory, which are
organised quite differently from the source tree.

So, the patch we carry is different from (really, a superset of) the
patch that I sent upstream:
    https://bitbucket.org/doub/flu/pull-requests/1

So, no, we won't carry a mercurial-formatted patch, I'm afraid... :-(

Regards,
Yann E. MORIN.

> > +diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua
> > +--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua	2015-03-31 18:54:19.000000000 +0200
> > ++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua	2018-05-06 09:22:28.499324049 +0200
> > +@@ -327,7 +327,7 @@
> > + 				name = "fs.getxattr";
> > + 				parameters = {"path", "name"};
> > + 				results = {"value"};
> > +-				doc = [[Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
> > ++				doc = [[Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
> 
> I do understand all the attr/xattr.h -> sys/xattr.h changes, but I
> don't understand the ENOATTR -> ENODATA changes. Has the ENOATTR error
> code disappeared ? What makes ENODATA a suitable replacement ?
> 
> Thanks!
> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
> Embedded Linux and Kernel engineering
> https://bootlin.com

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 2/5] package/stress-ng: bump version, fix to use system xattr header
  2018-05-07 18:25 [Buildroot] [PATCH 0/5] package: bump attr and acl, fix builds of dependees Yann E. MORIN
  2018-05-07 18:25 ` [Buildroot] [PATCH 1/5] package/lua-flu: fix to use system xattr header Yann E. MORIN
@ 2018-05-07 18:25 ` Yann E. MORIN
  2018-05-07 19:23   ` Thomas Petazzoni
  2018-05-07 18:25 ` [Buildroot] [PATCH 3/5] package/xorriso: " Yann E. MORIN
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 13+ messages in thread
From: Yann E. MORIN @ 2018-05-07 18:25 UTC (permalink / raw)
  To: buildroot

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Romain Naour <romain.naour@gmail.com>
---
 package/stress-ng/0001-xattr-from-libc.patch | 49 ++++++++++++++++++++++++++++
 package/stress-ng/stress-ng.hash             |  2 +-
 package/stress-ng/stress-ng.mk               |  3 +-
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 package/stress-ng/0001-xattr-from-libc.patch

diff --git a/package/stress-ng/0001-xattr-from-libc.patch b/package/stress-ng/0001-xattr-from-libc.patch
new file mode 100644
index 0000000000..0064b54470
--- /dev/null
+++ b/package/stress-ng/0001-xattr-from-libc.patch
@@ -0,0 +1,49 @@
+Use system <sys/xattr.h>
+
+The one from attr is no longer installed with latest version.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/Makefile.config b/Makefile.config
+index ee613273..136705cc 100644
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -173,10 +173,10 @@ endif
+ endif
+ 
+ ifndef $(HAVE_XATTR_H)
+-HAVE_XATTR_H = $(shell $(MAKE) -f Makefile.config --no-print-directory $(HAVE_NOT) HEADER=attr/xattr.h have_header_h)
++HAVE_XATTR_H = $(shell $(MAKE) -f Makefile.config --no-print-directory $(HAVE_NOT) HEADER=sys/xattr.h have_header_h)
+ ifeq ($(HAVE_XATTR_H),1)
+ 	CONFIG_CFLAGS += -DHAVE_XATTR_H
+-$(info autoconfig: using attr/xattr.h)
++$(info autoconfig: using sys/xattr.h)
+ endif
+ endif
+ 
+diff --git a/stress-sysbadaddr.c b/stress-sysbadaddr.c
+index ed04b286..043c61d9 100644
+--- a/stress-sysbadaddr.c
++++ b/stress-sysbadaddr.c
+@@ -34,7 +34,7 @@
+ #endif
+ #endif
+ #if defined(__linux__) && defined(HAVE_XATTR_H)
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #endif
+ 
+ #include <poll.h>
+diff --git a/stress-xattr.c b/stress-xattr.c
+index e083de7a..625ae960 100644
+--- a/stress-xattr.c
++++ b/stress-xattr.c
+@@ -26,7 +26,7 @@
+ 
+ #if defined(__linux__) && defined(HAVE_XATTR_H)
+ 
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ 
+ /*
+  *  stress_xattr
diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash
index e735439a7e..3802450175 100644
--- a/package/stress-ng/stress-ng.hash
+++ b/package/stress-ng/stress-ng.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	0e1d7733b35f594f7461dedbf836bd4966d0611da4cd4e85cde4804d2a425e6d	stress-ng-0.06.15.tar.gz
+sha256  a6f81dcc58d856e92136bcb8204f12e6070da4ae492d06df69b847d685d1bb11  stress-ng-0.09.26.tar.xz
diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk
index 794e87554e..81ff4d736b 100644
--- a/package/stress-ng/stress-ng.mk
+++ b/package/stress-ng/stress-ng.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-STRESS_NG_VERSION = 0.06.15
+STRESS_NG_VERSION = 0.09.26
+STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz
 STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng
 STRESS_NG_LICENSE = GPL-2.0+
 STRESS_NG_LICENSE_FILES = COPYING
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 2/5] package/stress-ng: bump version, fix to use system xattr header
  2018-05-07 18:25 ` [Buildroot] [PATCH 2/5] package/stress-ng: bump version, " Yann E. MORIN
@ 2018-05-07 19:23   ` Thomas Petazzoni
  2018-05-07 20:32     ` Yann E. MORIN
  0 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2018-05-07 19:23 UTC (permalink / raw)
  To: buildroot

Hello,

On Mon,  7 May 2018 20:25:17 +0200, Yann E. MORIN wrote:

> diff --git a/package/stress-ng/0001-xattr-from-libc.patch b/package/stress-ng/0001-xattr-from-libc.patch
> new file mode 100644
> index 0000000000..0064b54470
> --- /dev/null
> +++ b/package/stress-ng/0001-xattr-from-libc.patch
> @@ -0,0 +1,49 @@
> +Use system <sys/xattr.h>
> +
> +The one from attr is no longer installed with latest version.
> +
> +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Git-formatted patch, please ?

Git repo is at git://kernel.ubuntu.com/cking/stress-ng.git.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 2/5] package/stress-ng: bump version, fix to use system xattr header
  2018-05-07 19:23   ` Thomas Petazzoni
@ 2018-05-07 20:32     ` Yann E. MORIN
  0 siblings, 0 replies; 13+ messages in thread
From: Yann E. MORIN @ 2018-05-07 20:32 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2018-05-07 21:23 +0200, Thomas Petazzoni spake thusly:
> On Mon,  7 May 2018 20:25:17 +0200, Yann E. MORIN wrote:
> > diff --git a/package/stress-ng/0001-xattr-from-libc.patch b/package/stress-ng/0001-xattr-from-libc.patch
> > new file mode 100644
> > index 0000000000..0064b54470
> > --- /dev/null
> > +++ b/package/stress-ng/0001-xattr-from-libc.patch
> > @@ -0,0 +1,49 @@
> > +Use system <sys/xattr.h>
> > +
> > +The one from attr is no longer installed with latest version.
> > +
> > +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> Git-formatted patch, please ?

Woops...

> Git repo is at git://kernel.ubuntu.com/cking/stress-ng.git.

I already send the patch to Colin (I hven't found a mailing list for
it).

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 3/5] package/xorriso: fix to use system xattr header
  2018-05-07 18:25 [Buildroot] [PATCH 0/5] package: bump attr and acl, fix builds of dependees Yann E. MORIN
  2018-05-07 18:25 ` [Buildroot] [PATCH 1/5] package/lua-flu: fix to use system xattr header Yann E. MORIN
  2018-05-07 18:25 ` [Buildroot] [PATCH 2/5] package/stress-ng: bump version, " Yann E. MORIN
@ 2018-05-07 18:25 ` Yann E. MORIN
  2018-05-07 20:59   ` Yann E. MORIN
  2018-05-07 18:25 ` [Buildroot] [PATCH 4/5] package/acl: bump version Yann E. MORIN
  2018-05-07 18:25 ` [Buildroot] [PATCH 5/5] package/attr: " Yann E. MORIN
  4 siblings, 1 reply; 13+ messages in thread
From: Yann E. MORIN @ 2018-05-07 18:25 UTC (permalink / raw)
  To: buildroot

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Steve Kenton <skenton@ou.edu>
---
 package/xorriso/0001-use-sys-xattr.h.patch | 30 ++++++++++++++++++++++++++++++
 package/xorriso/xorriso.mk                 | 10 ++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 package/xorriso/0001-use-sys-xattr.h.patch

diff --git a/package/xorriso/0001-use-sys-xattr.h.patch b/package/xorriso/0001-use-sys-xattr.h.patch
new file mode 100644
index 0000000000..89cd530d1d
--- /dev/null
+++ b/package/xorriso/0001-use-sys-xattr.h.patch
@@ -0,0 +1,30 @@
+Use system <sys/xattr.h>
+
+The one from attr is no longer installed with latest version.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN xorriso-1.4.6.orig/configure.ac xorriso-1.4.6/configure.ac
+--- xorriso-1.4.6.orig/configure.ac	2016-09-16 15:51:33.000000000 +0200
++++ xorriso-1.4.6/configure.ac	2018-05-06 23:45:38.377153069 +0200
+@@ -264,7 +264,7 @@
+ dnl Check whether there is the header for Linux xattr.
+ dnl If not, erase this macro which would enable use of listxattr and others
+         XATTR_DEF="-DLibisofs_with_aaip_xattR"
+-        AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= ,
++        AC_CHECK_HEADER(sys/xattr.h, AC_CHECK_LIB(c, listxattr, X= ,
+                                                    XATTR_DEF= ), XATTR_DEF= )
+     fi
+ elif test x"$LIBBURNIA_SUPP_FATTR" = xextattr
+diff -durN xorriso-1.4.6.orig/libisofs/aaip-os-linux.c xorriso-1.4.6/libisofs/aaip-os-linux.c
+--- xorriso-1.4.6.orig/libisofs/aaip-os-linux.c	2016-09-16 15:51:34.000000000 +0200
++++ xorriso-1.4.6/libisofs/aaip-os-linux.c	2018-05-06 23:47:25.764941583 +0200
+@@ -30,7 +30,7 @@
+ #endif
+ 
+ #ifdef Libisofs_with_aaip_xattR
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #endif
+ 
+ 
diff --git a/package/xorriso/xorriso.mk b/package/xorriso/xorriso.mk
index 1f095911f8..2dda1e8d73 100644
--- a/package/xorriso/xorriso.mk
+++ b/package/xorriso/xorriso.mk
@@ -8,6 +8,16 @@ XORRISO_VERSION = 1.4.6
 XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso
 XORRISO_LICENSE = GPL-3.0+
 XORRISO_LICENSE_FILES = COPYING COPYRIGHT
+
+# 0001-use-sys-xattr.h.patch
+XORRISO_AUTORECONF = YES
+
+define XORRSISO_AUTOTOOLS_NEWS
+	@touch $(@D)/NEWS
+endef
+XORRISO_POST_PATCH_HOOKS += XORRSISO_AUTOTOOLS_NEWS
+HOST_XORRISO_POST_PATCH_HOOKS += XORRSISO_AUTOTOOLS_NEWS
+
 # Disable everything until we actually need those features, and add the correct
 # host libraries
 HOST_XORRISO_CONF_OPTS = \
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 3/5] package/xorriso: fix to use system xattr header
  2018-05-07 18:25 ` [Buildroot] [PATCH 3/5] package/xorriso: " Yann E. MORIN
@ 2018-05-07 20:59   ` Yann E. MORIN
  0 siblings, 0 replies; 13+ messages in thread
From: Yann E. MORIN @ 2018-05-07 20:59 UTC (permalink / raw)
  To: buildroot

All,

On 2018-05-07 20:25 +0200, Yann E. MORIN spake thusly:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Steve Kenton <skenton@ou.edu>
> ---
>  package/xorriso/0001-use-sys-xattr.h.patch | 30 ++++++++++++++++++++++++++++++
>  package/xorriso/xorriso.mk                 | 10 ++++++++++
>  2 files changed, 40 insertions(+)
>  create mode 100644 package/xorriso/0001-use-sys-xattr.h.patch
> 
> diff --git a/package/xorriso/0001-use-sys-xattr.h.patch b/package/xorriso/0001-use-sys-xattr.h.patch
> new file mode 100644
> index 0000000000..89cd530d1d
> --- /dev/null
> +++ b/package/xorriso/0001-use-sys-xattr.h.patch
> @@ -0,0 +1,30 @@
> +Use system <sys/xattr.h>
> +
> +The one from attr is no longer installed with latest version.
> +
> +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Before Thomas whines about a git-formatted patch...

The git tree, or rather the git tree*s*, are bizarelly arranged.

Upstream is at https://www.gnu.org/software/xorriso/, which points to
http://libburnia-project.org/, which is a redirect to a mattermost
instance (you know, a slightly glorified irc client with fancy bells and
whisttles for millenials ;-])...

But then, digigng a bit unearthes what appears to be the upstream git
trees, at https://dev.lovelyhq.com/explore/projects

Then, there is no tree for xorriso. Instead, it seems to be part of
another tree, https://dev.lovelyhq.com/libburnia/libisoburn.

Alas, this is not all the story yet, as the code from the tarball does
not match the one from the tree: there are more things in the tarball
than in the tree, notably libisofs, which is in its own git tree
https://dev.lovelyhq.com/libburnia/libisofs.

So, again, we can't carry a git-formatted patch for xorriso...

But I'll be sending them patches to each of their impacted trees...
Tomorrow...

Regards,
Yann E. MORIN.

> +diff -durN xorriso-1.4.6.orig/configure.ac xorriso-1.4.6/configure.ac
> +--- xorriso-1.4.6.orig/configure.ac	2016-09-16 15:51:33.000000000 +0200
> ++++ xorriso-1.4.6/configure.ac	2018-05-06 23:45:38.377153069 +0200
> +@@ -264,7 +264,7 @@
> + dnl Check whether there is the header for Linux xattr.
> + dnl If not, erase this macro which would enable use of listxattr and others
> +         XATTR_DEF="-DLibisofs_with_aaip_xattR"
> +-        AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= ,
> ++        AC_CHECK_HEADER(sys/xattr.h, AC_CHECK_LIB(c, listxattr, X= ,
> +                                                    XATTR_DEF= ), XATTR_DEF= )
> +     fi
> + elif test x"$LIBBURNIA_SUPP_FATTR" = xextattr
> +diff -durN xorriso-1.4.6.orig/libisofs/aaip-os-linux.c xorriso-1.4.6/libisofs/aaip-os-linux.c
> +--- xorriso-1.4.6.orig/libisofs/aaip-os-linux.c	2016-09-16 15:51:34.000000000 +0200
> ++++ xorriso-1.4.6/libisofs/aaip-os-linux.c	2018-05-06 23:47:25.764941583 +0200
> +@@ -30,7 +30,7 @@
> + #endif
> + 
> + #ifdef Libisofs_with_aaip_xattR
> +-#include <attr/xattr.h>
> ++#include <sys/xattr.h>
> + #endif
> + 
> + 
> diff --git a/package/xorriso/xorriso.mk b/package/xorriso/xorriso.mk
> index 1f095911f8..2dda1e8d73 100644
> --- a/package/xorriso/xorriso.mk
> +++ b/package/xorriso/xorriso.mk
> @@ -8,6 +8,16 @@ XORRISO_VERSION = 1.4.6
>  XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso
>  XORRISO_LICENSE = GPL-3.0+
>  XORRISO_LICENSE_FILES = COPYING COPYRIGHT
> +
> +# 0001-use-sys-xattr.h.patch
> +XORRISO_AUTORECONF = YES
> +
> +define XORRSISO_AUTOTOOLS_NEWS
> +	@touch $(@D)/NEWS
> +endef
> +XORRISO_POST_PATCH_HOOKS += XORRSISO_AUTOTOOLS_NEWS
> +HOST_XORRISO_POST_PATCH_HOOKS += XORRSISO_AUTOTOOLS_NEWS
> +
>  # Disable everything until we actually need those features, and add the correct
>  # host libraries
>  HOST_XORRISO_CONF_OPTS = \
> -- 
> 2.14.1
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 4/5] package/acl: bump version
  2018-05-07 18:25 [Buildroot] [PATCH 0/5] package: bump attr and acl, fix builds of dependees Yann E. MORIN
                   ` (2 preceding siblings ...)
  2018-05-07 18:25 ` [Buildroot] [PATCH 3/5] package/xorriso: " Yann E. MORIN
@ 2018-05-07 18:25 ` Yann E. MORIN
  2018-05-07 18:25 ` [Buildroot] [PATCH 5/5] package/attr: " Yann E. MORIN
  4 siblings, 0 replies; 13+ messages in thread
From: Yann E. MORIN @ 2018-05-07 18:25 UTC (permalink / raw)
  To: buildroot

There has been no release of acl in the past 5+ years now, but a
lot has changed.

Of most interest is the build system overhaul, and the drop of
the dependency on attr-provided <attr/xattr.h> in favour of the
system-provided <sys/xattr.h>.

That last bit meaning that we will beable to bump attr.

Since there is no release tarball, we need to autoreconf. Also,
there is a hard dependency on gettext, so we need to gettextize
as well... :-/

But at least, we can drop our patches: static is now natively
supported thanks to the use of libtool, and the internal symbols
was a backport.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
---
 package/acl/0001-support-static-installation.patch |  29 --
 ...2-add-__acl_-prefixes-to-internal-symbols.patch | 292 ---------------------
 package/acl/acl.hash                               |   2 +-
 package/acl/acl.mk                                 |  60 ++---
 4 files changed, 17 insertions(+), 366 deletions(-)
 delete mode 100644 package/acl/0001-support-static-installation.patch
 delete mode 100644 package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch

diff --git a/package/acl/0001-support-static-installation.patch b/package/acl/0001-support-static-installation.patch
deleted file mode 100644
index 4cb473ffc2..0000000000
--- a/package/acl/0001-support-static-installation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Support installation of .a file when doing static linking
-
-When doing static linking (i.e ENABLE_SHARED != yes), the acl build
-logic wasn't installing any library at all, not even the .a file which
-is needed for static linking. This patch fixes that.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/include/buildmacros
-===================================================================
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -97,7 +97,15 @@
- 
- INSTALL_LTLIB_STATIC = \
- 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
-+	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
-+	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \
-+	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
-+	fi
- 
- INSTALL_MAN = \
- 	@for d in $(MAN_PAGES); do \
diff --git a/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch b/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch
deleted file mode 100644
index f9a5d9bd1e..0000000000
--- a/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From debbe4f7b591b3f35d0ed65c17fa81b196b2eb2d Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 12 Aug 2014 08:37:25 -0400
-Subject: [PATCH] add __acl_ prefixes to internal symbols
-
-When static linking libacl, people sometimes run into symbol collisions
-because their own code defines symbols like "quote".  So for acl internal
-symbols, use an __acl_ prefix.
-
-[Rahul Bedarkar: backported from upstream 
-  http://git.savannah.gnu.org/cgit/acl.git/commit/?id=a2c4d71c2e84419a49db503ed59de4d3d1dca7dd ]
-Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
----
- exports                    | 12 ++----------
- getfacl/getfacl.c          |  4 ++--
- include/misc.h             |  8 ++++----
- libacl/__acl_to_any_text.c |  4 ++--
- libacl/acl_from_text.c     |  4 ++--
- libmisc/high_water_alloc.c |  2 +-
- libmisc/next_line.c        |  6 +++---
- libmisc/quote.c            |  4 ++--
- libmisc/unquote.c          |  2 +-
- setfacl/parse.c            | 10 +++++-----
- setfacl/setfacl.c          |  4 ++--
- 11 files changed, 26 insertions(+), 34 deletions(-)
-
-diff --git a/exports b/exports
-index 7d8e69e..bf15d84 100644
---- a/exports
-+++ b/exports
-@@ -59,22 +59,14 @@ ACL_1.0 {
- 	acl_to_any_text;
- 
-     local:
--    	# Library internal stuff
-+	# Library internal stuff
- 	__new_var_obj_p;
- 	__new_obj_p_here;
- 	__free_obj_p;
- 	__check_obj_p;
- 	__ext2int_and_check;
--	__acl_reorder_entry_obj_p;
--	__acl_reorder_obj_p;
--	__acl_init_obj;
--	__acl_create_entry_obj;
--	__acl_free_acl_obj;
--	__acl_to_any_text;
-+	__acl_*;
- 	__apply_mask_to_mode;
--
--	quote;
--	unquote;
- };
- 
- ACL_1.1 {
-diff --git a/getfacl/getfacl.c b/getfacl/getfacl.c
-index f8eaf25..af9e225 100644
---- a/getfacl/getfacl.c
-+++ b/getfacl/getfacl.c
-@@ -90,7 +90,7 @@ int opt_numeric;  /* don't convert id's to symbolic names */
- 
- static const char *xquote(const char *str, const char *quote_chars)
- {
--	const char *q = quote(str, quote_chars);
-+	const char *q = __acl_quote(str, quote_chars);
- 	if (q == NULL) {
- 		fprintf(stderr, "%s: %s\n", progname, strerror(errno));
- 		exit(1);
-@@ -718,7 +718,7 @@ int main(int argc, char *argv[])
- 	do {
- 		if (optind == argc ||
- 		    strcmp(argv[optind], "-") == 0) {
--			while ((line = next_line(stdin)) != NULL) {
-+			while ((line = __acl_next_line(stdin)) != NULL) {
- 				if (*line == '\0')
- 					continue;
- 
-diff --git a/include/misc.h b/include/misc.h
-index 0c5fdcc..c25accf 100644
---- a/include/misc.h
-+++ b/include/misc.h
-@@ -15,9 +15,9 @@
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--extern int high_water_alloc(void **buf, size_t *bufsize, size_t newsize);
-+extern int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize);
- 
--extern const char *quote(const char *str, const char *quote_chars);
--extern char *unquote(char *str);
-+extern const char *__acl_quote(const char *str, const char *quote_chars);
-+extern char *__acl_unquote(char *str);
- 
--extern char *next_line(FILE *file);
-+extern char *__acl_next_line(FILE *file);
-diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c
-index a4f9c34..19f1ccc 100644
---- a/libacl/__acl_to_any_text.c
-+++ b/libacl/__acl_to_any_text.c
-@@ -159,7 +159,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size,
- 				if (options & TEXT_NUMERIC_IDS)
- 					str = NULL;
- 				else
--					str = quote(user_name(
-+					str = __acl_quote(user_name(
- 						entry_obj_p->eid.qid), ":, \t\n\r");
- 				if (str != NULL) {
- 					strncpy(text_p, str, size);
-@@ -182,7 +182,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size,
- 				if (options & TEXT_NUMERIC_IDS)
- 					str = NULL;
- 				else
--					str = quote(group_name(
-+					str = __acl_quote(group_name(
- 						entry_obj_p->eid.qid), ":, \t\n\r");
- 				if (str != NULL) {
- 					strncpy(text_p, str, size);
-diff --git a/libacl/acl_from_text.c b/libacl/acl_from_text.c
-index 1e05322..f6165be 100644
---- a/libacl/acl_from_text.c
-+++ b/libacl/acl_from_text.c
-@@ -206,7 +206,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p)
- 			str = get_token(text_p);
- 			if (str) {
- 				entry_obj.etag = ACL_USER;
--				error = get_uid(unquote(str),
-+				error = get_uid(__acl_unquote(str),
- 						&entry_obj.eid.qid);
- 				free(str);
- 				if (error) {
-@@ -225,7 +225,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p)
- 			str = get_token(text_p);
- 			if (str) {
- 				entry_obj.etag = ACL_GROUP;
--				error = get_gid(unquote(str),
-+				error = get_gid(__acl_unquote(str),
- 						&entry_obj.eid.qid);
- 				free(str);
- 				if (error) {
-diff --git a/libmisc/high_water_alloc.c b/libmisc/high_water_alloc.c
-index c127dc1..951f4bb 100644
---- a/libmisc/high_water_alloc.c
-+++ b/libmisc/high_water_alloc.c
-@@ -21,7 +21,7 @@
- #include <stdlib.h>
- #include "misc.h"
- 
--int high_water_alloc(void **buf, size_t *bufsize, size_t newsize)
-+int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize)
- {
- #define CHUNK_SIZE	256
- 	/*
-diff --git a/libmisc/next_line.c b/libmisc/next_line.c
-index 0566d7a..126a364 100644
---- a/libmisc/next_line.c
-+++ b/libmisc/next_line.c
-@@ -23,7 +23,7 @@
- 
- #define LINE_SIZE getpagesize()
- 
--char *next_line(FILE *file)
-+char *__acl_next_line(FILE *file)
- {
- 	static char *line;
- 	static size_t line_size;
-@@ -31,7 +31,7 @@ char *next_line(FILE *file)
- 	int eol = 0;
- 
- 	if (!line) {
--		if (high_water_alloc((void **)&line, &line_size, LINE_SIZE))
-+		if (__acl_high_water_alloc((void **)&line, &line_size, LINE_SIZE))
- 			return NULL;
- 	}
- 	c = line;
-@@ -47,7 +47,7 @@ char *next_line(FILE *file)
- 		if (feof(file))
- 			break;
- 		if (!eol) {
--			if (high_water_alloc((void **)&line, &line_size,
-+			if (__acl_high_water_alloc((void **)&line, &line_size,
- 					     2 * line_size))
- 				return NULL;
- 			c = strrchr(line, '\0');
-diff --git a/libmisc/quote.c b/libmisc/quote.c
-index bf8f9eb..a28800c 100644
---- a/libmisc/quote.c
-+++ b/libmisc/quote.c
-@@ -23,7 +23,7 @@
- #include <string.h>
- #include "misc.h"
- 
--const char *quote(const char *str, const char *quote_chars)
-+const char *__acl_quote(const char *str, const char *quote_chars)
- {
- 	static char *quoted_str;
- 	static size_t quoted_str_len;
-@@ -40,7 +40,7 @@ const char *quote(const char *str, const char *quote_chars)
- 	if (nonpr == 0)
- 		return str;
- 
--	if (high_water_alloc((void **)&quoted_str, &quoted_str_len,
-+	if (__acl_high_water_alloc((void **)&quoted_str, &quoted_str_len,
- 			     (s - (unsigned char *)str) + nonpr * 3 + 1))
- 		return NULL;
- 	for (s = (unsigned char *)str, q = quoted_str; *s != '\0'; s++) {
-diff --git a/libmisc/unquote.c b/libmisc/unquote.c
-index bffebf9..4f4ce7c 100644
---- a/libmisc/unquote.c
-+++ b/libmisc/unquote.c
-@@ -22,7 +22,7 @@
- #include <ctype.h>
- #include "misc.h"
- 
--char *unquote(char *str)
-+char *__acl_unquote(char *str)
- {
- 	unsigned char *s, *t;
- 
-diff --git a/setfacl/parse.c b/setfacl/parse.c
-index e7e6add..7433459 100644
---- a/setfacl/parse.c
-+++ b/setfacl/parse.c
-@@ -226,7 +226,7 @@ user_entry:
- 			str = get_token(text_p);
- 			if (str) {
- 				cmd->c_tag = ACL_USER;
--				error = get_uid(unquote(str), &cmd->c_id);
-+				error = get_uid(__acl_unquote(str), &cmd->c_id);
- 				free(str);
- 				if (error) {
- 					*text_p = backup;
-@@ -245,7 +245,7 @@ user_entry:
- 			str = get_token(text_p);
- 			if (str) {
- 				cmd->c_tag = ACL_GROUP;
--				error = get_gid(unquote(str), &cmd->c_id); 
-+				error = get_gid(__acl_unquote(str), &cmd->c_id);
- 				free(str);
- 				if (error) {
- 					*text_p = backup;
-@@ -466,7 +466,7 @@ read_acl_comments(
- 		if (strncmp(cp, "file:", 5) == 0) {
- 			cp += 5;
- 			SKIP_WS(cp);
--			cp = unquote(cp);
-+			cp = __acl_unquote(cp);
- 			
- 			if (path_p) {
- 				if (*path_p)
-@@ -483,7 +483,7 @@ read_acl_comments(
- 			if (uid_p) {
- 				if (*uid_p != ACL_UNDEFINED_ID)
- 					goto fail;
--				if (get_uid(unquote(cp), uid_p) != 0)
-+				if (get_uid(__acl_unquote(cp), uid_p) != 0)
- 					continue;
- 			}
- 		} else if (strncmp(cp, "group:", 6) == 0) {
-@@ -493,7 +493,7 @@ read_acl_comments(
- 			if (gid_p) {
- 				if (*gid_p != ACL_UNDEFINED_ID)
- 					goto fail;
--				if (get_gid(unquote(cp), gid_p) != 0)
-+				if (get_gid(__acl_unquote(cp), gid_p) != 0)
- 					continue;
- 			}
- 		} else if (strncmp(cp, "flags:", 6) == 0) {
-diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
-index 81062a6..fb2d172 100644
---- a/setfacl/setfacl.c
-+++ b/setfacl/setfacl.c
-@@ -92,7 +92,7 @@ int promote_warning;
- 
- static const char *xquote(const char *str, const char *quote_chars)
- {
--	const char *q = quote(str, quote_chars);
-+	const char *q = __acl_quote(str, quote_chars);
- 	if (q == NULL) {
- 		fprintf(stderr, "%s: %s\n", progname, strerror(errno));
- 		exit(1);
-@@ -311,7 +311,7 @@ int next_file(const char *arg, seq_t seq)
- 	args.seq = seq;
- 
- 	if (strcmp(arg, "-") == 0) {
--		while ((line = next_line(stdin)))
-+		while ((line = __acl_next_line(stdin)))
- 			errors = walk_tree(line, walk_flags, 0, do_set, &args);
- 		if (!feof(stdin)) {
- 			fprintf(stderr, _("%s: Standard input: %s\n"),
--- 
-2.6.2
-
diff --git a/package/acl/acl.hash b/package/acl/acl.hash
index 3f9d7900d3..45da8c5fc0 100644
--- a/package/acl/acl.hash
+++ b/package/acl/acl.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23	acl-2.2.52.src.tar.gz
+sha256  eb0e06157efc50aa2211afdf393d264ef3c2e3a42998da7dcd2ac0cc6cdc63b4  acl-ff3bca294e092810e92fd8a832bc0388e3194932.tar.gz
diff --git a/package/acl/acl.mk b/package/acl/acl.mk
index 4d30059390..306df74dac 100644
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -4,54 +4,26 @@
 #
 ################################################################################
 
-ACL_VERSION = 2.2.52
-ACL_SOURCE = acl-$(ACL_VERSION).src.tar.gz
-ACL_SITE = http://download.savannah.gnu.org/releases/acl
-ACL_INSTALL_STAGING = YES
-ACL_DEPENDENCIES = attr
-ACL_CONF_OPTS = --enable-gettext=no
+ACL_VERSION = ff3bca294e092810e92fd8a832bc0388e3194932
+ACL_SITE = https://git.savannah.gnu.org/git/acl.git
+ACL_SITE_METHOD = git
 ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
 
-# While the configuration system uses autoconf, the Makefiles are
-# hand-written and do not use automake. Therefore, we have to hack
-# around their deficiencies by:
-# - explicitly passing CFLAGS (LDFLAGS are passed on from configure,
-#   CFLAGS are not).
-# - explicitly passing the installation prefix, not using DESTDIR.
-
-ACL_MAKE_ENV = CFLAGS="$(TARGET_CFLAGS)"
-
-ACL_INSTALL_STAGING_OPTS = \
-	prefix=$(STAGING_DIR)/usr \
-	exec_prefix=$(STAGING_DIR)/usr \
-	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
-	install-dev install-lib
-
-ACL_INSTALL_TARGET_OPTS = \
-	prefix=$(TARGET_DIR)/usr \
-	exec_prefix=$(TARGET_DIR)/usr \
-	install install-lib
-
-# The libdir variable in libacl.la is empty, so let's fix it. This is
-# probably due to acl not using automake, and not doing fully the
-# right thing with libtool.
-define ACL_FIX_LIBTOOL_LA_LIBDIR
-	$(SED) "s,libdir=.*,libdir='$(STAGING_DIR)'," \
-		$(STAGING_DIR)/usr/lib/libacl.la
-endef
-
-ACL_POST_INSTALL_STAGING_HOOKS += ACL_FIX_LIBTOOL_LA_LIBDIR
-
+ACL_INSTALL_STAGING = YES
+ACL_DEPENDENCIES = attr
 HOST_ACL_DEPENDENCIES = host-attr
-HOST_ACL_CONF_OPTS = --enable-gettext=no
-HOST_ACL_MAKE_ENV = CFLAGS="$(HOST_CFLAGS)"
-HOST_ACL_INSTALL_OPTS = \
-	prefix=$(HOST_DIR) \
-	exec_prefix=$(HOST_DIR) \
-	PKG_DEVLIB_DIR=$(HOST_DIR)/lib \
-	install-dev install-lib
-# For the host, libacl.la is correct, no fixup needed.
+
+# Straight out of the git tree
+ACL_AUTORECONF = YES
+ACL_GETTEXTIZE = YES
+
+define ACL_GETTEXT
+	cd $(@D) && ./po/update-potfiles
+	cd $(@D) && $(HOST_DIR)/bin/autopoint --force
+endef
+ACL_PRE_CONFIGURE_HOOKS += ACL_GETTEXT
+HOST_ACL_PRE_CONFIGURE_HOOKS += ACL_GETTEXT
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 5/5] package/attr: bump version
  2018-05-07 18:25 [Buildroot] [PATCH 0/5] package: bump attr and acl, fix builds of dependees Yann E. MORIN
                   ` (3 preceding siblings ...)
  2018-05-07 18:25 ` [Buildroot] [PATCH 4/5] package/acl: bump version Yann E. MORIN
@ 2018-05-07 18:25 ` Yann E. MORIN
  4 siblings, 0 replies; 13+ messages in thread
From: Yann E. MORIN @ 2018-05-07 18:25 UTC (permalink / raw)
  To: buildroot

The current version of attr uses a canned custom buildsystem, that
is borked in quite a few ways (no support for static, overwrites
destination files without unlinking...)

There has been a release recently-ish, with a complete overhaul of
the buildsystem. We can now drop all our patches.

There is a new tag in the git tree, but there is no release tarball.
So, we need to autoreconf. Also, there is a hard dependency on gettext,
so we need to gettextize as well... :-/

Fixes: #10986

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
---
 .../attr/0001-support-static-installation.patch    | 29 ---------------
 .../0002-avoid-glibc-specific-decls-defines.patch  | 37 -------------------
 package/attr/0003-portability-fixes.patch          | 37 -------------------
 package/attr/attr.hash                             |  2 +-
 package/attr/attr.mk                               | 43 ++++++----------------
 5 files changed, 13 insertions(+), 135 deletions(-)
 delete mode 100644 package/attr/0001-support-static-installation.patch
 delete mode 100644 package/attr/0002-avoid-glibc-specific-decls-defines.patch
 delete mode 100644 package/attr/0003-portability-fixes.patch

diff --git a/package/attr/0001-support-static-installation.patch b/package/attr/0001-support-static-installation.patch
deleted file mode 100644
index 87858ac75e..0000000000
--- a/package/attr/0001-support-static-installation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Support installation of .a file when doing static linking
-
-When doing static linking (i.e ENABLE_SHARED != yes), the attr build
-logic wasn't installing any library at all, not even the .a file which
-is needed for static linking. This patch fixes that.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/include/buildmacros
-===================================================================
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -97,7 +97,15 @@
- 
- INSTALL_LTLIB_STATIC = \
- 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
-+	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
-+	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \
-+	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
-+	fi
- 
- INSTALL_MAN = \
- 	@for d in $(MAN_PAGES); do \
diff --git a/package/attr/0002-avoid-glibc-specific-decls-defines.patch b/package/attr/0002-avoid-glibc-specific-decls-defines.patch
deleted file mode 100644
index 8c71678cf4..0000000000
--- a/package/attr/0002-avoid-glibc-specific-decls-defines.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 667137acaffb8d0cc62b47821a67a52ba0637d5c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 10 Jan 2014 13:56:37 +0000
-Subject: avoid glibc-specific DECLS defines
-
-This matches what we do in all the other headers.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
-diff --git a/include/xattr.h b/include/xattr.h
-index 70a84be..070d7c5 100644
---- a/include/xattr.h
-+++ b/include/xattr.h
-@@ -30,8 +30,9 @@
- #define XATTR_CREATE  0x1       /* set value, fail if attr already exists */
- #define XATTR_REPLACE 0x2       /* set value, fail if attr does not exist */
- 
--
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- extern int setxattr (const char *__path, const char *__name,
- 		      const void *__value, size_t __size, int __flags) __THROW;
-@@ -58,6 +59,8 @@ extern int removexattr (const char *__path, const char *__name) __THROW;
- extern int lremovexattr (const char *__path, const char *__name) __THROW;
- extern int fremovexattr (int __filedes,   const char *__name) __THROW;
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif	/* __XATTR_H__ */
---
-cgit v0.9.0.2
diff --git a/package/attr/0003-portability-fixes.patch b/package/attr/0003-portability-fixes.patch
deleted file mode 100644
index c5dc8c865b..0000000000
--- a/package/attr/0003-portability-fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 92247401984dd9a80d9d0c8c030692323f980678 Mon Sep 17 00:00:00 2001
-From: Emmanuel Dreyfus <manu@netbsd.org>
-Date: Mon, 30 Jun 2014 13:06:05 +0000
-Subject: Portability fixes
-
-- <features.h>  is Linux specific
-- Define __THROW for non glibc based systems
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
-(limited to 'include/xattr.h')
-
-diff --git a/include/xattr.h b/include/xattr.h
-index 070d7c5..fd1f268 100644
---- a/include/xattr.h
-+++ b/include/xattr.h
-@@ -20,7 +20,18 @@
- #ifndef __XATTR_H__
- #define __XATTR_H__
- 
-+#if defined(linux)
- #include <features.h>
-+#endif
-+
-+/* Portability non glibc c++ build systems */
-+#ifndef __THROW
-+# if defined __cplusplus
-+#  define __THROW       throw ()
-+# else
-+#  define __THROW
-+# endif
-+#endif
- 
- #include <errno.h>
- #ifndef ENOATTR
---
-cgit v0.9.0.2
diff --git a/package/attr/attr.hash b/package/attr/attr.hash
index d2d1c2ed50..b0b23374e9 100644
--- a/package/attr/attr.hash
+++ b/package/attr/attr.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859	attr-2.4.47.src.tar.gz
+sha256  2a1a3795c6c344597683ddfd62e81fdeebd74204f6b4bcd41cb541b4d08c381f  attr-v2.4.48.tar.gz
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
index 8d250608b7..77adda9c9b 100644
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -4,43 +4,24 @@
 #
 ################################################################################
 
-ATTR_VERSION = 2.4.47
-ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz
-ATTR_SITE = http://download.savannah.gnu.org/releases/attr
-ATTR_INSTALL_STAGING = YES
-ATTR_CONF_OPTS = --enable-gettext=no
-HOST_ATTR_CONF_OPTS = --enable-gettext=no
+ATTR_VERSION = v2.4.48
+ATTR_SITE = https://git.savannah.nongnu.org/git/attr.git
+ATTR_SITE_METHOD = git
 ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
 
-# While the configuration system uses autoconf, the Makefiles are
-# hand-written and do not use automake. Therefore, we have to hack
-# around their deficiencies by passing installation paths.
-ATTR_INSTALL_STAGING_OPTS = \
-	prefix=$(STAGING_DIR)/usr \
-	exec_prefix=$(STAGING_DIR)/usr \
-	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
-	install-dev install-lib
+ATTR_INSTALL_STAGING = YES
 
-ATTR_INSTALL_TARGET_OPTS = \
-	prefix=$(TARGET_DIR)/usr \
-	exec_prefix=$(TARGET_DIR)/usr \
-	install install-lib
+# Straight out of the git tree
+ATTR_AUTORECONF = YES
+ATTR_GETTEXTIZE = YES
 
-HOST_ATTR_INSTALL_OPTS = \
-	prefix=$(HOST_DIR) \
-	exec_prefix=$(HOST_DIR) \
-	install-dev install-lib
-
-# The libdir variable in libattr.la is empty, so let's fix it. This is
-# probably due to attr not using automake, and not doing fully the
-# right thing with libtool.
-define ATTR_FIX_LIBTOOL_LA_LIBDIR
-	$(SED) "s,libdir=.*,libdir='$(STAGING_DIR)'," \
-		$(STAGING_DIR)/usr/lib/libattr.la
+define ATTR_GETTEXT
+	cd $(@D) && ./po/update-potfiles
+	cd $(@D) && $(HOST_DIR)/bin/autopoint --force
 endef
-
-ATTR_POST_INSTALL_STAGING_HOOKS += ATTR_FIX_LIBTOOL_LA_LIBDIR
+ATTR_PRE_CONFIGURE_HOOKS += ATTR_GETTEXT
+HOST_ATTR_PRE_CONFIGURE_HOOKS += ATTR_GETTEXT
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2018-05-07 20:59 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-07 18:25 [Buildroot] [PATCH 0/5] package: bump attr and acl, fix builds of dependees Yann E. MORIN
2018-05-07 18:25 ` [Buildroot] [PATCH 1/5] package/lua-flu: fix to use system xattr header Yann E. MORIN
2018-05-07 19:22   ` Thomas Petazzoni
2018-05-07 20:29     ` Yann E. MORIN
2018-05-07 20:51       ` Thomas Petazzoni
2018-05-07 20:43     ` Yann E. MORIN
2018-05-07 18:25 ` [Buildroot] [PATCH 2/5] package/stress-ng: bump version, " Yann E. MORIN
2018-05-07 19:23   ` Thomas Petazzoni
2018-05-07 20:32     ` Yann E. MORIN
2018-05-07 18:25 ` [Buildroot] [PATCH 3/5] package/xorriso: " Yann E. MORIN
2018-05-07 20:59   ` Yann E. MORIN
2018-05-07 18:25 ` [Buildroot] [PATCH 4/5] package/acl: bump version Yann E. MORIN
2018-05-07 18:25 ` [Buildroot] [PATCH 5/5] package/attr: " Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox