update: net/retroshare 0.5.5b
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
--- Makefile25 Nov 2013 14:16:23 - 1.2
+++ Makefile27 Nov 2013 23:20:42 -
@@ -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
--- distinfo15 Aug 2013 21:55:20 - 1.1.1.1
+++ distinfo27 Nov 2013 23:16:23 -
@@ -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_cc15 Aug 2013 21:55:20
- 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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.origMon 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 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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
Re: update: net/retroshare 0.5.5b
On Thu, Nov 28, 2013 at 12:49:21AM +0100, Stefan Sperling wrote: 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. Nope. What doesn't work with parallel build ? Is it make itself, or are the Makefile bogus ?
Re: update: net/retroshare 0.5.5b
On Thu, Nov 28, 2013 at 01:18:29AM +0100, Marc Espie wrote: On Thu, Nov 28, 2013 at 12:49:21AM +0100, Stefan Sperling wrote: 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. Nope. What doesn't work with parallel build ? Is it make itself, or are the Makefile bogus ? No idea, but I would guess the Makefiles are bogus. It is happening with Makefiles generated by qmake. It fails like this: /usr/local/lib/qt4/bin/moc -DQT_NO_DEBUG -DQT_MULTIMEDIA_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I/usr/local/lib/qt4/mkspecs/openbsd-g++4 -I. -I/usr/local/include/X11/qt4/QtCore -I/usr/local/include/X11/qt4/QtGui -I/usr/local/include/X11/qt4/QtMultimedia -I/usr/local/include/X11/qt4 -I../../libretroshare/src -I../../retroshare-gui/src -I../../retroshare-gui/src/temp/ui -I../../libretroshare/src -I. -I. -I/usr/local/include gui/AudioPopupChatDialog.h -o moc_AudioPopupChatDialog.cpp In file included from gui/AudioPopupChatDialog.h:4, from gui/AudioPopupChatDialog.cpp:4: ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:26:32: error: ui_PopupChatDialog.h: No such file or directory g++ -c -pipe -O2 -fno-wrapv -Wall -O2 -fno-wrapv -pthread -Wall -W -fPIC -DQT_NO_DEBUG -DQT_MULTIMEDIA_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I/usr/local/lib/qt4/mkspecs/openbsd-g++4 -I. -I/usr/local/include/X11/qt4/QtCore -I/usr/local/include/X11/qt4/QtGui -I/usr/local/include/X11/qt4/QtMultimedia -I/usr/local/include/X11/qt4 -I../../libretroshare/src -I../../retroshare-gui/src -I../../retroshare-gui/src/temp/ui -I../../libretroshare/src -I. -I. -I/usr/local/include -o moc_AudioPopupChatDialog.o moc_AudioPopupChatDialog.cpp In file included from gui/AudioPopupChatDialog.h:4, from moc_AudioPopupChatDialog.cpp:9: ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:26:32: error: ui_PopupChatDialog.h: No such file or directory In file included from gui/AudioPopupChatDialog.h:4, from gui/AudioPopupChatDialog.cpp:4: ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:71: error: 'Ui' has not been declared g++ -c -pipe -O2 -fno-wrapv -Wall -O2 -fno-wrapv -pthread -Wall -W -fPIC -DQT_NO_DEBUG -DQT_MULTIMEDIA_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I/usr/local/lib/qt4/mkspecs/openbsd-g++4 -I. -I/usr/local/include/X11/qt4/QtCore -I/usr/local/include/X11/qt4/QtGui -I/usr/local/include/X11/qt4/QtMultimedia -I/usr/local/include/X11/qt4 -I../../libretroshare/src -I../../retroshare-gui/src -I../../retroshare-gui/src/temp/ui -I../../libretroshare/src -I. -I. -I/usr/local/include -o PluginGUIHandler.o gui/PluginGUIHandler.cpp ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:71: error: ISO C++ forbids declaration of 'PopupChatDialog' with no type ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:71: error: expected ';' before 'ui' gui/AudioPopupChatDialog.cpp: In member function 'void AudioPopupChatDialog::toggleAudioMuteCapture()': gui/AudioPopupChatDialog.cpp:137: error: invalid use of incomplete type 'struct ChatWidget' ../../retroshare-gui/src/gui/chat/ChatDialog.h:29: error: forward declaration of 'struct ChatWidget' gui/AudioPopupChatDialog.cpp:137: error: incomplete type 'QDateTime' used in nested name specifier gui/AudioPopupChatDialog.cpp:137: error: incomplete type 'QDateTime' used in nested name specifier gui/AudioPopupChatDialog.cpp:137: error: incomplete type 'ChatWidget' used in nested name specifier In file included from gui/AudioPopupChatDialog.h:4, from moc_AudioPopupChatDialog.cpp:9: ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:71: error: 'Ui' has not been declared ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:71: error: ISO C++ forbids declaration of 'PopupChatDialog' with no type ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:71: error: expected ';' before 'ui' *** Error 1 in target 'AudioPopupChatDialog.o' *** Error 1 in target 'moc_AudioPopupChatDialog.o' In file included from ./gui/AudioPopupChatDialog.h:4, from gui/PluginGUIHandler.cpp:7: ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:26:32: error: ui_PopupChatDialog.h: No such file or directory In file included from ./gui/AudioPopupChatDialog.h:4, from gui/PluginGUIHandler.cpp:7: ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:71: error: 'Ui' has not been declared ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:71: error: ISO C++ forbids declaration of 'PopupChatDialog' with no type ../../retroshare-gui/src/gui/chat/PopupChatDialog.h:71: error: expected ';' before 'ui' *** Error 1 in plugins/VOIP (Makefile:396 'PluginGUIHandler.o') *** Error 1 (Makefile:439 'moc_AudioPopupChatDialog.o') *** Error 1 (Makefile:389 'AudioPopupChatDialog.o') *** Error 2 in
Re: update: net/retroshare 0.5.5b
On Thu, Nov 28, 2013 at 12:49:21AM +0100, Stefan Sperling wrote:
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.
And I forgot to remove a few patches, sorry.
Below is the complete diff
The upstream versions of these patches aren't ${LOCALBASE}-clean,
i.e. they hard-code /usr/local. Do we care?
Index: Makefile
===
RCS file: /cvs/ports/net/retroshare/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile25 Nov 2013 14:16:23 - 1.2
+++ Makefile27 Nov 2013 23:20:42 -
@@ -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
--- distinfo15 Aug 2013 21:55:20 - 1.1.1.1
+++ distinfo27 Nov 2013 23:16:23 -
@@ -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_libbitdht_pro
===
RCS file: patches/patch-src_libbitdht_src_libbitdht_pro
diff -N patches/patch-src_libbitdht_src_libbitdht_pro
--- patches/patch-src_libbitdht_src_libbitdht_pro 15 Aug 2013 21:55:20
- 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_libbitdht_src_libbitdht_pro,v 1.1.1.1 2013/08/15 21:55:20
stsp Exp $
src/libbitdht/src/libbitdht.pro.orig Mon Aug 12 18:47:50 2013
-+++ src/libbitdht/src/libbitdht.proMon Aug 12 18:52:12 2013
-@@ -93,6 +93,12 @@ freebsd-* {
- DESTDIR = lib
- }
-
-+# OpenBSD
##
-+
-+openbsd-* {
-+ DESTDIR = lib
-+}
-+
- ### COMMON stuff
##
- ### COMMON stuff
##
-
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_cc15 Aug 2013 21:55:20
- 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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.origMon 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_libretroshare_pro
===
RCS file: patches/patch-src_libretroshare_src_libretroshare_pro
diff -N patches/patch-src_libretroshare_src_libretroshare_pro
--- patches/patch-src_libretroshare_src_libretroshare_pro 15 Aug 2013
21:55:20 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_libretroshare_src_libretroshare_pro,v 1.1.1.1 2013/08/15
21:55:20 stsp Exp $
src/libretroshare/src/libretroshare.pro.orig Fri Mar 22 18:29:00 2013
-+++ src/libretroshare/src/libretroshare.proMon Aug 12 23:54:53 2013
-@@ -283,6 +283,22 @@ freebsd-* {
-
- # linux/bsd can use either - libupnp is more complete and packaged.
- #CONFIG += upnp_miniupnpc
-+ CONFIG
