Updated py-bitmessage to 0.6.1.

pybitmessage (0.6.0-1) trusty; urgency=low

  * Bugfixes
  * UI improvements
  * performance and security improvements
  * integration with email gateway (mailchuck.com)

 -- Peter Surda <dev@mailchuck.com>  Mon, 2 May 2016 16:25:00 +0200

6 files changed, 74 insertions, 97 deletions

diff --git a/net/py-bitmessage/Makefile b/net/py-bitmessage/Makefile
index 08557336b91..5747f19e71c 100644
--- a/net/py-bitmessage/Makefile
+++ b/net/py-bitmessage/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2016/07/09 13:03:59 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/09/01 16:52:10 wiz Exp $
 
-GITHUB_PROJECT=	PyBitmessage
-DISTNAME=	${PYPKGPREFIX}-bitmessage-0.4.4
-PKGREVISION=	1
+DISTNAME=	PyBitmessage-0.6.1
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Py//:tl}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Bitmessage/}
+GITHUB_PROJECT=	PyBitmessage
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -18,6 +18,7 @@ HAS_CONFIGURE=	yes
 USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	src/bitmessagemain.py
+REPLACE_PYTHON+=	src/depends.py
 REPLACE_PYTHON+=	src/pyelliptic/cipher.py
 REPLACE_PYTHON+=	src/pyelliptic/ecc.py
 REPLACE_PYTHON+=	src/pyelliptic/hash.py
@@ -25,11 +26,6 @@ REPLACE_PYTHON+=	src/pyelliptic/openssl.py
 REPLACE_PYTHON+=	src/qidenticon.py
 REPLACE_PYTHON+=	src/singleton.py
 
-# Hack
-post-install:
-	${RUN} rm -f ${DESTDIR}${PREFIX}/share/pybitmessage/helper_startup.py.orig
-	${RUN} rm -f ${DESTDIR}${PREFIX}/share/pybitmessage/shared.py.orig
-
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/py-bitmessage/PLIST b/net/py-bitmessage/PLIST
index d7db5df3f86..23c41916228 100644
--- a/net/py-bitmessage/PLIST
+++ b/net/py-bitmessage/PLIST
@@ -1,17 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1 2015/12/13 00:31:53 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/09/01 16:52:10 wiz Exp $
 bin/pybitmessage
 man/man1/pybitmessage.1
 share/applications/pybitmessage.desktop
 share/icons/hicolor/24x24/apps/pybitmessage.png
-share/icons/hicolor/scalable/apps/pybitmessage.svg
 share/pybitmessage/addresses.py
 share/pybitmessage/api.py
 share/pybitmessage/api_client.py
+share/pybitmessage/bitmessagecli.py
 share/pybitmessage/bitmessagecurses/__init__.py
 share/pybitmessage/bitmessagemain.py
 share/pybitmessage/bitmessageqt/__init__.py
 share/pybitmessage/bitmessageqt/about.py
 share/pybitmessage/bitmessageqt/about.ui
+share/pybitmessage/bitmessageqt/account.py
 share/pybitmessage/bitmessageqt/addaddressdialog.py
 share/pybitmessage/bitmessageqt/addaddressdialog.ui
 share/pybitmessage/bitmessageqt/addpeer.ui
@@ -19,45 +20,75 @@ share/pybitmessage/bitmessageqt/bitmessage_icons.qrc
 share/pybitmessage/bitmessageqt/bitmessage_icons_rc.py
 share/pybitmessage/bitmessageqt/bitmessageui.py
 share/pybitmessage/bitmessageqt/bitmessageui.ui
+share/pybitmessage/bitmessageqt/blacklist.py
+share/pybitmessage/bitmessageqt/blacklist.ui
 share/pybitmessage/bitmessageqt/connect.py
 share/pybitmessage/bitmessageqt/connect.ui
+share/pybitmessage/bitmessageqt/dialogs.py
+share/pybitmessage/bitmessageqt/emailgateway.py
+share/pybitmessage/bitmessageqt/emailgateway.ui
+share/pybitmessage/bitmessageqt/foldertree.py
 share/pybitmessage/bitmessageqt/help.py
 share/pybitmessage/bitmessageqt/help.ui
 share/pybitmessage/bitmessageqt/iconglossary.py
 share/pybitmessage/bitmessageqt/iconglossary.ui
+share/pybitmessage/bitmessageqt/languagebox.py
+share/pybitmessage/bitmessageqt/messagecompose.py
+share/pybitmessage/bitmessageqt/messageview.py
+share/pybitmessage/bitmessageqt/migrationwizard.py
+share/pybitmessage/bitmessageqt/networkstatus.py
+share/pybitmessage/bitmessageqt/networkstatus.ui
 share/pybitmessage/bitmessageqt/newaddressdialog.py
 share/pybitmessage/bitmessageqt/newaddressdialog.ui
