Date: Monday, May 13, 2013 @ 16:35:35
Author: spupykin
Revision: 90711
archrelease: copy trunk to community-any
Added:
pyicqt/repos/community-any/PKGBUILD
(from rev 90710, pyicqt/trunk/PKGBUILD)
pyicqt/repos/community-any/config.xml
(from rev 90710, pyicqt/trunk/config.xml)
pyicqt/repos/community-any/ficq.patch
(from rev 90710, pyicqt/trunk/ficq.patch)
pyicqt/repos/community-any/pyicqt.service
(from rev 90710, pyicqt/trunk/pyicqt.service)
pyicqt/repos/community-any/pyicqt.tmpfiles
(from rev 90710, pyicqt/trunk/pyicqt.tmpfiles)
pyicqt/repos/community-any/unicode-error-fix.diff
(from rev 90710, pyicqt/trunk/unicode-error-fix.diff)
Deleted:
pyicqt/repos/community-any/PKGBUILD
pyicqt/repos/community-any/config.xml
pyicqt/repos/community-any/ficq.patch
pyicqt/repos/community-any/pyicq.rc
pyicqt/repos/community-any/pyicqt.service
pyicqt/repos/community-any/pyicqt.tmpfiles
pyicqt/repos/community-any/unicode-error-fix.diff
------------------------+
PKGBUILD | 87 ++++++++++++++++++++++-------------------------
config.xml | 36 +++++++++----------
ficq.patch | 22 +++++------
pyicq.rc | 53 ----------------------------
pyicqt.service | 22 +++++------
pyicqt.tmpfiles | 2 -
unicode-error-fix.diff | 28 +++++++--------
7 files changed, 97 insertions(+), 153 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-13 14:35:15 UTC (rev 90710)
+++ PKGBUILD 2013-05-13 14:35:35 UTC (rev 90711)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com>
-
-pkgname=pyicqt
-pkgver=0.8.1.5
-pkgrel=6
-pkgdesc="jabber icq transport"
-arch=(any)
-url="http://code.google.com/p/pyicqt/";
-license=('GPL')
-backup=(etc/ejabberd/pyicq.xml)
-depends=('python2' 'twisted')
-source=(http://pyicqt.googlecode.com/files/pyicqt-$pkgver.tar.gz
- pyicq.rc
- config.xml
- pyicqt.service
- pyicqt.tmpfiles)
-md5sums=('d1c544f82ed416bbe987a5e419820fa8'
- 'f5a7a999253286c0cd2bc6552ee885cd'
- '150501a11601763ce4ef12eb5649ef2a'
- 'c3cc068a208b176bf088df9dda9650ac'
- '7a9bec0597576753f87093759cf2a7d8')
-
-build() {
- cd $srcdir
-
- # python2 fix
- for file in $(find . -name '*.py' -print); do
- sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
- sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
- done
-
- install -d -m0755 $pkgdir/usr/lib
- cp -r $pkgname-$pkgver $pkgdir/usr/lib
- mv $pkgdir/usr/lib/$pkgname-$pkgver $pkgdir/usr/lib/$pkgname
- install -d -m0755 $pkgdir/var/spool/pyicqt
- install -D -m0644 ./config.xml $pkgdir/etc/ejabberd/pyicq.xml
- mv $pkgdir/usr/lib/$pkgname/config_example.xml
$pkgdir/etc/ejabberd/pyicq_example.xml
- ln -s ../../../etc/ejabberd/pyicq.xml $pkgdir/usr/lib/$pkgname/config.xml
- install -D -m0755 pyicq.rc $pkgdir/etc/rc.d/pyicqt
-
- install -Dm0644 $srcdir/$pkgname.service
$pkgdir/usr/lib/systemd/system/$pkgname.service
- install -Dm0644 $srcdir/$pkgname.tmpfiles
$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
-}
Copied: pyicqt/repos/community-any/PKGBUILD (from rev 90710,
pyicqt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-05-13 14:35:35 UTC (rev 90711)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com>
+
+pkgname=pyicqt
+pkgver=0.8.1.5
+pkgrel=7
+pkgdesc="jabber icq transport"
+arch=(any)
+url="http://code.google.com/p/pyicqt/";
+license=('GPL')
+backup=(etc/ejabberd/pyicq.xml)
+depends=('python2' 'twisted')
+source=(http://pyicqt.googlecode.com/files/pyicqt-$pkgver.tar.gz
+ config.xml
+ pyicqt.service
+ pyicqt.tmpfiles)
+md5sums=('d1c544f82ed416bbe987a5e419820fa8'
+ '150501a11601763ce4ef12eb5649ef2a'
+ 'c3cc068a208b176bf088df9dda9650ac'
+ '7a9bec0597576753f87093759cf2a7d8')
+
+package() {
+ cd $srcdir
+
+ # python2 fix
+ for file in $(find . -name '*.py' -print); do
+ sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+ sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+ done
+
+ install -d -m0755 $pkgdir/usr/lib
+ cp -r $pkgname-$pkgver $pkgdir/usr/lib
+ mv $pkgdir/usr/lib/$pkgname-$pkgver $pkgdir/usr/lib/$pkgname
+ install -d -m0755 $pkgdir/var/spool/pyicqt
+ install -D -m0644 ./config.xml $pkgdir/etc/ejabberd/pyicq.xml
+ mv $pkgdir/usr/lib/$pkgname/config_example.xml
$pkgdir/etc/ejabberd/pyicq_example.xml
+ ln -s ../../../etc/ejabberd/pyicq.xml $pkgdir/usr/lib/$pkgname/config.xml
+
+ install -Dm0644 $srcdir/$pkgname.service
$pkgdir/usr/lib/systemd/system/$pkgname.service
+ install -Dm0644 $srcdir/$pkgname.tmpfiles
$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
+}
Deleted: config.xml
===================================================================
--- config.xml 2013-05-13 14:35:15 UTC (rev 90710)
+++ config.xml 2013-05-13 14:35:35 UTC (rev 90711)
@@ -1,18 +0,0 @@
-<pyicqt>
- <jid>icq.example.org</jid>
- <spooldir>/var/spool/pyicqt</spooldir>
- <pid>/var/run/pyicqt.pid</pid>
- <mainServer>127.0.0.1</mainServer>
- <mainServerJID>jabber.localhost</mainServerJID>
- <website>http://jabber.localhost/</website>
- <port>5347</port>
- <secret>secret</secret>
- <lang>en</lang>
- <encoding>iso-8859-1</encoding>
- <icqServer>login.icq.com</icqServer>
- <icqPort>5190</icqPort>
- <admins>
- <!--<jid>ad...@host.com</jid>-->
- </admins>
- <disableAvatars/>
-</pyicqt>
Copied: pyicqt/repos/community-any/config.xml (from rev 90710,
pyicqt/trunk/config.xml)
===================================================================
--- config.xml (rev 0)
+++ config.xml 2013-05-13 14:35:35 UTC (rev 90711)
@@ -0,0 +1,18 @@
+<pyicqt>
+ <jid>icq.example.org</jid>
+ <spooldir>/var/spool/pyicqt</spooldir>
+ <pid>/var/run/pyicqt.pid</pid>
+ <mainServer>127.0.0.1</mainServer>
+ <mainServerJID>jabber.localhost</mainServerJID>
+ <website>http://jabber.localhost/</website>
+ <port>5347</port>
+ <secret>secret</secret>
+ <lang>en</lang>
+ <encoding>iso-8859-1</encoding>
+ <icqServer>login.icq.com</icqServer>
+ <icqPort>5190</icqPort>
+ <admins>
+ <!--<jid>ad...@host.com</jid>-->
+ </admins>
+ <disableAvatars/>
+</pyicqt>
Deleted: ficq.patch
===================================================================
--- ficq.patch 2013-05-13 14:35:15 UTC (rev 90710)
+++ ficq.patch 2013-05-13 14:35:35 UTC (rev 90711)
@@ -1,11 +0,0 @@
---- oscar.py.orig 2009-01-06 20:31:38.000000000 +0300
-+++ oscar.py 2009-01-22 19:03:51.000000000 +0300
-@@ -598,7 +598,7 @@
- class OscarConnection(protocol.Protocol):
- def connectionMade(self):
- self.state=""
-- self.seqnum=0
-+ self.seqnum=10000
- self.buf=''
- self.outRate=6000
- self.outTime=time.time()
Copied: pyicqt/repos/community-any/ficq.patch (from rev 90710,
pyicqt/trunk/ficq.patch)
===================================================================
--- ficq.patch (rev 0)
+++ ficq.patch 2013-05-13 14:35:35 UTC (rev 90711)
@@ -0,0 +1,11 @@
+--- oscar.py.orig 2009-01-06 20:31:38.000000000 +0300
++++ oscar.py 2009-01-22 19:03:51.000000000 +0300
+@@ -598,7 +598,7 @@
+ class OscarConnection(protocol.Protocol):
+ def connectionMade(self):
+ self.state=""
+- self.seqnum=0
++ self.seqnum=10000
+ self.buf=''
+ self.outRate=6000
+ self.outTime=time.time()
Deleted: pyicq.rc
===================================================================
--- pyicq.rc 2013-05-13 14:35:15 UTC (rev 90710)
+++ pyicq.rc 2013-05-13 14:35:35 UTC (rev 90711)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
- [ -f /var/run/pyicqt.pid ] && echo `cat /var/run/pyicqt.pid`
-}
-
-case "$1" in
- start)
- stat_busy "Starting jabber ICQ transport daemon"
-
- [ -f /var/run/pyicqt.pid ] && rm -f /var/run/pyicqt.pid
- PID=`get_pid`
- if [ -z "$PID" ]; then
- cd /usr/lib/pyicqt && exec python2 ./PyICQt.py 1>/dev/null 2>/dev/null &
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- add_daemon pyicqt
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping jabber ICQ transport daemon"
- PID=`get_pid`
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/pyicqt.pid &> /dev/null
- rm_daemon pyicqt
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: pyicqt.service
===================================================================
--- pyicqt.service 2013-05-13 14:35:15 UTC (rev 90710)
+++ pyicqt.service 2013-05-13 14:35:35 UTC (rev 90711)
@@ -1,11 +0,0 @@
-[Unit]
-Description=PyICQt is an ICQ transport for Jabber/XMPP
-
-[Service]
-Type=simple
-PIDFile=/var/run/pyicqt/pyicqt.pid
-ExecStart=/usr/bin/python2 /usr/lib/pyicqt/PyICQt.py
-
-[Install]
-WantedBy=multi-user.target
-StandardOutput=syslog
Copied: pyicqt/repos/community-any/pyicqt.service (from rev 90710,
pyicqt/trunk/pyicqt.service)
===================================================================
--- pyicqt.service (rev 0)
+++ pyicqt.service 2013-05-13 14:35:35 UTC (rev 90711)
@@ -0,0 +1,11 @@
+[Unit]
+Description=PyICQt is an ICQ transport for Jabber/XMPP
+
+[Service]
+Type=simple
+PIDFile=/var/run/pyicqt/pyicqt.pid
+ExecStart=/usr/bin/python2 /usr/lib/pyicqt/PyICQt.py
+
+[Install]
+WantedBy=multi-user.target
+StandardOutput=syslog
Deleted: pyicqt.tmpfiles
===================================================================
--- pyicqt.tmpfiles 2013-05-13 14:35:15 UTC (rev 90710)
+++ pyicqt.tmpfiles 2013-05-13 14:35:35 UTC (rev 90711)
@@ -1 +0,0 @@
-d /var/run/pyicqt 0755 root root -
Copied: pyicqt/repos/community-any/pyicqt.tmpfiles (from rev 90710,
pyicqt/trunk/pyicqt.tmpfiles)
===================================================================
--- pyicqt.tmpfiles (rev 0)
+++ pyicqt.tmpfiles 2013-05-13 14:35:35 UTC (rev 90711)
@@ -0,0 +1 @@
+d /var/run/pyicqt 0755 root root -
Deleted: unicode-error-fix.diff
===================================================================
--- unicode-error-fix.diff 2013-05-13 14:35:15 UTC (rev 90710)
+++ unicode-error-fix.diff 2013-05-13 14:35:35 UTC (rev 90711)
@@ -1,14 +0,0 @@
---- icqt.py.org 2009-01-12 19:55:44.000000000 +0300
-+++ icqt.py 2009-01-23 12:57:41.000000000 +0300
-@@ -321,7 +321,10 @@
- self.oscarcon.legacyList.delCustomStatus(user.name,
savemask=mask)
-
- LogEvent(WARN, self.session.jabberID, "Status message: %s" %
status)
-+ try:
-- status = status.encode("utf-8", "replace")
-+ status = status.encode("utf-8", "replace")
-+ except UnicodeDecodeError:
-+ status = "unicode error"
- # status = status.encode(config.encoding, "replace")
-
- if config.xstatusessupport:
Copied: pyicqt/repos/community-any/unicode-error-fix.diff (from rev 90710,
pyicqt/trunk/unicode-error-fix.diff)
===================================================================
--- unicode-error-fix.diff (rev 0)
+++ unicode-error-fix.diff 2013-05-13 14:35:35 UTC (rev 90711)
@@ -0,0 +1,14 @@
+--- icqt.py.org 2009-01-12 19:55:44.000000000 +0300
++++ icqt.py 2009-01-23 12:57:41.000000000 +0300
+@@ -321,7 +321,10 @@
+ self.oscarcon.legacyList.delCustomStatus(user.name,
savemask=mask)
+
+ LogEvent(WARN, self.session.jabberID, "Status message: %s" %
status)
++ try:
+- status = status.encode("utf-8", "replace")
++ status = status.encode("utf-8", "replace")
++ except UnicodeDecodeError:
++ status = "unicode error"
+ # status = status.encode(config.encoding, "replace")
+
+ if config.xstatusessupport:
