From owner-svn-ports-all@FreeBSD.ORG Sat Mar 8 00:00:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4CC84EC; Sat, 8 Mar 2014 00:00:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3853CEB5; Sat, 8 Mar 2014 00:00:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2800DwT019126; Sat, 8 Mar 2014 00:00:13 GMT (envelope-from lioux@svn.freebsd.org) Received: (from lioux@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2800Csk019121; Sat, 8 Mar 2014 00:00:12 GMT (envelope-from lioux@svn.freebsd.org) Message-Id: <201403080000.s2800Csk019121@svn.freebsd.org> From: Mario Sergio Fujikawa Ferreira Date: Sat, 8 Mar 2014 00:00:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347431 - in head: net-p2p/i2p security/i2p security/i2p/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Mar 2014 00:00:13 -0000 Author: lioux Date: Sat Mar 8 00:00:11 2014 New Revision: 347431 URL: http://svnweb.freebsd.org/changeset/ports/347431 QAT: https://qat.redports.org/buildarchive/r347431/ Log: - Change net-p2p/i2p primary category to security. Therefore, move net-p2p/i2p to security/i2p. Following security/tor example. Keep net-p2p as secondary category since i2p provides p2p services. - Update security/i2p to 0.9.11 Approved by: bdrewery (mentor) Added: head/security/i2p/ - copied from r347429, head/net-p2p/i2p/ head/security/i2p/files/patch-installer__resources__postinstall.sh (contents, props changed) Deleted: head/net-p2p/i2p/ Modified: head/security/i2p/Makefile head/security/i2p/distinfo head/security/i2p/files/patch-installer__resources__clients.config head/security/i2p/pkg-descr Modified: head/security/i2p/Makefile ============================================================================== --- head/net-p2p/i2p/Makefile Fri Mar 7 22:34:55 2014 (r347429) +++ head/security/i2p/Makefile Sat Mar 8 00:00:11 2014 (r347431) @@ -2,95 +2,104 @@ # $FreeBSD$ PORTNAME= i2p -PORTVERSION= 0.8.7 -CATEGORIES= net-p2p java security -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}:i2p \ - http://mirror.i2p2.de/:i2p \ - http://dist.codehaus.org/jetty/jetty-5.1.x/:jetty -DISTFILES= \ - i2psource_${PORTVERSION}${EXTRACT_SUFX}:i2p \ - ${JETTY_DISTFILE}:jetty -EXTRACT_ONLY= i2psource_${PORTVERSION}${EXTRACT_SUFX} +PORTVERSION= 0.9.11 +CATEGORIES= security java net-p2p +MASTER_SITES= http://download.i2p2.no/releases/${PORTVERSION}/ \ + http://download2.geti2p.com/${PORTVERSION}/ \ + http://download.geti2p.com/${PORTVERSION}/ \ + http://download.i2p2.de/releases/${PORTVERSION}/ \ + https://dl.dropboxusercontent.com/u/18621288/I2P/${PORTVERSION}/ \ + https://launchpad.net/i2p/trunk/${PORTVERSION}/+download/ \ + https://googledrive.com/host/0B4jHEq5G7_EPWV9UeERwdGplZXc/${PORTVERSION}/ +DISTFILES= i2psource_${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= An anonymizing network -LICENSE= APACHE20 EULA -LICENSE_COMB= multi +LICENSE= EULA +LICENSE_NAME= End User License Agreement +LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_DISTFILES= i2psource_${PORTVERSION}${EXTRACT_SUFX} -BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/gmp \ - msgfmt:${PORTSDIR}/devel/gettext +BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/gmp RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -LICENSE_NAME_EULA= End User License Agreement -LICENSE_PERMS_EULA= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LICENSE_FILE_EULA= ${WRKSRC}/LICENSE.txt -LICENSE_DISTFILES_ASL= ${JETTY_DISTFILE} -LICENSE_DISTFILES_EULA= i2psource_${PORTVERSION}${EXTRACT_SUFX} +ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS_REASON= i2p libwrapper.so library binary only available for i386 and amd64 +OPTIONS_DEFINE= DOCS + +USES= gettext iconv USE_BZIP2= yes USE_RC_SUBR= i2p -JAVA_BUILD= jdk +USE_ANT= yes USE_JAVA= yes +JAVA_BUILD= jdk JAVA_VERSION= 1.6+ -USE_ANT= yes ALL_TARGET= \ updater \ tarball -.ifndef(NOPORTDOCS) -ALL_TARGET+= javadoc -.endif +PORTDATA= * -JAVADOC_WRKSRC= ${WRKSRC}/build/javadoc +PLIST_FILES= \ + sbin/i2prouter -.ifndef(NOPORTDOCS) -PORTDOCS= * -.endif +SUB_FILES= wrapper.sh -PLIST_DIRS= \ - %%DATADIR%% -PLIST_FILES= \ - sbin/i2prouter \ - %%DATADIR%%/i2p.tar.bz2 \ - %%DATADIR%%/i2pupdate.zip +.include -JETTY_DISTFILE= jetty-5.1.15.tgz +.if ${PORT_OPTIONS:MDOCS} +ALL_TARGET+= javadoc -SUB_FILES= wrapper.sh +PORTDOCS= * -NO_STAGE= yes -post-extract: - @${MKDIR} ${WRKSRC}/apps/jetty/ - @${CP} -f ${DISTDIR}/${JETTY_DISTFILE} ${WRKSRC}/apps/jetty/ +JAVADOC_WRKSRC= ${WRKSRC}/build/javadoc +.endif + +.include + +# Only works with converters/iconv port due to binary dependency: +# source code isn't available at this moment +.if ${OSVERSION} >= 1000043 +IGNORE= libwrapper.so binary depends on converters/iconv port.\ + Therefore, it's not compatible with FreeBSD 10.x and above. Check\ + entry 20130904 on ${PORTSDIR}/UPDATING +.endif post-patch: # postinstall.sh SHOULD only do post installation house keeping @${REINPLACE_CMD} -E \ -e 's|./i2prouter[[:space:]]+start||' \ ${WRKSRC}/installer/resources/postinstall.sh + @${REINPLACE_CMD} -E \ + -e 's|%INSTALL_PATH|$${HOME}/i2p|' \ + -e 's|%USER_HOME|$${HOME}|' \ + ${WRKSRC}/installer/resources/i2prouter \ + ${WRKSRC}/installer/resources/runplain.sh do-install: - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} # install @${INSTALL_DATA} ${WRKSRC}/i2p.tar.bz2 \ - ${DATADIR}/ + ${STAGEDIR}${DATADIR}/ # update @${INSTALL_DATA} ${WRKSRC}/i2pupdate.zip \ - ${DATADIR}/ + ${STAGEDIR}${DATADIR}/ # wrapper @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \ - ${PREFIX}/sbin/i2prouter + ${STAGEDIR}${PREFIX}/sbin/i2prouter # doc -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/installer/resources/readme/readme*.html ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/installer/resources/readme/readme*.html ${STAGEDIR}${DOCSDIR} # line taken from textproc/xerces-j maintained by hq@FreeBSD.org @cd ${JAVADOC_WRKSRC} && \ - ${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \ - ${FIND} * -not -type d -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \; + ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \ + ${FIND} * -not -type d -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DOCSDIR}/{}" \; .endif -.include +.include Modified: head/security/i2p/distinfo ============================================================================== --- head/net-p2p/i2p/distinfo Fri Mar 7 22:34:55 2014 (r347429) +++ head/security/i2p/distinfo Sat Mar 8 00:00:11 2014 (r347431) @@ -1,4 +1,2 @@ -SHA256 (i2psource_0.8.7.tar.bz2) = 31acef3fcd1a5839edc3b931f108944222c833d218bd427fe89a57b4acd92ece -SIZE (i2psource_0.8.7.tar.bz2) = 18473515 -SHA256 (jetty-5.1.15.tgz) = c866bfe7715941e343e66bd5d6696a743b9c0811ef9763848eb673070f4a53d6 -SIZE (jetty-5.1.15.tgz) = 11063548 +SHA256 (i2psource_0.9.11.tar.bz2) = 50b18c6e012cae1f05295b54ec88ab71c56b8ebf8b9267242bab37f918b80166 +SIZE (i2psource_0.9.11.tar.bz2) = 22618918 Modified: head/security/i2p/files/patch-installer__resources__clients.config ============================================================================== --- head/net-p2p/i2p/files/patch-installer__resources__clients.config Fri Mar 7 22:34:55 2014 (r347429) +++ head/security/i2p/files/patch-installer__resources__clients.config Sat Mar 8 00:00:11 2014 (r347431) @@ -1,8 +1,8 @@ ---- ./installer/resources/clients.config.orig 2009-05-31 20:15:45.000000000 -0300 -+++ ./installer/resources/clients.config 2009-05-31 20:16:20.000000000 -0300 -@@ -36,7 +36,7 @@ +--- installer/resources/clients.config.orig 2014-02-13 23:18:57.000000000 -0200 ++++ installer/resources/clients.config 2014-02-13 23:19:16.000000000 -0200 +@@ -57,7 +57,7 @@ clientApp.4.name=Open Router Console in web browser at startup - clientApp.4.args=http://127.0.0.1:7657/index.jsp + clientApp.4.args=http://127.0.0.1:7657/ clientApp.4.delay=3 -clientApp.4.startOnLoad=true +clientApp.4.startOnLoad=false Added: head/security/i2p/files/patch-installer__resources__postinstall.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/i2p/files/patch-installer__resources__postinstall.sh Sat Mar 8 00:00:11 2014 (r347431) @@ -0,0 +1,11 @@ +--- installer/resources/postinstall.sh.orig 2014-02-14 00:08:38.000000000 -0200 ++++ installer/resources/postinstall.sh 2014-02-14 00:08:49.000000000 -0200 +@@ -72,7 +72,7 @@ + wrapperpath="./lib/wrapper/freebsd64" + cp ${wrapperpath}/libwrapper.so ./lib/ + # the 32bit libwrapper.so will be needed if a 32 bit jvm is used +- cp ./lib/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so ++ cp ./lib/wrapper/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so + fi + ;; + osx ) Modified: head/security/i2p/pkg-descr ============================================================================== --- head/net-p2p/i2p/pkg-descr Fri Mar 7 22:34:55 2014 (r347429) +++ head/security/i2p/pkg-descr Sat Mar 8 00:00:11 2014 (r347431) @@ -1,19 +1,16 @@ [ excerpt from developer's web site ] -I2P is an anonymizing network, offering a simple layer that -identity-sensitive applications can use to securely communicate. -All data is wrapped with several layers of encryption, and the -network is both distributed and dynamic, with no trusted parties. +I2P is an anonymous overlay network - a network within a network. +It is intended to protect communication from dragnet surveillance +and monitoring by third parties such as ISPs. -Many applications are available that interface with I2P, including -mail, peer-peer, IRC chat, and others. +I2P is used by many people who care about their privacy: activists, +oppressed people, journalists and whistleblowers, as well as the +average person. -Anonymity is not a boolean - we are not trying to make something -"perfectly anonymous", but instead are working at making attacks -more and more expensive to mount. I2P alone is what could be called -a "low latency mix network", and there are limits to the anonymity -offered by such a system, but the applications on top of I2P, such -as Syndie, I2P mail, and I2PSnark extend it to offer both additional -functionality and protection. +No network can be "perfectly anonymous". The continued goal of I2P +is to make attacks more and more difficult to mount. Its anonymity +will get stronger as the size of the network increases and with +ongoing academic review. -WWW: http://www.i2p2.de/ +WWW: http://geti2p.net/