+share/pybitmessage/bitmessageqt/newaddresswizard.py
 share/pybitmessage/bitmessageqt/newchandialog.py
 share/pybitmessage/bitmessageqt/newchandialog.ui
 share/pybitmessage/bitmessageqt/newsubscriptiondialog.py
 share/pybitmessage/bitmessageqt/newsubscriptiondialog.ui
 share/pybitmessage/bitmessageqt/regenerateaddresses.py
 share/pybitmessage/bitmessageqt/regenerateaddresses.ui
+share/pybitmessage/bitmessageqt/retranslateui.py
+share/pybitmessage/bitmessageqt/safehtmlparser.py
 share/pybitmessage/bitmessageqt/settings.py
 share/pybitmessage/bitmessageqt/settings.ui
+share/pybitmessage/bitmessageqt/settingsmixin.py
 share/pybitmessage/bitmessageqt/specialaddressbehavior.py
 share/pybitmessage/bitmessageqt/specialaddressbehavior.ui
+share/pybitmessage/bitmessageqt/support.py
+share/pybitmessage/bitmessageqt/uisignaler.py
+share/pybitmessage/bitmessageqt/utils.py
 share/pybitmessage/bitmessageqt/wanlan.ui
+share/pybitmessage/bitmessageqt/widgets.py
+share/pybitmessage/bitmsghash/Makefile
+share/pybitmessage/bitmsghash/bitmsghash.cl
+share/pybitmessage/bitmsghash/bitmsghash.cpp
 share/pybitmessage/build_osx.py
 share/pybitmessage/class_addressGenerator.py
 share/pybitmessage/class_objectHashHolder.py
 share/pybitmessage/class_objectProcessor.py
+share/pybitmessage/class_objectProcessorQueue.py
 share/pybitmessage/class_outgoingSynSender.py
 share/pybitmessage/class_receiveDataThread.py
 share/pybitmessage/class_sendDataThread.py
 share/pybitmessage/class_singleCleaner.py
 share/pybitmessage/class_singleListener.py
 share/pybitmessage/class_singleWorker.py
+share/pybitmessage/class_smtpDeliver.py
+share/pybitmessage/class_smtpServer.py
 share/pybitmessage/class_sqlThread.py
 share/pybitmessage/debug.py
 share/pybitmessage/defaultKnownNodes.py
+share/pybitmessage/depends.py
 share/pybitmessage/helper_bitcoin.py
 share/pybitmessage/helper_bootstrap.py
 share/pybitmessage/helper_generic.py
 share/pybitmessage/helper_inbox.py
+share/pybitmessage/helper_msgcoding.py
+share/pybitmessage/helper_search.py
 share/pybitmessage/helper_sent.py
 share/pybitmessage/helper_sql.py
 share/pybitmessage/helper_startup.py
+share/pybitmessage/helper_threading.py
 share/pybitmessage/highlevelcrypto.py
 share/pybitmessage/images/addressbook.png
 share/pybitmessage/images/bitmessage.icns
@@ -85,7 +116,9 @@ share/pybitmessage/images/yellowicon.png
 share/pybitmessage/l10n.py
 share/pybitmessage/message_data_reader.py
 share/pybitmessage/namecoin.py
+share/pybitmessage/openclpow.py
 share/pybitmessage/proofofwork.py
+share/pybitmessage/protocol.py
 share/pybitmessage/pyelliptic/LICENSE
 share/pybitmessage/pyelliptic/README.md
 share/pybitmessage/pyelliptic/__init__.py
@@ -101,34 +134,46 @@ share/pybitmessage/socks/BUGS
 share/pybitmessage/socks/LICENSE
 share/pybitmessage/socks/README
 share/pybitmessage/socks/__init__.py
+share/pybitmessage/sslkeys/cert.pem
+share/pybitmessage/sslkeys/key.pem
 share/pybitmessage/tr.py
-share/pybitmessage/translations/bitmessage_ar.pro
+share/pybitmessage/translations/bitmessage.pro
 share/pybitmessage/translations/bitmessage_ar.qm
 share/pybitmessage/translations/bitmessage_ar.ts
-share/pybitmessage/translations/bitmessage_de.pro
+share/pybitmessage/translations/bitmessage_cs.qm
+share/pybitmessage/translations/bitmessage_cs.ts
+share/pybitmessage/translations/bitmessage_da.qm
+share/pybitmessage/translations/bitmessage_da.ts
 share/pybitmessage/translations/bitmessage_de.qm
 share/pybitmessage/translations/bitmessage_de.ts
-share/pybitmessage/translations/bitmessage_en_pirate.pro
+share/pybitmessage/translations/bitmessage_en.qm
+share/pybitmessage/translations/bitmessage_en.ts
 share/pybitmessage/translations/bitmessage_en_pirate.qm
 share/pybitmessage/translations/bitmessage_en_pirate.ts
-share/pybitmessage/translations/bitmessage_eo.pro
 share/pybitmessage/translations/bitmessage_eo.qm
 share/pybitmessage/translations/bitmessage_eo.ts
-share/pybitmessage/translations/bitmessage_fr.pro
 share/pybitmessage/translations/bitmessage_fr.qm
 share/pybitmessage/translations/bitmessage_fr.ts
-share/pybitmessage/translations/bitmessage_ja.pro
+share/pybitmessage/translations/bitmessage_it.qm
+share/pybitmessage/translations/bitmessage_it.ts
 share/pybitmessage/translations/bitmessage_ja.qm
 share/pybitmessage/translations/bitmessage_ja.ts
-share/pybitmessage/translations/bitmessage_nl.pro
+share/pybitmessage/translations/bitmessage_nb.ts
 share/pybitmessage/translations/bitmessage_nl.qm
 share/pybitmessage/translations/bitmessage_nl.ts
-share/pybitmessage/translations/bitmessage_no.pro
 share/pybitmessage/translations/bitmessage_no.qm
 share/pybitmessage/translations/bitmessage_no.ts
-share/pybitmessage/translations/bitmessage_ru.pro
+share/pybitmessage/translations/bitmessage_pl.qm
+share/pybitmessage/translations/bitmessage_pl.ts
+share/pybitmessage/translations/bitmessage_pt.qm
+share/pybitmessage/translations/bitmessage_pt.ts
 share/pybitmessage/translations/bitmessage_ru.qm
 share/pybitmessage/translations/bitmessage_ru.ts
-share/pybitmessage/translations/bitmessage_zh_cn.pro
+share/pybitmessage/translations/bitmessage_sk.qm
+share/pybitmessage/translations/bitmessage_sk.ts
+share/pybitmessage/translations/bitmessage_sv.ts
 share/pybitmessage/translations/bitmessage_zh_cn.qm
 share/pybitmessage/translations/bitmessage_zh_cn.ts
+share/pybitmessage/upnp.py
+@pkgdir share/pixmaps
+@pkgdir share/icons/hicolor/scalable/apps
diff --git a/net/py-bitmessage/distinfo b/net/py-bitmessage/distinfo
index 30290c02076..cf6b89f3fa1 100644
--- a/net/py-bitmessage/distinfo
+++ b/net/py-bitmessage/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.2 2016/04/21 10:47:46 jperkin Exp $
+$NetBSD: distinfo,v 1.3 2016/09/01 16:52:10 wiz Exp $
 
-SHA1 (py27-bitmessage-0.4.4.tar.gz) = 60585ee922b53f96940898bf4c278ae035b32ab9
-RMD160 (py27-bitmessage-0.4.4.tar.gz) = b6ea349ebfecd3ac2f809156cfeffedf95d36449
-Size (py27-bitmessage-0.4.4.tar.gz) = 611490 bytes
-SHA1 (patch-Makefile) = 2d119c42c1bdf8f37f81f1e057c7230e0b0ec55b
-SHA1 (patch-src_helper__startup.py) = 1175e9f5279160ec8d533a188944c60283f6be22
-SHA1 (patch-src_shared.py) = 691380e3879aaf776abbfe6711c791cd013ac127
+SHA1 (PyBitmessage-0.6.1.tar.gz) = 77895e69f45f9e9f28c61dd3621e771a6087ddd0
+RMD160 (PyBitmessage-0.6.1.tar.gz) = a0d12d7b2618d513fab8ee6c55fbf2cf29a4312e
+SHA512 (PyBitmessage-0.6.1.tar.gz) = 1d94341d4a792db61d7478718b3dead7907410398390ec8b5b1c9bff1a3456179f935baf23dc36677726ae19b7cc4ea91a1e77e7b2f9346ac84fd852b290b5ec
+Size (PyBitmessage-0.6.1.tar.gz) = 962301 bytes
+SHA1 (patch-Makefile) = b6cf0b700737964d5912cc051cf3152a020e0cca
diff --git a/net/py-bitmessage/patches/patch-Makefile b/net/py-bitmessage/patches/patch-Makefile
index 238932a7475..9145488a29e 100644
--- a/net/py-bitmessage/patches/patch-Makefile
+++ b/net/py-bitmessage/patches/patch-Makefile
@@ -1,42 +1,18 @@
-$NetBSD: patch-Makefile,v 1.2 2016/04/21 10:47:46 jperkin Exp $
+$NetBSD: patch-Makefile,v 1.3 2016/09/01 16:52:10 wiz Exp $
 
-Adjust paths for pkgsrc.
+Install man page into proper path for pkgsrc.
 
---- Makefile.orig	2014-10-15 21:16:27.000000000 +0000
+--- Makefile.orig	2016-08-21 09:56:25.000000000 +0000
 +++ Makefile
-@@ -13,13 +13,12 @@ source:
- 	tar -cvf ../${APP}_${VERSION}.orig.tar ../${APP}-${VERSION} --exclude-vcs
- 	gzip -f9n ../${APP}_${VERSION}.orig.tar
- install:
--	mkdir -p ${DESTDIR}/usr
+@@ -16,9 +16,8 @@ install:
  	mkdir -p ${DESTDIR}${PREFIX}
  	mkdir -p ${DESTDIR}${PREFIX}/bin
--	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share
+ 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share
 -	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man
 -	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
 -	install -m 644 man/${APP}.1.gz ${DESTDIR}${PREFIX}/share/man/man1
-+	mkdir -m 755 -p ${DESTDIR}${PREFIX}/${PKGMANDIR}
 +	mkdir -m 755 -p ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-+	gunzip man/${APP}.1.gz
-+	install -m 644 man/${APP}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
++	install -m 644 man/${APP}.1.gz ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
  	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/${APP}
  	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/applications
  	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/pixmaps
-@@ -34,15 +33,10 @@ install:
- 	install -m 644 desktop/can-icon.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${APP}.svg
- 	cp -rf src/* ${DESTDIR}${PREFIX}/share/${APP}
- 	echo '#!/bin/sh' > ${DESTDIR}${PREFIX}/bin/${APP}
--	echo 'if [ -d ${DESTDIR}/usr/local/share/${APP} ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP}
--	echo '  cd ${DESTDIR}/usr/local/share/${APP}' >> ${DESTDIR}${PREFIX}/bin/${APP}
--	echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP}
--	echo '  cd ${DESTDIR}/usr/share/pybitmessage' >> ${DESTDIR}${PREFIX}/bin/${APP}
--	echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP}
--	echo 'LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
-+	echo 'exec ${PREFIX}/share/${APP}/bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
- 	chmod +x ${DESTDIR}${PREFIX}/bin/${APP}
- uninstall:
--	rm -f ${PREFIX}/share/man/man1/${APP}.1.gz
-+	rm -f ${PREFIX}/${PKGMANDIR}/man1/${APP}.1.gz
- 	rm -rf ${PREFIX}/share/${APP}
- 	rm -f ${PREFIX}/bin/${APP}
- 	rm -f ${PREFIX}/share/applications/${APP}.desktop
diff --git a/net/py-bitmessage/patches/patch-src_helper__startup.py b/net/py-bitmessage/patches/patch-src_helper__startup.py
deleted file mode 100644
index 152253af6b9..00000000000
--- a/net/py-bitmessage/patches/patch-src_helper__startup.py
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_helper__startup.py,v 1.1 2015/12/13 00:31:54 kamil Exp $
-
-Unbreak version check of all BSDs.
-
-Merged upstream:
-https://github.com/Bitmessage/PyBitmessage/pull/811
-
---- src/helper_startup.py.orig	2014-10-15 21:16:27.000000000 +0000
-+++ src/helper_startup.py
-@@ -140,8 +140,8 @@ def loadConfig():
- 
- def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
-     try:
--        VER_THIS=StrictVersion(platform.version())
-         if sys.platform[0:3]=="win":
-+            VER_THIS=StrictVersion(platform.version())
-             return StrictVersion("5.1.2600")<=VER_THIS and StrictVersion("6.0.6000")>=VER_THIS
-         return False
-     except Exception as err:
diff --git a/net/py-bitmessage/patches/patch-src_shared.py b/net/py-bitmessage/patches/patch-src_shared.py
deleted file mode 100644
index 78860c798ce..00000000000
--- a/net/py-bitmessage/patches/patch-src_shared.py
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_shared.py,v 1.1 2015/12/13 00:31:54 kamil Exp $
-
-FreeBSD and NetBSD are compatible here.
-
-Patch merged upstream:
-https://github.com/Bitmessage/PyBitmessage/pull/812
-
---- src/shared.py.orig	2014-10-15 21:16:27.000000000 +0000
-+++ src/shared.py
-@@ -419,8 +419,8 @@ def checkSensitiveFilePermissions(filena
-         # TODO: This might deserve extra checks by someone familiar with
-         # Windows systems.
-         return True
--    elif sys.platform[:7] == 'freebsd':
--        # FreeBSD file systems are the same as major Linux file systems
-+    elif sys.platform[:7] == 'freebsd' or sys.platform[:6] == 'netbsd':
-+        # BSD file systems are the same as major Linux file systems
-         present_permissions = os.stat(filename)[0]
-         disallowed_permissions = stat.S_IRWXG | stat.S_IRWXO
-         return present_permissions & disallowed_permissions == 0