[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a42dfb216d63b80ff0d03b1359424d65e3c133dc

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a42dfb216d63b80ff0d03b1359424d65e3c133dc

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 4687 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  a42dfb216d63b80ff0d03b1359424d65e3c133dc (commit)
       via  45a3168ef11d07733a14a6e78c4bdc21c56fe98a (commit)
      from  d704e75d750b38e77d01ca32fd5a4d70470467ce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a42dfb216d63b80ff0d03b1359424d65e3c133dc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 28 16:51:29 2019 +0000

    speedtest-cli: Use Python 3 instead of Python 2
    
    This seems to be required although the documentation says
    that Python 2 is supported.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 45a3168ef11d07733a14a6e78c4bdc21c56fe98a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 28 16:49:54 2019 +0000

    python3: Bump release version to redistribute package
    
    Python 3 was linked against an old version of OpenSSL on my
    system and to avoid this, we need to ship it again being built
    against the current version of it.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/packages/speedtest-cli | 16 ++++++++--------
 lfs/python3                             |  2 +-
 lfs/speedtest-cli                       |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

Difference in files:
diff --git a/config/rootfiles/packages/speedtest-cli b/config/rootfiles/packages/speedtest-cli
index f21c7afa7..7dc60ca81 100644
--- a/config/rootfiles/packages/speedtest-cli
+++ b/config/rootfiles/packages/speedtest-cli
@@ -1,10 +1,10 @@
 usr/bin/speedtest
 usr/bin/speedtest-cli
-usr/lib/python2.7/site-packages/speedtest.py
-usr/lib/python2.7/site-packages/speedtest.pyc
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/PKG-INFO
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/SOURCES.txt
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/dependency_links.txt
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/entry_points.txt
-#usr/lib/python2.7/site-packages/speedtest_cli-2.1.2-py2.7.egg-info/top_level.txt
+usr/lib/python3.6/site-packages/__pycache__/speedtest.cpython-36.pyc
+usr/lib/python3.6/site-packages/speedtest.py
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/entry_points.txt
+usr/lib/python3.6/site-packages/speedtest_cli-2.1.2-py3.6.egg-info/top_level.txt
diff --git a/lfs/python3 b/lfs/python3
index 70f39c3e9..1767afddf 100644
--- a/lfs/python3
+++ b/lfs/python3
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 
diff --git a/lfs/speedtest-cli b/lfs/speedtest-cli
index aa2af73bb..6c11d5314 100644
--- a/lfs/speedtest-cli
+++ b/lfs/speedtest-cli
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = speedtest-cli
-PAK_VER    = 1
+PAK_VER    = 2
 
-DEPS       = ""
+DEPS       = "python3"
 
 ###############################################################################
 # Top-level Rules
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && python setup.py build
-	cd $(DIR_APP) && python setup.py install --root=/
+	cd $(DIR_APP) && python3 setup.py build
+	cd $(DIR_APP) && python3 setup.py install --root=/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)


hooks/post-receive
--
IPFire 2.x development tree