4 files changed, 105 insertions, 208 deletions

diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index 6a12e3920258..8cd4e99c14f3 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	tribler
-PORTVERSION=	6.3.3
+PORTVERSION=	6.4.3
 CATEGORIES=	net-p2p
-MASTER_SITES=	GH \
-		https://github.com/Tribler/tribler/releases/download/${PORTVERSION:S/^/v/}/:tribler
-DISTFILES=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}${EXTRACT_SUFX} \
-		${PORTNAME}_${PORTVERSION}_all.deb:tribler
+MASTER_SITES=	https://github.com/Tribler/tribler/releases/download/${PORTVERSION:S/^/v/}/
+DISTFILES=	${PORTNAME}_${PORTVERSION}_all.deb
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Streaming capable P2P network client based on BitTorrent
@@ -15,34 +13,35 @@ COMMENT=	Streaming capable P2P network client based on BitTorrent
 LICENSE=	LGPL21 MIT
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apsw>0:${PORTSDIR}/databases/py-apsw \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}asn1>0:${PORTSDIR}/devel/py-asn1 \
+		${PYTHON_PKGNAMEPREFIX}asn1>=0.1.7:${PORTSDIR}/devel/py-asn1 \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}gmpy>0:${PORTSDIR}/math/py-gmpy \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:${PORTSDIR}/net/py-netifaces \
-		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>0:${PORTSDIR}/net-p2p/libtorrent-rasterbar-python \
+		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0.16.4:${PORTSDIR}/net-p2p/libtorrent-rasterbar-python \
 		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}feedparser>0:${PORTSDIR}/textproc/py-feedparser
+		${PYTHON_PKGNAMEPREFIX}feedparser>0:${PORTSDIR}/textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}cherrypy>0:${PORTSDIR}/www/py-cherrypy \
+		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	LipuFei
-GH_PROJECT=	libswift
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	01745ce
+NO_ARCH=	yes
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-USES=		desktop-file-utils gmake python:2 shebangfix twisted:run
-SHEBANG_FILES=	../usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/*.py \
-		../usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/*/*.py \
-		../usr/share/tribler/Tribler/Debug/memory.py \
-		../usr/share/tribler/Tribler/Main/*.py \
-		../usr/share/tribler/Tribler/dispersy/*/*.py \
-		../usr/share/tribler/Tribler/vlc.py
+USES=		desktop-file-utils python:2 shebangfix twisted:run
+SHEBANG_FILES=	usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/*.py \
+		usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/*/*.py \
+		usr/share/tribler/Tribler/Debug/memory.py \
+		usr/share/tribler/Tribler/Main/*.py \
+		usr/share/tribler/Tribler/dispersy/*/*.py \
+		usr/share/tribler/Tribler/vlc.py
+USE_OPENSSL=	yes
+USE_PYTHON=	run
 USE_WX=		2.8+
 WX_COMPS=	python
 WX_UNICODE=	yes
-USE_OPENSSL=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -57,37 +56,28 @@ VLC_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
 TRIBLER_DIR=	${PYTHONPREFIX_SITELIBDIR}/tribler
 
 post-extract:
-	@${TAR} -C ${WRKDIR} -xf ${WRKDIR}/data.tar.gz
+	@(cd ${WRKSRC} && ${TAR} -xf data.tar.xz)
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|-O2|$${CXXFLAGS}| ; \
-		 s|-g|| ; \
-		 s|-lstdc++|| ; \
-		 s|g++|$${CXX}|' \
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e \
 		's|%%OPSYS%%|${OPSYS}| ; \
 		 s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}| ; \
 		 s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' \
-		${WRKDIR}/usr/bin/tribler
+		${WRKSRC}/usr/bin/tribler
 	@${REINPLACE_CMD} -e \
 		's|Application;|| ; \
 		 /^Categories/s|$$|;| ; \
 		 /^MimeType/s|$$|;|' \
-		${WRKDIR}/usr/share/applications/tribler.desktop
+		${WRKSRC}/usr/share/applications/tribler.desktop
 	@${REINPLACE_CMD} -i '' -e \
 		's|linux|${OPSYS:tl}|' \
