diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /net-im/pyicq-t/files | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'net-im/pyicq-t/files')
-rw-r--r-- | net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 | 23 | ||||
-rw-r--r-- | net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch | 36 | ||||
-rw-r--r-- | net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff | 118 | ||||
-rw-r--r-- | net-im/pyicq-t/files/pyicq-t.service | 10 |
4 files changed, 0 insertions, 187 deletions
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 b/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 deleted file mode 100644 index eda03d55077e..000000000000 --- a/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - use jabber-server -} - -start() { - ebegin "Starting ICQ Jabber Transport" - checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/ - start-stop-daemon --start --pidfile /var/run/jabber/pyicq-t.pid -u jabber -g jabber \ - --exec INSPATH/pyicq-t.py -- \ - -b -c /etc/jabber/pyicq-t.xml -l /var/log/jabber/pyicq-t.log - eend $? -} - -stop() { - ebegin "Stopping ICQ Jabber Transport" - start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyicq-t.pid - eend $? -} diff --git a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch deleted file mode 100644 index 62df75873c08..000000000000 --- a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur pyicqt-0.8.1.5/src/contact.py pyicqt-0.8.1.5-1/src/contact.py ---- pyicqt-0.8.1.5/src/contact.py 2009-08-24 14:37:59.000000000 +0200 -+++ pyicqt-0.8.1.5-1/src/contact.py 2013-09-11 22:19:01.320467367 +0200 -@@ -13,7 +13,7 @@ - import globals - import base64 - if not config.disableAvatars: -- import Image -+ import PIL.Image as Image - import StringIO - - -diff -Naur pyicqt-0.8.1.5/src/imgmanip.py pyicqt-0.8.1.5-1/src/imgmanip.py ---- pyicqt-0.8.1.5/src/imgmanip.py 2009-08-24 14:37:59.000000000 +0200 -+++ pyicqt-0.8.1.5-1/src/imgmanip.py 2013-09-11 22:19:25.257168117 +0200 -@@ -5,7 +5,7 @@ - - if not config.disableAvatars: - try: -- import Image -+ import PIL.Image as Image - import StringIO - - def convertToPNG(imageData): -diff -Naur pyicqt-0.8.1.5/tools/infodump.py pyicqt-0.8.1.5-1/tools/infodump.py ---- pyicqt-0.8.1.5/tools/infodump.py 2009-08-24 14:37:59.000000000 +0200 -+++ pyicqt-0.8.1.5-1/tools/infodump.py 2013-09-11 22:18:34.084807860 +0200 -@@ -41,7 +41,7 @@ - print "Nevow Version: Unknown or Not Installed" - - try: -- from Image import VERSION -+ from PIL.Image import VERSION - print "Python Imaging Library (PIL) Version: " + VERSION - except: - print "Python Imaging Library (PIL) Version: Unknown or Not Installed" diff --git a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff deleted file mode 100644 index fd8e9e5ab8f0..000000000000 --- a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff +++ /dev/null @@ -1,118 +0,0 @@ -diff -Naur pyicqt-0.8.1.5/src/avatar.py p1//src/avatar.py ---- pyicqt-0.8.1.5/src/avatar.py 2010-06-07 12:16:36.000000000 +0200 -+++ p1//src/avatar.py 2010-06-07 12:16:16.000000000 +0200 -@@ -6,7 +6,7 @@ - from twisted.words.xish.domish import Element - from debug import LogEvent, INFO, WARN, ERROR - import lang --import sha -+from hashlib import sha1 - import base64 - import os - import os.path -@@ -46,7 +46,7 @@ - class Avatar: - """ Represents an Avatar. Does not store the image in memory. """ - def __init__(self, imageData, avatarCache): -- self.__imageHash = sha.sha(imageData).hexdigest() -+ self.__imageHash = sha1(imageData).hexdigest() - self.__avatarCache = avatarCache - - def getImageHash(self): -diff -Naur pyicqt-0.8.1.5/src/contact.py p1//src/contact.py ---- pyicqt-0.8.1.5/src/contact.py 2010-06-07 12:16:43.000000000 +0200 -+++ p1//src/contact.py 2010-06-07 12:16:16.000000000 +0200 -@@ -8,7 +8,6 @@ - import config - from debug import LogEvent, INFO, WARN, ERROR - import lang --import sha - import legacy - import globals - import base64 -diff -Naur pyicqt-0.8.1.5/src/legacy/buddies.py p1//src/legacy/buddies.py ---- pyicqt-0.8.1.5/src/legacy/buddies.py 2009-08-24 14:37:59.000000000 +0200 -+++ p1//src/legacy/buddies.py 2010-06-07 12:07:37.000000000 +0200 -@@ -12,7 +12,7 @@ - import os.path - import binascii - import os.path --import md5 -+from hashlib import md5 - - X = os.path.sep - -@@ -188,7 +188,7 @@ - avatarData = avatar.AvatarCache().setAvatar(imgmanip.convertToPNG(iconData)) - c.updateAvatar(avatarData, push=True) - if not md5Hash: -- m = md5.new() -+ m = md5() - m.update(iconData) - md5Hash = m.digest() - if not numHash: -diff -Naur pyicqt-0.8.1.5/src/legacy/glue.py p1//src/legacy/glue.py ---- pyicqt-0.8.1.5/src/legacy/glue.py 2009-08-24 14:37:59.000000000 +0200 -+++ p1//src/legacy/glue.py 2010-06-07 12:07:37.000000000 +0200 -@@ -18,7 +18,7 @@ - import time - import binascii - import avatar --import md5 -+from hashlib import md5 - import random - - from twisted.python import log -@@ -398,7 +398,7 @@ - try: - self.myavatar = imgmanip.convertToJPG(imageData) - self.myavatarlen = len(self.myavatar) -- m=md5.new() -+ m=md5() - m.update(self.myavatar) - self.myavatarsum = m.digest() - self.myavatarstamp = time.time() -diff -Naur pyicqt-0.8.1.5/src/legacy/icqt.py p1//src/legacy/icqt.py ---- pyicqt-0.8.1.5/src/legacy/icqt.py 2009-08-24 14:37:59.000000000 +0200 -+++ p1//src/legacy/icqt.py 2010-06-07 12:07:37.000000000 +0200 -@@ -14,7 +14,6 @@ - import time - import datetime - import binascii --import md5 - import locale - import struct - -diff -Naur pyicqt-0.8.1.5/src/tlib/oscar.py p1//src/tlib/oscar.py ---- pyicqt-0.8.1.5/src/tlib/oscar.py 2009-08-24 14:37:59.000000000 +0200 -+++ p1//src/tlib/oscar.py 2010-06-07 12:07:37.000000000 +0200 -@@ -21,7 +21,7 @@ - from scheduler import Scheduler - - import struct --import md5 -+from hashlib import md5 - import string - import socket - import random -@@ -120,9 +120,9 @@ - return dict,data - - def encryptPasswordMD5(password,key): -- m=md5.new() -+ m=md5() - m.update(key) -- m.update(md5.new(password).digest()) -+ m.update(md5(password).digest()) - m.update("AOL Instant Messenger (SM)") - return m.digest() - -@@ -534,7 +534,7 @@ - self.iconSum = tlvs.get(0xd5,"") - - def updateIcon(self, iconData): -- m=md5.new() -+ m=md5() - m.update(iconData) - self.iconSum = m.digest() - log.msg("icon sum is %s" % binascii.hexlify(self.iconSum)) diff --git a/net-im/pyicq-t/files/pyicq-t.service b/net-im/pyicq-t/files/pyicq-t.service deleted file mode 100644 index 852ec13315af..000000000000 --- a/net-im/pyicq-t/files/pyicq-t.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=PyICQt is an ICQ transport for Jabber/XMPP - -[Service] -ExecStart=INSPATH/pyicq-t.py -c /etc/jabber/pyicq-t.xml -l /var/log/jabber/pyicq-t.log -User=jabber -Group=jabber - -[Install] -WantedBy=multi-user.target |