Merge remote-tracking branch 'ms/tor' into tor
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 31 Jul 2013 17:40:17 +0000 (19:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 31 Jul 2013 17:40:17 +0000 (19:40 +0200)
lfs/arm
src/patches/arm-dont-require-distutils.patch [new file with mode: 0644]

diff --git a/lfs/arm b/lfs/arm
index 3c042a4..2fbf65e 100644 (file)
--- a/lfs/arm
+++ b/lfs/arm
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/arm-dont-require-distutils.patch
        cd $(DIR_APP) && ./install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/src/patches/arm-dont-require-distutils.patch b/src/patches/arm-dont-require-distutils.patch
new file mode 100644 (file)
index 0000000..1fe2b8a
--- /dev/null
@@ -0,0 +1,20 @@
+diff -Nur arm.vanilla/src/util/hostnames.py arm/src/util/hostnames.py
+--- arm.vanilla/src/util/hostnames.py  2012-04-29 05:59:24.000000000 +0200
++++ arm/src/util/hostnames.py  2013-07-31 17:59:19.245591564 +0200
+@@ -30,7 +30,6 @@
+ import threading
+ import itertools
+ import Queue
+-import distutils.sysconfig
+ from util import log, sysTools
+@@ -264,7 +263,7 @@
+     # 'socket.gethostbyaddr'. The following checks if the system has the
+     # gethostbyname_r function, which determines if python resolutions can be
+     # done in parallel or not. If so, this is preferable.
+-    isSocketResolutionParallel = distutils.sysconfig.get_config_var("HAVE_GETHOSTBYNAME_R")
++    isSocketResolutionParallel = True #distutils.sysconfig.get_config_var("HAVE_GETHOSTBYNAME_R")
+     self.useSocketResolution = CONFIG["queries.hostnames.useSocketModule"] and isSocketResolutionParallel
+     
+     for _ in range(CONFIG["queries.hostnames.poolSize"]):