diff --git a/app-admin/pulumi-bin/Manifest b/app-admin/pulumi-bin/Manifest index f58f9eb2f9..063252a9cd 100644 --- a/app-admin/pulumi-bin/Manifest +++ b/app-admin/pulumi-bin/Manifest @@ -1,3 +1,3 @@ -DIST pulumi-v3.104.2-linux-x64.tar.gz 155082196 BLAKE2B f446ae9311b9afa8ff123fa787bd2131c656acc5499eb068eb71d4ff9d6672c6919c4fdd56675a5e11b0ec8244bd6891cdc3e76504a69ed12a90a974b3a8e402 SHA512 fccc0cb2011f49ef29aabc9992d9b9993fa41c54eeacc8771d77ff3ba058d7993d1771af70c4c189bfecbc344f311824d88dc93625c94d13afe8f054ddb8eb19 DIST pulumi-v3.105.0-linux-x64.tar.gz 155107676 BLAKE2B 29e55bdc259f5fe3c7b02b1c309c12aea5b607c43dd426071b5c9e3bf1cd580b03237d8487c0347ef5f181a814e032e0977c6ef6a38cfbd4a3a0f06f4eaa24e8 SHA512 c2c0d3572d26e7f9e3243ce07ac6130c60e8986684ad9c49833b814af07fadee4b7b2371427927c5b094719cfd41ea281fd71c866408a44129e7e35b6341ad3c DIST pulumi-v3.106.0-linux-x64.tar.gz 157770055 BLAKE2B a7dc4d5e5bd8756dbdbf906041934528c41fbc49afa0a387f61fd54ac0c87abf28f1ae2270f79bbf507c9028bc1c9fccbca8a75096a43e8d71e79650db1fce6a SHA512 6008714083062336f90b4409bb9fec924f1f62f4cc63456c9826e2aac4a99a9772a930642a0f42dcfa67a179dbc5e3b5492ebad9997476167aa5bb65dae57787 +DIST pulumi-v3.107.0-linux-x64.tar.gz 157901430 BLAKE2B 70df3bd37659a2de9dcc1c6d2b9e752c6e123a0e8a8ea6e578e2b1a825e64ece28418097a3abb58f944bd33480948cf5431a0e9f6ad23ff0a1a27c0762bc3736 SHA512 cf6c683640bd327749bcce08f98cc4e4f95dfd64452fc7e216c19aa9713aeb65f0ba51d4ab74d8bd69c0fac94dae62cd49883958dc88f98c4c250558c6834fde diff --git a/app-admin/pulumi-bin/pulumi-bin-3.104.2.ebuild b/app-admin/pulumi-bin/pulumi-bin-3.107.0.ebuild similarity index 100% rename from app-admin/pulumi-bin/pulumi-bin-3.104.2.ebuild rename to app-admin/pulumi-bin/pulumi-bin-3.107.0.ebuild diff --git a/app-crypt/certbot-dns-rfc2136/Manifest b/app-crypt/certbot-dns-rfc2136/Manifest index 06de86a391..2aa6fc0bd1 100644 --- a/app-crypt/certbot-dns-rfc2136/Manifest +++ b/app-crypt/certbot-dns-rfc2136/Manifest @@ -1,5 +1,2 @@ -DIST certbot-2.6.0.gh.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3 -DIST certbot-2.7.2.gh.tar.gz 1343827 BLAKE2B 83fade55e9ea348b5a0fb10ab425f1d23ef6f4e8d43e7c762e363230548ede061ace66cbc49212cca1262809bcf046703859b80a93d698b7ffc545ff16f56bf5 SHA512 bb82a6f6f8d4042e598f9b4b583fd3ea3128026f41acbacb9ee932b195522e565eaddf7ae8d6a661cab5e2f15a436e234f36e0388c730844bff40a3f982a45ee -DIST certbot-2.7.3.gh.tar.gz 1344285 BLAKE2B b32a57c5a13cb1dac474f291eba17c51abe11455455d9831d88c77e0559e9c76b78da2e4dc14165dc892c61b901713687e72657504947ca810c9c139038fe4f0 SHA512 6251f7c3062fcac5b13df94d70c5bcf72e541da4f1dd73a3cc3198fbab050cc3e584fc8ccae9819435896c1d2d2df372ce7465ef571592896afcfee473148f0c -DIST certbot-2.7.4.gh.tar.gz 1345476 BLAKE2B 9050765a345ab1195edbf6f0194b9442f64d468f34d26a6ec780901850835ce488d235b72d0a4d5079f29b433454b2bd24e1c0b2001e136216734e353f3627d9 SHA512 4363a2b9cc0d80692c26b6e4e82d7b2f1b57145f82603d33591cc6d00f08a920a2f9b963268c9a24211492e570fc8a91a1c64ccbcd4a44068e30590ce0a1d369 DIST certbot-2.8.0.gh.tar.gz 1344483 BLAKE2B f9957367ae65f69ab43a83993b29da4d28c0d01bd7a89ebefcbfb82915c26167b7443d08f6ee4d28e029f5a58736dee01700a30261aaa1dc0290273868da08e9 SHA512 2fbaf5349e7ef0dcb054c3b22d63007c588cbdc0d23d484a56e62ad38d21c91b838887e6e94cf9c0045a4382567c342288a796c81307deba84a246f5cc3bc5d6 +DIST certbot-2.9.0.gh.tar.gz 1346993 BLAKE2B cf7fb4676dc31442abe11ef50d18073480a46f4ab19cc328da599b1372509af683b4c6010b46f31bce5703949e88b4702d404bd8582a1361caad43ec8f02cb94 SHA512 27c15ce8e4450f432fbc271cd847d27c7f1bce552cc6e5f2a91f1fbfc09ebe331b54bab17639b86c19605de059767015665c26e872c3b0699edb1c85392a0546 diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.7.2.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.7.2.ebuild deleted file mode 100644 index 425d68e1ae..0000000000 --- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.7.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -PARENT_PN="${PN%-dns-rfc2136}" -PARENT_P="${PARENT_PN}-${PV}" - -if [[ "${PV}" == *9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/certbot/certbot.git" - EGIT_SUBMODULES=() - EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" -else - SRC_URI=" - https://github.com/certbot/certbot/archive/v${PV}.tar.gz - -> ${PARENT_P}.gh.tar.gz - " - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)" -HOMEPAGE=" - https://github.com/certbot/certbot - https://letsencrypt.org/ -" - -LICENSE="Apache-2.0" -SLOT="0" - -S="${WORKDIR}/${PARENT_P}/${PN}" - -BDEPEND=" - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" - -RDEPEND=" - ${PYTHON_DEPS} - >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] - >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] - >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] -" - -distutils_enable_sphinx docs dev-python/sphinx-rtd-theme -distutils_enable_tests pytest - -# Same than PATCHES but from repository's root directory, -# please see function `python_prepare_all` below. -# Simplier for users IMHO. -PARENT_PATCHES=( -) - -# Here for patches within "${PN}" subdirectory. -PATCHES=( -) - -python_prepare_all() { - pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die - [[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}" - eapply_user - popd > /dev/null || die - - distutils-r1_python_prepare_all -} diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.7.3.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.7.3.ebuild deleted file mode 100644 index 425d68e1ae..0000000000 --- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.7.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -PARENT_PN="${PN%-dns-rfc2136}" -PARENT_P="${PARENT_PN}-${PV}" - -if [[ "${PV}" == *9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/certbot/certbot.git" - EGIT_SUBMODULES=() - EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" -else - SRC_URI=" - https://github.com/certbot/certbot/archive/v${PV}.tar.gz - -> ${PARENT_P}.gh.tar.gz - " - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)" -HOMEPAGE=" - https://github.com/certbot/certbot - https://letsencrypt.org/ -" - -LICENSE="Apache-2.0" -SLOT="0" - -S="${WORKDIR}/${PARENT_P}/${PN}" - -BDEPEND=" - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" - -RDEPEND=" - ${PYTHON_DEPS} - >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] - >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] - >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] -" - -distutils_enable_sphinx docs dev-python/sphinx-rtd-theme -distutils_enable_tests pytest - -# Same than PATCHES but from repository's root directory, -# please see function `python_prepare_all` below. -# Simplier for users IMHO. -PARENT_PATCHES=( -) - -# Here for patches within "${PN}" subdirectory. -PATCHES=( -) - -python_prepare_all() { - pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die - [[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}" - eapply_user - popd > /dev/null || die - - distutils-r1_python_prepare_all -} diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.7.4.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.7.4.ebuild deleted file mode 100644 index 425d68e1ae..0000000000 --- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.7.4.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -PARENT_PN="${PN%-dns-rfc2136}" -PARENT_P="${PARENT_PN}-${PV}" - -if [[ "${PV}" == *9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/certbot/certbot.git" - EGIT_SUBMODULES=() - EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}" -else - SRC_URI=" - https://github.com/certbot/certbot/archive/v${PV}.tar.gz - -> ${PARENT_P}.gh.tar.gz - " - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)" -HOMEPAGE=" - https://github.com/certbot/certbot - https://letsencrypt.org/ -" - -LICENSE="Apache-2.0" -SLOT="0" - -S="${WORKDIR}/${PARENT_P}/${PN}" - -BDEPEND=" - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" - -RDEPEND=" - ${PYTHON_DEPS} - >=app-crypt/acme-${PV}[${PYTHON_USEDEP}] - >=app-crypt/certbot-${PV}[${PYTHON_USEDEP}] - >=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}] -" - -distutils_enable_sphinx docs dev-python/sphinx-rtd-theme -distutils_enable_tests pytest - -# Same than PATCHES but from repository's root directory, -# please see function `python_prepare_all` below. -# Simplier for users IMHO. -PARENT_PATCHES=( -) - -# Here for patches within "${PN}" subdirectory. -PATCHES=( -) - -python_prepare_all() { - pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die - [[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}" - eapply_user - popd > /dev/null || die - - distutils-r1_python_prepare_all -} diff --git a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.6.0.ebuild b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.9.0.ebuild similarity index 100% rename from app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.6.0.ebuild rename to app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.9.0.ebuild diff --git a/games-action/technic-launcher/Manifest b/games-action/technic-launcher/Manifest index d069980ad6..316a0ca1cf 100644 --- a/games-action/technic-launcher/Manifest +++ b/games-action/technic-launcher/Manifest @@ -1,3 +1,4 @@ DIST technic-launcher-4.625.jar 5394348 BLAKE2B 46306f86a4b80aa70276ccc8fbd3f88c036bdd5e67a3b9a6b0444a9ec22d86113082d279ad9d78313e5753e9458ba7c52a7e507eb4b625c2b6d2662c5e5fdb10 SHA512 29cca87c55c3415fa3dde40030b09db75dc00387e87f2432a44d7acde1e1544ebf7f55a12d46d084c2f207be7882ee13bd6f50af3da0046b02d64077c35a24c4 DIST technic-launcher-4.768.jar 6949323 BLAKE2B b5e2006b82f0efee9c872c513436c8ab68ad87473a001b1baf25393be5a1c26ffee1d0783dd87218c1e38978d6934c610019cc80e68401bc978a1834b19b8741 SHA512 d96cda057e746dced1bcc7635ace43a9eb65ed71a28e7af3f0b184162cb365aa101e4bb90880da679b52a9f5b828d27cf81b3cb729ccda4b02837bc638876753 +DIST technic-launcher-4.822.jar 7170316 BLAKE2B ab222361a511c66d23dda052b17b00b4ba5068d229e1dcb0720976998712dc82c92831135fea700be671459f304f3bf29907defee1cd3ac8b5985eff80d37156 SHA512 9ffbd23c4ff26f3a1d0a198fd404a811a8326eb04cafa900c1627abd6c191e089ac758500dbb10c747c68daedfcfd91399bebabfaa6e73d9fa76372b8d73ab45 DIST technic-launcher.ico 15086 BLAKE2B 4f5be0661bfbdca971cf022767618acef1e912b60c3f0574f383a8bd0281a6d66ca1b8b105412ec9579f3999514a471412fb16da66d937acfb4d3236b8f99663 SHA512 c109113a0e1be10bc013bfb79b742396a768fa683860a83d734e158b709e66b9e21067e1791ae5f7a854ccd21b1bf9adf6eeb27bc33d9da03f902dfe5d8be710 diff --git a/games-action/technic-launcher/technic-launcher-4.822.ebuild b/games-action/technic-launcher/technic-launcher-4.822.ebuild new file mode 100644 index 0000000000..cacf1614ef --- /dev/null +++ b/games-action/technic-launcher/technic-launcher-4.822.ebuild @@ -0,0 +1,44 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop java-pkg-2 xdg + +DESCRIPTION="Minecraft launcher for community-made modpacks on the Technic Platform" +HOMEPAGE="https://www.technicpack.net/" +SRC_URI=" + https://launcher.technicpack.net/launcher${PV:0:1}/${PV:2}/TechnicLauncher.jar -> ${P}.jar + https://www.technicpack.net/favicon.ico -> ${PN}.ico +" + +KEYWORDS="~amd64 ~x86" +LICENSE="technic" +SLOT="0" + +RESTRICT="bindist mirror" + +BDEPEND="media-gfx/imagemagick[png]" + +RDEPEND="virtual/jre:1.8" + +S="${WORKDIR}" + +src_unpack() { + # do not unpack jar file + cp "${DISTDIR}/${PN}.ico" "${S}" || die +} + +src_compile() { + convert ${PN}.ico ${PN}.png || die +} + +src_install() { + java-pkg_newjar "${DISTDIR}/${P}.jar" ${PN}.jar + java-pkg_dolauncher ${PN} --jar ${PN}.jar --java_args "\${JAVA_OPTS}" + + newicon -s 16x16 ${PN}-0.png technic.png + newicon -s 32x32 ${PN}-1.png technic.png + newicon -s 48x48 ${PN}-2.png technic.png + make_desktop_entry ${PN} "Technic Launcher" technic Game +} diff --git a/gui-apps/hyprlock/Manifest b/gui-apps/hyprlock/Manifest index b4c4ad0a08..edd905f413 100644 --- a/gui-apps/hyprlock/Manifest +++ b/gui-apps/hyprlock/Manifest @@ -1 +1 @@ -DIST hyprlock-0_pre20240220.gh.tar.gz 33244 BLAKE2B 3acca1217274d1d6b05febaa6ef9988080f70bb58bdde87d51c906ea62b49f3a7eeb1e64cc43b0c6e6a0688ef2348c563cc788904274dd675248620c6cf1126d SHA512 e3baa476852329dbd1eea87ad1ddfcb0521d6c73797e2fd2e9ab17d4f8cebfae68ccf947cda44aeb8d32ceaf1a03c586fa77dd539f47713b8a64afd2ebbff3fa +DIST hyprlock-0_pre20240223.gh.tar.gz 49082 BLAKE2B 91c552a9bd4c9feeecca348f84b2819fda0988be663aa73737cefe3a45bddaf09e4d2eebb1df0df26e4e7f323f22f37b61644521e8e829d1867f42a5dfcf9a08 SHA512 35295180ff50904dce6bd076bb8c9c84ad5dce6473d3829e01fe6bc0eb466dd79229d427034746f575941fbd87a5ed7e6fafa5586cff62f2fa664640cf7bf15a diff --git a/gui-apps/hyprlock/hyprlock-0_pre20240220.ebuild b/gui-apps/hyprlock/hyprlock-0_pre20240223.ebuild similarity index 94% rename from gui-apps/hyprlock/hyprlock-0_pre20240220.ebuild rename to gui-apps/hyprlock/hyprlock-0_pre20240223.ebuild index fe026f8bab..26901f5f8b 100644 --- a/gui-apps/hyprlock/hyprlock-0_pre20240220.ebuild +++ b/gui-apps/hyprlock/hyprlock-0_pre20240223.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit cmake toolchain-funcs -COMMIT="7b15d34f0af9b1c8ef49279827eee47e4dca9afa" +COMMIT="8969351cba0e4a7ed91715121391f9786c2e6345" DESCRIPTION="Hyprland's GPU-accelerated screen locking utility" HOMEPAGE="https://github.com/hyprwm/hyprlock" @@ -43,6 +43,7 @@ BDEPEND=" x11-libs/libxkbcommon x11-libs/cairo dev-build/cmake + dev-libs/date virtual/pkgconfig " diff --git a/gui-apps/hyprlock/hyprlock-9999.ebuild b/gui-apps/hyprlock/hyprlock-9999.ebuild index fe026f8bab..26901f5f8b 100644 --- a/gui-apps/hyprlock/hyprlock-9999.ebuild +++ b/gui-apps/hyprlock/hyprlock-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit cmake toolchain-funcs -COMMIT="7b15d34f0af9b1c8ef49279827eee47e4dca9afa" +COMMIT="8969351cba0e4a7ed91715121391f9786c2e6345" DESCRIPTION="Hyprland's GPU-accelerated screen locking utility" HOMEPAGE="https://github.com/hyprwm/hyprlock" @@ -43,6 +43,7 @@ BDEPEND=" x11-libs/libxkbcommon x11-libs/cairo dev-build/cmake + dev-libs/date virtual/pkgconfig " diff --git a/media-sound/TauonMusicBox/TauonMusicBox-7.7.1-r1.ebuild b/media-sound/TauonMusicBox/TauonMusicBox-7.7.1-r1.ebuild index 9f94f970b5..a38abd496d 100644 --- a/media-sound/TauonMusicBox/TauonMusicBox-7.7.1-r1.ebuild +++ b/media-sound/TauonMusicBox/TauonMusicBox-7.7.1-r1.ebuild @@ -28,11 +28,12 @@ PHAZOR_DEPS=" dev-libs/miniaudio media-libs/flac media-libs/libopenmpt - media-sound/mpg123 media-libs/opus media-libs/opusfile - media-sound/wavpack media-libs/libsamplerate + media-libs/libvorbis + media-sound/mpg123 + media-sound/wavpack sci-libs/kissfft[-cpu_flags_x86_sse] " @@ -85,6 +86,7 @@ src_test() { python_install() { newbin tauon.py tauon dolib.so "${WORKDIR}/${P}_build/libphazor.so" + dosym "/usr/$(get_libdir)/libphazor.so" "/usr/share/${PN}/lib/libphazor.so" install_locale() { insinto "/usr/share/locale/${1}/LC_MESSAGES" diff --git a/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild b/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild index 9f94f970b5..a38abd496d 100644 --- a/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild +++ b/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild @@ -28,11 +28,12 @@ PHAZOR_DEPS=" dev-libs/miniaudio media-libs/flac media-libs/libopenmpt - media-sound/mpg123 media-libs/opus media-libs/opusfile - media-sound/wavpack media-libs/libsamplerate + media-libs/libvorbis + media-sound/mpg123 + media-sound/wavpack sci-libs/kissfft[-cpu_flags_x86_sse] " @@ -85,6 +86,7 @@ src_test() { python_install() { newbin tauon.py tauon dolib.so "${WORKDIR}/${P}_build/libphazor.so" + dosym "/usr/$(get_libdir)/libphazor.so" "/usr/share/${PN}/lib/libphazor.so" install_locale() { insinto "/usr/share/locale/${1}/LC_MESSAGES" diff --git a/media-sound/nulloy/nulloy-0.9.8.7.ebuild b/media-sound/nulloy/nulloy-0.9.8.7.ebuild index 9831d0db81..687c88d670 100644 --- a/media-sound/nulloy/nulloy-0.9.8.7.ebuild +++ b/media-sound/nulloy/nulloy-0.9.8.7.ebuild @@ -25,7 +25,7 @@ BDEPEND=" DEPEND=" dev-qt/qtcore dev-qt/designer - dev-qt/qtsvg + dev-qt/qtsvg:6 dev-qt/linguist dev-qt/qtscript dev-qt/qtx11extras diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-server-empty-thread-name.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-server-empty-thread-name.patch new file mode 100644 index 0000000000..af062b3b93 --- /dev/null +++ b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-server-empty-thread-name.patch @@ -0,0 +1,82 @@ +From a7019631b765581b7e3549cf7cdac77496984709 Mon Sep 17 00:00:00 2001 +From: lanthora +Date: Wed, 2 Aug 2023 13:16:43 +0800 +Subject: [PATCH] Fix server empty thread name (#478) + +--- + ixwebsocket/IXWebSocket.cpp | 11 ++++++++++- + ixwebsocket/IXWebSocket.h | 5 +++++ + ixwebsocket/IXWebSocketServer.cpp | 3 +++ + 3 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/ixwebsocket/IXWebSocket.cpp b/ixwebsocket/IXWebSocket.cpp +index 1a879a78..b74426ef 100644 +--- a/ixwebsocket/IXWebSocket.cpp ++++ b/ixwebsocket/IXWebSocket.cpp +@@ -41,6 +41,7 @@ namespace ix + , _enablePong(kDefaultEnablePong) + , _pingIntervalSecs(kDefaultPingIntervalSecs) + , _pingType(SendMessageKind::Ping) ++ , _autoThreadName(true) + { + _ws.setOnCloseCallback( + [this](uint16_t code, const std::string& reason, size_t wireSize, bool remote) +@@ -370,7 +371,10 @@ namespace ix + + void WebSocket::run() + { +- setThreadName(getUrl()); ++ if (_autoThreadName) ++ { ++ setThreadName(getUrl()); ++ } + + bool firstConnectionAttempt = true; + +@@ -627,4 +631,9 @@ namespace ix + std::lock_guard lock(_configMutex); + return _subProtocols; + } ++ ++ void WebSocket::setAutoThreadName(bool enabled) ++ { ++ _autoThreadName = enabled; ++ } + } // namespace ix +diff --git a/ixwebsocket/IXWebSocket.h b/ixwebsocket/IXWebSocket.h +index 7adfe166..21292e7d 100644 +--- a/ixwebsocket/IXWebSocket.h ++++ b/ixwebsocket/IXWebSocket.h +@@ -119,6 +119,8 @@ namespace ix + uint32_t getMinWaitBetweenReconnectionRetries() const; + const std::vector& getSubProtocols(); + ++ void setAutoThreadName(bool enabled); ++ + private: + WebSocketSendInfo sendMessage(const IXWebSocketSendData& message, + SendMessageKind sendMessageKind, +@@ -182,6 +184,9 @@ namespace ix + // Subprotocols + std::vector _subProtocols; + ++ // enable or disable auto set thread name ++ bool _autoThreadName; ++ + friend class WebSocketServer; + }; + } // namespace ix +diff --git a/ixwebsocket/IXWebSocketServer.cpp b/ixwebsocket/IXWebSocketServer.cpp +index 03b0ea50..4518389b 100644 +--- a/ixwebsocket/IXWebSocketServer.cpp ++++ b/ixwebsocket/IXWebSocketServer.cpp +@@ -91,6 +91,9 @@ namespace ix + setThreadName("Srv:ws:" + connectionState->getId()); + + auto webSocket = std::make_shared(); ++ ++ webSocket->setAutoThreadName(false); ++ + if (_onConnectionCallback) + { + _onConnectionCallback(webSocket, connectionState); diff --git a/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild index ab45a5ac9c..2f852a9479 100644 --- a/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild +++ b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild @@ -49,6 +49,8 @@ PATCHES=( "${FILESDIR}/${P}-remove-network-tests.patch" # Upstream uses git submodules "${FILESDIR}/${P}-use-system-spdlog.patch" + # Fix Server empty thread name + "${FILESDIR}/${P}-fix-server-empty-thread-name.patch" ) src_configure() { diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest new file mode 100644 index 0000000000..f87e317a79 --- /dev/null +++ b/net-vpn/candy/Manifest @@ -0,0 +1 @@ +DIST candy-3.9.1.tar.gz 37847 BLAKE2B af7c857a8a41f0e98bd744162be563b973e20a630fb505de91155ab9fb7a17679a2bb9f69db8c737258d1293c5d77ad96a65a2b22455512b8f97390a7368165f SHA512 aa9727c74ab7c9536331098f11a2837daa51aa58503cbf5b43536afedf5eea8d30db296f515c4689cf44c980eea5a88e06ad161836fe64d4146de4fdce9d99ac diff --git a/net-vpn/candy/candy-3.9.1.ebuild b/net-vpn/candy/candy-3.9.1.ebuild new file mode 100644 index 0000000000..843aa73cde --- /dev/null +++ b/net-vpn/candy/candy-3.9.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd + +DESCRIPTION="Another virtual private network that supports peer-to-peer connections" +HOMEPAGE="https://github.com/lanthora/candy" +SRC_URI="https://github.com/lanthora/candy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + dev-libs/uriparser + dev-libs/libconfig + net-libs/ixwebsocket[ws] + dev-libs/openssl + sys-libs/zlib + dev-libs/libfmt +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-libs/spdlog +" + +src_prepare() { + eapply "${FILESDIR}/${P}-use-system-ixwebsocket.patch" + cmake_src_prepare + default +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + ) + cmake_src_configure +} + +src_install(){ + cmake_src_install + default + + insinto /etc + doins candy.conf + fperms 0644 /etc/candy.conf + + systemd_dounit candy.service + systemd_dounit candy@.service +} diff --git a/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch b/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch new file mode 100644 index 0000000000..445d5ad080 --- /dev/null +++ b/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch @@ -0,0 +1,60 @@ +From 317538a145784eb28b530a7969e941dc047cbf06 Mon Sep 17 00:00:00 2001 +From: lanthora +Date: Wed, 21 Feb 2024 06:20:29 +0000 +Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8=E7=B3=BB?= + =?UTF-8?q?=E7=BB=9F=E7=9A=84=20ixwebsocket?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + CMakeLists.txt | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2da4334..160cfa1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,9 +20,13 @@ pkg_check_modules( + liburiparser + ) + ++pkg_check_modules(IXWEBSOCKET ixwebsocket) ++ + find_library(ARGP_LIB argp) + +-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ixwebsocket.cmake) ++if (NOT IXWEBSOCKET_FOUND) ++ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ixwebsocket.cmake) ++endif() + + if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/wintun.cmake) +@@ -30,7 +34,12 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + endif() + + include_directories(${DEPENDENCIES_INCLUDEDIR}) +-include_directories(${ixwebsocket_SOURCE_DIR}) ++ ++if (IXWEBSOCKET_FOUND) ++ include_directories(${IXWEBSOCKET_INCLUDEDIR}) ++else() ++ include_directories(${ixwebsocket_SOURCE_DIR}) ++endif() + + add_subdirectory(${SOURCE}/core) + add_subdirectory(${SOURCE}/websocket) +@@ -43,7 +52,12 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE websocket) + target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE tun) + target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE peer) + target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE utility) +-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ixwebsocket) ++ ++if (IXWEBSOCKET_FOUND) ++ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ${IXWEBSOCKET_LIBRARIES}) ++else() ++ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ixwebsocket) ++endif() + + if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE iphlpapi) diff --git a/net-vpn/candy/metadata.xml b/net-vpn/candy/metadata.xml new file mode 100644 index 0000000000..67deff1aff --- /dev/null +++ b/net-vpn/candy/metadata.xml @@ -0,0 +1,15 @@ + + + + + yangmame@icloud.com + Xin Yang + + + lanthora/candy + + lanthora + lanthora@outlook.com + + +