From 4d2e32a01b4ae0007af77d3114864276f25ae424 Mon Sep 17 00:00:00 2001 From: NRK Date: Sat, 24 Feb 2024 13:32:34 +0000 Subject: [PATCH 01/13] app-arch/7zip: add rar support Closes: https://bugs.gentoo.org/918634 Signed-off-by: NRK --- app-arch/7zip/7zip-23.01.ebuild | 26 ++++++++++++++++++++++---- app-arch/7zip/metadata.xml | 7 ++++--- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild index 38a77c1c4c..45f60812c2 100644 --- a/app-arch/7zip/7zip-23.01.ebuild +++ b/app-arch/7zip/7zip-23.01.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,9 +9,9 @@ NO_DOT_PV=$(ver_rs 1- '') DESCRIPTION="A free file archiver for extremely high compression" HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/" SRC_URI="https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz/download -> ${PN}-${PV}.tar.xz" -LICENSE="LGPL-2 BSD" +LICENSE="LGPL-2 BSD rar? ( unRAR )" -IUSE="asm" +IUSE="asm rar" SLOT="0" KEYWORDS="~amd64" @@ -20,6 +20,12 @@ RESTRICT="mirror" RDEPEND="" DEPEND="${RDEPEND}" +# TODO(NRK): package asmc? since 7zip docs recommends using it over jwasm since +# jwasm doesn't support AES instructions. +# +# alternatively look into packaging uasm (https://www.terraspace.co.uk/uasm.html) +# instead which is jwasm based but also supports AES. the 7zip AUR package uses +# uasm for reference. BDEPEND="asm? ( dev-lang/jwasm )" pkg_setup() { @@ -62,7 +68,19 @@ src_compile() { export G_CXXFLAGS=${CXXFLAGS} export G_LDFLAGS=${LDFLAGS} # USE_JWASM=1 - if asm: use JWasm assembler instead of Asmc (not a gentoo package) - emake DISABLE_RAR=1 USE_JWASM=1 --file "../../${mfile}" + local args=( + -f "../../${mfile}" + USE_JWASM=1 + ) + # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only + # whether it's defined or not. so in case user has `rar` enabled + # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined. + if ! use rar; then + # disables non-free rar code but allows listing and extracting + # non-compressed rar archives + args+=(DISABLE_RAR_COMPRESS=1) + fi + emake ${args[@]} popd > /dev/null || die "Unable to switch directory" } diff --git a/app-arch/7zip/metadata.xml b/app-arch/7zip/metadata.xml index 099821269c..43ad17ef87 100644 --- a/app-arch/7zip/metadata.xml +++ b/app-arch/7zip/metadata.xml @@ -1,13 +1,14 @@ - - Use dev-lang/jwasm to include optimized code - m@matous.dev Martin Matouš + + Use dev-lang/jwasm to include optimized code + Enable support for non-free rar decoder + Igor Pavlov From 2e6dc534cf743f24a2ed122d000b757a5f7f2b14 Mon Sep 17 00:00:00 2001 From: NRK Date: Sat, 24 Feb 2024 15:16:30 +0000 Subject: [PATCH 02/13] dev-lang/uasm: new package Signed-off-by: NRK --- dev-lang/uasm/Manifest | 1 + dev-lang/uasm/metadata.xml | 10 +++++++++ dev-lang/uasm/uasm-2.56.2.ebuild | 36 ++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 dev-lang/uasm/Manifest create mode 100644 dev-lang/uasm/metadata.xml create mode 100644 dev-lang/uasm/uasm-2.56.2.ebuild diff --git a/dev-lang/uasm/Manifest b/dev-lang/uasm/Manifest new file mode 100644 index 0000000000..bb9b666ccf --- /dev/null +++ b/dev-lang/uasm/Manifest @@ -0,0 +1 @@ +DIST uasm-2.56.2.tar.gz 1243830 BLAKE2B dcc0948d92cdd5972a6698e721a6ccc6a54926ef94778438cf9a88a6e41ebc652d5230003f689d4278bd1e48959dd04595c602427287a48c551d7b847be665f0 SHA512 1f6c1037909d012f3293985c4e0516f4b61497de23cac6bbb58db735efb512599c0bba5d60d8ce999e6afc57e44484a094bf10f0ee185a51afd826f5541c9337 diff --git a/dev-lang/uasm/metadata.xml b/dev-lang/uasm/metadata.xml new file mode 100644 index 0000000000..9ceaa24387 --- /dev/null +++ b/dev-lang/uasm/metadata.xml @@ -0,0 +1,10 @@ + + + + + nrk@disroot.org + + + Terraspace/UASM + + diff --git a/dev-lang/uasm/uasm-2.56.2.ebuild b/dev-lang/uasm/uasm-2.56.2.ebuild new file mode 100644 index 0000000000..911bc83151 --- /dev/null +++ b/dev-lang/uasm/uasm-2.56.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="UASM is a free MASM-compatible assembler" +HOMEPAGE="https://www.terraspace.co.uk/uasm.html" +SRC_URI="https://github.com/Terraspace/UASM/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Watcom-1.0" + +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="" +DEPEND="" +BDEPEND="" +S="${WORKDIR}/UASM-${PV}" + +src_prepare() { + default + # don't strip binary + sed -i gccLinux64.mak -e 's/ -s / /g' || die +} + +src_compile() { + # -fcommon: https://github.com/Terraspace/UASM/issues/143 + emake -f gccLinux64.mak CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS} -fcommon" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin GccUnixR/uasm + dodoc *.txt Doc/*.txt +} From 66e3c38e9193bb36ef35a1eab00016b4b1e6a5e6 Mon Sep 17 00:00:00 2001 From: NRK Date: Sat, 24 Feb 2024 15:35:48 +0000 Subject: [PATCH 03/13] app-arch/7zip: add support for dev-lang/uasm Signed-off-by: NRK --- app-arch/7zip/7zip-23.01.ebuild | 28 ++++++++++++++-------------- app-arch/7zip/metadata.xml | 3 ++- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild index 45f60812c2..7fe4ad21c1 100644 --- a/app-arch/7zip/7zip-23.01.ebuild +++ b/app-arch/7zip/7zip-23.01.ebuild @@ -11,7 +11,8 @@ HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/" SRC_URI="https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz/download -> ${PN}-${PV}.tar.xz" LICENSE="LGPL-2 BSD rar? ( unRAR )" -IUSE="asm rar" +IUSE="uasm jwasm rar" +REQUIRED_USE="?? ( uasm jwasm )" SLOT="0" KEYWORDS="~amd64" @@ -20,13 +21,11 @@ RESTRICT="mirror" RDEPEND="" DEPEND="${RDEPEND}" -# TODO(NRK): package asmc? since 7zip docs recommends using it over jwasm since -# jwasm doesn't support AES instructions. -# -# alternatively look into packaging uasm (https://www.terraspace.co.uk/uasm.html) -# instead which is jwasm based but also supports AES. the 7zip AUR package uses -# uasm for reference. -BDEPEND="asm? ( dev-lang/jwasm )" +# TODO: disable executable stack when asm is used +BDEPEND=" + uasm? ( dev-lang/uasm ) + jwasm? ( dev-lang/jwasm ) +" pkg_setup() { # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux @@ -42,7 +41,7 @@ pkg_setup() { else die "Unsupported compiler: $(tc-getCC)" fi - if use asm ; then + if use jwasm || use uasm ; then mfile="${mfile}_x64" bdir="${bdir}_x64" fi @@ -67,11 +66,7 @@ src_compile() { export G_CFLAGS=${CFLAGS} export G_CXXFLAGS=${CXXFLAGS} export G_LDFLAGS=${LDFLAGS} - # USE_JWASM=1 - if asm: use JWasm assembler instead of Asmc (not a gentoo package) - local args=( - -f "../../${mfile}" - USE_JWASM=1 - ) + local args=( -f "../../${mfile}" ) # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only # whether it's defined or not. so in case user has `rar` enabled # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined. @@ -80,6 +75,11 @@ src_compile() { # non-compressed rar archives args+=(DISABLE_RAR_COMPRESS=1) fi + if use jwasm; then + args+=(USE_JWASM=1) + elif use uasm; then + args+=(MY_ASM=uasm) + fi emake ${args[@]} popd > /dev/null || die "Unable to switch directory" } diff --git a/app-arch/7zip/metadata.xml b/app-arch/7zip/metadata.xml index 43ad17ef87..3f87406d71 100644 --- a/app-arch/7zip/metadata.xml +++ b/app-arch/7zip/metadata.xml @@ -6,8 +6,9 @@ Martin Matouš - Use dev-lang/jwasm to include optimized code Enable support for non-free rar decoder + Use dev-lang/uasm to include optimized code + Use dev-lang/jwasm to include optimized code (doesn't support AES) From d00074052481cbb468d930cc42caeaa6990d1987 Mon Sep 17 00:00:00 2001 From: NRK Date: Sat, 24 Feb 2024 15:46:14 +0000 Subject: [PATCH 04/13] app-arch/7zip: disable executable stack when using uasm Signed-off-by: NRK --- app-arch/7zip/7zip-23.01.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild index 7fe4ad21c1..414d6e33be 100644 --- a/app-arch/7zip/7zip-23.01.ebuild +++ b/app-arch/7zip/7zip-23.01.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit edos2unix toolchain-funcs +inherit edos2unix toolchain-funcs flag-o-matic NO_DOT_PV=$(ver_rs 1- '') DESCRIPTION="A free file archiver for extremely high compression" @@ -21,7 +21,6 @@ RESTRICT="mirror" RDEPEND="" DEPEND="${RDEPEND}" -# TODO: disable executable stack when asm is used BDEPEND=" uasm? ( dev-lang/uasm ) jwasm? ( dev-lang/jwasm ) @@ -61,6 +60,7 @@ src_prepare() { src_compile() { pushd "./Bundles/Alone2" || die "Unable to switch directory" + append-ldflags -Wl,-z,noexecstack export G_CC=$(tc-getCC) export G_CXX=$(tc-getCXX) export G_CFLAGS=${CFLAGS} From cdc75fb7c0cb1982ee5065effc061903fd679190 Mon Sep 17 00:00:00 2001 From: NRK Date: Sat, 24 Feb 2024 15:47:52 +0000 Subject: [PATCH 05/13] app-arch/7zip: add myself as co-maintainer Signed-off-by: NRK --- app-arch/7zip/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-arch/7zip/metadata.xml b/app-arch/7zip/metadata.xml index 3f87406d71..f6008af2b1 100644 --- a/app-arch/7zip/metadata.xml +++ b/app-arch/7zip/metadata.xml @@ -5,6 +5,9 @@ m@matous.dev Martin Matouš + + nrk@disroot.org + Enable support for non-free rar decoder Use dev-lang/uasm to include optimized code From 68c75128c03373ec97181652fdfd9203c9fc71c7 Mon Sep 17 00:00:00 2001 From: NRK Date: Sat, 24 Feb 2024 15:49:14 +0000 Subject: [PATCH 06/13] dev-lang/uasm: use append-cflags Signed-off-by: NRK --- dev-lang/uasm/uasm-2.56.2.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-lang/uasm/uasm-2.56.2.ebuild b/dev-lang/uasm/uasm-2.56.2.ebuild index 911bc83151..dab3f1d2df 100644 --- a/dev-lang/uasm/uasm-2.56.2.ebuild +++ b/dev-lang/uasm/uasm-2.56.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit toolchain-funcs +inherit toolchain-funcs flag-o-matic DESCRIPTION="UASM is a free MASM-compatible assembler" HOMEPAGE="https://www.terraspace.co.uk/uasm.html" @@ -25,9 +25,9 @@ src_prepare() { } src_compile() { - # -fcommon: https://github.com/Terraspace/UASM/issues/143 + append-cflags -fcommon # Bug: https://github.com/Terraspace/UASM/issues/143 emake -f gccLinux64.mak CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} -fcommon" LDFLAGS="${LDFLAGS}" + CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() { From f324f3dde6e0be2d5893756315b8413754252407 Mon Sep 17 00:00:00 2001 From: NRK Date: Sat, 24 Feb 2024 21:42:27 +0000 Subject: [PATCH 07/13] app-arch/7zip: simplify patch Signed-off-by: NRK --- app-arch/7zip/7zip-23.01.ebuild | 12 +++-- .../files/7zip-23.01-respect-build-env.patch | 45 ------------------- 2 files changed, 9 insertions(+), 48 deletions(-) diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild index 414d6e33be..c3ec08e7e0 100644 --- a/app-arch/7zip/7zip-23.01.ebuild +++ b/app-arch/7zip/7zip-23.01.ebuild @@ -26,6 +26,10 @@ BDEPEND=" jwasm? ( dev-lang/jwasm ) " +# TODO(NRK): also build and install the library +# TODO(NRK): make it so this package can be used as a drop-in replacement +# for app-arch/p7zip ?? + pkg_setup() { # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux # TLDR; every combination of options (clang|gcc)+(asm/noasm) @@ -61,12 +65,14 @@ src_prepare() { src_compile() { pushd "./Bundles/Alone2" || die "Unable to switch directory" append-ldflags -Wl,-z,noexecstack - export G_CC=$(tc-getCC) - export G_CXX=$(tc-getCXX) export G_CFLAGS=${CFLAGS} export G_CXXFLAGS=${CXXFLAGS} export G_LDFLAGS=${LDFLAGS} - local args=( -f "../../${mfile}" ) + local args=( + -f "../../${mfile}" + CC=$(tc-getCC) + CXX=$(tc-getCXX) + ) # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only # whether it's defined or not. so in case user has `rar` enabled # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined. diff --git a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch b/app-arch/7zip/files/7zip-23.01-respect-build-env.patch index 2615a9e34a..c897cf6259 100644 --- a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch +++ b/app-arch/7zip/files/7zip-23.01-respect-build-env.patch @@ -51,48 +51,3 @@ Bug: https://bugs.gentoo.org/913189 endif LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2) ---- a/var_clang.mak -+++ b/var_clang.mak -@@ -6,6 +6,6 @@ IS_ARM64= - CROSS_COMPILE= - MY_ARCH= - USE_ASM= --CC=$(CROSS_COMPILE)clang --CXX=$(CROSS_COMPILE)clang++ -+CC=$(G_CC) -+CXX=$(G_CXX) - USE_CLANG=1 ---- a/var_clang_x64.mak -+++ b/var_clang_x64.mak -@@ -6,7 +6,7 @@ IS_ARM64= - CROSS_COMPILE= - MY_ARCH= - USE_ASM=1 --CC=$(CROSS_COMPILE)clang --CXX=$(CROSS_COMPILE)clang++ -+CC=$(G_CC) -+CXX=$(G_CXX) - USE_CLANG=1 - ---- a/var_gcc.mak -+++ b/var_gcc.mak -@@ -6,7 +6,7 @@ IS_ARM64= - CROSS_COMPILE= - MY_ARCH= - USE_ASM= --CC=$(CROSS_COMPILE)gcc --CXX=$(CROSS_COMPILE)g++ -+CC=$(G_CC) -+CXX=$(G_CXX) - - # -march=armv8-a+crc+crypto ---- a/var_gcc_x64.mak -+++ b/var_gcc_x64.mak -@@ -6,5 +6,5 @@ IS_ARM64= - CROSS_COMPILE= - MY_ARCH= - USE_ASM=1 --CC=$(CROSS_COMPILE)gcc --CXX=$(CROSS_COMPILE)g++ -+CC=$(G_CC) -+CXX=$(G_CXX) From 5e9e2ad78d04b60b5e2bfcd6174b9482e27a2003 Mon Sep 17 00:00:00 2001 From: NRK Date: Sun, 25 Feb 2024 10:35:33 +0000 Subject: [PATCH 08/13] app-arch/7zip: grab docs from the linux tarball Signed-off-by: NRK --- app-arch/7zip/7zip-23.01.ebuild | 10 +++++++++- app-arch/7zip/Manifest | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild index c3ec08e7e0..340dd91b03 100644 --- a/app-arch/7zip/7zip-23.01.ebuild +++ b/app-arch/7zip/7zip-23.01.ebuild @@ -8,7 +8,10 @@ inherit edos2unix toolchain-funcs flag-o-matic NO_DOT_PV=$(ver_rs 1- '') DESCRIPTION="A free file archiver for extremely high compression" HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/" -SRC_URI="https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz/download -> ${PN}-${PV}.tar.xz" +SRC_URI=" + https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz/download -> ${PN}-${PV}.tar.xz + https://sourceforge.net/projects/sevenzip/files/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz/download -> ${PN}-${PV}-linux.tar.xz +" LICENSE="LGPL-2 BSD rar? ( unRAR )" IUSE="uasm jwasm rar" @@ -17,6 +20,8 @@ SLOT="0" KEYWORDS="~amd64" S="${WORKDIR}/CPP/7zip/" +DOCS=( readme.txt History.txt License.txt ) +HTML_DOCS=( MANUAL ) RESTRICT="mirror" RDEPEND="" @@ -92,4 +97,7 @@ src_compile() { src_install() { dobin "./Bundles/Alone2/b/${bdir}/7zz" + + pushd "${WORKDIR}" || die "Unable to switch directory" + einstalldocs } diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest index 0f23ebee40..39335efa32 100644 --- a/app-arch/7zip/Manifest +++ b/app-arch/7zip/Manifest @@ -1 +1,2 @@ +DIST 7zip-23.01-linux.tar.xz 1527700 BLAKE2B 35dc74f0a7a4e586ea5ae969dce72c14e0231822630d2d70f24e1c911cea0492354a258ef65096a6ce0da1510117c12466bc6cda577cdf9e8e74ede17e47f23e SHA512 d3549468de8fd161e4c9233fa0b170af1f28c74749d20f3d0eeb3873857f6c6d2cc0777d564e6a79be7cc21c9e982e10710a795320428dc51db809a8d0f9454e DIST 7zip-23.01.tar.xz 1378588 BLAKE2B 348484b24b39db70e513fe50d79954ea0e2dd669f83e3601fa796c8f0ca4734132ca20fac8cda9b8ba550bad9146627fc0ae07056abb99028ef6d825b6a533bd SHA512 e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986 From 0d7cd393ac22dfaf40fa48bf1a4863af64700ae3 Mon Sep 17 00:00:00 2001 From: NRK Date: Mon, 26 Feb 2024 18:37:11 +0000 Subject: [PATCH 09/13] app-text/md4c: add md2html useflag Signed-off-by: NRK --- app-text/md4c/md4c-0.5.2.ebuild | 4 +++- app-text/md4c/metadata.xml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app-text/md4c/md4c-0.5.2.ebuild b/app-text/md4c/md4c-0.5.2.ebuild index 4a8b725b1c..524311cd3f 100644 --- a/app-text/md4c/md4c-0.5.2.ebuild +++ b/app-text/md4c/md4c-0.5.2.ebuild @@ -7,8 +7,8 @@ inherit cmake # TODO(NRK): # - enable tests -# - useflag to not build md2html tool # - useflag for static lib (?) +# - move this under dev-libs or maybe split the md2html tool into it's own package (??) if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -25,6 +25,7 @@ HOMEPAGE="https://github.com/mity/md4c" LICENSE="MIT" SLOT="0" +IUSE="+md2html" src_prepare() { cmake_src_prepare @@ -34,6 +35,7 @@ src_configure() { mycmakeargs=( -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON + -DBUILD_MD2HTML_EXECUTABLE=$(usex md2html ON OFF) ) cmake_src_configure diff --git a/app-text/md4c/metadata.xml b/app-text/md4c/metadata.xml index 0b2c5c0d69..102047fdc7 100644 --- a/app-text/md4c/metadata.xml +++ b/app-text/md4c/metadata.xml @@ -4,6 +4,9 @@ nrk@disroot.org + + Build the md2html cli tool + mity/md4c From 56075f81a712bef841dd47d2b48d44a8e0e143b6 Mon Sep 17 00:00:00 2001 From: Rahil Bhimjiani Date: Mon, 26 Feb 2024 23:10:15 +0530 Subject: [PATCH 10/13] app-admin/vaultwarden: print instructions only on first install also add symlink /etc/conf.d/vaultwarden -> ../vaultwarden.env for openrc users to find config at usual location Signed-off-by: Rahil Bhimjiani --- .../vaultwarden/vaultwarden-1.30.3.ebuild | 20 +++++++++++++------ app-admin/vaultwarden/vaultwarden-9999.ebuild | 20 +++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild b/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild index 4cf733e1aa..27fdd5ac6d 100644 --- a/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild +++ b/app-admin/vaultwarden/vaultwarden-1.30.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cargo check-reqs systemd tmpfiles +inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust" HOMEPAGE="https://github.com/dani-garcia/vaultwarden" @@ -53,6 +53,16 @@ PATCHES=( CHECKREQS_MEMORY=3G CHECKREQS_DISK_BUILD=2G +DOC_CONTENTS="\n + Configuration file: /etc/${PN}.env\n + Data directory: /var/lib/${PN}\n + \n + MySQL & PostgreSQL users must set DATABASE_URL in config\n + \n + Default server: http://0.0.0.0:8000\n + Admin interface: http://0.0.0.0:8000/admin +" + src_unpack() { if [[ ${PV} == 9999* ]]; then # clone vaultwarden @@ -96,17 +106,15 @@ src_install() { newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf insinto /etc newins .env.template "${PN}".env + dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}" keepdir /var/lib/"${PN}" + readme.gentoo_create_doc einstalldocs dodoc -r ../"${PN}".wiki/* } pkg_postinst() { tmpfiles_process "${PN}".conf - elog "Configuration file: /etc/${PN}.env" - elog "Data directory: /var/lib/${PN}" - use mysql || use postgres && elog "User must set DATABASE_URL in config " - elog "Default server: http://127.0.0.1:8000" - elog "Admin interface: http://127.0.0.1:8000/admin" + readme.gentoo_print_elog } diff --git a/app-admin/vaultwarden/vaultwarden-9999.ebuild b/app-admin/vaultwarden/vaultwarden-9999.ebuild index 4cf733e1aa..27fdd5ac6d 100644 --- a/app-admin/vaultwarden/vaultwarden-9999.ebuild +++ b/app-admin/vaultwarden/vaultwarden-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cargo check-reqs systemd tmpfiles +inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust" HOMEPAGE="https://github.com/dani-garcia/vaultwarden" @@ -53,6 +53,16 @@ PATCHES=( CHECKREQS_MEMORY=3G CHECKREQS_DISK_BUILD=2G +DOC_CONTENTS="\n + Configuration file: /etc/${PN}.env\n + Data directory: /var/lib/${PN}\n + \n + MySQL & PostgreSQL users must set DATABASE_URL in config\n + \n + Default server: http://0.0.0.0:8000\n + Admin interface: http://0.0.0.0:8000/admin +" + src_unpack() { if [[ ${PV} == 9999* ]]; then # clone vaultwarden @@ -96,17 +106,15 @@ src_install() { newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf insinto /etc newins .env.template "${PN}".env + dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}" keepdir /var/lib/"${PN}" + readme.gentoo_create_doc einstalldocs dodoc -r ../"${PN}".wiki/* } pkg_postinst() { tmpfiles_process "${PN}".conf - elog "Configuration file: /etc/${PN}.env" - elog "Data directory: /var/lib/${PN}" - use mysql || use postgres && elog "User must set DATABASE_URL in config " - elog "Default server: http://127.0.0.1:8000" - elog "Admin interface: http://127.0.0.1:8000/admin" + readme.gentoo_print_elog } From 1e15d68eb375d7e1ceb3796314ca69aa8b4a596d Mon Sep 17 00:00:00 2001 From: Rahil Bhimjiani Date: Mon, 26 Feb 2024 23:16:22 +0530 Subject: [PATCH 11/13] app-admin/bitwarden-cli: what is pushd must be popd Signed-off-by: Rahil Bhimjiani --- app-admin/bitwarden-cli/bitwarden-cli-2024.2.0.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/app-admin/bitwarden-cli/bitwarden-cli-2024.2.0.ebuild b/app-admin/bitwarden-cli/bitwarden-cli-2024.2.0.ebuild index 7d6bf1c2a0..d6eb78d6ef 100644 --- a/app-admin/bitwarden-cli/bitwarden-cli-2024.2.0.ebuild +++ b/app-admin/bitwarden-cli/bitwarden-cli-2024.2.0.ebuild @@ -54,6 +54,7 @@ src_compile() { PKG_CACHE_PATH="${WORKDIR}"/.pkg-cache npm --verbose --offline run dist:lin \ || die "Build failed! Try prebuilt from upstream ${CATEGORY}/${PN}-bin" ./dist/linux/bw completion --shell zsh > bw.zsh + popd } src_install() { From c4def3f6f4b0ee781566975b1fc7a31e44337086 Mon Sep 17 00:00:00 2001 From: Rahil Bhimjiani Date: Tue, 27 Feb 2024 03:11:09 +0530 Subject: [PATCH 12/13] app-admin/bitwarden-cli: die multiple times Clauses - https://github.com/gentoo/guru/commit/1e15d68eb375d7e1ceb3796314ca69aa8b4a596d#r139080432 Signed-off-by: Rahil Bhimjiani --- app-admin/bitwarden-cli/bitwarden-cli-2024.2.0.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-admin/bitwarden-cli/bitwarden-cli-2024.2.0.ebuild b/app-admin/bitwarden-cli/bitwarden-cli-2024.2.0.ebuild index d6eb78d6ef..14a95f9cc5 100644 --- a/app-admin/bitwarden-cli/bitwarden-cli-2024.2.0.ebuild +++ b/app-admin/bitwarden-cli/bitwarden-cli-2024.2.0.ebuild @@ -50,11 +50,11 @@ src_prepare() { } src_compile() { - pushd apps/cli + pushd apps/cli || die PKG_CACHE_PATH="${WORKDIR}"/.pkg-cache npm --verbose --offline run dist:lin \ || die "Build failed! Try prebuilt from upstream ${CATEGORY}/${PN}-bin" - ./dist/linux/bw completion --shell zsh > bw.zsh - popd + ./dist/linux/bw completion --shell zsh > bw.zsh || die + popd || die } src_install() { From 960abdf6fad4e3e65e6c7d7c65b5293d065b82ce Mon Sep 17 00:00:00 2001 From: Daichi Yamamoto Date: Tue, 27 Feb 2024 10:13:46 +0900 Subject: [PATCH 13/13] dev-util/rye: add 0.27.0, drop 0.26.0 Signed-off-by: Daichi Yamamoto --- dev-util/rye/Manifest | 2 +- dev-util/rye/{rye-0.26.0.ebuild => rye-0.27.0.ebuild} | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) rename dev-util/rye/{rye-0.26.0.ebuild => rye-0.27.0.ebuild} (98%) diff --git a/dev-util/rye/Manifest b/dev-util/rye/Manifest index 54ffd2deba..9291cb9e08 100644 --- a/dev-util/rye/Manifest +++ b/dev-util/rye/Manifest @@ -183,7 +183,7 @@ DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e78 DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960 DIST rustls-0.21.10.crate 284920 BLAKE2B eb4628b6e0384fa7cbb5468c75c11512eb111a8a7dc7c655c6ac6beac72fc3025b1a590324ec3275ba66b632dab14dd78da4d62c1c66b2c2502099ad153900f5 SHA512 3bfcd137e6d4d86c716e8afe75450a39ca055d44557fd1a8d4b6ad4d7c58e2d5fb86ba92c3825a667c9daf5bd7a89a779ffcf8c23d6cd0af05ad47ad437da139 DIST rustls-webpki-0.101.7.crate 168808 BLAKE2B ab7177449be359e17f1f4553193e96e71b8e26e1298a0937af658b1a6f9485f051183d1bf8262d52430ea4c3b96263d1fd903c7a5f046bfe5f87b6b97ebb0672 SHA512 680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68 -DIST rye-0.26.0.tar.gz 1448145 BLAKE2B 92e8e8aa762338ee9bc0e1db1818ef44a7622873625267b9f118ca0fd307c6083c05dca9b16c11dce130559cb469ae1d2f134a6c786b9280a467550b7b2ca47a SHA512 93372c884e0fcbc9f8d8f390582c878375652ba6adea82299160923c9e54f79c3dfa0cfe8803d3f8746ee882a28c3b18091f9c870c0c5daee17b9881784375a1 +DIST rye-0.27.0.tar.gz 1454277 BLAKE2B 938243028695b290933526e484bcc170b4a7aa1977ab0e8007611d6955fd47be736f43f912cfea4db4352912c24c201cfda71563fac416a1de830c1c51ba7225 SHA512 c6785d34ff1193856186b8a50f2908900691e44243182cc325eecc5b3a3b890a6eba27208b8d6bc48d77a894110540f4bab6b47d563de9c8b0205e3234b591b9 DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10 DIST salsa20-0.10.2.crate 12780 BLAKE2B 9627985a2b5583e91cdbefff2a71af02009b1905b05d58ced99eac357c27c3b363ef9dc40afd3d19c39a6fd5b19fab7f7149b1fcd85f3e2f63edf7cb1e8990ee SHA512 9066143f6f503fbd6e85434e9dcbe0f0ed4e71e363c599d90968f6f9517dc749798f3e4cae6ed45e4ec429495a103ff4fc9ec564397c947ea63a6c32773c90f0 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c diff --git a/dev-util/rye/rye-0.26.0.ebuild b/dev-util/rye/rye-0.27.0.ebuild similarity index 98% rename from dev-util/rye/rye-0.26.0.ebuild rename to dev-util/rye/rye-0.27.0.ebuild index 324683fd2e..e1388c310b 100644 --- a/dev-util/rye/rye-0.26.0.ebuild +++ b/dev-util/rye/rye-0.27.0.ebuild @@ -314,7 +314,7 @@ inherit cargo DESCRIPTION="An Experimental Package Management Solution for Python" HOMEPAGE="https://rye-up.com" SRC_URI=" - https://github.com/mitsuhiko/rye/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/astral-sh/rye/archive/${PV}.tar.gz -> ${P}.tar.gz ${CARGO_CRATE_URIS} " @@ -336,6 +336,7 @@ src_test() { --skip test_add_and_sync_no_auto_sync --skip test_add_autosync --skip test_add_flask + --skip test_add_flask_wrong_venv_exported --skip test_add_from_find_links --skip test_basic_tool_behavior --skip test_config_empty @@ -344,6 +345,7 @@ src_test() { --skip test_config_show_path --skip test_config_show_path_and_any_action --skip test_empty_sync + --skip test_fetch --skip test_init_default --skip test_init_lib --skip test_init_script