summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/twisted/files')
-rw-r--r--dev-python/twisted/files/twistd.conf7
-rw-r--r--dev-python/twisted/files/twistd.init25
-rw-r--r--dev-python/twisted/files/twisted-12.0.0-fix-test-timeFormatting.patch26
-rw-r--r--dev-python/twisted/files/twisted-12.1.0-remove-tests-conch-dependency.patch15
-rw-r--r--dev-python/twisted/files/twisted-2.1.0-echo-less.patch13
-rw-r--r--dev-python/twisted/files/twisted-2.1.0-zsh-head.patch13
-rw-r--r--dev-python/twisted/files/twisted-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch11
7 files changed, 0 insertions, 110 deletions
diff --git a/dev-python/twisted/files/twistd.conf b/dev-python/twisted/files/twistd.conf
deleted file mode 100644
index 53788cd0017e..000000000000
--- a/dev-python/twisted/files/twistd.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# These are passed to twistd.
-# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -y /etc/twistd.tac"
-# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -f /etc/twistd.tap"
-
-# Make any additions to PYTHONPATH the twistd needs here.
-# PYTHONPATH="/path/to/extra/python/modules"
diff --git a/dev-python/twisted/files/twistd.init b/dev-python/twisted/files/twistd.init
deleted file mode 100644
index e7b29f1a7e96..000000000000
--- a/dev-python/twisted/files/twistd.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-
-depend() {
- need net
-}
-
-start() {
- if [ -z "${TWISTD_OPTS}" ]; then
- eerror "TWISTD_OPTS is not set!"
- eerror "You need to configure twistd in /etc/conf.d/twistd."
- return 1
- fi
- export PYTHONPATH
- ebegin "Starting twistd"
- start-stop-daemon --start --quiet --pidfile /var/run/twistd.pid \
- --exec /usr/bin/twistd -- --pidfile /var/run/twistd.pid \
- ${TWISTD_OPTS}
- eend $? "Failed to start twistd"
-}
-
-stop() {
- ebegin "Stopping twistd"
- start-stop-daemon --stop --quiet --pidfile /var/run/twistd.pid
- eend $? "Failed to stop twistd"
-}
diff --git a/dev-python/twisted/files/twisted-12.0.0-fix-test-timeFormatting.patch b/dev-python/twisted/files/twisted-12.0.0-fix-test-timeFormatting.patch
deleted file mode 100644
index a466a973f959..000000000000
--- a/dev-python/twisted/files/twisted-12.0.0-fix-test-timeFormatting.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Apply patch: use calendar.timegm instead of manual broken timezone math.
-
-Author: marienz
-Review: itamar
-Fixes: #5583
-
-Index: /trunk/twisted/test/test_log.py
-===================================================================
---- /trunk/twisted/test/test_log.py (revision 32453)
-+++ /trunk/twisted/test/test_log.py (revision 34145)
-@@ -6,5 +6,5 @@
- """
-
--import os, sys, time, logging, warnings
-+import os, sys, time, logging, warnings, calendar
- from cStringIO import StringIO
-
-@@ -392,7 +392,5 @@
- human-readable string.
- """
-- # There is no function in the time module which converts a UTC time
-- # tuple to a timestamp.
-- when = time.mktime((2001, 2, 3, 4, 5, 6, 7, 8, 0)) - time.timezone
-+ when = calendar.timegm((2001, 2, 3, 4, 5, 6, 7, 8, 0))
-
- # Pretend to be in US/Eastern for a moment
diff --git a/dev-python/twisted/files/twisted-12.1.0-remove-tests-conch-dependency.patch b/dev-python/twisted/files/twisted-12.1.0-remove-tests-conch-dependency.patch
deleted file mode 100644
index db2e2454bbc6..000000000000
--- a/dev-python/twisted/files/twisted-12.1.0-remove-tests-conch-dependency.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: twisted/test/test_strcred.py
-===================================================================
---- twisted/test/test_strcred.py (revision 34525)
-+++ twisted/test/test_strcred.py (working copy)
-@@ -352,6 +352,10 @@
- except ImportError:
- skip = "PyCrypto is not available"
-
-+ try:
-+ from twisted import conch
-+ except ImportError:
-+ skip = "Twisted Conch is not available"
-
- def test_isChecker(self):
- """
diff --git a/dev-python/twisted/files/twisted-2.1.0-echo-less.patch b/dev-python/twisted/files/twisted-2.1.0-echo-less.patch
deleted file mode 100644
index c180a111021d..000000000000
--- a/dev-python/twisted/files/twisted-2.1.0-echo-less.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'twisted/test/test_process.py'
---- twisted/test/test_process.py
-+++ twisted/test/test_process.py
-@@ -76,7 +76,7 @@
-
- class EchoProtocol(protocol.ProcessProtocol):
-
-- s = "1234567" * 1001
-+ s = "1234567" * 11
- n = 10
- finished = 0
-
-
diff --git a/dev-python/twisted/files/twisted-2.1.0-zsh-head.patch b/dev-python/twisted/files/twisted-2.1.0-zsh-head.patch
deleted file mode 100644
index 236610ad9940..000000000000
--- a/dev-python/twisted/files/twisted-2.1.0-zsh-head.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: twisted/python/_twisted_zsh_stub
-===================================================================
---- twisted/python/_twisted_zsh_stub (revision 14988)
-+++ twisted/python/_twisted_zsh_stub (working copy)
-@@ -30,7 +30,7 @@
-
- function load_twisted_completions() {
- [[ -z $commands[twistd] ]] && echo 'ERROR: test command "twistd" not found in path' && return 1
-- shebang=$(head -1 $commands[twistd])
-+ shebang=$(head -n1 $commands[twistd])
- [[ $shebang != \#\!* ]] && echo 'ERROR: invalid shebang line for test script "twistd"' && return 1
- PYTHON=$shebang[3,-1]
-
diff --git a/dev-python/twisted/files/twisted-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch b/dev-python/twisted/files/twisted-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
deleted file mode 100644
index 2fe22f1640b1..000000000000
--- a/dev-python/twisted/files/twisted-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- twisted/plugin.py
-+++ twisted/plugin.py
-@@ -174,7 +174,7 @@
- if pluginKey not in existingKeys:
- del dropinDotCache[pluginKey]
- needsWrite = True
-- if needsWrite:
-+ if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
- try:
- dropinPath.setContent(pickle.dumps(dropinDotCache))
- except: