[ptxdist] [PATCH 01/22] coreutils: version bump 8.27 -> 8.29

[ptxdist] [PATCH 01/22] coreutils: version bump 8.27 -> 8.29

[Clemens Gruber]

List of changes:
http://lists.gnu.org/archive/html/info-gnu/2017-12/msg00016.html
http://lists.gnu.org/archive/html/info-gnu/2017-09/msg00001.html

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/coreutils.make | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rules/coreutils.make b/rules/coreutils.make
index a49f118a8..32601ad67 100644
--- a/rules/coreutils.make
+++ b/rules/coreutils.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_COREUTILS) += coreutils
 #
 # Paths and names
 #
-COREUTILS_VERSION	:= 8.27
-COREUTILS_MD5		:= 502795792c212932365e077946d353ae
+COREUTILS_VERSION	:= 8.29
+COREUTILS_MD5		:= 960cfe75a42c9907c71439f8eb436303
 COREUTILS		:= coreutils-$(COREUTILS_VERSION)
 COREUTILS_SUFFIX	:= tar.xz
 COREUTILS_URL		:= $(call ptx/mirror, GNU, coreutils/$(COREUTILS).$(COREUTILS_SUFFIX))
@@ -169,10 +169,14 @@ COREUTILS_CONF_OPT	:= \
 	--disable-libsmack \
 	--disable-xattr \
 	--disable-libcap \
+	--disable-gcc-warnings \
+	--disable-single-binary \
+	--disable-single-binary-exceptions \
 	--enable-no-install-program=$(subst $(space),$(comma),$(strip $(COREUTILS_INST-))) \
 	--disable-nls \
 	--without-openssl \
 	--$(call ptx/wwo, PTXCONF_GLOBAL_SELINUX)-selinux \
+	--with-tty-group=tty \
 	--without-gmp
 
 COREUTILS_MAKE_OPT	:= \
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 02/22] cryptsetup: version bump 1.7.5 -> 2.0.0

[Clemens Gruber]

Now includes support for dm-integrity via new integritysetup tool.
---
 rules/cryptsetup.in   | 10 +++++++++-
 rules/cryptsetup.make | 28 +++++++++++++++++++---------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/rules/cryptsetup.in b/rules/cryptsetup.in
index 2cd898058..67ce41beb 100644
--- a/rules/cryptsetup.in
+++ b/rules/cryptsetup.in
@@ -1,6 +1,7 @@
 ## SECTION=disk_and_file
 
 menuconfig CRYPTSETUP
+	select JSON_C
 	select LVM2
 	select LIBUUID
 	select LIBPOPT
@@ -11,7 +12,10 @@ menuconfig CRYPTSETUP
 	prompt "cryptsetup                    "
 	help
 	  Cryptsetup is a utility used to conveniently setup disk encryption
-	  based on DMCrypt kernel module.
+	  based on the dm-crypt kernel module.
+	  It also includes veritysetup, used to setup dm-verity block integrity
+	  checking of read-only targets, as well as integritysetup to setup
+	  dm-integrity block integrity checking of read-write targets.
 
 if CRYPTSETUP
 
@@ -42,6 +46,10 @@ config CRYPTSETUP_CRYPTSETUP
 	bool
 	prompt "install cryptsetup"
 
+config CRYPTSETUP_INTEGRITYSETUP
+	bool
+	prompt "install integritysetup"
+
 config CRYPTSETUP_VERITYSETUP
 	bool
 	prompt "install veritysetup"
diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make
index 9975e72f3..bb865aa9a 100644
--- a/rules/cryptsetup.make
+++ b/rules/cryptsetup.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_CRYPTSETUP) += cryptsetup
 #
 # Paths and names
 #
-CRYPTSETUP_VERSION	:= 1.7.5
-CRYPTSETUP_MD5		:= dde798a883b06a2903379dcd593480e1
+CRYPTSETUP_VERSION	:= 2.0.0
+CRYPTSETUP_MD5		:= 0f44b7535b2cdabbf0c4adf523fbceeb
 CRYPTSETUP		:= cryptsetup-$(CRYPTSETUP_VERSION)
 CRYPTSETUP_SUFFIX	:= tar.gz
-CRYPTSETUP_URL		:= https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7//$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
+CRYPTSETUP_URL		:= https://www.kernel.org/pub/linux/utils/cryptsetup/v$(basename $(CRYPTSETUP_VERSION))/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
 CRYPTSETUP_SOURCE	:= $(SRCDIR)/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
 CRYPTSETUP_DIR		:= $(BUILDDIR)/$(CRYPTSETUP)
 CRYPTSETUP_LICENSE	:= GPL-2.0+
@@ -35,20 +35,27 @@ CRYPTSETUP_LICENSE	:= GPL-2.0+
 CRYPTSETUP_CONF_TOOL	:= autoconf
 CRYPTSETUP_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--enable-keyring \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-nls \
 	--disable-rpath \
+	--disable-fips \
 	--disable-pwquality \
 	--disable-static-cryptsetup \
-	--enable-veritysetup \
-	--enable-cryptsetup-reencrypt \
+	--$(call ptx/endis, PTXCONF_CRYPTSETUP_CRYPTSETUP)-cryptsetup \
+	--$(call ptx/endis, PTXCONF_CRYPTSETUP_VERITYSETUP)-veritysetup \
+	--$(call ptx/endis, PTXCONF_CRYPTSETUP_CRYPTSETUP)-cryptsetup-reencrypt \
+	--$(call ptx/endis, PTXCONF_CRYPTSETUP_INTEGRITYSETUP)-integritysetup \
 	--disable-selinux \
 	--enable-udev \
 	--$(call ptx/endis, PTXCONF_CRYPTSETUP_CRYPT_BACKEND_KERNEL)-kernel_crypto \
 	--$(call ptx/endis, PTXCONF_CRYPTSETUP_CRYPT_BACKEND_GCRYPT)-gcrypt-pbkdf2 \
+	--enable-internal-argon2 \
+	--disable-libargon2 \
 	--enable-dev-random \
 	--disable-python \
-	--with-crypto_backend=$(PTXCONF_CRYPTSETUP_CRYPT_BACKEND)
+	--with-crypto_backend=$(PTXCONF_CRYPTSETUP_CRYPT_BACKEND) \
+	--with-luks2-lock-path=/run/cryptsetup
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -65,12 +72,15 @@ $(STATEDIR)/cryptsetup.targetinstall:
 
 	@$(call install_lib, cryptsetup, 0, 0, 0644, libcryptsetup)
 
-ifdef PTXCONF_CRYPTSETUP_VERITYSETUP
-	@$(call install_copy, cryptsetup, 0, 0, 0755, -, /usr/sbin/veritysetup)
-endif
 ifdef PTXCONF_CRYPTSETUP_CRYPTSETUP
 	@$(call install_copy, cryptsetup, 0, 0, 0755, -, /usr/sbin/cryptsetup)
 endif
+ifdef PTXCONF_CRYPTSETUP_INTEGRITYSETUP
+	@$(call install_copy, cryptsetup, 0, 0, 0755, -, /usr/sbin/integritysetup)
+endif
+ifdef PTXCONF_CRYPTSETUP_VERITYSETUP
+	@$(call install_copy, cryptsetup, 0, 0, 0755, -, /usr/sbin/veritysetup)
+endif
 
 	@$(call install_finish, cryptsetup)
 
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 03/22] dbus: version bump 1.10.24 -> 1.12.2

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/dbus.make | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/rules/dbus.make b/rules/dbus.make
index bbf602625..1ba7ad3d2 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus
 #
 # Paths and names
 #
-DBUS_VERSION	:= 1.10.24
-DBUS_MD5	:= d548ae16f9a3268fe4650ccc86a3f06f
+DBUS_VERSION	:= 1.12.2
+DBUS_MD5	:= 3361456cadb99aa6601bed5b48964254
 DBUS		:= dbus-$(DBUS_VERSION)
 DBUS_SUFFIX	:= tar.gz
 DBUS_URL	:= http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
@@ -38,11 +38,10 @@ DBUS_CONF_TOOL	:= autoconf
 DBUS_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--enable-silent-rules \
+	--disable-developer \
+	--disable-debug \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-static \
-	--disable-compiler-coverage \
-	--enable-compiler-optimisations \
-	--disable-developer \
 	--disable-ansi \
 	--disable-verbose-mode \
 	--disable-asserts \
@@ -50,7 +49,6 @@ DBUS_CONF_OPT	:= \
 	--disable-xml-docs \
 	--disable-doxygen-docs \
 	--disable-ducktype-docs \
-	--enable-abstract-sockets=yes \
 	--$(call ptx/endis, PTXCONF_DBUS_SELINUX)-selinux \
 	--disable-apparmor \
 	--disable-libaudit \
@@ -63,9 +61,12 @@ DBUS_CONF_OPT	:= \
 	--disable-modular-tests \
 	--disable-tests \
 	--disable-installed-tests \
+	--disable-code-coverage \
 	--enable-epoll \
 	--$(call ptx/endis, PTXCONF_DBUS_X)-x11-autolaunch \
+	--disable-compile-warnings \
 	--disable-Werror \
+	--disable-relocation \
 	--disable-stats \
 	--$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-user-session \
 	--with-dbus-user=messagebus \
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 03/22] dbus: version bump 1.10.24 -> 1.12.2

[Michael Olbrich]

On Tue, Jan 16, 2018 at 04:50:21PM +0100, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

You need to update host-dbus as well:

[...]
-------------------------
target: host-dbus.prepare
-------------------------

configure: error: unrecognized options: --disable-compiler-coverage, --enable-abstract-sockets
[...]

Michael

> ---
>  rules/dbus.make | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/rules/dbus.make b/rules/dbus.make
> index bbf602625..1ba7ad3d2 100644
> --- a/rules/dbus.make
> +++ b/rules/dbus.make
> @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus
>  #
>  # Paths and names
>  #
> -DBUS_VERSION	:= 1.10.24
> -DBUS_MD5	:= d548ae16f9a3268fe4650ccc86a3f06f
> +DBUS_VERSION	:= 1.12.2
> +DBUS_MD5	:= 3361456cadb99aa6601bed5b48964254
>  DBUS		:= dbus-$(DBUS_VERSION)
>  DBUS_SUFFIX	:= tar.gz
>  DBUS_URL	:= http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
> @@ -38,11 +38,10 @@ DBUS_CONF_TOOL	:= autoconf
>  DBUS_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--enable-silent-rules \
> +	--disable-developer \
> +	--disable-debug \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--disable-static \
> -	--disable-compiler-coverage \
> -	--enable-compiler-optimisations \
> -	--disable-developer \
>  	--disable-ansi \
>  	--disable-verbose-mode \
>  	--disable-asserts \
> @@ -50,7 +49,6 @@ DBUS_CONF_OPT	:= \
>  	--disable-xml-docs \
>  	--disable-doxygen-docs \
>  	--disable-ducktype-docs \
> -	--enable-abstract-sockets=yes \
>  	--$(call ptx/endis, PTXCONF_DBUS_SELINUX)-selinux \
>  	--disable-apparmor \
>  	--disable-libaudit \
> @@ -63,9 +61,12 @@ DBUS_CONF_OPT	:= \
>  	--disable-modular-tests \
>  	--disable-tests \
>  	--disable-installed-tests \
> +	--disable-code-coverage \
>  	--enable-epoll \
>  	--$(call ptx/endis, PTXCONF_DBUS_X)-x11-autolaunch \
> +	--disable-compile-warnings \
>  	--disable-Werror \
> +	--disable-relocation \
>  	--disable-stats \
>  	--$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-user-session \
>  	--with-dbus-user=messagebus \
> -- 
> 2.15.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 04/22] dbus: add upstream patches for OOM conditions

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...r_new_for_socket-Invalidate-watches-durin.patch |  28 +++++
 ...r_new_for_socket-Properly-disconnect-duri.patch | 124 +++++++++++++++++++++
 ...n_tcp_socket-Don-t-rely-on-dbus_realloc-s.patch |  37 ++++++
 ...r_new_for_socket-Iterate-over-arrays-as-i.patch |  54 +++++++++
 patches/dbus-1.12.2/series                         |   7 ++
 5 files changed, 250 insertions(+)
 create mode 100644 patches/dbus-1.12.2/0001-_dbus_server_new_for_socket-Invalidate-watches-durin.patch
 create mode 100644 patches/dbus-1.12.2/0002-_dbus_server_new_for_socket-Properly-disconnect-duri.patch
 create mode 100644 patches/dbus-1.12.2/0003-_dbus_listen_tcp_socket-Don-t-rely-on-dbus_realloc-s.patch
 create mode 100644 patches/dbus-1.12.2/0004-_dbus_server_new_for_socket-Iterate-over-arrays-as-i.patch
 create mode 100644 patches/dbus-1.12.2/series

diff --git a/patches/dbus-1.12.2/0001-_dbus_server_new_for_socket-Invalidate-watches-durin.patch b/patches/dbus-1.12.2/0001-_dbus_server_new_for_socket-Invalidate-watches-durin.patch
new file mode 100644
index 000000000..0a024be7f
--- /dev/null
+++ b/patches/dbus-1.12.2/0001-_dbus_server_new_for_socket-Invalidate-watches-durin.patch
@@ -0,0 +1,28 @@
+From: Simon McVittie <smcv@collabora.com>
+Date: Tue, 21 Nov 2017 14:36:02 +0000
+Subject: [PATCH] _dbus_server_new_for_socket: Invalidate watches during error
+ unwinding
+
+We assert that every watch is invalidated before it is freed, but
+in some OOM code paths this didn't happen.
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+Reviewed-by: Philip Withnall <withnall@endlessm.com>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
+(cherry picked from commit 1ce34beef85a7a0b3c25890837e3a72f8bdac1f0)
+---
+ dbus/dbus-server-socket.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
+index d716f500234d..61e143ba9e43 100644
+--- a/dbus/dbus-server-socket.c
++++ b/dbus/dbus-server-socket.c
+@@ -358,6 +358,7 @@ _dbus_server_new_for_socket (DBusSocket       *fds,
+     {
+       if (socket_server->watch[i] != NULL)
+         {
++          _dbus_watch_invalidate (socket_server->watch[i]);
+           _dbus_watch_unref (socket_server->watch[i]);
+           socket_server->watch[i] = NULL;
+         }
diff --git a/patches/dbus-1.12.2/0002-_dbus_server_new_for_socket-Properly-disconnect-duri.patch b/patches/dbus-1.12.2/0002-_dbus_server_new_for_socket-Properly-disconnect-duri.patch
new file mode 100644
index 000000000..e01e12786
--- /dev/null
+++ b/patches/dbus-1.12.2/0002-_dbus_server_new_for_socket-Properly-disconnect-duri.patch
@@ -0,0 +1,124 @@
+From: Simon McVittie <smcv@collabora.com>
+Date: Tue, 21 Nov 2017 14:38:13 +0000
+Subject: [PATCH] _dbus_server_new_for_socket: Properly disconnect during error
+ unwinding
+
+_dbus_server_finalize_base() asserts that the socket has been
+disconnected, but in some OOM code paths we would call it without
+officially disconnecting. Do so.
+
+This means we need to be a bit more careful about what is
+socket_disconnect()'s responsibility to clean up, what is
+_dbus_server_new_for_socket()'s responsibility, and what is the caller's
+responsibility.
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+Reviewed-by: Philip Withnall <withnall@endlessm.com>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
+(cherry picked from commit 0c03b505a9718c6d497caffb7d6083371679a852)
+---
+ dbus/dbus-server-protected.h |  1 +
+ dbus/dbus-server-socket.c    | 27 ++++++++++++++++++++++-----
+ dbus/dbus-server.c           | 24 +++++++++++++++---------
+ 3 files changed, 38 insertions(+), 14 deletions(-)
+
+diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h
+index f613bf34e0d8..5664b2b4e150 100644
+--- a/dbus/dbus-server-protected.h
++++ b/dbus/dbus-server-protected.h
+@@ -96,6 +96,7 @@ dbus_bool_t _dbus_server_init_base      (DBusServer             *server,
+                                          const DBusString       *address,
+                                          DBusError              *error);
+ void        _dbus_server_finalize_base  (DBusServer             *server);
++void        _dbus_server_disconnect_unlocked (DBusServer        *server);
+ dbus_bool_t _dbus_server_add_watch      (DBusServer             *server,
+                                          DBusWatch              *watch);
+ void        _dbus_server_remove_watch   (DBusServer             *server,
+diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
+index 61e143ba9e43..42d71450b051 100644
+--- a/dbus/dbus-server-socket.c
++++ b/dbus/dbus-server-socket.c
+@@ -243,8 +243,11 @@ socket_disconnect (DBusServer *server)
+           socket_server->watch[i] = NULL;
+         }
+ 
+-      _dbus_close_socket (socket_server->fds[i], NULL);
+-      _dbus_socket_invalidate (&socket_server->fds[i]);
++      if (_dbus_socket_is_valid (socket_server->fds[i]))
++        {
++          _dbus_close_socket (socket_server->fds[i], NULL);
++          _dbus_socket_invalidate (&socket_server->fds[i]);
++        }
+     }
+ 
+   if (socket_server->socket_name != NULL)
+@@ -338,10 +341,24 @@ _dbus_server_new_for_socket (DBusSocket       *fds,
+                                    socket_server->watch[i]))
+         {
+           int j;
+-          for (j = 0 ; j < i ; j++)
+-            _dbus_server_remove_watch (server,
+-                                       socket_server->watch[j]);
+ 
++          /* The caller is still responsible for closing the fds until
++           * we return successfully, so don't let socket_disconnect()
++           * close them */
++          for (j = 0; j < n_fds; j++)
++            _dbus_socket_invalidate (&socket_server->fds[i]);
++
++          /* socket_disconnect() will try to remove all the watches;
++           * make sure it doesn't see the ones that weren't even added
++           * yet */
++          for (j = i; j < n_fds; j++)
++            {
++              _dbus_watch_invalidate (socket_server->watch[i]);
++              _dbus_watch_unref (socket_server->watch[i]);
++              socket_server->watch[i] = NULL;
++            }
++
++          _dbus_server_disconnect_unlocked (server);
+           SERVER_UNLOCK (server);
+           _dbus_server_finalize_base (&socket_server->base);
+           goto failed_2;
+diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c
+index ea9aff2dbe45..d91df8325cd7 100644
+--- a/dbus/dbus-server.c
++++ b/dbus/dbus-server.c
+@@ -764,6 +764,20 @@ dbus_server_unref (DBusServer *server)
+     }
+ }
+ 
++void
++_dbus_server_disconnect_unlocked (DBusServer *server)
++{
++  _dbus_assert (server->vtable->disconnect != NULL);
++
++  if (!server->disconnected)
++    {
++      /* this has to be first so recursive calls to disconnect don't happen */
++      server->disconnected = TRUE;
++
++      (* server->vtable->disconnect) (server);
++    }
++}
++
+ /**
+  * Releases the server's address and stops listening for
+  * new clients. If called more than once, only the first
+@@ -780,15 +794,7 @@ dbus_server_disconnect (DBusServer *server)
+   dbus_server_ref (server);
+   SERVER_LOCK (server);
+ 
+-  _dbus_assert (server->vtable->disconnect != NULL);
+-
+-  if (!server->disconnected)
+-    {
+-      /* this has to be first so recursive calls to disconnect don't happen */
+-      server->disconnected = TRUE;
+-      
+-      (* server->vtable->disconnect) (server);
+-    }
++  _dbus_server_disconnect_unlocked (server);
+ 
+   SERVER_UNLOCK (server);
+   dbus_server_unref (server);
diff --git a/patches/dbus-1.12.2/0003-_dbus_listen_tcp_socket-Don-t-rely-on-dbus_realloc-s.patch b/patches/dbus-1.12.2/0003-_dbus_listen_tcp_socket-Don-t-rely-on-dbus_realloc-s.patch
new file mode 100644
index 000000000..d3c637d56
--- /dev/null
+++ b/patches/dbus-1.12.2/0003-_dbus_listen_tcp_socket-Don-t-rely-on-dbus_realloc-s.patch
@@ -0,0 +1,37 @@
+From: Simon McVittie <smcv@collabora.com>
+Date: Tue, 21 Nov 2017 14:43:01 +0000
+Subject: [PATCH] _dbus_listen_tcp_socket: Don't rely on dbus_realloc setting
+ errno
+
+dbus_realloc() doesn't guarantee to set errno (if it did, the
+only reasonable thing it could set it to would be ENOMEM). In
+particular, faking OOM conditions doesn't set it. This can cause an
+assertion failure when OOM tests assert that the only error that can
+validly occur is DBUS_ERROR_NO_MEMORY.
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+Reviewed-by: Philip Withnall <withnall@endlessm.com>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
+(cherry picked from commit 9ded6907e66b89c3c74620a4485e8f752f092a60)
+---
+ dbus/dbus-sysdeps-unix.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
+index bebf2073b680..b0ba89919dab 100644
+--- a/dbus/dbus-sysdeps-unix.c
++++ b/dbus/dbus-sysdeps-unix.c
+@@ -1576,11 +1576,9 @@ _dbus_listen_tcp_socket (const char     *host,
+       newlisten_fd = dbus_realloc(listen_fd, sizeof(DBusSocket)*(nlisten_fd+1));
+       if (!newlisten_fd)
+         {
+-          saved_errno = errno;
+           _dbus_close (fd, NULL);
+-          dbus_set_error (error, _dbus_error_from_errno (saved_errno),
+-                          "Failed to allocate file handle array: %s",
+-                          _dbus_strerror (saved_errno));
++          dbus_set_error (error, DBUS_ERROR_NO_MEMORY,
++                          "Failed to allocate file handle array");
+           goto failed;
+         }
+       listen_fd = newlisten_fd;
diff --git a/patches/dbus-1.12.2/0004-_dbus_server_new_for_socket-Iterate-over-arrays-as-i.patch b/patches/dbus-1.12.2/0004-_dbus_server_new_for_socket-Iterate-over-arrays-as-i.patch
new file mode 100644
index 000000000..eb0270aa0
--- /dev/null
+++ b/patches/dbus-1.12.2/0004-_dbus_server_new_for_socket-Iterate-over-arrays-as-i.patch
@@ -0,0 +1,54 @@
+From: Simon McVittie <smcv@collabora.com>
+Date: Mon, 27 Nov 2017 16:23:16 +0000
+Subject: [PATCH] _dbus_server_new_for_socket: Iterate over arrays as intended
+
+Commit 0c03b505 was meant to clear all the fds indexed by j in
+[0, n_fds), which socket_disconnect() can't be allowed to close
+(because on failure the caller remains responsible for closing them);
+but instead it closed the one we failed to add to the main loop
+(fd i), repeatedly.
+
+Similarly, it was meant to invalidate all the watches indexed by j
+in [i, n_fds) (the one we failed to add to the main loop and the ones
+we didn't try to add to the main loop yet), which socket_disconnect()
+can't be allowed to see (because it would fail to remove them from
+the main loop and hit an assertion failure); but instead it invalidated
+fd i, repeatedly.
+
+These happen to be the same thing if you only have one fd, resulting
+in the test-case passing on an IPv4-only system, but failing on a
+system with both IPv4 and IPv6.
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+Reviewed-by: Philip Withnall <withnall@endlessm.com>
+(cherry picked from commit c9aa00ce730f9741ab39ff704e46ec33dd4a11ea)
+---
+ dbus/dbus-server-socket.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
+index 42d71450b051..6a93091a2291 100644
+--- a/dbus/dbus-server-socket.c
++++ b/dbus/dbus-server-socket.c
+@@ -346,16 +346,16 @@ _dbus_server_new_for_socket (DBusSocket       *fds,
+            * we return successfully, so don't let socket_disconnect()
+            * close them */
+           for (j = 0; j < n_fds; j++)
+-            _dbus_socket_invalidate (&socket_server->fds[i]);
++            _dbus_socket_invalidate (&socket_server->fds[j]);
+ 
+           /* socket_disconnect() will try to remove all the watches;
+            * make sure it doesn't see the ones that weren't even added
+            * yet */
+           for (j = i; j < n_fds; j++)
+             {
+-              _dbus_watch_invalidate (socket_server->watch[i]);
+-              _dbus_watch_unref (socket_server->watch[i]);
+-              socket_server->watch[i] = NULL;
++              _dbus_watch_invalidate (socket_server->watch[j]);
++              _dbus_watch_unref (socket_server->watch[j]);
++              socket_server->watch[j] = NULL;
+             }
+ 
+           _dbus_server_disconnect_unlocked (server);
diff --git a/patches/dbus-1.12.2/series b/patches/dbus-1.12.2/series
new file mode 100644
index 000000000..ddb681448
--- /dev/null
+++ b/patches/dbus-1.12.2/series
@@ -0,0 +1,7 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-_dbus_server_new_for_socket-Invalidate-watches-durin.patch
+0002-_dbus_server_new_for_socket-Properly-disconnect-duri.patch
+0003-_dbus_listen_tcp_socket-Don-t-rely-on-dbus_realloc-s.patch
+0004-_dbus_server_new_for_socket-Iterate-over-arrays-as-i.patch
+# 25ab7f66637a3a950cd047d33df3f9e5  - git-ptx-patches magic
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 05/22] e2fsprogs: version bump 1.43.6 -> 1.43.8

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/e2fsprogs.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index a6c7fb8a5..f2fcc1a78 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
 #
 # Paths and names
 #
-E2FSPROGS_VERSION	:= 1.43.6
-E2FSPROGS_MD5		:= 94fb7105284474a71cf5dd0e03b92661
+E2FSPROGS_VERSION	:= 1.43.8
+E2FSPROGS_MD5		:= af4f9aeba1a3b875c2ef1c58e995578d
 E2FSPROGS		:= e2fsprogs-$(E2FSPROGS_VERSION)
 E2FSPROGS_SUFFIX	:= tar.gz
 E2FSPROGS_URL		:= $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 06/22] expat: version bump 2.2.4 -> 2.2.5

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/expat.make | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rules/expat.make b/rules/expat.make
index efd226bb3..c8c967ffc 100644
--- a/rules/expat.make
+++ b/rules/expat.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_EXPAT) += expat
 #
 # Paths and names
 #
