Attachment 171960 Details for Bug 210682 – new version of yuris patch with DISTVERSIONPREFIX in right order and USES=ssl added

[patch] new version of yuris patch with DISTVERSIONPREFIX in right order and USES=ssl added

patch2 (text/plain), 8.84 KB, created by peter on 2016-06-29 22:01:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: peter

Created: 2016-06-29 22:01:06 UTC

Size: 8.84 KB

patch

obsolete

>diff -ruN net-p2p/retroshare.orig/Makefile net-p2p/retroshare/Makefile
>--- net-p2p/retroshare.orig/Makefile	2016-05-21 02:10:58.000000000 +0000
>+++ net-p2p/retroshare/Makefile	2016-06-29 20:19:28.000000000 +0000
>@@ -2,8 +2,9 @@
> # $FreeBSD: head/net-p2p/retroshare/Makefile 415583 2016-05-21 02:10:58Z pi $
> 
> PORTNAME=	retroshare
>-PORTVERSION=	0.6.0
>+PORTVERSION=	0.6.0e
> DISTVERSIONPREFIX=	v
>+PORTREVISION=	1
> CATEGORIES=	net-p2p
> 
> MAINTAINER=	peter@netkey.at
>@@ -23,7 +24,7 @@
> 		libcurl.so:ftp/curl \
> 		libmicrohttpd.so:www/libmicrohttpd
> 
>-USES=		qmake compiler:features dos2unix execinfo pkgconfig
>+USES=		compiler:features desktop-file-utils dos2unix execinfo pkgconfig qmake ssl
> USE_GNOME=	glib20 libxml2 libxslt
> USE_GL=		gl
> USE_QT5=	buildtools_build uitools_build core gui network xml \
>@@ -34,6 +35,7 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	RetroShare
> GH_PROJECT=	RetroShare
>+GH_TAGNAME=	9f7ef8b
> 
> .include <bsd.port.pre.mk>
> 
>@@ -52,5 +54,9 @@
> 		${WRKSRC}/data/retroshare06.desktop
> 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
> 		${WRKSRC}/data/retroshare06.desktop
>+.if defined(GH_TAGNAME)
>+	@${REINPLACE_CMD} -e 's|01234567|0${GH_TAGNAME}|' \
>+		${WRKSRC}/libretroshare/src/retroshare/rsversion.h
>+.endif
> 
> .include <bsd.port.post.mk>
>diff -ruN net-p2p/retroshare.orig/distinfo net-p2p/retroshare/distinfo
>--- net-p2p/retroshare.orig/distinfo	2016-05-21 02:10:58.000000000 +0000
>+++ net-p2p/retroshare/distinfo	2016-06-29 19:48:36.000000000 +0000
>@@ -1,2 +1,3 @@
>-SHA256 (RetroShare-RetroShare-v0.6.0_GH0.tar.gz) = 50b9157bbe407aaefcbf9af1f29392e63148dc060bf78a3b200c9bc09998cf7c
>-SIZE (RetroShare-RetroShare-v0.6.0_GH0.tar.gz) = 17436205
>+TIMESTAMP = 1467176910
>+SHA256 (RetroShare-RetroShare-v0.6.0e-9f7ef8b_GH0.tar.gz) = 0bcffff8814e4ff67458fbaca8e15b11c5a3fdc85ad4c080583c0f9cf32734e7
>+SIZE (RetroShare-RetroShare-v0.6.0e-9f7ef8b_GH0.tar.gz) = 17400160
>diff -ruN net-p2p/retroshare.orig/files/patch-libbitdht_src_bitdht_bencode.c net-p2p/retroshare/files/patch-libbitdht_src_bitdht_bencode.c
>--- net-p2p/retroshare.orig/files/patch-libbitdht_src_bitdht_bencode.c	2016-05-21 02:10:58.000000000 +0000
>+++ net-p2p/retroshare/files/patch-libbitdht_src_bitdht_bencode.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,46 +0,0 @@
>---- libbitdht/src/bitdht/bencode.c.orig	2016-02-05 19:04:46 UTC
>-+++ libbitdht/src/bitdht/bencode.c
>-@@ -20,7 +20,6 @@
>-  */
>- 
>- #include <stdio.h>
>--#include <iostream>
>- #include <stdlib.h> /* malloc() realloc() free() strtoll() */
>- #include <string.h> /* memset() */
>- #include "util/bdstring.h"
>-@@ -115,7 +114,7 @@ static char *_be_decode_str(const char *
>-         
>-     	if(_ret == NULL)
>-         {
>--            std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
>-+            //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
>-             return NULL;
>-         }
>-                          
>-@@ -511,7 +510,7 @@ be_node *be_create_str(const char *str)
>-     
>-     	if(_ret == NULL)
>-         {
>--            std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
>-+            //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
>-             return NULL;
>-         }
>- 	char *ret = NULL;
>-@@ -536,7 +535,7 @@ be_node *be_create_str_wlen(const char *
>-     
>-     	if(_ret == NULL)
>-         {
>--            std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
>-+            //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
>-             return NULL;
>-         }
>- 	char *ret = NULL;
>-@@ -584,7 +583,7 @@ int be_add_keypair(be_node *dict, const 
>-     
>-     	if(_ret == NULL)
>-         {
>--            std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
>-+            //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
>-             return 0;
>-         }
>- 	char *ret = NULL;
>diff -ruN net-p2p/retroshare.orig/files/patch-libretroshare_src_grouter_p3grouter.h net-p2p/retroshare/files/patch-libretroshare_src_grouter_p3grouter.h
>--- net-p2p/retroshare.orig/files/patch-libretroshare_src_grouter_p3grouter.h	2016-05-21 02:10:58.000000000 +0000
>+++ net-p2p/retroshare/files/patch-libretroshare_src_grouter_p3grouter.h	1970-01-01 00:00:00.000000000 +0000
>@@ -1,20 +0,0 @@
>---- libretroshare/src/grouter/p3grouter.h.orig	2016-02-05 19:04:46 UTC
>-+++ libretroshare/src/grouter/p3grouter.h
>-@@ -225,7 +225,7 @@ private:
>-     void handleLowLevelTransactionAckItem(RsGRouterTransactionAcknItem*) ;
>- 
>-     static Sha1CheckSum computeDataItemHash(RsGRouterGenericDataItem *data_item);
>--#ifdef __APPLE__
>-+#if defined(__APPLE__) || defined(__FreeBSD__)
>- public:
>- #endif
>-     class nullstream: public std::ostream {};
>-@@ -236,7 +236,7 @@ public:
>- 
>-         return _debug_enabled?(std::cerr):null;
>-     }
>--#ifdef __APPLE__
>-+#if defined(__APPLE__) || defined(__FreeBSD__)
>- private:
>- #endif
>-     void routePendingObjects() ;
>diff -ruN net-p2p/retroshare.orig/files/patch-libretroshare_src_rsserver_rsinit.cc net-p2p/retroshare/files/patch-libretroshare_src_rsserver_rsinit.cc
>--- net-p2p/retroshare.orig/files/patch-libretroshare_src_rsserver_rsinit.cc	2016-05-21 02:10:58.000000000 +0000
>+++ net-p2p/retroshare/files/patch-libretroshare_src_rsserver_rsinit.cc	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- libretroshare/src/rsserver/rsinit.cc.orig	2016-02-05 19:04:46 UTC
>-+++ libretroshare/src/rsserver/rsinit.cc
>-@@ -367,7 +367,7 @@ int RsInit::InitRetroShare(int argcIgnor
>- #ifdef LOCALNET_TESTING
>- 			   >> parameter('R',"restrict-port" ,portRestrictions             ,"port1-port2","Apply port restriction"                   ,false)
>- #endif
>--#ifdef __APPLE__
>-+#if defined(__APPLE__) || defined(__FreeBSD__)
>-  				>> help('h',"help","Display this Help") ;
>- #else
>- 				>> help() ;
>diff -ruN net-p2p/retroshare.orig/files/patch-libretroshare_src_util_argstream.h net-p2p/retroshare/files/patch-libretroshare_src_util_argstream.h
>--- net-p2p/retroshare.orig/files/patch-libretroshare_src_util_argstream.h	2016-05-21 02:10:58.000000000 +0000
>+++ net-p2p/retroshare/files/patch-libretroshare_src_util_argstream.h	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- libretroshare/src/util/argstream.h.orig	2016-02-05 19:04:46 UTC
>-+++ libretroshare/src/util/argstream.h
>-@@ -141,7 +141,7 @@ namespace 
>- 			inline OptionHolder(char s,
>- 					const char* l,
>- 					const char* desc);  
>--#ifdef __APPLE__
>-+#if defined(__APPLE__) || defined(__FreeBSD__)
>-  			friend OptionHolder help(char s,
>-  					const char* l,
>-  					const char* desc);
>diff -ruN net-p2p/retroshare.orig/files/patch-retroshare-nogui_src_retroshare.cc net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare.cc
>--- net-p2p/retroshare.orig/files/patch-retroshare-nogui_src_retroshare.cc	2016-05-21 02:10:58.000000000 +0000
>+++ net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare.cc	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- retroshare-nogui/src/retroshare.cc.orig	2016-02-05 19:04:46 UTC
>-+++ retroshare-nogui/src/retroshare.cc
>-@@ -86,7 +86,7 @@ int main(int argc, char **argv)
>-     // unfinished
>-     //args >> parameter("http-listen", listenAddress, "ipv6 address", "Listen only on the specified address.", false);
>-     args >> option("http-allow-all", allowAllIps, "allow connections from all IP adresses (default= localhost only)");
>--#ifdef __APPLE__    
>-+#if defined(__APPLE__) || defined(__FreeBSD__)
>-     args >> help('h',"help","Display this Help");
>- #else
>-     args >> help();
>diff -ruN net-p2p/retroshare.orig/pkg-plist net-p2p/retroshare/pkg-plist
>--- net-p2p/retroshare.orig/pkg-plist	2016-05-21 02:10:58.000000000 +0000
>+++ net-p2p/retroshare/pkg-plist	2016-06-29 19:48:36.000000000 +0000
>@@ -434,14 +434,10 @@
> share/RetroShare06/stylesheets/Bubble_Compact/private/system.htm
> share/RetroShare06/stylesheets/Bubble_Compact/private/variants/color.css
> share/RetroShare06/stylesheets/Bubble_Compact/private/variants/standard.css
>-share/RetroShare06/webui/JSXTransformer.js
>-share/RetroShare06/webui/RsApi.js
>-share/RetroShare06/webui/RsXHRConnection.js
>-share/RetroShare06/webui/green-black.css
>-share/RetroShare06/webui/gui.jsx
>+share/RetroShare06/webui/app.css
>+share/RetroShare06/webui/app.js
> share/RetroShare06/webui/img/logo_splash.png
> share/RetroShare06/webui/index.html
>-share/RetroShare06/webui/react.js
> share/applications/retroshare06.desktop
> share/icons/hicolor/128x128/apps/retroshare06.png
> share/icons/hicolor/24x24/apps/retroshare06.png

Flags:

peter: maintainer-approval+

Actions: View | Diff

Attachments on bug 210682: 171933 | 171934 | 171960