From 139158d87cbdf903094e55178ebbf03348e1a27b Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Mon, 9 Nov 2020 16:11:16 -0800 Subject: [PATCH] dev-python/python-iptables-1.0.0-r1: revbump, add patch for new glibc Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Patrick McLean --- .../python-iptables-1.0.0-ldconfig-fix.patch | 21 +++++++++++++++++++ ...ebuild => python-iptables-1.0.0-r1.ebuild} | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 dev-python/python-iptables/files/python-iptables-1.0.0-ldconfig-fix.patch rename dev-python/python-iptables/{python-iptables-1.0.0.ebuild => python-iptables-1.0.0-r1.ebuild} (91%) diff --git a/dev-python/python-iptables/files/python-iptables-1.0.0-ldconfig-fix.patch b/dev-python/python-iptables/files/python-iptables-1.0.0-ldconfig-fix.patch new file mode 100644 index 0000000000000..14fe9eae38da2 --- /dev/null +++ b/dev-python/python-iptables/files/python-iptables-1.0.0-ldconfig-fix.patch @@ -0,0 +1,21 @@ +diff --git a/iptc/xtables.py b/iptc/xtables.py +index cf21029..8f62164 100644 +--- a/iptc/xtables.py ++++ b/iptc/xtables.py +@@ -4,6 +4,7 @@ import ctypes as ct + import os + import sys + import weakref ++import pathlib + + from . import version + from .util import find_library, find_libc +@@ -805,7 +806,7 @@ _lib_xtables, xtables_version = find_library(_searchlib) + _xtables_libdir = os.getenv("XTABLES_LIBDIR") + if _xtables_libdir is None: + import re +- ldconfig_path_regex = re.compile('^(/.*):$') ++ ldconfig_path_regex = re.compile(r'^(/.*): \(.*$') + import subprocess + ldconfig = subprocess.Popen( + ('/sbin/ldconfig', '-N', '-v'), diff --git a/dev-python/python-iptables/python-iptables-1.0.0.ebuild b/dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild similarity index 91% rename from dev-python/python-iptables/python-iptables-1.0.0.ebuild rename to dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild index 53037c8775b5a..b69547d73feee 100644 --- a/dev-python/python-iptables/python-iptables-1.0.0.ebuild +++ b/dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild @@ -18,6 +18,10 @@ RDEPEND="net-firewall/iptables" # tests manipulate live iptables rules, so disable them by default RESTRICT="test" +PATCHES=( + "${FILESDIR}/python-iptables-1.0.0-ldconfig-fix.patch" +) + distutils_enable_sphinx doc distutils_enable_tests setup.py