6 files changed, 294 insertions, 0 deletions
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index e66b3cf0e053..1a71232a5da6 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index 455d868688c5..6abcd304fd67 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -3,6 +3,8 @@ AUX fms-use-system-libs4.patch 815 BLAKE2B 8b5380465c7ec4ab6c14aa087b1b9b57c8bf3
 AUX fms.initd 294 BLAKE2B 2ca5dd139ca0380cec252d99f0573d613568bf35556439a8efb770d63af4f88b8867215118504926c7b326136a391c4effc8c9614b57c3679b66d05925e5a75f SHA512 55a918ad3462d932ba6b785ee9cf2c6ef999b770a51bf6260976c89f87cf2e5f2c38dd82e7d687325e0b21b9813f5aa9222cc895c06bb0ac6fb355b6070ee196
 DIST fms-src-0.3.82.zip 4786920 BLAKE2B c18630b8b1b8871290f1d66c4638b99c110e0f49bef11517aa83760274707fd5d0b53c053ea3b38a0c35018de4a4b6f3dd426499228997bac377bb1f04f784fb SHA512 2a72cbc7e23eb16cc12bd373944d1da090030602a09d0c1cf2fd8688a7b1a98ff649f1d0aa8b525b65987394d81acbb9b7558fcb21cea90a7646067a16600673
 DIST fms-src-0.3.83.zip 4813813 BLAKE2B 07b28fa1ef151ca75e547515c8771fc425aa78003980f20134c4d3b670ccaa4c20b24dc0517194dd4675d9b3b8c8f84e929a94921945d156ae5b0b898a7fad56 SHA512 140f76f4a5c0582c3df031e4001f8870c761249d3af0226acefc9ee646973c9dee4f65ab8964ae43a6ec29de735bea0155603f596ec5a07ff7458d0ffd2ee4d3
+DIST fms-src-0.3.84.zip 4913007 BLAKE2B ec96d26ea5fedaf2109c0b1aa00d1dfa82e5b45bfe7db8a58cab9f682c16f41b05a2d3e51a4ece2a148101d36472499d1592d9dab66dd544402e8cc8cc37a5ff SHA512 e3fe163e3aefafbdeebeb67601bb940db2015eb8d8ca334f9bcfc41c86b704fc450e039f1301106c299011ef02d5fb7c28b97782bf3252d320adf3bac230b744
 EBUILD fms-0.3.82-r1.ebuild 2139 BLAKE2B 7474b82db550d2788712d7db3d5dd233636d1fdf6b0d4208d6ff236d49950c4df6ad860d7ee6c1fbeb4b56ccb3b7952da278d7babdabbb7b9fa2dd5cea4255dd SHA512 8282dbfb932c3080be34eff46e22931e8316fb9085c3c529b39cbcf472ebc92acf3b7cc4f9518277d3174bbe52bd8446a0cd521c62543d82b996ceb3b1e39248
 EBUILD fms-0.3.83.ebuild 2219 BLAKE2B 0436faed68b3f6413c01f37a5119d7d834abebc23be1c1368f2cb29208001c09858704e45565aea1a47cd3ed646ebb9e1aaf4007e8bd17b2137d54eb148ba10c SHA512 c98169d360bdbb9e7743db9e8b6d1f6685308e431a43b3f6f71ff157b31b4e113385624f1f15d10222b5fca6400fa70ae69afe92bcc1077893baf0c16033c0a5
+EBUILD fms-0.3.84.ebuild 2227 BLAKE2B 5d0ab09cdab230cfc57b37adf081e3561d61ce2fa2d356b6f2730b03de9c18e0946ac90035c2adcc2976f2b7c3b67d0e6a36415f9fc2d962d1cdd0212a282405 SHA512 08c65561c6cca28644106a5b13b11c5fde5f06338ee7665d962b8114cd0f14939e985e924ccaed6c68d458c20596053a5eed05f78262dda46a22c7a5a848aa94
 MISC metadata.xml 395 BLAKE2B d270d94280fc48170e2cb76d1649976eb62fe18a5c62cc17b35dd704afe06b21d8290c6a30d1a6d1827d39727719387cbd1899a9a42b91530b1d3c0ebcd0bf37 SHA512 455405ef9317e994180b1e9d85a1a5b7c9b5fa03b2618e46aae1503855eaa2fe3e8573b67881bbce43736b97df2fdc3ca6e2f914aff4a3cfe6f876d8cf353df3
