Commit 085a13d9 authored by Mike Hibler's avatar Mike Hibler

Yet another version of The Patch

parent c8e1e313
......@@ -531,7 +531,10 @@ Phase "patches", "Applying patches", sub {
Phase "m2cryptopatch", "Patching m2crypto", sub {
my $patchfile = $M2CRYPTO_PATCH;
if (ExecQuiet("$PKG_INFO -I -x m2crypto | fgrep -q -s '0.13'") == 0) {
if (ExecQuiet("$PKG_INFO -I -x m2crypto | fgrep -q -s '0.17'") == 0) {
$patchfile = "${patchfile}-0.17";
}
elsif (ExecQuiet("$PKG_INFO -I -x m2crypto | fgrep -q -s '0.13'") == 0) {
$patchfile = "${patchfile}-0.13";
}
if (!ExecQuiet("$PATCH -C -f -l -R -p0 -i $patchfile")) {
......
......@@ -508,7 +508,10 @@ Phase "patches", "Applying patches", sub {
Phase "m2cryptopatch", "Patching m2crypto", sub {
my $patchfile = $M2CRYPTO_PATCH;
if (ExecQuiet("$PKG_INFO -I -x m2crypto | fgrep -q -s '0.13'") == 0) {
if (ExecQuiet("$PKG_INFO -I -x m2crypto | fgrep -q -s '0.17'") == 0) {
$patchfile = "${patchfile}-0.17";
}
elsif (ExecQuiet("$PKG_INFO -I -x m2crypto | fgrep -q -s '0.13'") == 0) {
$patchfile = "${patchfile}-0.13";
}
if (!ExecQuiet("$PATCH -C -f -l -R -p0 -i $patchfile")) {
......
Index: /usr/local/lib/python2.5/site-packages/M2Crypto/SSL/Context.py
===================================================================
--- Context.py (revision 322)
+++ Context.py (working copy)
@@ -14,13 +14,13 @@
self.map = {}
def __getitem__(self, key):
- return self.map[key]
+ return self.map[repr(key)]
def __setitem__(self, key, value):
- self.map[key] = value
+ self.map[repr(key)] = value
def __delitem__(self, key):
- del self.map[key]
+ del self.map[repr(key)]
def map():
if _ctxmap.singleton is None:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment