* [ptxdist] [PATCH 1/3] nettle + gnutls: version bumps
@ 2016-06-09 22:11 Robert Schwebel
2016-06-09 22:11 ` [ptxdist] [PATCH 2/3] xz: version bump 5.0.4 -> 5.2.2 Robert Schwebel
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Robert Schwebel @ 2016-06-09 22:11 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
As gnutls cannot be updated without updating nettle as well, do both
version bumps in one commit. Update nettle from 2.7.1 to 3.2 and gnutls
from 3.3.13 to 3.5.0.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
rules/gnutls.make | 9 +++++----
rules/nettle.make | 7 +++++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/rules/gnutls.make b/rules/gnutls.make
index 8836a72..95aabcd 100644
--- a/rules/gnutls.make
+++ b/rules/gnutls.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUTLS) += gnutls
#
# Paths and names
#
-GNUTLS_VERSION := 3.3.13
-GNUTLS_MD5 := a7387fe8bf3e604bf518a6da9ab2a4e6
+GNUTLS_VERSION := 3.5.0
+GNUTLS_MD5 := 173154d0b41f6c58881e3fbd88f7e6e4
GNUTLS := gnutls-$(GNUTLS_VERSION)
GNUTLS_SUFFIX := tar.xz
GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v$(basename $(GNUTLS_VERSION))/$(GNUTLS).$(GNUTLS_SUFFIX)
@@ -41,7 +41,6 @@ GNUTLS_CONF_OPT := \
--enable-padlock \
--enable-dtls-srtp-support \
--enable-alpn-support \
- --enable-rsa-export \
--enable-heartbeat-support \
--enable-srp-authentication \
--enable-psk-authentication \
@@ -53,6 +52,7 @@ GNUTLS_CONF_OPT := \
--enable-session-tickets \
--$(call ptx/endis, PTXCONF_GNUTLS_OPENSSL)-openssl-compatibility \
--disable-doc \
+ --disable-manpages \
--disable-tests \
--disable-gtk-doc \
--disable-nls \
@@ -68,12 +68,13 @@ GNUTLS_CONF_OPT := \
--enable-local-libopts \
--disable-libopts-install \
--disable-guile \
- --disable-crywrap \
--without-p11-kit \
--without-tpm \
--without-librt-prefix \
--without-libregex \
--with-zlib \
+ --disable-tools \
+ --without-idn \
--without-libz-prefix
# ----------------------------------------------------------------------------
diff --git a/rules/nettle.make b/rules/nettle.make
index dae19bd..cea78be 100644
--- a/rules/nettle.make
+++ b/rules/nettle.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_NETTLE) += nettle
#
# Paths and names
#
-NETTLE_VERSION := 2.7.1
-NETTLE_MD5 := 003d5147911317931dd453520eb234a5
+NETTLE_VERSION := 3.2
+NETTLE_MD5 := afb15b4764ebf1b4e6d06c62bd4d29e4
NETTLE := nettle-$(NETTLE_VERSION)
NETTLE_SUFFIX := tar.gz
NETTLE_URL := http://www.lysator.liu.se/~nisse/archive/$(NETTLE).$(NETTLE_SUFFIX)
@@ -42,6 +42,9 @@ NETTLE_CONF_OPT := \
--disable-openssl \
--disable-gcov \
--disable-documentation \
+ --disable-fat \
+ --disable-x86-aesni \
+ --disable-mini-gmp \
--$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-arm-neon
# ----------------------------------------------------------------------------
--
2.8.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread* [ptxdist] [PATCH 2/3] xz: version bump 5.0.4 -> 5.2.2
2016-06-09 22:11 [ptxdist] [PATCH 1/3] nettle + gnutls: version bumps Robert Schwebel
@ 2016-06-09 22:11 ` Robert Schwebel
2016-06-14 7:26 ` Michael Olbrich
2016-06-09 22:11 ` [ptxdist] [PATCH 3/3] htop: version bump 1.0.3 -> 2.0.1 Robert Schwebel
2016-06-13 8:09 ` [ptxdist] [PATCH 1/3] nettle + gnutls: version bumps Michael Olbrich
2 siblings, 1 reply; 8+ messages in thread
From: Robert Schwebel @ 2016-06-09 22:11 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
The MD5 sums for the license file for GPLv2 and LGPLv2.1 have changed,
but the files contain only whitespace changes.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
rules/xz.make | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/rules/xz.make b/rules/xz.make
index 783046f..6339dcb 100644
--- a/rules/xz.make
+++ b/rules/xz.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_XZ) += xz
#
# Paths and names
#
-XZ_VERSION := 5.0.4
-XZ_MD5 := 741cd3a5f64b23b7bac56ec5b2258715
+XZ_VERSION := 5.2.2
+XZ_MD5 := f90c9a0c8b259aee2234c4e0d7fd70af
XZ := xz-$(XZ_VERSION)
XZ_SUFFIX := tar.bz2
XZ_URL := http://tukaani.org/xz/$(XZ).$(XZ_SUFFIX)
@@ -26,9 +26,9 @@ XZ_DIR := $(BUILDDIR)/$(XZ)
XZ_LICENSE := public_domain, LGPL-2.1+, GPL-2.0+, GPL-3.0+
XZ_LICENSE_FILES := \
file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
- file://COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe \
+ file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
- file://COPYING.LGPLv2.1;md5=fbc093901857fcd118f065f900982c24
+ file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c
# ----------------------------------------------------------------------------
# Prepare
--
2.8.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/3] xz: version bump 5.0.4 -> 5.2.2
2016-06-09 22:11 ` [ptxdist] [PATCH 2/3] xz: version bump 5.0.4 -> 5.2.2 Robert Schwebel
@ 2016-06-14 7:26 ` Michael Olbrich
0 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2016-06-14 7:26 UTC (permalink / raw)
To: ptxdist
On Fri, Jun 10, 2016 at 12:11:14AM +0200, Robert Schwebel wrote:
> The MD5 sums for the license file for GPLv2 and LGPLv2.1 have changed,
> but the files contain only whitespace changes.
>
Thanks, applied.
Michael
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
> rules/xz.make | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/rules/xz.make b/rules/xz.make
> index 783046f..6339dcb 100644
> --- a/rules/xz.make
> +++ b/rules/xz.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_XZ) += xz
> #
> # Paths and names
> #
> -XZ_VERSION := 5.0.4
> -XZ_MD5 := 741cd3a5f64b23b7bac56ec5b2258715
> +XZ_VERSION := 5.2.2
> +XZ_MD5 := f90c9a0c8b259aee2234c4e0d7fd70af
> XZ := xz-$(XZ_VERSION)
> XZ_SUFFIX := tar.bz2
> XZ_URL := http://tukaani.org/xz/$(XZ).$(XZ_SUFFIX)
> @@ -26,9 +26,9 @@ XZ_DIR := $(BUILDDIR)/$(XZ)
> XZ_LICENSE := public_domain, LGPL-2.1+, GPL-2.0+, GPL-3.0+
> XZ_LICENSE_FILES := \
> file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
> - file://COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe \
> + file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
> - file://COPYING.LGPLv2.1;md5=fbc093901857fcd118f065f900982c24
> + file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c
>
> # ----------------------------------------------------------------------------
> # Prepare
> --
> 2.8.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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 3/3] htop: version bump 1.0.3 -> 2.0.1
2016-06-09 22:11 [ptxdist] [PATCH 1/3] nettle + gnutls: version bumps Robert Schwebel
2016-06-09 22:11 ` [ptxdist] [PATCH 2/3] xz: version bump 5.0.4 -> 5.2.2 Robert Schwebel
@ 2016-06-09 22:11 ` Robert Schwebel
2016-06-13 12:48 ` Ladislav Michl
2016-06-13 8:09 ` [ptxdist] [PATCH 1/3] nettle + gnutls: version bumps Michael Olbrich
2 siblings, 1 reply; 8+ messages in thread
From: Robert Schwebel @ 2016-06-09 22:11 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Add defaults for the new configure options.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
rules/htop.make | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/rules/htop.make b/rules/htop.make
index 8a4b70a..b3719e5 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
#
# Paths and names
#
-HTOP_VERSION := 1.0.3
-HTOP_MD5 := e768b9b55c033d9c1dffda72db3a6ac7
+HTOP_VERSION := 2.0.1
+HTOP_MD5 := f75fe92b4defaa80d99109830f34b5e2
HTOP := htop-$(HTOP_VERSION)
HTOP_SUFFIX := tar.gz
HTOP_URL := http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
@@ -41,6 +41,8 @@ HTOP_CONF_ENV := \
HTOP_CONF_TOOL := autoconf
HTOP_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ --enable-proc \
+ --enable-linux-affinity \
--disable-unicode
# ----------------------------------------------------------------------------
--
2.8.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 3/3] htop: version bump 1.0.3 -> 2.0.1
2016-06-09 22:11 ` [ptxdist] [PATCH 3/3] htop: version bump 1.0.3 -> 2.0.1 Robert Schwebel
@ 2016-06-13 12:48 ` Ladislav Michl
2016-06-14 5:23 ` Robert Schwebel
0 siblings, 1 reply; 8+ messages in thread
From: Ladislav Michl @ 2016-06-13 12:48 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
Hi Robert...
On Fri, Jun 10, 2016 at 12:11:15AM +0200, Robert Schwebel wrote:
> Add defaults for the new configure options.
I overlooked your patch, so another one doing the same was sent. However
I think you should consider using it instead :-)
Thank you,
ladis
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
> rules/htop.make | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/rules/htop.make b/rules/htop.make
> index 8a4b70a..b3719e5 100644
> --- a/rules/htop.make
> +++ b/rules/htop.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
> #
> # Paths and names
> #
> -HTOP_VERSION := 1.0.3
> -HTOP_MD5 := e768b9b55c033d9c1dffda72db3a6ac7
> +HTOP_VERSION := 2.0.1
> +HTOP_MD5 := f75fe92b4defaa80d99109830f34b5e2
> HTOP := htop-$(HTOP_VERSION)
> HTOP_SUFFIX := tar.gz
> HTOP_URL := http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
> @@ -41,6 +41,8 @@ HTOP_CONF_ENV := \
> HTOP_CONF_TOOL := autoconf
> HTOP_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> + --enable-proc \
> + --enable-linux-affinity \
> --disable-unicode
>
> # ----------------------------------------------------------------------------
> --
> 2.8.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 3/3] htop: version bump 1.0.3 -> 2.0.1
2016-06-13 12:48 ` Ladislav Michl
@ 2016-06-14 5:23 ` Robert Schwebel
2016-06-14 12:34 ` Michael Olbrich
0 siblings, 1 reply; 8+ messages in thread
From: Robert Schwebel @ 2016-06-14 5:23 UTC (permalink / raw)
To: ptxdist
On Mon, Jun 13, 2016 at 02:48:31PM +0200, Ladislav Michl wrote:
> On Fri, Jun 10, 2016 at 12:11:15AM +0200, Robert Schwebel wrote:
> > Add defaults for the new configure options.
>
> I overlooked your patch, so another one doing the same was sent. However
> I think you should consider using it instead :-)
Could you send an incremental patch with your additional parameter
changes?
rsc
--
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 3/3] htop: version bump 1.0.3 -> 2.0.1
2016-06-14 5:23 ` Robert Schwebel
@ 2016-06-14 12:34 ` Michael Olbrich
0 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2016-06-14 12:34 UTC (permalink / raw)
To: ptxdist
On Tue, Jun 14, 2016 at 07:23:39AM +0200, Robert Schwebel wrote:
> On Mon, Jun 13, 2016 at 02:48:31PM +0200, Ladislav Michl wrote:
> > On Fri, Jun 10, 2016 at 12:11:15AM +0200, Robert Schwebel wrote:
> > > Add defaults for the new configure options.
> >
> > I overlooked your patch, so another one doing the same was sent. However
> > I think you should consider using it instead :-)
>
> Could you send an incremental patch with your additional parameter
> changes?
No need to do that. I've rebased the patch and changed the commit message.
Michael
--
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/3] nettle + gnutls: version bumps
2016-06-09 22:11 [ptxdist] [PATCH 1/3] nettle + gnutls: version bumps Robert Schwebel
2016-06-09 22:11 ` [ptxdist] [PATCH 2/3] xz: version bump 5.0.4 -> 5.2.2 Robert Schwebel
2016-06-09 22:11 ` [ptxdist] [PATCH 3/3] htop: version bump 1.0.3 -> 2.0.1 Robert Schwebel
@ 2016-06-13 8:09 ` Michael Olbrich
2 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2016-06-13 8:09 UTC (permalink / raw)
To: ptxdist
On Fri, Jun 10, 2016 at 12:11:13AM +0200, Robert Schwebel wrote:
> As gnutls cannot be updated without updating nettle as well, do both
> version bumps in one commit. Update nettle from 2.7.1 to 3.2 and gnutls
> from 3.3.13 to 3.5.0.
Fails to build here (maybe only with GNUTLS_OPENSSL enabled):
CC openssl_compat.lo
openssl_compat.c:29:27: fatal error: gnutls_global.h: No such file or directory
#include <gnutls_global.h>
^
compilation terminated.
Makefile:1496: recipe for target 'openssl_compat.lo' failed
make[4]: *** [openssl_compat.lo] Error 1
Michael
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
> rules/gnutls.make | 9 +++++----
> rules/nettle.make | 7 +++++--
> 2 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/rules/gnutls.make b/rules/gnutls.make
> index 8836a72..95aabcd 100644
> --- a/rules/gnutls.make
> +++ b/rules/gnutls.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUTLS) += gnutls
> #
> # Paths and names
> #
> -GNUTLS_VERSION := 3.3.13
> -GNUTLS_MD5 := a7387fe8bf3e604bf518a6da9ab2a4e6
> +GNUTLS_VERSION := 3.5.0
> +GNUTLS_MD5 := 173154d0b41f6c58881e3fbd88f7e6e4
> GNUTLS := gnutls-$(GNUTLS_VERSION)
> GNUTLS_SUFFIX := tar.xz
> GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v$(basename $(GNUTLS_VERSION))/$(GNUTLS).$(GNUTLS_SUFFIX)
> @@ -41,7 +41,6 @@ GNUTLS_CONF_OPT := \
> --enable-padlock \
> --enable-dtls-srtp-support \
> --enable-alpn-support \
> - --enable-rsa-export \
> --enable-heartbeat-support \
> --enable-srp-authentication \
> --enable-psk-authentication \
> @@ -53,6 +52,7 @@ GNUTLS_CONF_OPT := \
> --enable-session-tickets \
> --$(call ptx/endis, PTXCONF_GNUTLS_OPENSSL)-openssl-compatibility \
> --disable-doc \
> + --disable-manpages \
> --disable-tests \
> --disable-gtk-doc \
> --disable-nls \
> @@ -68,12 +68,13 @@ GNUTLS_CONF_OPT := \
> --enable-local-libopts \
> --disable-libopts-install \
> --disable-guile \
> - --disable-crywrap \
> --without-p11-kit \
> --without-tpm \
> --without-librt-prefix \
> --without-libregex \
> --with-zlib \
> + --disable-tools \
> + --without-idn \
> --without-libz-prefix
>
> # ----------------------------------------------------------------------------
> diff --git a/rules/nettle.make b/rules/nettle.make
> index dae19bd..cea78be 100644
> --- a/rules/nettle.make
> +++ b/rules/nettle.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_NETTLE) += nettle
> #
> # Paths and names
> #
> -NETTLE_VERSION := 2.7.1
> -NETTLE_MD5 := 003d5147911317931dd453520eb234a5
> +NETTLE_VERSION := 3.2
> +NETTLE_MD5 := afb15b4764ebf1b4e6d06c62bd4d29e4
> NETTLE := nettle-$(NETTLE_VERSION)
> NETTLE_SUFFIX := tar.gz
> NETTLE_URL := http://www.lysator.liu.se/~nisse/archive/$(NETTLE).$(NETTLE_SUFFIX)
> @@ -42,6 +42,9 @@ NETTLE_CONF_OPT := \
> --disable-openssl \
> --disable-gcov \
> --disable-documentation \
> + --disable-fat \
> + --disable-x86-aesni \
> + --disable-mini-gmp \
> --$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-arm-neon
>
> # ----------------------------------------------------------------------------
> --
> 2.8.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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-06-14 12:34 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-09 22:11 [ptxdist] [PATCH 1/3] nettle + gnutls: version bumps Robert Schwebel
2016-06-09 22:11 ` [ptxdist] [PATCH 2/3] xz: version bump 5.0.4 -> 5.2.2 Robert Schwebel
2016-06-14 7:26 ` Michael Olbrich
2016-06-09 22:11 ` [ptxdist] [PATCH 3/3] htop: version bump 1.0.3 -> 2.0.1 Robert Schwebel
2016-06-13 12:48 ` Ladislav Michl
2016-06-14 5:23 ` Robert Schwebel
2016-06-14 12:34 ` Michael Olbrich
2016-06-13 8:09 ` [ptxdist] [PATCH 1/3] nettle + gnutls: version bumps Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox