summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author JK Wood2013-06-27 14:42:47 +0200
committer Niels Horn2013-06-29 21:11:05 +0200
commit6ed7820369f954446d5c95c1aaff541c9346d44f (patch)
treee16409a0041d5373f3cb07ee33c31b6aaad94bdd
parent39484c4cfefbb7691003143aca30a1fd9063315f (diff)
downloadslackbuilds-6ed7820369f954446d5c95c1aaff541c9346d44f.tar.gz
games/PyLotRO: Build bump.
Added a patch to allow connection to the LOTRO servers without modifying the system Python install. Added doinst.sh. Signed-off-by: Erik Hanson <erik@slackbuilds.org>
-rw-r--r--games/PyLotRO/HTTPSConnectionFix.patch22
-rw-r--r--games/PyLotRO/PyLotRO.SlackBuild8
-rw-r--r--games/PyLotRO/PyLotRO.info2
-rw-r--r--games/PyLotRO/doinst.sh3
4 files changed, 32 insertions, 3 deletions
diff --git a/games/PyLotRO/HTTPSConnectionFix.patch b/games/PyLotRO/HTTPSConnectionFix.patch
new file mode 100644
index 0000000000..96f6889037
--- /dev/null
+++ b/games/PyLotRO/HTTPSConnectionFix.patch
@@ -0,0 +1,22 @@
+--- PyLotROLauncher/PyLotROUtils.py 2012-11-28 20:06:06.000000000 -0600
++++ PyLotROLauncher/PyLotROUtils.py 2013-06-04 21:08:53.032626141 -0500
+@@ -37,6 +37,7 @@
+ # If Python 3.0 is in use use http otherwise httplib
+ if sys.version_info[:2] < (3, 0):
+ from httplib import HTTPConnection, HTTPSConnection
++ import ssl, socket
+ from urllib import quote
+ else:
+ from http.client import HTTPConnection, HTTPSConnection
+@@ -50,7 +51,10 @@
+ else:
+ url = urlIn[8:].split("/")[0]
+ post = urlIn[8:].replace(url, "")
+- return HTTPSConnection(url), post
++ conn = HTTPSConnection(url)
++ sock = socket.create_connection((conn.host, conn.port), conn.timeout, conn.source_address)
++ conn.sock = ssl.wrap_socket(sock, conn.key_file, conn.cert_file, ssl_version=ssl.PROTOCOL_TLSv1)
++ return conn, post
+
+ def GetText(nodelist):
+ rc = ""
diff --git a/games/PyLotRO/PyLotRO.SlackBuild b/games/PyLotRO/PyLotRO.SlackBuild
index 85db53c15f..fd9e86c26f 100644
--- a/games/PyLotRO/PyLotRO.SlackBuild
+++ b/games/PyLotRO/PyLotRO.SlackBuild
@@ -22,8 +22,8 @@
PRGNAM=PyLotRO
-VERSION=${VERSION:-0.1.15}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.1.15}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -50,6 +50,9 @@ rm -rf $PRGNAM-$VERSION
unzip $CWD/$PRGNAM-$VERSION.zip
mv $PRGNAM $PRGNAM-$VERSION
cd $PRGNAM-$VERSION
+
+patch -p0 < $CWD/HTTPSConnectionFix.patch
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -69,6 +72,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/PyLotRO/PyLotRO.info b/games/PyLotRO/PyLotRO.info
index 2f87bdd0b3..bc5d8424d2 100644
--- a/games/PyLotRO/PyLotRO.info
+++ b/games/PyLotRO/PyLotRO.info
@@ -2,7 +2,7 @@ PRGNAM="PyLotRO"
VERSION="0.1.15"
HOMEPAGE="https://sites.google.com/site/leeslinuxblog/installing-lotro-in-wine"
DOWNLOAD="https://sites.google.com/site/leeslinuxblog/PyLotRO-0.1.15.zip"
-MD5SUM="ff7f0baf94290c44263a1618e7e6a116"
+MD5SUM="0020630b0be1ae8cee075e994c4feb8d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/games/PyLotRO/doinst.sh b/games/PyLotRO/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/PyLotRO/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi