summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-im/pyaim-t/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-im/pyaim-t/files')
-rw-r--r--net-im/pyaim-t/files/pyaim-t-0.8-initd-r124
-rw-r--r--net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch36
-rw-r--r--net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch118
3 files changed, 178 insertions, 0 deletions
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1 b/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1
new file mode 100644
index 000000000000..c4d867e37773
--- /dev/null
+++ b/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need net
+ use jabber-server
+}
+
+start() {
+ ebegin "Starting AIM Jabber Transport"
+ checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/
+ start-stop-daemon --start --pidfile /var/run/jabber/pyaim-t.pid -u jabber -g jabber \
+ --exec INSPATH/pyaim-t.py -- \
+ -b -c /etc/jabber/pyaim-t.xml -l /var/log/jabber/pyaim-t.log
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping AIM Jabber Transport"
+ start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyaim-t.pid
+ eend $?
+}
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch
new file mode 100644
index 000000000000..13067925c18a
--- /dev/null
+++ b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch
@@ -0,0 +1,36 @@
+diff -Naur pyaimt-0.8.0.1/src/contact.py pyaimt-0.8.0.1-1/src/contact.py
+--- pyaimt-0.8.0.1/src/contact.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-1/src/contact.py 2013-09-18 17:57:12.863780595 +0200
+@@ -13,7 +13,7 @@
+ import globals
+ import base64
+ if not config.disableAvatars:
+- import Image
++ import PIL.Image as Image
+ import StringIO
+
+
+diff -Naur pyaimt-0.8.0.1/src/imgmanip.py pyaimt-0.8.0.1-1/src/imgmanip.py
+--- pyaimt-0.8.0.1/src/imgmanip.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-1/src/imgmanip.py 2013-09-18 17:57:12.863780595 +0200
+@@ -5,7 +5,7 @@
+
+ if not config.disableAvatars:
+ try:
+- import Image
++ import PIL.Image as Image
+ import StringIO
+
+ def convertToPNG(imageData):
+diff -Naur pyaimt-0.8.0.1/tools/infodump.py pyaimt-0.8.0.1-1/tools/infodump.py
+--- pyaimt-0.8.0.1/tools/infodump.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-1/tools/infodump.py 2013-09-18 17:57:12.864780582 +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/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
new file mode 100644
index 000000000000..a6fa52e757e8
--- /dev/null
+++ b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
@@ -0,0 +1,118 @@
+diff -Naur pyaimt-0.8.0.1/src/avatar.py pyaimt-0.8.0.1-py26//src/avatar.py
+--- pyaimt-0.8.0.1/src/avatar.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/avatar.py 2011-08-24 20:30:06.146311346 +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 pyaimt-0.8.0.1/src/contact.py pyaimt-0.8.0.1-py26//src/contact.py
+--- pyaimt-0.8.0.1/src/contact.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/contact.py 2011-08-24 20:30:06.146311346 +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 pyaimt-0.8.0.1/src/legacy/aimt.py pyaimt-0.8.0.1-py26//src/legacy/aimt.py
+--- pyaimt-0.8.0.1/src/legacy/aimt.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/aimt.py 2011-08-24 20:32:28.187361518 +0200
+@@ -11,7 +11,6 @@
+ import re
+ import time
+ import binascii
+-import md5
+ import imgmanip
+
+
+diff -Naur pyaimt-0.8.0.1/src/legacy/buddies.py pyaimt-0.8.0.1-py26//src/legacy/buddies.py
+--- pyaimt-0.8.0.1/src/legacy/buddies.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/buddies.py 2011-08-24 20:30:06.147311326 +0200
+@@ -12,7 +12,7 @@
+ import os.path
+ import binascii
+ import os.path
+-import md5
++from hashlib import md5
+
+ X = os.path.sep
+
+@@ -138,7 +138,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 pyaimt-0.8.0.1/src/legacy/glue.py pyaimt-0.8.0.1-py26//src/legacy/glue.py
+--- pyaimt-0.8.0.1/src/legacy/glue.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/legacy/glue.py 2011-08-24 20:31:20.066825898 +0200
+@@ -19,7 +19,7 @@
+ import time
+ import binascii
+ import avatar
+-import md5
++from hashlib import md5
+
+ # The name of the transport
+ name = "AIM Transport"
+@@ -450,7 +450,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 pyaimt-0.8.0.1/src/tlib/oscar.py pyaimt-0.8.0.1-py26//src/tlib/oscar.py
+--- pyaimt-0.8.0.1/src/tlib/oscar.py 2009-08-24 15:04:03.000000000 +0200
++++ pyaimt-0.8.0.1-py26//src/tlib/oscar.py 2011-08-24 20:30:22.415200813 +0200
+@@ -20,7 +20,7 @@
+ from scheduler import Scheduler
+
+ import struct
+-import md5
++from hashlib import md5
+ import string
+ import socket
+ import random
+@@ -106,9 +106,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))