Attachment #213451 for bug #245656

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




# $FreeBSD: head/security/i2p/Makefile 529327 2020-03-28 11:26:58Z rene $

PORTNAME=	i2p
DISTVERSION=	0.9.45
CATEGORIES=	security java net-p2p
MASTER_SITES=	http://download.i2p2.de/releases/${PORTVERSION}/
		http://download.i2p2.no/releases/${PORTVERSION}/ \
		http://download2.geti2p.com/${PORTVERSION}/ \
		http://download.geti2p.com/${PORTVERSION}/ \
		http://download.i2p2.de/releases/${PORTVERSION}/ \
		https://launchpad.net/i2p/trunk/${PORTVERSION}/+download/ \
		https://googledrive.com/host/0B4jHEq5G7_EPWV9UeERwdGplZXc/${PORTVERSION}/
DISTNAME=	i2psource_${PORTVERSION}

MAINTAINER=	m.muenz@gmail.com
COMMENT=	Anonymizing network

LICENSE=	EULA

BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.a:math/gmp
LIB_DEPENDS=	libiconv.so:converters/libiconv

USES=		gettext tar:bz2

WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}

USES=		gettext tar:bzip2
USE_RC_SUBR=	i2p
USE_ANT=	yes
USE_JAVA=	yes

SUB_FILES=	wrapper.sh

PORTDATA=	*
PORTDOCS=	*
PLIST_FILES=	sbin/i2prouter

OPTIONS_DEFINE=	DOCS

DOCS_ALL_TARGET=	javadoc

post-patch:
# postinstall.sh SHOULD only do post installation house keeping
	@${REINPLACE_CMD} -E \

	${INSTALL_DATA} ${WRKSRC}/i2p.tar.bz2 ${STAGEDIR}${DATADIR}/
	${INSTALL_DATA} ${WRKSRC}/i2pupdate.zip ${STAGEDIR}${DATADIR}/
	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/sbin/i2prouter

do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/installer/resources/readme/readme*.html ${STAGEDIR}${DOCSDIR}
	@cd ${WRKSRC}/build/javadoc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)i2p-new/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1557365594	1	TIMESTAMP = 1586771166
2	SHA256 (i2psource_0.9.40.tar.bz2) = 5d31e0a324dfe429135ac17595b3cab3e81d85d4aa7a720db402dec47bfeda23	2	SHA256 (i2psource_0.9.45.tar.bz2) = e65c7dbbf464b6bc64afb228306fbfed0f1e67ffec74f96852b82acade53921c
3	SIZE (i2psource_0.9.40.tar.bz2) = 30808508	3	SIZE (i2psource_0.9.45.tar.bz2) = 31921025

Lines 1-11 Link Here

(-)i2p-new/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java (-11 lines)
1	--- apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/package-info.java.orig 2019-04-17 11:52:29.174848000 -0400
2	+++ apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/package-info.java 2019-04-17 11:55:57.085931000 -0400
3	@@ -13,7 +13,7 @@
4	* exception of <i>batching / multicall</i>. This feature is deliberately left
5	* out as it tends to confuse users (judging by posts in the JSON-RPC forum).
6	*
7	- * <p>See the <a href="http://www.jsonrpc.org/specification"></a>JSON-RPC 2.0
8	+ * <p>See the <a href="http://www.jsonrpc.org/specification">JSON-RPC 2.0
9	* specification</a> for more information or write to the
10	* <a href="https://groups.google.com/forum/#!forum/json-rpc">user group</a> if
11	* you have questions.




--- apps/i2pcontrol/java/org/mindrot/jbcrypt/BCrypt.java.orig	2019-04-17 11:58:51.939865000 -0400
+++ apps/i2pcontrol/java/org/mindrot/jbcrypt/BCrypt.java	2019-04-17 11:58:57.299331000 -0400
@@ -32,25 +32,25 @@
  * call the hashpw method with a random salt, like this:
  * <p>
  * <code>
- * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
  * </code>
  * <p>
  * To check whether a plaintext password matches one that has been
  * hashed previously, use the checkpw method:
  * <p>
  * <code>
- * if (BCrypt.checkpw(candidate_password, stored_hash))<br />
- * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");<br />
- * else<br />
- * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br />
+ * if (BCrypt.checkpw(candidate_password, stored_hash))
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");
+ * else
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");
  * </code>
  * <p>
  * The gensalt() method takes an optional parameter (log_rounds)
  * that determines the computational complexity of the hashing:
  * <p>
  * <code>
- * String strong_salt = BCrypt.gensalt(10)<br />
- * String stronger_salt = BCrypt.gensalt(12)<br />
+ * String strong_salt = BCrypt.gensalt(10)
+ * String stronger_salt = BCrypt.gensalt(12)
  * </code>
  * <p>
  * The amount of work increases exponentially (2**log_rounds), so 




--- apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java.orig	2018-06-26 11:12:11 UTC
+++ apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
@@ -8,6 +8,7 @@ import net.i2p.client.streaming.AcceptingChannel;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.client.streaming.RouterRestartException;
 
 /**
  * Bridge to allow accepting new connections
@@ -35,7 +36,7 @@ class I2PServerSocketFull implements I2PServerSocket {
      *         Not actually thrown through 0.9.16; thrown as of 0.9.17
      * @throws SocketTimeoutException if a timeout was previously set with setSoTimeout and the timeout has been reached.
      */