diff --git a/net-p2p/fms/fms-0.3.84.ebuild b/net-p2p/fms/fms-0.3.84.ebuild
new file mode 100644
index 000000000000..d99313f0e5f2
--- /dev/null
+++ b/net-p2p/fms/fms-0.3.84.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit edos2unix cmake
+
+DESCRIPTION="A spam-resistant message board application for Freenet"
+# FMS only has a homepage within freenet, so the closest is a wiki linking to it
+HOMEPAGE="https://github.com/freenet/wiki/wiki/FMS"
+SRC_URI="https://dev.gentoo.org/~tommy/distfiles/${PN}-src-${PV}.zip"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="frost ssl"
+
+CDEPEND="
+	acct-group/freenet
+	acct-user/freenet
+"
+
+RDEPEND="
+	${CDEPEND}
+	dev-db/sqlite:3=
+	dev-libs/poco
+	frost? ( net-libs/mbedtls:0= )
+	ssl? ( net-libs/mbedtls:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	virtual/libiconv
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-use-system-libs4.patch"
+	"${FILESDIR}/${PN}-0.3.83-fix-for-mbedtls-3.patch"
+)
+
+DOCS=( "readme.txt" )
+
+src_prepare() {
+	# Convert encoding due applied patch
+	edos2unix src/http/pages/showfilepage.cpp
+	edos2unix CMakeLists.txt
+	edos2unix include/freenet/fcpv2.h
+
+	# Remove bundled libs
+	rm -fr libs || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDO_CHARSET_CONVERSION="ON"
+		-DFCP_SSL_SUPPORT="$(usex ssl 'ON' 'OFF')"
+		-DFROST_SUPPORT="$(usex frost 'ON' 'OFF')"
+		-DI_HAVE_READ_THE_README="ON"
+		-DUSE_BUNDLED_SQLITE="OFF"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/fms
+
+	insinto /var/freenet/fms
+	doins *.htm
+	doins -r fonts images styles translations
+
+	fperms -R o-rwx /var/freenet/fms
+	fowners -R freenet:freenet /var/freenet/fms
+
+	newinitd "${FILESDIR}/fms.initd" fms
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if ! has_version 'net-p2p/freenet' ; then
+		ewarn "FMS needs a freenet node to upload and download messages."
+		ewarn "Please make sure to have a node you can connect to"
+		ewarn "or install net-p2p/freenet to get FMS working."
+	fi
+
+	einfo "By default, the FMS NNTP server will listen on port 1119,"
+	einfo "and the web configuration interface will be running at"
+	einfo "http://localhost:8080."
+	einfo "For more information, read the installed readme.txt."
+
+	if use frost; then
+		einfo
+		einfo "You need to enable frost on the configuration page"
+		einfo "and restart FMS for frost support."
+	fi
+}
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 28714e003c4b..1e6504bf6894 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -6,6 +6,7 @@ AUX build.properties 2655 BLAKE2B 137de56b6118d7306c036d7ed00fee314446bd9b221d39
 AUX freenet 474 BLAKE2B f50fbfaaaf6a919ac15b078a627eb1b2fbc9e6b6c83e4229ae4032e64436926c40410f1182bdbc6bcd005677d9ef9c5be252fbd008ad6fffb6df5bfce38a2148 SHA512 8bfaf754106cd5476f96554932d3a394efbfbbdd51d6a62b32259e3c65ef562cf92f0f7fb2a2cb768037312780a990cdd05f758e23c4cc57e7543aaaed85f285
 AUX freenet-0.7.5_p1474-wrapper.conf 949 BLAKE2B 6832683015aff6db0ad2b4116a6b8aea2ca23c1ac38da72ae71ac3a339a2efe69a7bab37911035d82a15d6ff725fb8d481deae42bd1bbaf0ad62119194674354 SHA512 a6d30afc502176a6e0bab480368553c1df50add8fe18b65cede38be752c989125999cbb8bedfd68641623fd4498e19610c16d02fcf9d951da450a9612301cdeb
 AUX freenet-0.7.5_p1491-wrapper.conf 1126 BLAKE2B 9be1699e36487de28868a1f4a191de4d50fe92d8ea550c73f07dee99466ed5d6455a8c1d31690fa660b18a291702a43349629ace158d9ac97ba6f47bd95069f5 SHA512 26bfd9cc3e2f172b08c9bd5970ad2420d3c9f44023cfa9a3978fa59a92956019b4eff5b64b0fe913587baba242915779a87613bd6daa3318c314e78a56b7ec1e
