diff options
| author | root <root@alpha.trunkmasters.com> | 2026-09-04 03:04:33 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-09-04 03:04:33 -0500 |
| commit | 3b087cb8037b6f474d64a793289ff822cebdf1c8 (patch) | |
| tree | 39205d65894685267f578a7255e5ec028f40e614 /net-misc | |
| parent | b7c761e367074b6c8a81e0c7f64c72564299812c (diff) | |
| download | baldeagleos-repo-3b087cb8037b6f474d64a793289ff822cebdf1c8.tar.gz baldeagleos-repo-3b087cb8037b6f474d64a793289ff822cebdf1c8.tar.xz baldeagleos-repo-3b087cb8037b6f474d64a793289ff822cebdf1c8.zip | |
Adding metadata
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/freerdp/Manifest | 6 | ||||
| -rw-r--r-- | net-misc/freerdp/files/freerdp-3.31.0-debug.patch | 63 | ||||
| -rw-r--r-- | net-misc/freerdp/freerdp-3.29.0.ebuild | 192 | ||||
| -rw-r--r-- | net-misc/freerdp/freerdp-3.30.0.ebuild | 192 | ||||
| -rw-r--r-- | net-misc/freerdp/freerdp-3.31.0-r1.ebuild | 197 | ||||
| -rw-r--r-- | net-misc/freerdp/freerdp-3.31.1.ebuild | 2 | ||||
| -rw-r--r-- | net-misc/gallery-dl/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/gallery-dl/gallery-dl-1.32.10-r1.ebuild (renamed from net-misc/gallery-dl/gallery-dl-1.32.10.ebuild) | 10 | ||||
| -rw-r--r-- | net-misc/gallery-dl/gallery-dl-9999.ebuild | 10 | ||||
| -rw-r--r-- | net-misc/gallery-dl/metadata.xml | 2 | ||||
| -rw-r--r-- | net-misc/kea/files/kea-confd-r4 | 7 | ||||
| -rw-r--r-- | net-misc/kea/files/kea-initd-r5 | 78 | ||||
| -rw-r--r-- | net-misc/kea/kea-3.2.0-r1.ebuild | 335 | ||||
| -rw-r--r-- | net-misc/kea/kea-9999.ebuild | 87 |
14 files changed, 465 insertions, 718 deletions
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 1baa6f6da2a5..f2f01036fa57 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,8 +1,2 @@ -DIST freerdp-3.29.0.tar.gz 11067925 BLAKE2B 2202eae9cca1275b366b6b87935760ec438b10ef0e15222241ee8126b74614938dc47586d51c28e68e1597fc46a0a02130238af7dff5db4fc850d6604e516548 SHA512 daa1dc6d561c5ffa65a422ffbd218a6244dd3eff400759a456f33ead3618461302d13543ae32a41aa188b2e3590f15b143cf158b13f38b235fe992c38c9916f9 -DIST freerdp-3.29.0.tar.gz.asc 228 BLAKE2B 5df8af1b75bfe5eb0be2526908c39d6324c9bbd04219528b84b467e9db875ed4b406e550d8e2a4ca4ee528d405063183d551f98aa405a1361fdc28307a0b3453 SHA512 46373f21988db91fa9179364290e0daf3a8b2d58cc084a6c1fbd5870994b011bebab01b8e9ee32e7df266350fb0a647defaab37aa5d10246f8922b196460d1ff -DIST freerdp-3.30.0.tar.gz 11070523 BLAKE2B 654816d8fede28e5a302f4288481411ae6dc07ab2bd090026e2d92c3d19a896e40b5d8ca79fe45daa7e77459b21b540ef825abd3df1d573a88a59c2dccdcfade SHA512 a7048c67936640779c9a754af35466fe4821b4cf98f68ebeccdbc6793ddf755e53e672390a91cd0440d26b9be9ae65e67689d8e3c9c249ce6971bee3a10c6629 -DIST freerdp-3.30.0.tar.gz.asc 228 BLAKE2B 4ffb2710ca3a24df878a77c350b875c44515a1696a212a99596f3dbb79433ed3a2f066f4aa3187653a579db4a37d0d0b342aac372db0a3803ba8bf0c52fc3673 SHA512 df68f5ff8d0c895202c579b4b14f1dcc0555b6459ba0c73ad82224d8b2f031a88ff35c50a92c9426cc13c64ede138179eaa256a6785a77b78aefb7e55f7c1c24 -DIST freerdp-3.31.0.tar.gz 11106371 BLAKE2B 62b2a227e05a6e96f031888de95281a37db9d0b82a52117a2b88570f0a0e0308469194e5c93542d56bb335ce6091641f2139359ce65daa5394e5e93b72183676 SHA512 3543a32b0204dcdc64deb6d4a410e223dce5c4195de8bc5c5931f569cf184a54441ddf315ca509e6500f79735693372c8f7dd108d94dd187df0da3f935a2c28d -DIST freerdp-3.31.0.tar.gz.asc 228 BLAKE2B 91e961f6987090cb85f9189415620dc8eed578afa5599e698579b0e075a858c3ade2952935e746d3811fc661180facfa53f70a156e1d3156c76e43452634fe1d SHA512 0e001b1ff461fe9eca67e80f0487d9d069c9a188412667a6bf5e3e21a0d5189126fe7b4ae0ee173ba8935ce915d5d1c2d49adc03b5b09bf8ae4863a09de73f98 DIST freerdp-3.31.1.tar.gz 11111567 BLAKE2B 97d47a4daab1341b558212da34c580543fc9c62d5e4fa6ea71b230a8b79b8c5aa2d960aa49294b48f19fcf27f0a6d81cae9c75d3987477c8ff964a1ec71d723b SHA512 708fa170d70c01cbd5b16b2bc0359092114e0158c3a76c38862b58b19bc2757a467656cf0f326cd9e81c366f2a9c1ff11073a099ee81304006556dac0d8b5a7e DIST freerdp-3.31.1.tar.gz.asc 228 BLAKE2B 6b009b8969c06a2123469eadf02a85a18567a541b745b7a7a82324dd3c27faa99f53c05846933ee24001686f4bc297d32d48a9f4d7f82045161d94bf7586f0f5 SHA512 5c9bfc3cb28cc900cce93f9b9f94e41e3e7ed1ee1b87c68d46bed260ddc294bab3035676a2361e8943c5d6be8791c237f89032e04dc772e16d0bc6117d13ded9 diff --git a/net-misc/freerdp/files/freerdp-3.31.0-debug.patch b/net-misc/freerdp/files/freerdp-3.31.0-debug.patch deleted file mode 100644 index 6c7e299c4f52..000000000000 --- a/net-misc/freerdp/files/freerdp-3.31.0-debug.patch +++ /dev/null @@ -1,63 +0,0 @@ -https://bugs.gentoo.org/981480 -https://github.com/FreeRDP/FreeRDP/pull/13283 - -From 6055267480f91dcdfd2060922af778d152a5662a Mon Sep 17 00:00:00 2001 -From: Armin Novak <armin.novak@thincast.com> -Date: Wed, 26 Aug 2026 22:06:58 +0200 -Subject: [PATCH] [debug,logs] fix warnings and errors WITH_DEBUG_ALL - ---- - client/common/client_cliprdr_file.c | 4 ++-- - libfreerdp/codec/include/bitmap.h | 3 ++- - libfreerdp/core/server.c | 2 +- - 3 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/client/common/client_cliprdr_file.c b/client/common/client_cliprdr_file.c -index 5095ab856c75..947bda8cb834 100644 ---- a/client/common/client_cliprdr_file.c -+++ b/client/common/client_cliprdr_file.c -@@ -998,7 +998,7 @@ static BOOL request_file_range_async(CliprdrFileContext* file_context, CliprdrFu - // NOLINTBEGIN(clang-analyzer-unix.Malloc) - DEBUG_CLIPRDR( - file_context->log, -- "Requested file range (%zu Bytes at offset %lu) for file \"%s\" with stream id %u", -+ "Requested file range (%zu Bytes at offset %ld) for file \"%s\" with stream id %u", - requested_size, offset, fuse_file->filename, fuse_request->stream_id); - - return TRUE; -@@ -1104,7 +1104,7 @@ static void cliprdr_file_fuse_readdir(fuse_req_t fuse_req, fuse_ino_t fuse_ino, - return; - } - -- DEBUG_CLIPRDR(file_context->log, "Reading directory \"%s\" at offset %lu", -+ DEBUG_CLIPRDR(file_context->log, "Reading directory \"%s\" at offset %ld", - fuse_file->filename_with_root, offset); - - if ((offset < 0) || ((size_t)offset >= ArrayList_Count(fuse_file->children))) -diff --git a/libfreerdp/codec/include/bitmap.h b/libfreerdp/codec/include/bitmap.h -index 07874dade123..f180fb5abb15 100644 ---- a/libfreerdp/codec/include/bitmap.h -+++ b/libfreerdp/codec/include/bitmap.h -@@ -153,7 +153,8 @@ static inline BOOL RLEDECOMPRESS(const BYTE* WINPR_RESTRICT pbSrcBuffer, UINT32 - code = ExtractCodeId(*pbSrc); - - #if defined(WITH_DEBUG_CODECS) -- WLog_VRB(TAG, "pbSrc=%p code=%s, rem=%" PRIuz, pbSrc, rle_code_str(code), pbEnd - pbSrc); -+ WLog_VRB(TAG, "pbSrc=%p code=%s, rem=%ld", (const void*)pbSrc, rle_code_str(code), -+ pbEnd - pbSrc); - #endif - - /* Handle Background Run Orders. */ -diff --git a/libfreerdp/core/server.c b/libfreerdp/core/server.c -index 9183843f9375..f5a06553eb6c 100644 ---- a/libfreerdp/core/server.c -+++ b/libfreerdp/core/server.c -@@ -375,7 +375,7 @@ static BOOL wts_read_drdynvc_pdu_ready(rdpPeerChannel* channel, wStream* s, UINT - return FALSE; - - DEBUG_DVC("Cmd %s ChannelId %" PRIu32 " length %" PRIuz "", drdynvc_get_packet_type(Cmd), -- ChannelId, length); -+ ChannelId, Stream_GetRemainingLength(s)); - table = channel->vcm->dynamicVirtualChannels; - if (!table) - return FALSE; diff --git a/net-misc/freerdp/freerdp-3.29.0.ebuild b/net-misc/freerdp/freerdp-3.29.0.ebuild deleted file mode 100644 index 3398e4ac12ec..000000000000 --- a/net-misc/freerdp/freerdp-3.29.0.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 2011-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" - case ${PV} in - 2.*) EGIT_BRANCH="stable-2.0";; - esac -else - inherit verify-sig - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz - verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" - KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" - VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="https://www.freerdp.com/" - -LICENSE="Apache-2.0" -SLOT="3" -IUSE="aad alsa camera cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -BDEPEND+=" - virtual/pkgconfig - app-text/docbook-xsl-stylesheets - dev-libs/libxslt -" -COMMON_DEPEND=" - dev-libs/openssl:0= - virtual/zlib:= - aad? ( dev-libs/cJSON ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - fuse? ( sys-fs/fuse:3= ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - X? ( x11-libs/libXrandr ) - ) - icu? ( dev-libs/icu:0= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - kerberos? ( virtual/krb5 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-libs/libpulse ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - client? ( - camera? ( media-libs/libv4l ) - sdl? ( - media-libs/libsdl3 - media-libs/sdl3-ttf - ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND="${COMMON_DEPEND} - test? ( - ffmpeg? ( media-video/ffmpeg:0[x264(-)] ) - ) - valgrind? ( dev-debug/valgrind ) -" -RDEPEND="${COMMON_DEPEND} - !net-misc/freerdp:0 - client? ( !net-misc/freerdp:2[client] ) - server? ( !net-misc/freerdp:2[server] ) - smartcard? ( app-crypt/p11-kit ) -" - -option() { - usex "$1" ON OFF -} - -option_client() { - if use client; then - option "$1" - else - echo OFF - fi -} - -src_configure() { - use debug || append-cppflags -DNDEBUG - local mycmakeargs=( - -Wno-dev - - -DBUILD_TESTING=$(option test) - - # https://bugs.gentoo.org/927037 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF - - -DCHANNEL_URBDRC=$(option usb) - -DCHANNEL_RDPECAM_CLIENT=$(option_client camera) - -DWITH_AAD=$(option aad) - -DWITH_ALSA=$(option alsa) - -DWITH_CCACHE=OFF - -DWITH_CLIENT=$(option client) - -DWITH_CLIENT_SDL2=OFF - -DWITH_CLIENT_SDL3=$(option_client sdl) - -DWITH_SAMPLE=OFF - -DWITH_CUPS=$(option cups) - -DWITH_DEBUG_ALL=$(option debug) - -DWITH_VERBOSE_WINPR_ASSERT=$(option debug) - -DWITH_MANPAGES=ON - -DWITH_FFMPEG=$(option ffmpeg) - -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON - -DWITH_SWSCALE=$(option ffmpeg) - -DWITH_CAIRO=$(option !ffmpeg) - -DWITH_DSP_FFMPEG=$(option ffmpeg) - -DWITH_FUSE=$(option fuse) - -DWITH_GSTREAMER_1_0=$(option gstreamer) - -DWITH_JPEG=$(option jpeg) - -DWITH_KRB5=$(option kerberos) - -DWITH_NEON=$(option cpu_flags_arm_neon) - -DWITH_OPENH264=$(option openh264) - -DWITH_OSS=OFF - -DWITH_PCSC=$(option smartcard) - -DWITH_PKCS11=$(option smartcard) - -DWITH_PULSE=$(option pulseaudio) - -DWITH_SERVER=$(option server) - -DWITH_LIBSYSTEMD=$(option systemd) - -DWITH_UNICODE_BUILTIN=$(option !icu) - -DWITH_VALGRIND_MEMCHECK=$(option valgrind) - -DWITH_X11=$(option X) - -DWITH_XINERAMA=$(option xinerama) - -DWITH_XV=$(option xv) - -DWITH_WAYLAND=$(option_client wayland) - -DWITH_WEBVIEW=OFF - -DWITH_WINPR_TOOLS=$(option server) - ) - cmake_src_configure -} - -src_test() { - # TestBacktrace: bug 930636 - # TestSynchCritical, TestSynchMultipleThreads: bug 951301 - local CMAKE_SKIP_TESTS=( TestBacktrace TestSynchCritical TestSynchMultipleThreads ) - if has network-sandbox ${FEATURES}; then - CMAKE_SKIP_TESTS+=( TestConnect ) - fi - cmake_src_test -} - -src_install() { - cmake_src_install - mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die -} diff --git a/net-misc/freerdp/freerdp-3.30.0.ebuild b/net-misc/freerdp/freerdp-3.30.0.ebuild deleted file mode 100644 index e3a36bfd8578..000000000000 --- a/net-misc/freerdp/freerdp-3.30.0.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 2011-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" - case ${PV} in - 2.*) EGIT_BRANCH="stable-2.0";; - esac -else - inherit verify-sig - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz - verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" - VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="https://www.freerdp.com/" - -LICENSE="Apache-2.0" -SLOT="3" -IUSE="aad alsa camera cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -BDEPEND+=" - virtual/pkgconfig - app-text/docbook-xsl-stylesheets - dev-libs/libxslt -" -COMMON_DEPEND=" - dev-libs/openssl:0= - virtual/zlib:= - aad? ( dev-libs/cJSON ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - fuse? ( sys-fs/fuse:3= ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - X? ( x11-libs/libXrandr ) - ) - icu? ( dev-libs/icu:0= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - kerberos? ( virtual/krb5 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-libs/libpulse ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - client? ( - camera? ( media-libs/libv4l ) - sdl? ( - media-libs/libsdl3 - media-libs/sdl3-ttf - ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND="${COMMON_DEPEND} - test? ( - ffmpeg? ( media-video/ffmpeg:0[x264(-)] ) - ) - valgrind? ( dev-debug/valgrind ) -" -RDEPEND="${COMMON_DEPEND} - !net-misc/freerdp:0 - client? ( !net-misc/freerdp:2[client] ) - server? ( !net-misc/freerdp:2[server] ) - smartcard? ( app-crypt/p11-kit ) -" - -option() { - usex "$1" ON OFF -} - -option_client() { - if use client; then - option "$1" - else - echo OFF - fi -} - -src_configure() { - use debug || append-cppflags -DNDEBUG - local mycmakeargs=( - -Wno-dev - - -DBUILD_TESTING=$(option test) - - # https://bugs.gentoo.org/927037 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF - - -DCHANNEL_URBDRC=$(option usb) - -DCHANNEL_RDPECAM_CLIENT=$(option_client camera) - -DWITH_AAD=$(option aad) - -DWITH_ALSA=$(option alsa) - -DWITH_CCACHE=OFF - -DWITH_CLIENT=$(option client) - -DWITH_CLIENT_SDL2=OFF - -DWITH_CLIENT_SDL3=$(option_client sdl) - -DWITH_SAMPLE=OFF - -DWITH_CUPS=$(option cups) - -DWITH_DEBUG_ALL=$(option debug) - -DWITH_VERBOSE_WINPR_ASSERT=$(option debug) - -DWITH_MANPAGES=ON - -DWITH_FFMPEG=$(option ffmpeg) - -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON - -DWITH_SWSCALE=$(option ffmpeg) - -DWITH_CAIRO=$(option !ffmpeg) - -DWITH_DSP_FFMPEG=$(option ffmpeg) - -DWITH_FUSE=$(option fuse) - -DWITH_GSTREAMER_1_0=$(option gstreamer) - -DWITH_JPEG=$(option jpeg) - -DWITH_KRB5=$(option kerberos) - -DWITH_NEON=$(option cpu_flags_arm_neon) - -DWITH_OPENH264=$(option openh264) - -DWITH_OSS=OFF - -DWITH_PCSC=$(option smartcard) - -DWITH_PKCS11=$(option smartcard) - -DWITH_PULSE=$(option pulseaudio) - -DWITH_SERVER=$(option server) - -DWITH_LIBSYSTEMD=$(option systemd) - -DWITH_UNICODE_BUILTIN=$(option !icu) - -DWITH_VALGRIND_MEMCHECK=$(option valgrind) - -DWITH_X11=$(option X) - -DWITH_XINERAMA=$(option xinerama) - -DWITH_XV=$(option xv) - -DWITH_WAYLAND=$(option_client wayland) - -DWITH_WEBVIEW=OFF - -DWITH_WINPR_TOOLS=$(option server) - ) - cmake_src_configure -} - -src_test() { - # TestBacktrace: bug 930636 - # TestSynchCritical, TestSynchMultipleThreads: bug 951301 - local CMAKE_SKIP_TESTS=( TestBacktrace TestSynchCritical TestSynchMultipleThreads ) - if has network-sandbox ${FEATURES}; then - CMAKE_SKIP_TESTS+=( TestConnect ) - fi - cmake_src_test -} - -src_install() { - cmake_src_install - mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die -} diff --git a/net-misc/freerdp/freerdp-3.31.0-r1.ebuild b/net-misc/freerdp/freerdp-3.31.0-r1.ebuild deleted file mode 100644 index 7c228858a6e0..000000000000 --- a/net-misc/freerdp/freerdp-3.31.0-r1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 2011-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" - case ${PV} in - 2.*) EGIT_BRANCH="stable-2.0";; - esac -else - inherit verify-sig - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz - verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" - VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="https://www.freerdp.com/" - -LICENSE="Apache-2.0" -SLOT="3" -IUSE="aad alsa camera cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -BDEPEND+=" - virtual/pkgconfig - app-text/docbook-xsl-stylesheets - dev-libs/libxslt -" -COMMON_DEPEND=" - dev-libs/openssl:0= - virtual/zlib:= - aad? ( dev-libs/cJSON ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - fuse? ( sys-fs/fuse:3= ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - X? ( x11-libs/libXrandr ) - ) - icu? ( dev-libs/icu:0= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - kerberos? ( virtual/krb5 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-libs/libpulse ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - client? ( - camera? ( media-libs/libv4l ) - sdl? ( - media-libs/libsdl3 - media-libs/sdl3-ttf - ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND="${COMMON_DEPEND} - test? ( - ffmpeg? ( media-video/ffmpeg:0[x264(-)] ) - ) - valgrind? ( dev-debug/valgrind ) -" -RDEPEND="${COMMON_DEPEND} - !net-misc/freerdp:0 - client? ( !net-misc/freerdp:2[client] ) - server? ( !net-misc/freerdp:2[server] ) - smartcard? ( app-crypt/p11-kit ) -" - -PATCHES=( - "${FILESDIR}/freerdp-3.31.0-debug.patch" -) - -option() { - usex "$1" ON OFF -} - -option_client() { - if use client; then - option "$1" - else - echo OFF - fi -} - -src_configure() { - use debug || append-cppflags -DNDEBUG - local mycmakeargs=( - -Wno-dev - - -DBUILD_TESTING=$(option test) - - # https://bugs.gentoo.org/927037 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF - - -DCHANNEL_URBDRC=$(option usb) - -DCHANNEL_RDPECAM_CLIENT=$(option_client camera) - -DWITH_AAD=$(option aad) - -DWITH_ALSA=$(option alsa) - -DWITH_CCACHE=OFF - -DWITH_CLIENT=$(option client) - -DWITH_CLIENT_SDL2=OFF - -DWITH_CLIENT_SDL3=$(option_client sdl) - -DWITH_SAMPLE=OFF - -DWITH_CUPS=$(option cups) - -DWITH_DEBUG_ALL=$(option debug) - -DWITH_VERBOSE_WINPR_ASSERT=$(option debug) - -DWITH_MANPAGES=ON - -DWITH_FFMPEG=$(option ffmpeg) - -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON - -DWITH_SWSCALE=$(option ffmpeg) - -DWITH_CAIRO=$(option !ffmpeg) - -DWITH_DSP_FFMPEG=$(option ffmpeg) - -DWITH_FUSE=$(option fuse) - -DWITH_GSTREAMER_1_0=$(option gstreamer) - -DWITH_JPEG=$(option jpeg) - -DWITH_KRB5=$(option kerberos) - -DWITH_NEON=$(option cpu_flags_arm_neon) - -DWITH_OPENH264=$(option openh264) - -DWITH_OSS=OFF - -DWITH_PCSC=$(option smartcard) - -DWITH_PKCS11=$(option smartcard) - -DWITH_PULSE=$(option pulseaudio) - -DWITH_SERVER=$(option server) - -DWITH_LIBSYSTEMD=$(option systemd) - -DWITH_UNICODE_BUILTIN=$(option !icu) - -DWITH_VALGRIND_MEMCHECK=$(option valgrind) - -DWITH_X11=$(option X) - -DWITH_XINERAMA=$(option xinerama) - -DWITH_XV=$(option xv) - -DWITH_WAYLAND=$(option_client wayland) - -DWITH_WEBVIEW=OFF - # https://bugs.gentoo.org/981523 - #-DWITH_WINPR_TOOLS=$(option server) - ) - cmake_src_configure -} - -src_test() { - # TestBacktrace: bug 930636 - # TestSynchCritical, TestSynchMultipleThreads: bug 951301 - local CMAKE_SKIP_TESTS=( TestBacktrace TestSynchCritical TestSynchMultipleThreads ) - if has network-sandbox ${FEATURES}; then - CMAKE_SKIP_TESTS+=( TestConnect ) - fi - cmake_src_test -} - -src_install() { - cmake_src_install - mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die -} diff --git a/net-misc/freerdp/freerdp-3.31.1.ebuild b/net-misc/freerdp/freerdp-3.31.1.ebuild index ff26f7257c8b..00793ccacb25 100644 --- a/net-misc/freerdp/freerdp-3.31.1.ebuild +++ b/net-misc/freerdp/freerdp-3.31.1.ebuild @@ -17,7 +17,7 @@ else S="${WORKDIR}/${MY_P}" SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" - KEYWORDS="~alpha ~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" fi diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index f59cecc80066..c4b429382b15 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -1,4 +1,4 @@ -DIST gallery-dl-1.32.10.gh.tar.gz 1145881 BLAKE2B 1fcd613e5b7f42c2d6ab620a86a442074152c9d2b229d986debf1b8745512f888d166781e723d411fdeddb92c91e2fc68294146a8b1e1b530005934afae92d89 SHA512 8c09c43eb51280a26e43e9c497e760a3c44fbb39c5fe2b5f93277aee7800b48e96c7caf9e8aa0f6e928cf83decfc18cae0b7fcd86f8bde2047ebeef6194afb1b +DIST gallery-dl-1.32.10.codeberg.tar.gz 1271009 BLAKE2B 340375456255e7495827cf620f64da8405c366df6b35461a057697d3d0bc09e95c4785d10d6b666a92be99bfa2da94891a0367c9919b31d2e490cc57fbc4329e SHA512 ef83fb0538331dd4bc5cc612078db17a2179c83de6a4081f20ff3c612195a5df97b38ef4e50c1d55b30634d2b9863495f926ce076f15c1d43ac631311266551c DIST gallery-dl-1.32.6.gh.tar.gz 1144576 BLAKE2B 4056a43b7caf99812faee983417ebe8257a83e997f4f25e7a2542ebf2d9d239ad2dadd489f301337ccf428cef0ee0ca1c2ee4ba57dbcb156ef0fe10d5be75810 SHA512 1eee3701083bc487527433c8b367963cd43ab583fc7d8839b0470c1bffbc7ed13defb823e3c1906105b49500587ccdf42af87a5790dcd6475a0e3e925becab26 DIST gallery-dl-1.32.8.gh.tar.gz 1144378 BLAKE2B 619c745592448d90ad8b62c88bc9fc216f0b34f114c7d22761338a61605d1244617fc6a65db0f3bdfba52aac5e1512b6a73e9b18fde3a88eb8b40806124b8974 SHA512 8dcf9df4b364decf9daa5f3e48c157c534ee467a4f17398a905adf6b3fb9e4cc2832851063fe31657f09f8abd0e9971e5c4149f690fd5172127c162e4dcc1068 DIST gallery-dl-1.32.9.gh.tar.gz 1144928 BLAKE2B 6c0776849259d48a2c4822d4aeb330c3e58e6b3efca5d0439d7ecef4b06ed62be8b5a03115b0640f8bb589ebf463281cd5ee8ab3aafe780e3a64e9a782e7f519 SHA512 9bfcd4a68af20e882260cd7a821877a8d64a711df246e968d541993020e791fc877520eae4c520ada50821c25538e68024e4505fe9ac0f4cbd947bb1981606c9 diff --git a/net-misc/gallery-dl/gallery-dl-1.32.10.ebuild b/net-misc/gallery-dl/gallery-dl-1.32.10-r1.ebuild index b3ff03178a27..a4b1349cec6a 100644 --- a/net-misc/gallery-dl/gallery-dl-1.32.10.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.32.10-r1.ebuild @@ -10,14 +10,16 @@ DISTUTILS_USE_PEP517="setuptools" inherit distutils-r1 optfeature DESCRIPTION="Download image galleries and collections from several image hosting sites" -HOMEPAGE="https://github.com/mikf/gallery-dl/" +HOMEPAGE="https://codeberg.org/mikf/gallery-dl/ + https://github.com/mikf/gallery-dl/" if [[ "${PV}" == *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/mikf/${PN}" + EGIT_REPO_URI="https://codeberg.org/mikf/${PN}" else - SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz" + SRC_URI="https://codeberg.org/mikf/${PN}/archive/v${PV}.tar.gz + -> ${P}.codeberg.tar.gz" + S="${WORKDIR}/${PN}" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" fi diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild index b3ff03178a27..a4b1349cec6a 100644 --- a/net-misc/gallery-dl/gallery-dl-9999.ebuild +++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild @@ -10,14 +10,16 @@ DISTUTILS_USE_PEP517="setuptools" inherit distutils-r1 optfeature DESCRIPTION="Download image galleries and collections from several image hosting sites" -HOMEPAGE="https://github.com/mikf/gallery-dl/" +HOMEPAGE="https://codeberg.org/mikf/gallery-dl/ + https://github.com/mikf/gallery-dl/" if [[ "${PV}" == *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/mikf/${PN}" + EGIT_REPO_URI="https://codeberg.org/mikf/${PN}" else - SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz" + SRC_URI="https://codeberg.org/mikf/${PN}/archive/v${PV}.tar.gz + -> ${P}.codeberg.tar.gz" + S="${WORKDIR}/${PN}" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" fi diff --git a/net-misc/gallery-dl/metadata.xml b/net-misc/gallery-dl/metadata.xml index 53ec7d516144..a376b93d1700 100644 --- a/net-misc/gallery-dl/metadata.xml +++ b/net-misc/gallery-dl/metadata.xml @@ -6,7 +6,7 @@ <name>Maciej Barć</name> </maintainer> <upstream> - <bugs-to>https://github.com/mikf/gallery-dl/issues/</bugs-to> + <bugs-to>https://codeberg.org/mikf/gallery-dl/issues/</bugs-to> </upstream> <stabilize-allarches /> <longdescription> diff --git a/net-misc/kea/files/kea-confd-r4 b/net-misc/kea/files/kea-confd-r4 new file mode 100644 index 000000000000..a39610acadc7 --- /dev/null +++ b/net-misc/kea/files/kea-confd-r4 @@ -0,0 +1,7 @@ +# KEA_SVC must be defined here! +# Available values: dhcp4 dhcp6 dhcp-ddns +KEA_SVC="@KEA_SVC@" + +#KEA_USER=dhcp +#KEA_GROUP=dhcp +#KEA_CONFIG=/etc/kea/kea-@KEA_SVC@.conf diff --git a/net-misc/kea/files/kea-initd-r5 b/net-misc/kea/files/kea-initd-r5 new file mode 100644 index 000000000000..0208b21d4678 --- /dev/null +++ b/net-misc/kea/files/kea-initd-r5 @@ -0,0 +1,78 @@ +#!/sbin/openrc-run +# Copyright 2025-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${KEA_USER:=dhcp} +: ${KEA_GROUP:=dhcp} +: ${KEA_CONFIG:=/etc/kea/${RC_SVCNAME}.conf} + +description="kea ${KEA_SVC} services" +command="/usr/sbin/kea-${KEA_SVC}" +command_args="-c ${KEA_CONFIG}" +command_user="${KEA_USER}:${KEA_GROUP}" +pidfile="/run/kea/$(basename ${KEA_CONFIG%.*}).kea-${KEA_SVC}.pid" +required_files="${KEA_CONFIG}" +start_stop_daemon_args="--background" + +extra_commands="check_kea_svc checkconfig" +extra_started_commands="reload" + +check_kea_svc() { + if [ "${RC_SVCNAME}" = "kea" ]; then + eerror "You are not supposed to run this script directly." + eerror "Create a symlink for the kea service you want to run." + eerror "Symlinks should have been created during installation." + return 1 + fi + + case "${KEA_SVC}" in + dhcp4) + capabilities="^cap_net_bind_service,^cap_net_raw" + ;; + dhcp6|dhcp-ddns) + capabilities="^cap_net_bind_service" + ;; + *) + eerror "KEA_SVC is undefined or invalid!" + eerror "It should be defined in /etc/conf.d/${RC_SVCNAME}" + return 1 + ;; + esac +} + +checkconfig() { + ${command} -t ${KEA_CONFIG} 1>/dev/null || return 1 +} + +reload() { + checkconfig || return 1 + ebegin "Reloading ${RC_SVCNAME}" + start-stop-daemon --signal HUP --pidfile ${pidfile} + eend $? +} + +start_pre() { + check_kea_svc || return 1 + + if [ $(stat -c "%U:%G" ${KEA_CONFIG}) != "root:${KEA_GROUP}" ] ; then + eerror "${KEA_CONFIG} config file is not owned by root:${KEA_GROUP}" + eerror "you should reset the ownership:" + eerror "chown root:${KEA_GROUP} ${KEA_CONFIG}" + return 1 + fi + + if [ "${RC_CMD}" != "restart" ]; then + checkconfig || return 1 + fi +} + +start_post() { + # Kea creates the pidfile only after it has started successfully. + ewaitfile "${STARTUP_TIMEOUT:-1}" "${pidfile}" +} + +stop_pre() { + if [ "${RC_CMD}" = "restart" ]; then + checkconfig || return 1 + fi +} diff --git a/net-misc/kea/kea-3.2.0-r1.ebuild b/net-misc/kea/kea-3.2.0-r1.ebuild new file mode 100644 index 000000000000..ad055115322a --- /dev/null +++ b/net-misc/kea/kea-3.2.0-r1.ebuild @@ -0,0 +1,335 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{13..14} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc +inherit eapi9-ver flag-o-matic meson python-r1 systemd tmpfiles +inherit toolchain-funcs verify-sig + +DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" +HOMEPAGE="https://www.isc.org/kea/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.isc.org/isc-projects/kea.git" +else + SRC_URI=" + https://downloads.isc.org/isc/kea/${PV}/${P}.tar.xz + !doc? ( https://codeberg.org/peter1010/kea-manpages/archive/kea-manpages-${PV}.tar.gz ) + verify-sig? ( https://downloads.isc.org/isc/kea/${PV}/${P}.tar.xz.asc ) + " + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="MPL-2.0" +SLOT="0" +IUSE="debug doc kerberos mysql +openssl postgres selinux shell test" + +REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + >=dev-libs/boost-1.66:= + dev-libs/log4cplus:= + kerberos? ( virtual/krb5 ) + mysql? ( + app-arch/zstd:= + dev-db/mysql-connector-c:= + dev-libs/openssl:= + virtual/zlib:= + ) + !openssl? ( dev-libs/botan:3=[boost] ) + openssl? ( dev-libs/openssl:0= ) + postgres? ( dev-db/postgresql:* ) + shell? ( ${PYTHON_DEPS} ) +" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) +" +RDEPEND="${COMMON_DEPEND} + acct-group/dhcp + acct-user/dhcp + selinux? ( sec-policy/selinux-dhcp ) +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/meson-1.8 + virtual/pkgconfig + doc? ( + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + ) + verify-sig? ( sec-keys/openpgp-keys-isc ) +" + +python_check_deps() { + use doc || return 0 + python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" \ + "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && python_setup +} + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + return + fi + + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} + fi + + default +} + +src_prepare() { + default + + # Fix up all doc paths, whether or not we are installing full set of docs + sed -e "s:'doc/kea':'doc/${PF}':" \ + -i meson.build || die + sed -e "s:'share/doc/kea':'share/doc/${PF}':" \ + -i doc/meson.build || die + sed -e "s:'doc/kea':'doc/${PF}':" \ + -i doc/sphinx/meson.build || die + sed -e "s:share/doc/kea/:share/doc/${PF}/:" \ + -i doc/sphinx/arm/install.rst || die + sed -e "s:share/doc/kea/examples:share/doc/${PF}/examples:" \ + -i doc/sphinx/arm/config.rst || die + + # set shebang before meson whether or not we are installing the shell + sed -e 's:^#!@PYTHON@:#!/usr/bin/env python3:' \ + -i src/bin/shell/kea-shell.in || die + + # Don't allow meson to install shell, we shall do that if required + sed -e 's:install\: true:install\: false:' \ + -i src/bin/shell/meson.build || die + + # do not create /run + sed -e '/^install_emptydir(RUNSTATEDIR/d' \ + -i meson.build || die +} + +src_configure() { + # https://bugs.gentoo.org/861617 + # https://gitlab.isc.org/isc-projects/kea/-/issues/3946 + # + # Upstream does not support LTO + filter-lto + + if use !openssl; then + append-cxxflags -std=c++20 + fi + + # Note: https://gitlab.isc.org/isc-projects/kea/-/issues/4171 suggests patching meson.build to set umask, + # instead here we pass install-umask as an argument to do the same thing, i.e. control permissions on + # installed files. + local emesonargs=( + --localstatedir="${EPREFIX}/var" + -Drunstatedir="${EPREFIX}/run" + $(meson_feature kerberos krb5) + -Dnetconf=disabled + -Dcrypto=$(usex openssl openssl botan) + $(meson_feature mysql) + $(meson_feature postgres postgresql) + $(meson_feature test tests) + --install-umask=0o023 + ) + if use debug; then + emesonargs+=( + --debug + ) + fi + meson_src_configure +} + +src_compile() { + meson_src_compile + + use doc && meson_src_compile doc +} + +src_test() { + # Get list of all test suites into an associative array + # the meson test --list returns either "kea / test_suite", "kea:shell-tests / test_suite" or + # "kea:python-tests / test_suite" + # Note: In meson >= 1.10 the format has changed to + # the meson test --list returns either "kea:test_suite", "shell-tests - kea:test_suite" or + # "python-tests - kea:test_suite" + # + # Discard the shell tests as we can't run shell tests in sandbox + + pushd "${BUILD_DIR}" || die + + local -A test_suites + local -a words + while IFS="/: " read -ra words ; do + if [[ "${words[0]}" != "shell-tests" ]] && [[ "${words[2]}" != "shell-tests" ]]; then + test_suites["${words[-1]}"]=1 + fi + done < <(meson test --list || die) + popd || die + + # Some other tests will fail for interface access restrictions, we have to remove the test suites those tests + # belong to + local -a skip_tests=( + dhcp-radius-tests + kea-log-buffer_logger_test.sh + kea-log-console_test.sh + dhcp-lease-query-tests + kea-dhcp6-tests + kea-dhcp4-tests + kea-dhcp-tests + ) + + # skip shell tests that require a running instance of MySQL + if use mysql; then + skip_tests+=( + kea-mysql-tests + dhcp-mysql-lib-tests + dhcp-forensic-log-libload-tests + ) + fi + + # skip shell tests that require a running instance of PgSQL + if use postgres; then + skip_tests+=( + kea-pgsql-tests + dhcp-pgsql-lib-tests + dhcp-forensic-log-libload-tests + ) + fi + + if use kerberos; then + skip_tests+=( + ddns-gss-tsig-tests + ) + fi + + if [[ $(tc-get-ptr-size) -eq 4 ]]; then + # see https://bugs.gentoo.org/958171 for reason for skipping these tests + skip_tests+=( + kea-util-tests + kea-dhcpsrv-tests + dhcp-ha-lib-tests + kea-d2-tests + ) + fi + + local name + for name in ${skip_tests[@]}; do + unset -v 'test_suites[${name}]' + done + + meson_src_test "${!test_suites[@]}" +} + +install_shell() { + local orig_build_dir=$1 + python_domodule "${orig_build_dir}"/src/bin/shell/*.py + python_doscript "${orig_build_dir}"/src/bin/shell/kea-shell + + # fix path to import kea modules + sed -e "/^sys.path.append/s|(.*)|('$(python_get_sitedir)/${PN}')|" \ + -i "${ED}"/usr/lib/python-exec/${EPYTHON}/kea-shell || die +} + +src_install() { + meson_install + + # Remove unused database files + if use !mysql; then + rm -r "${ED}"/usr/share/kea/scripts/mysql || die + fi + if use !postgres; then + rm -r "${ED}"/usr/share/kea/scripts/pgsql || die + fi + + # No easy way to control how meson_install sets permissions in meson < 1.9 + # So make sure permissions are same as in previous versions of kea + # To avoid any differences between an update vers first time install + fperms -R 0755 /usr/sbin + fperms -R 0755 /usr/bin + fperms -R 0755 /usr/$(get_libdir) + + if use shell; then + python_moduleinto ${PN} + python_foreach_impl install_shell "${BUILD_DIR}" + fi + + # We don't use keactrl.conf so move to reduce confusion + mv "${ED}"/etc/${PN}/keactrl.conf "${ED}"/usr/share/doc/${PF}/examples/keactrl.conf || die + + fowners -R root:dhcp /etc/${PN} + + # A side effect of using install_umask 023 in meson setup is setting config files to be world readable + # lets not do that + fperms -R 0750 /etc/${PN} + chmod 0640 "${ED}"/etc/${PN}/*.conf || die + + # Install a conf per service and a linked init script per service + newinitd "${FILESDIR}"/${PN}-initd-r5 ${PN} + local svc + for svc in dhcp4 dhcp6 dhcp-ddns; do + newconfd "${FILESDIR}"/${PN}-confd-r4 kea-${svc} + sed -e "s:@KEA_SVC@:${svc}:g" \ + -i "${ED}"/etc/conf.d/kea-${svc} || die + dosym kea "${EPREFIX}"/etc/init.d/kea-${svc} + done + + if use !doc; then + doman "${WORKDIR}"/kea-manpages/man/* + fi + + systemd_newunit "${FILESDIR}"/${PN}-dhcp-ddns.service-r2 ${PN}-dhcp-ddns.service + systemd_newunit "${FILESDIR}"/${PN}-dhcp4.service-r2 ${PN}-dhcp4.service + systemd_newunit "${FILESDIR}"/${PN}-dhcp6.service-r2 ${PN}-dhcp6.service + + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf + + keepdir /var/lib/${PN} /var/log/${PN} + fowners -R dhcp:dhcp /var/lib/${PN} /var/log/${PN} + fperms 750 /var/lib/${PN} /var/log/${PN} +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf + + if ver_replacing -lt 2.6; then + ewarn "Several changes have been made for daemons:" + ewarn " To comply with common practices for this package," + ewarn " config paths by default has been changed as below:" + ewarn " /etc/kea/kea-dhcp4.conf" + ewarn " /etc/kea/kea-dhcp6.conf" + ewarn " /etc/kea/kea-dhcp-ddns.conf" + ewarn + ewarn " Daemons are launched by default with the unprivileged user 'dhcp'" + ewarn + ewarn "Please check your configuration!" + fi + + if ver_replacing -lt 3.0; then + ewarn "Make sure that ${EPREFIX}/var/lib/kea and all the files in it are owned by dhcp:" + ewarn "chown -R dhcp:dhcp ${EPREFIX}/var/lib/kea" + ewarn + ewarn "If using openrc;" + ewarn " There are now separate conf.d scripts and associated init.d per daemon!" + ewarn " Each Daemon needs to be launched separately, i.e. the daemons are" + ewarn " kea-dhcp4" + ewarn " kea-dhcp6" + ewarn " kea-dhcp-ddns" + ewarn "Please adjust your service startups appropriately" + fi + + if ! has_version net-misc/kea; then + elog "See examples of config files in:" + elog " ${EROOT}/usr/share/doc/${PF}/examples" + fi +} diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 4b59b16e4ec3..7e7acad9111b 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{13..14} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc -inherit eapi9-ver flag-o-matic meson python-r1 systemd tmpfiles +inherit flag-o-matic meson python-r1 systemd tmpfiles inherit toolchain-funcs verify-sig DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" @@ -66,7 +66,7 @@ BDEPEND=" " python_check_deps() { - use doc || return 0; + use doc || return 0 python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" \ "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" } @@ -76,7 +76,7 @@ pkg_setup() { } src_unpack() { - if [[ ${PV} == 9999 ]] ; then + if [[ ${PV} == 9999 ]]; then git-r3_src_unpack return fi @@ -112,7 +112,7 @@ src_prepare() { -i src/bin/shell/meson.build || die # do not create /run - sed -e '/^install_emptydir(RUNSTATEDIR)$/d' \ + sed -e '/^install_emptydir(RUNSTATEDIR/d' \ -i meson.build || die } @@ -120,7 +120,7 @@ src_configure() { # https://bugs.gentoo.org/861617 # https://gitlab.isc.org/isc-projects/kea/-/issues/3946 # - # Kea Devs say no to LTO + # Upstream does not support LTO filter-lto if use !openssl; then @@ -152,8 +152,6 @@ src_configure() { src_compile() { meson_src_compile - # Note: If you want man pages doc use has to be set. This may change - # in the future and be like 2.6.3 where man pages were part of the release tarball use doc && meson_src_compile doc } @@ -168,18 +166,19 @@ src_test() { # Discard the shell tests as we can't run shell tests in sandbox pushd "${BUILD_DIR}" || die - local -A TEST_SUITES - while IFS="/: " read -a words ; do + local -A test_suites + local -a words + while IFS="/: " read -ra words ; do if [[ "${words[0]}" != "shell-tests" ]] && [[ "${words[2]}" != "shell-tests" ]]; then - TEST_SUITES["${words[-1]}"]=1 + test_suites["${words[-1]}"]=1 fi done < <(meson test --list || die) - popd + popd || die # Some other tests will fail for interface access restrictions, we have to remove the test suites those tests # belong to - local SKIP_TESTS=( + local -a skip_tests=( dhcp-radius-tests kea-log-buffer_logger_test.sh kea-log-console_test.sh @@ -191,31 +190,31 @@ src_test() { # skip shell tests that require a running instance of MySQL if use mysql; then - SKIP_TESTS+=( + skip_tests+=( kea-mysql-tests dhcp-mysql-lib-tests - dhcp-forensic-log-libloadtests + dhcp-forensic-log-libload-tests ) fi # skip shell tests that require a running instance of PgSQL if use postgres; then - SKIP_TESTS+=( + skip_tests+=( kea-pgsql-tests dhcp-pgsql-lib-tests - dhcp-forensic-log-libloadtests + dhcp-forensic-log-libload-tests ) fi if use kerberos; then - SKIP_TESTS+=( + skip_tests+=( ddns-gss-tsig-tests ) fi if [[ $(tc-get-ptr-size) -eq 4 ]]; then # see https://bugs.gentoo.org/958171 for reason for skipping these tests - SKIP_TESTS+=( + skip_tests+=( kea-util-tests kea-dhcpsrv-tests dhcp-ha-lib-tests @@ -223,16 +222,18 @@ src_test() { ) fi - for SKIP in ${SKIP_TESTS[@]}; do - unset TEST_SUITES["${SKIP}"] + local name + for name in ${skip_tests[@]}; do + unset -v 'test_suites[${name}]' done - meson_src_test ${!TEST_SUITES[@]} + meson_src_test "${!test_suites[@]}" } install_shell() { - python_domodule ${ORIG_BUILD_DIR}/src/bin/shell/*.py - python_doscript ${ORIG_BUILD_DIR}/src/bin/shell/kea-shell + local orig_build_dir=$1 + python_domodule "${orig_build_dir}"/src/bin/shell/*.py + python_doscript "${orig_build_dir}"/src/bin/shell/kea-shell # fix path to import kea modules sed -e "/^sys.path.append/s|(.*)|('$(python_get_sitedir)/${PN}')|" \ @@ -242,7 +243,7 @@ install_shell() { src_install() { meson_install - # Tidy up + # Remove build metadata and unused database files rm -r "${ED}"/usr/share/kea/meson-info || die if use !mysql; then rm -r "${ED}"/usr/share/kea/scripts/mysql || die @@ -260,7 +261,7 @@ src_install() { if use shell; then python_moduleinto ${PN} - ORIG_BUILD_DIR=${BUILD_DIR} python_foreach_impl install_shell + python_foreach_impl install_shell "${BUILD_DIR}" fi # We don't use keactrl.conf so move to reduce confusion @@ -274,16 +275,16 @@ src_install() { chmod 0640 "${ED}"/etc/${PN}/*.conf || die # Install a conf per service and a linked init script per service - newinitd "${FILESDIR}"/${PN}-initd-r4 ${PN} + newinitd "${FILESDIR}"/${PN}-initd-r5 ${PN} + local svc - for svc in dhcp4 dhcp6 dhcp-ddns ctrl-agent; do - newconfd "${FILESDIR}"/${PN}-confd-r3 kea-${svc} + for svc in dhcp4 dhcp6 dhcp-ddns; do + newconfd "${FILESDIR}"/${PN}-confd-r4 kea-${svc} sed -e "s:@KEA_SVC@:${svc}:g" \ -i "${ED}"/etc/conf.d/kea-${svc} || die dosym kea "${EPREFIX}"/etc/init.d/kea-${svc} done - systemd_newunit "${FILESDIR}"/${PN}-ctrl-agent.service-r2 ${PN}-ctrl-agent.service systemd_newunit "${FILESDIR}"/${PN}-dhcp-ddns.service-r2 ${PN}-dhcp-ddns.service systemd_newunit "${FILESDIR}"/${PN}-dhcp4.service-r2 ${PN}-dhcp4.service systemd_newunit "${FILESDIR}"/${PN}-dhcp6.service-r2 ${PN}-dhcp6.service @@ -298,34 +299,6 @@ src_install() { pkg_postinst() { tmpfiles_process ${PN}.conf - if ver_replacing -lt 2.6; then - ewarn "Several changes have been made for daemons:" - ewarn " To comply with common practices for this package," - ewarn " config paths by default has been changed as below:" - ewarn " /etc/kea/kea-dhcp4.conf" - ewarn " /etc/kea/kea-dhcp6.conf" - ewarn " /etc/kea/kea-dhcp-ddns.conf" - ewarn " /etc/kea/kea-ctrl-agent.conf" - ewarn - ewarn " Daemons are launched by default with the unprivileged user 'dhcp'" - ewarn - ewarn "Please check your configuration!" - fi - - if ver_replacing -lt 3.0; then - ewarn "Make sure that ${EPREFIX}/var/lib/kea and all the files in it are owned by dhcp:" - ewarn "chown -R dhcp:dhcp ${EPREFIX}/var/lib/kea" - ewarn - ewarn "If using openrc;" - ewarn " There are now separate conf.d scripts and associated init.d per daemon!" - ewarn " Each Daemon needs to be launched separately, i.e. the daemons are" - ewarn " kea-dhcp4" - ewarn " kea-dhcp6" - ewarn " kea-dhcp-ddns" - ewarn " kea-ctrl" - ewarn "Please adjust your service startups appropriately" - fi - if ! has_version net-misc/kea; then elog "See examples of config files in:" elog " ${EROOT}/usr/share/doc/${PF}/examples" |
