From c3206ad77cf101afc689860855a764980418b4bb Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Wed, 21 Nov 2018 16:22:41 +0100
Subject: [PATCH] Renumber some patches
---
...-luci-base-Add-webapps-configuration.patch} | 0
...> 0002-kernel-Add-Turris-1.X-support.patch} | 0
...tomatically-bump-release-when-needed.patch} | 0
...atch => 0004-mvebu-Basic-MoX-support.patch} | 0
.../0001-transmission-Add-to-webapps.patch | 0
...jit-Try-to-build-something-on-64bits.patch} | 0
...-and-drop-chains-added-option-to-set-.patch | 12 ++++++------
...Provide-packages-for-python2-as-well.patch} | 6 +++---
...=> 0003-luajit-Enable-build-on-arm64.patch} | 8 ++++----
...-mariadb-Small-init-script-polishing.patch} | 14 +++++++-------
...> 0005-net-openssh-permit-root-login.patch} | 12 ++++++------
...pthread-hack-when-compiling-with-pam.patch} | 10 +++++-----
...=> 0007-python-jinja2-Add-host-build.patch} | 6 +++---
...008-python-markupsafe-Add-host-build.patch} | 6 +++---
...ch => 0009-python-ply-Add-host-build.patch} | 18 +++++++++---------
...10-pythons-intepreter-in-scripts-fix.patch} | 6 +++---
...ython3-Drop-pytest-from-requirements.patch} | 4 ++--
...ython-version-part-of-release-number.patch} | 4 ++--
18 files changed, 53 insertions(+), 53 deletions(-)
rename patches/luci/branding/{0001-luci-base-Add-webapps-configuration.patch => 0002-luci-base-Add-webapps-configuration.patch} (100%)
rename patches/openwrt/wip/{0001-kernel-Add-Turris-1.X-support.patch => 0002-kernel-Add-Turris-1.X-support.patch} (100%)
rename patches/openwrt/wip/{0001-build-Automatically-bump-release-when-needed.patch => 0003-build-Automatically-bump-release-when-needed.patch} (100%)
rename patches/openwrt/wip/{0001-mvebu-Basic-MoX-support.patch => 0004-mvebu-Basic-MoX-support.patch} (100%)
rename patches/packages/{hack => branding}/0001-transmission-Add-to-webapps.patch (100%)
rename patches/packages/hack/{0001-luajit-Try-to-build-something-on-64bits.patch => 0002-luajit-Try-to-build-something-on-64bits.patch} (100%)
rename patches/packages/to-upstream/{0001-jinja2-Provide-packages-for-python2-as-well.patch => 0002-jinja2-Provide-packages-for-python2-as-well.patch} (95%)
rename patches/packages/to-upstream/{0001-luajit-Enable-build-on-arm64.patch => 0003-luajit-Enable-build-on-arm64.patch} (80%)
rename patches/packages/to-upstream/{0001-mariadb-Small-init-script-polishing.patch => 0004-mariadb-Small-init-script-polishing.patch} (90%)
rename patches/packages/to-upstream/{0001-net-openssh-permit-root-login.patch => 0005-net-openssh-permit-root-login.patch} (82%)
rename patches/packages/to-upstream/{0001-openssh-Enable-pthread-hack-when-compiling-with-pam.patch => 0006-openssh-Enable-pthread-hack-when-compiling-with-pam.patch} (67%)
rename patches/packages/to-upstream/{0001-python-jinja2-Add-host-build.patch => 0007-python-jinja2-Add-host-build.patch} (96%)
rename patches/packages/to-upstream/{0001-python-markupsafe-Add-host-build.patch => 0008-python-markupsafe-Add-host-build.patch} (95%)
rename patches/packages/to-upstream/{0001-python-ply-Add-host-build.patch => 0009-python-ply-Add-host-build.patch} (77%)
rename patches/packages/to-upstream/{0001-pythons-intepreter-in-scripts-fix.patch => 0010-pythons-intepreter-in-scripts-fix.patch} (95%)
rename patches/packages/to-upstream/{0001-python3-Drop-pytest-from-requirements.patch => 0011-python3-Drop-pytest-from-requirements.patch} (86%)
rename patches/packages/to-upstream/{0001-python3-Make-python-version-part-of-release-number.patch => 0012-python3-Make-python-version-part-of-release-number.patch} (85%)
diff --git a/patches/luci/branding/0001-luci-base-Add-webapps-configuration.patch b/patches/luci/branding/0002-luci-base-Add-webapps-configuration.patch
similarity index 100%
rename from patches/luci/branding/0001-luci-base-Add-webapps-configuration.patch
rename to patches/luci/branding/0002-luci-base-Add-webapps-configuration.patch
diff --git a/patches/openwrt/wip/0001-kernel-Add-Turris-1.X-support.patch b/patches/openwrt/wip/0002-kernel-Add-Turris-1.X-support.patch
similarity index 100%
rename from patches/openwrt/wip/0001-kernel-Add-Turris-1.X-support.patch
rename to patches/openwrt/wip/0002-kernel-Add-Turris-1.X-support.patch
diff --git a/patches/openwrt/wip/0001-build-Automatically-bump-release-when-needed.patch b/patches/openwrt/wip/0003-build-Automatically-bump-release-when-needed.patch
similarity index 100%
rename from patches/openwrt/wip/0001-build-Automatically-bump-release-when-needed.patch
rename to patches/openwrt/wip/0003-build-Automatically-bump-release-when-needed.patch
diff --git a/patches/openwrt/wip/0001-mvebu-Basic-MoX-support.patch b/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
similarity index 100%
rename from patches/openwrt/wip/0001-mvebu-Basic-MoX-support.patch
rename to patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
diff --git a/patches/packages/hack/0001-transmission-Add-to-webapps.patch b/patches/packages/branding/0001-transmission-Add-to-webapps.patch
similarity index 100%
rename from patches/packages/hack/0001-transmission-Add-to-webapps.patch
rename to patches/packages/branding/0001-transmission-Add-to-webapps.patch
diff --git a/patches/packages/hack/0001-luajit-Try-to-build-something-on-64bits.patch b/patches/packages/hack/0002-luajit-Try-to-build-something-on-64bits.patch
similarity index 100%
rename from patches/packages/hack/0001-luajit-Try-to-build-something-on-64bits.patch
rename to patches/packages/hack/0002-luajit-Try-to-build-something-on-64bits.patch
diff --git a/patches/packages/to-upstream/0001-firewall-accept-and-drop-chains-added-option-to-set-.patch b/patches/packages/to-upstream/0001-firewall-accept-and-drop-chains-added-option-to-set-.patch
index cb61a271a..a792c838c 100644
--- a/patches/packages/to-upstream/0001-firewall-accept-and-drop-chains-added-option-to-set-.patch
+++ b/patches/packages/to-upstream/0001-firewall-accept-and-drop-chains-added-option-to-set-.patch
@@ -1,8 +1,8 @@
-From d2205f8c9b36516bcbcd7e3b1a018638dd277fa3 Mon Sep 17 00:00:00 2001
+From 5d4b0f972af5ed68f40d5c2ffc52b606b0a49436 Mon Sep 17 00:00:00 2001
From: Stepan Henek <stepan.henek@nic.cz>
Date: Tue, 12 Jun 2018 14:36:58 +0200
-Subject: [PATCH] firewall: accept and drop chains added + option to set uci
- config directory added
+Subject: [PATCH 01/12] firewall: accept and drop chains added + option to set
+ uci config directory added
---
.../01-accept-and-reject-chains-added.patch | 160 ++++++++++++++++++
@@ -13,7 +13,7 @@ Subject: [PATCH] firewall: accept and drop chains added + option to set uci
diff --git a/package/network/config/firewall/patches/01-accept-and-reject-chains-added.patch b/package/network/config/firewall/patches/01-accept-and-reject-chains-added.patch
new file mode 100644
-index 0000000000..1a3970b58e
+index 0000000..1a3970b
--- /dev/null
+++ b/package/network/config/firewall/patches/01-accept-and-reject-chains-added.patch
@@ -0,0 +1,160 @@
@@ -179,7 +179,7 @@ index 0000000000..1a3970b58e
+
diff --git a/package/network/config/firewall/patches/02-uci_config_dir-option-added.patch b/package/network/config/firewall/patches/02-uci_config_dir-option-added.patch
new file mode 100644
-index 0000000000..d1571600eb
+index 0000000..d157160
--- /dev/null
+++ b/package/network/config/firewall/patches/02-uci_config_dir-option-added.patch
@@ -0,0 +1,57 @@
@@ -241,5 +241,5 @@ index 0000000000..d1571600eb
+ rv = usage();
+ goto out;
--
-2.17.1
+2.19.1
diff --git a/patches/packages/to-upstream/0001-jinja2-Provide-packages-for-python2-as-well.patch b/patches/packages/to-upstream/0002-jinja2-Provide-packages-for-python2-as-well.patch
similarity index 95%
rename from patches/packages/to-upstream/0001-jinja2-Provide-packages-for-python2-as-well.patch
rename to patches/packages/to-upstream/0002-jinja2-Provide-packages-for-python2-as-well.patch
index c50a47484..741dddcd3 100644
--- a/patches/packages/to-upstream/0001-jinja2-Provide-packages-for-python2-as-well.patch
+++ b/patches/packages/to-upstream/0002-jinja2-Provide-packages-for-python2-as-well.patch
@@ -1,7 +1,7 @@
-From 50f3ea44d93be1ef3714510c662aa1ec24056a86 Mon Sep 17 00:00:00 2001
+From e0abd98aae3a200cf4f1ac80a5bf7e565b67c82f Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Tue, 7 Aug 2018 15:14:55 +0200
-Subject: [PATCH] jinja2: Provide packages for python2 as well
+Subject: [PATCH 02/12] jinja2: Provide packages for python2 as well
Provide packages for legacy applications till they get ported.
@@ -98,5 +98,5 @@ index 84cd184..e7b8884 100644
+$(eval $(call PyPackage,python-markupsafe))
+$(eval $(call BuildPackage,python-markupsafe))
--
-2.18.0
+2.19.1
diff --git a/patches/packages/to-upstream/0001-luajit-Enable-build-on-arm64.patch b/patches/packages/to-upstream/0003-luajit-Enable-build-on-arm64.patch
similarity index 80%
rename from patches/packages/to-upstream/0001-luajit-Enable-build-on-arm64.patch
rename to patches/packages/to-upstream/0003-luajit-Enable-build-on-arm64.patch
index b01e703cd..2ac334b54 100644
--- a/patches/packages/to-upstream/0001-luajit-Enable-build-on-arm64.patch
+++ b/patches/packages/to-upstream/0003-luajit-Enable-build-on-arm64.patch
@@ -1,7 +1,7 @@
-From 6ceafc313752b421e4b3938b571dc0dccd84d552 Mon Sep 17 00:00:00 2001
+From 6a0852697a0912c22995ef97f0a72c4edc765f15 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Thu, 24 May 2018 12:46:40 +0200
-Subject: [PATCH] luajit: Enable build on arm64
+Subject: [PATCH 03/12] luajit: Enable build on arm64
Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
---
@@ -9,7 +9,7 @@ Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
-index e5dfa95..334cbb6 100644
+index fbf126e..40abbee 100644
--- a/lang/luajit/Makefile
+++ b/lang/luajit/Makefile
@@ -26,7 +26,7 @@ define Package/luajit
@@ -22,5 +22,5 @@ index e5dfa95..334cbb6 100644
define Package/luajit/description
--
-2.17.0
+2.19.1
diff --git a/patches/packages/to-upstream/0001-mariadb-Small-init-script-polishing.patch b/patches/packages/to-upstream/0004-mariadb-Small-init-script-polishing.patch
similarity index 90%
rename from patches/packages/to-upstream/0001-mariadb-Small-init-script-polishing.patch
rename to patches/packages/to-upstream/0004-mariadb-Small-init-script-polishing.patch
index b49424ea0..59eae1575 100644
--- a/patches/packages/to-upstream/0001-mariadb-Small-init-script-polishing.patch
+++ b/patches/packages/to-upstream/0004-mariadb-Small-init-script-polishing.patch
@@ -1,7 +1,7 @@
-From d9ba8d6cf441203761b78fbe21d18dc5b7fab21d Mon Sep 17 00:00:00 2001
+From eef1749fe403449ad1e68b2e967c88d303dd8003 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Tue, 9 Oct 2018 12:22:35 +0200
-Subject: [PATCH] mariadb: Small init script polishing
+Subject: [PATCH 04/12] mariadb: Small init script polishing
Using mysqld to get datadir, tmpdir, pidfile and socketfile. This way they
don't need to be set or can be set in included configuration file. Also allows
@@ -15,15 +15,15 @@ Also include fallback when logger is not available.
Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
---
- utils/mariadb/Makefile | 8 +++++---
+ utils/mariadb/Makefile | 6 ++++--
utils/mariadb/files/mysqld.init | 20 +++++++++++---------
- 2 files changed, 16 insertions(+), 12 deletions(-)
+ 2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile
-index c0c4e3a69..7ff8f2bc3 100644
+index b501e7e..cc60dce 100644
--- a/utils/mariadb/Makefile
+++ b/utils/mariadb/Makefile
-@@ -493,10 +493,12 @@ define Package/mariadb-server/install
+@@ -494,10 +494,12 @@ define Package/mariadb-server/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/etc/mysql/conf.d
$(INSTALL_BIN) files/mysqld.init $(1)/etc/init.d/mysqld
@@ -39,7 +39,7 @@ index c0c4e3a69..7ff8f2bc3 100644
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/mysql/english/errmsg.sys $(1)/usr/share/mysql/english
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/mysql/fill_help_tables.sql $(1)/usr/share/mysql
diff --git a/utils/mariadb/files/mysqld.init b/utils/mariadb/files/mysqld.init
-index abc99fc7a..a9ee9ebb4 100644
+index abc99fc..a9ee9eb 100644
--- a/utils/mariadb/files/mysqld.init
+++ b/utils/mariadb/files/mysqld.init
@@ -12,6 +12,7 @@ MYSQLD=mysqld
diff --git a/patches/packages/to-upstream/0001-net-openssh-permit-root-login.patch b/patches/packages/to-upstream/0005-net-openssh-permit-root-login.patch
similarity index 82%
rename from patches/packages/to-upstream/0001-net-openssh-permit-root-login.patch
rename to patches/packages/to-upstream/0005-net-openssh-permit-root-login.patch
index 607470d4f..73f34b0bf 100644
--- a/patches/packages/to-upstream/0001-net-openssh-permit-root-login.patch
+++ b/patches/packages/to-upstream/0005-net-openssh-permit-root-login.patch
@@ -1,7 +1,7 @@
-From d1c8fb6e30b860062c76948414648caa38502039 Mon Sep 17 00:00:00 2001
+From 42967b6eda28ce99593699089c2a25a3c72bbe48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Mon, 28 May 2018 16:36:07 +0200
-Subject: [PATCH] net/openssh: permit root login
+Subject: [PATCH 05/12] net/openssh: permit root login
Having no root login possibility is commonly pretty good idea but not on
device with only root account. Because of that root login should be
@@ -11,10 +11,10 @@ enabled by default on OpenWRT.
1 file changed, 2 insertions(+)
diff --git a/net/openssh/Makefile b/net/openssh/Makefile
-index 3098481..dedf26a 100644
+index 09063ab..639ce5f 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
-@@ -250,6 +250,7 @@ define Package/openssh-server/install
+@@ -236,6 +236,7 @@ define Package/openssh-server/install
chmod 0700 $(1)/etc/ssh
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/
sed -r -i 's,^#(HostKey /etc/ssh/ssh_host_(rsa|ecdsa|ed25519)_key)$$$$,\1,' $(1)/etc/ssh/sshd_config
@@ -22,7 +22,7 @@ index 3098481..dedf26a 100644
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd
$(INSTALL_DIR) $(1)/usr/sbin
-@@ -260,6 +261,7 @@ define Package/openssh-server-pam/install
+@@ -246,6 +247,7 @@ define Package/openssh-server-pam/install
$(call Package/openssh-server/install,$(1))
sed -i 's,#PasswordAuthentication yes,PasswordAuthentication no,g' $(1)/etc/ssh/sshd_config
sed -i 's,#UsePAM no,UsePAM yes,g' $(1)/etc/ssh/sshd_config
@@ -31,5 +31,5 @@ index 3098481..dedf26a 100644
$(INSTALL_DATA) ./files/sshd.pam $(1)/etc/pam.d/sshd
$(INSTALL_DIR) $(1)/etc/security
--
-2.17.0
+2.19.1
diff --git a/patches/packages/to-upstream/0001-openssh-Enable-pthread-hack-when-compiling-with-pam.patch b/patches/packages/to-upstream/0006-openssh-Enable-pthread-hack-when-compiling-with-pam.patch
similarity index 67%
rename from patches/packages/to-upstream/0001-openssh-Enable-pthread-hack-when-compiling-with-pam.patch
rename to patches/packages/to-upstream/0006-openssh-Enable-pthread-hack-when-compiling-with-pam.patch
index 39e11b66e..8ee8c094b 100644
--- a/patches/packages/to-upstream/0001-openssh-Enable-pthread-hack-when-compiling-with-pam.patch
+++ b/patches/packages/to-upstream/0006-openssh-Enable-pthread-hack-when-compiling-with-pam.patch
@@ -1,7 +1,7 @@
-From 90eea2dc3733a147d1fedfe1996deb3c377a94fa Mon Sep 17 00:00:00 2001
+From a02d444ceba0a5972dd76b2412199edbf35cb072 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Wed, 2 May 2018 16:10:06 +0200
-Subject: [PATCH] openssh: Enable pthread hack when compiling with pam
+Subject: [PATCH 06/12] openssh: Enable pthread hack when compiling with pam
Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
---
@@ -9,10 +9,10 @@ Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
1 file changed, 1 insertion(+)
diff --git a/net/openssh/Makefile b/net/openssh/Makefile
-index afdd602..3098481 100644
+index 639ce5f..02882df 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
-@@ -189,6 +189,7 @@ CONFIGURE_VARS += LD="$(TARGET_CC)"
+@@ -194,6 +194,7 @@ CONFIGURE_VARS += LD="$(TARGET_CC)"
ifeq ($(BUILD_VARIANT),with-pam)
TARGET_LDFLAGS += -lpthread
@@ -21,5 +21,5 @@ index afdd602..3098481 100644
define Build/Compile
--
-2.16.3
+2.19.1
diff --git a/patches/packages/to-upstream/0001-python-jinja2-Add-host-build.patch b/patches/packages/to-upstream/0007-python-jinja2-Add-host-build.patch
similarity index 96%
rename from patches/packages/to-upstream/0001-python-jinja2-Add-host-build.patch
rename to patches/packages/to-upstream/0007-python-jinja2-Add-host-build.patch
index f36d6551b..e0881310f 100644
--- a/patches/packages/to-upstream/0001-python-jinja2-Add-host-build.patch
+++ b/patches/packages/to-upstream/0007-python-jinja2-Add-host-build.patch
@@ -1,7 +1,7 @@
-From e47692c60b546f3ac7f916c55440274f4133a388 Mon Sep 17 00:00:00 2001
+From af00a1cb1a76e92326f278d121d0e71938e87547 Mon Sep 17 00:00:00 2001
From: Stepan Henek <stepan.henek@nic.cz>
Date: Wed, 22 Aug 2018 13:05:02 +0200
-Subject: [PATCH] python-jinja2: Add host build
+Subject: [PATCH 07/12] python-jinja2: Add host build
Signed-off-by: Stepan Henek <stepan.henek@nic.cz>
---
@@ -116,5 +116,5 @@ index d95eb0b..51f7b82 100644
$(eval $(call BuildPackage,python-jinja2))
+$(eval $(call BuildPackage,python-jinja2-src))
--
-2.18.0
+2.19.1
diff --git a/patches/packages/to-upstream/0001-python-markupsafe-Add-host-build.patch b/patches/packages/to-upstream/0008-python-markupsafe-Add-host-build.patch
similarity index 95%
rename from patches/packages/to-upstream/0001-python-markupsafe-Add-host-build.patch
rename to patches/packages/to-upstream/0008-python-markupsafe-Add-host-build.patch
index 227652b91..59c5eeb64 100644
--- a/patches/packages/to-upstream/0001-python-markupsafe-Add-host-build.patch
+++ b/patches/packages/to-upstream/0008-python-markupsafe-Add-host-build.patch
@@ -1,7 +1,7 @@
-From d46533bcde39eb704f0ef91d5a847b5a257df069 Mon Sep 17 00:00:00 2001
+From f5a864c020c87063a8f87ee4d6916fef447668bc Mon Sep 17 00:00:00 2001
From: Stepan Henek <stepan.henek@nic.cz>
Date: Wed, 22 Aug 2018 11:08:34 +0200
-Subject: [PATCH] python-markupsafe: Add host build
+Subject: [PATCH 08/12] python-markupsafe: Add host build
Signed-off-by: Stepan Henek <stepan.henek@nic.cz>
---
@@ -68,5 +68,5 @@ index e7b8884..88df3b9 100644
-$(eval $(call BuildPackage,python-markupsafe))
+$(eval $(call BuildPackage,python3-markupsafe-src))
--
-2.18.0
+2.19.1
diff --git a/patches/packages/to-upstream/0001-python-ply-Add-host-build.patch b/patches/packages/to-upstream/0009-python-ply-Add-host-build.patch
similarity index 77%
rename from patches/packages/to-upstream/0001-python-ply-Add-host-build.patch
rename to patches/packages/to-upstream/0009-python-ply-Add-host-build.patch
index e8015f96b..da87ac93c 100644
--- a/patches/packages/to-upstream/0001-python-ply-Add-host-build.patch
+++ b/patches/packages/to-upstream/0009-python-ply-Add-host-build.patch
@@ -1,23 +1,23 @@
-From 63df256254d8307d8f9a0223148cc4707a2427a5 Mon Sep 17 00:00:00 2001
+From d1c051698e20ed687bbd03399580265d523bed3f Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Tue, 23 Jan 2018 18:16:51 +0100
-Subject: [PATCH] python-ply: Add host build
+Subject: [PATCH 09/12] python-ply: Add host build
Might be handy to somebody and we actually need it.
Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
---
- lang/python/python-ply/Makefile | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
+ lang/python/python-ply/Makefile | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
diff --git a/lang/python/python-ply/Makefile b/lang/python/python-ply/Makefile
-index 6970204..4d0ee58 100644
+index 85aa740..258b04e 100644
--- a/lang/python/python-ply/Makefile
+++ b/lang/python/python-ply/Makefile
-@@ -21,11 +21,15 @@ PKG_LICENSE:=BSD-3-Clause
+@@ -22,11 +22,15 @@ PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=README.md
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
-
+
+HOST_BUILD_DEPENDS:=python/host
+include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
@@ -30,7 +30,7 @@ index 6970204..4d0ee58 100644
define Package/python-ply/Default
SECTION:=lang
-@@ -59,6 +62,15 @@ $(call Package/python-ply/description)
+@@ -60,6 +64,15 @@ $(call Package/python-ply/description)
(Variant for Python3)
endef
@@ -47,5 +47,5 @@ index 6970204..4d0ee58 100644
$(eval $(call BuildPackage,python-ply))
$(eval $(call BuildPackage,python-ply-src))
--
-2.15.1
+2.19.1
diff --git a/patches/packages/to-upstream/0001-pythons-intepreter-in-scripts-fix.patch b/patches/packages/to-upstream/0010-pythons-intepreter-in-scripts-fix.patch
similarity index 95%
rename from patches/packages/to-upstream/0001-pythons-intepreter-in-scripts-fix.patch
rename to patches/packages/to-upstream/0010-pythons-intepreter-in-scripts-fix.patch
index a816b65ba..cf702f7b6 100644
--- a/patches/packages/to-upstream/0001-pythons-intepreter-in-scripts-fix.patch
+++ b/patches/packages/to-upstream/0010-pythons-intepreter-in-scripts-fix.patch
@@ -1,7 +1,7 @@
-From e5c52f022247e572a6febfa2f705ff60451638c2 Mon Sep 17 00:00:00 2001
+From 13c5d314410b44543d9c5dad16cc995dfc6757f6 Mon Sep 17 00:00:00 2001
From: Stepan Henek <stepan.henek@nic.cz>
Date: Mon, 27 Aug 2018 12:29:49 +0200
-Subject: [PATCH] pythons: intepreter in scripts fix
+Subject: [PATCH 10/12] pythons: intepreter in scripts fix
Signed-off-by: Stepan Henek <stepan.henek@nic.cz>
---
@@ -91,5 +91,5 @@ index 9e473b5..7f47370 100644
define Build/Compile
$(call Py3Build/Compile)
--
-2.18.0
+2.19.1
diff --git a/patches/packages/to-upstream/0001-python3-Drop-pytest-from-requirements.patch b/patches/packages/to-upstream/0011-python3-Drop-pytest-from-requirements.patch
similarity index 86%
rename from patches/packages/to-upstream/0001-python3-Drop-pytest-from-requirements.patch
rename to patches/packages/to-upstream/0011-python3-Drop-pytest-from-requirements.patch
index a4bf6e3b7..2e4154429 100644
--- a/patches/packages/to-upstream/0001-python3-Drop-pytest-from-requirements.patch
+++ b/patches/packages/to-upstream/0011-python3-Drop-pytest-from-requirements.patch
@@ -1,7 +1,7 @@
-From 390b6b1c3ad18833743320f1c8fd04b0246b4759 Mon Sep 17 00:00:00 2001
+From a4d3fa64e7ec479a1311300ab9c1b435e4fd64b3 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Wed, 21 Nov 2018 15:25:57 +0100
-Subject: [PATCH] python3: Drop pytest from requirements
+Subject: [PATCH 11/12] python3: Drop pytest from requirements
We don't plan to run them anyway, so let's keep this dependency out.
diff --git a/patches/packages/to-upstream/0001-python3-Make-python-version-part-of-release-number.patch b/patches/packages/to-upstream/0012-python3-Make-python-version-part-of-release-number.patch
similarity index 85%
rename from patches/packages/to-upstream/0001-python3-Make-python-version-part-of-release-number.patch
rename to patches/packages/to-upstream/0012-python3-Make-python-version-part-of-release-number.patch
index c69e4e864..8109faad6 100644
--- a/patches/packages/to-upstream/0001-python3-Make-python-version-part-of-release-number.patch
+++ b/patches/packages/to-upstream/0012-python3-Make-python-version-part-of-release-number.patch
@@ -1,7 +1,7 @@
-From 80daee8c1a4573e5045934a14f7f2d77e7d99f19 Mon Sep 17 00:00:00 2001
+From d3876d96ff2f2b00d1a6598c6ac30f329efa9d77 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Wed, 21 Nov 2018 15:27:34 +0100
-Subject: [PATCH] python3: Make python version part of release number
+Subject: [PATCH 12/12] python3: Make python version part of release number
We need to distinguish between packages targeting different python version.
--
GitLab