-		${WRKDIR}/usr/share/tribler/Tribler/vlc.py
+		${WRKSRC}/usr/share/tribler/Tribler/vlc.py
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${TRIBLER_DIR}/Tribler \
-		${STAGEDIR}${DESKTOPDIR} \
-		${STAGEDIR}${DOCSDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/swift ${STAGEDIR}${PREFIX}/libexec
-	${INSTALL_SCRIPT} ${WRKDIR}/usr/bin/tribler ${STAGEDIR}${PREFIX}/bin
-	${LN} -sf ${PREFIX}/libexec/swift ${STAGEDIR}${TRIBLER_DIR}
-	(${TAR} -C ${WRKDIR}/usr/share/tribler/Tribler \
+	(cd ${WRKSRC}/usr/bin && ${INSTALL_SCRIPT} tribler \
+		${STAGEDIR}${PREFIX}/bin)
+	@${MKDIR} ${STAGEDIR}${TRIBLER_DIR}/Tribler
+	@(${TAR} -C ${WRKSRC}/usr/share/tribler/Tribler \
 		--exclude "Build" \
 		--exclude "LGPL-2.1.txt" \
 		--exclude "SwiftEngine" \
@@ -95,20 +85,22 @@ do-install:
 		--exclude "*LICENSE*.txt" \
 		--exclude "*.orig" \
 		-cf - . | ${TAR} -C ${STAGEDIR}${TRIBLER_DIR}/Tribler -xf -)
-	${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type f -print0 | \
+	@${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type f -print0 | \
 		${XARGS} -0 ${CHMOD} ${SHAREMODE}
-	${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type d -print0 | \
+	@${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type d -print0 | \
 		${XARGS} -0 ${CHMOD} a+rx
-	(cd ${WRKDIR}/usr/share/applications && ${INSTALL_DATA} \
-		tribler.desktop ${STAGEDIR}${DESKTOPDIR})
-	(cd ${WRKDIR}/usr/share/pixmaps && ${INSTALL_DATA} \
-		tribler.xpm ${STAGEDIR}${PREFIX}/share/pixmaps)
-	(cd ${WRKDIR}/usr/share/tribler/Tribler && ${INSTALL_DATA} \
+	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+	(cd ${WRKSRC}/usr/share/applications && ${INSTALL_DATA} \
+		*.desktop ${STAGEDIR}${PREFIX}/share/applications)
+	(cd ${WRKSRC}/usr/share/pixmaps && ${INSTALL_DATA} \
+		*.xpm ${STAGEDIR}${PREFIX}/share/pixmaps)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/usr/share/tribler/Tribler && ${INSTALL_DATA} \
 		*LICENSE*.txt readme.txt ${STAGEDIR}${DOCSDIR})
-	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
+	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
-	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O -m compileall \
+	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O -m compileall \
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 
diff --git a/net-p2p/tribler/distinfo b/net-p2p/tribler/distinfo
index 5f630d1da63d..ba6bf851ef33 100644
--- a/net-p2p/tribler/distinfo
+++ b/net-p2p/tribler/distinfo
@@ -1,4 +1,2 @@
-SHA256 (LipuFei-libswift-01745ce.tar.gz) = c348a6b2be2d362cee71587307bfd26d36067f6c0f2e0dc12dc0a6410abf39a9
-SIZE (LipuFei-libswift-01745ce.tar.gz) = 3300760
-SHA256 (tribler_6.3.3_all.deb) = 95f6cac8f5760229896bb66ee8e4d6b50939b7da4f1fb0c9a589a7617c456010
-SIZE (tribler_6.3.3_all.deb) = 1997346
+SHA256 (tribler_6.4.3_all.deb) = 80dc3e44adb0edc7a77ce85475a6bddfd693666afcaefa2b1dfbf9d6721be814
+SIZE (tribler_6.4.3_all.deb) = 3568984
diff --git a/net-p2p/tribler/files/patch-tribler b/net-p2p/tribler/files/patch-tribler
index 6bc46db8d448..e6f210a9f180 100644
--- a/net-p2p/tribler/files/patch-tribler
+++ b/net-p2p/tribler/files/patch-tribler
@@ -1,5 +1,5 @@
---- ../usr/bin/tribler.orig	2012-02-08 00:33:48.000000000 +0900
-+++ ../usr/bin/tribler	2012-02-24 18:46:06.000000000 +0900
+--- usr/bin/tribler.orig	2012-02-08 00:33:48.000000000 +0900
++++ usr/bin/tribler	2012-02-24 18:46:06.000000000 +0900
 @@ -1,10 +1,12 @@
  #!/bin/sh
 -# Startup script for Ubuntu Linux
diff --git a/net-p2p/tribler/pkg-plist b/net-p2p/tribler/pkg-plist
index 4599885c5248..a65dce8ff53b 100644
--- a/net-p2p/tribler/pkg-plist
+++ b/net-p2p/tribler/pkg-plist
@@ -47,6 +47,9 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/db_versions.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/db_versions.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/db_versions.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/sqlitecachedb.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/sqlitecachedb.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/sqlitecachedb.pyo
@@ -627,37 +630,36 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDef.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDef.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDef.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDownloadImpl.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDownloadImpl.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDownloadImpl.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftProcess.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftProcess.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftProcess.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftProcessMgr.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftProcessMgr.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftProcessMgr.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/util.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/util.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/util.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Tag/Extraction.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Tag/Extraction.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Tag/Extraction.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Tag/StopwordsFilter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Tag/StopwordsFilter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Tag/StopwordsFilter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Tag/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Tag/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Tag/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Tag/stop_snowball.filter
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/exception.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/exception.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/exception.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/handler.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/handler.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/handler.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/packet.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/packet.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/packet.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/session.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/session.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/session.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentDef.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentDef.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentDef.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/db_upgrader.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/db_upgrader.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/db_upgrader.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/torrent_upgrade64.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/torrent_upgrade64.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/torrent_upgrade64.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/upgrade.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/upgrade.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/upgrade.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/Crypto.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/Crypto.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/Crypto.pyo
@@ -802,9 +804,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/compat.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/compat.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/compat.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/helpers.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/helpers.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/helpers.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/utility.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/utility.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/utility.pyo
@@ -865,6 +864,9 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TorrentStateManager.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TorrentStateManager.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TorrentStateManager.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TriblerUpgradeDialog.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TriblerUpgradeDialog.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TriblerUpgradeDialog.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/UserDownloadChoice.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/UserDownloadChoice.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/UserDownloadChoice.pyo
@@ -1157,6 +1159,12 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/play.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/progressbarEmpty.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/progressbarFull.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/scale_0.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/scale_1.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/scale_2.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/scale_3.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/scale_4.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/scale_5.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/search_new.gif
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/settings.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/snapshot.png
@@ -1173,9 +1181,9 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/statusbar_noactivity.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/statusbar_ok.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/statusbar_warning.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/swift.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/tribler.ico
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/unused/help.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/upgrade.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/upload.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/video_fullscreen.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/video_muted.png
@@ -1347,9 +1355,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/FastI2I.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/FastI2I.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/FastI2I.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/Instance2Instance.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/Instance2Instance.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/Instance2Instance.pyo
@@ -1446,112 +1451,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/payload.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/payload.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/payload.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/community.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/community.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/community.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/conversion.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/conversion.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/conversion.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/OverlayManager.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/OverlayManager.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/OverlayManager.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/SearchManager.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/SearchManager.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/SearchManager.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/community.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/community.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/community.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/conversion.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/conversion.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/conversion.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/payload.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/payload.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/payload.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_average.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_average.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_average.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_randomness.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_randomness.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_randomness.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/payload.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/payload.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/payload.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/python27_ordereddict.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/python27_ordereddict.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/python27_ordereddict.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/community.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/community.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/community.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/conversion.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/conversion.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/conversion.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/curves.ec
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecelgamal.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecelgamal.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecelgamal.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecutils.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecutils.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecutils.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamal.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamal.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamal.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamalcrypto.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamalcrypto.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamalcrypto.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/optional_crypto.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/optional_crypto.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/optional_crypto.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/paillier.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/paillier.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/paillier.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/polycreate.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/polycreate.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/polycreate.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/rsa.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/rsa.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/rsa.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/database.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/database.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/database.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/payload.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/payload.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/payload.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/python27_ordereddict.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/python27_ordereddict.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/python27_ordereddict.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/test.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/test.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/test.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/community.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/community.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/community.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/conversion.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/conversion.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/conversion.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/database.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/database.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/database.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/payload.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/payload.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/payload.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/search/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/search/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/search/__init__.pyo
@@ -1597,12 +1496,25 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/conversion.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/conversion.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/conversion.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/endpoint.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/endpoint.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/endpoint.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/cryptowrapper.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/cryptowrapper.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/cryptowrapper.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/curves.ec
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecelgamal.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecelgamal.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecelgamal.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecutils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecutils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecutils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/elgamalcrypto.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/elgamalcrypto.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/elgamalcrypto.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/tunnelcrypto.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/tunnelcrypto.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/tunnelcrypto.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/main.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/main.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/main.pyo
@@ -1624,9 +1536,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_defaultExitStrategy.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_defaultExitStrategy.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_defaultExitStrategy.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_dispersyBypassEndpoint.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_dispersyBypassEndpoint.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_dispersyBypassEndpoint.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_libtorrent.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_libtorrent.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_libtorrent.pyo
@@ -1850,14 +1759,12 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/util.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/util.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/util.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/schema_sdb_v22.sql
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/svn_ext_val.txt
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/schema_sdb_v24.sql
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/vlc.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/vlc.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/vlc.pyo
-%%PYTHON_SITELIBDIR%%/tribler/swift
-libexec/swift
 share/applications/tribler.desktop
 %%PORTDOCS%%%%DOCSDIR%%/binary-LICENSE-postfix.txt
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
 share/pixmaps/tribler.xpm
+share/pixmaps/tribler_big.xpm