Attachment #121902 for bug #164979

View | Details | Raw Unified | Return to bug 164979
Collapse All | Expand All




 # Date created:        15 January 2012
 # Whom:                glocke
 #
# $FreeBSD$
 #
 PORTNAME=      retroshare
PORTVERSION=   0.5.3a
 CATEGORIES=    net-p2p
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}

                qmake_build moc_build rcc_build
 HAS_CONFIGURE= yes
 BINARY=                RetroShare
BINARY_NOGUI=  retroshare-nogui
 DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \
                "Network;FileTransfer;" true
OPTIONS=       NOGUI "Also build nogui binary" On
.include <bsd.port.options.mk>
 do-configure:
        @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
                ${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro
 post-patch:
       @${REINPLACE_CMD} -e 's|plugins|#plugins|' 
       @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
               ${WRKSRC}/libretroshare/src/libretroshare.pro
       @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
               ${WRKSRC}/retroshare-gui/src/RetroShare.pro
       @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
               ${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
.if defined(WITHOUT_NOGUI)
       @${REINPLACE_CMD} -e 's|retroshare-nogui|#retroshare-nogui|' \
               ${WRKSRC}/${BINARY}.pro
       @${REINPLACE_CMD} -e 's|RetroShare.pro \\|RetroShare.pro|' \
               ${WRKSRC}/${BINARY}.pro
.else
       @${REINPLACE_CMD} -e 's|retroshare-nogui.pro 
               ${WRKSRC}/${BINARY}.pro
.endif

pre-install:
.if defined(WITHOUT_NOGUI)
PLIST_SUB+=    NOGUI="@comment "
.else
PLIST_SUB+=    NOGUI=""
.endif
 post-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} 
.if defined(WITH_NOGUI)
       ${INSTALL_PROGRAM} 
.endif
        ${MKDIR} ${DATADIR}
        ${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt 
        @${ECHO_MSG} 




SHA256 (RetroShare-v0.5.2a.tar.gz) = 

SHA256 (RetroShare-v0.5.3a.tar.gz) = 
SIZE (RetroShare-v0.5.3a.tar.gz) = 6419672
-- 
    2012-01-27 15:41:16.000000000 +0100
++ 

0100
--- libbitdht/src/util/bdrandom.cc.orig        2012-01-15 
@@ -13,7 +13,7 @@
   #ifdef __APPLE__
       static bool auto_seed = bdRandom::seed( (time(NULL) + 
   #else
+//    static bool auto_seed = bdRandom::seed( (time(NULL) + 
-    static bool auto_seed = bdRandom::seed( (time(NULL) + 
   #endif
 #endif
 bool bdRandom::seed(uint32_t s)
-- 
  2012-01-27 15:41:16.000000000 +0100
++ 
      1970-01-01 01:00:00.000000000 +0100

0100
+++ libretroshare/src/dbase/findex.h   2012-01-15 03:55:27.000000000 
@@ -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;

 
-- 
      2012-01-27 15:41:16.000000000 +0100
++ 
  1970-01-01 01:00:00.000000000 +0100

--- libretroshare/src/ft/ftfilecreator.h~      2011-04-25 
+++ libretroshare/src/ft/ftfilecreator.h       2012-01-15 
@@ -35,6 +35,7 @@
 #include "ftfileprovider.h"
 #include "ftchunkmap.h"
 #include <map>
+#define fseeko64 fseeko

 class ZeroInitCounter
 {
-- 
     2012-01-27 15:41:16.000000000 +0100
++ 
 1970-01-01 01:00:00.000000000 +0100

--- libretroshare/src/ft/ftfileprovider.h~     2011-02-20 
+++ libretroshare/src/ft/ftfileprovider.h      2012-01-15 
@@ -34,6 +34,7 @@
 #include <stdint.h>
 #include "util/rsthreads.h"
 #include "retroshare/rsfiles.h"
+#define fseeko64 fseeko

 class ftFileProvider
 {
-- 
       2012-01-27 15:41:16.000000000 +0100
++ 
   1970-01-01 01:00:00.000000000 +0100

--- libretroshare/src/libretroshare.pro~       2011-08-03 
+++ libretroshare/src/libretroshare.pro        2012-01-15 
@@ -104,6 +104,7 @@
       INCLUDEPATH += . $${BITDHT_DIR}
       # The next line if for compliance with debian packages. Keep 
       INCLUDEPATH += ../libbitdht
+      INCLUDEPATH += $${PREFIX}/include/gpgme
       DEFINES *= RS_USE_BITDHT
 }

-- 
      2012-01-27 15:41:16.000000000 +0100
++ 
  1970-01-01 01:00:00.000000000 +0100

--- libretroshare/src/rsserver/rsinit.cc.org   2012-01-15 
+++ libretroshare/src/rsserver/rsinit.cc       2012-01-15 
@@ -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 
-                static bool startMinimised;           /* Icon or Full 
-
-                /* 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;

-- 
      2012-01-27 15:41:16.000000000 +0100
++ 
  1970-01-01 01:00:00.000000000 +0100

--- libretroshare/src/rsserver/rsloginhandler.cc.orig  2012-01-15 
+++ libretroshare/src/rsserver/rsloginhandler.cc       2012-01-15 
@@ -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 = 
+      FILE* helpFile = 

       if(helpFile == NULL){
               std::cerr << "\nFailed to open help file\n" << 
@@ -408,7 +409,7 @@
 #else

       /* WARNING: Autologin is inherently unsafe */
-      FILE* helpFile = 
+      FILE* helpFile = 

       if(helpFile == NULL){
               std::cerr << "\nRsStoreAutoLogin(): Failed to open help 
-- 
     2012-01-27 15:41:16.000000000 +0100
++ 
 1970-01-01 01:00:00.000000000 +0100

--- libretroshare/src/upnp/upnphandler.cc~     2011-07-08 
+++ libretroshare/src/upnp/upnphandler.cc      2012-01-15 
@@ -12,6 +12,7 @@
 #endif
 /* This stuff is actually C */

+#define do_not_use_this
 #include "upnp/upnphandler.h"

 #include "util/rsnet.h"
-- 
      2012-01-27 15:41:16.000000000 +0100
++ 
  1970-01-01 01:00:00.000000000 +0100

--- libretroshare/src/upnp/upnphandler.h~      2010-07-04 
+++ libretroshare/src/upnp/upnphandler.h       2012-01-15 
@@ -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
-- 
    2012-01-27 15:41:16.000000000 +0100
++ 

0100
+++ libretroshare/src/util/rsdir.h     2012-01-15 20:10:19.000000000 
@@ -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;
-- 
     2012-01-27 15:41:16.000000000 +0100
++ 
 1970-01-01 01:00:00.000000000 +0100

++ 
+++ libretroshare/src/util/rsdiscspace.cc      2012-01-15 
@@ -31,6 +31,7 @@
 #include <util/rsthreads.h>
 #ifndef WIN32
 #include <sys/statvfs.h>
+#define statvfs64 statvfs
 #endif

 #define DELAY_BETWEEN_CHECKS 2
-- 
    1970-01-01 01:00:00.000000000 +0100

0100
+++ libretroshare/src/util/rsrandom.cc 2012-01-15 04:56:47.000000000 
@@ -13,7 +13,7 @@
   #ifdef __APPLE__
       static bool auto_seed = RSRandom::seed( (time(NULL) + 
   #else
-    static bool auto_seed = RSRandom::seed( (time(NULL) + 
+//    static bool auto_seed = RSRandom::seed( (time(NULL) + 
   #endif
 #endif
 bool RSRandom::seed(uint32_t s)
-- 
 2012-01-27 15:41:16.000000000 +0100
++ 
     1970-01-01 01:00:00.000000000 +0100

0100
+++ retroshare-gui/src/RetroShare.pro  2012-01-15 12:55:12.000000000 
@@ -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 {





#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 
                static bool startMinimised;            /* Icon or Full 

                /* 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


Lines 1-3 Link Here

(-)/home/retep/src/redports/port/retroshare/pkg-plist 2012-02-10 (+1 lines)
1	bin/RetroShare	1	bin/RetroShare
		2	%%NOGUI%%bin/retroshare-nogui
2	%%DATADIR%%/bdboot.txt	3	%%DATADIR%%/bdboot.txt
3	@dirrm %%DATADIR%%	4	@dirrm %%DATADIR%%

Return to bug 164979

Lines 2-12 Link Here

(-)/home/retep/src/redports/port/retroshare/Makefile 2012-02-11 (-5 / +31 lines)
2	# Date created: 15 January 2012	2	# Date created: 15 January 2012
3	# Whom: glocke	3	# Whom: glocke
4	#	4	#
5	# $FreeBSD: ports/net-p2p/retroshare/Makefile,v 1.1 2012/01/27	5	# $FreeBSD$
6	#	6	#
7	PORTNAME= retroshare	7	PORTNAME= retroshare
8	PORTVERSION= 0.5.2a	8	PORTVERSION= 0.5.3a
9	CATEGORIES= net-p2p	9	CATEGORIES= net-p2p
10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
11	MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}	11	MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
Lines 29-51 Link Here
29	qmake_build moc_build rcc_build	29	qmake_build moc_build rcc_build
30	HAS_CONFIGURE= yes	30	HAS_CONFIGURE= yes
31	BINARY= RetroShare	31	BINARY= RetroShare
		32	BINARY_NOGUI= retroshare-nogui
32	DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \	33	DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \
33	"Network;FileTransfer;" true	34	"Network;FileTransfer;" true
34	CFLAGS+= -I${LOCALBASE}/include/gpgme	35	OPTIONS= NOGUI "Also build nogui binary" On
35	USE_DOS2UNIX= retroshare-gui/src/${BINARY}.pro	36	.include <bsd.port.options.mk>
36	do-configure:	37	do-configure:
37	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \	38	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
38	${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro	39	${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro
39	post-patch:	40	post-patch:
40	${CP} ${FILESDIR}/rsinit.h ${WRKSRC}/libretroshare/src/rsserver	41	@${REINPLACE_CMD} -e 's\|plugins\|#plugins\|'
		42	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \
		43	${WRKSRC}/libretroshare/src/libretroshare.pro
		44	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \
		45	${WRKSRC}/retroshare-gui/src/RetroShare.pro
		46	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \
		47	${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
		48	.if defined(WITHOUT_NOGUI)
		49	@${REINPLACE_CMD} -e 's\|retroshare-nogui\|#retroshare-nogui\|' \
		50	${WRKSRC}/${BINARY}.pro
		51	@${REINPLACE_CMD} -e 's\|RetroShare.pro \\\|RetroShare.pro\|' \
		52	${WRKSRC}/${BINARY}.pro
		53	.else
		54	@${REINPLACE_CMD} -e 's\|retroshare-nogui.pro
		55	${WRKSRC}/${BINARY}.pro
		56	.endif
		57
		58	pre-install:
		59	.if defined(WITHOUT_NOGUI)
		60	PLIST_SUB+= NOGUI="@comment "
		61	.else
		62	PLIST_SUB+= NOGUI=""
		63	.endif
41	post-install:	64	post-install:
42	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY}	65	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY}
		66	.if defined(WITH_NOGUI)
		67	${INSTALL_PROGRAM}
		68	.endif
43	${MKDIR} ${DATADIR}	69	${MKDIR} ${DATADIR}
44	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt	70	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt
45	@${ECHO_MSG}	71	@${ECHO_MSG}

Lines 1-2 Link Here

(-)/home/retep/src/redports/port/retroshare/distinfo 2012-02-09 (-271 / +20 lines)
1	SHA256 (RetroShare-v0.5.2a.tar.gz) =
Line 33838 Link Here
33838	SIZE (RetroShare-v0.5.2a.tar.gz) = 10334273	234	SHA256 (RetroShare-v0.5.3a.tar.gz) =
		235	SIZE (RetroShare-v0.5.3a.tar.gz) = 6419672
33839	--
33840	2012-01-27 15:41:16.000000000 +0100	236	2012-01-27 15:41:16.000000000 +0100
		237	++
Lines 1-11 Link Here
1	+++ libbitdht/src/util/bdrandom.cc 2012-01-15 03:45:36.000000000	0	0100
2	--- libbitdht/src/util/bdrandom.cc.orig 2012-01-15
3	@@ -13,7 +13,7 @@
4	#ifdef __APPLE__
5	static bool auto_seed = bdRandom::seed( (time(NULL) +
6	#else
7	+// static bool auto_seed = bdRandom::seed( (time(NULL) +
8	- static bool auto_seed = bdRandom::seed( (time(NULL) +
9	#endif
10	#endif
11	bool bdRandom::seed(uint32_t s)
12	--
13	2012-01-27 15:41:16.000000000 +0100	1	2012-01-27 15:41:16.000000000 +0100
		2	++
14	1970-01-01 01:00:00.000000000 +0100	3	1970-01-01 01:00:00.000000000 +0100
Lines 1-17 Link Here
1	--- libretroshare/src/dbase/findex.h.orig 2011-04-15	0	0100
2	+++ libretroshare/src/dbase/findex.h 2012-01-15 03:55:27.000000000
3	@@ -33,6 +33,14 @@
4	#include <stdint.h>
5	#include "retroshare/rstypes.h"
6
7	+#include <dirent.h>
8	+#include <fnmatch.h>
9	+#include <unistd.h>
10	+#define O_LARGEFILE 0100000
11	+#define stat64 stat
12	+#define _stat stat
13	+#define _getcwd getcwd
14	+
15	class ostream;
16
17
18	--
19	2012-01-27 15:41:16.000000000 +0100	1	2012-01-27 15:41:16.000000000 +0100
		2	++
20	1970-01-01 01:00:00.000000000 +0100	3	1970-01-01 01:00:00.000000000 +0100
Lines 1-10 Link Here
1	--- libretroshare/src/ft/ftfilecreator.h~ 2011-04-25
2	+++ libretroshare/src/ft/ftfilecreator.h 2012-01-15
3	@@ -35,6 +35,7 @@
4	#include "ftfileprovider.h"
5	#include "ftchunkmap.h"
6	#include <map>
7	+#define fseeko64 fseeko
8
9	class ZeroInitCounter
10	{
11	--
12	2012-01-27 15:41:16.000000000 +0100	0	2012-01-27 15:41:16.000000000 +0100
		1	++
13	1970-01-01 01:00:00.000000000 +0100	2	1970-01-01 01:00:00.000000000 +0100
Lines 1-10 Link Here
1	--- libretroshare/src/ft/ftfileprovider.h~ 2011-02-20
2	+++ libretroshare/src/ft/ftfileprovider.h 2012-01-15
3	@@ -34,6 +34,7 @@
4	#include <stdint.h>
5	#include "util/rsthreads.h"
6	#include "retroshare/rsfiles.h"
7	+#define fseeko64 fseeko
8
9	class ftFileProvider
10	{
11	--
12	2012-01-27 15:41:16.000000000 +0100	0	2012-01-27 15:41:16.000000000 +0100
		1	++
13	1970-01-01 01:00:00.000000000 +0100	2	1970-01-01 01:00:00.000000000 +0100
Lines 1-10 Link Here
1	--- libretroshare/src/libretroshare.pro~ 2011-08-03
2	+++ libretroshare/src/libretroshare.pro 2012-01-15
3	@@ -104,6 +104,7 @@
4	INCLUDEPATH += . $${BITDHT_DIR}
5	# The next line if for compliance with debian packages. Keep
6	INCLUDEPATH += ../libbitdht
7	+ INCLUDEPATH += $${PREFIX}/include/gpgme
8	DEFINES *= RS_USE_BITDHT
9	}
10
11	--
12	2012-01-27 15:41:16.000000000 +0100	0	2012-01-27 15:41:16.000000000 +0100
		1	++
13	1970-01-01 01:00:00.000000000 +0100	2	1970-01-01 01:00:00.000000000 +0100
Lines 1-88 Link Here
1	--- libretroshare/src/rsserver/rsinit.cc.org 2012-01-15
2	+++ libretroshare/src/rsserver/rsinit.cc 2012-01-15
3	@@ -59,78 +59,14 @@
4
5	#include "tcponudp/udpstunner.h"
6
7	-class accountId
8	-{
9	- public:
10	- std::string pgpId;
11	- std::string pgpName;
12	- std::string pgpEmail;
13	-
14	- std::string sslId;
15	- std::string location;
16	-};
17	-
18	-
19	-class RsInitConfig
20	-{
21	- public:
22	- /* Directories (SetupBaseDir) */
23	- static std::string basedir;
24	- static std::string homePath;
25	-#ifdef WINDOWS_SYS
26	- static bool portable;
27	- static bool isWindowsXP;
28	-#endif
29	-
30	- static std::list<accountId> accountIds;
31	- static std::string preferedId;
32	-
33	- /* for certificate creation */
34	- //static std::string gpgPasswd;
35	-
36	-#ifndef WINDOWS_SYS
37	- static int lockHandle;
38	-#else
39	- static HANDLE lockHandle;
40	-#endif
41	-
42	- /* These fields are needed for login */
43	- static std::string loginId;
44	- static std::string configDir;
45	- static std::string load_cert;
46	- static std::string load_key;
47	-
48	- static std::string passwd;
49	-
50	- static bool autoLogin; /* autoLogin
51	- static bool startMinimised; /* Icon or Full
52	-
53	- /* Key Parameters that must be set before
54	- * RetroShare will start up:
55	- */
56	-
57	- /* Listening Port */
58	- static bool forceExtPort;
59	- static bool forceLocalAddr;
60	- static unsigned short port;
61	- static char inet[256];
62	-
63	- /* Logging */
64	- static bool haveLogFile;
65	- static bool outStderr;
66	- static bool haveDebugLevel;
67	- static int debugLevel;
68	- static std::string logfname;
69	-
70	- static bool firsttime_run;
71	- static bool load_trustedpeer;
72	- static std::string load_trustedpeer_file;
73	-
74	- static bool udpListenerOnly;
75	-
76	- static std::string RetroShareLink;
77	-};
78	+#include "rsinit.h"
79
80	+#include <fnmatch.h>
81	+#include <unistd.h>
82	+#define O_LARGEFILE 0100000
83	+#define stat64 stat
84	+#define _stat stat
85	+#define _getcwd getcwd
86
87	const int p3facestartupzone = 47238;
88
89	--
90	2012-01-27 15:41:16.000000000 +0100	0	2012-01-27 15:41:16.000000000 +0100
		1	++
91	1970-01-01 01:00:00.000000000 +0100	2	1970-01-01 01:00:00.000000000 +0100
Lines 1-28 Link Here
1	--- libretroshare/src/rsserver/rsloginhandler.cc.orig 2012-01-15
2	+++ libretroshare/src/rsserver/rsloginhandler.cc 2012-01-15
3	@@ -4,6 +4,7 @@
4	#include <pqi/authgpg.h>
5	#include "rsloginhandler.h"
6	#include "util/rsdir.h"
7	+#include "rsinit.h"
8
9	#ifdef UBUNTU
10	#include <gnome-keyring-1/gnome-keyring.h>
11	@@ -196,7 +197,7 @@
12	/******************** OSX KeyChain stuff
13	#else /* UNIX, but not UBUNTU or APPLE */
14
15	- FILE* helpFile =
16	+ FILE* helpFile =
17
18	if(helpFile == NULL){
19	std::cerr << "\nFailed to open help file\n" <<
20	@@ -408,7 +409,7 @@
21	#else
22
23	/* WARNING: Autologin is inherently unsafe */
24	- FILE* helpFile =
25	+ FILE* helpFile =
26
27	if(helpFile == NULL){
28	std::cerr << "\nRsStoreAutoLogin(): Failed to open help
29	--
30	2012-01-27 15:41:16.000000000 +0100	0	2012-01-27 15:41:16.000000000 +0100
		1	++
31	1970-01-01 01:00:00.000000000 +0100	2	1970-01-01 01:00:00.000000000 +0100
Lines 1-10 Link Here
1	--- libretroshare/src/upnp/upnphandler.cc~ 2011-07-08
2	+++ libretroshare/src/upnp/upnphandler.cc 2012-01-15
3	@@ -12,6 +12,7 @@
4	#endif
5	/* This stuff is actually C */
6
7	+#define do_not_use_this
8	#include "upnp/upnphandler.h"
9
10	#include "util/rsnet.h"
11	--
12	2012-01-27 15:41:16.000000000 +0100	0	2012-01-27 15:41:16.000000000 +0100
		1	++
13	1970-01-01 01:00:00.000000000 +0100	2	1970-01-01 01:00:00.000000000 +0100
Lines 1-14 Link Here
1	--- libretroshare/src/upnp/upnphandler.h~ 2010-07-04
2	+++ libretroshare/src/upnp/upnphandler.h 2012-01-15
3	@@ -13,7 +13,11 @@
4	#include "util/rsthreads.h"
5
6	#include <upnp/upnp.h>
7	+#ifdef do_not_use_this
8	+#include "upnp/UPnPBase.cpp"
9	+#else
10	#include "upnp/UPnPBase.h"
11	+#endif
12
13	#define RS_UPNP_S_UNINITIALISED 0
14	#define RS_UPNP_S_UNAVAILABLE 1
15	--
16	2012-01-27 15:41:16.000000000 +0100	0	2012-01-27 15:41:16.000000000 +0100
		1	++
Lines 1-20 Link Here
1	--- libretroshare/src/util/rsdir.h.orig 2011-05-15	0	0100
2	+++ libretroshare/src/util/rsdir.h 2012-01-15 20:10:19.000000000
3	@@ -31,6 +31,17 @@
4	#include <string>
5	#include <list>
6	#include <stdint.h>
7	+#include <fnmatch.h>
8	+
9	+#include <dirent.h>
10	+#include <unistd.h>
11	+#define O_LARGEFILE 0100000
12	+#define stat64 stat
13	+#define _stat stat
14	+#define _getcwd getcwd
15	+#define fseeko64 fseeko
16	+#define fopen64 fopen
17	+#define ftello64 ftello
18
19	class CRC32Map ;
20	class RsThread;
21	--
22	2012-01-27 15:41:16.000000000 +0100	1	2012-01-27 15:41:16.000000000 +0100
		2	++
23	1970-01-01 01:00:00.000000000 +0100	3	1970-01-01 01:00:00.000000000 +0100
Lines 1-10 Link Here
1	--- libretroshare/src/util/rsdiscspace.cc.orig 2011-07-05	0	++
2	+++ libretroshare/src/util/rsdiscspace.cc 2012-01-15
3	@@ -31,6 +31,7 @@
4	#include <util/rsthreads.h>
5	#ifndef WIN32
6	#include <sys/statvfs.h>
7	+#define statvfs64 statvfs
8	#endif
9
10	#define DELAY_BETWEEN_CHECKS 2
11	--
12	1970-01-01 01:00:00.000000000 +0100	1	1970-01-01 01:00:00.000000000 +0100
Lines 1-11 Link Here
1	--- libretroshare/src/util/rsrandom.cc~ 2011-07-05	0	0100
2	+++ libretroshare/src/util/rsrandom.cc 2012-01-15 04:56:47.000000000
3	@@ -13,7 +13,7 @@
4	#ifdef __APPLE__
5	static bool auto_seed = RSRandom::seed( (time(NULL) +
6	#else
7	- static bool auto_seed = RSRandom::seed( (time(NULL) +
8	+// static bool auto_seed = RSRandom::seed( (time(NULL) +
9	#endif
10	#endif
11	bool RSRandom::seed(uint32_t s)
12	--
13	2012-01-27 15:41:16.000000000 +0100	1	2012-01-27 15:41:16.000000000 +0100
		2	++
14	1970-01-01 01:00:00.000000000 +0100	3	1970-01-01 01:00:00.000000000 +0100
Lines 1-17 Link Here
1	--- retroshare-gui/src/RetroShare.pro.orig 2011-08-03	0	0100
2	+++ retroshare-gui/src/RetroShare.pro 2012-01-15 12:55:12.000000000
3	@@ -153,9 +153,12 @@
4
5	# ###########################################
6
7	+INCLUDEPATH += $${PREFIX}/include/gpgme
8	+LIBS += ../../libretroshare/src/libretroshare.a -lssl -lgpgme -lupnp
9	+
10	bitdht {
11	- LIBS += ../../libbitdht/src/lib/libbitdht.a
12	- PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
13	+ LIBS += ../../libbitdht/src/libbitdht.a
14	+ PRE_TARGETDEPS *= ../../libbitdht/src/libbitdht.a
15	}
16
17	win32 {

Lines 1-78 Link Here

(-)/home/retep/src/redports/port/retroshare/files/rsinit.h (-78 lines)
1
2	#ifndef RETROSHARE_RSINIT_H
3	#define RETROSHARE_RSINIT_H
4
5	class accountId
6	{
7	public:
8	std::string pgpId;
9	std::string pgpName;
10	std::string pgpEmail;
11
12	std::string sslId;
13	std::string location;
14	};
15
16
17	class RsInitConfig
18	{
19	public:
20	/* Directories (SetupBaseDir) */
21	static std::string basedir;
22	static std::string homePath;
23	#ifdef WINDOWS_SYS
24	static bool portable;
25	static bool isWindowsXP;
26	#endif
27
28	static std::list<accountId> accountIds;
29	static std::string preferedId;
30
31	/* for certificate creation */
32	//static std::string gpgPasswd;
33
34	#ifndef WINDOWS_SYS
35	static int lockHandle;
36	#else
37	static HANDLE lockHandle;
38	#endif
39
40	/* These fields are needed for login */
41	static std::string loginId;
42	static std::string configDir;
43	static std::string load_cert;
44	static std::string load_key;
45
46	static std::string passwd;
47
48	static bool autoLogin; /* autoLogin
49	static bool startMinimised; /* Icon or Full
50
51	/* Key Parameters that must be set before
52	* RetroShare will start up:
53	*/
54
55	/* Listening Port */
56	static bool forceExtPort;
57	static bool forceLocalAddr;
58	static unsigned short port;
59	static char inet[256];
60
61	/* Logging */
62	static bool haveLogFile;
63	static bool outStderr;
64	static bool haveDebugLevel;
65	static int debugLevel;
66	static std::string logfname;
67
68	static bool firsttime_run;
69	static bool load_trustedpeer;
70	static std::string load_trustedpeer_file;
71
72	static bool udpListenerOnly;
73
74	static std::string RetroShareLink;
75	};
76
77	#endif
78