Date: Wed, 1 Mar 2006 15:32:04 +0100 (CET) From: "M. Possamai" <possamai@xs4all.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/93982: [Port-update] jabber-pymsn update to v0.11a Message-ID: <200603011432.k21EW47C002759@zaadje.nl> Resent-Message-ID: <200603011440.k21Ee4bs060856@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 93982 >Category: ports >Synopsis: [Port-update] jabber-pymsn update to v0.11a >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Mar 01 14:40:03 GMT 2006 >Closed-Date: >Last-Modified: >Originator: M. Possamai <possamai@xs4all.nl> >Release: FreeBSD 5.5-PRERELEASE i386 >Organization: >Environment: System: FreeBSD zaadje.nl 5.5-PRERELEASE FreeBSD 5.5-PRERELEASE #5: Sat Feb 25 15:50:56 CET 2006 root@zaadje.nl:/usr/obj/usr/src/sys/SCORPIO i386 >Description: >How-To-Repeat: >Fix: --- jabber-pymsn.diff begins here --- diff -ruN jabber-pymsn.old/Makefile jabber-pymsn/Makefile --- jabber-pymsn.old/Makefile Tue Feb 28 11:17:08 2006 +++ jabber-pymsn/Makefile Tue Feb 28 17:29:05 2006 @@ -5,7 +5,7 @@ # $FreeBSD: ports/net-im/jabber-pymsn/Makefile,v 1.8 2006/01/27 14:13:31 garga Exp $ PORTNAME= pymsn -PORTVERSION= 0.10.3 +PORTVERSION= 0.11a CATEGORIES= net-im MASTER_SITES= http://msn-transport.jabberstudio.org/tarballs/ PKGNAMEPREFIX= jabber- @@ -19,6 +19,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl \ ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted +WRKSRC= ${WRKDIR}/pymsnt-0.11 NO_BUILD= yes USE_PYTHON= yes USE_RC_SUBR= jabber-pymsn-transport.sh @@ -34,26 +35,19 @@ @${FIND} ${WRKSRC}/ -type d \( -name CVS -or -name .svn \) | ${XARGS} ${RM} -rf post-patch: - @${REINPLACE_CMD} -i "" '/spooldir/s|/path/to/data|/var/spool/jabber|' \ - ${WRKSRC}/config-example.xml - @${REINPLACE_CMD} -i "" 's|../config.xml|${PREFIX}/etc/jabber-pymsn.xml|g' \ - ${WRKSRC}/src/xmlconfig.py - @${REINPLACE_CMD} -i "" 's|src/legacy|legacy|g' \ - ${WRKSRC}/src/legacy/glue.py \ - ${WRKSRC}/src/legacy/legacylist.py @${REINPLACE_CMD} -i "" 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/src/config.py + ${WRKSRC}/src/config.py \ + ${WRKSRC}/src/main.py + @${RM} -f ${WRKSRC}/*.orig @${RM} -f ${WRKSRC}/src/*.orig - @${ECHO} '#!${PYTHON_CMD}' > ${WRKSRC}/src/main.py.new - @${CAT} ${WRKSRC}/src/main.py >> ${WRKSRC}/src/main.py.new - @${MV} ${WRKSRC}/src/main.py.new ${WRKSRC}/src/main.py - @${MV} ${WRKSRC}/src/config.py ${WRKSRC}/src/config.py.sample + @${ECHO} '#!${PYTHON_CMD}' > ${WRKSRC}/PyMSNt.py.new + @${CAT} ${WRKSRC}/PyMSNt.py >> ${WRKSRC}/PyMSNt.py.new + @${MV} ${WRKSRC}/PyMSNt.py.new ${WRKSRC}/PyMSNt.py do-install: ${INSTALL} -d ${INST_DIR} - @${CP} -pPRv ${WRKSRC}/src/* ${INST_DIR}/ - ${CHMOD} 755 ${INST_DIR}/main.py - @[ -f ${INST_DIR}/config.py ] || ${CP} -v ${INST_DIR}/config.py.sample ${INST_DIR}/config.py + @${CP} -pPRv ${WRKSRC}/* ${INST_DIR}/ + ${CHMOD} 755 ${INST_DIR}/PyMSNt.py ${MKDIR} ${EXAMPLESDIR}/etc ${INSTALL_DATA} ${WRKSRC}/config-example.xml ${EXAMPLESDIR}/etc/jabber-pymsn.xml @[ -f ${PREFIX}/etc/jabber-pymsn.xml ] || ${CP} -v ${EXAMPLESDIR}/etc/jabber-pymsn.xml ${PREFIX}/etc/jabber-pymsn.xml diff -ruN jabber-pymsn.old/distinfo jabber-pymsn/distinfo --- jabber-pymsn.old/distinfo Tue Feb 28 11:17:08 2006 +++ jabber-pymsn/distinfo Tue Feb 28 11:36:37 2006 @@ -1,3 +1,3 @@ -MD5 (jabber/pymsnt-0.10.3.tar.gz) = 02e2de762c2bb890c8cec2c4222ffa5f -SHA256 (jabber/pymsnt-0.10.3.tar.gz) = ecd836fc27b50acf5c8c774b208c3dbf51207decfc5183654dc09fc1cfa673f2 -SIZE (jabber/pymsnt-0.10.3.tar.gz) = 235140 +MD5 (jabber/pymsnt-0.11a.tar.gz) = 58afdee2a1e1a9a4aca38c1cd892028d +SHA256 (jabber/pymsnt-0.11a.tar.gz) = e083a4ca50a074bfd9fd924279b27379e1cf042c90355bb25eb7f40328bdccce +SIZE (jabber/pymsnt-0.11a.tar.gz) = 257753 diff -ruN jabber-pymsn.old/files/jabber-pymsn-transport.sh.in jabber-pymsn/files/jabber-pymsn-transport.sh.in --- jabber-pymsn.old/files/jabber-pymsn-transport.sh.in Tue Feb 28 11:17:08 2006 +++ jabber-pymsn/files/jabber-pymsn-transport.sh.in Wed Mar 1 10:13:11 2006 @@ -25,9 +25,8 @@ jabber_pymsn_chdir=${jabber_pymsn_dir} -pidfile="${jabber_pymsn_piddir}/pymsn.pid" +pidfile="${jabber_pymsn_piddir}/PyMSNt.pid" command_interpreter="%%PYTHON_CMD%%" -command="${jabber_pymsn_dir}/main.py" -command_args="-o pid=${pidfile} &" +command="${jabber_pymsn_dir}/PyMSNt.py" run_rc_command "$1" diff -ruN jabber-pymsn.old/files/patch-PyMSNt.py jabber-pymsn/files/patch-PyMSNt.py --- jabber-pymsn.old/files/patch-PyMSNt.py Thu Jan 1 01:00:00 1970 +++ jabber-pymsn/files/patch-PyMSNt.py Tue Feb 28 17:32:41 2006 @@ -0,0 +1,7 @@ +--- PyMSNt.py.orig Tue Feb 28 17:30:12 2006 ++++ PyMSNt.py Tue Feb 28 17:30:31 2006 +@@ -1,4 +1,3 @@ +-#!/usr/bin/python + + # Make 'cwd'/src in the PYTHONPATH + import sys, os, os.path diff -ruN jabber-pymsn.old/files/patch-config-example.xml jabber-pymsn/files/patch-config-example.xml --- jabber-pymsn.old/files/patch-config-example.xml Tue Feb 28 11:17:08 2006 +++ jabber-pymsn/files/patch-config-example.xml Tue Feb 28 13:30:10 2006 @@ -1,11 +1,19 @@ ---- config-example.xml.orig Tue Dec 6 07:11:29 2005 -+++ config-example.xml Tue Dec 6 07:12:36 2005 -@@ -12,6 +12,8 @@ +--- config-example.xml.orig Fri Feb 17 23:07:30 2006 ++++ config-example.xml Tue Feb 28 13:24:32 2006 +@@ -12,13 +12,13 @@ + + <!-- The location of the spool directory.. if relative, relative to the PyMSNt dir. Do not include the jid of the transport --> - <!-- <spooldir>/path/to/data</spooldir> --> +-<!-- <spooldir>/path/to/data</spooldir> --> ++<!-- <spooldir>/var/jabber/spool/</spooldir> --> + <!-- The location of the PID file, relative to the PyMSNt directory --> +-<pid>PyMSNt.pid</pid> ++<pid>/var/jabberd/pid/PyMSNt.pid</pid> + <!-- If set, the transport will background itself when run --> + <background/> + <!-- The Twisted reactor to choose. Pick poll or epoll on Linux, kqueue on BSD. Or leave as default (select) --> +-<!-- <reactor>poll</reactor> --> ++<!-- <reactor>kqueue</reactor> --> -+<!-- The location of the PID file (if relative, relative to the PyMSNt dir) --> -+<pid>/var/jabberd/pid/pymsn.pid</pid> <!-- The IP address of the main Jabber server to connect to --> - <mainServer>127.0.0.1</mainServer> diff -ruN jabber-pymsn.old/files/patch-src_config.py jabber-pymsn/files/patch-src_config.py --- jabber-pymsn.old/files/patch-src_config.py Tue Feb 28 11:17:08 2006 +++ jabber-pymsn/files/patch-src_config.py Tue Feb 28 15:26:14 2006 @@ -1,17 +1,24 @@ ---- src/config.py.orig Mon Dec 5 16:43:57 2005 -+++ src/config.py Mon Dec 5 16:45:18 2005 -@@ -1,11 +1,12 @@ +--- src/config.py.orig Tue Feb 28 13:33:12 2006 ++++ src/config.py Tue Feb 28 13:46:17 2006 +@@ -1,10 +1,10 @@ # This file contains the default settings for various options. - # Please edit config.xml instead of this file - --configFile = "config.xml" -+configFile = "%%PREFIX%%/etc/jabber-pymsn.xml" +-# Please edit config.xml instead of this file ++# Please edit jabber-pymsn.xml instead of this file jid = "msn" + host = "127.0.0.1" compjid = "" -spooldir = "" +spooldir = "/tmp/jabber-pymsn" -+pid = "/var/jabberd/pid/pymsn.pid" mainServer = "127.0.0.1" - mainServerJID = "" + website = "" +@@ -30,7 +30,7 @@ + + reactor = "" + background = False +-pid = "" ++pid = "/var/jabberd/pid/pymsn.pid" + + debugLevel = "0" # 0->None, 1->Traceback, 2->WARN,ERROR, 3->INFO,WARN,ERROR + debugFile = "" diff -ruN jabber-pymsn.old/files/patch-src_main.py jabber-pymsn/files/patch-src_main.py --- jabber-pymsn.old/files/patch-src_main.py Tue Feb 28 11:17:08 2006 +++ jabber-pymsn/files/patch-src_main.py Tue Feb 28 15:26:40 2006 @@ -1,28 +1,12 @@ ---- src/main.py.orig Mon Dec 5 16:39:23 2005 -+++ src/main.py Mon Dec 5 16:41:07 2005 -@@ -233,6 +233,17 @@ - - class App: - def __init__(self): -+ # Check that there isn't already a PID file -+ if(os.path.isfile(utils.doPath(config.pid))): -+ print "PID file exists at that location. Please check for running PyMSNt and try again." -+ sys.exit(1) +--- src/main.py.orig Tue Feb 28 13:33:39 2006 ++++ src/main.py Tue Feb 28 14:09:46 2006 +@@ -34,7 +34,8 @@ + # Must load config before everything else + import config + import xmlconfig +-configFile = "config.xml" ++configFile = "%%PREFIX%%/etc/jabber-pymsn.xml" + -+ # Create a PID file -+ pid = str(os.getpid()) -+ pf = file(utils.doPath(config.pid),'w') -+ pf.write("%s\n" % pid); -+ pf.close() -+ - jid = config.jid - if config.compjid: jid = config.compjid - self.c = component.buildServiceManager(jid, config.secret, "tcp:%s:%s" % (config.mainServer, config.port)) -@@ -248,6 +259,7 @@ - - def shuttingDown(self): - self.transportSvc.removeMe() -+ os.remove(utils.doPath(config.pid)) - # Keep the transport running for another 3 seconds - def cb(ignored=None): - pass + configOptions = {} + opts, args = getopt.getopt(sys.argv[1:], "bc:o:dDgtlp:h", ["background", "config=", "option=", "debug", "Debug", "garbage", "traceback", "log=", "pid=", "help"]) + for o, v in opts: diff -ruN jabber-pymsn.old/files/patch-src_utils.py jabber-pymsn/files/patch-src_utils.py --- jabber-pymsn.old/files/patch-src_utils.py Tue Feb 28 11:17:08 2006 +++ jabber-pymsn/files/patch-src_utils.py Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ ---- src/utils.py.orig Mon Dec 5 16:41:53 2005 -+++ src/utils.py Mon Dec 5 16:42:18 2005 -@@ -180,4 +180,8 @@ - def flush(self): - self.lst = [] - -- -+def doPath(path): -+ if(path and path[0] == "/"): -+ return path -+ else: -+ return "../" + path diff -ruN jabber-pymsn.old/files/patch-src_xmlconfig.py jabber-pymsn/files/patch-src_xmlconfig.py --- jabber-pymsn.old/files/patch-src_xmlconfig.py Thu Jan 1 01:00:00 1970 +++ jabber-pymsn/files/patch-src_xmlconfig.py Tue Feb 28 15:26:52 2006 @@ -0,0 +1,11 @@ +--- src/xmlconfig.py.orig Tue Feb 28 14:58:22 2006 ++++ src/xmlconfig.py Tue Feb 28 15:00:38 2006 +@@ -18,7 +18,7 @@ + def importFile(configFile): + # Check the file exists + if not os.path.isfile(configFile): +- print "Configuration file not found. You need to create a config.xml file in the PyMSNt directory." ++ print "Configuration file not found. You need to create a jabber-pymsn.xml file." + sys.exit(1) + + # Get ourself a DOM diff -ruN jabber-pymsn.old/pkg-plist jabber-pymsn/pkg-plist --- jabber-pymsn.old/pkg-plist Tue Feb 28 11:17:08 2006 +++ jabber-pymsn/pkg-plist Wed Mar 1 14:49:02 2006 @@ -1,50 +1,64 @@ -@unexec if cmp -s %D/%%EXAMPLESDIR%%/etc/jabber-pymsn.xml %D/etc/jabber-pymsn.xml; then rm -f %D/etc/jabber-pymsn.xml; fi -%%EXAMPLESDIR%%/etc/jabber-pymsn.xml -@exec [ -f %D/etc/jabber-pymsn.xml ] || cp %B/%f %D/etc/jabber-pymsn.xml -lib/jabber/pymsn/avatar.py -lib/jabber/pymsn/baseproto/__init__.py -lib/jabber/pymsn/baseproto/glue.py -@unexec if cmp -s %D/lib/jabber/pymsn/config.py.sample %D/lib/jabber/pymsn/config.py; then rm -f %D/lib/jabber/pymsn/config.py; fi -lib/jabber/pymsn/config.py.sample -@exec [ -f %D/lib/jabber/pymsn/config.py ] || cp %B/%f %D/lib/jabber/pymsn/config.py -lib/jabber/pymsn/contact.py -lib/jabber/pymsn/debug.py -lib/jabber/pymsn/disco.py -lib/jabber/pymsn/groupchat.py -lib/jabber/pymsn/housekeep.py -lib/jabber/pymsn/jabw.py -lib/jabber/pymsn/lang.py -lib/jabber/pymsn/legacy/__init__.py -lib/jabber/pymsn/legacy/defaultAvatar.png -lib/jabber/pymsn/legacy/defaultJabberAvatar.png -lib/jabber/pymsn/legacy/glue.py -lib/jabber/pymsn/legacy/legacylist.py -lib/jabber/pymsn/legacy/msnw.py -lib/jabber/pymsn/main.py -lib/jabber/pymsn/misciq.py -lib/jabber/pymsn/register.py -lib/jabber/pymsn/session.py -lib/jabber/pymsn/tlib/__init__.py -lib/jabber/pymsn/tlib/domish.py -lib/jabber/pymsn/tlib/jabber/__init__.py -lib/jabber/pymsn/tlib/jabber/client.py -lib/jabber/pymsn/tlib/jabber/component.py -lib/jabber/pymsn/tlib/jabber/jid.py -lib/jabber/pymsn/tlib/jabber/jstrports.py -lib/jabber/pymsn/tlib/jabber/xmpp_stringprep.py -lib/jabber/pymsn/tlib/msn.py -lib/jabber/pymsn/tlib/msnp11chl.py -lib/jabber/pymsn/tlib/msnp2p.py -lib/jabber/pymsn/tlib/xmlstream.py -lib/jabber/pymsn/tlib/xmlw.py -lib/jabber/pymsn/utils.py -lib/jabber/pymsn/xdb.py -lib/jabber/pymsn/xmlconfig.py -@dirrm lib/jabber/pymsn/tlib/jabber -@dirrm lib/jabber/pymsn/tlib -@dirrm lib/jabber/pymsn/legacy -@dirrm lib/jabber/pymsn/baseproto +etc/rc.d/jabber-pymsn-transport.sh +lib/jabber/pymsn/COPYING +lib/jabber/pymsn/PyMSNt.py +lib/jabber/pymsn/README +lib/jabber/pymsn/TODO +lib/jabber/pymsn/config-example.xml +lib/jabber/pymsn/data/defaultJabberAvatar.png +lib/jabber/pymsn/data/defaultMSNAvatar.png +lib/jabber/pymsn/src/avatar.py +lib/jabber/pymsn/src/baseproto/__init__.py +lib/jabber/pymsn/src/baseproto/glue.py +lib/jabber/pymsn/src/config.py +lib/jabber/pymsn/src/contact.py +lib/jabber/pymsn/src/debug.py +lib/jabber/pymsn/src/disco.py +lib/jabber/pymsn/src/ft.py +lib/jabber/pymsn/src/groupchat.py +lib/jabber/pymsn/src/housekeep.py +lib/jabber/pymsn/src/jabw.py +lib/jabber/pymsn/src/lang.py +lib/jabber/pymsn/src/legacy/__init__.py +lib/jabber/pymsn/src/legacy/glue.py +lib/jabber/pymsn/src/main.py +lib/jabber/pymsn/src/misciq.py +lib/jabber/pymsn/src/register.py +lib/jabber/pymsn/src/session.py +lib/jabber/pymsn/src/tlib/__init__.py +lib/jabber/pymsn/src/tlib/domish.py +lib/jabber/pymsn/src/tlib/jabber/__init__.py +lib/jabber/pymsn/src/tlib/jabber/client.py +lib/jabber/pymsn/src/tlib/jabber/component.py +lib/jabber/pymsn/src/tlib/jabber/jid.py +lib/jabber/pymsn/src/tlib/jabber/jstrports.py +lib/jabber/pymsn/src/tlib/jabber/xmpp_stringprep.py +lib/jabber/pymsn/src/tlib/msn/__init__.py +lib/jabber/pymsn/src/tlib/msn/msn.py +lib/jabber/pymsn/src/tlib/msn/msnft.py +lib/jabber/pymsn/src/tlib/msn/msnp11chl.py +lib/jabber/pymsn/src/tlib/msn/msnw.py +lib/jabber/pymsn/src/tlib/msn/test_msn.py +lib/jabber/pymsn/src/tlib/msn/test_msnw.py +lib/jabber/pymsn/src/tlib/socks5.py +lib/jabber/pymsn/src/tlib/throttle.py +lib/jabber/pymsn/src/tlib/xmlstream.py +lib/jabber/pymsn/src/tlib/xmlw.py +lib/jabber/pymsn/src/utils.py +lib/jabber/pymsn/src/xdb.py +lib/jabber/pymsn/src/xmlconfig.py +share/doc/pymsn/COPYING +share/doc/pymsn/README +share/doc/pymsn/TODO +share/examples/pymsn/etc/jabber-pymsn.xml +@dirrm share/examples/pymsn/etc +@dirrm share/examples/pymsn +@dirrm share/doc/pymsn +@dirrm lib/jabber/pymsn/src/tlib/msn +@dirrm lib/jabber/pymsn/src/tlib/jabber +@dirrm lib/jabber/pymsn/src/tlib +@dirrm lib/jabber/pymsn/src/legacy +@dirrm lib/jabber/pymsn/src/baseproto +@dirrm lib/jabber/pymsn/src +@dirrm lib/jabber/pymsn/data @dirrm lib/jabber/pymsn -@dirrmtry lib/jabber -@dirrm %%EXAMPLESDIR%%/etc -@dirrm %%EXAMPLESDIR%% +@dirrm lib/jabber --- jabber-pymsn.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603011432.k21EW47C002759>