-EXPAT_VERSION	:= 2.2.4
-EXPAT_MD5	:= 6e3980aba29a224a9f478d88ac7ec207
+EXPAT_VERSION	:= 2.2.5
+EXPAT_MD5	:= 789e297f547980fc9ecc036f9a070d49
 EXPAT		:= expat-$(EXPAT_VERSION)
 EXPAT_SUFFIX	:= tar.bz2
 EXPAT_URL	:= $(call ptx/mirror, SF, expat/$(EXPAT).$(EXPAT_SUFFIX))
@@ -40,7 +40,8 @@ EXPAT_CONF_OPT	:= \
 	--disable-static \
 	--enable-xml-context \
 	--without-xmlwf \
-	--without-libbsd
+	--without-libbsd \
+	--without-docbook
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 07/22] file: version bump 5.30 -> 5.32

[Clemens Gruber]

Fixes CVE-2017-1000249
Details: http://www.openwall.com/lists/oss-security/2017/09/05/3

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/file.make | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rules/file.make b/rules/file.make
index 44cf09607..32ff63f2d 100644
--- a/rules/file.make
+++ b/rules/file.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_FILE) += file
 #
 # Paths and names
 #
-FILE_VERSION	:= 5.30
-FILE_MD5	:= f35eaf05489ae566eafc4d26bb1dcd90
+FILE_VERSION	:= 5.32
+FILE_MD5	:= 4f2503752ff041895090ed6435610435
 FILE		:= file-$(FILE_VERSION)
 FILE_SUFFIX	:= tar.gz
 FILE_URL	:= ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
@@ -38,7 +38,8 @@ FILE_CONF_OPT	:= \
 	--enable-elf-core \
 	--enable-zlib \
 	--disable-fsect-man5 \
-	$(GLOBAL_LARGE_FILE_OPTION)
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--disable-warnings
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 08/22] host-meson: version bump 0.43.0 -> 0.44.0

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/host-meson.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/host-meson.make b/rules/host-meson.make
index f195f985d..d09bdc03f 100644
--- a/rules/host-meson.make
+++ b/rules/host-meson.make
@@ -16,8 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
 #
 # Paths and names
 #
-HOST_MESON_VERSION	:= 0.43.0
-HOST_MESON_MD5		:= fe05d655bdfdd1899db81e97023d2311
+HOST_MESON_VERSION	:= 0.44.0
+HOST_MESON_MD5		:= 0485860724787eb4cccbdc450b6ddda0
 HOST_MESON		:= meson-$(HOST_MESON_VERSION)
 HOST_MESON_SUFFIX	:= tar.gz
 HOST_MESON_URL		:= https://github.com/mesonbuild/meson/archive/$(HOST_MESON_VERSION).$(HOST_MESON_SUFFIX)
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 09/22] iproute2: version bump 4.13 -> 4.14.1

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/iproute2.make | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/rules/iproute2.make b/rules/iproute2.make
index 721a9e346..b573b5efe 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
 #
 # Paths and names
 #
-IPROUTE2_VERSION	:= 4.13.0
-IPROUTE2_MD5		:= 69dc9e3ece3296890278f0de478330c8
+IPROUTE2_VERSION	:= 4.14.1
+IPROUTE2_MD5		:= 1075423d7029e02a8f23ed4f42b7e372
 IPROUTE2		:= iproute2-$(IPROUTE2_VERSION)
 IPROUTE2_SUFFIX		:= tar.xz
 IPROUTE2_URL		:= $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
@@ -37,15 +37,15 @@ $(STATEDIR)/iproute2.prepare:
 	@$(call targetinfo)
 	@$(call world/prepare, IPROUTE2)
 # overwrite options we don't want, or may be misdetected
-	@echo 'TC_CONFIG_ATM:=n'	>> $(IPROUTE2_DIR)/Config
-	@echo 'TC_CONFIG_NO_XT:=y'	>> $(IPROUTE2_DIR)/Config
-	@echo 'HAVE_ELF:=n'		>> $(IPROUTE2_DIR)/Config
+	@echo 'TC_CONFIG_ATM:=n'	>> $(IPROUTE2_DIR)/config.mk
+	@echo 'TC_CONFIG_NO_XT:=y'	>> $(IPROUTE2_DIR)/config.mk
+	@echo 'HAVE_ELF:=n'		>> $(IPROUTE2_DIR)/config.mk
 ifndef PTXCONF_GLOBAL_SELINUX
-	@echo 'HAVE_SELINUX:=n'		>> $(IPROUTE2_DIR)/Config
+	@echo 'HAVE_SELINUX:=n'		>> $(IPROUTE2_DIR)/config.mk
 endif
-	@echo 'HAVE_MNL:=n'		>> $(IPROUTE2_DIR)/Config
+	@echo 'HAVE_MNL:=n'		>> $(IPROUTE2_DIR)/config.mk
 ifndef PTXCONF_IPROUTE2_ARPD
-	@echo 'HAVE_BERKELEY_DB:=n'	>> $(IPROUTE2_DIR)/Config
+	@echo 'HAVE_BERKELEY_DB:=n'	>> $(IPROUTE2_DIR)/config.mk
 endif
 	@$(call touch)
 
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 10/22] json-c: version bump 0.12.1 -> 0.13

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/json-c.make | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rules/json-c.make b/rules/json-c.make
index 3c37a8706..0b7fe4626 100644
--- a/rules/json-c.make
+++ b/rules/json-c.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_JSON_C) += json-c
 #
 # Paths and names
 #
-JSON_C_VERSION		:= 0.12.1-20160607
-JSON_C_MD5		:= 0a2a49a1e89044fdac414f984f3f81a6
+JSON_C_VERSION		:= 0.13-20171207
+JSON_C_MD5		:= 0cd2cca9bd869eacf3595ad3484135be
 JSON_C			:= json-c-$(JSON_C_VERSION)
 JSON_C_SUFFIX		:= tar.gz
 JSON_C_URL		:= https://github.com/json-c/json-c/archive/$(JSON_C).$(JSON_C_SUFFIX)
@@ -39,6 +39,8 @@ JSON_C_CONF_ENV		:= \
 JSON_C_CONF_TOOL	:= autoconf
 JSON_C_CONF_OPT		:= \
 	$(CROSS_AUTOCONF_USR) \
+	--disable-threading \
+	--disable-rdrand \
 	--disable-static
 
 # ----------------------------------------------------------------------------
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 11/22] kexec-tools: version bump 2.0.14 -> 2.0.16

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/kexec-tools.make | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make
index a915821a4..1808f09fe 100644
--- a/rules/kexec-tools.make
+++ b/rules/kexec-tools.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_KEXEC_TOOLS) += kexec-tools
 #
 # Paths and names
 #
-KEXEC_TOOLS_VERSION	:= 2.0.14
-KEXEC_TOOLS_MD5		:= 4164abff8ed21e9f94d57f535c2f77bf
+KEXEC_TOOLS_VERSION	:= 2.0.16
+KEXEC_TOOLS_MD5		:= b6bd3e0cc59ae0206ef0197b76a1f0b9
 KEXEC_TOOLS		:= kexec-tools-$(KEXEC_TOOLS_VERSION)
 KEXEC_TOOLS_SUFFIX	:= tar.xz
 KEXEC_TOOLS_URL		:= $(call ptx/mirror, KERNEL, utils/kernel/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX))
@@ -42,8 +42,11 @@ endif
 #
 KEXEC_TOOLS_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	--without-gamecube \
 	--$(call ptx/wwo, PTXCONF_KEXEC_TOOLS_ZLIB)-zlib \
-	--$(call ptx/wwo, PTXCONF_KEXEC_TOOLS_XEN)-xen
+	--without-lzma \
+	--$(call ptx/wwo, PTXCONF_KEXEC_TOOLS_XEN)-xen \
+	--without-booke
 	
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 12/22] libsodium: version bump 1.0.11 -> 1.0.16

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/libsodium.in   |  1 +
 rules/libsodium.make | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/rules/libsodium.in b/rules/libsodium.in
index e621a1bb9..cfdd4fc3a 100644
--- a/rules/libsodium.in
+++ b/rules/libsodium.in
@@ -2,6 +2,7 @@
 
 config LIBSODIUM
 	bool
+	select LIBC_PTHREAD
 	prompt "libsodium"
 	help
 	  Sodium is a new, easy-to-use software library for encryption,
diff --git a/rules/libsodium.make b/rules/libsodium.make
index d8036d743..be91fec90 100644
--- a/rules/libsodium.make
+++ b/rules/libsodium.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBSODIUM) += libsodium
 #
 # Paths and names
 #
-LIBSODIUM_VERSION	:= 1.0.11
-LIBSODIUM_MD5		:= b58928d035064b2a46fb564937b83540
+LIBSODIUM_VERSION	:= 1.0.16
+LIBSODIUM_MD5		:= 37b18839e57e7a62834231395c8e962b
 LIBSODIUM		:= libsodium-$(LIBSODIUM_VERSION)
 LIBSODIUM_SUFFIX	:= tar.gz
 LIBSODIUM_URL		:= https://github.com/jedisct1/libsodium/releases/download/$(LIBSODIUM_VERSION)/$(LIBSODIUM).$(LIBSODIUM_SUFFIX)
@@ -35,7 +35,23 @@ LIBSODIUM_LICENSE	:= ISC
 LIBSODIUM_CONF_TOOL	:= autoconf
 LIBSODIUM_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--disable-static
+	--enable-ssp \
+	--$(call ptx/endis, PTXCONF_ARCH_X86)-asm \
+	--enable-pie \
+	--disable-blocking-random \
+	--disable-minimal \
+	--disable-debug \
+	--disable-opt \
+	--disable-valgrind \
+	--disable-valgrind-memcheck \
+	--disable-valgrind-helgrind \
+	--disable-valgrind-drd \
+	--disable-valgrind-sgcheck \
+	--enable-soname-versions \
+	--disable-static \
+	--with-pthreads \
+	--without-safecode \
+	--without-ctgrind
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -48,7 +64,7 @@ $(STATEDIR)/libsodium.targetinstall:
 	@$(call install_fixup, libsodium, PRIORITY, optional)
 	@$(call install_fixup, libsodium, SECTION, base)
 	@$(call install_fixup, libsodium, AUTHOR, "Clemens Gruber <clemens.gruber@pqgruber.com>")
-	@$(call install_fixup, libsodium, DESCRIPTION, missing)
+	@$(call install_fixup, libsodium, DESCRIPTION, "The sodium crypto library")
 
 	@$(call install_lib, libsodium, 0, 0, 0644, libsodium)
 
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 13/22] lvm2: version bump 2.02.66 -> 2.02.177

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/lvm2.in   | 11 +++++++++++
 rules/lvm2.make | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/rules/lvm2.in b/rules/lvm2.in
index db6e60c36..b53086d8b 100644
--- a/rules/lvm2.in
+++ b/rules/lvm2.in
@@ -14,11 +14,22 @@ menuconfig LVM2
 
 if LVM2
 
+config LVM2_LVM_TOOLS
+	bool
+	default y
+	prompt "install lvm tools"
+	help
+	  If disabled, only dmsetup and the dm-mapper library are installed.
+
+if LVM2_LVM_TOOLS
+
 config LVM2_STARTSCRIPT
 	bool
 	default y
         prompt "install /etc/init.d/lvm2"
 
+endif
+
 config LVM2_DEVICE_UID
 	int
 	default 0
diff --git a/rules/lvm2.make b/rules/lvm2.make
index dacdba767..26d5c6474 100644
--- a/rules/lvm2.make
+++ b/rules/lvm2.make
@@ -16,32 +16,66 @@ PACKAGES-$(PTXCONF_LVM2) += lvm2
 #
 # Paths and names
 #
-LVM2_VERSION	:= 2.02.66
-LVM2_MD5	:= 59766571610a4298f8bedf9f73839050
+LVM2_VERSION	:= 2.02.177
+LVM2_MD5	:= ee6cfbc5a0c5696ffae79dac04ee7a2b
 LVM2		:= LVM2.$(LVM2_VERSION)
 LVM2_SUFFIX	:= tgz
 LVM2_URL	:= \
-	ftp://sources.redhat.com/pub/lvm2/$(LVM2).$(LVM2_SUFFIX) \
+	ftp://sources.redhat.com/pub/lvm2/releases/$(LVM2).$(LVM2_SUFFIX) \
 	ftp://sources.redhat.com/pub/lvm2/old/$(LVM2).$(LVM2_SUFFIX)
 LVM2_SOURCE	:= $(SRCDIR)/$(LVM2).$(LVM2_SUFFIX)
 LVM2_DIR	:= $(BUILDDIR)/$(LVM2)
-LVM2_LICENSE	:= GPL-2.0
+LVM2_LICENSE	:= GPL-2.0, LGPL-2.1
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-LVM2_ENV := \
-	$(CROSS_ENV) \
-	CFLAGS="$(CROSS_CFLAGS) $(CROSS_CPPFLAGS)" \
-	ac_cv_path_MODPROBE_CMD="/sbin/modprobe"
-
 #
 # autoconf
 #
 LVM2_CONF_TOOL	:= autoconf
 LVM2_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
+	--disable-static_link \
+	--disable-lvm1_fallback \
+	--disable-thin_check_needs_check \
+	--disable-cache_check_needs_check \
+	--enable-readline \
+	--enable-realtime \
+	--disable-ocf \
+	--disable-cmirrord \
+	--disable-debug \
+	--disable-profiling \
+	--disable-testing \
+	--disable-valgrind-pool \
+	--enable-devmapper \
+	--disable-lvmetad \
+	--disable-lvmpolld \
+	--disable-lvmlockd-sanlock \
+	--disable-lvmlockd-dlm \
+	--disable-use-lvmlockd \
+	--disable-use-lvmetad \
+	--disable-use-lvmpolld \
+	--disable-dmfilemapd \
+	--disable-notify-dbus \
+	--disable-blkid_wiping \
+	--disable-compat \
+	--disable-units-compat \
+	--enable-ioctl \
+	--enable-o_direct \
+	--enable-applib \
+	--enable-cmdlib \
+	--disable-python_bindings \
+	--disable-python2_bindings \
+	--disable-python3_bindings \
+	--enable-pkgconfig \
+	--enable-write_install \
+	--enable-fsadm \
+	--enable-blkdeactivate \
+	--enable-dmeventd \
+	--disable-selinux \
+	--disable-nls \
 	--with-device-uid=$(PTXCONF_LVM2_DEVICE_UID) \
 	--with-device-gid=$(PTXCONF_LVM2_DEVICE_GID) \
 	--with-device-mode=$(PTXCONF_LVM2_DEVICE_MODE)
@@ -60,6 +94,8 @@ $(STATEDIR)/lvm2.targetinstall:
 	@$(call install_fixup, lvm2,DESCRIPTION,missing)
 
 	@$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/dmsetup)
+
+ifdef PTXCONF_LVM2_LVM_TOOLS
 	@$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/fsadm)
 	@$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/lvmdump)
 	@$(call install_copy, lvm2, 0, 0, 0755, -, /usr/sbin/vgimportclone)
@@ -107,10 +143,12 @@ $(STATEDIR)/lvm2.targetinstall:
 	@$(call install_link, lvm2, lvm, /usr/sbin/vgs)
 	@$(call install_link, lvm2, lvm, /usr/sbin/vgscan)
 	@$(call install_link, lvm2, lvm, /usr/sbin/vgsplit)
+endif
 
 	@$(call install_alternative, lvm2, 0, 0, 0644, /etc/lvm/lvm.conf)
 
 	@$(call install_lib, lvm2, 0, 0, 0644, libdevmapper)
+	@$(call install_lib, lvm2, 0, 0, 0644, libdevmapper-event)
 
 ifdef PTXCONF_LVM2_STARTSCRIPT
 	@$(call install_alternative, lvm2, 0, 0, 0755, /etc/init.d/lvm2)
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 14/22] mpg123: version bump 1.25.6 -> 1.25.8

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/mpg123.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/mpg123.make b/rules/mpg123.make
index f772f147d..391acdcbd 100644
--- a/rules/mpg123.make
+++ b/rules/mpg123.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MPG123) += mpg123
 #
 # Paths and names
 #
-MPG123_VERSION	:= 1.25.6
-MPG123_MD5	:= 43336bef78f67c2e66c4f6c288ca1eb3
+MPG123_VERSION	:= 1.25.8
+MPG123_MD5	:= 62ef1e417eb50f82bf241866d9e6e19b
 MPG123		:= mpg123-$(MPG123_VERSION)
 MPG123_SUFFIX	:= tar.bz2
 MPG123_URL	:= http://www.mpg123.org/download/$(MPG123).$(MPG123_SUFFIX)
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 15/22] nano: version bump 2.8.4 -> 2.9.2

[Clemens Gruber]

Also fix configure flags.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/nano.make | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rules/nano.make b/rules/nano.make
index c1f968bd6..78e305fc0 100644
--- a/rules/nano.make
+++ b/rules/nano.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NANO) += nano
 #
 # Paths and names
 #
-NANO_VERSION		:= 2.8.4
-NANO_MD5		:= e2a6bfc054d1f535b723f93eb73e5f77
+NANO_VERSION		:= 2.9.2
+NANO_MD5		:= 40ac792d28641969ce0be0a4a37df6a0
 NANO			:= nano-$(NANO_VERSION)
 NANO_SUFFIX		:= tar.gz
 NANO_URL		:= https://www.nano-editor.org/dist/v$(basename $(NANO_VERSION))/$(NANO).$(NANO_SUFFIX)
@@ -42,6 +42,7 @@ NANO_CONF_TOOL	:= autoconf
 NANO_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	$(GLOBAL_LARGE_FILE_OPTION) \
+	--enable-threads=posix \
 	--disable-rpath \
 	--disable-nls \
 	--disable-browser \
@@ -66,6 +67,7 @@ NANO_CONF_OPT	:= \
 	--disable-tiny \
 	--disable-utf8 \
 	--disable-altrcname \
+	--without-included-regex \
 	--without-slang \
 	--with-wordbounds
 
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 16/22] ninja: version bump 1.7.2 -> 1.8.2

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...001-Add-GNU-make-jobserver-client-support.patch | 26 ++++++++--------
 ...enPool-monitoring-to-SubprocessSet-DoWork.patch | 36 +++++++++++-----------
 patches/{ninja-1.7.2 => ninja-1.8.2}/series        |  0
 rules/host-ninja.make                              |  4 +--
 4 files changed, 33 insertions(+), 33 deletions(-)
 rename patches/{ninja-1.7.2 => ninja-1.8.2}/0001-Add-GNU-make-jobserver-client-support.patch (94%)
 rename patches/{ninja-1.7.2 => ninja-1.8.2}/0002-Add-TokenPool-monitoring-to-SubprocessSet-DoWork.patch (93%)
 rename patches/{ninja-1.7.2 => ninja-1.8.2}/series (100%)

diff --git a/patches/ninja-1.7.2/0001-Add-GNU-make-jobserver-client-support.patch b/patches/ninja-1.8.2/0001-Add-GNU-make-jobserver-client-support.patch
similarity index 94%
rename from patches/ninja-1.7.2/0001-Add-GNU-make-jobserver-client-support.patch
rename to patches/ninja-1.8.2/0001-Add-GNU-make-jobserver-client-support.patch
index dd6ccd83e..5c23e036e 100644
--- a/patches/ninja-1.7.2/0001-Add-GNU-make-jobserver-client-support.patch
+++ b/patches/ninja-1.8.2/0001-Add-GNU-make-jobserver-client-support.patch
@@ -31,10 +31,10 @@ Fixes https://github.com/ninja-build/ninja/issues/1139
  create mode 100644 src/tokenpool.h
 
 diff --git a/configure.py b/configure.py
-index 9ec368f364f3..2037121186b5 100755
+index a4437489426e..41d95469c00d 100755
 --- a/configure.py
 +++ b/configure.py
