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
--- 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_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
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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.pro Mon 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_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_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 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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.pro Mon 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 += upnp_libupnp
-+
-+ DESTDIR = lib
-+}
-+
-+################################# OpenBSD
##########################################
-+
-+openbsd-* {
-+ INCLUDEPATH *= ${LOCALBASE}/include
-+ INCLUDEPATH += $$system(pkg-config --cflags glib-2.0 | sed -e "s/-I//g")
-+
-+ OPENPGPSDK_DIR = ../../openpgpsdk/src
-+ INCLUDEPATH *= $${OPENPGPSDK_DIR} ../openpgpsdk
-+
-+ QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat
-Dstatvfs64=statvfs -Dfopen64=fopen
-+
- CONFIG += upnp_libupnp
-
- DESTDIR = lib
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;
Index: patches/patch-src_plugins_FeedReader_FeedReader_pro
===================================================================
RCS file: patches/patch-src_plugins_FeedReader_FeedReader_pro
diff -N patches/patch-src_plugins_FeedReader_FeedReader_pro
--- patches/patch-src_plugins_FeedReader_FeedReader_pro 15 Aug 2013 21:55:20
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_plugins_FeedReader_FeedReader_pro,v 1.1.1.1 2013/08/15
21:55:20 stsp Exp $
---- src/plugins/FeedReader/FeedReader.pro.orig Fri Mar 22 18:28:25 2013
-+++ src/plugins/FeedReader/FeedReader.pro Mon Aug 12 23:54:53 2013
-@@ -90,3 +90,12 @@ win32 {
-
- LIBS += -lcurl -lxml2 -lxslt -lws2_32 -lwldap32
- }
-+
-+openbsd-* {
-+ LIBXML2_DIR = ${LOCALBASE}/include/libxml2
-+
-+ INCLUDEPATH += $${LIBXML2_DIR}
-+
-+ LIBS += -lcurl -lxml2 -lxslt
-+}
-+
Index: patches/patch-src_retroshare-gui_src_retroshare-gui_pro
===================================================================
RCS file: patches/patch-src_retroshare-gui_src_retroshare-gui_pro
diff -N patches/patch-src_retroshare-gui_src_retroshare-gui_pro
--- patches/patch-src_retroshare-gui_src_retroshare-gui_pro 15 Aug 2013
21:55:20 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-src_retroshare-gui_src_retroshare-gui_pro,v 1.1.1.1 2013/08/15
21:55:20 stsp Exp $
---- src/retroshare-gui/src/retroshare-gui.pro.orig Fri Mar 22 18:28:23 2013
-+++ src/retroshare-gui/src/retroshare-gui.pro Mon Aug 12 23:54:53 2013
-@@ -216,6 +216,30 @@ freebsd-* {
-
- }
-
-+##################################### OpenBSD
######################################
-+
-+openbsd-* {
-+ INCLUDEPATH *= ${LOCALBASE}/include
-+
-+ PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
-+ PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
-+
-+ LIBS *= ../../libretroshare/src/lib/libretroshare.a
-+ LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
-+ LIBS *= -lssl -lcrypto
-+ LIBS *= -lgpgme
-+ LIBS *= -lupnp
-+ LIBS *= -lgnome-keyring
-+ PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
-+
-+ gxs {
-+ LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-+ LIBS += -lsqlite3
-+ }
-+
-+ LIBS *= -rdynamic
-+}
-+
- ############################## Common stuff
######################################
-
- # On Linux systems that alredy have libssl and libcrypto it is advisable
Index: patches/patch-src_retroshare-nogui_src_retroshare-nogui_pro
===================================================================
RCS file: patches/patch-src_retroshare-nogui_src_retroshare-nogui_pro
diff -N patches/patch-src_retroshare-nogui_src_retroshare-nogui_pro
--- patches/patch-src_retroshare-nogui_src_retroshare-nogui_pro 15 Aug 2013
21:55:20 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_retroshare-nogui_src_retroshare-nogui_pro,v 1.1.1.1
2013/08/15 21:55:20 stsp Exp $
---- src/retroshare-nogui/src/retroshare-nogui.pro.orig Fri Mar 22 18:29:12 2013
-+++ src/retroshare-nogui/src/retroshare-nogui.pro Tue Aug 13 00:00:42 2013
-@@ -120,6 +120,21 @@ freebsd-* {
- PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
- }
-
-+##################################### OpenBSD
######################################
-+
-+openbsd-* {
-+ INCLUDEPATH *= ${LOCALBASE}/include
-+ LIBS *= ../../libretroshare/src/lib/libretroshare.a
-+ LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
-+ LIBS *= -lssl -lcrypto
-+ LIBS *= -lgpgme
-+ LIBS *= -lupnp
-+ LIBS *= -lgnome-keyring
-+ PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
-+ PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
-+ LIBS *= -rdynamic
-+}
-+
- ############################## Common stuff
######################################
-
- # bitdht config
Index: patches/patch-src_supportlibs_pegmarkdown_pegmarkdown_pro
===================================================================
RCS file: patches/patch-src_supportlibs_pegmarkdown_pegmarkdown_pro
diff -N patches/patch-src_supportlibs_pegmarkdown_pegmarkdown_pro
--- patches/patch-src_supportlibs_pegmarkdown_pegmarkdown_pro 15 Aug 2013
21:55:20 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_supportlibs_pegmarkdown_pegmarkdown_pro,v 1.1.1.1
2013/08/15 21:55:20 stsp Exp $
---- src/supportlibs/pegmarkdown/pegmarkdown.pro.orig Mon Aug 12 18:47:50 2013
-+++ src/supportlibs/pegmarkdown/pegmarkdown.pro Mon Aug 12 18:51:53 2013
-@@ -58,6 +58,12 @@ freebsd-* {
- DESTDIR = lib
- }
-
-+################################# OpenBSD
##########################################
-+
-+openbsd-* {
-+ DESTDIR = lib
-+}
-+
- ################################### COMMON stuff
##################################
- ################################### COMMON stuff
##################################
-
