From ec46d739f94954d01c64a06342e8f9f6cee2915a Mon Sep 17 00:00:00 2001 From: Edgar Luque Date: Thu, 1 Feb 2024 08:11:02 +0100 Subject: [PATCH 1/6] games-action/ddnet: add 18.0.2, drop 17.4.2 Signed-off-by: Edgar Luque --- games-action/ddnet/Manifest | 2 +- games-action/ddnet/{ddnet-17.4.2.ebuild => ddnet-18.0.2.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename games-action/ddnet/{ddnet-17.4.2.ebuild => ddnet-18.0.2.ebuild} (100%) diff --git a/games-action/ddnet/Manifest b/games-action/ddnet/Manifest index 1f0f5e810e..e426eeb86a 100644 --- a/games-action/ddnet/Manifest +++ b/games-action/ddnet/Manifest @@ -2,7 +2,7 @@ DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480 DIST cxx-1.0.71.crate 195479 BLAKE2B 956f735ad6a417337dd6e0f71ba49d21e8ad9724e288b8d05a013c76bdeb0c3565197f8fc02f861a13f68c6823a969b05852c4abc0ef48d3deb4a3ede3ce7d3c SHA512 1b770312e5ea69a9fa3882e2e507d9de4505dbf09fdab4e6cacdeed7a00122b1cc88583d7353959cd0375a380b7e8563a673c4602fc036130f248db97225b305 DIST cxxbridge-flags-1.0.71.crate 5593 BLAKE2B 4f3c72079b42cf41c66dc779a792c76d860e7b85220508b9284b23645b8fae3911864b76719457952bb3b7e666312022def72204c2d096afa2683716cb9f0c5d SHA512 53f5783c4c15b87eac8f6c7ca911b5b3c92a5821040c4000586a118b441aaab17f798f878433436e881f0edd531d9243234cdb4bacfea16fe1f60df080a2d6b9 DIST cxxbridge-macro-1.0.71.crate 59620 BLAKE2B ce4b5bfc016a799312cfc2000bcc7b0b701636a558b66d079e3a69ed3a4c83c3c22cbba7bcd3168107d5dd3a0728e2e8887c0089ac7ef022957cc0559ed7a2c5 SHA512 13b0f742ecf4724214b896bcd3c4fedff011751661bd657ca902f123fcb869e835ce850acb1cb9ebe0cb1d13fb9aecc74c7730586ebd465500c2e01cfe686dbc -DIST ddnet-17.4.2.tar.gz 45734215 BLAKE2B 1ff2334e5e8f3a45693f155a7a3cf4dcbbf3ed9eb2b979008b8b4ae10205b605c574a71659b404015e7a2e02c1b331c6bcff11afd6997025c7510d708182642d SHA512 8f3166c00dc9b353fcfbcf73ba1f6f89b7ac44da9411dc9149d03a1726b56b936201004d3b5868cfbbc2a13e185a98e225563333342b6373f8efd6b0af1241d6 +DIST ddnet-18.0.2.tar.gz 45795837 BLAKE2B 9f6e242e33afec1cf8d801f5a6d275da4a7a0ba66c2c77a9d3f5ab1eacfcff23eedec6612a0d37ab472e78f0bbb9d9c38d410d2783145bba2b11143343e3d33c SHA512 1953cea32b49741fc1648d10dc99969fbd6b8596c99f4584769d35291ffa7d2a1f5362b1f65b376509a181269c69e515b977eb90b6ab9251a01d38d53327c2ef DIST link-cplusplus-1.0.6.crate 8150 BLAKE2B 82b0eb89926a7f3b7e427242ff3f65eba78f467f1ab972f7f280daf09e2be7188d8e851a21018a268871d5dc9cf7dfda4ef24952b5bc38bd722a5537504c1ddb SHA512 9f77f71f7261472de0d97b2c26efb43f3d49dafbaa1eb853340467260a65d85344e94e023540e068051108afd63cc48c6a5c8025f50922a73dc6409134418e74 DIST proc-macro2-1.0.40.crate 40559 BLAKE2B d83cf7283393a82ca65263afc375d123bd2f48b719c9eab6859c52dc0c2b9b4b5af3090a0ebd0fedf0e1095f0bafbc443016f751a0485dc654bcd80a6f71e326 SHA512 bb179524bd41e36735010a7ec53e096359ffc3688ab97806a45ed9cfb17e8688ce352bbb8cd3bd4e15a4299e8500603c86591b17cfa31bca03f299f6f6347992 DIST quote-1.0.20.crate 28160 BLAKE2B db257025f64817b1b58eecb8e64e63f1782d8a7fcb42ed6c3364254ec5a26705e49ce0637c880b0355b99a77473ce3083caae2cfabbd1a1a7e4fc826bae2cb7c SHA512 d12f4a425273b99ae655da11fcf5dad2609e20ad3e7d85cde08c7d09f444a5c7a3505470bad2d48b1ba8ea59ebf38ab87aa1052e47ec414acfc05dcb07d438be diff --git a/games-action/ddnet/ddnet-17.4.2.ebuild b/games-action/ddnet/ddnet-18.0.2.ebuild similarity index 100% rename from games-action/ddnet/ddnet-17.4.2.ebuild rename to games-action/ddnet/ddnet-18.0.2.ebuild From 8315d328efc493b4cb5b3fcf8e917cbd70d54752 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Thu, 1 Feb 2024 19:52:00 +0900 Subject: [PATCH 2/6] media-gfx/azpainter: add 3.0.7 Closes: https://bugs.gentoo.org/860057 Signed-off-by: Takuya Wakazono --- media-gfx/azpainter/Manifest | 1 + media-gfx/azpainter/azpainter-3.0.7.ebuild | 62 +++++++++++++++++++ .../azpainter-3.0.7-strict-aliasing.patch | 61 ++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 media-gfx/azpainter/azpainter-3.0.7.ebuild create mode 100644 media-gfx/azpainter/files/azpainter-3.0.7-strict-aliasing.patch diff --git a/media-gfx/azpainter/Manifest b/media-gfx/azpainter/Manifest index a523d1cc6c..0e5b84ccfd 100644 --- a/media-gfx/azpainter/Manifest +++ b/media-gfx/azpainter/Manifest @@ -1,2 +1,3 @@ DIST azpainter-v3.0.3.tar.gz 1260272 BLAKE2B b0d7e21f4a24ef27e6d4cbc639624dcc333d19f477dbf436bf72929473e07318246009d3291e56296d8f8a46d1f10d2dc1b8224f99c94dc46672f9c91827ce9f SHA512 7c363127d1bb3ad9c212ec3a226b047edff0452e46d0d8de52fefaf2399d72a4e3211b2b32ea57a43a9d705ad06729543c4ab401dba672a909568b7935b67801 DIST azpainter-v3.0.4.tar.gz 1283239 BLAKE2B a0632909c4b066309fd5a696b7839526f5a2a4dbf91a3c77a27ad199ea83fb09b5f711effe3c77da629e2dfffe30a0b09eda66a939affa1f52f3c73ed3ca14e1 SHA512 44fd259d50ef794c223e7bed9f4ccf9c5fe6b0905e521066e279b33c836d8d0090c01229b63444ea459477f2aef174d9876b1811753d0a253cef02ffe4e95af2 +DIST azpainter-v3.0.7.tar.bz2 992188 BLAKE2B a027ddcc424a3d3edaeae3a50e5c8bf24214f1420f1e99aaae0ddcc3ec7401a032b7aea5181e0efc7c55855deb65580d355ee2859f7603bb321b461f2cf57843 SHA512 bf46b4a895bb4a2abf4d88442eacee3d580ae93a07de281af4bf57397b08dcd88fa8064693e54d285e101463fc010ebec4e0d54d735e0c26a4cbdacd4ce11a0d diff --git a/media-gfx/azpainter/azpainter-3.0.7.ebuild b/media-gfx/azpainter/azpainter-3.0.7.ebuild new file mode 100644 index 0000000000..35036a1f0c --- /dev/null +++ b/media-gfx/azpainter/azpainter-3.0.7.ebuild @@ -0,0 +1,62 @@ +# Copyright 2018-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo ninja-utils toolchain-funcs xdg + +DESCRIPTION="Full color painting software for Linux for illustration drawing" +HOMEPAGE="http://azsky2.html.xdomain.jp/soft/azpainter.html + https://gitlab.com/azelpg/azpainter" +SRC_URI="https://gitlab.com/azelpg/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" +S="${WORKDIR}/${PN}-v${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + media-libs/fontconfig + media-libs/freetype + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/libwebp:= + media-libs/tiff:= + sys-libs/zlib:= + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi +" +RDEPEND="${DEPEND}" +BDEPEND=" + ${NINJA_DEPEND} + virtual/pkgconfig +" + +DOCS=( + about_mlk_en.txt + about_mlk_ja.txt + translation/tool/about-en.txt + translation/tool/about-ja.txt +) + +PATCHES=( "${FILESDIR}/${P}-strict-aliasing.patch" ) + +src_prepare() { + sed -i "s|ar rc|$(tc-getAR) rc|" build.ninja.in || die + sed -i "s|doc/@PACKAGE_NAME@|doc/${PF}|" install.sh.in || die + default +} + +src_configure() { + edo sh ./configure --prefix="${EPREFIX}/usr" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_compile() { + eninja -C build +} + +src_install() { + DESTDIR="${D}" eninja -C build install +} diff --git a/media-gfx/azpainter/files/azpainter-3.0.7-strict-aliasing.patch b/media-gfx/azpainter/files/azpainter-3.0.7-strict-aliasing.patch new file mode 100644 index 0000000000..44da8ac4c9 --- /dev/null +++ b/media-gfx/azpainter/files/azpainter-3.0.7-strict-aliasing.patch @@ -0,0 +1,61 @@ +https://bugs.gentoo.org/860057 + +diff --git a/src/draw/draw_image.c b/src/draw/draw_image.c +index 531101a..f225164 100644 +--- a/src/draw/draw_image.c ++++ b/src/draw/draw_image.c +@@ -21,6 +21,8 @@ $*/ + * AppDraw: イメージ関連 + *****************************************/ + ++#include ++ + #include + #include + #include +@@ -798,7 +800,7 @@ mlkerr drawImage_blendImageReal_alpha(AppDraw *p,int dstbits,mPopupProgress *pro + { + //8bit は常に 8bit + +- *((uint32_t *)pd) = *((uint32_t *)&colres); ++ memcpy(&pd, &colres, sizeof(uint32_t)); + + pd += 4; + } +diff --git a/src/image/tileimage_imagefile.c b/src/image/tileimage_imagefile.c +index e05e633..9b2d3ef 100644 +--- a/src/image/tileimage_imagefile.c ++++ b/src/image/tileimage_imagefile.c +@@ -165,7 +165,7 @@ static void _loadimgbuf_convert_8to16(uint8_t **ppbuf,int width,int height,mlkbo + c[2] = tbl[pd8[2]]; + c[3] = tbl[(ignore_alpha)? 255: pd8[3]]; + +- *((uint64_t *)pd16) = *((uint64_t *)c); ++ memcpy(&pd16, c, sizeof(uint64_t)); + } + } + +diff --git a/src/other/colorvalue.c b/src/other/colorvalue.c +index 74f8ebe..67a255c 100644 +--- a/src/other/colorvalue.c ++++ b/src/other/colorvalue.c +@@ -22,6 +22,7 @@ $*/ + *****************************************/ + + #include ++#include + + #include + #include +@@ -156,8 +157,10 @@ uint32_t RGBA16_to_32bit(const RGBA16 *p) + uint64_t RGB16_to_64bit_buf(const RGB16 *p) + { + uint16_t buf[4] = {p->r, p->g, p->b, 0}; ++ uint64_t ret; ++ memcpy(&ret, buf, sizeof(uint64_t)); + +- return *((uint64_t *)buf); ++ return ret; + } + + //-------- 32bit RGB から変換 From 61f066a62c011e4a65f524afc2f0fa98cc6b782f Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Thu, 1 Feb 2024 19:52:47 +0900 Subject: [PATCH 3/6] media-gfx/azpainter: drop 3.0.3, 3.0.4 Signed-off-by: Takuya Wakazono --- media-gfx/azpainter/Manifest | 2 - media-gfx/azpainter/azpainter-3.0.3.ebuild | 55 ---------------------- media-gfx/azpainter/azpainter-3.0.4.ebuild | 49 ------------------- 3 files changed, 106 deletions(-) delete mode 100644 media-gfx/azpainter/azpainter-3.0.3.ebuild delete mode 100644 media-gfx/azpainter/azpainter-3.0.4.ebuild diff --git a/media-gfx/azpainter/Manifest b/media-gfx/azpainter/Manifest index 0e5b84ccfd..3e8a36894d 100644 --- a/media-gfx/azpainter/Manifest +++ b/media-gfx/azpainter/Manifest @@ -1,3 +1 @@ -DIST azpainter-v3.0.3.tar.gz 1260272 BLAKE2B b0d7e21f4a24ef27e6d4cbc639624dcc333d19f477dbf436bf72929473e07318246009d3291e56296d8f8a46d1f10d2dc1b8224f99c94dc46672f9c91827ce9f SHA512 7c363127d1bb3ad9c212ec3a226b047edff0452e46d0d8de52fefaf2399d72a4e3211b2b32ea57a43a9d705ad06729543c4ab401dba672a909568b7935b67801 -DIST azpainter-v3.0.4.tar.gz 1283239 BLAKE2B a0632909c4b066309fd5a696b7839526f5a2a4dbf91a3c77a27ad199ea83fb09b5f711effe3c77da629e2dfffe30a0b09eda66a939affa1f52f3c73ed3ca14e1 SHA512 44fd259d50ef794c223e7bed9f4ccf9c5fe6b0905e521066e279b33c836d8d0090c01229b63444ea459477f2aef174d9876b1811753d0a253cef02ffe4e95af2 DIST azpainter-v3.0.7.tar.bz2 992188 BLAKE2B a027ddcc424a3d3edaeae3a50e5c8bf24214f1420f1e99aaae0ddcc3ec7401a032b7aea5181e0efc7c55855deb65580d355ee2859f7603bb321b461f2cf57843 SHA512 bf46b4a895bb4a2abf4d88442eacee3d580ae93a07de281af4bf57397b08dcd88fa8064693e54d285e101463fc010ebec4e0d54d735e0c26a4cbdacd4ce11a0d diff --git a/media-gfx/azpainter/azpainter-3.0.3.ebuild b/media-gfx/azpainter/azpainter-3.0.3.ebuild deleted file mode 100644 index 33f77ce980..0000000000 --- a/media-gfx/azpainter/azpainter-3.0.3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2018-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs xdg - -DESCRIPTION="Full color painting software for Linux for illustration drawing" -HOMEPAGE="http://azsky2.html.xdomain.jp/soft/azpainter.html -https://gitlab.com/azelpg/azpainter" -SRC_URI="https://gitlab.com/azelpg/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" -S="${WORKDIR}/${PN}-v${PV}" - -LICENSE="GPL-3" -SLOT="0/3" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - x11-libs/libX11:= - x11-libs/libXext:= - x11-libs/libXcursor:= - x11-libs/libXi:= - media-libs/freetype:= - media-libs/fontconfig:= - sys-libs/zlib:= - media-libs/libpng:= - media-libs/libjpeg-turbo:= - media-libs/libwebp:= - media-libs/tiff:= -" -RDEPEND="${DEPEND}" - -DOCS=( - about_mlk_en.txt - about_mlk_ja.txt - translation/tool/about-en.txt - translation/tool/about-ja.txt -) - -src_configure() { - sh ./configure \ - --prefix=/usr \ - --docdir=/usr/share/doc/${PF} \ - CC="$(tc-getCC)" CFLAGS="${CFLAGS:-02}" LDFLAGS="${LDFLAGS}" || die -} - -src_compile() { - tc-export AR - default -} - -src_install() { - default - rm "${ED}"/usr/share/doc/${PF}/GPL3 -} diff --git a/media-gfx/azpainter/azpainter-3.0.4.ebuild b/media-gfx/azpainter/azpainter-3.0.4.ebuild deleted file mode 100644 index 79d5a1d0dc..0000000000 --- a/media-gfx/azpainter/azpainter-3.0.4.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2018-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo toolchain-funcs xdg - -DESCRIPTION="Full color painting software for Linux for illustration drawing" -HOMEPAGE="http://azsky2.html.xdomain.jp/soft/azpainter.html - https://gitlab.com/azelpg/azpainter" -SRC_URI="https://gitlab.com/azelpg/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" -S="${WORKDIR}/${PN}-v${PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXcursor - x11-libs/libXi - media-libs/freetype - media-libs/fontconfig - sys-libs/zlib:= - media-libs/libpng:= - media-libs/libjpeg-turbo:= - media-libs/libwebp:= - media-libs/tiff -" -RDEPEND="${DEPEND}" - -DOCS=( - about_mlk_en.txt - about_mlk_ja.txt - translation/tool/about-en.txt - translation/tool/about-ja.txt -) - -src_configure() { - tc-export AR - edo sh ./configure --prefix=/usr --docdir=/usr/share/doc/${PF} \ - CC="$(tc-getCC)" CFLAGS="${CFLAGS:-02}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - default - rm "${ED}"/usr/share/doc/${PF}/GPL3 -} From f98770c46d775b57f4eecc8bfa5c667db5138464 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Thu, 1 Feb 2024 19:54:35 +0900 Subject: [PATCH 4/6] app-misc/1password-cli: add 2.24.0 Closes: https://bugs.gentoo.org/904454 Signed-off-by: Takuya Wakazono --- .../1password-cli/1password-cli-2.24.0.ebuild | 22 +++++++++++++++++++ app-misc/1password-cli/Manifest | 1 + 2 files changed, 23 insertions(+) create mode 100644 app-misc/1password-cli/1password-cli-2.24.0.ebuild diff --git a/app-misc/1password-cli/1password-cli-2.24.0.ebuild b/app-misc/1password-cli/1password-cli-2.24.0.ebuild new file mode 100644 index 0000000000..aff21e8d65 --- /dev/null +++ b/app-misc/1password-cli/1password-cli-2.24.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="The world’s most-loved password manager CLI" +HOMEPAGE="https://1password.com" +SRC_URI="amd64? ( https://cache.agilebits.com/dist/1P/op2/pkg/v${PV}/op_linux_amd64_v${PV}.zip )" +S="${WORKDIR}" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="strip test bindist" + +BDEPEND="app-arch/unzip" + +QA_FLAGS_IGNORED="usr/bin/op" + +src_install() { + dobin op +} diff --git a/app-misc/1password-cli/Manifest b/app-misc/1password-cli/Manifest index c350c948d2..d63a6dcd81 100644 --- a/app-misc/1password-cli/Manifest +++ b/app-misc/1password-cli/Manifest @@ -1 +1,2 @@ DIST op_linux_amd64_v2.14.0.zip 7374365 BLAKE2B f5c6d0fd676b364e1caddb3cac67fcddfb6f3364841d2589fdc7b546a617e551aae5efa42502b4a3058be17be6035f80334be511445c617b10d9dac84d32cae2 SHA512 e3e47f878fb2b48be669a7a9fc2f20729e4706d6815bf802a80725a578b8e45cb939dd55ec161ea2752091e7f27a5c46674c2d26845e21f19c0f1323d9440da7 +DIST op_linux_amd64_v2.24.0.zip 8517044 BLAKE2B 42c7b3523fd6237cd1e4c4574880a7bed5f5105fb6974fc9c9bd86e83ead7468ce955272306d00417d31cf376b87fe539935f4d7831360cbbd891b91e7f3811c SHA512 08b8792c1978b8457313cbe309071a71bf0305e85c3a7fac6709f9ad7d9806fa55c19cdd9032c70ccff361a4b55d878633a1235f0f68189af173ecfcf6fcbcfa From f5bc7cc2b0fe7822e289221a63f719194d91b58b Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Thu, 1 Feb 2024 19:54:53 +0900 Subject: [PATCH 5/6] app-misc/1password-cli: drop 2.14.0 Signed-off-by: Takuya Wakazono --- .../1password-cli/1password-cli-2.14.0.ebuild | 24 ------------------- app-misc/1password-cli/Manifest | 1 - 2 files changed, 25 deletions(-) delete mode 100644 app-misc/1password-cli/1password-cli-2.14.0.ebuild diff --git a/app-misc/1password-cli/1password-cli-2.14.0.ebuild b/app-misc/1password-cli/1password-cli-2.14.0.ebuild deleted file mode 100644 index 081283d536..0000000000 --- a/app-misc/1password-cli/1password-cli-2.14.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="The world’s most-loved password manager CLI" -HOMEPAGE="https://1password.com" -SRC_URI="amd64? ( https://cache.agilebits.com/dist/1P/op2/pkg/v${PV}/op_linux_amd64_v${PV}.zip )" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="strip test bindist" - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="app-arch/unzip" - -S=${WORKDIR} - -src_install() { - dobin op -} diff --git a/app-misc/1password-cli/Manifest b/app-misc/1password-cli/Manifest index d63a6dcd81..7c3cbc4033 100644 --- a/app-misc/1password-cli/Manifest +++ b/app-misc/1password-cli/Manifest @@ -1,2 +1 @@ -DIST op_linux_amd64_v2.14.0.zip 7374365 BLAKE2B f5c6d0fd676b364e1caddb3cac67fcddfb6f3364841d2589fdc7b546a617e551aae5efa42502b4a3058be17be6035f80334be511445c617b10d9dac84d32cae2 SHA512 e3e47f878fb2b48be669a7a9fc2f20729e4706d6815bf802a80725a578b8e45cb939dd55ec161ea2752091e7f27a5c46674c2d26845e21f19c0f1323d9440da7 DIST op_linux_amd64_v2.24.0.zip 8517044 BLAKE2B 42c7b3523fd6237cd1e4c4574880a7bed5f5105fb6974fc9c9bd86e83ead7468ce955272306d00417d31cf376b87fe539935f4d7831360cbbd891b91e7f3811c SHA512 08b8792c1978b8457313cbe309071a71bf0305e85c3a7fac6709f9ad7d9806fa55c19cdd9032c70ccff361a4b55d878633a1235f0f68189af173ecfcf6fcbcfa From 8e5c0a09278cb8b0ccc1e0fc660fd6ec161256e5 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Thu, 1 Feb 2024 21:45:33 +0500 Subject: [PATCH 6/6] net-misc/gmid: use bundled libtls Upstream issue: https://codeberg.org/op/gmid/issues/2 Signed-off-by: Anna (cybertailor) Vyalkova --- net-misc/gmid/gmid-2.0.1-r1.ebuild | 111 +++++++++++++++++++++++++++++ net-misc/gmid/gmid-9999.ebuild | 3 +- 2 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 net-misc/gmid/gmid-2.0.1-r1.ebuild diff --git a/net-misc/gmid/gmid-2.0.1-r1.ebuild b/net-misc/gmid/gmid-2.0.1-r1.ebuild new file mode 100644 index 0000000000..603af799a8 --- /dev/null +++ b/net-misc/gmid/gmid-2.0.1-r1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +SSL_DAYS=36500 +SSL_CERT_MANDATORY=1 +VERIFY_SIG_METHOD="signify" +inherit edo ssl-cert systemd toolchain-funcs verify-sig + +DESCRIPTION="Simple and secure Gemini server" +HOMEPAGE="https://gmid.omarpolo.com" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz + verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.sha256.sig )" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD ISC MIT" +SLOT="0" +IUSE="seccomp test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gemini + dev-libs/libevent:= + dev-libs/openssl:= + !elibc_Darwin? ( dev-libs/libbsd ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + app-alternatives/yacc + seccomp? ( sys-kernel/linux-headers ) +" +if [[ ${PV} != 9999 ]]; then + BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )" +fi + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub" + +DOCS=( README.md ChangeLog contrib/README ) + +# not an autoconf configure script +QA_CONFIG_IMPL_DECL_SKIP=( "*" ) + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + if use verify-sig; then + # Too many levels of symbolic links + cp "${DISTDIR}"/${P}.{sha256.sig,tar.gz} "${WORKDIR}" || die + cd "${WORKDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}.sha256.sig sha256 ${P}.tar.gz + fi + default + fi +} + +src_configure() { + local conf_args + tc-export CC + + # note: not an autoconf configure script + conf_args=( + --prefix="${EPREFIX}"/usr + --mandir="${EPREFIX}"/usr/share/man + --sysconfdir="${EPREFIX}"/etc + --with-libtls=bundled + $(use_enable seccomp sandbox) + ) + edo ./configure "${conf_args[@]}" + + if use seccomp && has usersandbox ${FEATURES}; then + export SKIP_RUNTIME_TESTS=1 + fi +} + +src_install() { + default + + insinto /etc/gmid + newins "${FILESDIR}"/gmid.conf-r1 gmid.conf + + insinto /usr/share/vim/vimfiles + doins -r contrib/vim/* + + systemd_dounit "${FILESDIR}"/gmid.service + newinitd "${FILESDIR}"/gmid.initd gmid + newconfd "${FILESDIR}"/gmid.confd gmid + + keepdir /var/gemini/localhost +} + +pkg_postinst() { + if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then + install_cert /etc/ssl/${PN}/${PN} + chown gemini:gemini "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem} + fi + + einfo "This gemini server can be run as a user with zero configuration.\n" + einfo "In order to use it with the init service you will need to generate a" + einfo "self-signed TLS certificate and a key and set up the configuration" + einfo "file (see man 1 gmid for details)." +} diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild index f046fc3257..603af799a8 100644 --- a/net-misc/gmid/gmid-9999.ebuild +++ b/net-misc/gmid/gmid-9999.ebuild @@ -28,7 +28,6 @@ RESTRICT="!test? ( test )" DEPEND=" acct-user/gemini dev-libs/libevent:= - dev-libs/libretls:= dev-libs/openssl:= !elibc_Darwin? ( dev-libs/libbsd ) " @@ -73,7 +72,7 @@ src_configure() { --prefix="${EPREFIX}"/usr --mandir="${EPREFIX}"/usr/share/man --sysconfdir="${EPREFIX}"/etc - --with-libtls=system + --with-libtls=bundled $(use_enable seccomp sandbox) ) edo ./configure "${conf_args[@]}"