From: Thomas Sachau Date: Sun, 17 Mar 2019 13:09:57 +0000 (+0100) Subject: net-p2p/freenet: Version bump X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a8920b39da93922d27ae9cef808bf50c089da543;p=gentoo.git net-p2p/freenet: Version bump Package-Manager: Portage-2.3.62, Repoman-2.3.12 RepoMan-Options: --force Signed-off-by: Thomas Sachau --- diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest index f79179c52659..f1f51c4439ba 100644 --- a/net-p2p/freenet/Manifest +++ b/net-p2p/freenet/Manifest @@ -1,5 +1,6 @@ DIST freenet-0.7.5_p1478.zip 5082260 BLAKE2B 4f08b5eff361b0666647f67152fb9709d35ca6c5996a0ac1e899de16510d2f25afb89c8af150a4f9d0785da25ff5db2e80fc2e851e0c42c763b72952d456bde1 SHA512 4147ef68e9c61a7d90c378cd9a3896933c4b931c31caf95107d1e188b4bf51d187381200d262fc1adaf939be7b0ea0eec9f795a09c897c1d20765325ac5faf03 DIST freenet-0.7.5_p1480.zip 5099654 BLAKE2B cdbe32e90f61f664c0aff8dea81a68a46ced7ba5aef3068243d99a1b189597dfc4126c6e83c0fd4de547d6d076939c601ed3d3f8ec4fa6d4a5dd5d6ef5322069 SHA512 8e6c11014554cba0591f5f98a6af22660643a2d62c46fb003ec16d1dd3643178300081bef78083d87608c012f232f46f71fdd201d031248bf28e91899f71547e +DIST freenet-0.7.5_p1483.zip 5548445 BLAKE2B 275e9d86d5d2aff94c227d774ce8853a0aeefb8963d6365f684e5e9b07ee4ba3779908d35e0b2ca92fc980c4199a1d29be73cce476c9e3d2f237734e4f9a35e7 SHA512 6c959c0ece7faaa07cd3c228cd2de7c15063ccd30f91b45b180d4d79e0060c5c156470d03eb421418ccd207931f9737e1a63b8be639b348cb0d15dacca89e4cc DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408 DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497 DIST seednodes-20160521.fref.bz2 13751 BLAKE2B f464eb99fcefd690867246b1a77175230ac1cc9e037f3dc465d56ad70d293df78f990cfd75e6be64c26d77f2bc7bfa0bbdedd9d1720a4afa658ed3c381139eb1 SHA512 3530ac6bf9de886930bb403c2d2ec27102d5dc6904582ee69987e369dbfaf7170aadbc02b95836ff43fef2531fb06087a494b426662cd5529c87316590fd2686 diff --git a/net-p2p/freenet/files/0.7.5_p1483-ext.patch b/net-p2p/freenet/files/0.7.5_p1483-ext.patch new file mode 100644 index 000000000000..5b778dd619f4 --- /dev/null +++ b/net-p2p/freenet/files/0.7.5_p1483-ext.patch @@ -0,0 +1,22 @@ +--- src/freenet/node/NodeStarter.java 2019-03-17 12:44:12.000000000 +0100 ++++ src/freenet/node/NodeStarter.java.new 2019-03-17 12:58:51.000000000 +0100 +@@ -51,8 +51,8 @@ + public static final String extRevisionNumber; + + static { +- extBuildNumber = ExtVersion.extBuildNumber(); +- extRevisionNumber = ExtVersion.extRevisionNumber(); ++ extBuildNumber = 29; ++ extRevisionNumber = ""; + } + + private FreenetFilePersistentConfig cfg; +@@ -109,7 +109,7 @@ + System.out.println("Usage: $ java freenet.node.Node "); + return Integer.valueOf(-1); + } +- String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + ExtVersion.buildNumber + " r" + ExtVersion.cvsRevision+" running with ext build "+extBuildNumber+" r" + extRevisionNumber; ++ String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber +" running with ext build "+extBuildNumber; + Logger.normal(this, builtWithMessage); + System.out.println(builtWithMessage); + diff --git a/net-p2p/freenet/files/build-clean.xml b/net-p2p/freenet/files/build-clean.xml new file mode 100644 index 000000000000..89698df2675f --- /dev/null +++ b/net-p2p/freenet/files/build-clean.xml @@ -0,0 +1,421 @@ + + + +Freenet is free software that lets you publish and retrieve information without +fear of censorship. To achieve this, the network is entirely decentralized, and +all actions are anonymous. Without anonymity, there can never be true freedom +of speech, and without decentralization the network would be vulnerable to attack. + +This file is to build Freenet entirely from source. The builder is responsible +for satisfying all library dependencies, e.g. via override.properties. Package +maintainers may prefer to use this instead of build.xml. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/net-p2p/freenet/files/build.properties b/net-p2p/freenet/files/build.properties new file mode 100644 index 000000000000..21fecf30c803 --- /dev/null +++ b/net-p2p/freenet/files/build.properties @@ -0,0 +1,95 @@ +## +# Properties you can set to affect the build process. +# +# This file contains default values that are checked-in to version control. +# +# End users should not edit this file to set machine-specific properties; +# instead, create a new file called override.properties and set them there. +# + +################################################################################ +## build files/directories + +main.src=src +main.make=build/main +main.dst=dist + +test.src=test +test.make=build/test +test.dst=run + +doc.src=doc +doc.dst=javadoc +doc.api=javadoc + +################################################################################ +## external dependencies + +# dir for common library jars +lib.dir = lib + +# dir for freenet library jars (aka freenet-ext or "contrib" jars) +lib.contrib.dir = lib/freenet +## if you use the git submodule in ./contrib (legacy-27 branch) +## by running `git submodule init && git submodule update` +## contrib.ant is needed for the old legacy layout +#lib.contrib.dir = contrib/freenet_ext +#contrib.ant = ${lib.contrib.dir}/build.xml +## if you clone the contrib package separately (master branch) +#lib.contrib.dir = ../contrib/freenet-ext/dist + +# dir that freenet library jars will be installed to, relative to freenet.jar +lib.contrib.dir.rel = freenet + +# jars from ${lib.dir} to use +bc.jar = bcprov-jdk15on-154.jar +lib.jars = ${bc.jar} +#lib.jars = wrapper.jar db-je.jar bdb-je.jar commons-compress.jar + +# jars from ${lib.dir} to use, for tests +libtest.jars = junit4.jar hamcrest-core.jar + +# jars from ${lib.contrib.dir} to use +lib.contrib.jars = freenet-ext.jar bitcollider-core.jar db4o.jar lzmajio.jar mantissa.jar \ + wrapper.jar db-je.jar bdb-je.jar commons-compress.jar + +# jars from ${lib.dir} to use, for compiling GWT javascript +gjs.lib.jars = null +#gjs.lib.jars = gwt-dev-linux.jar gwt-dev-windows.jar gwt-dev.jar gwt-user.jar \ +# commons-collections3.jar ant.jar eclipse-ecj.jar + +findbugs.dir = findbugs +findbugs.path = ${findbugs.dir}/lib/findbugs-ant.jar + +pmd.dir = +################################################################################ +## build tool options + +# Javac +javac.args=-Xlint -Xlint:-deprecation + +# Test properties +test.skip=false +test.verbose=false +test.benchmark=false +test.extensive=false +test.xml_output=true +test.haltonfailure=yes + +# select a single test to run +#test.class= + +# Build javadoc +doc.skip=false + +# Run findbugs +findbugs.skip=false +pmd.skip=false +cpd.skip=false + +################################################################################ +## misc options + +# Hack around property expansion not featured in ant <= 1.7.1 +# see http://ant.apache.org/manual/properties.html#if+unless +true=true diff --git a/net-p2p/freenet/freenet-0.7.5_p1483.ebuild b/net-p2p/freenet/freenet-0.7.5_p1483.ebuild new file mode 100644 index 000000000000..104ad58ab195 --- /dev/null +++ b/net-p2p/freenet/freenet-0.7.5_p1483.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DATE=20160521 +JAVA_PKG_IUSE="doc source" + +inherit eutils java-pkg-2 java-ant-2 multilib systemd user + +DESCRIPTION="An encrypted network without censorship" +HOMEPAGE="https://freenetproject.org/" +# https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip +SRC_URI=" + https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip + https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip + mirror://gentoo/freenet-ant-1.7.1.jar" + +LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +CDEPEND="dev-java/bcprov:1.54 + dev-java/commons-compress:0 + dev-java/fec:0 + dev-java/java-service-wrapper:0 + dev-java/jbitcollider-core:0 + dev-java/jna:0 + dev-java/lzma:0 + dev-java/lzmajio:0 + dev-java/mersennetwister:0" + +DEPEND=" + app-arch/unzip + >=virtual/jdk-1.7 + ${CDEPEND} + test? ( + dev-java/junit:0 + dev-java/ant-junit:0 + ) + dev-java/ant-core:0" + +RDEPEND=" + >=virtual/jre-1.7 + net-libs/nativebiginteger:0 + ${CDEPEND}" + +PDEPEND="net-libs/NativeThread:0" + +JAVA_PKG_BSFIX_NAME+=" build-clean.xml" +JAVA_ANT_REWRITE_CLASSPATH="yes" +JAVA_ANT_CLASSPATH_TAGS+=" javadoc" +JAVA_ANT_ENCODING="utf8" + +EANT_BUILD_TARGET="package" +EANT_TEST_TARGET="unit" +EANT_BUILD_XML="build-clean.xml" +EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna,lzma,lzmajio,mersennetwister" +EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true" + +S="${WORKDIR}/fred-build0${PV#*p}" + +RESTRICT="test" # they're broken in the last release. + +MY_PATCHES=( + "${FILESDIR}"/0.7.5_p1483-ext.patch + "${FILESDIR}/"0.7.5_p1475-remove-git.patch +) + +pkg_setup() { + has_version dev-java/icedtea[cacao] && { + ewarn "dev-java/icedtea was built with cacao USE flag." + ewarn "freenet may compile with it, but it will refuse to run." + ewarn "Please remerge dev-java/icedtea without cacao USE flag," + ewarn "if you plan to use it for running freenet." + } + java-pkg-2_pkg_setup + enewgroup freenet + enewuser freenet -1 -1 /var/freenet freenet +} + +src_unpack() { +# unpack ${P}.zip seednodes-${PV}.zip + unpack ${P}.zip seednodes-0.7.5_p1480.zip +} + +src_prepare() { +# cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref + cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref + cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die + cp "${FILESDIR}"/run.sh-20090501 run.sh || die + cp "${FILESDIR}"/build-clean.xml build-clean.xml || die + cp "${FILESDIR}"/build.properties build.properties || die + + epatch "${MY_PATCHES[@]}" + + sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \ + freenet-wrapper.conf || die "sed failed" + + echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die + + local i=2 pkg jars jar + local ifs_original=${IFS} + IFS="," + for pkg in ${EANT_GENTOO_CLASSPATH} ; do + jars="$(java-pkg_getjars ${pkg})" + for jar in ${jars} ; do + echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die + done + done + IFS=${ifs_original} + echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die + + cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die + eapply_user +} + +EANT_TEST_EXTRA_ARGS="-Dtest.skip=false" + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_dojar dist/freenet.jar + java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar + + if has_version =sys-apps/baselayout-2*; then + doinitd "${FILESDIR}"/freenet + else + newinitd "${FILESDIR}"/freenet.old freenet + fi + + systemd_dounit "${FILESDIR}"/freenet.service + + dodoc AUTHORS + newdoc README.md README + insinto /etc + doins freenet-wrapper.conf + insinto /var/freenet + doins run.sh seednodes.fref + fperms +x /var/freenet/run.sh + dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so + use doc && java-pkg_dojavadoc javadoc + use source && java-pkg_dosrc src +} + +pkg_postinst() { + elog " " + elog "1. Start freenet with /etc/init.d/freenet start." + elog "2. Open localhost:8888 in your browser for the web interface." + #workaround for previously existing freenet user + [[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \ + freenet:freenet /var/freenet +} + +pkg_postrm() { + if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then + elog " " + elog "If you dont want to use freenet any more" + elog "and dont want to keep your identity/other stuff" + elog "remember to do 'rm -rf /var/freenet' to remove everything" + fi +}