-@@ -494,6 +494,7 @@ for name in ['build',
+@@ -499,6 +499,7 @@ for name in ['build',
      objs += cxx(name)
  if platform.is_windows():
      for name in ['subprocess-win32',
@@ -42,7 +42,7 @@ index 9ec368f364f3..2037121186b5 100755
                   'includes_normalize-win32',
                   'msvc_helper-win32',
                   'msvc_helper_main-win32']:
-@@ -503,6 +504,7 @@ if platform.is_windows():
+@@ -508,6 +509,7 @@ if platform.is_windows():
      objs += cc('getopt')
  else:
      objs += cxx('subprocess-posix')
@@ -51,10 +51,10 @@ index 9ec368f364f3..2037121186b5 100755
      objs += cc('getopt')
  if platform.is_msvc():
 diff --git a/src/build.cc b/src/build.cc
-index 64710ddec0dd..c3dcc5899981 100644
+index 61ef0e849add..cc796ff838fa 100644
 --- a/src/build.cc
 +++ b/src/build.cc
-@@ -33,6 +33,7 @@
+@@ -38,6 +38,7 @@
  #include "graph.h"
  #include "state.h"
  #include "subprocess.h"
@@ -62,7 +62,7 @@ index 64710ddec0dd..c3dcc5899981 100644
  #include "util.h"
  
  namespace {
-@@ -364,7 +365,7 @@ bool Plan::CheckDependencyCycle(Node* node, const vector<Node*>& stack,
+@@ -347,7 +348,7 @@ bool Plan::AddSubTarget(Node* node, Node* dependent, string* err) {
  }
  
  Edge* Plan::FindWork() {
@@ -71,7 +71,7 @@ index 64710ddec0dd..c3dcc5899981 100644
      return NULL;
    set<Edge*>::iterator e = ready_.begin();
    Edge* edge = *e;
-@@ -502,8 +503,8 @@ void Plan::Dump() {
+@@ -485,8 +486,8 @@ void Plan::Dump() {
  }
  
  struct RealCommandRunner : public CommandRunner {
@@ -82,7 +82,7 @@ index 64710ddec0dd..c3dcc5899981 100644
    virtual bool CanRunMore();
    virtual bool StartCommand(Edge* edge);
    virtual bool WaitForCommand(Result* result);
-@@ -512,9 +513,18 @@ struct RealCommandRunner : public CommandRunner {
+@@ -495,9 +496,18 @@ struct RealCommandRunner : public CommandRunner {
  
    const BuildConfig& config_;
    SubprocessSet subprocs_;
@@ -101,7 +101,7 @@ index 64710ddec0dd..c3dcc5899981 100644
  vector<Edge*> RealCommandRunner::GetActiveEdges() {
    vector<Edge*> edges;
    for (map<Subprocess*, Edge*>::iterator e = subproc_to_edge_.begin();
-@@ -525,14 +535,18 @@ vector<Edge*> RealCommandRunner::GetActiveEdges() {
+@@ -508,14 +518,18 @@ vector<Edge*> RealCommandRunner::GetActiveEdges() {
  
  void RealCommandRunner::Abort() {
    subprocs_.Clear();
@@ -122,7 +122,7 @@ index 64710ddec0dd..c3dcc5899981 100644
  }
  
  bool RealCommandRunner::StartCommand(Edge* edge) {
-@@ -540,6 +554,8 @@ bool RealCommandRunner::StartCommand(Edge* edge) {
+@@ -523,6 +537,8 @@ bool RealCommandRunner::StartCommand(Edge* edge) {
    Subprocess* subproc = subprocs_.Add(command, edge->use_console());
    if (!subproc)
      return false;
@@ -131,7 +131,7 @@ index 64710ddec0dd..c3dcc5899981 100644
    subproc_to_edge_.insert(make_pair(subproc, edge));
  
    return true;
-@@ -553,6 +569,9 @@ bool RealCommandRunner::WaitForCommand(Result* result) {
+@@ -536,6 +552,9 @@ bool RealCommandRunner::WaitForCommand(Result* result) {
        return false;
    }
  
@@ -141,7 +141,7 @@ index 64710ddec0dd..c3dcc5899981 100644
    result->status = subproc->Finish();
    result->output = subproc->GetOutput();
  
-@@ -660,23 +679,23 @@ bool Builder::Build(string* err) {
+@@ -644,23 +663,23 @@ bool Builder::Build(string* err) {
    // Second, we attempt to wait for / reap the next finished command.
    while (plan_.more_to_do()) {
      // See if we can start any more commands.
@@ -181,7 +181,7 @@ index 64710ddec0dd..c3dcc5899981 100644
  
      // See if we can reap any finished commands.
 diff --git a/src/build.h b/src/build.h
-index 66ce607676d2..651e1e6540bc 100644
+index 43786f1c928f..cca7e8d8181d 100644
 --- a/src/build.h
 +++ b/src/build.h
 @@ -53,6 +53,9 @@ struct Plan {
diff --git a/patches/ninja-1.7.2/0002-Add-TokenPool-monitoring-to-SubprocessSet-DoWork.patch b/patches/ninja-1.8.2/0002-Add-TokenPool-monitoring-to-SubprocessSet-DoWork.patch
similarity index 93%
rename from patches/ninja-1.7.2/0002-Add-TokenPool-monitoring-to-SubprocessSet-DoWork.patch
rename to patches/ninja-1.8.2/0002-Add-TokenPool-monitoring-to-SubprocessSet-DoWork.patch
index bd162c37c..caf8a5aac 100644
--- a/patches/ninja-1.7.2/0002-Add-TokenPool-monitoring-to-SubprocessSet-DoWork.patch
+++ b/patches/ninja-1.8.2/0002-Add-TokenPool-monitoring-to-SubprocessSet-DoWork.patch
@@ -24,10 +24,10 @@ ninja a more aggressive GNU make jobserver client.
  10 files changed, 108 insertions(+), 29 deletions(-)
 
 diff --git a/src/build.cc b/src/build.cc
-index c3dcc5899981..db6da983cee4 100644
+index cc796ff838fa..ccd67697786d 100644
 --- a/src/build.cc
 +++ b/src/build.cc
-@@ -45,7 +45,7 @@ struct DryRunCommandRunner : public CommandRunner {
+@@ -50,7 +50,7 @@ struct DryRunCommandRunner : public CommandRunner {
    // Overridden from CommandRunner:
    virtual bool CanRunMore();
    virtual bool StartCommand(Edge* edge);
@@ -36,7 +36,7 @@ index c3dcc5899981..db6da983cee4 100644
  
   private:
    queue<Edge*> finished_;
-@@ -60,7 +60,7 @@ bool DryRunCommandRunner::StartCommand(Edge* edge) {
+@@ -65,7 +65,7 @@ bool DryRunCommandRunner::StartCommand(Edge* edge) {
    return true;
  }
  
@@ -45,7 +45,7 @@ index c3dcc5899981..db6da983cee4 100644
     if (finished_.empty())
       return false;
  
-@@ -507,7 +507,7 @@ struct RealCommandRunner : public CommandRunner {
+@@ -490,7 +490,7 @@ struct RealCommandRunner : public CommandRunner {
    virtual ~RealCommandRunner();
    virtual bool CanRunMore();
    virtual bool StartCommand(Edge* edge);
@@ -54,7 +54,7 @@ index c3dcc5899981..db6da983cee4 100644
    virtual vector<Edge*> GetActiveEdges();
    virtual void Abort();
  
-@@ -561,14 +561,23 @@ bool RealCommandRunner::StartCommand(Edge* edge) {
+@@ -544,14 +544,23 @@ bool RealCommandRunner::StartCommand(Edge* edge) {
    return true;
  }
  
@@ -81,7 +81,7 @@ index c3dcc5899981..db6da983cee4 100644
    if (tokens_)
      tokens_->Release();
  
-@@ -701,7 +710,7 @@ bool Builder::Build(string* err) {
+@@ -685,7 +694,7 @@ bool Builder::Build(string* err) {
      // See if we can reap any finished commands.
      if (pending_commands) {
        CommandRunner::Result result;
@@ -90,7 +90,7 @@ index c3dcc5899981..db6da983cee4 100644
            result.status == ExitInterrupted) {
          Cleanup();
          status_->BuildFinished();
-@@ -709,6 +718,10 @@ bool Builder::Build(string* err) {
+@@ -693,6 +702,10 @@ bool Builder::Build(string* err) {
          return false;
        }
  
@@ -102,10 +102,10 @@ index c3dcc5899981..db6da983cee4 100644
        if (!FinishCommand(&result, err)) {
          Cleanup();
 diff --git a/src/build.h b/src/build.h
-index 651e1e6540bc..292130942ad5 100644
+index cca7e8d8181d..ec6594f714c0 100644
 --- a/src/build.h
 +++ b/src/build.h
-@@ -118,7 +118,7 @@ struct CommandRunner {
+@@ -119,7 +119,7 @@ struct CommandRunner {
      bool success() const { return status == ExitSuccess; }
    };
    /// Wait for a command to complete, or return false if interrupted.
@@ -115,10 +115,10 @@ index 651e1e6540bc..292130942ad5 100644
    virtual vector<Edge*> GetActiveEdges() { return vector<Edge*>(); }
    virtual void Abort() {}
 diff --git a/src/build_test.cc b/src/build_test.cc
-index 640e1b01a3c6..20423ccd6d34 100644
+index 46ab33ef86c8..c1d3b047271a 100644
 --- a/src/build_test.cc
 +++ b/src/build_test.cc
-@@ -499,7 +499,7 @@ struct FakeCommandRunner : public CommandRunner {
+@@ -446,7 +446,7 @@ struct FakeCommandRunner : public CommandRunner {
    // CommandRunner impl
    virtual bool CanRunMore();
    virtual bool StartCommand(Edge* edge);
@@ -127,7 +127,7 @@ index 640e1b01a3c6..20423ccd6d34 100644
    virtual vector<Edge*> GetActiveEdges();
    virtual void Abort();
  
-@@ -627,7 +627,7 @@ bool FakeCommandRunner::StartCommand(Edge* edge) {
+@@ -575,7 +575,7 @@ bool FakeCommandRunner::StartCommand(Edge* edge) {
    return true;
  }
  
@@ -151,7 +151,7 @@ index a714ece791f7..75ebf6a7a0ce 100644
  
  #endif  // NINJA_EXIT_STATUS_H_
 diff --git a/src/subprocess-posix.cc b/src/subprocess-posix.cc
-index 5ffe85b76161..d5862c0ccb89 100644
+index 1de22c38f7fa..980fadf78e0d 100644
 --- a/src/subprocess-posix.cc
 +++ b/src/subprocess-posix.cc
 @@ -13,6 +13,7 @@
@@ -162,7 +162,7 @@ index 5ffe85b76161..d5862c0ccb89 100644
  
  #include <assert.h>
  #include <errno.h>
-@@ -216,7 +217,7 @@ Subprocess *SubprocessSet::Add(const string& command, bool use_console) {
+@@ -219,7 +220,7 @@ Subprocess *SubprocessSet::Add(const string& command, bool use_console) {
  }
  
  #ifdef USE_PPOLL
@@ -171,7 +171,7 @@ index 5ffe85b76161..d5862c0ccb89 100644
    vector<pollfd> fds;
    nfds_t nfds = 0;
  
-@@ -230,6 +231,12 @@ bool SubprocessSet::DoWork() {
+@@ -233,6 +234,12 @@ bool SubprocessSet::DoWork() {
      ++nfds;
    }
  
@@ -184,7 +184,7 @@ index 5ffe85b76161..d5862c0ccb89 100644
    interrupted_ = 0;
    int ret = ppoll(&fds.front(), nfds, NULL, &old_mask_);
    if (ret == -1) {
-@@ -262,11 +269,20 @@ bool SubprocessSet::DoWork() {
+@@ -265,11 +272,20 @@ bool SubprocessSet::DoWork() {
      ++i;
    }
  
@@ -206,7 +206,7 @@ index 5ffe85b76161..d5862c0ccb89 100644
    fd_set set;
    int nfds = 0;
    FD_ZERO(&set);
-@@ -281,6 +297,13 @@ bool SubprocessSet::DoWork() {
+@@ -284,6 +300,13 @@ bool SubprocessSet::DoWork() {
      }
    }
  
@@ -220,7 +220,7 @@ index 5ffe85b76161..d5862c0ccb89 100644
    interrupted_ = 0;
    int ret = pselect(nfds, &set, 0, 0, 0, &old_mask_);
    if (ret == -1) {
-@@ -309,6 +332,12 @@ bool SubprocessSet::DoWork() {
+@@ -312,6 +335,12 @@ bool SubprocessSet::DoWork() {
      ++i;
    }
  
diff --git a/patches/ninja-1.7.2/series b/patches/ninja-1.8.2/series
similarity index 100%
rename from patches/ninja-1.7.2/series
rename to patches/ninja-1.8.2/series
diff --git a/rules/host-ninja.make b/rules/host-ninja.make
index 712e59644..dbf023c80 100644
--- a/rules/host-ninja.make
+++ b/rules/host-ninja.make
@@ -16,8 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_NINJA) += host-ninja
 #
 # Paths and names
 #
-HOST_NINJA_VERSION	:= 1.7.2
-HOST_NINJA_MD5		:= 7b482218757acbaeac4d4d54a3cd94e1
+HOST_NINJA_VERSION	:= 1.8.2
+HOST_NINJA_MD5		:= 5fdb04461cc7f5d02536b3bfc0300166
 HOST_NINJA		:= ninja-$(HOST_NINJA_VERSION)
 HOST_NINJA_SUFFIX	:= tar.gz
 HOST_NINJA_URL		:= https://github.com/ninja-build/ninja/archive/v$(HOST_NINJA_VERSION).$(HOST_NINJA_SUFFIX)
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 17/22] nginx: update pkg-config patches from buildroot

[Clemens Gruber]

The regular expression that drops the -I flag from the output of
pkg-config --cflags-only-I did not work properly (Broke paths like
/usr/Some-Install-Location/include)

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 .../nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch   | 7 ++++---
 .../nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch   | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/patches/nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch b/patches/nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch
index d61a5dc59..b6bd50cc3 100644
--- a/patches/nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch
+++ b/patches/nginx-1.12.2/0004-auto-lib-libxslt-conf-use-pkg-config.patch
@@ -11,16 +11,17 @@ Signed-off-by: Martin Bark <martin@barkynet.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
-index 3a0f37be543a..3c2a60e57ec0 100644
+index 3a0f37b..3c2a60e 100644
 --- a/auto/lib/libxslt/conf
 +++ b/auto/lib/libxslt/conf
-@@ -12,8 +12,8 @@
+@@ -12,8 +12,9 @@
                        #include <libxslt/xsltInternals.h>
                        #include <libxslt/transform.h>
                        #include <libxslt/xsltutils.h>"
 -    ngx_feature_path="/usr/include/libxml2"
 -    ngx_feature_libs="-lxml2 -lxslt"
-+    ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I libxslt|sed 's/-I//g')"
++    ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I libxslt|
++			 sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')"
 +    ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs libxslt)"
      ngx_feature_test="xmlParserCtxtPtr    ctxt = NULL;
                        xsltStylesheetPtr   sheet = NULL;
diff --git a/patches/nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch b/patches/nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch
index 21ebd769b..b5772e411 100644
--- a/patches/nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch
+++ b/patches/nginx-1.12.2/0006-auto-lib-openssl-conf-use-pkg-config.patch
@@ -11,16 +11,17 @@ Signed-off-by: Martin Bark <martin@barkynet.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
-index e7d3795b2a8f..a24695c53bfb 100644
+index 39d9602..995c6f3 100644
 --- a/auto/lib/openssl/conf
 +++ b/auto/lib/openssl/conf
-@@ -58,8 +58,8 @@ else
+@@ -58,8 +58,9 @@ else
          ngx_feature_name="NGX_OPENSSL"
          ngx_feature_run=no
          ngx_feature_incs="#include <openssl/ssl.h>"
 -        ngx_feature_path=
 -        ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL"
-+        ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl|sed 's/-I//g')"
++        ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl|
++			     sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')"
 +        ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)"
          ngx_feature_test="SSL_CTX_set_options(NULL, 0)"
          . auto/feature
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 18/22] protobuf: version bump 3.3.2 -> 3.5.1

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 patches/protobuf-3.3.2/autogen.sh | 1 -
 rules/host-protobuf.make          | 1 +
 rules/protobuf.make               | 7 ++++---
 3 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 120000 patches/protobuf-3.3.2/autogen.sh

diff --git a/patches/protobuf-3.3.2/autogen.sh b/patches/protobuf-3.3.2/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/protobuf-3.3.2/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/rules/host-protobuf.make b/rules/host-protobuf.make
index d65fe1020..be7aa5aaa 100644
--- a/rules/host-protobuf.make
+++ b/rules/host-protobuf.make
@@ -23,6 +23,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_PROTOBUF) += host-protobuf
 HOST_PROTOBUF_CONF_TOOL	:= autoconf
 HOST_PROTOBUF_CONF_OPT	:= \
 	$(HOST_AUTOCONF) \
+	--disable-64bit-solaris \
 	--disable-static \
 	--without-zlib
 
diff --git a/rules/protobuf.make b/rules/protobuf.make
index 34b1e3dd9..91d095964 100644
--- a/rules/protobuf.make
+++ b/rules/protobuf.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_PROTOBUF) += protobuf
 #
 # Paths and names
 #
-PROTOBUF_VERSION	:= 3.3.2
-PROTOBUF_MD5		:= 19ed45d0cbbb88de2c4922978235d314 ef2a6a6bb3b92d8fa8d71e3cef741f2f
+PROTOBUF_VERSION	:= 3.5.1
+PROTOBUF_MD5		:= ca0d9b243e649d398a6b419acd35103a
 PROTOBUF		:= protobuf-$(PROTOBUF_VERSION)
 PROTOBUF_SUFFIX		:= tar.gz
-PROTOBUF_URL		:= https://github.com/google/protobuf/archive/v$(PROTOBUF_VERSION).$(PROTOBUF_SUFFIX)
+PROTOBUF_URL		:= https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).$(PROTOBUF_SUFFIX)
 PROTOBUF_SOURCE		:= $(SRCDIR)/$(PROTOBUF).$(PROTOBUF_SUFFIX)
 PROTOBUF_DIR		:= $(BUILDDIR)/$(PROTOBUF)
 PROTOBUF_LICENSE	:= BSD-3-Clause
@@ -35,6 +35,7 @@ PROTOBUF_LICENSE	:= BSD-3-Clause
 PROTOBUF_CONF_TOOL	:= autoconf
 PROTOBUF_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--disable-64bit-solaris \
 	--disable-static \
 	--$(call ptx/wwo, PTXCONF_PROTOBUF_ZLIB)-zlib \
 	--with-protoc=$(PTXDIST_SYSROOT_HOST)/bin/protoc
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 18/22] protobuf: version bump 3.3.2 -> 3.5.1

[Michael Olbrich]

On Tue, Jan 16, 2018 at 04:50:36PM +0100, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

This breaks python-protobuf. I think that needs to use a separate tarball?

Michael

> ---
>  patches/protobuf-3.3.2/autogen.sh | 1 -
>  rules/host-protobuf.make          | 1 +
>  rules/protobuf.make               | 7 ++++---
>  3 files changed, 5 insertions(+), 4 deletions(-)
>  delete mode 120000 patches/protobuf-3.3.2/autogen.sh
> 
> diff --git a/patches/protobuf-3.3.2/autogen.sh b/patches/protobuf-3.3.2/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7d..000000000
> --- a/patches/protobuf-3.3.2/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/rules/host-protobuf.make b/rules/host-protobuf.make
> index d65fe1020..be7aa5aaa 100644
> --- a/rules/host-protobuf.make
> +++ b/rules/host-protobuf.make
> @@ -23,6 +23,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_PROTOBUF) += host-protobuf
>  HOST_PROTOBUF_CONF_TOOL	:= autoconf
>  HOST_PROTOBUF_CONF_OPT	:= \
>  	$(HOST_AUTOCONF) \
> +	--disable-64bit-solaris \
>  	--disable-static \
>  	--without-zlib
>  
> diff --git a/rules/protobuf.make b/rules/protobuf.make
> index 34b1e3dd9..91d095964 100644
> --- a/rules/protobuf.make
> +++ b/rules/protobuf.make
> @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_PROTOBUF) += protobuf
>  #
>  # Paths and names
>  #
> -PROTOBUF_VERSION	:= 3.3.2
> -PROTOBUF_MD5		:= 19ed45d0cbbb88de2c4922978235d314 ef2a6a6bb3b92d8fa8d71e3cef741f2f
> +PROTOBUF_VERSION	:= 3.5.1
> +PROTOBUF_MD5		:= ca0d9b243e649d398a6b419acd35103a
>  PROTOBUF		:= protobuf-$(PROTOBUF_VERSION)
>  PROTOBUF_SUFFIX		:= tar.gz
> -PROTOBUF_URL		:= https://github.com/google/protobuf/archive/v$(PROTOBUF_VERSION).$(PROTOBUF_SUFFIX)
> +PROTOBUF_URL		:= https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).$(PROTOBUF_SUFFIX)
>  PROTOBUF_SOURCE		:= $(SRCDIR)/$(PROTOBUF).$(PROTOBUF_SUFFIX)
>  PROTOBUF_DIR		:= $(BUILDDIR)/$(PROTOBUF)
>  PROTOBUF_LICENSE	:= BSD-3-Clause
> @@ -35,6 +35,7 @@ PROTOBUF_LICENSE	:= BSD-3-Clause
>  PROTOBUF_CONF_TOOL	:= autoconf
>  PROTOBUF_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> +	--disable-64bit-solaris \
>  	--disable-static \
>  	--$(call ptx/wwo, PTXCONF_PROTOBUF_ZLIB)-zlib \
>  	--with-protoc=$(PTXDIST_SYSROOT_HOST)/bin/protoc
> -- 
> 2.15.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 18/22] protobuf: version bump 3.3.2 -> 3.5.1

[Clemens Gruber]

Hi Michael,

On Thu, Jan 25, 2018 at 03:38:19PM +0100, Michael Olbrich wrote:
> On Tue, Jan 16, 2018 at 04:50:36PM +0100, Clemens Gruber wrote:
> > Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> 
> This breaks python-protobuf. I think that needs to use a separate tarball?

Yes, we could either use the protobuf-all tarball in protobuf.make or
use the separate protobuf-python tarball in python-protobuf.make.
(Looks like it was split-up)

I also think the latter is better. I'll send a patch!

Clemens

> 
> Michael
> 
> > ---
> >  patches/protobuf-3.3.2/autogen.sh | 1 -
> >  rules/host-protobuf.make          | 1 +
> >  rules/protobuf.make               | 7 ++++---
> >  3 files changed, 5 insertions(+), 4 deletions(-)
> >  delete mode 120000 patches/protobuf-3.3.2/autogen.sh
> > 
> > diff --git a/patches/protobuf-3.3.2/autogen.sh b/patches/protobuf-3.3.2/autogen.sh
> > deleted file mode 120000
> > index 9f8a4cb7d..000000000
> > --- a/patches/protobuf-3.3.2/autogen.sh
> > +++ /dev/null
> > @@ -1 +0,0 @@
> > -../autogen.sh
> > \ No newline at end of file
> > diff --git a/rules/host-protobuf.make b/rules/host-protobuf.make
> > index d65fe1020..be7aa5aaa 100644
> > --- a/rules/host-protobuf.make
> > +++ b/rules/host-protobuf.make
> > @@ -23,6 +23,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_PROTOBUF) += host-protobuf
> >  HOST_PROTOBUF_CONF_TOOL	:= autoconf
> >  HOST_PROTOBUF_CONF_OPT	:= \
> >  	$(HOST_AUTOCONF) \
> > +	--disable-64bit-solaris \
> >  	--disable-static \
> >  	--without-zlib
> >  
> > diff --git a/rules/protobuf.make b/rules/protobuf.make
> > index 34b1e3dd9..91d095964 100644
> > --- a/rules/protobuf.make
> > +++ b/rules/protobuf.make
> > @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_PROTOBUF) += protobuf
> >  #
> >  # Paths and names
> >  #
> > -PROTOBUF_VERSION	:= 3.3.2
> > -PROTOBUF_MD5		:= 19ed45d0cbbb88de2c4922978235d314 ef2a6a6bb3b92d8fa8d71e3cef741f2f
> > +PROTOBUF_VERSION	:= 3.5.1
> > +PROTOBUF_MD5		:= ca0d9b243e649d398a6b419acd35103a
> >  PROTOBUF		:= protobuf-$(PROTOBUF_VERSION)
> >  PROTOBUF_SUFFIX		:= tar.gz
> > -PROTOBUF_URL		:= https://github.com/google/protobuf/archive/v$(PROTOBUF_VERSION).$(PROTOBUF_SUFFIX)
> > +PROTOBUF_URL		:= https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).$(PROTOBUF_SUFFIX)
> >  PROTOBUF_SOURCE		:= $(SRCDIR)/$(PROTOBUF).$(PROTOBUF_SUFFIX)
> >  PROTOBUF_DIR		:= $(BUILDDIR)/$(PROTOBUF)
> >  PROTOBUF_LICENSE	:= BSD-3-Clause
> > @@ -35,6 +35,7 @@ PROTOBUF_LICENSE	:= BSD-3-Clause
> >  PROTOBUF_CONF_TOOL	:= autoconf
> >  PROTOBUF_CONF_OPT	:= \
> >  	$(CROSS_AUTOCONF_USR) \
> > +	--disable-64bit-solaris \
> >  	--disable-static \
> >  	--$(call ptx/wwo, PTXCONF_PROTOBUF_ZLIB)-zlib \
> >  	--with-protoc=$(PTXDIST_SYSROOT_HOST)/bin/protoc
> > -- 
> > 2.15.1
> > 
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 18/22] protobuf: version bump 3.3.2 -> 3.5.1

[Clemens Gruber]

On Thu, Jan 25, 2018 at 04:04:51PM +0100, Clemens Gruber wrote:
> Hi Michael,
> 
> On Thu, Jan 25, 2018 at 03:38:19PM +0100, Michael Olbrich wrote:
> > On Tue, Jan 16, 2018 at 04:50:36PM +0100, Clemens Gruber wrote:
> > > Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> > 
> > This breaks python-protobuf. I think that needs to use a separate tarball?
> 
> Yes, we could either use the protobuf-all tarball in protobuf.make or
> use the separate protobuf-python tarball in python-protobuf.make.
> (Looks like it was split-up)
> 
> I also think the latter is better. I'll send a patch!

OTOH: Then we'd have to update two md5sums for each protobuf version
bump. Maybe I'll better send a v2 of the protobuf bump instead and
change protobuf-cpp to protobuf-all, which should work just as well!

> 
> Clemens
> 
> > 
> > Michael
> > 
> > > ---
> > >  patches/protobuf-3.3.2/autogen.sh | 1 -
> > >  rules/host-protobuf.make          | 1 +
> > >  rules/protobuf.make               | 7 ++++---
> > >  3 files changed, 5 insertions(+), 4 deletions(-)
> > >  delete mode 120000 patches/protobuf-3.3.2/autogen.sh
> > > 
> > > diff --git a/patches/protobuf-3.3.2/autogen.sh b/patches/protobuf-3.3.2/autogen.sh
> > > deleted file mode 120000
> > > index 9f8a4cb7d..000000000
> > > --- a/patches/protobuf-3.3.2/autogen.sh
> > > +++ /dev/null
> > > @@ -1 +0,0 @@
> > > -../autogen.sh
> > > \ No newline at end of file
> > > diff --git a/rules/host-protobuf.make b/rules/host-protobuf.make
> > > index d65fe1020..be7aa5aaa 100644
> > > --- a/rules/host-protobuf.make
> > > +++ b/rules/host-protobuf.make
> > > @@ -23,6 +23,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_PROTOBUF) += host-protobuf
> > >  HOST_PROTOBUF_CONF_TOOL	:= autoconf
> > >  HOST_PROTOBUF_CONF_OPT	:= \
> > >  	$(HOST_AUTOCONF) \
> > > +	--disable-64bit-solaris \
> > >  	--disable-static \
> > >  	--without-zlib
> > >  
> > > diff --git a/rules/protobuf.make b/rules/protobuf.make
> > > index 34b1e3dd9..91d095964 100644
> > > --- a/rules/protobuf.make
> > > +++ b/rules/protobuf.make
> > > @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_PROTOBUF) += protobuf
> > >  #
> > >  # Paths and names
> > >  #
> > > -PROTOBUF_VERSION	:= 3.3.2
> > > -PROTOBUF_MD5		:= 19ed45d0cbbb88de2c4922978235d314 ef2a6a6bb3b92d8fa8d71e3cef741f2f
> > > +PROTOBUF_VERSION	:= 3.5.1
> > > +PROTOBUF_MD5		:= ca0d9b243e649d398a6b419acd35103a
> > >  PROTOBUF		:= protobuf-$(PROTOBUF_VERSION)
> > >  PROTOBUF_SUFFIX		:= tar.gz
> > > -PROTOBUF_URL		:= https://github.com/google/protobuf/archive/v$(PROTOBUF_VERSION).$(PROTOBUF_SUFFIX)
> > > +PROTOBUF_URL		:= https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)/protobuf-cpp-$(PROTOBUF_VERSION).$(PROTOBUF_SUFFIX)
> > >  PROTOBUF_SOURCE		:= $(SRCDIR)/$(PROTOBUF).$(PROTOBUF_SUFFIX)
> > >  PROTOBUF_DIR		:= $(BUILDDIR)/$(PROTOBUF)
> > >  PROTOBUF_LICENSE	:= BSD-3-Clause
> > > @@ -35,6 +35,7 @@ PROTOBUF_LICENSE	:= BSD-3-Clause
> > >  PROTOBUF_CONF_TOOL	:= autoconf
> > >  PROTOBUF_CONF_OPT	:= \
> > >  	$(CROSS_AUTOCONF_USR) \
> > > +	--disable-64bit-solaris \
> > >  	--disable-static \
> > >  	--$(call ptx/wwo, PTXCONF_PROTOBUF_ZLIB)-zlib \
> > >  	--with-protoc=$(PTXDIST_SYSROOT_HOST)/bin/protoc
> > > -- 
> > > 2.15.1
> > > 
> > > 
> > > _______________________________________________
> > > ptxdist mailing list
> > > ptxdist@pengutronix.de
> > 
> > -- 
> > Pengutronix e.K.                           |                             |
> > Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> > Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 19/22] strace: version bump 4.18 -> 4.20

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/strace.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/strace.make b/rules/strace.make
index d0d98e355..93e3162ae 100644
--- a/rules/strace.make
+++ b/rules/strace.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_STRACE) += strace
 #
 # Paths and names
 #
-STRACE_VERSION	:= 4.18
-STRACE_MD5	:= 3579b3266bb096cebaefbe2cdb1a3a78
+STRACE_VERSION	:= 4.20
+STRACE_MD5	:= f2271ab0fac49ebee9cbd7f3469227cb
 STRACE		:= strace-$(STRACE_VERSION)
 STRACE_SUFFIX	:= tar.xz
 STRACE_URL	:= $(call ptx/mirror, SF, strace/$(STRACE).$(STRACE_SUFFIX))
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 20/22] trace-cmd: version bump 2.6.1 -> 2.6.2

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/trace-cmd.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/trace-cmd.make b/rules/trace-cmd.make
index cd37734e1..4ee1b0271 100644
--- a/rules/trace-cmd.make
+++ b/rules/trace-cmd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_TRACE_CMD) += trace-cmd
 #
 # Paths and names
 #
-TRACE_CMD_VERSION	:= 2.6.1
-TRACE_CMD_MD5		:= d677c8895af84d6cdb9f6a65006cc507
+TRACE_CMD_VERSION	:= 2.6.2
+TRACE_CMD_MD5		:= c30343f4965096ad7a97c813a6626a80
 TRACE_CMD		:= trace-cmd-$(TRACE_CMD_VERSION)
 TRACE_CMD_SUFFIX	:= tar.bz2
 TRACE_CMD_URL		:= http://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;tag=trace-cmd-v$(TRACE_CMD_VERSION)
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 21/22] u-boot-tools: version bump 2017.07 -> 2018.01

[Clemens Gruber]

The patch is now upstream and can be removed.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...-not-attempt-to-use-the-systemwide-libfdt.patch | 52 ----------------------
 patches/u-boot-2017.09/series                      |  5 ---
 rules/u-boot-tools.make                            |  4 +-
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch
 delete mode 100644 patches/u-boot-2017.09/series

diff --git a/patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch b/patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch
deleted file mode 100644
index 94aee2413..000000000
--- a/patches/u-boot-2017.09/0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kundrat@cesnet.cz>
-Date: Fri, 3 Nov 2017 03:06:35 +0100
-Subject: [PATCH] Do not attempt to use the systemwide libfdt
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-U-Boot bundles a patched copy of libfdt, so it's wrong to attempt to
-include it <like/this>. This breaks the build for me when I have dtc
-fully installed in my host -- as happened earlier tonight with
-Buildroot, for example.
-
-There are several other occurrences throughout the code where '<libfdt'
-matches. I'm not modifying these because I have no clue why the
-<systemwide> include style is being used -- IMHO wrongly.
-
-Signed-off-by: Jan Kundrát <jan.kundrat@cesnet.cz>
----
- include/fdt.h    | 2 +-
- include/libfdt.h | 2 +-
- tools/fdtgrep.c  | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/fdt.h b/include/fdt.h
-index 7ead62e77715..f40b56c75545 100644
---- a/include/fdt.h
-+++ b/include/fdt.h
-@@ -1 +1 @@
--#include <../lib/libfdt/fdt.h>
-+#include "../lib/libfdt/fdt.h"
-diff --git a/include/libfdt.h b/include/libfdt.h
-index 10296a21addf..7ba13e634b65 100644
---- a/include/libfdt.h
-+++ b/include/libfdt.h
-@@ -1 +1 @@
--#include <../lib/libfdt/libfdt.h>
-+#include "../lib/libfdt/libfdt.h"
-diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
-index f51f5f15f549..5897b6d5f780 100644
---- a/tools/fdtgrep.c
-+++ b/tools/fdtgrep.c
-@@ -16,8 +16,8 @@
- #include <string.h>
- #include <unistd.h>
- 
--#include <../include/libfdt.h>
--#include <libfdt_internal.h>
-+#include "../include/libfdt.h"
-+#include "libfdt_internal.h"
- 
- /* Define DEBUG to get some debugging output on stderr */
- #ifdef DEBUG
diff --git a/patches/u-boot-2017.09/series b/patches/u-boot-2017.09/series
deleted file mode 100644
index 49260d81a..000000000
--- a/patches/u-boot-2017.09/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 0
-#tag:upstream --start-number 1
-0001-Do-not-attempt-to-use-the-systemwide-libfdt.patch
-# a8e035bf38bdaf0a13114ea507417c0d  - git-ptx-patches magic
diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
index b5d6fdb5c..7bc557246 100644
--- a/rules/u-boot-tools.make
+++ b/rules/u-boot-tools.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
 #
 # Paths and names
 #
-U_BOOT_TOOLS_VERSION	:= 2017.09
-U_BOOT_TOOLS_MD5	:= 9f7eb7db4530996a28e86f38f3b3e66f
+U_BOOT_TOOLS_VERSION	:= 2018.01
+U_BOOT_TOOLS_MD5	:= b42e45813369f4ae84490a481e531768
 U_BOOT_TOOLS		:= u-boot-$(U_BOOT_TOOLS_VERSION)
 U_BOOT_TOOLS_SUFFIX	:= tar.bz2
 U_BOOT_TOOLS_URL	:= ftp://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 22/22] util-linux-ng: version bump 2.30.2 -> 2.31.1

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 .../0001-__progname-redefinition-fix.patch                          | 0
 patches/{util-linux-2.30.2 => util-linux-2.31.1}/series             | 0
 rules/util-linux-ng.make                                            | 6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename patches/{util-linux-2.30.2 => util-linux-2.31.1}/0001-__progname-redefinition-fix.patch (100%)
 rename patches/{util-linux-2.30.2 => util-linux-2.31.1}/series (100%)

diff --git a/patches/util-linux-2.30.2/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.31.1/0001-__progname-redefinition-fix.patch
similarity index 100%
rename from patches/util-linux-2.30.2/0001-__progname-redefinition-fix.patch
rename to patches/util-linux-2.31.1/0001-__progname-redefinition-fix.patch
diff --git a/patches/util-linux-2.30.2/series b/patches/util-linux-2.31.1/series
similarity index 100%
rename from patches/util-linux-2.30.2/series
rename to patches/util-linux-2.31.1/series
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 009fbcb85..488b4967f 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng
 #
 # Paths and names
 #
-UTIL_LINUX_NG_VERSION	:= 2.30.2
-UTIL_LINUX_NG_MD5	:= 23a5dce0030144a42676b92310026bac
+UTIL_LINUX_NG_VERSION	:= 2.31.1
+UTIL_LINUX_NG_MD5	:= 7733b583dcb51518944d42aa62ef19ea
 UTIL_LINUX_NG		:= util-linux-$(UTIL_LINUX_NG_VERSION)
 UTIL_LINUX_NG_SUFFIX	:= tar.xz
 UTIL_LINUX_NG_BASENAME	:= v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([0-9]*\.[0-9]*\)[\.[0-9]*]\?/\1/g')
@@ -98,6 +98,7 @@ UTIL_LINUX_NG_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_CHMEM)-chmem \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCRM)-ipcrm \
 	--$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCS)-ipcs \
+	--disable-rfkill \
 	--disable-tunelp \
 	--disable-kill \
 	--disable-last \
@@ -106,7 +107,6 @@ UTIL_LINUX_NG_CONF_OPT	:= \
 	--disable-mesg \
 	--disable-raw \
 	--disable-rename \
-	--disable-reset \
 	--disable-vipw \
 	--disable-newgrp \
 	--disable-chfn-chsh-password \
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de