Merge pull request #625 from Atheros1/master

v0.4.2
This commit is contained in:
Jonathan Warren 2014-01-20 23:15:25 -08:00
commit 15c61a2b39
14 changed files with 36 additions and 21 deletions

View File

@ -1,5 +1,5 @@
APP=pybitmessage APP=pybitmessage
VERSION=0.4.1 VERSION=0.4.2
RELEASE=1 RELEASE=1
ARCH_TYPE=`uname -m` ARCH_TYPE=`uname -m`
PREFIX?=/usr/local PREFIX?=/usr/local

View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
APP=pybitmessage APP=pybitmessage
PREV_VERSION=0.4.1 PREV_VERSION=0.4.2
VERSION=0.4.1 VERSION=0.4.2
RELEASE=1 RELEASE=1
ARCH_TYPE=any ARCH_TYPE=any
CURRDIR=`pwd` CURRDIR=`pwd`

View File

@ -1,6 +1,6 @@
# Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to> # Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to>
pkgname=pybitmessage pkgname=pybitmessage
pkgver=0.4.1 pkgver=0.4.2
pkgrel=1 pkgrel=1
pkgdesc="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide "non-content" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs." pkgdesc="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide "non-content" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs."
arch=('any') arch=('any')

View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
APP=pybitmessage APP=pybitmessage
PREV_VERSION=0.4.1 PREV_VERSION=0.4.2
VERSION=0.4.1 VERSION=0.4.2
RELEASE=1 RELEASE=1
ARCH_TYPE=all ARCH_TYPE=all
DIR=${APP}-${VERSION} DIR=${APP}-${VERSION}

View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
APP=pybitmessage APP=pybitmessage
PREV_VERSION=0.4.1 PREV_VERSION=0.4.2
VERSION=0.4.1 VERSION=0.4.2
RELEASE=1 RELEASE=1
SOURCEDIR=. SOURCEDIR=.
ARCH_TYPE=`uname -m` ARCH_TYPE=`uname -m`

View File

@ -4,7 +4,7 @@
rm -f Makefile rpmpackage/*.spec rm -f Makefile rpmpackage/*.spec
packagemonkey -n "PyBitmessage" --version "0.4.1" --dir "." -l "mit" \ packagemonkey -n "PyBitmessage" --version "0.4.2" --dir "." -l "mit" \
-e "Bob Mottram (4096 bits) <bob@robotics.uk.to>" \ -e "Bob Mottram (4096 bits) <bob@robotics.uk.to>" \
--brief "Send encrypted messages" \ --brief "Send encrypted messages" \
--desc "Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs." \ --desc "Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs." \

View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
APP=pybitmessage APP=pybitmessage
PREV_VERSION=0.4.1 PREV_VERSION=0.4.2
VERSION=0.4.1 VERSION=0.4.2
RELEASE=1 RELEASE=1
BUILDDIR=~/petbuild BUILDDIR=~/petbuild
CURRDIR=`pwd` CURRDIR=`pwd`

4
rpm.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
APP=pybitmessage APP=pybitmessage
PREV_VERSION=0.4.1 PREV_VERSION=0.4.2
VERSION=0.4.1 VERSION=0.4.2
RELEASE=1 RELEASE=1
SOURCEDIR=. SOURCEDIR=.
ARCH_TYPE=`uname -m` ARCH_TYPE=`uname -m`

View File

@ -1,5 +1,5 @@
Name: pybitmessage Name: pybitmessage
Version: 0.4.1 Version: 0.4.2
Release: 1%{?dist} Release: 1%{?dist}
Summary: Send encrypted messages Summary: Send encrypted messages
License: MIT License: MIT

View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
APP=pybitmessage APP=pybitmessage
PREV_VERSION=0.4.1 PREV_VERSION=0.4.2
VERSION=0.4.1 VERSION=0.4.2
RELEASE=1 RELEASE=1
ARCH_TYPE=`uname -m` ARCH_TYPE=`uname -m`
BUILDDIR=~/slackbuild BUILDDIR=~/slackbuild

View File

@ -15,7 +15,8 @@ import singleton
import os import os
from SimpleXMLRPCServer import SimpleXMLRPCServer from SimpleXMLRPCServer import SimpleXMLRPCServer
from api import MySimpleXMLRPCRequestHandler from api import MySimpleXMLRPCRequestHandler
from helper_startup import isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections
import shared import shared
from helper_sql import sqlQuery from helper_sql import sqlQuery
@ -59,10 +60,12 @@ def connectToStream(streamNumber):
for row in queryData: for row in queryData:
shared.inventorySets[streamNumber].add(row[0]) shared.inventorySets[streamNumber].add(row[0])
if sys.platform[0:3] == 'win':
if isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
# Some XP and Vista systems can only have 10 outgoing connections at a time.
maximumNumberOfHalfOpenConnections = 9 maximumNumberOfHalfOpenConnections = 9
else: else:
maximumNumberOfHalfOpenConnections = 32 maximumNumberOfHalfOpenConnections = 64
for i in range(maximumNumberOfHalfOpenConnections): for i in range(maximumNumberOfHalfOpenConnections):
a = outgoingSynSender() a = outgoingSynSender()
a.setup(streamNumber, selfInitiatedConnections) a.setup(streamNumber, selfInitiatedConnections)

View File

@ -1,7 +1,7 @@
from setuptools import setup from setuptools import setup
name = "Bitmessage" name = "Bitmessage"
version = "0.4.1" version = "0.4.2"
mainscript = ["bitmessagemain.py"] mainscript = ["bitmessagemain.py"]
setup( setup(

View File

@ -5,6 +5,8 @@ import os
import locale import locale
import random import random
import string import string
import platform
from distutils.version import StrictVersion
from namecoin import ensureNamecoinOptions from namecoin import ensureNamecoinOptions
@ -119,3 +121,13 @@ def loadConfig():
os.umask(0o077) os.umask(0o077)
with open(shared.appdata + 'keys.dat', 'wb') as configfile: with open(shared.appdata + 'keys.dat', 'wb') as configfile:
shared.config.write(configfile) shared.config.write(configfile)
def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
try:
VER_THIS=StrictVersion(platform.version())
if sys.platform[0:3]=="win":
return StrictVersion("5.1.2600")<=VER_THIS and StrictVersion("6.0.6000")>=VER_THIS
return False
except Exception as err:
print 'An Exception occurred within isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections:', err
return False

View File

@ -1,4 +1,4 @@
softwareVersion = '0.4.1' softwareVersion = '0.4.2'
verbose = 1 verbose = 1
maximumAgeOfAnObjectThatIAmWillingToAccept = 216000 # Equals two days and 12 hours. maximumAgeOfAnObjectThatIAmWillingToAccept = 216000 # Equals two days and 12 hours.
lengthOfTimeToLeaveObjectsInInventory = 237600 # Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice. lengthOfTimeToLeaveObjectsInInventory = 237600 # Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice.