8 files changed, 281 insertions, 0 deletions
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 89f5704c3f20..d09f734894e9 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index f0589927d146..5a3694666969 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -1,5 +1,8 @@
+AUX fms-0.3.83-fix-for-mbedtls-3.patch 330 BLAKE2B 34fa8e55e8ddcad2a15193082d6e56084c99fe02fdc65e1b64b63017eb409b7b9ec8fc9c3d5659406a4bfec335f5f9633791870bf9a5a5466b252870a03db3a0 SHA512 011fda7af36149b2d2394cf0d1e057a9e9746a0474239bed7d99f1791a6cdd3f2cc978cad95e892f0666cbf44380e68c22c1aed58b1e6c3889d7c5d5c67f2e72
 AUX fms-use-system-libs4.patch 1343 BLAKE2B b45a272f24e0b738328e7d901699f4a5a9e4d9f8f2d564d28d85e817ed4fc8165cebdaa150ecece8c88197d2b5bb7d31a690f84198bad89e9cb7df63a5d57f65 SHA512 36aa556661db38813021e6e4ef2ebc6f3b4e06aa400f774281766579fa21da9583d87a27aef3c7b68c840bec7c69b99aebd237ba25c42fc5732a66b10d4ed20d
 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
 EBUILD fms-0.3.82-r1.ebuild 2139 BLAKE2B 7474b82db550d2788712d7db3d5dd233636d1fdf6b0d4208d6ff236d49950c4df6ad860d7ee6c1fbeb4b56ccb3b7952da278d7babdabbb7b9fa2dd5cea4255dd SHA512 8282dbfb932c3080be34eff46e22931e8316fb9085c3c529b39cbcf472ebc92acf3b7cc4f9518277d3174bbe52bd8446a0cd521c62543d82b996ceb3b1e39248
+EBUILD fms-0.3.83.ebuild 2219 BLAKE2B 0436faed68b3f6413c01f37a5119d7d834abebc23be1c1368f2cb29208001c09858704e45565aea1a47cd3ed646ebb9e1aaf4007e8bd17b2137d54eb148ba10c SHA512 c98169d360bdbb9e7743db9e8b6d1f6685308e431a43b3f6f71ff157b31b4e113385624f1f15d10222b5fca6400fa70ae69afe92bcc1077893baf0c16033c0a5
 MISC metadata.xml 395 BLAKE2B d270d94280fc48170e2cb76d1649976eb62fe18a5c62cc17b35dd704afe06b21d8290c6a30d1a6d1827d39727719387cbd1899a9a42b91530b1d3c0ebcd0bf37 SHA512 455405ef9317e994180b1e9d85a1a5b7c9b5fa03b2618e46aae1503855eaa2fe3e8573b67881bbce43736b97df2fdc3ca6e2f914aff4a3cfe6f876d8cf353df3
diff --git a/net-p2p/fms/files/fms-0.3.83-fix-for-mbedtls-3.patch b/net-p2p/fms/files/fms-0.3.83-fix-for-mbedtls-3.patch
new file mode 100644
index 000000000000..fdc1948abd82
--- /dev/null
+++ b/net-p2p/fms/files/fms-0.3.83-fix-for-mbedtls-3.patch
@@ -0,0 +1,11 @@
+--- /include/freenet/fcpv2.h	2016-06-04 18:16:06.000000000 +0200
++++ /include/freenet/fcpv2.h.new	2021-10-29 11:38:04.000000000 +0200
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ #ifdef FCP_SSL
+-	#include <mbedtls/net.h>
++	#include <mbedtls/net_sockets.h>
+ 	#include <mbedtls/ssl.h>
+ 	#include <mbedtls/ctr_drbg.h>
+ 	#include <mbedtls/entropy.h>
diff --git a/net-p2p/fms/fms-0.3.83.ebuild b/net-p2p/fms/fms-0.3.83.ebuild
new file mode 100644
index 000000000000..4923e8506423
--- /dev/null
+++ b/net-p2p/fms/fms-0.3.83.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 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}/${P}-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 59a3271cc217..dc10eb1fe4ec 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -7,7 +7,9 @@ AUX freenet-0.7.5_p1474-wrapper.conf 949 BLAKE2B 6832683015aff6db0ad2b4116a6b8ae
 AUX freenet.service 271 BLAKE2B 7d47ad525f4bb13e07c50a0bdf19f1ef234d5219e82f426254c316abc4517180c22267a245ca022edf68e615a2865fe0dd08f694ee5ee2ced8c5391b3c5e33ad SHA512 2f3d4ec0ba05eff328e8176cbe130176a82a1bb432599de44ab78ca27e9c96e0eafe0871f12b0165247f941a2e929635a6abe6cd61351b1305c0d0e8cff83d2b
 AUX run.sh-20090501 16217 BLAKE2B 249254104ca2d0a20131a5d6b36a07b14fe6407d1915d75ecf98a617de6e532def710975ff1b2e0b580f7148099cd7f6915d8adc0b15e1f67af4fc4713e0e5af SHA512 ba97f1e370ffb7c9ea109b7d529430581a588d8d7e121ec09865e9e8932f2901477f7f43e7d0b95c7c95c2c42db05870e5d811528f91f78b48b68a539c804e67
 DIST freenet-0.7.5_p1488.zip 7815529 BLAKE2B a63de0b365abe7fd3a7bdde735127c56d0bf220036932db93392893c21e8714cffa27b76357b9e429e5a915975030470035549c8010e3828bb503eaab5911c62 SHA512 5232d4d18bcf8775832aabee7392d0434cecb07114190ed9cd9bbab08fd693a1ac07f3ffad0835e4c5e3696961a234906cbee79c425e50cd29021b8bb77ef733
