Update retroshare to the latest release. https://retroshareteam.wordpress.com/2013/10/30/v0-5-5-release-notes/
This release contains some of the patches I've pushed upstream. I also noticed that the build doesn't work with MAKE_JOBS=4, so disable parallel build for now. ok? Index: Makefile =================================================================== RCS file: /cvs/ports/net/retroshare/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 25 Nov 2013 14:16:23 -0000 1.2 +++ Makefile 27 Nov 2013 23:20:42 -0000 @@ -2,8 +2,8 @@ SHARED_ONLY = Yes COMMENT = secure decentralised communication platform -V = 0.5.4e -DISTNAME = RetroShare-v${V} +V = 0.5.5b +DISTNAME = retroshare_0.5.5-0.6864_src PKGNAME = retroshare-${V} CATEGORIES = net security HOMEPAGE = http://retroshare.sourceforge.net @@ -30,7 +30,8 @@ LIB_DEPENDS = audio/speex \ textproc/libxslt \ x11/gnome/libgnome-keyring NO_TEST = Yes -WRKDIST = ${WRKDIR}/retroshare-${V:S/e$//} +PARALLEL_BUILD = No +WRKDIST = ${WRKDIR}/retroshare-${V:S/b$//} WRKSRC = ${WRKDIST}/src post-patch: Index: distinfo =================================================================== RCS file: /cvs/ports/net/retroshare/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 15 Aug 2013 21:55:20 -0000 1.1.1.1 +++ distinfo 27 Nov 2013 23:16:23 -0000 @@ -1,2 +1,2 @@ -SHA256 (RetroShare-v0.5.4e.tar.gz) = ocyFMnITqjurDqwJI7VGRyu0GqzVahH1874bojFaC9o= -SIZE (RetroShare-v0.5.4e.tar.gz) = 9442382 +SHA256 (retroshare_0.5.5-0.6864_src.tar.gz) = s+AAddNB+jGrGxxyGMfCbfjSvemUZZyQVo0jn6aqUwM= +SIZE (retroshare_0.5.5-0.6864_src.tar.gz) = 11600167 Index: patches/patch-src_libbitdht_src_util_bdrandom_cc =================================================================== RCS file: patches/patch-src_libbitdht_src_util_bdrandom_cc diff -N patches/patch-src_libbitdht_src_util_bdrandom_cc --- patches/patch-src_libbitdht_src_util_bdrandom_cc 15 Aug 2013 21:55:20 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_libbitdht_src_util_bdrandom_cc,v 1.1.1.1 2013/08/15 21:55:20 stsp Exp $ ---- src/libbitdht/src/util/bdrandom.cc.orig Mon Aug 12 18:55:29 2013 -+++ src/libbitdht/src/util/bdrandom.cc Mon Aug 12 18:55:47 2013 -@@ -15,6 +15,8 @@ static bool auto_seed = bdRandom::seed( (time(NULL) + - #elif defined(__FreeBSD__) - // since this is completely insecure anyway, just kludge for now - static bool auto_seed = bdRandom::seed(time(NULL)); -+ #elif defined(__OpenBSD__) -+ static bool auto_seed = bdRandom::seed(arc4random()); - #else - static bool auto_seed = bdRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; - #endif Index: patches/patch-src_libretroshare_src_rsserver_rsloginhandler_cc =================================================================== RCS file: patches/patch-src_libretroshare_src_rsserver_rsloginhandler_cc diff -N patches/patch-src_libretroshare_src_rsserver_rsloginhandler_cc --- patches/patch-src_libretroshare_src_rsserver_rsloginhandler_cc 15 Aug 2013 21:55:20 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$OpenBSD: patch-src_libretroshare_src_rsserver_rsloginhandler_cc,v 1.1.1.1 2013/08/15 21:55:20 stsp Exp $ ---- src/libretroshare/src/rsserver/rsloginhandler.cc.orig Mon Aug 12 19:02:27 2013 -+++ src/libretroshare/src/rsserver/rsloginhandler.cc Mon Aug 12 19:03:40 2013 -@@ -5,7 +5,7 @@ - #include "rsloginhandler.h" - #include "util/rsdir.h" - --#if defined(UBUNTU) || defined(__FreeBSD__) -+#if defined(UBUNTU) || defined(__FreeBSD__) || defined(__OpenBSD__) - #include <gnome-keyring-1/gnome-keyring.h> - - GnomeKeyringPasswordSchema my_schema = { -@@ -119,7 +119,7 @@ bool RsLoginHandler::tryAutoLogin(const std::string& s - - /******************************** WINDOWS/UNIX SPECIFIC PART ******************/ - #ifndef WINDOWS_SYS /* UNIX */ --#if defined(UBUNTU) || defined(__FreeBSD__) -+#if defined(UBUNTU) || defined(__FreeBSD__) || defined(__OpenBSD__) - - gchar *passwd = NULL; - -@@ -361,7 +361,7 @@ bool RsLoginHandler::enableAutoLogin(const std::string - - /******************************** WINDOWS/UNIX SPECIFIC PART ******************/ - #ifndef WINDOWS_SYS /* UNIX */ --#if defined(UBUNTU) || defined(__FreeBSD__) -+#if defined(UBUNTU) || defined(__FreeBSD__) || defined(__OpenBSD__) - if(GNOME_KEYRING_RESULT_OK == gnome_keyring_store_password_sync(&my_schema, NULL, (gchar*)("RetroShare password for SSL Id "+ssl_id).c_str(),(gchar*)ssl_passwd.c_str(),"RetroShare SSL Id",ssl_id.c_str(),NULL)) - { - std::cerr << "Stored passwd " << "************************" << " into gnome keyring" << std::endl;