+AUX freenet.initd 509 BLAKE2B e6d2aa034ae60a8b37008674fca475380a1b3a8e16ddd153fb6e12ff7963376b83ffae5ff48ae520cf4d1051acfae18c4c55e00960f6ff7192120bdb0559cd17 SHA512 c9f5b1a3210d389192b9390d5160ea2490bc89d4de6024dad7f6bd9b552b3130ad6d2f76ca3bfdf8fb8327175625377babb8064f901835254b3d4c4971f694a2
 AUX freenet.service 271 BLAKE2B 7d47ad525f4bb13e07c50a0bdf19f1ef234d5219e82f426254c316abc4517180c22267a245ca022edf68e615a2865fe0dd08f694ee5ee2ced8c5391b3c5e33ad SHA512 2f3d4ec0ba05eff328e8176cbe130176a82a1bb432599de44ab78ca27e9c96e0eafe0871f12b0165247f941a2e929635a6abe6cd61351b1305c0d0e8cff83d2b
 AUX run.sh-20090501 16217 BLAKE2B 249254104ca2d0a20131a5d6b36a07b14fe6407d1915d75ecf98a617de6e532def710975ff1b2e0b580f7148099cd7f6915d8adc0b15e1f67af4fc4713e0e5af SHA512 ba97f1e370ffb7c9ea109b7d529430581a588d8d7e121ec09865e9e8932f2901477f7f43e7d0b95c7c95c2c42db05870e5d811528f91f78b48b68a539c804e67
 DIST freenet-0.7.5_p1491.zip 7827005 BLAKE2B 422f3050dbfdc829d1614b2f65262a063710028255582f7952c7ee4195f62af34d2b52ae74e5f7af2d92fd7e0db2800b6b2c24b8259e55485e1ce89929fccb40 SHA512 6b09816f9fb77003462c06e090d9ca572db9360990f2c9ba43908f30cef47dca8f89044f13ab503ea406cb7a42c07b0cba87e114c80d971ce990e0869e7dd1c3
@@ -16,5 +17,6 @@ DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7
 EBUILD freenet-0.7.5_p1491-r1.ebuild 4881 BLAKE2B 342a7fd667dc4a2a0ff504784a184df10c5fc716c69dc18b4d70891a3a470593a63d21dd55c69857fa0e579b4ed65509bc0b54fcec7910e9220df37c7e27f2bd SHA512 8cae0cef31285330a2edd1618824df75ce8cbd27acea5bc5acde7b83d731aa5bc1a935e9785434918cec41d46d307b94ff051c9f6eae172d78cbfee83f11cb79
 EBUILD freenet-0.7.5_p1491.ebuild 4819 BLAKE2B 33df7b2784ed3a63b1dca0955858f358589d609a185fbb6d21200c6039cf0cb35c230ee05e95d22320bbc8d97ff2525599c7fcb2a6eaddb36e9239c810af6dc2 SHA512 453557ddd46fd6e92b858db79cf8ab46d285d435653f9f123d5ffeb7d554865a569e54adf74bc2fdb6846e2c487ac64507f7736a58e9d8c55983a7893d1f2a2b
 EBUILD freenet-0.7.5_p1492.ebuild 4887 BLAKE2B 75099a50aacc2d31b58ee4a7724c2b88d4ee773db9ba64e2a01f5ebd5b0df5da64ae198d32ecaa06b39f4971d22ce77255d713ab280dfcd7faa48e23512a3eaa SHA512 c40be5d910e307fa9cca5cde28912011429b419543a16e3b3290c4eede9036c71de5a9959348fbb3d04a7535d27beeb4f03cabbebcd0a87abd07f33d97b6f022
