Merge updates from master

acct-group/fileshelter/fileshelter-0.ebuild

@@ -0,0 +1,10 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for fileshelter"
+
+ACCT_GROUP_ID=-1

acct-group/fileshelter/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ppn@parhuet.fr</email>
+		<name>Nicolas PARLANT</name>
+	</maintainer>
+</pkgmetadata>

acct-user/fileshelter/fileshelter-0.ebuild

@@ -0,0 +1,13 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+DESCRIPTION="User for fileshelter"
+ACCT_USER_ID=-1
+ACCT_USER_HOME=/var/lib/fileshelter
+ACCT_USER_GROUPS=( fileshelter )
+
+acct-user_add_deps

acct-user/fileshelter/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ppn@parhuet.fr</email>
+		<name>Nicolas PARLANT</name>
+	</maintainer>
+</pkgmetadata>

dev-cpp/wt/Manifest

@@ -1,2 +1,2 @@
 DIST wt-4.10.4.tar.gz 10449928 BLAKE2B 19516d506612590fda1ba626487631397102c5634772e3435a911470d85da42803885368996a59a816400eaf623baad07dccd23c9fe769c6965b27372575aa23 SHA512 f41efec1e77bd76f6f66ffb4ff38c98cfc590debb194682e3c6eb3f7b4366c30f8e2bbc16f4c33faa45f6f49d28812215538d20f4abc6c4dc3a226ae9b10ac71
-DIST wt-4.11.0.tar.gz 10562160 BLAKE2B 5238f279c8899d976ce03b7840a4600bd22e54c8aede1cb908e3949278e61778361ccd67e3ea065f90875c15acad89553a87972078bb983857b871520ccf6669 SHA512 b437d822793261e57bb3a6024ec3fd06a7080ff053bc587e9e89f8d24c010158991827f925f0b59d43371aeeebdfc53983abd29a6c46ecf46b67bd923ca81e5a
+DIST wt-4.11.0.tar.gz 10563042 BLAKE2B c49427437298cccc930017d3f03badc33cfcacd370e88b0d18e96a0d4302843fac161d02f3af012cda26a24bac2585329d620324f00cdebad1e78cf59217608d SHA512 67557e39f97871855250d38434b1260d507d9bc27fe0d64e5bf3176eedc3b02269bb3167a9e31d61a30817a852e98fd594672bc5e0debd807523cc5f8db4d17f

net-misc/fileshelter/Manifest

@@ -0,0 +1 @@
+DIST fileshelter-6.2.0.tar.gz 66406 BLAKE2B bb510331c84f0321e21a87a7cd25886c7c391666504833c5acb8db724322cb2bf8919e8ef281cbe4453aacf7e1c0f93447200f60a79c429a595c8678b7e4bdb8 SHA512 5563fd04a1c97064f443d7081e897e3473d5937d43410d48d32dbb610c90d0eb8df2fb0b642aaf7af9c5fdad30f53d7f3a797021121fc9a3dbd35b2e64fdae6c

net-misc/fileshelter/files/fileshelter-6.2.0-fix-lib-dir.patch

@@ -0,0 +1,23 @@
+https://github.com/epoupon/fileshelter/pull/109/commits/c2f023133f4dd9d5826ea339bb6d278d33c389df
+use cmake libdir to satisfy some sanity checks
+
+diff -uNr a/src/libs/share/CMakeLists.txt b/src/libs/share/CMakeLists.txt
+--- a/src/libs/share/CMakeLists.txt
++++ b/src/libs/share/CMakeLists.txt
+@@ -28,5 +28,5 @@
+ 	Wt::Wt
+ 	)
+ 
+-install(TARGETS filesheltershare DESTINATION lib)
++install(TARGETS filesheltershare DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+diff -uNr a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
+--- a/src/libs/utils/CMakeLists.txt
++++ b/src/libs/utils/CMakeLists.txt
+@@ -27,5 +27,5 @@
+ 	Wt::Wt
+ 	)
+ 
+-install(TARGETS fileshelterutils DESTINATION lib)
++install(TARGETS fileshelterutils DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 

net-misc/fileshelter/files/fileshelter-6.2.0-hierarchy.patch

@@ -0,0 +1,29 @@
+diff --git a/conf/fileshelter.conf b/conf/fileshelter.conf
+--- a/conf/fileshelter.conf
++++ b/conf/fileshelter.conf
+@@ -1,10 +1,10 @@
+ # Fileshelter Sample configuration file
+ 
+ # Working directory (must have write privileges)
+-working-dir = "/var/fileshelter";
++working-dir = "/var/lib/fileshelter";
+ 
+ # Log files, empty means stderr
+-log-file = "";
++log-file = "/var/log/fileshelter/fileshelter.log";
+ access-log-file = "";
+ # Logger configuration, see log-config in https://webtoolkit.eu/wt/doc/reference/html/overview.html#config_general
+ log-config = "* -debug -info:WebRequest";
+@@ -45,9 +45,9 @@ trusted-proxies =
+ 
+ # If enabled, these files have to exist and have correct permissions set
+ tls-enable = false;
+-tls-cert = "/var/fileshelter/cert.pem";
+-tls-key = "/var/fileshelter/privkey.pem";
+-tls-dh = "/var/fileshelter/dh2048.pem";
++tls-cert = "/var/lib/fileshelter/cert.pem";
++tls-key = "/var/lib/fileshelter/privkey.pem";
++tls-dh = "/var/lib/fileshelter/dh2048.pem";
+ 
+ # Application settings
+ app-name = "FileShelter";

net-misc/fileshelter/files/fileshelter.init

@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${FILESHELTER_GROUP:=fileshelter}
+: ${FILESHELTER_USER:=fileshelter}
+: ${FILESHELTER_BINDIR:=/var/lib/fileshelter}
+: ${FILESHELTER_PIDFILE:=/run/fileshelter.pid}
+
+command="/usr/bin/fileshelter"
+command_user="fileshelter:fileshelter"
+command_background=true
+directory="${FILESHELTER_BINDIR}"
+pidfile="${FILESHELTER_PIDFILE}"
+extra_started_commands="reload"
+
+depend() {
+	use net
+}
+
+start_pre() {
+        checkpath -d -m 0750 -o "${FILESHELTER_USER}:${FILESHELTER_GROUP}" ${FILESHELTER_BINDIR}
+}
+
+reload () {
+	ebegin "Reloading configuration and re-opening log files"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}

net-misc/fileshelter/fileshelter-6.2.0.ebuild

@@ -0,0 +1,48 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="FileShelter is a “one-click” file sharing web application "
+HOMEPAGE="https://fileshelter-demo.poupon.dev https://github.com/epoupon/fileshelter"
+SRC_URI="https://github.com/epoupon/fileshelter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	acct-user/fileshelter
+	app-arch/libarchive
+	dev-cpp/wt:=
+	dev-libs/boost:=
+	dev-libs/libconfig[cxx]
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( INSTALL.md README.md )
+
+PATCHES="
+	${FILESDIR}/${PN}-6.2.0-fix-lib-dir.patch
+	${FILESDIR}/${PN}-6.2.0-hierarchy.patch
+"
+
+src_install() {
+	cmake_src_install
+
+	systemd_newunit conf/systemd/default.service fileshelter.service
+	newinitd "${FILESDIR}/fileshelter.init" fileshelter
+
+	keepdir /var/log/fileshelter
+	fowners -R fileshelter:fileshelter /var/log/fileshelter
+
+	mv "${ED}/usr/share/fileshelter/fileshelter.conf" "${ED}/etc/fileshelter.conf" || die
+
+	rm "${ED}/usr/share/fileshelter/default.service" || die
+
+	keepdir /var/lib/fileshelter
+	fowners fileshelter:fileshelter /var/lib/fileshelter
+}

net-misc/fileshelter/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ppn@parhuet.fr</email>
+		<name>Nicolas PARLANT</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">epoupon/fileshelter</remote-id>
+	</upstream>
+</pkgmetadata>

net-misc/iipsrv/files/iipsrv-1.2-tiff.patch

@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/929027
+https://github.com/ruven/iipsrv/commit/0d16fc300c809aafea5d8cd1ec39cdc1f7d47ec7
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -460,7 +460,7 @@ if test "$TIFF_LIBS" = ""; then
+ 	INCLUDES="$TIFF_INCLUDES $INCLUDES"
+ 
+ 	# Try the standard search path first
+-	AC_TRY_LINK([#include <tiff.h>],[TIFFGetVersion();], [
++	AC_TRY_LINK([#include <tiffio.h>],[TIFFGetVersion();], [
+ 		TIFF_LIBS="-ltiff"
+ 	], [
+ 		# libtiff is not in the standard search path.

net-misc/iipsrv/iipsrv-1.2.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd
+inherit autotools systemd
 
 DESCRIPTION="High performance image server for high resolution and scientific images"
 HOMEPAGE="https://iipimage.sourceforge.io"
@@ -40,8 +40,14 @@ QA_CONFIG_IMPL_DECL_SKIP=( TIFFGetVersion )
 PATCHES=(
 	"${FILESDIR}/${P}-rawtile.patch"
 	"${FILESDIR}/${P}-make.patch"
+	"${FILESDIR}/${P}-tiff.patch"
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_install() {
 
 	# Rename and install our binary

net-misc/iipsrv/metadata.xml

@@ -21,7 +21,7 @@
 			<name>Ruven</name>
 		</maintainer>
 		<changelog>https://github.com/ruven/iipsrv/commits/master</changelog>
-		<doc>https://iipimage.sourceforge.net/documentation/server</doc>
+		<doc>https://iipimage.sourceforge.io/documentation/server</doc>
 		<remote-id type="github">ruven/iipsrv</remote-id>
 		<remote-id type="sourceforge">iipimage</remote-id>
 	</upstream>

net-misc/jool-modules/Manifest

@@ -0,0 +1 @@
+DIST jool-4.1.13.tar.gz 625231 BLAKE2B 988108cc76d78cf8d92d49b45142bf52a002ff00b948796bb090f8f38daa7b667614c76cff425e2f92f0d7aa3f6bde72ea3b077c0a301aa354f98735af10d57f SHA512 27c67e99ca3198f35b764b17294c51edbdab78cf56e887c1a74ede050daf627e38e91ef866a32deed6f2930c64a81f27e530059034999d1a4e4743dfc137886d

net-misc/jool-modules/jool-modules-4.1.13.ebuild

@@ -0,0 +1,28 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="Jool is an Open Source SIIT and NAT64 for linux"
+HOMEPAGE="https://nicmx.github.io/Jool/en/index.html"
+SRC_URI="https://github.com/NICMx/Jool/releases/download/v${PV}/jool-${PV}.tar.gz"
+S="${WORKDIR}/jool-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_configure() {
+	true
+}
+
+src_compile() {
+	local modlist=( jool_common=:src/mod/common:common jool=:src/mod/nat64:nat64 jool_siit=:src/mod/siit:siit )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+}

net-misc/jool-modules/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ppn@parhuet.fr</email>
+		<name>Nicolas PARLANT</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">NICMx/Jool</remote-id>
+	</upstream>
+</pkgmetadata>

net-misc/jool/Manifest

@@ -0,0 +1 @@
+DIST jool-4.1.13.tar.gz 625231 BLAKE2B 988108cc76d78cf8d92d49b45142bf52a002ff00b948796bb090f8f38daa7b667614c76cff425e2f92f0d7aa3f6bde72ea3b077c0a301aa354f98735af10d57f SHA512 27c67e99ca3198f35b764b17294c51edbdab78cf56e887c1a74ede050daf627e38e91ef866a32deed6f2930c64a81f27e530059034999d1a4e4743dfc137886d

net-misc/jool/jool-4.1.13.ebuild

@@ -0,0 +1,30 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Required tools for Jool"
+HOMEPAGE="https://nicmx.github.io/Jool/en/index.html"
+SRC_URI="https://github.com/NICMx/Jool/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+iptables"
+
+DEPEND="
+	iptables? ( net-firewall/iptables )
+	dev-libs/libnl:3
+"
+RDEPEND="
+	|| (
+	net-firewall/nftables
+	iptables? ( net-firewall/iptables )
+	)
+"
+
+src_configure() {
+	econf \
+		--with-bash-completion-dir=no \
+		$(use_with iptables xtables)
+}

net-misc/jool/metadata.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ppn@parhuet.fr</email>
+		<name>Nicolas PARLANT</name>
+	</maintainer>
+	<use>
+		<flag name="iptables">In addition to <pkg>net-firewall/nftables</pkg>, include support for xtables with <pkg>net-firewall/iptables</pkg>.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">NICMx/Jool</remote-id>
+	</upstream>
+</pkgmetadata>