+DIST freenet-0.7.5_p1491.zip 7827005 BLAKE2B 422f3050dbfdc829d1614b2f65262a063710028255582f7952c7ee4195f62af34d2b52ae74e5f7af2d92fd7e0db2800b6b2c24b8259e55485e1ce89929fccb40 SHA512 6b09816f9fb77003462c06e090d9ca572db9360990f2c9ba43908f30cef47dca8f89044f13ab503ea406cb7a42c07b0cba87e114c80d971ce990e0869e7dd1c3
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
 DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497
 EBUILD freenet-0.7.5_p1488-r1.ebuild 4847 BLAKE2B 8b2499a6b19b5dcf064f48558c454fe8239a2c26d9ffd579a4d250bdc6a2c1a3231efa969635aabea62cacc220cfc1224d19863a1c89f71b4605118f49408cec SHA512 8de3b3306225ef90a69066274ee05249dd0b17a7eed49a0de7fdb45746254dda2b10895dc8c1119e8dfff86a36807258bff6f1a660623f50513cabc4b5fb3dc0
+EBUILD freenet-0.7.5_p1491.ebuild 4819 BLAKE2B 33df7b2784ed3a63b1dca0955858f358589d609a185fbb6d21200c6039cf0cb35c230ee05e95d22320bbc8d97ff2525599c7fcb2a6eaddb36e9239c810af6dc2 SHA512 453557ddd46fd6e92b858db79cf8ab46d285d435653f9f123d5ffeb7d554865a569e54adf74bc2fdb6846e2c487ac64507f7736a58e9d8c55983a7893d1f2a2b
 MISC metadata.xml 431 BLAKE2B 15ac565ad002dd559780d967574a62641f27fb60d952e73e83a1245dd38b9a27802f871e9588b8d2acaf6631b0a0e82cd4158dbfc44e16f7f187e88e5c57d39d SHA512 1972976d177084ca51c4580d4467a35634d5e9335f7a20a54822f18b560e682c577aabd316cb63eee2ece5ea68cbdd6650b086a2a6b13cc46437924d80f07b53
diff --git a/net-p2p/freenet/freenet-0.7.5_p1491.ebuild b/net-p2p/freenet/freenet-0.7.5_p1491.ebuild
new file mode 100644
index 000000000000..9c2352f70072
--- /dev/null
+++ b/net-p2p/freenet/freenet-0.7.5_p1491.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 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 ~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_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
+
+	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.5=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
+	fi
+	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
+	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
+	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
+	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
+}
diff --git a/net-p2p/opendchub/files/opendchub_setup.sh b/net-p2p/opendchub/files/opendchub_setup.sh
index 2944a02c395e..2944a02c395e 100755..100644
--- a/net-p2p/opendchub/files/opendchub_setup.sh
+++ b/net-p2p/opendchub/files/opendchub_setup.sh
diff --git a/net-p2p/syncthing/files/syncthing.initd b/net-p2p/syncthing/files/syncthing.initd
index b64ebac03254..b64ebac03254 100755..100644
--- a/net-p2p/syncthing/files/syncthing.initd
+++ b/net-p2p/syncthing/files/syncthing.initd