-    public I2PSocket accept() throws I2PException, ConnectException, SocketTimeoutException {
+    public I2PSocket accept() throws I2PException, RouterRestartException, ConnectException, SocketTimeoutException {
         return _socketManager.receiveSocket();
     }
 

Lines 1-11 Link Here

(-)i2p-new/files/patch-installer-resources-clients.config (-11 lines)
1	--- installer/resources/clients.config.orig 2014-07-28 20:53:18.000000000 +0200
2	+++ installer/resources/clients.config 2014-07-28 20:53:58.000000000 +0200
3	@@ -57,7 +57,7 @@
4	clientApp.4.name=Open Router Console in web browser at startup
5	clientApp.4.args=http://127.0.0.1:7657/
6	clientApp.4.delay=3
7	-clientApp.4.startOnLoad=true
8	+clientApp.4.startOnLoad=false
9
10	# BOB bridge
11	clientApp.5.args=

Lines 1-11 Link Here

(-)i2p-new/files/patch-installer-resources-postinstall.sh (-11 lines)
1	--- installer/resources/postinstall.sh.orig 2014-07-28 20:57:21.000000000 +0200
2	+++ installer/resources/postinstall.sh 2014-07-28 20:58:49.000000000 +0200
3	@@ -53,7 +53,7 @@
4	else
5	wrapperpath="./lib/wrapper/linux64"
6	# the 32bit libwrapper.so will be needed if a 32 bit jvm is used
7	- cp ./lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
8	+ cp ./lib/wrapper/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so
9	fi
10	cp ${wrapperpath}/libwrapper.so ./lib/
11	;;

Line 0 Link Here

(-)i2p-new/files/patch-installer_resources_postinstall.sh (+11 lines)
	1	--- installer/resources/postinstall.sh.orig 2020-02-24 17:37:40 UTC
	2	+++ installer/resources/postinstall.sh
	3	@@ -57,7 +57,7 @@ case $HOST_OS in
	4	else
	5	wrapperpath="./lib/wrapper/linux64"
	6	# the 32bit libwrapper.so will be needed if a 32 bit jvm is used
	7	- cp ./lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
	8	+ cp ./lib/wrapper/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so
	9	fi
	10	cp ${wrapperpath}/libwrapper.so ./lib/
	11	;;




[
{ type: install
  message: <<EOM

The wrapper and rc script are currently broken and under review,
so you have to install and run i2p in the following way:

- Install security/i2p port (which you might have now)
- As normal user run /usr/local/sbin/i2prouter install (root is not allowed)
  to extract all data into $HOME/i2p.
- Go to users home i2p/ and edit runplain.sh to map I2PTEMP to the same 
  directory as I2P
- Now you can start the process in I2P home directory with ./runplain.sh

You first have to walk through an initial setup via 

http://localhost:7657

Follow the instructions and map your browser to the configured ports.
You can also host hidden services and many more via the UI.

EOM
}
]

Return to bug 245656

Lines 2-19 Link Here

(-)i2p-new/Makefile (-20 / +5 lines)
2	# $FreeBSD: head/security/i2p/Makefile 529327 2020-03-28 11:26:58Z rene $	2	# $FreeBSD: head/security/i2p/Makefile 529327 2020-03-28 11:26:58Z rene $
3		3
4	PORTNAME= i2p	4	PORTNAME= i2p
5	DISTVERSION= 0.9.40	5	DISTVERSION= 0.9.45
6	CATEGORIES= security java net-p2p	6	CATEGORIES= security java net-p2p
7	MASTER_SITES= SF/${PORTNAME:tl}/${PORTVERSION} \	7	MASTER_SITES= http://download.i2p2.de/releases/${PORTVERSION}/
8	http://download.i2p2.no/releases/${PORTVERSION}/ \
9	http://download2.geti2p.com/${PORTVERSION}/ \
10	http://download.geti2p.com/${PORTVERSION}/ \
11	http://download.i2p2.de/releases/${PORTVERSION}/ \
12	https://launchpad.net/i2p/trunk/${PORTVERSION}/+download/ \
13	https://googledrive.com/host/0B4jHEq5G7_EPWV9UeERwdGplZXc/${PORTVERSION}/
14	DISTNAME= i2psource_${PORTVERSION}	8	DISTNAME= i2psource_${PORTVERSION}
15		9
16	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= m.muenz@gmail.com
17	COMMENT= Anonymizing network	11	COMMENT= Anonymizing network
18		12
19	LICENSE= EULA	13	LICENSE= EULA
Lines 28-36 Link Here
28	BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.a:math/gmp	22	BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.a:math/gmp
29	LIB_DEPENDS= libiconv.so:converters/libiconv	23	LIB_DEPENDS= libiconv.so:converters/libiconv
30		24
		25	USES= gettext tar:bz2
		26
31	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}	27	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
32		28
33	USES= gettext tar:bzip2
34	USE_RC_SUBR= i2p	29	USE_RC_SUBR= i2p
35	USE_ANT= yes	30	USE_ANT= yes
36	USE_JAVA= yes	31	USE_JAVA= yes
Lines 42-54 Link Here
42	SUB_FILES= wrapper.sh	37	SUB_FILES= wrapper.sh
43		38
44	PORTDATA= *	39	PORTDATA= *
45	PORTDOCS= *
46	PLIST_FILES= sbin/i2prouter	40	PLIST_FILES= sbin/i2prouter
47		41
48	OPTIONS_DEFINE= DOCS
49
50	DOCS_ALL_TARGET= javadoc
51
52	post-patch:	42	post-patch:
53	# postinstall.sh SHOULD only do post installation house keeping	43	# postinstall.sh SHOULD only do post installation house keeping
54	@${REINPLACE_CMD} -E \	44	@${REINPLACE_CMD} -E \
Lines 65-74 Link Here
65	${INSTALL_DATA} ${WRKSRC}/i2p.tar.bz2 ${STAGEDIR}${DATADIR}/	55	${INSTALL_DATA} ${WRKSRC}/i2p.tar.bz2 ${STAGEDIR}${DATADIR}/
66	${INSTALL_DATA} ${WRKSRC}/i2pupdate.zip ${STAGEDIR}${DATADIR}/	56	${INSTALL_DATA} ${WRKSRC}/i2pupdate.zip ${STAGEDIR}${DATADIR}/
67	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/sbin/i2prouter	57	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/sbin/i2prouter
68
69	do-install-DOCS-on:
70	@${MKDIR} ${STAGEDIR}${DOCSDIR}
71	${INSTALL_DATA} ${WRKSRC}/installer/resources/readme/readme*.html ${STAGEDIR}${DOCSDIR}
72	@cd ${WRKSRC}/build/javadoc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
73		58
74	.include <bsd.port.mk>	59	.include <bsd.port.mk>

Lines 1-35 Link Here

(-)i2p-new/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java (-35 lines)
1	--- apps/i2pcontrol/java/org/mindrot/jbcrypt/BCrypt.java.orig 2019-04-17 11:58:51.939865000 -0400
2	+++ apps/i2pcontrol/java/org/mindrot/jbcrypt/BCrypt.java 2019-04-17 11:58:57.299331000 -0400
3	@@ -32,25 +32,25 @@
4	* call the hashpw method with a random salt, like this:
5	* <p>
6	* <code>
7	- * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
8	+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
9	* </code>
10	* <p>
11	* To check whether a plaintext password matches one that has been
12	* hashed previously, use the checkpw method:
13	* <p>
14	* <code>
15	- * if (BCrypt.checkpw(candidate_password, stored_hash))<br />
16	- *     System.out.println("It matches");<br />
17	- * else<br />
18	- *     System.out.println("It does not match");<br />
19	+ * if (BCrypt.checkpw(candidate_password, stored_hash))
20	+ *     System.out.println("It matches");
21	+ * else
22	+ *     System.out.println("It does not match");
23	* </code>
24	* <p>
25	* The gensalt() method takes an optional parameter (log_rounds)
26	* that determines the computational complexity of the hashing:
27	* <p>
28	* <code>
29	- * String strong_salt = BCrypt.gensalt(10)<br />
30	- * String stronger_salt = BCrypt.gensalt(12)<br />
31	+ * String strong_salt = BCrypt.gensalt(10)
32	+ * String stronger_salt = BCrypt.gensalt(12)
33	* </code>
34	* <p>
35	* The amount of work increases exponentially (2**log_rounds), so

Lines 1-19 Link Here

(-)i2p-new/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java (-19 lines)
1	--- apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java.orig 2018-06-26 11:12:11 UTC
2	+++ apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
3	@@ -8,6 +8,7 @@ import net.i2p.client.streaming.AcceptingChannel;
4	import net.i2p.client.streaming.I2PServerSocket;
5	import net.i2p.client.streaming.I2PSocket;
6	import net.i2p.client.streaming.I2PSocketManager;
7	+import net.i2p.client.streaming.RouterRestartException;
8
9	/**
10	* Bridge to allow accepting new connections
11	@@ -35,7 +36,7 @@ class I2PServerSocketFull implements I2PServerSocket {
12	* Not actually thrown through 0.9.16; thrown as of 0.9.17
13	* @throws SocketTimeoutException if a timeout was previously set with setSoTimeout and the timeout has been reached.
14	*/
15	- public I2PSocket accept() throws I2PException, ConnectException, SocketTimeoutException {
16	+ public I2PSocket accept() throws I2PException, RouterRestartException, ConnectException, SocketTimeoutException {
17	return _socketManager.receiveSocket();
18	}
19

Line 0 Link Here

(-)i2p-new/pkg-message (+24 lines)
	1	[
	2	{ type: install
	3	message: <<EOM
	4
	5	The wrapper and rc script are currently broken and under review,
	6	so you have to install and run i2p in the following way:
	7
	8	- Install security/i2p port (which you might have now)
	9	- As normal user run /usr/local/sbin/i2prouter install (root is not allowed)
	10	to extract all data into $HOME/i2p.
	11	- Go to users home i2p/ and edit runplain.sh to map I2PTEMP to the same
	12	directory as I2P
	13	- Now you can start the process in I2P home directory with ./runplain.sh
	14
	15	You first have to walk through an initial setup via
	16
	17	http://localhost:7657
	18
	19	Follow the instructions and map your browser to the configured ports.
	20	You can also host hidden services and many more via the UI.
	21
	22	EOM
	23	}
	24	]