FreeBSD Bugzilla – Attachment 121339 Details for
Bug 164283
[NEW PORT] net-p2p/RetroShare: A private and secure decentralised communication platform
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
RetroShare-0.5.2a.shar
RetroShare-0.5.2a.shar (text/plain), 17.57 KB, created by
Peter Klett
on 2012-01-18 15:00:21 UTC
(
hide
)
Description:
RetroShare-0.5.2a.shar
Filename:
MIME Type:
Creator:
Peter Klett
Created:
2012-01-18 15:00:21 UTC
Size:
17.57 KB
patch
obsolete
># This is a shell archive. Save it in a file, remove anything before ># this line, and then unpack it by entering "sh file". Note, it may ># create directories; files and directories will be owned by you and ># have default permissions. ># ># This archive contains: ># ># retroshare ># retroshare/files ># retroshare/files/patch-libretroshare-src-dbase-findex.h ># retroshare/files/patch-libretroshare-src-ft-ftfileprovider.h ># retroshare/files/patch-libretroshare-src-ft-ftfilecreator.h ># retroshare/files/patch-libretroshare-src-libretroshare.pro ># retroshare/files/patch-libretroshare-src-rsserver-rsinit.cc ># retroshare/files/rsinit.h ># retroshare/files/patch-libbitdht-src-util-bdrandom.cc ># retroshare/files/patch-libretroshare-src-util-rsdir.h ># retroshare/files/patch-libretroshare-src-util-rsdiscspace.cc ># retroshare/files/patch-retroshare-gui-src-RetroShare.pro ># retroshare/files/patch-libretroshare-src-util-rsrandom.cc ># retroshare/files/patch-libretroshare-src-upnp-upnphandler.h ># retroshare/files/patch-libretroshare-src-upnp-upnphandler.cc ># retroshare/files/patch-libretroshare-src-rsserver-rsloginhandler.cc ># retroshare/distinfo ># retroshare/Makefile ># retroshare/pkg-descr ># retroshare/pkg-plist ># >echo c - retroshare >mkdir -p retroshare > /dev/null 2>&1 >echo c - retroshare/files >mkdir -p retroshare/files > /dev/null 2>&1 >echo x - retroshare/files/patch-libretroshare-src-dbase-findex.h >sed 's/^X//' >retroshare/files/patch-libretroshare-src-dbase-findex.h << '54944a539c31b0ef3d780816947f1805' >X--- libretroshare/src/dbase/findex.h.orig 2011-04-15 22:21:52.000000000 +0200 >X+++ libretroshare/src/dbase/findex.h 2012-01-15 03:55:27.000000000 +0100 >X@@ -33,6 +33,14 @@ >X #include <stdint.h> >X #include "retroshare/rstypes.h" >X >X+#include <dirent.h> >X+#include <fnmatch.h> >X+#include <unistd.h> >X+#define O_LARGEFILE 0100000 >X+#define stat64 stat >X+#define _stat stat >X+#define _getcwd getcwd >X+ >X class ostream; >X >X /****************************************************************************************** >54944a539c31b0ef3d780816947f1805 >echo x - retroshare/files/patch-libretroshare-src-ft-ftfileprovider.h >sed 's/^X//' >retroshare/files/patch-libretroshare-src-ft-ftfileprovider.h << '3c47ec91402d09346ef2a94c3e3dd320' >X--- libretroshare/src/ft/ftfileprovider.h~ 2011-02-20 01:59:47.000000000 +0100 >X+++ libretroshare/src/ft/ftfileprovider.h 2012-01-15 04:01:35.000000000 +0100 >X@@ -34,6 +34,7 @@ >X #include <stdint.h> >X #include "util/rsthreads.h" >X #include "retroshare/rsfiles.h" >X+#define fseeko64 fseeko >X >X class ftFileProvider >X { >3c47ec91402d09346ef2a94c3e3dd320 >echo x - retroshare/files/patch-libretroshare-src-ft-ftfilecreator.h >sed 's/^X//' >retroshare/files/patch-libretroshare-src-ft-ftfilecreator.h << 'a7abb7e19699f26fd4d1bfea73515e67' >X--- libretroshare/src/ft/ftfilecreator.h~ 2011-04-25 16:20:57.000000000 +0200 >X+++ libretroshare/src/ft/ftfilecreator.h 2012-01-15 20:30:41.000000000 +0100 >X@@ -35,6 +35,7 @@ >X #include "ftfileprovider.h" >X #include "ftchunkmap.h" >X #include <map> >X+#define fseeko64 fseeko >X >X class ZeroInitCounter >X { >a7abb7e19699f26fd4d1bfea73515e67 >echo x - retroshare/files/patch-libretroshare-src-libretroshare.pro >sed 's/^X//' >retroshare/files/patch-libretroshare-src-libretroshare.pro << '0bb42658593644c877d2e976bdd42da6' >X--- libretroshare/src/libretroshare.pro~ 2011-08-03 19:43:26.000000000 +0200 >X+++ libretroshare/src/libretroshare.pro 2012-01-15 04:20:41.000000000 +0100 >X@@ -104,6 +104,7 @@ >X INCLUDEPATH += . $${BITDHT_DIR} >X # The next line if for compliance with debian packages. Keep it! >X INCLUDEPATH += ../libbitdht >X+ INCLUDEPATH += $${PREFIX}/include/gpgme >X DEFINES *= RS_USE_BITDHT >X } >X >0bb42658593644c877d2e976bdd42da6 >echo x - retroshare/files/patch-libretroshare-src-rsserver-rsinit.cc >sed 's/^X//' >retroshare/files/patch-libretroshare-src-rsserver-rsinit.cc << 'ca8aad04fbf85e58f360825e35ccfa12' >X--- libretroshare/src/rsserver/rsinit.cc.org 2012-01-15 04:34:27.000000000 +0100 >X+++ libretroshare/src/rsserver/rsinit.cc 2012-01-15 04:35:45.000000000 +0100 >X@@ -59,78 +59,14 @@ >X >X #include "tcponudp/udpstunner.h" >X >X-class accountId >X-{ >X- public: >X- std::string pgpId; >X- std::string pgpName; >X- std::string pgpEmail; >X- >X- std::string sslId; >X- std::string location; >X-}; >X- >X- >X-class RsInitConfig >X-{ >X- public: >X- /* Directories (SetupBaseDir) */ >X- static std::string basedir; >X- static std::string homePath; >X-#ifdef WINDOWS_SYS >X- static bool portable; >X- static bool isWindowsXP; >X-#endif >X- >X- static std::list<accountId> accountIds; >X- static std::string preferedId; >X- >X- /* for certificate creation */ >X- //static std::string gpgPasswd; >X- >X-#ifndef WINDOWS_SYS >X- static int lockHandle; >X-#else >X- static HANDLE lockHandle; >X-#endif >X- >X- /* These fields are needed for login */ >X- static std::string loginId; >X- static std::string configDir; >X- static std::string load_cert; >X- static std::string load_key; >X- >X- static std::string passwd; >X- >X- static bool autoLogin; /* autoLogin allowed */ >X- static bool startMinimised; /* Icon or Full Window */ >X- >X- /* Key Parameters that must be set before >X- * RetroShare will start up: >X- */ >X- >X- /* Listening Port */ >X- static bool forceExtPort; >X- static bool forceLocalAddr; >X- static unsigned short port; >X- static char inet[256]; >X- >X- /* Logging */ >X- static bool haveLogFile; >X- static bool outStderr; >X- static bool haveDebugLevel; >X- static int debugLevel; >X- static std::string logfname; >X- >X- static bool firsttime_run; >X- static bool load_trustedpeer; >X- static std::string load_trustedpeer_file; >X- >X- static bool udpListenerOnly; >X- >X- static std::string RetroShareLink; >X-}; >X+#include "rsinit.h" >X >X+#include <fnmatch.h> >X+#include <unistd.h> >X+#define O_LARGEFILE 0100000 >X+#define stat64 stat >X+#define _stat stat >X+#define _getcwd getcwd >X >X const int p3facestartupzone = 47238; >X >ca8aad04fbf85e58f360825e35ccfa12 >echo x - retroshare/files/rsinit.h >sed 's/^X//' >retroshare/files/rsinit.h << 'e9d5262f5f320981e8d18e11433c4e72' >X >X#ifndef RETROSHARE_RSINIT_H >X#define RETROSHARE_RSINIT_H >X >Xclass accountId >X{ >X public: >X std::string pgpId; >X std::string pgpName; >X std::string pgpEmail; >X >X std::string sslId; >X std::string location; >X}; >X >X >Xclass RsInitConfig >X{ >X public: >X /* Directories (SetupBaseDir) */ >X static std::string basedir; >X static std::string homePath; >X#ifdef WINDOWS_SYS >X static bool portable; >X static bool isWindowsXP; >X#endif >X >X static std::list<accountId> accountIds; >X static std::string preferedId; >X >X /* for certificate creation */ >X //static std::string gpgPasswd; >X >X#ifndef WINDOWS_SYS >X static int lockHandle; >X#else >X static HANDLE lockHandle; >X#endif >X >X /* These fields are needed for login */ >X static std::string loginId; >X static std::string configDir; >X static std::string load_cert; >X static std::string load_key; >X >X static std::string passwd; >X >X static bool autoLogin; /* autoLogin allowed */ >X static bool startMinimised; /* Icon or Full Window */ >X >X /* Key Parameters that must be set before >X * RetroShare will start up: >X */ >X >X /* Listening Port */ >X static bool forceExtPort; >X static bool forceLocalAddr; >X static unsigned short port; >X static char inet[256]; >X >X /* Logging */ >X static bool haveLogFile; >X static bool outStderr; >X static bool haveDebugLevel; >X static int debugLevel; >X static std::string logfname; >X >X static bool firsttime_run; >X static bool load_trustedpeer; >X static std::string load_trustedpeer_file; >X >X static bool udpListenerOnly; >X >X static std::string RetroShareLink; >X}; >X >X#endif >X >e9d5262f5f320981e8d18e11433c4e72 >echo x - retroshare/files/patch-libbitdht-src-util-bdrandom.cc >sed 's/^X//' >retroshare/files/patch-libbitdht-src-util-bdrandom.cc << 'fd72a8d5ef66c80178b63cddc8896f7f' >X+++ libbitdht/src/util/bdrandom.cc 2012-01-15 03:45:36.000000000 +0100 >X--- libbitdht/src/util/bdrandom.cc.orig 2012-01-15 03:45:07.000000000 +0100 >X@@ -13,7 +13,7 @@ >X #ifdef __APPLE__ >X static bool auto_seed = bdRandom::seed( (time(NULL) + pthread_mach_thread_np(pthread_self())*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; >X #else >X+// static bool auto_seed = bdRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; >X- static bool auto_seed = bdRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; >X #endif >X #endif >X bool bdRandom::seed(uint32_t s) >fd72a8d5ef66c80178b63cddc8896f7f >echo x - retroshare/files/patch-libretroshare-src-util-rsdir.h >sed 's/^X//' >retroshare/files/patch-libretroshare-src-util-rsdir.h << '62db9eebef51bde0c579844ce6b21404' >X--- libretroshare/src/util/rsdir.h.orig 2011-05-15 14:42:55.000000000 +0200 >X+++ libretroshare/src/util/rsdir.h 2012-01-15 20:10:19.000000000 +0100 >X@@ -31,6 +31,17 @@ >X #include <string> >X #include <list> >X #include <stdint.h> >X+#include <fnmatch.h> >X+ >X+#include <dirent.h> >X+#include <unistd.h> >X+#define O_LARGEFILE 0100000 >X+#define stat64 stat >X+#define _stat stat >X+#define _getcwd getcwd >X+#define fseeko64 fseeko >X+#define fopen64 fopen >X+#define ftello64 ftello >X >X class CRC32Map ; >X class RsThread; >62db9eebef51bde0c579844ce6b21404 >echo x - retroshare/files/patch-libretroshare-src-util-rsdiscspace.cc >sed 's/^X//' >retroshare/files/patch-libretroshare-src-util-rsdiscspace.cc << 'b02380ae59bfde81e426188283292c01' >X--- libretroshare/src/util/rsdiscspace.cc.orig 2011-07-05 00:59:39.000000000 +0200 >X+++ libretroshare/src/util/rsdiscspace.cc 2012-01-15 04:55:17.000000000 +0100 >X@@ -31,6 +31,7 @@ >X #include <util/rsthreads.h> >X #ifndef WIN32 >X #include <sys/statvfs.h> >X+#define statvfs64 statvfs >X #endif >X >X #define DELAY_BETWEEN_CHECKS 2 >b02380ae59bfde81e426188283292c01 >echo x - retroshare/files/patch-retroshare-gui-src-RetroShare.pro >sed 's/^X//' >retroshare/files/patch-retroshare-gui-src-RetroShare.pro << 'bffee03db0698d0c6613e41999e989d3' >X--- retroshare-gui/src/RetroShare.pro.orig 2011-08-03 19:45:03.000000000 +0200 >X+++ retroshare-gui/src/RetroShare.pro 2012-01-15 12:55:12.000000000 +0100 >X@@ -153,9 +153,12 @@ >X >X # ########################################### >X >X+INCLUDEPATH += $${PREFIX}/include/gpgme >X+LIBS += ../../libretroshare/src/libretroshare.a -lssl -lgpgme -lupnp >X+ >X bitdht { >X- LIBS += ../../libbitdht/src/lib/libbitdht.a >X- PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a >X+ LIBS += ../../libbitdht/src/libbitdht.a >X+ PRE_TARGETDEPS *= ../../libbitdht/src/libbitdht.a >X } >X >X win32 { >bffee03db0698d0c6613e41999e989d3 >echo x - retroshare/files/patch-libretroshare-src-util-rsrandom.cc >sed 's/^X//' >retroshare/files/patch-libretroshare-src-util-rsrandom.cc << 'c067e582ac3ddb0beaacea4d5060ab32' >X--- libretroshare/src/util/rsrandom.cc~ 2011-07-05 00:59:39.000000000 +0200 >X+++ libretroshare/src/util/rsrandom.cc 2012-01-15 04:56:47.000000000 +0100 >X@@ -13,7 +13,7 @@ >X #ifdef __APPLE__ >X static bool auto_seed = RSRandom::seed( (time(NULL) + pthread_mach_thread_np(pthread_self())*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; >X #else >X- static bool auto_seed = RSRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; >X+// static bool auto_seed = RSRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; >X #endif >X #endif >X bool RSRandom::seed(uint32_t s) >c067e582ac3ddb0beaacea4d5060ab32 >echo x - retroshare/files/patch-libretroshare-src-upnp-upnphandler.h >sed 's/^X//' >retroshare/files/patch-libretroshare-src-upnp-upnphandler.h << '9bdb3adf14dddbc0f8e183b8c0d82623' >X--- libretroshare/src/upnp/upnphandler.h~ 2010-07-04 12:42:17.000000000 +0200 >X+++ libretroshare/src/upnp/upnphandler.h 2012-01-15 05:26:45.000000000 +0100 >X@@ -13,7 +13,11 @@ >X #include "util/rsthreads.h" >X >X #include <upnp/upnp.h> >X+#ifdef do_not_use_this >X+#include "upnp/UPnPBase.cpp" >X+#else >X #include "upnp/UPnPBase.h" >X+#endif >X >X #define RS_UPNP_S_UNINITIALISED 0 >X #define RS_UPNP_S_UNAVAILABLE 1 >9bdb3adf14dddbc0f8e183b8c0d82623 >echo x - retroshare/files/patch-libretroshare-src-upnp-upnphandler.cc >sed 's/^X//' >retroshare/files/patch-libretroshare-src-upnp-upnphandler.cc << 'd2d20f3705da3b5baa692be3eef9a121' >X--- libretroshare/src/upnp/upnphandler.cc~ 2011-07-08 11:54:27.000000000 +0200 >X+++ libretroshare/src/upnp/upnphandler.cc 2012-01-15 05:27:12.000000000 +0100 >X@@ -12,6 +12,7 @@ >X #endif >X /* This stuff is actually C */ >X >X+#define do_not_use_this >X #include "upnp/upnphandler.h" >X >X #include "util/rsnet.h" >d2d20f3705da3b5baa692be3eef9a121 >echo x - retroshare/files/patch-libretroshare-src-rsserver-rsloginhandler.cc >sed 's/^X//' >retroshare/files/patch-libretroshare-src-rsserver-rsloginhandler.cc << '87e62f6953e54e5c58d1175ccce98645' >X--- libretroshare/src/rsserver/rsloginhandler.cc.orig 2012-01-15 04:44:59.000000000 +0100 >X+++ libretroshare/src/rsserver/rsloginhandler.cc 2012-01-15 04:43:08.000000000 +0100 >X@@ -4,6 +4,7 @@ >X #include <pqi/authgpg.h> >X #include "rsloginhandler.h" >X #include "util/rsdir.h" >X+#include "rsinit.h" >X >X #ifdef UBUNTU >X #include <gnome-keyring-1/gnome-keyring.h> >X@@ -196,7 +197,7 @@ >X /******************** OSX KeyChain stuff *****************************/ >X #else /* UNIX, but not UBUNTU or APPLE */ >X >X- FILE* helpFile = RsDirUtil::rs_fopen(getAutologinFileName.c_str(), "r"); >X+ FILE* helpFile = RsDirUtil::rs_fopen(getAutologinFileName(ssl_id).c_str(), "r"); >X >X if(helpFile == NULL){ >X std::cerr << "\nFailed to open help file\n" << std::endl; >X@@ -408,7 +409,7 @@ >X #else >X >X /* WARNING: Autologin is inherently unsafe */ >X- FILE* helpFile = RsDirUtil::rs_fopen(getAutologinFileName.c_str(), "w"); >X+ FILE* helpFile = RsDirUtil::rs_fopen(getAutologinFileName(ssl_id).c_str(), "w"); >X >X if(helpFile == NULL){ >X std::cerr << "\nRsStoreAutoLogin(): Failed to open help file\n" << std::endl; >87e62f6953e54e5c58d1175ccce98645 >echo x - retroshare/distinfo >sed 's/^X//' >retroshare/distinfo << '8ad67f51dd4203d13f21d02b4af324f9' >XSHA256 (RetroShare-v0.5.2a.tar.gz) = 33838c0234e779e6b310bbd19bf6c5c0394e84cc5b418114b68f0cac8c1eec18 >XSIZE (RetroShare-v0.5.2a.tar.gz) = 10334273 >8ad67f51dd4203d13f21d02b4af324f9 >echo x - retroshare/Makefile >sed 's/^X//' >retroshare/Makefile << 'b707037c1d114b13ad58065907a013ec' >X# New ports collection makefile for: retroshare >X# Date created: 15 January 2012 >X# Whom: glocke >X# >X# $FreeBSD$ >X# >X >XPORTNAME= RetroShare >XPORTVERSION= 0.5.2a >XDISTVERSIONPREFIX= v >XCATEGORIES?= net-p2p >XMASTER_SITES= ${MASTER_SITE_SOURCEFORGE} >XMASTER_SITE_SUBDIR= ${PORTNAME:L}/${PORTNAME}/${PORTVERSION} >X >XMAINTAINER= glocke@bsdstammtisch.at >XCOMMENT= A private and secure decentralised communication platform >X >XLICENSE= GPLv2 >XLICENSE_FILE= ${WRKDIR}/trunk/retroshare-gui/src/license/license.txt >X >XLIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \ >X upnp.7:${PORTSDIR}/devel/upnp \ >X gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring >XRUN_DEPENDS+= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4 >X >XWRKSRC= ${WRKDIR}/trunk >XUSE_QT_VER= 4 >XQT_COMPONENTS= corelib gui network xml script designer_build uic_build qmake_build moc_build rcc_build >X >XCFLAGS+= -I${LOCALBASE}/include/gpgme >X >XHAS_CONFIGURE= yes >Xdo-configure: >X @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ >X ${QMAKE} PREFIX=${PREFIX} ${PORTNAME}.pro >X >Xpost-patch: >X ${CP} ${FILESDIR}/rsinit.h ${WRKSRC}/libretroshare/src/rsserver >X >Xpost-install: >X ${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${PORTNAME} ${PREFIX}/bin >X ${MKDIR} ${DATADIR} >X ${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt ${DATADIR} >X @${ECHO_MSG} "**************************************************" >X @${ECHO_MSG} "* POST INSTALL *" >X @${ECHO_MSG} "**************************************************" >X @${ECHO_MSG} "" >X @${ECHO_MSG} "After you have created an account, you should copy" >X @${ECHO_MSG} "${DATADIR}/bdboot.txt into your" >X @${ECHO_MSG} "~/.retroshare/YOURCERT/ directory to seed DHT with" >X @${ECHO_MSG} "initial nodes. UPnP does not work right now, you" >X @${ECHO_MSG} "have to use port forwarding to connect to others." >X @${ECHO_MSG} "" >X @${ECHO_MSG} "**************************************************" >X >X.include <bsd.port.mk> >b707037c1d114b13ad58065907a013ec >echo x - retroshare/pkg-descr >sed 's/^X//' >retroshare/pkg-descr << '88f470a4d01a26d6aa038dcc101ce865' >XRetroShare is a Open Source cross-platform, private and secure decentralised >Xcommunication platform. It lets you to securely chat and share files with your >Xfriends and family, using a web-of-trust to authenticate peers and OpenSSL to >Xencrypt all communication. RetroShare provides filesharing, chat, messages, >Xforums and channels. >X >XWWW: http://retroshare.sourceforge.net/ >88f470a4d01a26d6aa038dcc101ce865 >echo x - retroshare/pkg-plist >sed 's/^X//' >retroshare/pkg-plist << '6badaaa38bbb52b58a63aa1e9ee57578' >Xbin/RetroShare >X%%DATADIR%%/bdboot.txt >X@dirrm %%DATADIR%% >6badaaa38bbb52b58a63aa1e9ee57578 >exit
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=121339">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 164283
: 121339 |
121340
|
121341