From 213edea3f1b9f1026ed81faff1d646bbb6b1da06 Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Mon, 14 Oct 2024 00:25:05 +0200 Subject: [PATCH 1/8] net-misc/jool: new package, add 4.1.13 Signed-off-by: Nicolas PARLANT --- net-misc/jool/Manifest | 1 + net-misc/jool/jool-4.1.13.ebuild | 28 ++++++++++++++++++++++++++++ net-misc/jool/metadata.xml | 14 ++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 net-misc/jool/Manifest create mode 100644 net-misc/jool/jool-4.1.13.ebuild create mode 100644 net-misc/jool/metadata.xml diff --git a/net-misc/jool/Manifest b/net-misc/jool/Manifest new file mode 100644 index 0000000000..a2e0f97254 --- /dev/null +++ b/net-misc/jool/Manifest @@ -0,0 +1 @@ +DIST jool-4.1.13.tar.gz 625231 BLAKE2B 988108cc76d78cf8d92d49b45142bf52a002ff00b948796bb090f8f38daa7b667614c76cff425e2f92f0d7aa3f6bde72ea3b077c0a301aa354f98735af10d57f SHA512 27c67e99ca3198f35b764b17294c51edbdab78cf56e887c1a74ede050daf627e38e91ef866a32deed6f2930c64a81f27e530059034999d1a4e4743dfc137886d diff --git a/net-misc/jool/jool-4.1.13.ebuild b/net-misc/jool/jool-4.1.13.ebuild new file mode 100644 index 0000000000..144826f3c7 --- /dev/null +++ b/net-misc/jool/jool-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 + +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 )" +RDEPEND=" + || ( + net-firewall/nftables + iptables? ( net-firewall/iptables ) + ) + dev-libs/libnl +" + +src_configure() { + econf \ + --with-bash-completion-dir=no \ + $(use_with iptables xtables) +} diff --git a/net-misc/jool/metadata.xml b/net-misc/jool/metadata.xml new file mode 100644 index 0000000000..a27cae445b --- /dev/null +++ b/net-misc/jool/metadata.xml @@ -0,0 +1,14 @@ + + + + + ppn@parhuet.fr + Nicolas PARLANT + + + In addition to net-firewall/nftables, include support for xtables with net-firewall/iptables. + + + NICMx/Jool + + From 70c5c243bccfac3f9e8528093dc121a95a7681e2 Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Mon, 14 Oct 2024 00:29:10 +0200 Subject: [PATCH 2/8] net-misc/jool-modules: new package, add 4.1.13 Signed-off-by: Nicolas PARLANT --- net-misc/jool-modules/Manifest | 1 + .../jool-modules/jool-modules-4.1.13.ebuild | 28 +++++++++++++++++++ net-misc/jool-modules/metadata.xml | 11 ++++++++ 3 files changed, 40 insertions(+) create mode 100644 net-misc/jool-modules/Manifest create mode 100644 net-misc/jool-modules/jool-modules-4.1.13.ebuild create mode 100644 net-misc/jool-modules/metadata.xml diff --git a/net-misc/jool-modules/Manifest b/net-misc/jool-modules/Manifest new file mode 100644 index 0000000000..a2e0f97254 --- /dev/null +++ b/net-misc/jool-modules/Manifest @@ -0,0 +1 @@ +DIST jool-4.1.13.tar.gz 625231 BLAKE2B 988108cc76d78cf8d92d49b45142bf52a002ff00b948796bb090f8f38daa7b667614c76cff425e2f92f0d7aa3f6bde72ea3b077c0a301aa354f98735af10d57f SHA512 27c67e99ca3198f35b764b17294c51edbdab78cf56e887c1a74ede050daf627e38e91ef866a32deed6f2930c64a81f27e530059034999d1a4e4743dfc137886d diff --git a/net-misc/jool-modules/jool-modules-4.1.13.ebuild b/net-misc/jool-modules/jool-modules-4.1.13.ebuild new file mode 100644 index 0000000000..939d2c8fbb --- /dev/null +++ b/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 +} diff --git a/net-misc/jool-modules/metadata.xml b/net-misc/jool-modules/metadata.xml new file mode 100644 index 0000000000..9760d9bf83 --- /dev/null +++ b/net-misc/jool-modules/metadata.xml @@ -0,0 +1,11 @@ + + + + + ppn@parhuet.fr + Nicolas PARLANT + + + NICMx/Jool + + From eb955eab005005d1900054d8a1594da2c1cf6ec8 Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Mon, 14 Oct 2024 10:10:03 +0200 Subject: [PATCH 3/8] acct-group/fileshelter: new package, add 0 Signed-off-by: Nicolas PARLANT --- acct-group/fileshelter/fileshelter-0.ebuild | 10 ++++++++++ acct-group/fileshelter/metadata.xml | 8 ++++++++ 2 files changed, 18 insertions(+) create mode 100644 acct-group/fileshelter/fileshelter-0.ebuild create mode 100644 acct-group/fileshelter/metadata.xml diff --git a/acct-group/fileshelter/fileshelter-0.ebuild b/acct-group/fileshelter/fileshelter-0.ebuild new file mode 100644 index 0000000000..8e4a4c3d6d --- /dev/null +++ b/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 diff --git a/acct-group/fileshelter/metadata.xml b/acct-group/fileshelter/metadata.xml new file mode 100644 index 0000000000..c8bd5a75be --- /dev/null +++ b/acct-group/fileshelter/metadata.xml @@ -0,0 +1,8 @@ + + + + + ppn@parhuet.fr + Nicolas PARLANT + + From 126cd5b86fc62921f6636b8d291049be478a2999 Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Mon, 14 Oct 2024 10:10:42 +0200 Subject: [PATCH 4/8] acct-user/fileshelter: new package, add 0 Signed-off-by: Nicolas PARLANT --- acct-user/fileshelter/fileshelter-0.ebuild | 13 +++++++++++++ acct-user/fileshelter/metadata.xml | 8 ++++++++ 2 files changed, 21 insertions(+) create mode 100644 acct-user/fileshelter/fileshelter-0.ebuild create mode 100644 acct-user/fileshelter/metadata.xml diff --git a/acct-user/fileshelter/fileshelter-0.ebuild b/acct-user/fileshelter/fileshelter-0.ebuild new file mode 100644 index 0000000000..6e63a9f5ff --- /dev/null +++ b/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 diff --git a/acct-user/fileshelter/metadata.xml b/acct-user/fileshelter/metadata.xml new file mode 100644 index 0000000000..c8bd5a75be --- /dev/null +++ b/acct-user/fileshelter/metadata.xml @@ -0,0 +1,8 @@ + + + + + ppn@parhuet.fr + Nicolas PARLANT + + From 3af0defcaec8e733e3d04e8013d032cb1db0b3a6 Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Mon, 14 Oct 2024 10:11:17 +0200 Subject: [PATCH 5/8] net-misc/fileshelter: new package, add 6.2.0 Signed-off-by: Nicolas PARLANT --- net-misc/fileshelter/Manifest | 1 + .../files/fileshelter-6.2.0-fix-lib-dir.patch | 23 +++++++++ .../files/fileshelter-6.2.0-hierarchy.patch | 29 +++++++++++ net-misc/fileshelter/files/fileshelter.init | 29 +++++++++++ net-misc/fileshelter/fileshelter-6.2.0.ebuild | 48 +++++++++++++++++++ net-misc/fileshelter/metadata.xml | 11 +++++ 6 files changed, 141 insertions(+) create mode 100644 net-misc/fileshelter/Manifest create mode 100644 net-misc/fileshelter/files/fileshelter-6.2.0-fix-lib-dir.patch create mode 100644 net-misc/fileshelter/files/fileshelter-6.2.0-hierarchy.patch create mode 100644 net-misc/fileshelter/files/fileshelter.init create mode 100644 net-misc/fileshelter/fileshelter-6.2.0.ebuild create mode 100644 net-misc/fileshelter/metadata.xml diff --git a/net-misc/fileshelter/Manifest b/net-misc/fileshelter/Manifest new file mode 100644 index 0000000000..a31559ecdf --- /dev/null +++ b/net-misc/fileshelter/Manifest @@ -0,0 +1 @@ +DIST fileshelter-6.2.0.tar.gz 66406 BLAKE2B bb510331c84f0321e21a87a7cd25886c7c391666504833c5acb8db724322cb2bf8919e8ef281cbe4453aacf7e1c0f93447200f60a79c429a595c8678b7e4bdb8 SHA512 5563fd04a1c97064f443d7081e897e3473d5937d43410d48d32dbb610c90d0eb8df2fb0b642aaf7af9c5fdad30f53d7f3a797021121fc9a3dbd35b2e64fdae6c diff --git a/net-misc/fileshelter/files/fileshelter-6.2.0-fix-lib-dir.patch b/net-misc/fileshelter/files/fileshelter-6.2.0-fix-lib-dir.patch new file mode 100644 index 0000000000..d4432e2d51 --- /dev/null +++ b/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}) + diff --git a/net-misc/fileshelter/files/fileshelter-6.2.0-hierarchy.patch b/net-misc/fileshelter/files/fileshelter-6.2.0-hierarchy.patch new file mode 100644 index 0000000000..398fffd8ea --- /dev/null +++ b/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"; diff --git a/net-misc/fileshelter/files/fileshelter.init b/net-misc/fileshelter/files/fileshelter.init new file mode 100644 index 0000000000..34dc0939a1 --- /dev/null +++ b/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 $? +} diff --git a/net-misc/fileshelter/fileshelter-6.2.0.ebuild b/net-misc/fileshelter/fileshelter-6.2.0.ebuild new file mode 100644 index 0000000000..7594ab3902 --- /dev/null +++ b/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 +} diff --git a/net-misc/fileshelter/metadata.xml b/net-misc/fileshelter/metadata.xml new file mode 100644 index 0000000000..56bce0b9aa --- /dev/null +++ b/net-misc/fileshelter/metadata.xml @@ -0,0 +1,11 @@ + + + + + ppn@parhuet.fr + Nicolas PARLANT + + + epoupon/fileshelter + + From 28370b177bf0ad84e588ae26b3baf824a3df390b Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Mon, 14 Oct 2024 17:51:31 +0900 Subject: [PATCH 6/8] net-misc/iipsrv: fix libtiff in configure script Closes: https://bugs.gentoo.org/929027 Signed-off-by: Takuya Wakazono --- net-misc/iipsrv/files/iipsrv-1.2-tiff.patch | 13 +++++++++++++ net-misc/iipsrv/iipsrv-1.2.ebuild | 8 +++++++- net-misc/iipsrv/metadata.xml | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 net-misc/iipsrv/files/iipsrv-1.2-tiff.patch diff --git a/net-misc/iipsrv/files/iipsrv-1.2-tiff.patch b/net-misc/iipsrv/files/iipsrv-1.2-tiff.patch new file mode 100644 index 0000000000..6cdd1ce762 --- /dev/null +++ b/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 ],[TIFFGetVersion();], [ ++ AC_TRY_LINK([#include ],[TIFFGetVersion();], [ + TIFF_LIBS="-ltiff" + ], [ + # libtiff is not in the standard search path. diff --git a/net-misc/iipsrv/iipsrv-1.2.ebuild b/net-misc/iipsrv/iipsrv-1.2.ebuild index 23e4a09d27..df276ee370 100644 --- a/net-misc/iipsrv/iipsrv-1.2.ebuild +++ b/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 diff --git a/net-misc/iipsrv/metadata.xml b/net-misc/iipsrv/metadata.xml index bfa91ddd83..9c8b4668a6 100644 --- a/net-misc/iipsrv/metadata.xml +++ b/net-misc/iipsrv/metadata.xml @@ -21,7 +21,7 @@ Ruven https://github.com/ruven/iipsrv/commits/master - https://iipimage.sourceforge.net/documentation/server + https://iipimage.sourceforge.io/documentation/server ruven/iipsrv iipimage From 09c21970397b841bb0e78bea3e26140ee0449570 Mon Sep 17 00:00:00 2001 From: David Roman Date: Mon, 14 Oct 2024 11:03:19 +0200 Subject: [PATCH 7/8] dev-cpp/wt: update Manifest for wt-4.11.0 It was confirmed by upstream it was updated by them Signed-off-by: David Roman --- dev-cpp/wt/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/wt/Manifest b/dev-cpp/wt/Manifest index ab6cd4ddcd..1afb454e36 100644 --- a/dev-cpp/wt/Manifest +++ b/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 From ccb1f4bb99f56cdd74137aa7a8be65c403f44ec1 Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Mon, 14 Oct 2024 11:15:48 +0200 Subject: [PATCH 8/8] net-misc/jool: fix dev-libs/libnl in DEPEND Signed-off-by: Nicolas PARLANT --- net-misc/jool/jool-4.1.13.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net-misc/jool/jool-4.1.13.ebuild b/net-misc/jool/jool-4.1.13.ebuild index 144826f3c7..b65e26f78d 100644 --- a/net-misc/jool/jool-4.1.13.ebuild +++ b/net-misc/jool/jool-4.1.13.ebuild @@ -12,13 +12,15 @@ SLOT="0" KEYWORDS="~amd64" IUSE="+iptables" -DEPEND="iptables? ( net-firewall/iptables )" +DEPEND=" + iptables? ( net-firewall/iptables ) + dev-libs/libnl:3 +" RDEPEND=" || ( net-firewall/nftables iptables? ( net-firewall/iptables ) ) - dev-libs/libnl " src_configure() {