* [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/, net-p2p/freenet/files/
@ 2019-03-17 13:10 Thomas Sachau
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Sachau @ 2019-03-17 13:10 UTC (permalink / raw
To: gentoo-commits
commit: a8920b39da93922d27ae9cef808bf50c089da543
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 13:09:57 2019 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 13:10:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8920b39
net-p2p/freenet: Version bump
Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --force
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
net-p2p/freenet/Manifest | 1 +
net-p2p/freenet/files/0.7.5_p1483-ext.patch | 22 ++
net-p2p/freenet/files/build-clean.xml | 421 ++++++++++++++++++++++++++++
net-p2p/freenet/files/build.properties | 95 +++++++
net-p2p/freenet/freenet-0.7.5_p1483.ebuild | 165 +++++++++++
5 files changed, 704 insertions(+)
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index f79179c5265..f1f51c4439b 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 00000000000..5b778dd619f
--- /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 <configFile>");
+ 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 00000000000..89698df2675
--- /dev/null
+++ b/net-p2p/freenet/files/build-clean.xml
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="freenet" default="package" basedir=".">
+ <description>
+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.
+ </description>
+
+ <!-- =================================================================== -->
+ <!-- Global properties -->
+ <!-- =================================================================== -->
+
+ <!-- user overrides (properties are immutable, so set overrides first) -->
+ <property file="override.properties"/>
+ <property file="build.properties"/>
+ <property file="dependencies.properties"/>
+
+ <property name="version.src" value="freenet/node/Version.java" />
+ <property name="version.make" value="freenet/node/Version.class" />
+
+ <path id="lib.path">
+ <fileset dir="${lib.contrib.dir}" includes="${lib.contrib.jars}"/>
+ <fileset dir="${lib.dir}" includes="${lib.jars}"/>
+ <fileset dir="/usr/share/java" includes="${lib.jars}" erroronmissingdir="false"/>
+ </path>
+ <path id="libtest.path">
+ <path refid="lib.path"/>
+ <fileset dir="${lib.dir}" includes="${libtest.jars}"/>
+ <fileset dir="/usr/share/java" includes="${libtest.jars}" erroronmissingdir="false"/>
+ <pathelement path="${main.make}"/>
+ <pathelement path="${test.make}"/>
+ </path>
+
+ <property name="gjs.dst" value="${main.src}/freenet/clients/http/staticfiles/freenetjs"/>
+ <property name="gjs.dir" value="generator/js"/>
+ <path id="gjs.lib.path">
+ <fileset dir="${gjs.dir}" includes="lib/*.jar"/>
+ <pathelement location="${gjs.dir}/war/WEB-INF/classes"/>
+ <fileset dir="${lib.dir}" includes="${gjs.lib.jars}"/>
+ </path>
+
+ <path id="pmd.classpath">
+ <fileset dir="${pmd.dir}" erroronmissingdir="false" includes="lib/*.jar"/>
+ </path>
+
+ <property environment="env"/>
+ <property name="keystore" value="${env.jarsignerStoreLocation}"/>
+ <property name="keystore_alias" value="${env.jarsignerAlias}"/>
+ <property name="keystore_pass" value="${env.jarsignerStorePassword}"/>
+ <property name="key_pass" value="${env.jarsignerCodeSigningKeyPassword}"/>
+
+ <property name="jar.dst" value="${main.dst}/freenet.jar"/>
+
+ <assertions><enable/></assertions>
+
+ <!-- set version string based on git-describe -->
+ <exec executable="git" failifexecutionfails="false"
+ errorProperty="git.errror" outputproperty="git.describe" resultproperty="git.result">
+ <arg value="describe" />
+ <arg value="--always" />
+ <arg value="--abbrev=4" />
+ <arg value="--dirty" />
+ </exec>
+ <condition property="git.revision" value="${git.describe}" else="@unknown@">
+ <and>
+ <equals arg1="${git.result}" arg2="0" />
+ <isset property="git.describe" />
+ </and>
+ </condition>
+
+ <!-- =================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- =================================================================== -->
+
+ <target name="dist" depends="clean-all, all" description="clean-build everything"/>
+
+ <target name="sign" description="Sign the distribution" depends="package">
+ <echo message="Signing the distribution"/>
+ <signjar jar="${jar.dst}" strict="false" tsaurl="http://timestamp.comodoca.com/rfc3161" alias="${keystore_alias}" keystore="${keystore}" storepass="${keystore_pass}" keypass="${key_pass}" sigalg="SHA256withRSA" digestalg="SHA-256"/>
+ <!-- TODO: Should have strict="true", but it was introduced in Java 7, which we cannot yet require. -->
+ <verifyjar jar="${jar.dst}" alias="${keystore_alias}" keystore="${keystore}" storepass="${keystore_pass}" keypass="${key_pass}"/>
+ </target>
+
+ <target name="all" depends="package, doc, findbugs, pmd, cpd" description="build everything, incl. docs, GWT js"/>
+
+ <target name="clean-all" depends="clean, clean-doc, clean-gjs" description="clean all build products, incl. docs, GWT js"/>
+
+ <target name="help" description="display help on parameters">
+ <echo message="For main build targets, see `ant -p`"/>
+ <echo message=""/>
+ <echo message="Test parameters (-Dtest.PARAM=true)"/>
+ <echo message=" skip Skip all tests"/>
+ <echo message=" verbose Report additional information"/>
+ <echo message=" benchmark Run benchmark tests"/>
+ <echo message=" extensive Run extensive tests"/>
+ <echo message=""/>
+ <echo message="Misc parameters (-DPARAM=VALUE)"/>
+ <echo message=" javac.args Command line arguments to pass to javac"/>
+ <echo message=""/>
+ </target>
+
+ <target name="findbugs" depends="package" unless="${findbugs.skip}">
+ <antcall target="libdep-findbugs"/>
+ <echo message="Running Findbugs"/>
+ <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.path}"/>
+
+ <findbugs home="${findbugs.dir}"
+ output="xml"
+ outputFile="${test.dst}/findbugs.xml"
+ warningsProperty="findbugs.module.warnings"
+ failOnError="true"
+ jvmargs="-Xmx1536m -XX:MaxPermSize=384m -XX:ReservedCodeCacheSize=128m" >
+ <auxClasspath refid="lib.path" />
+ <sourcePath path="${main.src}" />
+ <class location="${jar.dst}" />
+ </findbugs>
+ </target>
+
+ <target name="pmd" depends="package" unless="${pmd.skip}">
+ <antcall target="libdep-pmd"/>
+ <echo message="Running PMD"/>
+ <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
+ <pmd rulesetfiles="rulesets/java/design.xml" encoding="utf-8">
+ <formatter type="xml" toFile="${test.dst}/pmd.xml"/>
+ <fileset dir="${main.src}">
+ <include name="**/*.java"/>
+ </fileset>
+ </pmd>
+ </target>
+
+ <target name="cpd" depends="package" unless="${cpd.skip}">
+ <antcall target="libdep-cpd"/>
+ <echo message="Running CPD"/>
+ <taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask" classpathref="pmd.classpath"/>
+ <cpd minimumTokenCount="100" format="xml" outputFile="${test.dst}/cpd.xml">
+ <fileset dir="${main.src}">
+ <include name="**/*.java"/>
+ </fileset>
+ </cpd>
+ </target>
+
+ <target name="debug">
+ <echoproperties/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Library dependencies -->
+ <!-- =================================================================== -->
+
+ <!--
+ currently we only check for the most common cases of missing libraries.
+ this does result in less clear error messages for more obscure setups, e.g.
+ if you have debian's gwt-dev.jar but not commons-collections3.jar. however,
+ to cover all scenarios would be a pain.
+ -->
+
+ <target name="env">
+ <available property="lib.contrib.present" classname="freenet.node.ExtVersion" classpathref="lib.path"/>
+ <available property="lib.bouncycastle.present" classname="org.bouncycastle.crypto.signers.HMacDSAKCalculator" classpathref="lib.path"/>
+ <available property="lib.junit.present" classname="org.junit.runners.JUnit4" classpathref="libtest.path"/>
+ <available property="lib.hamcrest.present" classname="org.hamcrest.SelfDescribing" classpathref="libtest.path"/>
+ <available property="lib.findbugs.present" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.path}"/>
+ <available property="lib.pmd.present" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
+ <available property="lib.cpd.present" classname="net.sourceforge.pmd.cpd.CPDTask" classpathref="pmd.classpath"/>
+ <available property="gjs.lib.gwt-user.present" classname="com.google.gwt.user.client.Window" classpathref="gjs.lib.path"/>
+ <available property="gjs.lib.gwt-dev.present" classname="com.google.gwt.dev.About" classpathref="gjs.lib.path"/>
+ <condition property="gjs.lib.gwt.present">
+ <and>
+ <isset property="gjs.lib.gwt-user.present"/>
+ <isset property="gjs.lib.gwt-dev.present"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="libdep-ext" depends="env" unless="lib.contrib.present">
+ <fail message="freenet-ext not available"/>
+ </target>
+
+ <target name="libdep-bc" depends="env" unless="lib.bouncycastle.present">
+ <fail message="Bouncycastle not available (or not recent enough); try https://www.bouncycastle.org/download/${bc.jar}"/>
+ </target>
+
+ <target name="libdep-junit" depends="env" unless="lib.junit.present">
+ <fail message="JUnit4 not available"/>
+ </target>
+
+ <target name="libdep-hamcrest" depends="env" unless="lib.hamcrest.present">
+ <fail message="Hamcrest-core not available"/>
+ </target>
+
+ <target name="libdep-findbugs" depends="env" unless="lib.findbugs.present">
+ <fail message="findbugs not available"/>
+ </target>
+
+ <target name="libdep-pmd" depends="env" unless="lib.pmd.present">
+ <fail message="PMD not available"/>
+ </target>
+
+ <target name="libdep-cpd" depends="env" unless="lib.cpd.present">
+ <fail message="CPD not available"/>
+ </target>
+
+ <target name="libdep-gwt-user" depends="env" unless="gjs.lib.gwt-user.present">
+ <fail message="GWT-user not present"/>
+ </target>
+
+ <target name="libdep-gwt-dev" depends="env" unless="gjs.lib.gwt-dev.present">
+ <fail message="GWT-dev not present"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Standard build -->
+ <!-- =================================================================== -->
+
+ <target name="init">
+ <mkdir dir="${main.make}"/>
+ <mkdir dir="${main.dst}"/>
+ <mkdir dir="${test.make}"/>
+ <mkdir dir="${test.dst}"/>
+ </target>
+
+ <target name="dep" depends="ensure-ext, ensure-bc, ensure-gjs"/>
+
+ <target name="check-version-file">
+ <uptodate property="version.uptodate"
+ targetfile="${main.make}/${version.src}"
+ srcfile="${main.src}/${version.src}"/>
+ </target>
+
+ <target name="build-version-file" depends="check-version-file" unless="version.uptodate">
+ <!-- Create the Version file with patched revision number in ${main.make} -->
+ <copy file="${main.src}/${version.src}" tofile="${main.make}/${version.src}" overwrite="true" />
+ <delete file="${main.make}/${version.make}" quiet="true" />
+ <replace file="${main.make}/${version.src}">
+ <replacefilter token="@custom@" value="${git.revision}"/>
+ </replace>
+ <echo message="Updated build version to ${git.revision} in ${main.make}/${version.src}"/>
+ </target>
+
+ <target name="build" depends="init, dep, build-version-file">
+ <!-- Create the time stamp -->
+ <tstamp/>
+ <!-- Create the build directory structure used by compile -->
+ <javac srcdir="${main.src}" destdir="${main.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
+ <compilerarg line="${javac.args}"/>
+ <classpath refid="lib.path"/>
+ <!-- tell javac to find Version.java in ${main.make}, not ${main.src} -->
+ <sourcepath><pathelement path="${main.make}"/></sourcepath>
+ <!-- following a very temporary list of files to be build -->
+ <include name="**/*.java"/>
+ <exclude name="**/package-info.java"/>
+ <exclude name="${version.src}"/>
+ </javac>
+
+ <!-- Force compile of Version.java in case compile of ${main.src} didn't trigger it -->
+ <javac srcdir="${main.make}" destdir="${main.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
+ <compilerarg line="${javac.args}"/>
+ <classpath refid="lib.path"/>
+ <include name="${version.src}"/>
+ </javac>
+
+ <!-- Copy web interface static files to the build dir -->
+ <copy todir="${main.make}/freenet/clients/http/staticfiles">
+ <fileset dir="${main.src}/freenet/clients/http/staticfiles"/>
+ </copy>
+ <!-- Copy translation files to the build dir -->
+ <copy todir="${main.make}/freenet/l10n">
+ <fileset dir="${main.src}/freenet/l10n">
+ <include name="freenet.l10n.*.properties"/>
+ <include name="iso-*.tab"/>
+ </fileset>
+ </copy>
+ <!-- Copy the dependencies.properties file -->
+ <copy todir="${main.make}" file="dependencies.properties"/>
+ </target>
+
+ <target name="package-only" depends="build">
+ <property name="lib.contrib.loc" location="${lib.contrib.dir}" />
+ <property name="lib.loc" location="${lib.dir}" />
+ <pathconvert property="lib.jars.package" refid="lib.path" pathsep=" ">
+ <map from="${lib.contrib.loc}/" to=""/>
+ <map from="${lib.loc}/" to=""/>
+ </pathconvert>
+ <jar jarfile="${jar.dst}" basedir="${main.make}">
+ <manifest>
+ <attribute name="Permissions" value="all-permissions"/>
+ <attribute name="Application-Name" value="Freenet REference Daemon"/>
+
+ <attribute name="Required-Ext-Version" value="29"/>
+ <attribute name="Recommended-Ext-Version" value="29"/>
+ <section name="common">
+ <attribute name="Specification-Title" value="Freenet"/>
+ <attribute name="Specification-Version" value="0.7.5"/>
+ <attribute name="Specification-Vendor" value="freenetproject.org"/>
+ <attribute name="Implementation-Title" value="Freenet"/>
+ <attribute name="Implementation-Version" value="0.7.5 ${git.revision}"/>
+ <attribute name="Implementation-Vendor" value="freenetproject.org"/>
+ </section>
+ </manifest>
+ <exclude name="${version.src}"/>
+ </jar>
+ </target>
+
+ <target name="package" depends="unit, package-only" description="build standard binary packages (Freenet daemon)"/>
+
+ <target name="unit-build" depends="build" unless="${test.skip}">
+ <antcall target="libdep-junit"/>
+ <antcall target="libdep-hamcrest"/>
+ <javac srcdir="${test.src}" destdir="${test.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
+ <compilerarg line="${javac.args}"/>
+ <classpath refid="libtest.path"/>
+ <include name="**/*.java"/>
+ <exclude name="*.java"/>
+ </javac>
+ <copy todir="${test.make}/freenet/client/filter/png" overwrite="true">
+ <fileset dir="${test.src}/freenet/client/filter/png"/>
+ </copy>
+ <copy todir="${test.make}/freenet/client/filter/bmp" overwrite="true">
+ <fileset dir="${test.src}/freenet/client/filter/bmp"/>
+ </copy>
+ <copy todir="${test.make}/freenet/client/filter/mp3" overwrite="true">
+ <fileset dir="${test.src}/freenet/client/filter/mp3"/>
+ </copy>
+ <copy todir="${test.make}/freenet/client/filter/gif" overwrite="true">
+ <fileset dir="${test.src}/freenet/client/filter/gif"/>
+ </copy>
+ <copy todir="${test.make}/freenet/crypt/ciphers/rijndael-gladman-test-data" overwrite="true">
+ <fileset dir="${test.src}/freenet/crypt/ciphers/rijndael-gladman-test-data"/>
+ </copy>
+ <copy todir="${test.make}/freenet/l10n" overwrite="true">
+ <fileset dir="${test.src}/freenet/l10n" includes="*.properties"/>
+ </copy>
+ </target>
+
+ <target name="unit" depends="unit-build" unless="${test.skip}">
+ <junit printsummary="yes" haltonfailure="${test.haltonfailure}" logfailedtests="yes" showoutput="yes" filtertrace="no" fork="on" forkmode="perTest" maxmemory="256m" dir="${test.dst}">
+ <classpath refid="libtest.path"/>
+ <formatter type="plain" usefile="false"/>
+ <formatter type="xml" if="${test.xml_output}"/>
+ <formatter classname="org.apache.tools.ant.taskdefs.optional.junit.TearDownOnVmCrash" usefile="false"/>
+ <test if="test.class" name="${test.class}" todir="${test.dst}"/>
+ <batchtest unless="test.class" fork="yes" todir="${test.dst}">
+ <fileset dir="${test.make}" includes="**/*Test.class"/>
+ </batchtest>
+ <sysproperty key="test.verbose" value="${test.verbose}"/>
+ <sysproperty key="test.benchmark" value="${test.benchmark}"/>
+ <sysproperty key="test.extensive" value="${test.extensive}"/>
+ <!-- TODO source needs to be edited too; the old variables were "benchmark" and "extensiveTesting" -->
+ <assertions><enable/></assertions>
+ </junit>
+ </target>
+
+ <target name="clean" description="clean standard build products">
+ <delete dir="${main.make}"/>
+ <delete dir="${main.dst}"/>
+ <delete dir="${test.make}"/>
+ <delete dir="${test.dst}"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Dependencies (contrib, ie. freenet-ext.jar) -->
+ <!-- =================================================================== -->
+
+ <target name="ensure-ext" depends="libdep-ext">
+ <!-- clean build does nothing, since this is external library. -->
+ </target>
+
+ <target name="ensure-bc" depends="libdep-bc">
+ <!-- clean build does nothing, since this is external library. -->
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Generate GWT code -->
+ <!-- =================================================================== -->
+
+ <target name="env-gjs">
+ <available property="gjs.present" file="${gjs.dst}" type="dir"/>
+ </target>
+
+ <target name="ensure-gjs" depends="env-gjs" unless="gjs.present">
+ <antcall target="build-gjs"/>
+ </target>
+
+ <target name="build-gjs" depends="libdep-gwt-user, libdep-gwt-dev">
+ <ant antfile="build.xml" dir="${gjs.dir}">
+ <reference refid="gjs.lib.path" torefid="project.class.path"/>
+ </ant>
+ </target>
+
+ <target name="clean-gjs">
+ <ant antfile="build.xml" dir="${gjs.dir}" target="deleteGenerated"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Documentation -->
+ <!-- =================================================================== -->
+
+ <target name="init-doc" unless="${doc.skip}">
+ <mkdir dir="${doc.api}"/>
+ </target>
+
+ <target name="javadoc" depends="init-doc, dep" unless="${doc.skip}">
+ <javadoc classpathref="lib.path" sourcepath="${main.src}" destdir="${doc.api}" use="true">
+ <link href="http://docs.oracle.com/javase/6/docs/api/"/>
+ </javadoc>
+ </target>
+
+ <target name="doc" depends="javadoc" description="build documentation">
+ <!-- currently freenet has no other documentation apart from javadocs -->
+ </target>
+
+ <target name="clean-doc" unless="${doc.skip}">
+ <delete dir="${doc.api}"/>
+ </target>
+
+</project>
diff --git a/net-p2p/freenet/files/build.properties b/net-p2p/freenet/files/build.properties
new file mode 100644
index 00000000000..21fecf30c80
--- /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 00000000000..104ad58ab19
--- /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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/, net-p2p/freenet/files/
@ 2023-05-26 10:24 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-05-26 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 26ab26e07b2cbfb44b62a3854a4f54b9a9344e2b
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Apr 21 11:14:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 26 10:24:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ab26e0
net-p2p/freenet: add 0.7.5_p1497
Switches to java-pkg-simple
Bundles binary version of pebble
Depends on freenet-ext with much smaller download than net-libs/nativebiginteger
EAPI 8
Enables tests
Changes test dependency hamcrest-*-1.3 -> hamcrest-2
Skips two failing tests via patch
Adds verify-sig
Adds Add-opens: to MANIFEST.MF for runtime
Updates metadata remote-id
Partly moves handling of freenet-wrapper.conf to src_compile
Depends on bug #878869
Bug: https://bugs.gentoo.org/904441
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30643
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-p2p/freenet/Manifest | 4 +
.../freenet-0.7.5_p1497-ignore-failing-tests.patch | 37 ++++
net-p2p/freenet/freenet-0.7.5_p1497.ebuild | 226 +++++++++++++++++++++
net-p2p/freenet/metadata.xml | 2 +-
4 files changed, 268 insertions(+), 1 deletion(-)
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index facd34648cce..c759eab58a0f 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -2,4 +2,8 @@ DIST freenet-0.7.5_p1491.zip 7827005 BLAKE2B 422f3050dbfdc829d1614b2f65262a06371
DIST freenet-0.7.5_p1492.zip 7844187 BLAKE2B 59dc274d1904448d9be608f34beb3fd942fe5f45a34c4be8e5c02939f5681796f8b3afe2fa70bb9a62d25bc45eb0f699c9949689fad79c11acef40b1b57e9849 SHA512 e5d40954e84ccd327b2935d222b1174c4720f1ee2c35ec41554f4d90b4cac6ab21d5655612dde2a844fbcaf13c5edfe405c0effe5c8200b77657aeecc09d1976
DIST freenet-0.7.5_p1493.zip 8507217 BLAKE2B af8eb65ada0c5bf698314d721e615c75b57ec0136b1a593ec0960398ae952ae4115cbcec3d1da22a1c624c5f434b032bb68103f2a2ad68e8d1a7f5fb17fc3167 SHA512 3a34648e59e4201a2e66a8d87fa45b2a311d5dbfea3de96d44f797c8a6bc74c35e9d495ea6f93e04003f8bae79026d1f929f28f56b4abaa2c581cc18a0d06104
DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
+DIST freenet-build01497-source.tar.bz2 6387097 BLAKE2B 1476793b1084bef4c596648f0d83b808da80e5d0ccddaede5c2b41264f70919dc73e7b2a020437da88bc5b6266a3866398d9a1204cf8ebef9d17b5d9a0a697c4 SHA512 f9c15ebbd7e04b241de767851254169b4d1f94b66afa910784eb9bf6a22db43d0786bd7323f92fde48b59b0c4f73a75ec64646dcc47e5aa908108fb7fb0712fa
+DIST freenet-build01497-source.tar.bz2.sig 566 BLAKE2B fb1d3169942d4a1fd50aadd03011cc8907c5f5784ddfa1a20ecf0956bb8b1e0e2fbd58d93d904edb93c1781bca39a8043e56f6e73a9da927dece905ce4c570e7 SHA512 0453a6bb146531bbcdd7c1e249d3d82731400985fad5d38277cb8687fa01fd8b43e7d3164c7c22d2e8605f6e03e125bc767ffcde51b880acedbcdd45f1009ffb
+DIST pebble-3.1.6.jar 318370 BLAKE2B c3ea059ebc960764cf32a2390773926f1c4e8b0be3aaee7739adfc9529a30dfd0dab3cec0c7519be991d43eed87025db9b64f230cca0622eba16e0e64371243d SHA512 abbf9f8d5c7e23cb658970f670e4e78e62d12433a6683506f14c9c0334257d0d93089d83348691b033704e661f7c1954859e9630e1d94a461a5acf7f336f88dd
+DIST seednodes-0.7.5_p1480.tar.gz 12364 BLAKE2B edb4e2a5c7424b51f0afb8234c7e486d56fe92e9201ab7ed7658366f070225f8def1b5412a31367e434ab4afae393caa16e7bdd7307f1d870607105fd5076638 SHA512 a2662a29f5721cd1523eb68b8787b074baec990327207b9ff444c91e644738a610e5216064aef00c62d6aca8ba66b2035a3175f63d45c1e0e8efc816b2a38660
DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1497-ignore-failing-tests.patch b/net-p2p/freenet/files/freenet-0.7.5_p1497-ignore-failing-tests.patch
new file mode 100644
index 000000000000..452ed82aa782
--- /dev/null
+++ b/net-p2p/freenet/files/freenet-0.7.5_p1497-ignore-failing-tests.patch
@@ -0,0 +1,37 @@
+# 1) testGetStringOverridden(freenet.l10n.BaseL10nTest)
+# org.junit.ComparisonFailure: expected:<[O]verridden> but was:<[Not o]verridden>
+# at org.junit.Assert.assertEquals(Assert.java:117)
+# at org.junit.Assert.assertEquals(Assert.java:146)
+# at freenet.l10n.BaseL10nTest.testGetStringOverridden(BaseL10nTest.java:188)
+# 2) testStrings(freenet.l10n.BaseL10nTest)
+# java.lang.AssertionError: Error in test.unmatchedCloseSubstitution for ENGLISH: Starts with /
+# at org.junit.Assert.fail(Assert.java:89)
+# at freenet.l10n.BaseL10nTest.testStrings(BaseL10nTest.java:245)
+--- a/test/freenet/l10n/BaseL10nTest.java
++++ b/test/freenet/l10n/BaseL10nTest.java
+@@ -6,6 +6,7 @@ import java.io.File;
+ import java.util.Iterator;
+
+ import org.junit.Test;
++import org.junit.Ignore;
+
+ import freenet.l10n.BaseL10n.LANGUAGE;
+ import freenet.support.HTMLNode;
+@@ -181,7 +182,7 @@ public class BaseL10nTest {
+ assertEquals("Sane", value);
+ }
+
+- @Test
++ @Test @Ignore
+ public void testGetStringOverridden() {
+ BaseL10n l10n = createTestL10n(LANGUAGE.ENGLISH);
+ String value = l10n.getString("test.override");
+@@ -230,7 +231,7 @@ public class BaseL10nTest {
+ assertEquals("test.nonexistent", value);
+ }
+
+- @Test
++ @Test @Ignore
+ public void testStrings() throws Exception {
+ for (LANGUAGE lang : LANGUAGE.values()) {
+ BaseL10n l10n = createL10n(lang);
diff --git a/net-p2p/freenet/freenet-0.7.5_p1497.ebuild b/net-p2p/freenet/freenet-0.7.5_p1497.ebuild
new file mode 100644
index 000000000000..b814fc624d53
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1497.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple systemd verify-sig
+
+DESCRIPTION="An encrypted network without censorship"
+HOMEPAGE="https://freenetproject.org/"
+# Currently we bundle a binary version of pebble, see bug #905005
+PEV="3.1.6"
+SRC_URI="https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2
+ https://github.com/hyphanet/seedrefs/archive/build01480.tar.gz -> seednodes-0.7.5_p1480.tar.gz
+ https://repo1.maven.org/maven2/io/pebbletemplates/pebble/${PEV}/pebble-${PEV}.jar
+ mirror://gentoo/freenet-ant-1.7.1.jar
+ verify-sig? (
+ https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2.sig
+ )"
+S="${WORKDIR}/freenet-build0${PV#*p}"
+
+# 'SPDX-License-Identifier: BSD-3-Clause'
+# needed for pebble is 'BSD' in Gentoo.
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 BSD Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+nss"
+
+CP_DEPEND="
+ dev-java/bcprov:0
+ dev-java/commons-compress:0
+ dev-java/fec:0
+ dev-java/freenet-ext:29
+ dev-java/jbitcollider-core:0
+ dev-java/jna:4
+ dev-java/lzma:0
+ dev-java/lzmajio:0
+ dev-java/mersennetwister:0
+ dev-java/java-service-wrapper:0
+ dev-java/unbescape:0
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ dev-java/hamcrest:0
+ dev-java/mockito:0
+ dev-java/objenesis:0
+ net-libs/NativeThread:0
+ )
+"
+RDEPEND="
+ acct-user/freenet
+ acct-group/freenet
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+ nss? ( dev-libs/nss )
+"
+BDEPEND="
+ app-arch/unzip
+ verify-sig? ( sec-keys/openpgp-keys-freenet )
+"
+PDEPEND="net-libs/NativeThread:0"
+
+DOCS=(
+ AUTHORS
+ CONTRIBUTING.md
+ NEWS.md
+ README.md
+ SECURITY.md
+)
+
+PATCHES=(
+ "${FILESDIR}/freenet-0.7.5_p1497-ignore-failing-tests.patch"
+)
+
+JAVA_CLASSPATH_EXTRA="java-service-wrapper"
+# pebble packaging resistant
+JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/pebble-${PEV}.jar"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src"
+JAVA_TEST_GENTOO_CLASSPATH="
+ hamcrest
+ junit-4
+ mockito
+ objenesis
+"
+# Yes, both variables point to the same directory
+# https://github.com/hyphanet/fred/blob/build01497/build.gradle#L169-L173
+JAVA_TEST_RESOURCE_DIRS="test"
+JAVA_TEST_SRC_DIR="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/freenetproject.org.asc"
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached \
+ "${DISTDIR}"/freenet-build0${PV#*p}-source.tar.bz2 \
+ "${DISTDIR}"/freenet-build0${PV#*p}-source.tar.bz2.sig
+ fi
+ unpack freenet-build0${PV#*p}-source.tar.bz2
+ unpack seednodes-0.7.5_p1480.tar.gz
+}
+
+src_prepare() {
+ default
+ java-pkg-2_src_prepare
+
+ # Could not get resource : freenet/l10n/freenet.l10n.pt-PT.properties
+ # https://github.com/hyphanet/fred/pull/500
+ mv src/freenet/l10n/freenet.l10n.pt{_,-}PT.properties || die
+
+ # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
+ mkdir res || die
+ pushd src > /dev/null || die
+ find -type f \
+ ! -name '*.java' \
+ ! -name 'package.html' \
+ ! -path '*/simulator/readme.txt' \
+ | xargs cp --parent -t ../res || die
+ popd > /dev/null || die
+
+ mkdir "${JAVA_RESOURCE_DIRS}/META-INF" || die
+ cat > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" <<- EOF || die
+ Add-opens: java.base/java.lang java.base/java.util java.base/java.io
+ EOF
+
+ cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
+ cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
+ cp "${FILESDIR}"/run.sh-20090501 run.sh || die
+
+ 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
+ if use nss; then
+ echo "wrapper.java.additional.11=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+
+ # Moved here because of using JAVA_GENTOO_CLASSPATH which is populated by java-pkg_gen-cp.
+ local i=2 pkg jars jar
+ local ifs_original=${IFS}
+ IFS=","
+ for pkg in ${JAVA_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
+ echo "wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> freenet-wrapper.conf || die
+ echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> freenet-wrapper.conf || die
+
+ cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
+}
+
+src_test() {
+ JAVA_TEST_EXTRA_ARGS=(
+ -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/jna-4/"
+ -Djna.nosys=false
+ -Dnetworkaddress.cache.negative.ttl=0
+ -Dnetworkaddress.cache.ttl=0
+ # https://github.com/hyphanet/fred/blob/build01497/build.gradle#L194-L196
+ # "test.l10npath_main" reads from the JAR file.
+ -Dtest.l10npath_test="freenet/l10n/"
+ -Dtest.l10npath_main="freenet/l10n/"
+ )
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 17; then
+ JAVA_TEST_EXTRA_ARGS+=(
+ --add-opens=java.base/java.io=ALL-UNNAMED
+ --add-opens=java.base/java.lang=ALL-UNNAMED
+ --add-opens=java.base/java.util=ALL-UNNAMED
+ )
+ fi
+
+ pushd test > /dev/null || die
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -type f -name "*Test.java" \
+ )
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd > /dev/null || die
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg-simple_src_install
+
+ java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
+
+ doinitd "${FILESDIR}"/freenet
+
+ systemd_dounit "${FILESDIR}"/freenet.service
+
+ insinto /etc
+ doins freenet-wrapper.conf
+ insinto /var/freenet
+ doins run.sh seednodes.fref
+ fperms +x /var/freenet/run.sh
+}
+
+pkg_postinst() {
+ elog " "
+ elog "1. Start freenet with rc-service 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
+}
diff --git a/net-p2p/freenet/metadata.xml b/net-p2p/freenet/metadata.xml
index ff6a0ffbd37a..b39a7becbac8 100644
--- a/net-p2p/freenet/metadata.xml
+++ b/net-p2p/freenet/metadata.xml
@@ -3,7 +3,7 @@
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
- <remote-id type="github">freenet/fred</remote-id>
+ <remote-id type="github">hyphanet/fred</remote-id>
</upstream>
<use>
<flag name="nss">Use nss for crypto operations, if it is the fastest way</flag>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/, net-p2p/freenet/files/
@ 2024-09-21 18:34 Florian Schmaus
0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2024-09-21 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 26520f09074555f14c75a187e5019bc15a805a67
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Apr 21 08:12:01 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 18:32:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26520f09
net-p2p/freenet: add 0.7.5_p1498
Bug: https://bugs.gentoo.org/918618
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34016
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-p2p/freenet/Manifest | 3 ++
.../freenet-0.7.5_p1498-ignore-failing-tests.patch | 42 ++++++++++++++++++++++
net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild | 2 ++
..._p1497-r1.ebuild => freenet-0.7.5_p1498.ebuild} | 30 ++++++----------
4 files changed, 58 insertions(+), 19 deletions(-)
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 7d1d4c5043c5..4f5bbef2692e 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,5 +1,8 @@
DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
DIST freenet-build01497-source.tar.bz2 6387097 BLAKE2B 1476793b1084bef4c596648f0d83b808da80e5d0ccddaede5c2b41264f70919dc73e7b2a020437da88bc5b6266a3866398d9a1204cf8ebef9d17b5d9a0a697c4 SHA512 f9c15ebbd7e04b241de767851254169b4d1f94b66afa910784eb9bf6a22db43d0786bd7323f92fde48b59b0c4f73a75ec64646dcc47e5aa908108fb7fb0712fa
DIST freenet-build01497-source.tar.bz2.sig 566 BLAKE2B fb1d3169942d4a1fd50aadd03011cc8907c5f5784ddfa1a20ecf0956bb8b1e0e2fbd58d93d904edb93c1781bca39a8043e56f6e73a9da927dece905ce4c570e7 SHA512 0453a6bb146531bbcdd7c1e249d3d82731400985fad5d38277cb8687fa01fd8b43e7d3164c7c22d2e8605f6e03e125bc767ffcde51b880acedbcdd45f1009ffb
+DIST freenet-build01498-source.tar.bz2 6349168 BLAKE2B e42b3b7a89a5b4051ac38512d6beb06ce21d661e9cdb7ae1e2e0f800cea4cac0885281efb589e29800e4fd15578b223dd42c2bfbfe3b0deabd774073eef0a4e8 SHA512 6202e6f066c85ae704cb1f5db8b971cfec39dc902b166d5204be87848f9ff338bf964cd694702c6a3bfd08c23533a3658914998cf384ddec367b77c09c6eb808
+DIST freenet-build01498-source.tar.bz2.sig 566 BLAKE2B 5c7fef3e5272be6ba4d75d5ca62cebe6bf2ebbc3086ad840e26c52b908bc9b7a2d0e3a77e20fbc3774d7a73bc63c710e3e44e681cf675931aa1bd1373c198c7c SHA512 008a13bde022d4db0b8daf2318c91255fc46bb374c884767b29370e4f0e595c7a9ca787a81197bcb2191c9b4f217f8f7ab7a1a9f5f91d51ac06a2a6505aa367e
+DIST freenet-java21.patch 1305 BLAKE2B bdffc231afdea89deb171017e7018f09b1b2413f0b7a78da7dfbf0c06dfe96540574d9aa6828cc4b050b8844856870c3d3d002879d9ebef89e0d13bd68b818de SHA512 e6114ad7a1c8993cfefb648789093f089f64b6636fdf53542d96f3ab935a080705aa8e57152d8447c49f1167d756b22b2971e51d0e21e502a8071858a9d404dd
DIST pebble-3.1.6.jar 318370 BLAKE2B c3ea059ebc960764cf32a2390773926f1c4e8b0be3aaee7739adfc9529a30dfd0dab3cec0c7519be991d43eed87025db9b64f230cca0622eba16e0e64371243d SHA512 abbf9f8d5c7e23cb658970f670e4e78e62d12433a6683506f14c9c0334257d0d93089d83348691b033704e661f7c1954859e9630e1d94a461a5acf7f336f88dd
DIST seednodes-0.7.5_p1480.tar.gz 12364 BLAKE2B edb4e2a5c7424b51f0afb8234c7e486d56fe92e9201ab7ed7658366f070225f8def1b5412a31367e434ab4afae393caa16e7bdd7307f1d870607105fd5076638 SHA512 a2662a29f5721cd1523eb68b8787b074baec990327207b9ff444c91e644738a610e5216064aef00c62d6aca8ba66b2035a3175f63d45c1e0e8efc816b2a38660
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1498-ignore-failing-tests.patch b/net-p2p/freenet/files/freenet-0.7.5_p1498-ignore-failing-tests.patch
new file mode 100644
index 000000000000..5212cebc19ee
--- /dev/null
+++ b/net-p2p/freenet/files/freenet-0.7.5_p1498-ignore-failing-tests.patch
@@ -0,0 +1,42 @@
+There were 2 failures:
+1) testGetStringOverridden(freenet.l10n.BaseL10nTest)
+org.junit.ComparisonFailure: expected:<[O]verridden> but was:<[Not o]verridden>
+ at org.junit.Assert.assertEquals(Assert.java:117)
+ at org.junit.Assert.assertEquals(Assert.java:146)
+ at freenet.l10n.BaseL10nTest.testGetStringOverridden(BaseL10nTest.java:188)
+2) testStrings(freenet.l10n.BaseL10nTest)
+java.lang.AssertionError: Error in test.unmatchedCloseSubstitution for ENGLISH: Starts with /
+ at org.junit.Assert.fail(Assert.java:89)
+ at freenet.l10n.BaseL10nTest.testStrings(BaseL10nTest.java:245)
+
+FAILURES!!!
+Tests run: 1053, Failures: 2
+
+--- a/test/freenet/l10n/BaseL10nTest.java
++++ b/test/freenet/l10n/BaseL10nTest.java
+@@ -6,6 +6,7 @@ import java.io.File;
+ import java.util.Iterator;
+
+ import org.junit.Test;
++import org.junit.Ignore;
+
+ import freenet.l10n.BaseL10n.LANGUAGE;
+ import freenet.support.HTMLNode;
+@@ -181,7 +182,7 @@ public class BaseL10nTest {
+ assertEquals("Sane", value);
+ }
+
+- @Test
++ @Test @Ignore
+ public void testGetStringOverridden() {
+ BaseL10n l10n = createTestL10n(LANGUAGE.ENGLISH);
+ String value = l10n.getString("test.override");
+@@ -230,7 +231,7 @@ public class BaseL10nTest {
+ assertEquals("test.nonexistent", value);
+ }
+
+- @Test
++ @Test @Ignore
+ public void testStrings() throws Exception {
+ for (LANGUAGE lang : LANGUAGE.values()) {
+ BaseL10n l10n = createL10n(lang);
diff --git a/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild
index bdfa94e03022..bb1142edc220 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="https://freenetproject.org/"
PEV="3.1.6"
SRC_URI="https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2
https://github.com/hyphanet/seedrefs/archive/build01480.tar.gz -> seednodes-0.7.5_p1480.tar.gz
+ https://github.com/hyphanet/fred/commit/49e1a69445.patch -> freenet-java21.patch
https://repo1.maven.org/maven2/io/pebbletemplates/pebble/${PEV}/pebble-${PEV}.jar
mirror://gentoo/freenet-ant-1.7.1.jar
verify-sig? (
@@ -76,6 +77,7 @@ DOCS=(
PATCHES=(
"${FILESDIR}/freenet-0.7.5_p1497-ignore-failing-tests.patch"
+ "${DISTDIR}/freenet-java21.patch"
)
JAVA_CLASSPATH_EXTRA="java-service-wrapper"
diff --git a/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1498.ebuild
similarity index 87%
copy from net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild
copy to net-p2p/freenet/freenet-0.7.5_p1498.ebuild
index bdfa94e03022..0b8b2cad4f5f 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1498.ebuild
@@ -9,23 +9,18 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple systemd verify-sig
DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-# Currently we bundle a binary version of pebble, see bug #905005
+HOMEPAGE="https://www.hyphanet.org"
PEV="3.1.6"
SRC_URI="https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2
https://github.com/hyphanet/seedrefs/archive/build01480.tar.gz -> seednodes-0.7.5_p1480.tar.gz
- https://repo1.maven.org/maven2/io/pebbletemplates/pebble/${PEV}/pebble-${PEV}.jar
- mirror://gentoo/freenet-ant-1.7.1.jar
verify-sig? (
https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2.sig
)"
S="${WORKDIR}/freenet-build0${PV#*p}"
-# 'SPDX-License-Identifier: BSD-3-Clause'
-# needed for pebble is 'BSD' in Gentoo.
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 BSD Apache-2.0"
+LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64"
IUSE="+nss"
CP_DEPEND="
@@ -34,16 +29,17 @@ CP_DEPEND="
dev-java/commons-io:1
dev-java/fec:0
dev-java/freenet-ext:29
+ dev-java/java-service-wrapper:0
dev-java/jbitcollider-core:0
dev-java/jna:4
dev-java/lzma:0
dev-java/lzmajio:0
dev-java/mersennetwister:0
- dev-java/java-service-wrapper:0
- dev-java/unbescape:0
+ dev-java/pebble:0
"
DEPEND="
+ dev-java/unbescape:0
>=virtual/jdk-1.8:*
${CP_DEPEND}
test? (
@@ -75,12 +71,13 @@ DOCS=(
)
PATCHES=(
- "${FILESDIR}/freenet-0.7.5_p1497-ignore-failing-tests.patch"
+ "${FILESDIR}/freenet-0.7.5_p1498-ignore-failing-tests.patch"
)
-JAVA_CLASSPATH_EXTRA="java-service-wrapper"
-# pebble packaging resistant
-JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/pebble-${PEV}.jar"
+JAVA_CLASSPATH_EXTRA="
+ java-service-wrapper
+ unbescape
+"
JAVA_RESOURCE_DIRS="res"
JAVA_SRC_DIR="src"
JAVA_TEST_GENTOO_CLASSPATH="
@@ -155,11 +152,8 @@ src_compile() {
done
done
IFS=${ifs_original}
- echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
echo "wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> freenet-wrapper.conf || die
echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> freenet-wrapper.conf || die
-
- cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
}
src_test() {
@@ -195,8 +189,6 @@ src_test() {
src_install() {
java-pkg-simple_src_install
- java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
doinitd "${FILESDIR}"/freenet
systemd_dounit "${FILESDIR}"/freenet.service
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/, net-p2p/freenet/files/
@ 2024-10-31 8:17 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2024-10-31 8:17 UTC (permalink / raw
To: gentoo-commits
commit: fe972ed0fd20b6c4313cd502c7a112302df5e810
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Oct 30 17:26:29 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 08:17:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe972ed0
net-p2p/freenet: drop 0.7.5_p1497-r1
Closes: https://bugs.gentoo.org/918618
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/39160/commits/d21f319fd67b44dd16220b6aa4ac038032e7e8fa
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
net-p2p/freenet/Manifest | 5 -
.../freenet-0.7.5_p1497-ignore-failing-tests.patch | 37 ----
net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild | 229 ---------------------
3 files changed, 271 deletions(-)
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 4f5bbef2692e..1e47162dde9c 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,8 +1,3 @@
-DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
-DIST freenet-build01497-source.tar.bz2 6387097 BLAKE2B 1476793b1084bef4c596648f0d83b808da80e5d0ccddaede5c2b41264f70919dc73e7b2a020437da88bc5b6266a3866398d9a1204cf8ebef9d17b5d9a0a697c4 SHA512 f9c15ebbd7e04b241de767851254169b4d1f94b66afa910784eb9bf6a22db43d0786bd7323f92fde48b59b0c4f73a75ec64646dcc47e5aa908108fb7fb0712fa
-DIST freenet-build01497-source.tar.bz2.sig 566 BLAKE2B fb1d3169942d4a1fd50aadd03011cc8907c5f5784ddfa1a20ecf0956bb8b1e0e2fbd58d93d904edb93c1781bca39a8043e56f6e73a9da927dece905ce4c570e7 SHA512 0453a6bb146531bbcdd7c1e249d3d82731400985fad5d38277cb8687fa01fd8b43e7d3164c7c22d2e8605f6e03e125bc767ffcde51b880acedbcdd45f1009ffb
DIST freenet-build01498-source.tar.bz2 6349168 BLAKE2B e42b3b7a89a5b4051ac38512d6beb06ce21d661e9cdb7ae1e2e0f800cea4cac0885281efb589e29800e4fd15578b223dd42c2bfbfe3b0deabd774073eef0a4e8 SHA512 6202e6f066c85ae704cb1f5db8b971cfec39dc902b166d5204be87848f9ff338bf964cd694702c6a3bfd08c23533a3658914998cf384ddec367b77c09c6eb808
DIST freenet-build01498-source.tar.bz2.sig 566 BLAKE2B 5c7fef3e5272be6ba4d75d5ca62cebe6bf2ebbc3086ad840e26c52b908bc9b7a2d0e3a77e20fbc3774d7a73bc63c710e3e44e681cf675931aa1bd1373c198c7c SHA512 008a13bde022d4db0b8daf2318c91255fc46bb374c884767b29370e4f0e595c7a9ca787a81197bcb2191c9b4f217f8f7ab7a1a9f5f91d51ac06a2a6505aa367e
-DIST freenet-java21.patch 1305 BLAKE2B bdffc231afdea89deb171017e7018f09b1b2413f0b7a78da7dfbf0c06dfe96540574d9aa6828cc4b050b8844856870c3d3d002879d9ebef89e0d13bd68b818de SHA512 e6114ad7a1c8993cfefb648789093f089f64b6636fdf53542d96f3ab935a080705aa8e57152d8447c49f1167d756b22b2971e51d0e21e502a8071858a9d404dd
-DIST pebble-3.1.6.jar 318370 BLAKE2B c3ea059ebc960764cf32a2390773926f1c4e8b0be3aaee7739adfc9529a30dfd0dab3cec0c7519be991d43eed87025db9b64f230cca0622eba16e0e64371243d SHA512 abbf9f8d5c7e23cb658970f670e4e78e62d12433a6683506f14c9c0334257d0d93089d83348691b033704e661f7c1954859e9630e1d94a461a5acf7f336f88dd
DIST seednodes-0.7.5_p1480.tar.gz 12364 BLAKE2B edb4e2a5c7424b51f0afb8234c7e486d56fe92e9201ab7ed7658366f070225f8def1b5412a31367e434ab4afae393caa16e7bdd7307f1d870607105fd5076638 SHA512 a2662a29f5721cd1523eb68b8787b074baec990327207b9ff444c91e644738a610e5216064aef00c62d6aca8ba66b2035a3175f63d45c1e0e8efc816b2a38660
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1497-ignore-failing-tests.patch b/net-p2p/freenet/files/freenet-0.7.5_p1497-ignore-failing-tests.patch
deleted file mode 100644
index 452ed82aa782..000000000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1497-ignore-failing-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# 1) testGetStringOverridden(freenet.l10n.BaseL10nTest)
-# org.junit.ComparisonFailure: expected:<[O]verridden> but was:<[Not o]verridden>
-# at org.junit.Assert.assertEquals(Assert.java:117)
-# at org.junit.Assert.assertEquals(Assert.java:146)
-# at freenet.l10n.BaseL10nTest.testGetStringOverridden(BaseL10nTest.java:188)
-# 2) testStrings(freenet.l10n.BaseL10nTest)
-# java.lang.AssertionError: Error in test.unmatchedCloseSubstitution for ENGLISH: Starts with /
-# at org.junit.Assert.fail(Assert.java:89)
-# at freenet.l10n.BaseL10nTest.testStrings(BaseL10nTest.java:245)
---- a/test/freenet/l10n/BaseL10nTest.java
-+++ b/test/freenet/l10n/BaseL10nTest.java
-@@ -6,6 +6,7 @@ import java.io.File;
- import java.util.Iterator;
-
- import org.junit.Test;
-+import org.junit.Ignore;
-
- import freenet.l10n.BaseL10n.LANGUAGE;
- import freenet.support.HTMLNode;
-@@ -181,7 +182,7 @@ public class BaseL10nTest {
- assertEquals("Sane", value);
- }
-
-- @Test
-+ @Test @Ignore
- public void testGetStringOverridden() {
- BaseL10n l10n = createTestL10n(LANGUAGE.ENGLISH);
- String value = l10n.getString("test.override");
-@@ -230,7 +231,7 @@ public class BaseL10nTest {
- assertEquals("test.nonexistent", value);
- }
-
-- @Test
-+ @Test @Ignore
- public void testStrings() throws Exception {
- for (LANGUAGE lang : LANGUAGE.values()) {
- BaseL10n l10n = createL10n(lang);
diff --git a/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild
deleted file mode 100644
index 09b3d57a5fd1..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1497-r1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple systemd verify-sig
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-# Currently we bundle a binary version of pebble, see bug #905005
-PEV="3.1.6"
-SRC_URI="https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2
- https://github.com/hyphanet/seedrefs/archive/build01480.tar.gz -> seednodes-0.7.5_p1480.tar.gz
- https://github.com/hyphanet/fred/commit/49e1a69445.patch -> freenet-java21.patch
- https://repo1.maven.org/maven2/io/pebbletemplates/pebble/${PEV}/pebble-${PEV}.jar
- mirror://gentoo/freenet-ant-1.7.1.jar
- verify-sig? (
- https://github.com/hyphanet/fred/releases/download/build0${PV#*p}/freenet-build0${PV#*p}-source.tar.bz2.sig
- )"
-S="${WORKDIR}/freenet-build0${PV#*p}"
-
-# 'SPDX-License-Identifier: BSD-3-Clause'
-# needed for pebble is 'BSD' in Gentoo.
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 BSD Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="+nss"
-
-CP_DEPEND="
- dev-java/bcprov:0
- dev-java/commons-compress:0
- dev-java/commons-io:1
- dev-java/fec:0
- dev-java/freenet-ext:29
- dev-java/jbitcollider-core:0
- dev-java/jna:4
- dev-java/lzma:0
- dev-java/lzmajio:0
- dev-java/mersennetwister:0
- dev-java/java-service-wrapper:0
- dev-java/unbescape:0
-"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
- test? (
- dev-java/hamcrest:0
- dev-java/mockito:0
- dev-java/objenesis:0
- net-libs/NativeThread:0
- )
-"
-RDEPEND="
- acct-user/freenet
- acct-group/freenet
- >=virtual/jre-1.8:*
- ${CP_DEPEND}
- nss? ( dev-libs/nss )
-"
-BDEPEND="
- app-arch/unzip
- verify-sig? ( sec-keys/openpgp-keys-freenet )
-"
-PDEPEND="net-libs/NativeThread:0"
-
-DOCS=(
- AUTHORS
- CONTRIBUTING.md
- NEWS.md
- README.md
- SECURITY.md
-)
-
-PATCHES=(
- "${FILESDIR}/freenet-0.7.5_p1497-ignore-failing-tests.patch"
- "${DISTDIR}/freenet-java21.patch"
-)
-
-JAVA_CLASSPATH_EXTRA="java-service-wrapper"
-# pebble packaging resistant
-JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/pebble-${PEV}.jar"
-JAVA_RESOURCE_DIRS="res"
-JAVA_SRC_DIR="src"
-JAVA_TEST_GENTOO_CLASSPATH="
- hamcrest
- junit-4
- mockito
- objenesis
-"
-# Yes, both variables point to the same directory
-# https://github.com/hyphanet/fred/blob/build01497/build.gradle#L169-L173
-JAVA_TEST_RESOURCE_DIRS="test"
-JAVA_TEST_SRC_DIR="test"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/freenetproject.org.asc"
-src_unpack() {
- if use verify-sig; then
- verify-sig_verify_detached \
- "${DISTDIR}"/freenet-build0${PV#*p}-source.tar.bz2 \
- "${DISTDIR}"/freenet-build0${PV#*p}-source.tar.bz2.sig
- fi
- unpack freenet-build0${PV#*p}-source.tar.bz2
- unpack seednodes-0.7.5_p1480.tar.gz
-}
-
-src_prepare() {
- default
- java-pkg-2_src_prepare
-
- # Could not get resource : freenet/l10n/freenet.l10n.pt-PT.properties
- # https://github.com/hyphanet/fred/pull/500
- mv src/freenet/l10n/freenet.l10n.pt{_,-}PT.properties || die
-
- # java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
- mkdir res || die
- pushd src > /dev/null || die
- find -type f \
- ! -name '*.java' \
- ! -name 'package.html' \
- ! -path '*/simulator/readme.txt' \
- | xargs cp --parent -t ../res || die
- popd > /dev/null || die
-
- mkdir "${JAVA_RESOURCE_DIRS}/META-INF" || die
- cat > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" <<- EOF || die
- Add-opens: java.base/java.lang java.base/java.util java.base/java.io
- EOF
-
- cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
- cp "${FILESDIR}"/freenet-0.7.5_p1497-wrapper.conf freenet-wrapper.conf || die
- cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-
- 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
- if use nss; then
- echo "wrapper.java.additional.11=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
- fi
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-
- # Moved here because of using JAVA_GENTOO_CLASSPATH which is populated by java-pkg_gen-cp.
- local i=2 pkg jars jar
- local ifs_original=${IFS}
- IFS=","
- for pkg in ${JAVA_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
- echo "wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> freenet-wrapper.conf || die
- echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> freenet-wrapper.conf || die
-
- cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-}
-
-src_test() {
- JAVA_TEST_EXTRA_ARGS=(
- -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/jna-4/"
- -Djna.nosys=false
- -Dnetworkaddress.cache.negative.ttl=0
- -Dnetworkaddress.cache.ttl=0
- # https://github.com/hyphanet/fred/blob/build01497/build.gradle#L194-L196
- # "test.l10npath_main" reads from the JAR file.
- -Dtest.l10npath_test="freenet/l10n/"
- -Dtest.l10npath_main="freenet/l10n/"
- )
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if ver_test "${vm_version}" -ge 17; then
- JAVA_TEST_EXTRA_ARGS+=(
- --add-opens=java.base/java.io=ALL-UNNAMED
- --add-opens=java.base/java.lang=ALL-UNNAMED
- --add-opens=java.base/java.util=ALL-UNNAMED
- )
- fi
-
- pushd test > /dev/null || die
- local JAVA_TEST_RUN_ONLY=$(find * \
- -type f -name "*Test.java" \
- )
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
- JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- popd > /dev/null || die
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg-simple_src_install
-
- java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
- doinitd "${FILESDIR}"/freenet
-
- systemd_dounit "${FILESDIR}"/freenet.service
-
- insinto /etc
- doins freenet-wrapper.conf
- insinto /var/freenet
- doins run.sh seednodes.fref
- fperms +x /var/freenet/run.sh
-}
-
-pkg_postinst() {
- elog " "
- elog "1. Start freenet with rc-service 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-31 8:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-26 10:24 [gentoo-commits] repo/gentoo:master commit in: net-p2p/freenet/, net-p2p/freenet/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-10-31 8:17 Miroslav Šulc
2024-09-21 18:34 Florian Schmaus
2019-03-17 13:10 Thomas Sachau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox