[ptxdist] [PATCH] libcurl: bump version and fix URL

[ptxdist] [PATCH] libcurl: bump version and fix URL

[Clemens Gruber]

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

diff --git a/rules/libcurl.make b/rules/libcurl.make
index 2a2f7f9..ca81879 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl
 #
 # Paths and names
 #
-LIBCURL_VERSION	:= 7.43.0
-LIBCURL_MD5	:= 11bddbb452a8b766b932f859aaeeed39
+LIBCURL_VERSION	:= 7.49.1
+LIBCURL_MD5	:= 6bb1f7af5b58b30e4e6414b8c1abccab
 LIBCURL		:= curl-$(LIBCURL_VERSION)
 LIBCURL_SUFFIX	:= tar.bz2
-LIBCURL_URL	:= https://github.com/bagder/curl/releases/download/curl-7_43_0/$(LIBCURL).$(LIBCURL_SUFFIX)
+LIBCURL_URL	:= https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)
 LIBCURL_SOURCE	:= $(SRCDIR)/$(LIBCURL).$(LIBCURL_SUFFIX)
 LIBCURL_DIR	:= $(BUILDDIR)/$(LIBCURL)
 LIBCURL_LICENSE	:= MIT
-- 
2.9.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] ca-certificates: update certificates

[Clemens Gruber]

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

diff --git a/rules/ca-certificates.make b/rules/ca-certificates.make
index 15065e0..01abd7a 100644
--- a/rules/ca-certificates.make
+++ b/rules/ca-certificates.make
@@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_CA_CERTIFICATES) += ca-certificates
 #
 # Paths and names
 #
-CA_CERTIFICATES_VERSION		:= 2015.04.22-1
+CA_CERTIFICATES_VERSION		:= 2016.02.26
 # The commit hash of the default branch. Update this in sync with the date above.
-CA_CERTIFICATES_HASH		:= d7ca3b75c842
-CA_CERTIFICATES_MD5		:= da5ff774b32aecbebb18d6fa974ef12a
+CA_CERTIFICATES_HASH		:= 07594dabc757
+CA_CERTIFICATES_MD5		:= 6dc99591db944198254c6e6ad8f0eaa4
 CA_CERTIFICATES			:= ca-certificates-$(CA_CERTIFICATES_VERSION)
 CA_CERTIFICATES_SUFFIX		:= txt
 CA_CERTIFICATES_URL		:= https://hg.mozilla.org/releases/mozilla-release/raw-file/$(CA_CERTIFICATES_HASH)/security/nss/lib/ckfw/builtins/certdata.$(CA_CERTIFICATES_SUFFIX)
-- 
2.9.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] ca-certificates: call python2 instead of python

[Clemens Gruber]

On ArchLinux, python defaults to python 3.5.1, which breaks the script.
Fix it by calling python2 directly instead of assuming python !=
python3.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 scripts/certdata2pem.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/certdata2pem.py b/scripts/certdata2pem.py
index 0482894..efb0eb3 100755
--- a/scripts/certdata2pem.py
+++ b/scripts/certdata2pem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # vim:set et sw=4:
 #
 # certdata2pem.py - splits certdata.txt into multiple files
-- 
2.9.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] ca-certificates: call python2 instead of python

[Michael Olbrich]

On Fri, Jul 01, 2016 at 11:15:45AM +0200, Clemens Gruber wrote:
> On ArchLinux, python defaults to python 3.5.1, which breaks the script.
> Fix it by calling python2 directly instead of assuming python !=
> python3.
> 
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
>  scripts/certdata2pem.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/certdata2pem.py b/scripts/certdata2pem.py
> index 0482894..efb0eb3 100755
> --- a/scripts/certdata2pem.py
> +++ b/scripts/certdata2pem.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/python2

Can you try '#!/usr/bin/env python'? That should work too.

Michael

>  # vim:set et sw=4:
>  #
>  # certdata2pem.py - splits certdata.txt into multiple files
> -- 
> 2.9.0
> 
> 
> _______________________________________________
> 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] ca-certificates: call python2 instead of python

[Clemens Gruber]

On Fri, Jul 01, 2016 at 12:37:55PM +0200, Michael Olbrich wrote:
> Can you try '#!/usr/bin/env python'? That should work too.

That won't work, because the problem is not the path itself, it's that
python is symlinked to python3 on Arch and probably in the future in
other distros as well. Arch is just a little ahead.

/usr/bin/env python --version returns "Python 3.5.1" on ArchLinux.

We could use /usr/bin/env python2 but that would only be good for
systems where python2 is not in /usr/bin but that does not seem to be
the problem.
A python2 symlink exists also on Debian, so /usr/bin/python2 should work
for most systems.

Otherwise we would need a logic like the following:

#!/bin/sh
''':'
if type python2 >/dev/null 2>/dev/null; then
  exec python2 "$0" "$@"
else
  exec python "$0" "$@"
fi
'''
# real Python script starts here

Would you prefer that?

Clemens

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] ca-certificates: call python2 instead of python

[Michael Olbrich]

On Fri, Jul 01, 2016 at 04:31:31PM +0200, Clemens Gruber wrote:
> On Fri, Jul 01, 2016 at 12:37:55PM +0200, Michael Olbrich wrote:
> > Can you try '#!/usr/bin/env python'? That should work too.
> 
> That won't work, because the problem is not the path itself, it's that
> python is symlinked to python3 on Arch and probably in the future in
> other distros as well. Arch is just a little ahead.
> 
> /usr/bin/env python --version returns "Python 3.5.1" on ArchLinux.
> 
> We could use /usr/bin/env python2 but that would only be good for
> systems where python2 is not in /usr/bin but that does not seem to be
> the problem.
> A python2 symlink exists also on Debian, so /usr/bin/python2 should work
> for most systems.

It should work correctly in PTXdist. We create <ptxdist>/bin/python as a
symlink to Python 2 when building PTXdist.

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

Re: [ptxdist] [PATCH] ca-certificates: call python2 instead of python

[Clemens Gruber]

On Mon, Jul 04, 2016 at 08:16:30AM +0200, Michael Olbrich wrote:
> It should work correctly in PTXdist. We create <ptxdist>/bin/python as a
> symlink to Python 2 when building PTXdist.

Ah, you are right, from within ptxdist it does work. Thanks!

I'll send a V2.

Clemens

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] mpg123: bump version to 1.23.5

[Clemens Gruber]

Important bugfixes.

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 059c3f6..e660947 100644
--- a/rules/mpg123.make
+++ b/rules/mpg123.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MPG123) += mpg123
 #
 # Paths and names
 #
-MPG123_VERSION	:= 1.23.1
-MPG123_MD5	:= f99210d31467dbf587e1e2974f329e5d
+MPG123_VERSION	:= 1.23.5
+MPG123_MD5	:= 6a318579dd7b52c5851bb7950af969ac
 MPG123		:= mpg123-$(MPG123_VERSION)
 MPG123_SUFFIX	:= tar.bz2
 MPG123_URL	:= http://www.mpg123.org/download/$(MPG123).$(MPG123_SUFFIX)
-- 
2.9.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de