From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 1 Jul 2021 17:16:09 +0000 (+0000)
Subject: Revert "python-six: Removal of python2 & 3 addon versions of six"
X-Git-Tag: v2.25-core158~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5996c2815798e7bb8c069caad40ffb084ecf1cf7;p=ipfire-2.x.git

Revert "python-six: Removal of python2 & 3 addon versions of six"

This reverts commit 3a61ae73fa179adb24f9feeb8ee486c1900609bf.

This module is required by awscli.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/python3-six b/config/rootfiles/packages/python3-six
new file mode 100644
index 0000000000..0801d36daf
--- /dev/null
+++ b/config/rootfiles/packages/python3-six
@@ -0,0 +1,6 @@
+#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info
+#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/PKG-INFO
+#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/SOURCES.txt
+#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/dependency_links.txt
+#usr/lib/python3.8/site-packages/six-1.14.0-py3.8.egg-info/top_level.txt
+usr/lib/python3.8/site-packages/six.py
diff --git a/lfs/python3-six b/lfs/python3-six
new file mode 100644
index 0000000000..9d467f2735
--- /dev/null
+++ b/lfs/python3-six
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.14.0
+
+THISAPP    = six-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = python3-six
+PAK_VER    = 3
+
+DEPS       =
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 21674588a57e649d1a6d977ec3122140
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && python3 setup.py build
+	cd $(DIR_APP) && python3 setup.py install --root=/
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index fc03ebcd5c..83bd9faeb6 100755
--- a/make.sh
+++ b/make.sh
@@ -1534,6 +1534,7 @@ buildipfire() {
   lfsmake2 libsolv
   lfsmake2 ddns
   lfsmake2 python3-setuptools-scm
+  lfsmake2 python3-six
   lfsmake2 python3-dateutil
   lfsmake2 python3-jmespath
   lfsmake2 python3-colorama