+EBUILD freenet-0.7.5_p1493-r1.ebuild 5778 BLAKE2B 8ba275d0f4ce3bc4e2119a6b15d7e0928049c47d012ff2c2836450f01a80923345560b445501cd91138244765b403799ecee6332d19cc2d5ff2741c139a4da0a SHA512 2fac80eea21d4cc90139c40e0561a3fae8e80af2aa407629eb4c9d33f3ee0468e3851f3db97e24456475e725dfe02ebc7118ba2011d4d610ba5cea52e3921e3f
 EBUILD freenet-0.7.5_p1493.ebuild 4832 BLAKE2B 3712071bc38f8f6dd346daeef84184db469a02fce3a5c2d8b4a7704104e8f01096bc9db24fc816706ed60235c470a0556ff3b852f06906b46c27c3fcdeb3f8a6 SHA512 2c0f6ecd3a1443ff7a1e9e09862575abfb38724054d64b75f21f015c54f5ce3c3ea858b47d3da1bd819b29249d155018d3c9fcc0a932443c09918cdbbe2669f0
 MISC metadata.xml 431 BLAKE2B 15ac565ad002dd559780d967574a62641f27fb60d952e73e83a1245dd38b9a27802f871e9588b8d2acaf6631b0a0e82cd4158dbfc44e16f7f187e88e5c57d39d SHA512 1972976d177084ca51c4580d4467a35634d5e9335f7a20a54822f18b560e682c577aabd316cb63eee2ece5ea68cbdd6650b086a2a6b13cc46437924d80f07b53
diff --git a/net-p2p/freenet/files/freenet.initd b/net-p2p/freenet/files/freenet.initd
new file mode 100755
index 000000000000..75e957e579cc
--- /dev/null
+++ b/net-p2p/freenet/files/freenet.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	start-stop-daemon --start --user freenet --chdir /var/freenet/ --background --stdout=/var/freenet/freenet.log --stderr=/var/freenet/freenet.log --make-pidfile --pidfile=/var/run/freenet.pid --name freenet --exec java -- -cp $classpath $additional_options $configurable_options $target
+}
+
+stop() {
+	start-stop-daemon --stop --user freenet --pidfile=/var/run/freenet.pid
+}
diff --git a/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild
new file mode 100644
index 000000000000..dc8909dae308
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 systemd
+
+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 ~arm ~arm64 ~x86"
+IUSE="+nss test"
+
+CDEPEND="dev-java/bcprov:0
+	dev-java/commons-compress:0
+	dev-java/fec:0
+	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
+	nss? ( dev-libs/nss )"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.8
+	${CDEPEND}
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	dev-java/ant-core:0"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	net-libs/nativebiginteger:0
+	${CDEPEND}
+	acct-user/freenet
+	acct-group/freenet"
+
+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,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,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.
+
+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
+}
+
+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_p1491-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
+
+	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
+	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
+
+	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
+	else
+		sed -i -e "s:Dfreenet.jce.use.NSS=tru:Dfreenet.jce.use.NSS=false:g" freenet.confd || die
+	fi
+	local i=2 pkg jars jar classpath
+	classpath="/usr/share/freenet/lib/freenet.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
+			classpath="${classpath}":"${jar}"
+
+		done
+	done
+	IFS=${ifs_original}
+	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
+	classpath="${classpath}":/usr/share/freenet/lib/ant.jar
+	echo "classpath=\"""${classpath}""\"" > freenet.confd || 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
+	echo "additional_options=\"-Dfreenet.jce.use.NSS=true -Djna.nosys=false -Dnetworkaddress.cache.ttl=0 -Dnetworkaddress.cache.negative.ttl=0 -enableassertions:freenet -Djava.library.path=/usr/$(get_libdir)/jna-4\"" >> freenet.confd || die
+	echo "target=\"freenet.node.NodeStarter\"" >> freenet.confd || die
+	echo "configurable_options=\"-Djava.initmemory=60 -Djava.maxmemory=1024 -XX:MaxPermSize=1024M\"" >> freenet.confd || 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
+#this uses java-service-wrapper, which is currently broken, bug 878869
+#		doinitd "${FILESDIR}"/freenet
+#this does directly start freenet without the wrapper
+		newinitd "${FILESDIR}"/freenet.initd freenet
+		newconfd freenet.confd 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
+	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
+}