Refreshing use-system-python.patch.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 116 deletions

diff --git a/debian/patches/debian/0001-use-system-python.patch b/debian/patches/debian/0001-use-system-python.patch
index 5a14159d5..b52273910 100644
--- a/debian/patches/debian/0001-use-system-python.patch
+++ b/debian/patches/debian/0001-use-system-python.patch
@@ -1,122 +1,9 @@
 Author: Lennart Weller <lhw@ring0.de>
 Description: Ignore embedded python modules.
 
-diff -Naurp netdata.orig/collectors/python.d.plugin/Makefile.am netdata/collectors/python.d.plugin/Makefile.am
---- netdata.orig/collectors/python.d.plugin/Makefile.am
-+++ netdata/collectors/python.d.plugin/Makefile.am
-@@ -145,109 +145,3 @@ dist_third_party_DATA = \
-     python_modules/third_party/monotonic.py \
-     python_modules/third_party/filelock.py \
-     $(NULL)
--
--pythonyaml2dir=$(pythonmodulesdir)/pyyaml2
--dist_pythonyaml2_DATA = \
--    python_modules/pyyaml2/__init__.py \
--    python_modules/pyyaml2/composer.py \
--    python_modules/pyyaml2/constructor.py \
--    python_modules/pyyaml2/cyaml.py \
--    python_modules/pyyaml2/dumper.py \
--    python_modules/pyyaml2/emitter.py \
--    python_modules/pyyaml2/error.py \
--    python_modules/pyyaml2/events.py \
--    python_modules/pyyaml2/loader.py \
--    python_modules/pyyaml2/nodes.py \
--    python_modules/pyyaml2/parser.py \
--    python_modules/pyyaml2/reader.py \
--    python_modules/pyyaml2/representer.py \
--    python_modules/pyyaml2/resolver.py \
--    python_modules/pyyaml2/scanner.py \
--    python_modules/pyyaml2/serializer.py \
--    python_modules/pyyaml2/tokens.py \
--    $(NULL)
--
--pythonyaml3dir=$(pythonmodulesdir)/pyyaml3
--dist_pythonyaml3_DATA = \
--    python_modules/pyyaml3/__init__.py \
--    python_modules/pyyaml3/composer.py \
--    python_modules/pyyaml3/constructor.py \
--    python_modules/pyyaml3/cyaml.py \
--    python_modules/pyyaml3/dumper.py \
--    python_modules/pyyaml3/emitter.py \
--    python_modules/pyyaml3/error.py \
--    python_modules/pyyaml3/events.py \
--    python_modules/pyyaml3/loader.py \
--    python_modules/pyyaml3/nodes.py \
--    python_modules/pyyaml3/parser.py \
--    python_modules/pyyaml3/reader.py \
--    python_modules/pyyaml3/representer.py \
--    python_modules/pyyaml3/resolver.py \
--    python_modules/pyyaml3/scanner.py \
--    python_modules/pyyaml3/serializer.py \
--    python_modules/pyyaml3/tokens.py \
--    $(NULL)
--
--python_urllib3dir=$(pythonmodulesdir)/urllib3
--dist_python_urllib3_DATA = \
--    python_modules/urllib3/__init__.py \
--    python_modules/urllib3/_collections.py \
--    python_modules/urllib3/connection.py \
--    python_modules/urllib3/connectionpool.py \
--    python_modules/urllib3/exceptions.py \
--    python_modules/urllib3/fields.py \
--    python_modules/urllib3/filepost.py \
--    python_modules/urllib3/response.py \
--    python_modules/urllib3/poolmanager.py \
--    python_modules/urllib3/request.py \
--    $(NULL)
--
--python_urllib3_utildir=$(python_urllib3dir)/util
--dist_python_urllib3_util_DATA = \
--    python_modules/urllib3/util/__init__.py \
--    python_modules/urllib3/util/connection.py \
--    python_modules/urllib3/util/request.py \
--    python_modules/urllib3/util/response.py \
--    python_modules/urllib3/util/retry.py \
--    python_modules/urllib3/util/selectors.py \
--    python_modules/urllib3/util/ssl_.py \
--    python_modules/urllib3/util/timeout.py \
--    python_modules/urllib3/util/url.py \
--    python_modules/urllib3/util/wait.py \
--    $(NULL)
--
--python_urllib3_packagesdir=$(python_urllib3dir)/packages
--dist_python_urllib3_packages_DATA = \
--    python_modules/urllib3/packages/__init__.py \
--    python_modules/urllib3/packages/ordered_dict.py \
--    python_modules/urllib3/packages/six.py \
--    $(NULL)
--
--python_urllib3_backportsdir=$(python_urllib3_packagesdir)/backports
--dist_python_urllib3_backports_DATA = \
--    python_modules/urllib3/packages/backports/__init__.py \
--    python_modules/urllib3/packages/backports/makefile.py \
--    $(NULL)
--
--python_urllib3_ssl_match_hostnamedir=$(python_urllib3_packagesdir)/ssl_match_hostname
--dist_python_urllib3_ssl_match_hostname_DATA = \
--    python_modules/urllib3/packages/ssl_match_hostname/__init__.py \
--    python_modules/urllib3/packages/ssl_match_hostname/_implementation.py \
--    $(NULL)
--
--python_urllib3_contribdir=$(python_urllib3dir)/contrib
--dist_python_urllib3_contrib_DATA = \
--    python_modules/urllib3/contrib/__init__.py \
--    python_modules/urllib3/contrib/appengine.py \
--    python_modules/urllib3/contrib/ntlmpool.py \
--    python_modules/urllib3/contrib/pyopenssl.py \
--    python_modules/urllib3/contrib/securetransport.py \
--    python_modules/urllib3/contrib/socks.py \
--    $(NULL)
--
--python_urllib3_securetransportdir=$(python_urllib3_contribdir)/_securetransport
--dist_python_urllib3_securetransport_DATA = \
--    python_modules/urllib3/contrib/_securetransport/__init__.py \
--    python_modules/urllib3/contrib/_securetransport/bindings.py \
--    python_modules/urllib3/contrib/_securetransport/low_level.py \
--    $(NULL)
-diff -Naurp netdata.orig/collectors/python.d.plugin/python_modules/bases/loaders.py netdata/collectors/python.d.plugin/python_modules/bases/loaders.py
---- netdata.orig/collectors/python.d.plugin/python_modules/bases/loaders.py
-+++ netdata/collectors/python.d.plugin/python_modules/bases/loaders.py
+diff -Naurp netdata.orig/src/collectors/python.d.plugin/python_modules/bases/loaders.py netdata/src/collectors/python.d.plugin/python_modules/bases/loaders.py
+--- netdata.orig/src/collectors/python.d.plugin/python_modules/bases/loaders.py
++++ netdata/src/collectors/python.d.plugin/python_modules/bases/loaders.py
 @@ -9,10 +9,7 @@ from sys import version_info
  PY_VERSION = version_info[:2]