diff options
author | Renato Botelho <garga@FreeBSD.org> | 2007-01-15 11:51:58 +0000 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2007-01-15 11:51:58 +0000 |
commit | 1d34b36c1cdc8d621fa91fe0c6c120b3c06ce336 (patch) | |
tree | 4095ae1442af3fde26789941000cea73928aa343 /net-im | |
parent | Document two sircd vulnerabilities: (diff) |
- Patch to work with py-twisted 2.5.0
- Bump PORTREVISION
PR: ports/107891
Submitted by: Neil Darlow <neil@darlow.co.uk>
Obtained from: py-transports maillist (Lars T. Mikkelsen)
Notes
Notes:
svn path=/head/; revision=182410
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/jabber-pyicq/Makefile | 2 | ||||
-rw-r--r-- | net-im/jabber-pyicq/files/patch-src_main.py | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/net-im/jabber-pyicq/Makefile b/net-im/jabber-pyicq/Makefile index 03b3ecf7830e..66d877470809 100644 --- a/net-im/jabber-pyicq/Makefile +++ b/net-im/jabber-pyicq/Makefile @@ -6,6 +6,7 @@ PORTNAME= pyicq PORTVERSION= 0.8 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.blathersource.org/download.php/pyicq-t/ PKGNAMEPREFIX= jabber- @@ -62,6 +63,7 @@ post-patch: ${WRKSRC}/src/main.py @${REINPLACE_CMD} -i "" 's|^#!.*$$|#!${LOCAL_PYTHON}|' \ ${WRKSRC}/PyICQt.py + @${RM} -f ${WRKSRC}/src/main.py.orig do-install: ${MKDIR} ${INST_DIR}/src ${INST_DIR}/data diff --git a/net-im/jabber-pyicq/files/patch-src_main.py b/net-im/jabber-pyicq/files/patch-src_main.py new file mode 100644 index 000000000000..5bff1b8f8fc2 --- /dev/null +++ b/net-im/jabber-pyicq/files/patch-src_main.py @@ -0,0 +1,14 @@ +--- src/main.py.orig Sat Sep 30 16:44:21 2006 ++++ src/main.py Sun Jan 14 19:52:36 2007 +@@ -89,7 +89,10 @@ + import signal + signal.signal(signal.SIGHUP, reloadConfig) + # Load scripts for PID and daemonizing +- from twisted.scripts import twistd ++ try: ++ from twisted.scripts import _twistd_unix as twistd ++ except: ++ from twisted.scripts import twistd + + selectWarning = "Unable to install any good reactors (kqueue, cf, epoll, poll).\nWe fell back to using select. You may have scalability problems.\nThis reactor will not support more than 1024 connections +at a time. You may silence this message by choosing 'select' or 'default' as your reactor in the transport config." + if config.reactor and len(config.reactor) > 0: |