diff options
Diffstat (limited to 'net-p2p/retroshare/files')
14 files changed, 334 insertions, 0 deletions
diff --git a/net-p2p/retroshare/files/patch-libbitdht-src-util-bdrandom.cc b/net-p2p/retroshare/files/patch-libbitdht-src-util-bdrandom.cc new file mode 100644 index 00000000000..1a3b57be370 --- /dev/null +++ b/net-p2p/retroshare/files/patch-libbitdht-src-util-bdrandom.cc @@ -0,0 +1,11 @@ ++++ libbitdht/src/util/bdrandom.cc 2012-01-15 03:45:36.000000000 +0100 +--- libbitdht/src/util/bdrandom.cc.orig 2012-01-15 03:45:07.000000000 +0100 +@@ -13,7 +13,7 @@ + #ifdef __APPLE__ + static bool auto_seed = bdRandom::seed( (time(NULL) + pthread_mach_thread_np(pthread_self())*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; + #else ++// static bool auto_seed = bdRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; +- static bool auto_seed = bdRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; + #endif + #endif + bool bdRandom::seed(uint32_t s) diff --git a/net-p2p/retroshare/files/patch-libretroshare-src-dbase-findex.h b/net-p2p/retroshare/files/patch-libretroshare-src-dbase-findex.h new file mode 100644 index 00000000000..dfcf1e618ed --- /dev/null +++ b/net-p2p/retroshare/files/patch-libretroshare-src-dbase-findex.h @@ -0,0 +1,17 @@ +--- libretroshare/src/dbase/findex.h.orig 2011-04-15 22:21:52.000000000 +0200 ++++ libretroshare/src/dbase/findex.h 2012-01-15 03:55:27.000000000 +0100 +@@ -33,6 +33,14 @@ + #include <stdint.h> + #include "retroshare/rstypes.h" + ++#include <dirent.h> ++#include <fnmatch.h> ++#include <unistd.h> ++#define O_LARGEFILE 0100000 ++#define stat64 stat ++#define _stat stat ++#define _getcwd getcwd ++ + class ostream; + + /****************************************************************************************** diff --git a/net-p2p/retroshare/files/patch-libretroshare-src-ft-ftfilecreator.h b/net-p2p/retroshare/files/patch-libretroshare-src-ft-ftfilecreator.h new file mode 100644 index 00000000000..1c9d403ec33 --- /dev/null +++ b/net-p2p/retroshare/files/patch-libretroshare-src-ft-ftfilecreator.h @@ -0,0 +1,10 @@ +--- libretroshare/src/ft/ftfilecreator.h~ 2011-04-25 16:20:57.000000000 +0200 ++++ libretroshare/src/ft/ftfilecreator.h 2012-01-15 20:30:41.000000000 +0100 +@@ -35,6 +35,7 @@ + #include "ftfileprovider.h" + #include "ftchunkmap.h" + #include <map> ++#define fseeko64 fseeko + + class ZeroInitCounter + { diff --git a/net-p2p/retroshare/files/patch-libretroshare-src-ft-ftfileprovider.h b/net-p2p/retroshare/files/patch-libretroshare-src-ft-ftfileprovider.h new file mode 100644 index 00000000000..3906c1fe9c0 --- /dev/null +++ b/net-p2p/retroshare/files/patch-libretroshare-src-ft-ftfileprovider.h @@ -0,0 +1,10 @@ +--- libretroshare/src/ft/ftfileprovider.h~ 2011-02-20 01:59:47.000000000 +0100 ++++ libretroshare/src/ft/ftfileprovider.h 2012-01-15 04:01:35.000000000 +0100 +@@ -34,6 +34,7 @@ + #include <stdint.h> + #include "util/rsthreads.h" + #include "retroshare/rsfiles.h" ++#define fseeko64 fseeko + + class ftFileProvider + { diff --git a/net-p2p/retroshare/files/patch-libretroshare-src-libretroshare.pro b/net-p2p/retroshare/files/patch-libretroshare-src-libretroshare.pro new file mode 100644 index 00000000000..2e8b4ee1c4c --- /dev/null +++ b/net-p2p/retroshare/files/patch-libretroshare-src-libretroshare.pro @@ -0,0 +1,10 @@ +--- libretroshare/src/libretroshare.pro~ 2011-08-03 19:43:26.000000000 +0200 ++++ libretroshare/src/libretroshare.pro 2012-01-15 04:20:41.000000000 +0100 +@@ -104,6 +104,7 @@ + INCLUDEPATH += . $${BITDHT_DIR} + # The next line if for compliance with debian packages. Keep it! + INCLUDEPATH += ../libbitdht ++ INCLUDEPATH += $${PREFIX}/include/gpgme + DEFINES *= RS_USE_BITDHT + } + diff --git a/net-p2p/retroshare/files/patch-libretroshare-src-rsserver-rsinit.cc b/net-p2p/retroshare/files/patch-libretroshare-src-rsserver-rsinit.cc new file mode 100644 index 00000000000..a98e5b4df1a --- /dev/null +++ b/net-p2p/retroshare/files/patch-libretroshare-src-rsserver-rsinit.cc @@ -0,0 +1,88 @@ +--- libretroshare/src/rsserver/rsinit.cc.org 2012-01-15 04:34:27.000000000 +0100 ++++ libretroshare/src/rsserver/rsinit.cc 2012-01-15 04:35:45.000000000 +0100 +@@ -59,78 +59,14 @@ + + #include "tcponudp/udpstunner.h" + +-class accountId +-{ +- public: +- std::string pgpId; +- std::string pgpName; +- std::string pgpEmail; +- +- std::string sslId; +- std::string location; +-}; +- +- +-class RsInitConfig +-{ +- public: +- /* Directories (SetupBaseDir) */ +- static std::string basedir; +- static std::string homePath; +-#ifdef WINDOWS_SYS +- static bool portable; +- static bool isWindowsXP; +-#endif +- +- static std::list<accountId> accountIds; +- static std::string preferedId; +- +- /* for certificate creation */ +- //static std::string gpgPasswd; +- +-#ifndef WINDOWS_SYS +- static int lockHandle; +-#else +- static HANDLE lockHandle; +-#endif +- +- /* These fields are needed for login */ +- static std::string loginId; +- static std::string configDir; +- static std::string load_cert; +- static std::string load_key; +- +- static std::string passwd; +- +- static bool autoLogin; /* autoLogin allowed */ +- static bool startMinimised; /* Icon or Full Window */ +- +- /* Key Parameters that must be set before +- * RetroShare will start up: +- */ +- +- /* Listening Port */ +- static bool forceExtPort; +- static bool forceLocalAddr; +- static unsigned short port; +- static char inet[256]; +- +- /* Logging */ +- static bool haveLogFile; +- static bool outStderr; +- static bool haveDebugLevel; +- static int debugLevel; +- static std::string logfname; +- +- static bool firsttime_run; +- static bool load_trustedpeer; +- static std::string load_trustedpeer_file; +- +- static bool udpListenerOnly; +- +- static std::string RetroShareLink; +-}; ++#include "rsinit.h" + ++#include <fnmatch.h> ++#include <unistd.h> ++#define O_LARGEFILE 0100000 ++#define stat64 stat ++#define _stat stat ++#define _getcwd getcwd + + const int p3facestartupzone = 47238; + diff --git a/net-p2p/retroshare/files/patch-libretroshare-src-rsserver-rsloginhandler.cc b/net-p2p/retroshare/files/patch-libretroshare-src-rsserver-rsloginhandler.cc new file mode 100644 index 00000000000..6813ca6e6d8 --- /dev/null +++ b/net-p2p/retroshare/files/patch-libretroshare-src-rsserver-rsloginhandler.cc @@ -0,0 +1,28 @@ +--- libretroshare/src/rsserver/rsloginhandler.cc.orig 2012-01-15 04:44:59.000000000 +0100 ++++ libretroshare/src/rsserver/rsloginhandler.cc 2012-01-15 04:43:08.000000000 +0100 +@@ -4,6 +4,7 @@ + #include <pqi/authgpg.h> + #include "rsloginhandler.h" + #include "util/rsdir.h" ++#include "rsinit.h" + + #ifdef UBUNTU + #include <gnome-keyring-1/gnome-keyring.h> +@@ -196,7 +197,7 @@ + /******************** OSX KeyChain stuff *****************************/ + #else /* UNIX, but not UBUNTU or APPLE */ + +- FILE* helpFile = RsDirUtil::rs_fopen(getAutologinFileName.c_str(), "r"); ++ FILE* helpFile = RsDirUtil::rs_fopen(getAutologinFileName(ssl_id).c_str(), "r"); + + if(helpFile == NULL){ + std::cerr << "\nFailed to open help file\n" << std::endl; +@@ -408,7 +409,7 @@ + #else + + /* WARNING: Autologin is inherently unsafe */ +- FILE* helpFile = RsDirUtil::rs_fopen(getAutologinFileName.c_str(), "w"); ++ FILE* helpFile = RsDirUtil::rs_fopen(getAutologinFileName(ssl_id).c_str(), "w"); + + if(helpFile == NULL){ + std::cerr << "\nRsStoreAutoLogin(): Failed to open help file\n" << std::endl; diff --git a/net-p2p/retroshare/files/patch-libretroshare-src-upnp-upnphandler.cc b/net-p2p/retroshare/files/patch-libretroshare-src-upnp-upnphandler.cc new file mode 100644 index 00000000000..db796e65ed5 --- /dev/null +++ b/net-p2p/retroshare/files/patch-libretroshare-src-upnp-upnphandler.cc @@ -0,0 +1,10 @@ +--- libretroshare/src/upnp/upnphandler.cc~ 2011-07-08 11:54:27.000000000 +0200 ++++ libretroshare/src/upnp/upnphandler.cc 2012-01-15 05:27:12.000000000 +0100 +@@ -12,6 +12,7 @@ + #endif + /* This stuff is actually C */ + ++#define do_not_use_this + #include "upnp/upnphandler.h" + + #include "util/rsnet.h" diff --git a/net-p2p/retroshare/files/patch-libretroshare-src-upnp-upnphandler.h b/net-p2p/retroshare/files/patch-libretroshare-src-upnp-upnphandler.h new file mode 100644 index 00000000000..45d1f4dc36f --- /dev/null +++ b/net-p2p/retroshare/files/patch-libretroshare-src-upnp-upnphandler.h @@ -0,0 +1,14 @@ +--- libretroshare/src/upnp/upnphandler.h~ 2010-07-04 12:42:17.000000000 +0200 ++++ libretroshare/src/upnp/upnphandler.h 2012-01-15 05:26:45.000000000 +0100 +@@ -13,7 +13,11 @@ + #include "util/rsthreads.h" + + #include <upnp/upnp.h> ++#ifdef do_not_use_this ++#include "upnp/UPnPBase.cpp" ++#else + #include "upnp/UPnPBase.h" ++#endif + + #define RS_UPNP_S_UNINITIALISED 0 + #define RS_UPNP_S_UNAVAILABLE 1 diff --git a/net-p2p/retroshare/files/patch-libretroshare-src-util-rsdir.h b/net-p2p/retroshare/files/patch-libretroshare-src-util-rsdir.h new file mode 100644 index 00000000000..ce9a1249409 --- /dev/null +++ b/net-p2p/retroshare/files/patch-libretroshare-src-util-rsdir.h @@ -0,0 +1,20 @@ +--- libretroshare/src/util/rsdir.h.orig 2011-05-15 14:42:55.000000000 +0200 ++++ libretroshare/src/util/rsdir.h 2012-01-15 20:10:19.000000000 +0100 +@@ -31,6 +31,17 @@ + #include <string> + #include <list> + #include <stdint.h> ++#include <fnmatch.h> ++ ++#include <dirent.h> ++#include <unistd.h> ++#define O_LARGEFILE 0100000 ++#define stat64 stat ++#define _stat stat ++#define _getcwd getcwd ++#define fseeko64 fseeko ++#define fopen64 fopen ++#define ftello64 ftello + + class CRC32Map ; + class RsThread; diff --git a/net-p2p/retroshare/files/patch-libretroshare-src-util-rsdiscspace.cc b/net-p2p/retroshare/files/patch-libretroshare-src-util-rsdiscspace.cc new file mode 100644 index 00000000000..4c590bb1602 --- /dev/null +++ b/net-p2p/retroshare/files/patch-libretroshare-src-util-rsdiscspace.cc @@ -0,0 +1,10 @@ +--- libretroshare/src/util/rsdiscspace.cc.orig 2011-07-05 00:59:39.000000000 +0200 ++++ libretroshare/src/util/rsdiscspace.cc 2012-01-15 04:55:17.000000000 +0100 +@@ -31,6 +31,7 @@ + #include <util/rsthreads.h> + #ifndef WIN32 + #include <sys/statvfs.h> ++#define statvfs64 statvfs + #endif + + #define DELAY_BETWEEN_CHECKS 2 diff --git a/net-p2p/retroshare/files/patch-libretroshare-src-util-rsrandom.cc b/net-p2p/retroshare/files/patch-libretroshare-src-util-rsrandom.cc new file mode 100644 index 00000000000..094e3ac7f45 --- /dev/null +++ b/net-p2p/retroshare/files/patch-libretroshare-src-util-rsrandom.cc @@ -0,0 +1,11 @@ +--- libretroshare/src/util/rsrandom.cc~ 2011-07-05 00:59:39.000000000 +0200 ++++ libretroshare/src/util/rsrandom.cc 2012-01-15 04:56:47.000000000 +0100 +@@ -13,7 +13,7 @@ + #ifdef __APPLE__ + static bool auto_seed = RSRandom::seed( (time(NULL) + pthread_mach_thread_np(pthread_self())*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; + #else +- static bool auto_seed = RSRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; ++// static bool auto_seed = RSRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ; + #endif + #endif + bool RSRandom::seed(uint32_t s) diff --git a/net-p2p/retroshare/files/patch-retroshare-gui-src-RetroShare.pro b/net-p2p/retroshare/files/patch-retroshare-gui-src-RetroShare.pro new file mode 100644 index 00000000000..9e5b8be7bdd --- /dev/null +++ b/net-p2p/retroshare/files/patch-retroshare-gui-src-RetroShare.pro @@ -0,0 +1,17 @@ +--- retroshare-gui/src/RetroShare.pro.orig 2011-08-03 19:45:03.000000000 +0200 ++++ retroshare-gui/src/RetroShare.pro 2012-01-15 12:55:12.000000000 +0100 +@@ -153,9 +153,12 @@ + + # ########################################### + ++INCLUDEPATH += $${PREFIX}/include/gpgme ++LIBS += ../../libretroshare/src/libretroshare.a -lssl -lgpgme -lupnp ++ + bitdht { +- LIBS += ../../libbitdht/src/lib/libbitdht.a +- PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a ++ LIBS += ../../libbitdht/src/libbitdht.a ++ PRE_TARGETDEPS *= ../../libbitdht/src/libbitdht.a + } + + win32 { diff --git a/net-p2p/retroshare/files/rsinit.h b/net-p2p/retroshare/files/rsinit.h new file mode 100644 index 00000000000..5434971c7b2 --- /dev/null +++ b/net-p2p/retroshare/files/rsinit.h @@ -0,0 +1,78 @@ + +#ifndef RETROSHARE_RSINIT_H +#define RETROSHARE_RSINIT_H + +class accountId +{ + public: + std::string pgpId; + std::string pgpName; + std::string pgpEmail; + + std::string sslId; + std::string location; +}; + + +class RsInitConfig +{ + public: + /* Directories (SetupBaseDir) */ + static std::string basedir; + static std::string homePath; +#ifdef WINDOWS_SYS + static bool portable; + static bool isWindowsXP; +#endif + + static std::list<accountId> accountIds; + static std::string preferedId; + + /* for certificate creation */ + //static std::string gpgPasswd; + +#ifndef WINDOWS_SYS + static int lockHandle; +#else + static HANDLE lockHandle; +#endif + + /* These fields are needed for login */ + static std::string loginId; + static std::string configDir; + static std::string load_cert; + static std::string load_key; + + static std::string passwd; + + static bool autoLogin; /* autoLogin allowed */ + static bool startMinimised; /* Icon or Full Window */ + + /* Key Parameters that must be set before + * RetroShare will start up: + */ + + /* Listening Port */ + static bool forceExtPort; + static bool forceLocalAddr; + static unsigned short port; + static char inet[256]; + + /* Logging */ + static bool haveLogFile; + static bool outStderr; + static bool haveDebugLevel; + static int debugLevel; + static std::string logfname; + + static bool firsttime_run; + static bool load_trustedpeer; + static std::string load_trustedpeer_file; + + static bool udpListenerOnly; + + static std::string RetroShareLink; +}; + +#endif + |