Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Eric Sandall (b8154de0bc9eabd83e0fcdf0335b04b7b152d89c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Eric Sandall (b8154de0bc9eabd83e0fcdf0335b04b7b152d89c)
  • Date: Fri, 26 Jul 2013 15:27:48 -0500

GIT changes to master games grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

dev/null |binary
games-rpg-mp/pylotro/BUILD | 1 +
games-rpg-mp/pylotro/DETAILS | 6 +++---
games-rpg-mp/pylotro/HISTORY | 7 +++++++
games-rpg-mp/pylotro/PRE_BUILD | 5 ++++-
games-rpg-mp/pylotro/PyLotRO-0.1.15.zip.sig |binary
games-rpg-mp/pylotro/python27.patch | 23 +++++++++++++++++++++++
7 files changed, 38 insertions(+), 4 deletions(-)

New commits:
commit b8154de0bc9eabd83e0fcdf0335b04b7b152d89c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

pylotro: Updated to 0.1.15 (now a ZIP; hosted elsewhere)
Main host is now down and unmaintained.
ZIP extracts to "PyLotRO" directory.
Fix HTTPS connections with Python 2.7+

diff --git a/games-rpg-mp/pylotro/BUILD b/games-rpg-mp/pylotro/BUILD
index a05d2aa..c313309 100755
--- a/games-rpg-mp/pylotro/BUILD
+++ b/games-rpg-mp/pylotro/BUILD
@@ -1 +1,2 @@
+cd "${SOURCE_DIRECTORY}"/PyLotRO &&
default_build_python
diff --git a/games-rpg-mp/pylotro/DETAILS b/games-rpg-mp/pylotro/DETAILS
index b6f911e..8bfcba4 100755
--- a/games-rpg-mp/pylotro/DETAILS
+++ b/games-rpg-mp/pylotro/DETAILS
@@ -1,8 +1,8 @@
SPELL=pylotro
- VERSION=0.1.13
- SOURCE=PyLotRO-$VERSION.tar.bz2
+ VERSION=0.1.15
+ SOURCE=PyLotRO-$VERSION.zip
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.lotrolinux.com/$SOURCE
+ SOURCE_URL[0]=https://sites.google.com/site/leeslinuxblog/$SOURCE
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
WEB_SITE=https://launchpad.net/pylotro
diff --git a/games-rpg-mp/pylotro/HISTORY b/games-rpg-mp/pylotro/HISTORY
index 19d1ca6..2fb8798 100644
--- a/games-rpg-mp/pylotro/HISTORY
+++ b/games-rpg-mp/pylotro/HISTORY
@@ -1,3 +1,10 @@
+2013-07-26 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.1.15 (now a ZIP; hosted elsewhere)
+ Main host is now down and unmaintained.
+ * PRE_BUILD: Apply python27.patch
+ * BUILD: ZIP extracts to "PyLotRO" directory.
+ * python27.patch: Fix HTTPS connections with Python 2.7+
+
2010-09-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.1.13

diff --git a/games-rpg-mp/pylotro/PRE_BUILD b/games-rpg-mp/pylotro/PRE_BUILD
index 777f6c3..a4e4aa8 100755
--- a/games-rpg-mp/pylotro/PRE_BUILD
+++ b/games-rpg-mp/pylotro/PRE_BUILD
@@ -1,3 +1,6 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
-unpack_file ''
+unpack_file '' &&
+message "${MESSAGE_COLOR}Fixing HTTPS connections with Python
2.7+...${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/PyLotRO/PyLotROLauncher/PyLotROUtils.py \
+ "${SPELL_DIRECTORY}"/python27.patch
diff --git a/games-rpg-mp/pylotro/PyLotRO-0.1.13.tar.bz2.sig
b/games-rpg-mp/pylotro/PyLotRO-0.1.13.tar.bz2.sig
deleted file mode 100644
index 04a0e82..0000000
Binary files a/games-rpg-mp/pylotro/PyLotRO-0.1.13.tar.bz2.sig and /dev/null
differ
diff --git a/games-rpg-mp/pylotro/PyLotRO-0.1.15.zip.sig
b/games-rpg-mp/pylotro/PyLotRO-0.1.15.zip.sig
new file mode 100644
index 0000000..e0b893c
Binary files /dev/null and b/games-rpg-mp/pylotro/PyLotRO-0.1.15.zip.sig
differ
diff --git a/games-rpg-mp/pylotro/python27.patch
b/games-rpg-mp/pylotro/python27.patch
new file mode 100644
index 0000000..ded516b
--- /dev/null
+++ b/games-rpg-mp/pylotro/python27.patch
@@ -0,0 +1,23 @@
+# Fix from
http://slackbuilds.org/slackbuilds/14.0/games/PyLotRO/HTTPSConnectionFix.patch
for Python 2.7+ HTTPS connections.
+--- 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 = ""



  • [SM-Commit] GIT changes to master games grimoire by Eric Sandall (b8154de0bc9eabd83e0fcdf0335b04b7b152d89c), Eric Sandall, 07/26/2013

Archive powered by MHonArc 2.6.24.

Top of Page