[gentoo-commits] data/api:master commit in: files/mirrors/
commit: ae04cbc4c51ecbce92cc77a9763043b6c6534128 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Nov 3 17:49:18 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Nov 3 17:49:18 2024 + URL:https://gitweb.gentoo.org/data/api.git/commit/?id=ae04cbc4 RIP ftp.vectranet.pl; reported by email, no longer resolves Signed-off-by: Robin H. Johnson gentoo.org> files/mirrors/distfiles.xml | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/files/mirrors/distfiles.xml b/files/mirrors/distfiles.xml index d3e8cd68..78768e8d 100644 --- a/files/mirrors/distfiles.xml +++ b/files/mirrors/distfiles.xml @@ -352,14 +352,10 @@ vim: ft=xml et ts=2 sts=2 sw=2: http://mirrors.evoluso.com/gentoo/ + RNL - Técnico Lisboa
[gentoo-commits] repo/gentoo:master commit in: dev-lang/snobol/
commit: fc7b0341af21a2c1b2bbc105977c916cb75a752b Author: Robin H. Johnson gentoo org> AuthorDate: Sun Oct 6 18:36:24 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Oct 6 18:36:24 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7b0341 dev-lang/snobol: QA: VariableOrderWrong Signed-off-by: Robin H. Johnson gentoo.org> dev-lang/snobol/snobol-1.4.1-r1.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-lang/snobol/snobol-1.4.1-r1.ebuild b/dev-lang/snobol/snobol-1.4.1-r1.ebuild index 2f1b55d3d530..db585fed563d 100644 --- a/dev-lang/snobol/snobol-1.4.1-r1.ebuild +++ b/dev-lang/snobol/snobol-1.4.1-r1.ebuild @@ -9,6 +9,7 @@ MY_P="${PN}4-${PV}" DESCRIPTION="Phil Budne's port of Macro SNOBOL4 in C, for modern machines" HOMEPAGE="http://www.snobol4.org/csnobol4/"; SRC_URI="ftp://ftp.snobol4.org/snobol/old/${MY_P}.tar.gz"; +S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" SLOT="0" @@ -19,8 +20,6 @@ DEPEND="sys-libs/gdbm[berkdb]" RDEPEND="${DEPEND}" BDEPEND="sys-devel/m4" -S="${WORKDIR}/${MY_P}" - PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/sipp/, net-misc/sipp/files/
commit: 4ca3664063ba0915ab4cce92fc0520d91e08c7d5 Author: Sam James gentoo org> AuthorDate: Sun Oct 6 14:37:19 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Oct 6 14:37:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca36640 net-misc/sipp: fix -Wformat-overflow Closes: https://bugs.gentoo.org/940748 Signed-off-by: Sam James gentoo.org> net-misc/sipp/files/sipp-3.7.3-overflow.patch | 84 +++ net-misc/sipp/sipp-3.7.3-r1.ebuild| 49 2 files changed, 133 insertions(+) diff --git a/net-misc/sipp/files/sipp-3.7.3-overflow.patch b/net-misc/sipp/files/sipp-3.7.3-overflow.patch new file mode 100644 index ..87e9c468e576 --- /dev/null +++ b/net-misc/sipp/files/sipp-3.7.3-overflow.patch @@ -0,0 +1,84 @@ +https://bugs.gentoo.org/940748 +https://github.com/SIPp/sipp/commit/fdc0c97e1d8acbe4de0d89cf26dfe74bf9b413ed + +From fdc0c97e1d8acbe4de0d89cf26dfe74bf9b413ed Mon Sep 17 00:00:00 2001 +From: Orgad Shaneh +Date: Wed, 11 Sep 2024 20:55:06 +0300 +Subject: [PATCH] Fix 32-bit compilation + +--- a/src/call.cpp b/src/call.cpp +@@ -1563,8 +1563,8 @@ char * call::get_last_header(const char * name) + if (name[len - 1] == ':') { + return get_header(last_recv_msg, name, false); + } else { +-char with_colon[MAX_HEADER_LEN]; +-sprintf(with_colon, "%s:", name); ++char with_colon[MAX_HEADER_LEN+2]; ++snprintf(with_colon, MAX_HEADER_LEN+2, "%s:", name); + return get_header(last_recv_msg, with_colon, false); + } + } +@@ -1604,8 +1604,8 @@ char * call::get_last_request_uri() + } + + last_request_uri[0] = '\0'; +-if (tmp && (tmp_len > 0)) { +-strncpy(last_request_uri, tmp, tmp_len); ++if (tmp_len > 0) { ++memcpy(last_request_uri, tmp, tmp_len); + } + last_request_uri[tmp_len] = '\0'; + +--- a/src/rtpstream.cpp b/src/rtpstream.cpp +@@ -2702,7 +2702,7 @@ void rtpstream_audioecho_thread(void* param) + pthread_mutex_lock(&debugremutexaudio); + if (debugrefileaudio != nullptr) + { +-fprintf(debugrefileaudio, "DATA SUCCESSFULLY RECEIVED [AUDIO] nr = %ld...", nr); ++fprintf(debugrefileaudio, "DATA SUCCESSFULLY RECEIVED [AUDIO] nr = %d...", int(nr)); + } + for (int i = 0; i < 12; i++) + { +@@ -2780,7 +2780,8 @@ void rtpstream_audioecho_thread(void* param) + pthread_mutex_lock(&debugremutexaudio); + if (debugrefileaudio != nullptr) + { +-fprintf(debugrefileaudio, "DATA SUCCESSFULLY SENT [AUDIO] seq_num = [%u] -- MISMATCHED RECV/SENT BYTE COUNT -- errno = %d nr = %ld ns = %ld\n", seq_num, errno, nr, ns); ++fprintf(debugrefileaudio, "DATA SUCCESSFULLY SENT [AUDIO] seq_num = [%u] -- MISMATCHED RECV/SENT BYTE COUNT -- errno = %d nr = %d ns = %d\n", ++seq_num, errno, int(nr), int(ns)); + } + pthread_mutex_unlock(&debugremutexaudio); + } else { +@@ -2961,7 +2962,7 @@ void rtpstream_videoecho_thread(void* param) + pthread_mutex_lock(&debugremutexvideo); + if (debugrefilevideo != nullptr) + { +-fprintf(debugrefilevideo, "DATA SUCCESSFULLY RECEIVED [VIDEO] nr = %ld...", nr); ++fprintf(debugrefilevideo, "DATA SUCCESSFULLY RECEIVED [VIDEO] nr = %d...", int(nr)); + } + for (int i = 0; i < 12; i++) + { +@@ -3038,7 +3039,8 @@ void rtpstream_videoecho_thread(void* param) + pthread_mutex_lock(&debugremutexvideo); + if (debugrefilevideo != nullptr) + { +-fprintf(debugrefilevideo, "DATA SUCCESSFULLY SENT [VIDEO] seq_num = [%u] -- MISMATCHED RECV/SENT BYTE COUNT -- errno = %d nr = %ld ns = %ld\n", seq_num, errno, nr, ns); ++fprintf(debugrefilevideo, "DATA SUCCESSFULLY SENT [VIDEO] seq_num = [%u] -- MISMATCHED RECV/SENT BYTE COUNT -- errno = %d nr = %d ns = %d\n", ++seq_num, errno, int(nr), int(ns)); + } + pthread_mutex_unlock(&debugremutexvideo); + } else { +--- a/src/sip_parser.cpp b/src/sip_parser.cpp +@@ -455,7 +455,7 @@ static const char* internal_find_header(const char* msg, const char* name, const + ptr = strchr(ptr, '\n'); + if (!ptr || ptr[-1] != '\r' || (ptr[1] == '\r' && ptr[2] =
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/childprocess/
commit: 99f21d400b3bdc3095ab053bda48859562d2f071 Author: Sam James gentoo org> AuthorDate: Sun Oct 6 14:37:42 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Oct 6 14:37:42 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99f21d40 dev-ruby/childprocess: Stabilize 5.1.0 ppc64, #941063 Signed-off-by: Sam James gentoo.org> dev-ruby/childprocess/childprocess-5.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/childprocess/childprocess-5.1.0.ebuild b/dev-ruby/childprocess/childprocess-5.1.0.ebuild index 522f2e276ab2..c14cd56eafec 100644 --- a/dev-ruby/childprocess/childprocess-5.1.0.ebuild +++ b/dev-ruby/childprocess/childprocess-5.1.0.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/enkessler/childprocess"; LICENSE="MIT" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" ruby_add_rdepend ">=dev-ruby/ffi-1.0.11 >=dev-ruby/logger-1.5:0"
[gentoo-commits] repo/gentoo:master commit in: app-admin/checksec/
commit: 30d023407df7eb630fa55aa67e8dc4d281145be7 Author: Sam James gentoo org> AuthorDate: Sun Oct 6 14:37:44 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Oct 6 14:37:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d02340 app-admin/checksec: Stabilize 2.7.1-r1 ppc64, #941071 Signed-off-by: Sam James gentoo.org> app-admin/checksec/checksec-2.7.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-admin/checksec/checksec-2.7.1-r1.ebuild b/app-admin/checksec/checksec-2.7.1-r1.ebuild index 6fd29bc8d3d3..fc362feb5a9e 100644 --- a/app-admin/checksec/checksec-2.7.1-r1.ebuild +++ b/app-admin/checksec/checksec-2.7.1-r1.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_PN}-${PV} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86" RDEPEND=" sys-apps/grep[pcre]
[gentoo-commits] repo/gentoo:master commit in: media-libs/libvpx/
commit: a3dcccde97ec48b994f627b255e1cb431f47f26d Author: Sam James gentoo org> AuthorDate: Sun Oct 6 14:37:41 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Oct 6 14:37:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3dcccde media-libs/libvpx: Stabilize 1.14.1 ppc64, #940102 Signed-off-by: Sam James gentoo.org> media-libs/libvpx/libvpx-1.14.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libvpx/libvpx-1.14.1.ebuild b/media-libs/libvpx/libvpx-1.14.1.ebuild index 0927dffc1f50..882b14c867ab 100644 --- a/media-libs/libvpx/libvpx-1.14.1.ebuild +++ b/media-libs/libvpx/libvpx-1.14.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0/9" -KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_ppc_vsx3 doc +highbitdepth postproc static-libs test +threads" REQUIRED_USE="test? ( threads )" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtd-utils/
commit: 4d825be7c42f1a6a024ddee07c016e074d2684c7 Author: Robin H. Johnson gentoo org> AuthorDate: Thu Sep 26 08:04:22 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Sep 26 08:08:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d825be7 sys-fs/mtd-utils: improve configure opts Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/940249 sys-fs/mtd-utils/metadata.xml | 3 +++ .../{mtd-utils-2.2.1.ebuild => mtd-utils-2.2.1-r1.ebuild} | 14 ++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys-fs/mtd-utils/metadata.xml b/sys-fs/mtd-utils/metadata.xml index 85989de1c9ac..1a40eb3fdbdb 100644 --- a/sys-fs/mtd-utils/metadata.xml +++ b/sys-fs/mtd-utils/metadata.xml @@ -12,4 +12,7 @@ cpe:/a:mtd-utils_project:mtd-utils + + Build UBIFS tools + diff --git a/sys-fs/mtd-utils/mtd-utils-2.2.1.ebuild b/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild similarity index 76% rename from sys-fs/mtd-utils/mtd-utils-2.2.1.ebuild rename to sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild index bdc80fbd7c37..cedbe3c1639e 100644 --- a/sys-fs/mtd-utils/mtd-utils-2.2.1.ebuild +++ b/sys-fs/mtd-utils/mtd-utils-2.2.1-r1.ebuild @@ -12,7 +12,8 @@ SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="+lzo +ssl test xattr +zstd" +IUSE="+lzo +ssl test xattr +zstd ubifs" +REQUIRED_USE="ubifs? ( lzo ssl xattr zstd )" RESTRICT="!test? ( test )" DEPEND=" @@ -34,14 +35,19 @@ src_prepare() { } src_configure() { - # --enable-tests is for test programs that are installed + # --with-tests is for test programs that are installed; was --enable-tests in earlier versions local myeconfargs=( - --enable-tests + --with-tests + --with-zlib + --enable-ubihealthd + --with-lsmtd + --with-jffs $(use_enable test unit-tests) $(use_with lzo) - $(use_with ssl ubifs) $(use_with xattr) $(use_with zstd) + $(use_with ubifs) + $(use_with ubifs crypto) # UBIFS-specific crypto support ) econf "${myeconfargs[@]}" }
[gentoo-commits] repo/gentoo:master commit in: sys-fs/mtd-utils/
commit: bdde1d3e33419ab5ad550998bdbeb69dabf00190 Author: Robin H. Johnson gentoo org> AuthorDate: Wed Sep 25 16:19:39 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed Sep 25 16:19:39 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdde1d3e sys-fs/mtd-utils: bump to 2.2.1 Signed-off-by: Robin H. Johnson gentoo.org> sys-fs/mtd-utils/Manifest | 1 + sys-fs/mtd-utils/mtd-utils-2.2.1.ebuild | 58 + 2 files changed, 59 insertions(+) diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest index 4719fe93cf9b..b89a103ace37 100644 --- a/sys-fs/mtd-utils/Manifest +++ b/sys-fs/mtd-utils/Manifest @@ -1 +1,2 @@ DIST mtd-utils-2.1.6.tar.bz2 458333 BLAKE2B 799c19fbee1a690fa695edfa7e2ab1691e37fccb3f83685065e93b5ceea96e550eecdba4576b7d1a58a1b0ce06e3e551ee635fe9ed16521952fc85986f74ae6f SHA512 470902475b9e583d3a12801c1cab5492c671ec3ccf853cc3336c4e2b8771eac489d67b1414b9f1e827c42ebdba0fe2cdc681297477d67a796af04d81160442bd +DIST mtd-utils-2.2.1.tar.bz2 476562 BLAKE2B 81403a5c6a94ad9147cda56a3f821d6b46b2718d7b1e084aa5236802c22e6b75223c68073abdd35f2ceb8b4857880e923dd49274c6ba3e9fce0ec1a0314fef22 SHA512 ef1cf4d6fa5219b8bbe4728282d0d73fd3234c36743cdfb901908269632f55a7993fdbeb22cc2b6841add1a9f320c4504a42980f5856626e259401e8e2f17f7d diff --git a/sys-fs/mtd-utils/mtd-utils-2.2.1.ebuild b/sys-fs/mtd-utils/mtd-utils-2.2.1.ebuild new file mode 100644 index ..bdc80fbd7c37 --- /dev/null +++ b/sys-fs/mtd-utils/mtd-utils-2.2.1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)" +HOMEPAGE="https://git.infradead.org/?p=mtd-utils.git;a=summary"; +SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="+lzo +ssl test xattr +zstd" +RESTRICT="!test? ( test )" + +DEPEND=" + sys-apps/util-linux:= + sys-libs/zlib:= + lzo? ( dev-libs/lzo:= ) + ssl? ( dev-libs/openssl:0= ) + xattr? ( sys-apps/acl ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND="${DEPEND}" +BDEPEND="test? ( dev-util/cmocka )" + +DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README ) + +src_prepare() { + default + sed -i '/if test.*then/s: == : = :' configure || die +} + +src_configure() { + # --enable-tests is for test programs that are installed + local myeconfargs=( + --enable-tests + $(use_enable test unit-tests) + $(use_with lzo) + $(use_with ssl ubifs) + $(use_with xattr) + $(use_with zstd) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + default + doman \ + jffsX-utils/mkfs.jffs2.1 \ + ubi-utils/ubinize.8 +}
[gentoo-commits] repo/gentoo:master commit in: profiles/, app-crypt/gnupg/
commit: b9deed5cdd4f2bb0b14de525b430345e470949e4 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Sep 22 07:16:09 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Sep 22 07:17:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9deed5c app-crypt/gnupg: add 2.5 testing release Signed-off-by: Robin H. Johnson gentoo.org> app-crypt/gnupg/Manifest | 2 + app-crypt/gnupg/gnupg-2.5.1.ebuild | 197 + profiles/package.mask | 5 + 3 files changed, 204 insertions(+) diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index 59f7652f5ad6..8b4089714cd8 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -4,3 +4,5 @@ DIST gnupg-2.2.43.tar.bz2 7435426 BLAKE2B ddf5c89d317e6ce8d1a5348f0ef81ffa1c61c9 DIST gnupg-2.2.43.tar.bz2.sig 119 BLAKE2B 38fd3790f5065d67d6b5323ef7abbb79facf00e5b9daba98e5078302fc3887423173ba434c7eff1e64faecef88d87aab9c057c570d6e96e8d0808f07f32d8fa1 SHA512 47c5354869b1825e56fa4276826fcde1ee41c70aab9b411686cf2733f4d1df9c006049e49e066b22e475bd37b337f9ffc97f8bbca0c62c0f32296909464a0643 DIST gnupg-2.4.5.tar.bz2 7889060 BLAKE2B a8b80cd4dfbb377066efb5c9f1b6cdc6d0cd1b18358c962781b5c06de1545117b13038a4655ae627c36bfd2e5fee127692df8729d6b23e1b31051ab6d897b733 SHA512 4d54744f09399c5899144d0cb5fdc2756e45b058db41b9ea9df3be03e80b914509e16ef35aa0248e7561185b80f7a5f9fd6afcab8ccff75ff82ed555448a38ff DIST gnupg-2.4.5.tar.bz2.sig 238 BLAKE2B b236e7d62f49c8385f4fb81389bf10715d9c0a0cb5c0b4c20fb6ff1465d05a3c3657061284db23af988a1ca16c9fa393af3ce5cbd27934501eb41a4f448fff0a SHA512 5a06970e499d1eb5213b142a8a182e46f5f21b7cb32785a9e5069378797c124e151ce74727382003820042d60fd7a2f909143f44aa9ef282605875e1cab04aef +DIST gnupg-2.5.1.tar.bz2 8126739 BLAKE2B 46955d2eebe14395adc0fdf81e89a32f3f9baaabfe1eee78f256a1fab25ce6fdb96b873678cfeb5e4abf4894c7ab4908359ed04cc6571ff442dcc5325b3ccd66 SHA512 733a11ff24145e23dd7d34d954a70c25bf70ecb1d517b8e15cc34bf690786c9f7007e4e99cde573500ac012852e91b29568fed00491f8c8254b3fb63ca5777cd +DIST gnupg-2.5.1.tar.bz2.sig 238 BLAKE2B cd024a63ecb82a12e92444cbff8dbc9bef6a4e436d59957aae77927cce0baf9e282e63df7a5159a521c7c8694a0dbe96d6537ad3ec5f779c7c0dea8d02b5e70d SHA512 8ffd5cc72a2907972bf1854e804f6c215ff66ba2d6e91952700f49b2b5ba8bab035d0f42efdb0d3c3166301cda6e716394928bdd9c0d0d1e1789a02c7aa1a926 diff --git a/app-crypt/gnupg/gnupg-2.5.1.ebuild b/app-crypt/gnupg/gnupg-2.5.1.ebuild new file mode 100644 index ..382e366f6c0d --- /dev/null +++ b/app-crypt/gnupg/gnupg-2.5.1.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Maintainers should: +# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/ +# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159 +# (find the one for the current release then subscribe to it + +# any subsequent ones linked within so you're covered for a while.) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc +# in-source builds are not supported: https://dev.gnupg.org/T6313#166339 +inherit flag-o-matic out-of-source multiprocessing systemd toolchain-funcs verify-sig + +MY_P="${P/_/-}" + +DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" +HOMEPAGE="https://gnupg.org/"; +SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3+" +SLOT="0" +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( tofu )" + +# Existence of executables is checked during configuration. +# Note: On each bump, update dep bounds on each version from configure.ac! +DEPEND=" + >=dev-libs/libassuan-2.5.0:= + >=dev-libs/libgcrypt-1.9.1:= + >=dev-libs/libgpg-error-1.46 + >=dev-libs/libksba-1.6.3 + >=dev-libs/npth-1.2 + >=net-misc/curl-7.10 + sys-libs/zlib + bzip2? ( app-arch/bzip2 ) + ldap? ( net-nds/openldap:= ) + readline? ( sys-libs/readline:0= ) + smartcard? ( usb? ( virtual/libusb:1 ) ) + tofu? ( >=dev-db/sqlite-3.27 ) + tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) + ssl? ( >=net-libs/gnutls-3.2:0= ) +" +RDEPEND=" + ${DEPEND} + nls? ( virtual/libintl ) + selinux? ( sec-policy/selinux-gpg ) + wks-server? ( virtual/mta ) +" +PDEPEND=" + app-crypt/pinentry +" +BDEPEND=" + virtual/pkgconf
[gentoo-commits] proj/gentoo-mirrorstats:master commit in: html/
commit: 7153c73288fc8302039877b95958408a968295c6 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Sep 14 21:51:31 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Sep 14 21:51:31 2024 + URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=7153c732 fix: improve exception output Signed-off-by: Robin H. Johnson gentoo.org> html/generate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/generate.py b/html/generate.py index 2d6ed2b..0ec4e4b 100755 --- a/html/generate.py +++ b/html/generate.py @@ -124,7 +124,7 @@ def getHostList(mirrorstatsList): try: mirrorData = getJson(mirror_url) except Exception as err: -print("Exception fetching "+mirror_url+": ", err) +print("Exception fetching "+mirror_url+": ", type(err).__name__, err) continue lastUpdate = datetime.datetime.fromtimestamp(int(mirrorData['LastUpdate'])).strftime('%Y-%m-%d %H:%M:%S')
[gentoo-commits] proj/gentoo-mirrorstats:master commit in: html/
commit: 257405af5bed5716c4e1e89ae0d163b5baf0a663 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Sep 14 21:48:53 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Sep 14 21:48:53 2024 + URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=257405af fix: handle mirror_url fetch errors Signed-off-by: Robin H. Johnson gentoo.org> html/generate.py | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/html/generate.py b/html/generate.py index a4b75e8..2d6ed2b 100755 --- a/html/generate.py +++ b/html/generate.py @@ -120,7 +120,13 @@ def getHostList(mirrorstatsList): # process all mirrors for mirror_url in mirrorstatsList: -mirrorData = getJson(mirror_url) +mirrorData = None +try: +mirrorData = getJson(mirror_url) +except Exception as err: +print("Exception fetching "+mirror_url+": ", err) +continue + lastUpdate = datetime.datetime.fromtimestamp(int(mirrorData['LastUpdate'])).strftime('%Y-%m-%d %H:%M:%S') for mirror in mirrorData['Mirrors']:
[gentoo-commits] proj/elections:master commit in: council-202406/, trustees-202406/
commit: 4b7ca9c04c432c15b3882920141e056b486e0e3f Author: Robin H. Johnson gentoo org> AuthorDate: Sat Aug 31 22:09:44 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Aug 31 22:09:44 2024 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=4b7ca9c0 feat: record casting voters for 202406 elections Signed-off-by: Robin H. Johnson gentoo.org> council-202406/casting-voters-council-202406 | 40 ++ trustees-202406/casting-voters-trustees-202406 | 24 2 files changed, 64 insertions(+) diff --git a/council-202406/casting-voters-council-202406 b/council-202406/casting-voters-council-202406 new file mode 100644 index 000..767f624 --- /dev/null +++ b/council-202406/casting-voters-council-202406 @@ -0,0 +1,40 @@ +ajak +andrewammerlaan +arkamar +arsen +arthurzam +billie +ceamac +chewi +conikost +dilfridge +dlan +eras +floppym +flow +grobian +grozin +hattya +ionen +jsmolic +jstein +kangie +kumba +lu_zero +matsl +matthew +mattst88 +mgorny +mjo +mpagano +neddyseagoon +patrick +rich0 +robbat2 +sam +soap +tamiko +tomjbe +tupone +ulm +xgqt diff --git a/trustees-202406/casting-voters-trustees-202406 b/trustees-202406/casting-voters-trustees-202406 new file mode 100644 index 000..9460479 --- /dev/null +++ b/trustees-202406/casting-voters-trustees-202406 @@ -0,0 +1,24 @@ +ajak +andrewammerlaan +arsen +arthurzam +dilfridge +eras +floppym +grobian +hattya +kumba +lu_zero +mattst88 +mgorny +mpagano +neddyseagoon +patrick +rich0 +robbat2 +sam +soap +tamiko +tomjbe +tupone +ulm
[gentoo-commits] proj/elections:master commit in: completed/council-202306/, completed/council-202106/, completed/council-202206/, ...
commit: 602214965283e69cb5127cc4cb89eef3807369ad Author: Robin H. Johnson gentoo org> AuthorDate: Sat Aug 31 22:10:57 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Aug 31 22:10:57 2024 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=60221496 feat: capture more casting-voters data Signed-off-by: Robin H. Johnson gentoo.org> .../casting-voters-basesystem-202108 | 10 +++ .../casting-voters-basesystem-202205 | 10 +++ .../council-202106/casting-voters-council-202106 | 73 ++ .../council-202206/casting-voters-council-202206 | 64 +++ .../council-202306/casting-voters-council-202306 | 50 +++ .../casting-voters-metastructure-2023 | 52 +++ .../security-202108/casting-voters-security-202108 | 5 ++ 7 files changed, 264 insertions(+) diff --git a/completed/basesystem-202108/casting-voters-basesystem-202108 b/completed/basesystem-202108/casting-voters-basesystem-202108 new file mode 100644 index 000..dcd9b12 --- /dev/null +++ b/completed/basesystem-202108/casting-voters-basesystem-202108 @@ -0,0 +1,10 @@ +dilfridge +floppym +gyakovlev +mattst88 +polynomial-c +robbat2 +sam +soap +williamh +zlogene diff --git a/completed/basesystem-202205/casting-voters-basesystem-202205 b/completed/basesystem-202205/casting-voters-basesystem-202205 new file mode 100644 index 000..29717c3 --- /dev/null +++ b/completed/basesystem-202205/casting-voters-basesystem-202205 @@ -0,0 +1,10 @@ +chutzpah +dilfridge +floppym +gyakovlev +mattst88 +robbat2 +sam +soap +whissi +williamh diff --git a/completed/council-202106/casting-voters-council-202106 b/completed/council-202106/casting-voters-council-202106 new file mode 100644 index 000..0130df1 --- /dev/null +++ b/completed/council-202106/casting-voters-council-202106 @@ -0,0 +1,73 @@ +ago +ajak +alicef +amadio +anarchy +andrewammerlaan +andrey_utkin +antarus +billie +bircoph +bkohler +bman +chiitoo +chutzpah +conikost +dabbott +dilfridge +dlan +dolsen +eras +floppym +fordfrog +gokturk +graaff +grobian +gyakovlev +hattya +heroxbd +ionen +jmbsvicetto +juippis +klausman +klondike +kumba +leio +lu_zero +maekke +marecki +mattst88 +mgorny +mjo +mpagano +mschiff +neddyseagoon +np-hardass +pacho +patrick +perfinion +pesa +pinkbyte +polynomial-c +prometheanfire +radhermit +robbat2 +sam +sbraz +slashbeast +slyfox +soap +steils +sultan +swegener +tamiko +tomjbe +toralf +tupone +ulm +voyageur +whissi +williamh +wraeth +zerochaos +zlogene diff --git a/completed/council-202206/casting-voters-council-202206 b/completed/council-202206/casting-voters-council-202206 new file mode 100644 index 000..98eeaf7 --- /dev/null +++ b/completed/council-202206/casting-voters-council-202206 @@ -0,0 +1,64 @@ +ajak +alexxy +alicef +andrewammerlaan +antarus +arthurzam +billie +bircoph +concord +conikost +dabbott +dilfridge +dlan +eras +floppym +flow +graaff +grobian +grozin +gyakovlev +hattya +idl0r +ionen +jmbsvicetto +john_r_graham +jsmolic +jstein +juippis +kensington +kumba +lu_zero +maekke +marecki +matthew +mattst88 +mgorny +mjo +mschiff +neddyseagoon +pacho +patrick +perfinion +pinkbyte +polynomial-c +prometheanfire +rich0 +robbat2 +sam +sarnex +sbraz +soap +stasibear +sultan +swegener +tamiko +tomjbe +toralf +tupone +ulm +voyageur +whissi +williamh +xen0n +zlogene diff --git a/completed/council-202306/casting-voters-council-202306 b/completed/council-202306/casting-voters-council-202306 new file mode 100644 index 000..e9beef0 --- /dev/null +++ b/completed/council-202306/casting-voters-council-202306 @@ -0,0 +1,50 @@ +ago +ajak +amynka +andrewammerlaan +arsen +arthurzam +billie +bircoph +ceamac +conikost +dabbott +dilfridge +dlan +eras +flow +graaff +grobian +grozin +hattya +ionen +jmbsvicetto +jsmolic +juippis +klondike +leio +lu_zero +maekke +marecki +matsl +matthew +mattst88 +mgorny +mjo +neddyseagoon +pacho +patrick +pinkbyte +prometheanfire +robbat2 +sam +soap +sultan +swegener +tamiko +tomjbe +toralf +tupone +ulm +voyageur +xen0n diff --git a/completed/metastructure-2023/casting-voters-metastructure-2023 b/completed/metastructure-2023/casting-voters-metastructure-2023 new file mode 100644 index 000..ccb82ef --- /dev/null +++ b/completed/metastructure-2023/casting-voters-metastructure-2023 @@ -0,0 +1,52 @@ +ajak +andrewammerlaan +arsen +arthurzam +bircoph +ceamac +cedk +chewi +chutzpah +concord +conikost +dabbott +dilfridge +eras +flow +graaff +grobian +gyakovlev +hattya +ionen +jmbsvicetto +john_r_graham +juippis +kumba +leio +lu_zero +maffblaster +marecki +matthew +mattst88 +mgorny +mjo +mpagano +mschiff +mva +neddyseagoon +patrick +perfinion +pinkbyte +ris +robbat2 +sam +soap +sultan +tomjbe +toralf +tupone +ulm +voyageur +williamh +xen0n +xgqt diff --git a/completed/security-202108/casting-voters-security-202108 b/completed/security-202108/casting-voters-security-202108 new file mode 100
[gentoo-commits] proj/elections:master commit in: completed/trustees-202406/, completed/council-202406/, council-202406/, ...
commit: f0f29336525635817270f4c75bfb0528d33389fa Author: Robin H. Johnson gentoo org> AuthorDate: Sat Aug 31 22:10:02 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Aug 31 22:10:02 2024 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=f0f29336 feat: archive completed 202406 elections Signed-off-by: Robin H. Johnson gentoo.org> {council-202406 => completed/council-202406}/Votify.pm| 0 {council-202406 => completed/council-202406}/ballot-council-202406| 0 .../council-202406}/casting-voters-council-202406 | 0 {council-202406 => completed/council-202406}/election-details | 0 {council-202406 => completed/council-202406}/officials-council-202406 | 0 {council-202406 => completed/council-202406}/start-council-202406 | 0 {council-202406 => completed/council-202406}/stop-council-202406 | 0 {council-202406 => completed/council-202406}/voters-council-202406| 0 {trustees-202406 => completed/trustees-202406}/Votify.pm | 0 {trustees-202406 => completed/trustees-202406}/ballot-trustees-202406 | 0 .../trustees-202406}/casting-voters-trustees-202406 | 0 {trustees-202406 => completed/trustees-202406}/election-details | 0 {trustees-202406 => completed/trustees-202406}/officials-trustees-202406 | 0 {trustees-202406 => completed/trustees-202406}/start-trustees-202406 | 0 {trustees-202406 => completed/trustees-202406}/stop-trustees-202406 | 0 {trustees-202406 => completed/trustees-202406}/voters-trustees-202406 | 0 16 files changed, 0 insertions(+), 0 deletions(-) diff --git a/council-202406/Votify.pm b/completed/council-202406/Votify.pm similarity index 100% rename from council-202406/Votify.pm rename to completed/council-202406/Votify.pm diff --git a/council-202406/ballot-council-202406 b/completed/council-202406/ballot-council-202406 similarity index 100% rename from council-202406/ballot-council-202406 rename to completed/council-202406/ballot-council-202406 diff --git a/council-202406/casting-voters-council-202406 b/completed/council-202406/casting-voters-council-202406 similarity index 100% rename from council-202406/casting-voters-council-202406 rename to completed/council-202406/casting-voters-council-202406 diff --git a/council-202406/election-details b/completed/council-202406/election-details similarity index 100% rename from council-202406/election-details rename to completed/council-202406/election-details diff --git a/council-202406/officials-council-202406 b/completed/council-202406/officials-council-202406 similarity index 100% rename from council-202406/officials-council-202406 rename to completed/council-202406/officials-council-202406 diff --git a/council-202406/start-council-202406 b/completed/council-202406/start-council-202406 similarity index 100% rename from council-202406/start-council-202406 rename to completed/council-202406/start-council-202406 diff --git a/council-202406/stop-council-202406 b/completed/council-202406/stop-council-202406 similarity index 100% rename from council-202406/stop-council-202406 rename to completed/council-202406/stop-council-202406 diff --git a/council-202406/voters-council-202406 b/completed/council-202406/voters-council-202406 similarity index 100% rename from council-202406/voters-council-202406 rename to completed/council-202406/voters-council-202406 diff --git a/trustees-202406/Votify.pm b/completed/trustees-202406/Votify.pm similarity index 100% rename from trustees-202406/Votify.pm rename to completed/trustees-202406/Votify.pm diff --git a/trustees-202406/ballot-trustees-202406 b/completed/trustees-202406/ballot-trustees-202406 similarity index 100% rename from trustees-202406/ballot-trustees-202406 rename to completed/trustees-202406/ballot-trustees-202406 diff --git a/trustees-202406/casting-voters-trustees-202406 b/completed/trustees-202406/casting-voters-trustees-202406 similarity index 100% rename from trustees-202406/casting-voters-trustees-202406 rename to completed/trustees-202406/casting-voters-trustees-202406 diff --git a/trustees-202406/election-details b/completed/trustees-202406/election-details similarity index 100% rename from trustees-202406/election-details rename to completed/trustees-202406/election-details diff --git a/trustees-202406/officials-trustees-202406 b/completed/trustees-202406/officials-trustees-202406 similarity index 100% rename from trustees-202406/officials-trustees-202406 rename to completed/trustees-202406/officials-trustees-202406 diff --git a/trustees-202406/start-trustees-202406 b/completed/trustees-202406/start-trustees-202406 similarity index 100% rename from trustees-202406/start-trustees-202406 rename to completed/trustees-202406/start-trustees-202406 diff --git a/trustees-202406/stop-trustees-202406 b/comple
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
commit: 9fe404138fa2136da29108e542713187e5d13b75 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Aug 25 20:32:39 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Aug 25 20:34:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe40413 net-nds/openldap: QA fix, false positive on strip STRIP was already patched out in all the paths that actually generated final objects or binaries, but that wasn't enough to stop the QA test firing. Fix it a bit more (package output is identical). Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/show_bug.cgi?id=840451 net-nds/openldap/openldap-2.6.8.ebuild | 33 + 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/net-nds/openldap/openldap-2.6.8.ebuild b/net-nds/openldap/openldap-2.6.8.ebuild index 894ea2a9ae3a..250d4ce0b66e 100644 --- a/net-nds/openldap/openldap-2.6.8.ebuild +++ b/net-nds/openldap/openldap-2.6.8.ebuild @@ -394,8 +394,11 @@ build_contrib_module() { einfo "Compiling contrib-module: $1" local target="${2:-all}" emake \ - LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \ - CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \ + CC="${CC}" \ + LDAP_BUILD="${BUILD_DIR}" \ + libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \ + prefix="${EPREFIX}/usr" \ + STRIP=/bin/true \ "${target}" popd &>/dev/null || die } @@ -534,7 +537,9 @@ multilib_src_configure() { tc-export AR CC CXX - ECONF_SOURCE="${S}" econf \ + ECONF_SOURCE="${S}" \ + STRIP=/bin/true \ + econf \ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \ --localstatedir="${EPREFIX}"/var \ --runstatedir="${EPREFIX}"/run \ @@ -570,13 +575,19 @@ src_configure_cxx() { append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs -L"${BUILD_DIR}"/libraries/libldap/.libs append-cppflags -I"${BUILD_DIR}"/include - ECONF_SOURCE="${S}"/contrib/ldapc++ econf "${myconf_ldapcpp[@]}" + ECONF_SOURCE="${S}"/contrib/ldapc++ \ + STRIP=/bin/true \ + econf \ + "${myconf_ldapcpp[@]}" popd &>/dev/null || die "popd contrib/ldapc++" } multilib_src_compile() { tc-export AR CC CXX - emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh + emake \ + CC="$(tc-getCC)" \ + SHELL="${EPREFIX}"/bin/sh \ + STRIP="/bin/true" if ! use minimal && multilib_is_native_abi ; then if use cxx ; then @@ -614,8 +625,10 @@ multilib_src_compile() { pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4" emake \ + CC="$(tc-getCC)" \ LDAP_BUILD="${BUILD_DIR}" \ - CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" + libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \ + STRIP=/bin/true popd &>/dev/null || die fi @@ -695,8 +708,12 @@ multilib_src_test() { } multilib_src_install() { - emake CC="$(tc-getCC)" \ - DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install + emake \ + CC="$(tc-getCC)" \ + DESTDIR="${D}" \ + SHELL="${EPREFIX}"/bin/sh \ + STRIP=/bin/true \ + install if ! use minimal && multilib_is_native_abi; then # openldap modules go here
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
commit: 7b3ab00f0043adb296acfac9135a4865dcab10ac Author: Robin H. Johnson gentoo org> AuthorDate: Sun Aug 25 20:12:19 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Aug 25 20:12:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3ab00f net-nds/openldap: QA trivial fix configure.in Signed-off-by: Robin H. Johnson gentoo.org> Bug: https://bugs.gentoo.org/658674 net-nds/openldap/openldap-2.4.59-r3.ebuild | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net-nds/openldap/openldap-2.4.59-r3.ebuild b/net-nds/openldap/openldap-2.4.59-r3.ebuild index 9de40ce840dd..367fb900d9bf 100644 --- a/net-nds/openldap/openldap-2.4.59-r3.ebuild +++ b/net-nds/openldap/openldap-2.4.59-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -383,8 +383,12 @@ src_prepare() { -e 's|/bin/sh|/bin/bash|g' \ -i tests/scripts/* || die "sed failed" + if test -e configure.in -a ! -e configure.ac ; then + mv -f configure.in configure.ac + fi + # Required for autoconf-2.70 #765043 - sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.in || die + sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.ac || die AT_NOEAUTOMAKE=yes eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/, net-nds/openldap/
commit: 5fffb10e6238d9e572ce84bb2b6fdd922eacdfcf Author: Robin H. Johnson gentoo org> AuthorDate: Sun Aug 25 18:02:30 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Aug 25 20:00:31 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fffb10e net-nds/openldap: fix more -Werror=incompatible-pointer-types cases Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/show_bug.cgi?id=933875 .../openldap-2.6.x-gnutls-pointer-error.patch | 40 .../files/openldap-2.6.x-slapd-pointer-types.patch | 71 ++ net-nds/openldap/openldap-2.5.18.ebuild| 4 +- net-nds/openldap/openldap-2.6.6-r2.ebuild | 2 + net-nds/openldap/openldap-2.6.8.ebuild | 4 +- 5 files changed, 119 insertions(+), 2 deletions(-) diff --git a/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch b/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch new file mode 100644 index ..e6ab4e5a46cb --- /dev/null +++ b/net-nds/openldap/files/openldap-2.6.x-gnutls-pointer-error.patch @@ -0,0 +1,40 @@ +From 634017950c1c920d0de63fffa5c52e621de1d603 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Wed, 26 Jun 2024 07:41:01 + +Subject: Fix incompatible pointer type error with gcc option + -Wincompatible-pointer-types + +lib32-openldap do_compile failure with gcc-14: +| tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types] +| 971 | keyhash.bv_val, &keyhash.bv_len ) < 0 ) { +| | ^~~ +| | | +| | ber_len_t * {aka long unsigned int *} +| In file included from tls_g.c:44: +| /usr/include/gnutls/gnutls.h:2406:32: note: expected 'size_t *' {aka 'unsigned int *'} but argument is of type 'ber_len_t *' {aka 'long unsigned int *'} +| 2406 |size_t *result_size); +| |^~~ + +Upstream-Status: Submitted + +Signed-off-by: Wang Mingyu +--- + libraries/libldap/tls_g.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c +index 7c23875..b4b487d 100644 +--- a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c +@@ -968,7 +968,7 @@ tlsg_session_pinning( LDAP *ld, tls_session *sess, char *hashalg, struct berval + keyhash.bv_len = gnutls_hash_get_len( alg ); + keyhash.bv_val = LDAP_MALLOC( keyhash.bv_len ); + if ( !keyhash.bv_val || gnutls_fingerprint( alg, &key, +- keyhash.bv_val, &keyhash.bv_len ) < 0 ) { ++ keyhash.bv_val, (size_t *)&keyhash.bv_len ) < 0 ) { + goto done; + } + } else { +-- +2.34.1 + diff --git a/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch b/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch new file mode 100644 index ..9f79048645d6 --- /dev/null +++ b/net-nds/openldap/files/openldap-2.6.x-slapd-pointer-types.patch @@ -0,0 +1,71 @@ +# https://git.openldap.org/openldap/openldap/-/commit/fb9e6a81bbee880549e7ec18f0a74bd2d1ab.patch +From fb9e6a81bbee880549e7ec18f0a74bd2d1ab Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Tue, 6 Feb 2024 21:38:24 -0500 +Subject: [PATCH] ITS#10171 - Explicitly cast private values + +Fixes issues with -Werror=incompatible-pointer-types + +Signed-off-by: Stephen Gallagher +--- + servers/slapd/config.c | 2 +- + servers/slapd/overlays/constraint.c | 2 +- + servers/slapd/overlays/dyngroup.c | 2 +- + servers/slapd/overlays/valsort.c| 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/servers/slapd/config.c b/servers/slapd/config.c +index 80333f359c..987c862d91 100644 +--- a/servers/slapd/config.c b/servers/slapd/config.c +@@ -151,7 +151,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) { + int rc, arg_user, arg_type, arg_syn, iarg; + unsigned uiarg; + long larg; +- size_t ularg; ++ unsigned long ularg; + ber_len_t barg; + + if(Conf->arg_type == ARG_IGNORED) { +diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c +index f939b37762..0d6156af4d 100644 +--- a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c +@@ -557,7 +557,7 @@ done:; + a2->restrict_filter = ap.restrict_filter; + a2->restrict_val = ap.restrict_val; + +-
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
commit: a6311ebbdd9edc68c6e1590ca3d0b3928a4847ba Author: Robin H. Johnson gentoo org> AuthorDate: Sun Aug 25 20:00:15 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Aug 25 20:00:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6311ebb net-nds/openldap: cleanup unused empty dir Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/926725 net-nds/openldap/openldap-2.6.6-r2.ebuild | 1 + net-nds/openldap/openldap-2.6.8.ebuild| 1 + 2 files changed, 2 insertions(+) diff --git a/net-nds/openldap/openldap-2.6.6-r2.ebuild b/net-nds/openldap/openldap-2.6.6-r2.ebuild index f63e7a4effc9..fd2f6205da49 100644 --- a/net-nds/openldap/openldap-2.6.6-r2.ebuild +++ b/net-nds/openldap/openldap-2.6.6-r2.ebuild @@ -817,6 +817,7 @@ multilib_src_install() { multilib_src_install_all() { dodoc ANNOUNCEMENT CHANGES COPYRIGHT README docinto rfc ; dodoc doc/rfc/*.txt + rmdir -p "${D}"/var/openldap-lloadd # Created but not used by any part of current codebase. } pkg_preinst() { diff --git a/net-nds/openldap/openldap-2.6.8.ebuild b/net-nds/openldap/openldap-2.6.8.ebuild index d8034c51fae3..894ea2a9ae3a 100644 --- a/net-nds/openldap/openldap-2.6.8.ebuild +++ b/net-nds/openldap/openldap-2.6.8.ebuild @@ -821,6 +821,7 @@ multilib_src_install() { multilib_src_install_all() { dodoc ANNOUNCEMENT CHANGES COPYRIGHT README docinto rfc ; dodoc doc/rfc/*.txt + rmdir -p "${D}"/var/openldap-lloadd # Created but not used by any part of current codebase. } pkg_preinst() {
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/
commit: 7d86c9da1effdbc18444b00ff438859a20d7256e Author: Robin H. Johnson gentoo org> AuthorDate: Sun Aug 25 00:45:39 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Aug 25 00:56:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d86c9da net-nds/openldap: bump; passes src_test Signed-off-by: Robin H. Johnson gentoo.org> net-nds/openldap/Manifest | 2 + net-nds/openldap/openldap-2.5.18.ebuild | 868 +++ net-nds/openldap/openldap-2.6.8.ebuild | 875 3 files changed, 1745 insertions(+) diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index 987dc7f896b3..13fcc87211c3 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -1,8 +1,10 @@ DIST openldap-2.4.59.tgz 5886272 BLAKE2B a2a8bed1d2af97fd41d651668152fd4740871bc5a8abf4b50390839228af82ac103346b3500ae0f8dd31b708acabb30435b90cd48dfafe510e648df5150d96b8 SHA512 233459ab446da6e107a7fc4ecd5668d6b08c11a11359ee76449550393e8f586a29b59d7ae09a050a1fca4fcf388ea61438ef60831b3ae802d92c048365ae3968 DIST openldap-OPENLDAP_REL_ENG_2_5_14.tar.bz2 5024359 BLAKE2B ffdffbd47e76545c2dc2d433d290945ab6eebd910031a60249cd8f6eac24f67841098e61c7e57864428e20a183a46d36dac422bba8cf6f3596f97439875af96b SHA512 abd1e8bda0762500db028f283fe2da9480a419072927295d6f3e1448cae130592511f385a87585843cf88217417c90ef57174ca919cfcf163eb41642a72bb4e3 DIST openldap-OPENLDAP_REL_ENG_2_5_16.tar.bz2 5022608 BLAKE2B 829e416e3cf92d36df0d6642e44083f9b288ef9c3743a84aef3f03cdf7b08b21ea45231653a2659fe0da285ca47a346d336d02c8e0dda21f039fb9e49630262b SHA512 629b92e275b69a540b200e61165492a4706afdf7b15d21bfe2f1fd4c338ecf397ad0c918e36dcef54d1f0cede2f039a8f73d4735f00e892d64ce9a177d490a07 +DIST openldap-OPENLDAP_REL_ENG_2_5_18.tar.bz2 5026131 BLAKE2B 0f1a00995bd880b3ee42c4de2c3a405ebb7969de253f4b3866eb46c1856b61539ed7e1133a1b11636efc1da1ed5fc6cae53da60b22ab31486518000d34ff6324 SHA512 77a84950c905d2a4bd25f93108eb79f1416689176531246f12b4c3f6e8e3fe689504cd3f9875142e9bf665306a622ac8fe7e6b39aa4be67099f0965a16634526 DIST openldap-OPENLDAP_REL_ENG_2_6_3.tar.gz 6244895 BLAKE2B 97792a1b368de44867b0ce9eef38601c3e64b7d40e4ca206295bee110097697c919040d2220eea6f0581812e09a2cc3e6afb4a243a5072a8a0a95f24f9fb354b SHA512 1c882a0cd0729b5d0f40b58588d0e36ae3b1cae6d569f0576e940c7c63d03c29ed2c9db87695a87594ba99a927ef4cba491bddba3ce049025fd5883463122ba7 DIST openldap-OPENLDAP_REL_ENG_2_6_4.tar.bz2 5043227 BLAKE2B 9bec77dbace0e52d1607d9ac13a77349e7d0b8876aa81fa635893638d00db58ec6bf8412f11fd266bba0440887be1aa21eb4a876122152f7f6de9fd8f75b6b4c SHA512 bff11bf1ae125bcabbd307f6c4e1c102a8df6f1091f84f5e7053fdbaa89ccd6aa0c86cc8dcce4fb9b6ffd853b5f8d3c933733f5713aeb4d6a9d77ab145293b48 DIST openldap-OPENLDAP_REL_ENG_2_6_5.tar.bz2 5040569 BLAKE2B d1835e560a81bc3df2eb44964162306057ad28869a1e41da7ab823460b4a33437cd385ec9448a6df9bc580afd04dff5c4680e0b91a2f16960ad2c5f3812410ba SHA512 d259ca5ac8fbdcf9bb477e24c0feaf05678ab660007164a54463a954f1b26c3f9740855d16155fa249adcb2652223fdcfc682bb4005b46a5f36e2d5cae37f158 DIST openldap-OPENLDAP_REL_ENG_2_6_6.tar.bz2 5040213 BLAKE2B 2497b6698344674a9e8db5f2f2531541167065bb8ac9f512ecdb9349115140d5e83daef9b489e244eee08445de57599ddcfeeed71d4aab41edc58a3092910925 SHA512 3c235ff7b26f753afeb0176e95ecbf6a353bf76f00935c091323366bf97289f628d4d7b4ae3e2a31fe0797715d6c69e6704967dc79ccbae7add3023e226ad73b +DIST openldap-OPENLDAP_REL_ENG_2_6_8.tar.bz2 5065637 BLAKE2B d55345c11bd8892a594c3f7114cd1368e017c2e29997da7a80bdd915308d498f62dfb5cc3a3360b50df78ef5f90a48a566a8ce3ace85ebf9aa6b288a37c4eff2 SHA512 556d1377afc73a84ee325c4d7bcc8446def936b67d3f07df4bd2a243ff30f268c5c0c298977482df1e1a86b2b7a0cd7846fc1f51d706748d39f67f5d621ccc04 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e diff --git a/net-nds/openldap/openldap-2.5.18.ebuild b/net-nds/openldap/openldap-2.5.18.ebuild new file mode 100644 index ..41d46debc6b3 --- /dev/null +++ b/net-nds/openldap/openldap-2.5.18.ebuild @@ -0,0 +1,868 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Re cleanups: +# 2.5.x is an LTS release so we want to keep it for a while. + +inherit autotools flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles + +MY_PV="$(ver_rs 1-2 _)" + +BIS_PN=rfc2307bis.schema +BIS_PV=20140524 +BIS_P="${BIS_PN}-${BIS_PV}" + +DESCRIPTION="LDAP suite of application and development tools" +HOMEPAGE="https://www.openldap.org/"; +SRC_URI=" + https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_RE
[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/, net-nds/openldap/
commit: 783532d33df25206c20ecc175a6910ab6b0a29fb Author: Robin H. Johnson gentoo org> AuthorDate: Sun Aug 25 00:33:46 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Aug 25 00:56:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783532d3 net-nds/openldap: get 2.4.x building again, with atexit fix from upstream 2.4.x series should be announced as end-of-life in Gentoo; to get remaining consumers to migrate to the 2.5 or 2.6 series. 2.4.59-r2 does not build with GCC14, and 2.4.59-r3 builds with warnings, some of which are downgraded from error. atexit-fix ensures that consumers of the libraries do not segfault during their cleanup. Please note that 2.4.x does NOT consistently pass src_test at this time. Closes: https://bugs.gentoo.org/show_bug.cgi?id=920380 Closes: https://bugs.gentoo.org/show_bug.cgi?id=882183 Signed-off-by: Robin H. Johnson gentoo.org> .../files/openldap-2.4.59-atexit-fix.patch | 60 ++ .../files/openldap-2.4.59-implicit-function.patch | 41 + net-nds/openldap/openldap-2.4.59-r3.ebuild | 928 + 3 files changed, 1029 insertions(+) diff --git a/net-nds/openldap/files/openldap-2.4.59-atexit-fix.patch b/net-nds/openldap/files/openldap-2.4.59-atexit-fix.patch new file mode 100644 index ..4ffee325275b --- /dev/null +++ b/net-nds/openldap/files/openldap-2.4.59-atexit-fix.patch @@ -0,0 +1,60 @@ +Port upstream commit 337455eb3a66176cc3f66d2c663a72cc7b4178bd to 2.4.59. + +With 2.4.x, gentoo-infra saw crashes in nsscache during exit. +This patch was later reverted upstream because it was not portable to AIX And +was fixed in a different way in 2.5 & 2.6 releases. + +original https://github.com/openldap/openldap/commit/337455eb3a66176cc3f66d2c663a72cc7b4178bd +revert: https://github.com/openldap/openldap/commit/5e13ef87a94491f9339dbca709db29e76741f1a9 +AIX discussion: https://bugs.openldap.org/show_bug.cgi?id=10176 +diff '--color=auto' -NuarwbB --exclude '*.rej' --exclude '*.orig' openldap-2.4.59.orig/libraries/libldap/init.c openldap-2.4.59/libraries/libldap/init.c +--- openldap-2.4.59.orig/libraries/libldap/init.c 2021-06-03 11:40:31.0 -0700 openldap-2.4.59/libraries/libldap/init.c 2024-08-24 11:15:06.727326650 -0700 +@@ -508,9 +508,6 @@ + gopts->ldo_def_sasl_authcid = NULL; + } + #endif +-#ifdef HAVE_TLS +- ldap_int_tls_destroy( gopts ); +-#endif + } + + /* +diff '--color=auto' -NuarwbB --exclude '*.rej' --exclude '*.orig' openldap-2.4.59.orig/libraries/libldap/tls2.c openldap-2.4.59/libraries/libldap/tls2.c +--- openldap-2.4.59.orig/libraries/libldap/tls2.c 2024-08-24 11:14:46.910678897 -0700 openldap-2.4.59/libraries/libldap/tls2.c 2024-08-24 11:15:38.103963402 -0700 +@@ -155,6 +155,14 @@ + tls_imp->ti_tls_destroy(); + } + ++static void ++ldap_exit_tls_destroy( void ) ++{ ++ struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT(); ++ ++ ldap_int_tls_destroy( lo ); ++} ++ + /* + * Initialize a particular TLS implementation. + * Called once per implementation. +@@ -163,6 +171,7 @@ + tls_init(tls_impl *impl ) + { + static int tls_initialized = 0; ++ int rc; + + if ( !tls_initialized++ ) { + #ifdef LDAP_R_COMPILE +@@ -175,7 +184,10 @@ + #ifdef LDAP_R_COMPILE + impl->ti_thr_init(); + #endif +- return impl->ti_tls_init(); ++ rc = impl->ti_tls_init(); ++ ++ atexit( ldap_exit_tls_destroy ); ++ return rc; + } + + /* diff --git a/net-nds/openldap/files/openldap-2.4.59-implicit-function.patch b/net-nds/openldap/files/openldap-2.4.59-implicit-function.patch new file mode 100644 index ..ec7775c99dfa --- /dev/null +++ b/net-nds/openldap/files/openldap-2.4.59-implicit-function.patch @@ -0,0 +1,41 @@ +--- openldap-2.4.59/servers/slapd/back-meta/conn.c 2021-06-03 11:40:31.0 -0700 openldap-2.4.59/servers/slapd/back-meta/conn.c 2024-08-24 14:22:31.677357359 -0700 +@@ -31,6 +31,7 @@ + + #define AVL_INTERNAL + #include "slap.h" ++#include "proto-slap.h" + #include "../back-ldap/back-ldap.h" + #include "back-meta.h" + +--- openldap-2.4.59/servers/slapd/back-ldap/bind.c 2021-06-03 11:40:31.0 -0700 openldap-2.4.59/servers/slapd/back-ldap/bind.c 2024-08-24 14:22:13.340701355 -0700 +@@ -31,6 +31,7 @@ + + #define AVL_INTERNAL + #include "slap.h" ++#include "proto-slap.h" + #include "back-ldap.h" + #include "lutil.h" + #include "lutil_ldap.h" +--- openldap-2.4.59/servers/slapd/config.c 2021-06-03 11:40:31.0 -0700 openldap-2.4.59/servers/slapd/config.c 2024-08-24 14:22:13.414034645 -0700 +@@ -43,6 +43,7 @@ + #endif + + #include "slap.h" ++#include "proto-slap.h" + #ifdef LDAP_SLAPI + #include "slapi/
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: b341ff7d283ccc6186eeb29c21baaa22499baadc Author: Robin H. Johnson gentoo org> AuthorDate: Mon Aug 19 18:14:45 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Aug 19 18:17:33 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b341ff7d virtualx.eclass: addpredict /dev/dri/ for Xvfb w/ mesa-24.2.0 Newer Mesa tries to access /dev/dri/ when used in Xvfb, and this triggers a sandbox error; discovered and verified w/ sci-mathematics/fricas-1.3.11-r2. Reference: https://public-inbox.gentoo.org/gentoo-dev/bb4927ba-5ced-3352-86bb-d87f37ceaab6 woodpecker.gentoo.org/T/#t Signed-off-by: Robin H. Johnson gentoo.org> eclass/virtualx.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 6e77cd662bdd..f7318eafc59e 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -113,6 +113,7 @@ virtx() { export XAUTHORITY= einfo "Starting Xvfb ..." + addpredict /dev/dri/ # Needed for Xvfb w/ >=mesa-24.2.0 debug-print "${FUNCNAME}: Xvfb -displayfd 1 ${xvfbargs[*]}" local logfile=${T}/Xvfb.log
[gentoo-commits] data/api:master commit in: files/mirrors/
commit: 6c8a270c8f844d447bda625ea0a7fcdedaf9c71d Author: Robin H. Johnson gentoo org> AuthorDate: Wed Aug 7 05:01:55 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed Aug 7 05:02:22 2024 + URL:https://gitweb.gentoo.org/data/api.git/commit/?id=6c8a270c mirrors: HEANet has announced their mirror service will end in August. Signed-off-by: Robin H. Johnson gentoo.org> files/mirrors/distfiles.xml | 6 -- files/mirrors/rsync.xml | 5 - 2 files changed, 11 deletions(-) diff --git a/files/mirrors/distfiles.xml b/files/mirrors/distfiles.xml index 96622e0..d3e8cd6 100644 --- a/files/mirrors/distfiles.xml +++ b/files/mirrors/distfiles.xml @@ -311,12 +311,6 @@ vim: ft=xml et ts=2 sts=2 sw=2: - - HEAnet - Ireland's National Education and Research Network - https://ftp.heanet.ie/mirrors/gentoo.org/ - http://ftp.heanet.ie/mirrors/gentoo.org/ - rsync://ftp.heanet.ie/mirrors/gentoo.org/ - diff --git a/files/mirrors/rsync.xml b/files/mirrors/rsync.xml index e175eaa..2fb65b6 100644 --- a/files/mirrors/rsync.xml +++ b/files/mirrors/rsync.xml @@ -126,11 +126,6 @@ vim: ft=xml et ts=2 sts=2 sw=2: Any available mirror - rsync.ie.gentoo.org rsync://rsync.ie.gentoo.org - - HEAnet - Ireland's National Education and Research Network - - rsync1.ie.gentoo.org - rsync://rsync1.ie.gentoo.org -
[gentoo-commits] repo/gentoo:master commit in: acct-group/ldap/
commit: 73d4ba16b1352a47efd42784b5950ad96f00af38 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Jul 28 15:41:40 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jul 28 15:44:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d4ba16 acct-group/ldap: set LDAP project as maintainer Signed-off-by: Robin H. Johnson gentoo.org> acct-group/ldap/metadata.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/acct-group/ldap/metadata.xml b/acct-group/ldap/metadata.xml index 115e9d64a669..7f0918bba851 100644 --- a/acct-group/ldap/metadata.xml +++ b/acct-group/ldap/metadata.xml @@ -1,5 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd";> - + + ldap-b...@gentoo.org +
[gentoo-commits] repo/gentoo:master commit in: acct-user/ldap/
commit: eba96f0351b144597378396410ee6fa330a2daf4 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Jul 28 15:42:11 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jul 28 15:44:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba96f03 acct-user/ldap: set LDAP project as maintainer Signed-off-by: Robin H. Johnson gentoo.org> acct-user/ldap/metadata.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/acct-user/ldap/metadata.xml b/acct-user/ldap/metadata.xml index 115e9d64a669..7f0918bba851 100644 --- a/acct-user/ldap/metadata.xml +++ b/acct-user/ldap/metadata.xml @@ -1,5 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd";> - + + ldap-b...@gentoo.org +
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/, dev-ruby/facter/files/
commit: 03e8deb55ed4376b4f5e29f019797c82c03539cd Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jul 20 17:27:52 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jul 20 17:29:50 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03e8deb5 dev-ruby/facter: fix vague Gem::MissingSpecError Signed-off-by: Robin H. Johnson gentoo.org> dev-ruby/facter/facter-4.7.0-r1.ebuild | 56 ++ .../files/facter-4.7.0-gentoo-thor-gemspec.patch | 36 ++ 2 files changed, 92 insertions(+) diff --git a/dev-ruby/facter/facter-4.7.0-r1.ebuild b/dev-ruby/facter/facter-4.7.0-r1.ebuild new file mode 100644 index ..6c7cda531d76 --- /dev/null +++ b/dev-ruby/facter/facter-4.7.0-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby30 ruby31 ruby32" +RUBY_FAKEGEM_GEMSPEC="facter.gemspec" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_RECIPE_DOC="yard" + +inherit ruby-fakegem + +DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems" +HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"; + +LICENSE="Apache-2.0" +SLOT="0" +#IUSE="test" +if [[ ${PV} == ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"; + EGIT_BRANCH="master" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~amd64 ~riscv ~x86" + #KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +#RESTRICT="!test? ( test )" + +ruby_add_rdepend "dev-ruby/hocon https://github.com/puppetlabs/facter/issues/2687 +Reference: https://github.com/puppetlabs/facter/pull/2674 +Reference: https://github.com/puppetlabs/facter/pull/2686 +Signed-off-by: Robin H. Johnson + +diff '--color=auto' -Nuar facter-4.7.0.orig/ext/project_data.yaml facter-4.7.0/ext/project_data.yaml +--- facter-4.7.0.orig/ext/project_data.yaml2024-04-05 10:45:18.0 -0700 facter-4.7.0/ext/project_data.yaml 2024-07-20 10:20:06.637005127 -0700 +@@ -15,4 +15,4 @@ + gem_required_ruby_version: ['>= 2.5', '< 4.0'] + gem_runtime_dependencies: + hocon: ~> 1.3 +- thor: ['>= 1.0.1', '< 1.3'] ++ thor: ['>= 1.0.1', '< 2.0'] +diff '--color=auto' -Nuar facter-4.7.0.orig/facter.gemspec facter-4.7.0/facter.gemspec +--- facter-4.7.0.orig/facter.gemspec 2024-07-20 10:18:09.763758108 -0700 facter-4.7.0/facter.gemspec2024-07-20 10:19:55.470346750 -0700 +@@ -46,5 +46,5 @@ + spec.add_development_dependency 'yard', '~> 0.9' + + spec.add_runtime_dependency 'hocon', '~> 1.3' +- spec.add_runtime_dependency 'thor', ['>= 1.0.1', '< 1.3'] # Thor 1.3.0 drops support for Ruby 2.5 ++ spec.add_runtime_dependency 'thor', ['>= 1.0.1', '< 2.0'] # Thor 1.3.0 drops support for Ruby 2.5 - which doesn't matter for Gentoo + end
[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet-lint/
commit: 74a613d51782ffe523d0a6cdd772dfc4a1659284 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jul 20 17:29:03 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jul 20 17:29:50 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74a613d5 app-admin/puppet-lint: bump to 4.2.4 Signed-off-by: Robin H. Johnson gentoo.org> app-admin/puppet-lint/Manifest | 1 + app-admin/puppet-lint/puppet-lint-4.2.4.ebuild | 39 ++ 2 files changed, 40 insertions(+) diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest index 32345ea1c4f3..4c98387cef43 100644 --- a/app-admin/puppet-lint/Manifest +++ b/app-admin/puppet-lint/Manifest @@ -2,3 +2,4 @@ DIST puppet-lint-4.2.1.gem 81920 BLAKE2B 5e291e4c1743092be9935231280f04ce3affdc1 DIST puppet-lint-4.2.2.gem 81920 BLAKE2B cad796866f323113a8c2aa5cf86b6187423f27186032ea76ebd1f158937c34f315d93de3d92b01acc0b160947b720bd987550c52aaa53a51f165396de776ec88 SHA512 e8a591e615db87dc2edc22fc4d53c03004e0227748896005d2252fab8b77193ecd30f9167702c6c4fd6551daaa0894789f3d9d50fb705eecaed4a22573a94afc DIST puppet-lint-4.2.3-pr181-fix-warnings.patch 5601 BLAKE2B a04fdf9d8627cc888924b4282a09e076d7e029eda008fc8da138a121a21e227cff45a54ddbe770a286a2a15e43d4402526a6201c805f6e574755a11a1d13d7d7 SHA512 15638f2d4a81c969aa77b51f2f147a1fba5544dd7e52f3127dc9949afaabbd161f815a22dc5091f19d3d16bc2be97bb50f455a3a67c503aff58e737288f80e49 DIST puppet-lint-4.2.3.gem 81920 BLAKE2B ee98aaed336a4302c4d67d94c83f30f6fdfc92b483f39a2c096f00daff2f7caf54bfa11c4b8217648a0ca68c6c8da5a4a6f2d0cab8efb6e2d7e814155780 SHA512 2f2192a48ed460371092ce99755b8cde55526ed96ee72d2a5b7989f7df7afb6abce5d3e8e7a0dca577b199bb380935e8734a92a53248697bb7195091da4cb9f6 +DIST puppet-lint-4.2.4.gem 82432 BLAKE2B 54bd65b917c184163adca920767b88d064cdd8c931d7911a64698d68a7b335055bd95bff91c462ecaf4111a231186ee5d2f2de42a04abffb519a67a4825bec59 SHA512 19b28de4e5d183dd46727cc4f7f7a6b81eb5ec7d0c7ca23514a015e43a7528bfc110853b82e65ac5da4d002abc3c21ce5d10abb6a97717b540d13570fd42eb6b diff --git a/app-admin/puppet-lint/puppet-lint-4.2.4.ebuild b/app-admin/puppet-lint/puppet-lint-4.2.4.ebuild new file mode 100644 index ..59d8d9af62c5 --- /dev/null +++ b/app-admin/puppet-lint/puppet-lint-4.2.4.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby31 ruby32 ruby33" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_BINWRAP="puppet-lint" + +inherit ruby-fakegem + +DESCRIPTION="A linter for puppet DSL" +HOMEPAGE="https://github.com/puppetlabs/puppet-lint"; + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCH_NAME="${PN}-4.2.3-pr181-fix-warnings.patch" +#SRC_URI+=" https://github.com/puppetlabs/puppet-lint/pull/181.patch -> ${PATCH_NAME} " + +#PATCHES=( +# "${DISTDIR}/${PATCH_NAME}" +#) + +ruby_add_bdepend "test? ( + dev-ruby/rspec-its:1 + dev-ruby/rspec-collection_matchers:1 + dev-ruby/rspec-json_expectations )" + +all_ruby_prepare() { + # Skip acceptance tests due to unpackages puppet_litmus which in turn + # has a number of unpackaged dependencies. + rm -rf spec/acceptance || die + rm -f spec/spec_helper_acceptance.rb || die +}
[gentoo-commits] repo/gentoo:master commit in: net-nds/nsscache/
commit: f4e12ad13f410d8c4354e94207234d0007b8bcaa Author: Robin H. Johnson gentoo org> AuthorDate: Mon Jul 8 16:07:50 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Jul 8 16:17:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e12ad1 net-nds/nsscache: QA improvements Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/923061 .../{nsscache-0.49.ebuild => nsscache-0.49-r1.ebuild} | 18 ++ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/net-nds/nsscache/nsscache-0.49.ebuild b/net-nds/nsscache/nsscache-0.49-r1.ebuild similarity index 92% rename from net-nds/nsscache/nsscache-0.49.ebuild rename to net-nds/nsscache/nsscache-0.49-r1.ebuild index 7c9dfe0b027a..b0fd6dc60bed 100644 --- a/net-nds/nsscache/nsscache-0.49.ebuild +++ b/net-nds/nsscache/nsscache-0.49-r1.ebuild @@ -11,6 +11,7 @@ inherit distutils-r1 DESCRIPTION="commandline tool to sync directory services to local cache" HOMEPAGE="https://github.com/google/nsscache"; SRC_URI="https://github.com/google/nsscache/archive/version/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-version-${PV}" # upstream *sources* say "or later", but upstream metadata does not include the # 'or later' clause. @@ -34,12 +35,7 @@ RDEPEND=" >=dev-python/pycurl-7.45.2[${PYTHON_USEDEP}] s3? ( dev-python/boto3[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} - dev-python/packaging[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/${PN}-version-${PV}" + dev-python/packaging[${PYTHON_USEDEP}]" distutils_enable_tests pytest @@ -48,19 +44,17 @@ python_prepare_all() { # Default config tries $PREFIX/config/nsscache.conf sed -i \ -e '/data_files/{s,.nsscache.conf.,,}' \ - setup.py + setup.py \ + || die # Upstream forgot to bump the version sed -i \ -e '/^__version__/s,0.48,0.49,g' \ - nss_cache/__init__.py + nss_cache/__init__.py \ + || die distutils-r1_python_prepare_all } -python_compile() { - distutils-r1_python_compile -} - python_install() { distutils-r1_python_install
[gentoo-commits] repo/gentoo:master commit in: dev-util/webhook/, dev-util/webhook/files/
commit: 2dfb57229e521d7be1d5a73e392c45033f285a24 Author: Holger Hoffstätte applied-asynchrony com> AuthorDate: Fri Apr 26 14:58:18 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Fri Jul 5 03:13:40 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dfb5722 dev-util/webhook: add 2.8.1, various additions/improvements This adds a proper OpenRC init script and out-of-the box configuration. Signed-off-by: Holger Hoffstätte applied-asynchrony.com> Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/36436 Closes: https://bugs.gentoo.org/870304 dev-util/webhook/Manifest | 1 + dev-util/webhook/files/webhook.confd| 2 + dev-util/webhook/files/webhook.initd| 22 dev-util/webhook/files/webhook.json.example | 13 + dev-util/webhook/files/webhook.logrotated | 3 ++ dev-util/webhook/webhook-2.8.1.ebuild | 84 + 6 files changed, 125 insertions(+) diff --git a/dev-util/webhook/Manifest b/dev-util/webhook/Manifest index 26d74735e8a3..42e0a70ca85b 100644 --- a/dev-util/webhook/Manifest +++ b/dev-util/webhook/Manifest @@ -1 +1,2 @@ DIST webhook-2.7.0.tar.gz 1652898 BLAKE2B e6cf049b39d7fea689060e9e1e42f6386a7a671a10cc7d3fc288ea9285dc90e674a3a4b5fcb77ac5af8a8b1bbfee0a574b2ae94f8df296b64e15578c824f8500 SHA512 107db4f873aa66c9e9910eb7542edf18c3bd5b3509ff03d6e6947cb162d08101f5b11855c403d6a0a27fea8da693aaa2c995799670b73693c8fe2b2f50ac1da1 +DIST webhook-2.8.1.tar.gz 1657848 BLAKE2B 7e6dbea83614042c6dcf2e0b377933dee625bfd300e24530f0682b68945734e11e3d2d5bc34ef8b19936b3880cab7febfa39160a5eea988c4f882acf47d99cbd SHA512 25edff21725ba9ac8823dbe5728234f7cd9218027e87df3e2482ef365a7dd0efe8659800233753c275f858ff87f848ff6141d09be3e0b66ff88b795680b9b635 diff --git a/dev-util/webhook/files/webhook.confd b/dev-util/webhook/files/webhook.confd new file mode 100644 index ..6cc27e091955 --- /dev/null +++ b/dev-util/webhook/files/webhook.confd @@ -0,0 +1,2 @@ +# arguments for webhook +command_args="-ip=localhost -port=9000 -hooks=/etc/webhook.json -logfile=/var/log/webhook.log" diff --git a/dev-util/webhook/files/webhook.initd b/dev-util/webhook/files/webhook.initd new file mode 100644 index ..d87e8cce035f --- /dev/null +++ b/dev-util/webhook/files/webhook.initd @@ -0,0 +1,22 @@ +#!/sbin/openrc-run +# Copyright 2016-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="Webhook server" +pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} + +command="/usr/bin/webhook" +command_args="${command_args}" +command_background="true" +extra_started_commands="reload" +start_stop_daemon_args="" + +depend() { + after net +} + +reload() { + ebegin "Reloading webhooks" + start-stop-daemon --signal SIGHUP --pidfile "${pidfile}" + eend $? +} diff --git a/dev-util/webhook/files/webhook.json.example b/dev-util/webhook/files/webhook.json.example new file mode 100644 index ..12a314522595 --- /dev/null +++ b/dev-util/webhook/files/webhook.json.example @@ -0,0 +1,13 @@ +[ + { +"id": "example", +"execute-command": "/var/lib/webhooks/example.sh", +"command-working-directory": "/var/lib/webhooks" +"pass-arguments-to-command": +[ + { +"source": "entire-payload" + } +] + } +] diff --git a/dev-util/webhook/files/webhook.logrotated b/dev-util/webhook/files/webhook.logrotated new file mode 100644 index ..7a6dd20b3ceb --- /dev/null +++ b/dev-util/webhook/files/webhook.logrotated @@ -0,0 +1,3 @@ +/var/log/webhook.log +{ +} diff --git a/dev-util/webhook/webhook-2.8.1.ebuild b/dev-util/webhook/webhook-2.8.1.ebuild new file mode 100644 index ..18c19358ef77 --- /dev/null +++ b/dev-util/webhook/webhook-2.8.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="lightweight incoming webhook server to run shell commands" +HOMEPAGE="https://github.com/adnanh/webhook/"; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/adnanh/webhook/"; +else + SRC_URI="https://github.com/adnanh/webhook/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/webhook-${PV}" +fi + +# SPDX:BSD-3-Clause is 'BSD' in Gentoo +# SPDX:BSD-2-Clause is 'BSD-2' in Gentoo +LICENSE="Apache-2.0 BSD-2 BSD MIT" +SLOT="0" + +BDEPEND=">=dev-lang/go-1.13" +RESTRICT="test" # hardcoded paths, plus go extra dependencies not included
[gentoo-commits] repo/gentoo:master commit in: sys-power/pmtools/, sys-power/pmtools/files/
commit: 5ccfb3ce0e2dd3d30e2a19ef5c3da0c7fb421dec Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jun 22 21:12:22 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jun 22 21:14:36 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ccfb3ce sys-power/pmtools: bump to 20130209 Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/874702 Closes: https://bugs.gentoo.org/565232 sys-power/pmtools/Manifest | 1 + .../pmtools/files/pmtools-20110323-r2-types.patch | 21 + sys-power/pmtools/pmtools-20130209.ebuild | 54 ++ 3 files changed, 76 insertions(+) diff --git a/sys-power/pmtools/Manifest b/sys-power/pmtools/Manifest index e8878e1ef742..f01fbcc156ae 100644 --- a/sys-power/pmtools/Manifest +++ b/sys-power/pmtools/Manifest @@ -1 +1,2 @@ DIST pmtools-20110323.tar.gz 62002 BLAKE2B f1de2e266d72c8a69a61df0fc57bc0b27e9a4fc89f840e893b8fbb1bc93ec54dc5f502a1066d17d082341c99b829189911d558261409455fd1db368924fbea59 SHA512 81108c011b45c58c02013a3653c2d00bc2a9a9d80bf85438a193a4fed04a3fd2890d9cd4d64ab455e3e9c1613d35a6be59698395d9a27ca0a858e3935439bafd +DIST pmtools-20130209.tar.gz 52952 BLAKE2B bf628f458f8bddb4dc7d18866026c0e45343c88686a57121a2bb5856c0816c90a85bb67636a77258530b18b8e4e72868d991eefb280741f60ac5ac8a90bbc75b SHA512 696af0967caed1ff51411c1bc5b01cbb300f465cb3c28d9d5b1d456d85a50d173a343e32a162fa1ea836f825365997c9bdf109595be737c7e01391b9d7ace6c5 diff --git a/sys-power/pmtools/files/pmtools-20110323-r2-types.patch b/sys-power/pmtools/files/pmtools-20110323-r2-types.patch new file mode 100644 index ..bdff55d26315 --- /dev/null +++ b/sys-power/pmtools/files/pmtools-20110323-r2-types.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/874702#c8 +--- pmtools-orig/madt/madt.c 2005-11-12 04:07:04.0 +1100 pmtools/madt/madt.c2024-06-06 12:04:59.554214977 +1000 +@@ -42,7 +42,7 @@ + /* read standard input + * write decoded madt to standard output + */ +-get_next_entry(acpi_table_entry_header * entry_header) ++int get_next_entry(acpi_table_entry_header * entry_header) + { + size_t retval; + +@@ -53,7 +53,7 @@ + + u8buffer[1024]; + +-main() ++int main() + { + size_t retval; + struct acpi_table_madt *madt_header; diff --git a/sys-power/pmtools/pmtools-20130209.ebuild b/sys-power/pmtools/pmtools-20130209.ebuild new file mode 100644 index ..b0f2450048c8 --- /dev/null +++ b/sys-power/pmtools/pmtools-20130209.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Collection of tools for ACPI and power management" +HOMEPAGE="https://github.com/anyc/pmtools/"; +SRC_URI="https://github.com/anyc/pmtools/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc" + +# dev-lang/perl - RDEPEND for the pmtest tooling, which only works on much older kernels. +RDEPEND=" + >=sys-power/iasl-20090521 +" + +PATCHES=( + # All merged upstream in 20230209 + #"${FILESDIR}"/${PN}-20100123-acpixtract-pmtools.patch + #"${FILESDIR}"/${PN}-20100123-madt.patch + #"${FILESDIR}"/${PN}-20071116-64bit.patch + #"${FILESDIR}"/${PN}-20101124-cflags-ldflags.patch + + # New patches + "${FILESDIR}"/pmtools-20110323-r2-types.patch +) + +src_prepare() { + default + + # update version info + sed -i -e "s|20060324|20110323|" acpixtract/acpixtract.c || die + + strip-unsupported-flags +} + +src_compile() { + # respect user's LDFLAGS + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" +} + +src_install() { + newbin acpidump/acpidump acpidump-pmtools + newbin acpixtract/acpixtract acpixtract-pmtools + dobin madt/madt + + dodoc README madt/README.madt + use doc && dodoc madt/APIC* +}
[gentoo-commits] repo/gentoo:master commit in: sys-process/runit/
commit: 0e256f242d7ce36744c2165fd639bebe7f9b6589 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Jun 16 06:02:59 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jun 16 06:07:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e256f24 sys-process/runit: EAPI=8 porting and other fixes Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/show_bug.cgi?id=920357 Closes: https://bugs.gentoo.org/show_bug.cgi?id=875533 Closes: https://bugs.gentoo.org/show_bug.cgi?id=721880 Closes: https://bugs.gentoo.org/show_bug.cgi?id=590412 sys-process/runit/Manifest | 1 + sys-process/runit/runit-2.1.2-r2.ebuild | 149 2 files changed, 150 insertions(+) diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest index 8331848d7bf9..d3ffa90ef4a7 100644 --- a/sys-process/runit/Manifest +++ b/sys-process/runit/Manifest @@ -1 +1,2 @@ DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf +DIST runit_2.1.2-59ubuntu1.debian.tar.xz 66756 BLAKE2B d071dae4a92f292837f55210cda62d8d0471efa623aeb43b56fb6381050b64fa5d3def7d0738756621e1c4d05b36d0cdaedb7d056d24d796f834ace932bd55b9 SHA512 de6289d9909a8df5c5657762f8214858f9301ac0d55cac9c605f70f92e663ed8067fe018a8585616099ac369b7078a95415040c27e82626261f2adf925d0bad2 diff --git a/sys-process/runit/runit-2.1.2-r2.ebuild b/sys-process/runit/runit-2.1.2-r2.ebuild new file mode 100644 index ..0d475b7e66d4 --- /dev/null +++ b/sys-process/runit/runit-2.1.2-r2.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="A UNIX init scheme with service supervision" +HOMEPAGE="http://smarden.org/runit/"; +UBUNTU_PR="59ubuntu1" +UBUNTU_A="${PN}_${PV}-${UBUNTU_PR}.debian.tar.xz" +SRC_URI=" + http://smarden.org/runit/${P}.tar.gz + http://archive.ubuntu.com/ubuntu/pool/universe/r/runit/${UBUNTU_A} + " + +RDEPEND="sys-apps/openrc" + +S=${WORKDIR}/admin/${P}/src + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="static" + +src_prepare() { + default + cd "${WORKDIR}/admin/" + eapply -p1 "${WORKDIR}/debian/patches" + cd "${S}" + + # we either build everything or nothing static + sed -i -e 's:-static: :' Makefile + + # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726008 + [[ ${COMPILER} == "diet" ]] && + use ppc && + filter-flags "-mpowerpc-gpopt" +} + +src_configure() { + use static && append-ldflags -static + + echo "$(tc-getCC) ${CFLAGS}" > conf-cc + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld + sed -i \ + -e "/echo.*ar.*cr/s,\,$(tc-getAR)," \ + -e "/echo.*ranlib/s,\,$(tc-getRANLIB)," \ + print-ar.sh || die +} + +src_install() { + into / + dobin $(<../package/commands) + dodir /sbin + mv "${ED}"/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin" + dosym ../etc/runit/2 /sbin/runsvdir-start + + DOCS=( ../package/{CHANGES,README,THANKS,TODO} ) + HTML_DOCS=( ../doc/*.html ) + einstalldocs + doman ../man/*.[18] + + exeinto /etc/runit + doexe "${FILESDIR}"/ctrlaltdel + newexe "${FILESDIR}"/1-${PV} 1 + newexe "${FILESDIR}"/2-${PV} 2 + newexe "${FILESDIR}"/3-${PV} 3 + + dodir /etc/sv + for tty in tty1 tty2 tty3 tty4 tty5 tty6; do + exeinto /etc/sv/getty-$tty/ + newexe "${FILESDIR}"/finish.getty finish + newexe "${FILESDIR}"/run.getty-${PV} run + for script in finish run; do + sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/sv/getty-$tty/$script + done + done + + # make sv command work + newenvd - 20runit <<- EOF + #/etc/env.d/20runit + SVDIR="/etc/service/" + EOF +} + +default_config() { + local sv="${EROOT}"/etc/sv + local service="${EROOT}"/etc/service + mkdir -p "${service}" || die + for x in tty1 tty2 tty3 tty4 tty5 tty6; do + ln -sf "${sv}"/getty-$x &
[gentoo-commits] repo/gentoo:master commit in: sys-block/sas2ircu/
commit: cebb8ab7b1fc4b4fe9cfa107f3fd1d3b2b535d40 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Jun 16 01:59:36 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jun 16 02:01:34 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cebb8ab7 sys-block/sas2ircu: EAPI=8 fixes Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/335749 sys-block/sas2ircu/Manifest| 2 +- .../{sas2ircu-20.ebuild => sas2ircu-20-r1.ebuild} | 59 -- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/sys-block/sas2ircu/Manifest b/sys-block/sas2ircu/Manifest index 1726a069fa4a..b91c1c8bdbfa 100644 --- a/sys-block/sas2ircu/Manifest +++ b/sys-block/sas2ircu/Manifest @@ -1,2 +1,2 @@ DIST SAS2IRCU_P20.zip 2777958 BLAKE2B ba8c3ef1cf353af90f32a53722b3a7039768c0f48e1d5b48766acdf1c1c05a039692e1edc2586140da5af0f1f2378f4bfaca219895317dc7974004f3aed25343 SHA512 a0a4fa7d07959aa6a81d3540e71e3cc248c23267875ca098da6a80850e008cbdf57b2d6456b5fe17ef890fd39ac550788c9769d169a0673578632f1a8c8a8311 -DIST SAS2_IR_User_Guide.pdf 999388 BLAKE2B 4f1a198ccaa04cf250430106e3254cfb37fd16a1e89861030ed92f52de1d8cff17337709bb641093d78acb44995c03fceff739a0c416f7e3b1692c3b8c6a85dc SHA512 7370b54021978eb543270c992569637092571eaad73896b4bfdf7c7bc45bfd0cb0c6f8f34468255372103f562eb1e3ce2ad30cc6f0d37e7f9bc23f61ee166355 +DIST SAS2IRCU_User_Guide.pdf 794046 BLAKE2B e976f57ada3c51b58bfee24cd2f5d059f59b48bf388d93b146238d54aa09b06f6d450e3ccf149903871dfcdb32807a35d6f379738e149b410b7c1279f811153f SHA512 515869794be428ffbefcbfadac992912fb0eebab0cda640b315b4a231b5f25f1205978605f108b9009380015f3058c47e0ce4352c693ef23ab31980ea8b821a0 diff --git a/sys-block/sas2ircu/sas2ircu-20.ebuild b/sys-block/sas2ircu/sas2ircu-20-r1.ebuild similarity index 72% rename from sys-block/sas2ircu/sas2ircu-20.ebuild rename to sys-block/sas2ircu/sas2ircu-20-r1.ebuild index 6113f2cb5019..6fc257827999 100644 --- a/sys-block/sas2ircu/sas2ircu-20.ebuild +++ b/sys-block/sas2ircu/sas2ircu-20-r1.ebuild @@ -1,48 +1,48 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit mount-boot +MY_PN=SAS2IRCU +MY_P="${MY_PN}_P${PV}" + +DISTFILE_BIN=${MY_P}.zip +DISTFILE_DOC="SAS2IRCU_User_Guide.pdf" +DOC_PV=12 +SRC_URI_BIN="https://docs.broadcom.com/docs/${DISTFILE_BIN}"; +# This is "SAS-2 Integrated RAID Configuration Utility (SAS2IRCU) User Guide" +# and replaces the older SAS2_IR_User_Guide.pdf. +# It contains additional material compared to the older PDF. +SRC_URI_DOC="https://docs.broadcom.com/doc/12353380"; + +inherit mount-boot secureboot DESCRIPTION="LSI MPT-SAS2 controller management tool" HOMEPAGE="https://www.broadcom.com/products/storage/host-bus-adapters/sas-9207-8e#tab-archive-drivers4-abc"; +SRC_URI=" +${SRC_URI_BIN} +doc? ( ${SRC_URI_DOC} -> ${DISTFILE_DOC} ) +" +S="${WORKDIR}/${MY_P}" LICENSE="LSI" SLOT="0" KEYWORDS="-* ~amd64 ~ppc64 ~x86 ~x64-solaris" -IUSE="uefi doc" +IUSE="doc uefi" RESTRICT="strip fetch mirror" -DEPEND="app-arch/unzip" -RDEPEND="" +BDEPEND="app-arch/unzip" QA_PREBUILT="opt/lsi/sas2ircu boot/efi/sas2ircu.efi" -MY_PN=SAS2IRCU -MY_P="${MY_PN}_P${PV}" - -DISTFILE_BIN=${MY_P}.zip -DISTFILE_DOC=SAS2_IR_User_Guide.pdf -DOC_PV=12 - -SRC_URI=" -https://docs.broadcom.com/docs/${DISTFILE_BIN} -https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_6g_p20_point6/$DISTFILE_BIN -doc? ( https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/SAS2_IR_User_Guide.pdf ) -" - LICENSE_URL="http://www.lsi.com/cm/License.do?url=&prodName=&subType=Miscellaneous&locale=EN"; -S="${WORKDIR}/${MY_P}" - pkg_nofetch() { elog "LSI has a mandatory click-through license on thier binaries." - elog "Please visit $HOMEPAGE and download ${DISTFILE_BIN} from the Management Software and Tools section." - elog "If the file has been moved again, the license form might be available at https://docs.broadcom.com/docs/${DISTFILE_BIN}"; + elog "Please visit ${SRC_URI_BIN} to agree to the license and download the binary." elog "After downloading, move ${DISTFILE_BIN} into your DISTDIR directory" if use doc; then - elog "Please also download 'SAS-2 Integrated RAID Configuration Utility User Guide' (${DISTFILE_DOC}) " - elog "and also place it into your DISTDIR directory" + elog "Please also download 'SAS-2 Integrated RAID Configuration Utility User Guide
[gentoo-commits] repo/gentoo:master commit in: net-mail/safecat/files/, net-mail/safecat/
commit: 69ef13ef2d97eecefe30c83a4dfcca76732c0f71 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jun 15 21:59:21 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jun 15 22:03:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69ef13ef net-mail/safecat: EAPI 8 bump, some fixes This does not include a full suite of Clang fixes, due to upstream's C coding style: significant work to fix all of the prototypes in this code base, and align with modern types. Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/show_bug.cgi?id=725030 Closes: https://bugs.gentoo.org/show_bug.cgi?id=836088 .../files/safecat-1.13-dup-obj-makefile.patch | 39 + net-mail/safecat/files/safecat-1.13-include.patch | 97 ++ ...{safecat-1.13.ebuild => safecat-1.13-r1.ebuild} | 20 +++-- net-mail/safecat/safecat-1.13.ebuild | 7 +- 4 files changed, 150 insertions(+), 13 deletions(-) diff --git a/net-mail/safecat/files/safecat-1.13-dup-obj-makefile.patch b/net-mail/safecat/files/safecat-1.13-dup-obj-makefile.patch new file mode 100644 index ..b276bb7ff709 --- /dev/null +++ b/net-mail/safecat/files/safecat-1.13-dup-obj-makefile.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/740798 +https://cgit.freebsd.org/ports/plain/sysutils/safecat/files/patch-Makefile + +sysutils/safecat: avoid duplicating object files in library + +Previously byte_copy.o and str_len.o were added to str.a, and then +specified as objects on the safecat link command line along with str. +When linking with lld this produces duplicate symbol errors like: + +/usr/bin/ld: error: duplicate symbol: byte_copy +>>> defined at byte_copy.c +>>>byte_copy.o:(byte_copy) in archive str.a +>>> defined at byte_copy.c +>>>byte_copy.o(.text+0x0) + +As these symbols are provided by str.a just avoid listing the object +files as well. +--- safecat-1.13/Makefile.orig 2004-08-16 20:50:09.0 -0400 safecat-1.13/Makefile 2017-11-23 16:49:00.505811000 -0500 +@@ -219,14 +219,14 @@ + + safecat: \ + load safecat.o getln.a str.a stralloc.a strerr.a substdio.a alloc.o \ +-alloc_re.o byte_copy.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \ +-hostname.o sig.o stat_dir.o str_diffn.o str_len.o substdio_copy.o \ ++alloc_re.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \ ++hostname.o sig.o stat_dir.o str_diffn.o substdio_copy.o \ + substdi.o substdio.o taia_fmtfrac.o taia_now.o taia_tai.o tempfile.o \ + writefile.o +- ./load safecat getln.a str.a stralloc.a strerr.a substdio.a \ +- alloc.o alloc_re.o byte_copy.o byte_cr.o envread.o error.o \ ++ ./load safecat getln.a stralloc.a strerr.a substdio.a str.a \ ++ alloc.o alloc_re.o byte_cr.o envread.o error.o \ + error_str.o fmt_uint64.o hostname.o sig.o stat_dir.o str_diffn.o \ +- str_len.o substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \ ++ substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \ + taia_now.o taia_tai.o tempfile.o writefile.o + + safecat.0: \ diff --git a/net-mail/safecat/files/safecat-1.13-include.patch b/net-mail/safecat/files/safecat-1.13-include.patch new file mode 100644 index ..f59f2a45d230 --- /dev/null +++ b/net-mail/safecat/files/safecat-1.13-include.patch @@ -0,0 +1,97 @@ +diff '--color=auto' -Nuar safecat-1.13.orig/install.c safecat-1.13/install.c +--- safecat-1.13.orig/install.c2000-02-28 20:10:12.0 -0800 safecat-1.13/install.c 2024-06-15 14:40:24.142699634 -0700 +@@ -1,3 +1,10 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include + #include "substdio.h" + #include "strerr.h" + #include "error.h" +diff '--color=auto' -Nuar safecat-1.13.orig/instcheck.c safecat-1.13/instcheck.c +--- safecat-1.13.orig/instcheck.c 2000-02-28 20:10:12.0 -0800 safecat-1.13/instcheck.c 2024-06-15 14:40:27.502696776 -0700 +@@ -1,5 +1,12 @@ + #include + #include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + #include "strerr.h" + #include "error.h" + #include "readwrite.h" +diff '--color=auto' -Nuar safecat-1.13.orig/safecat.c safecat-1.13/safecat.c +--- safecat-1.13.orig/safecat.c2004-08-16 18:14:34.0 -0700 safecat-1.13/safecat.c 2024-06-15 14:40:17.246038832 -0700 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + + /* Support for large files (on Linux systems, if the appropriate +--- safecat-1.13.orig/alloc.c 2000-02-28 20:10:12.0 -0800 safecat-1.13/alloc.c 2024-06-15 14:41:26.985979033 -0700 +@@ -1,7 +1,6 @@ ++#include + #include "alloc.h" + #include "error.h" +-e
[gentoo-commits] repo/gentoo:master commit in: media-gfx/monica/files/, media-gfx/monica/
commit: 0d6587457d4c4a9cce3ccfa2672361440b48d4a1 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jun 15 18:06:23 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jun 15 18:08:31 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d658745 media-gfx/monica: EAPI 8 & minor fixes Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/740008 media-gfx/monica/files/monica-3.7-exit.patch | 61 ++ media-gfx/monica/files/monica-3.7-fprintf.patch| 46 .../monica/files/monica-3.7-makefile-cleanup.patch | 33 .../{monica-3.7.ebuild => monica-3.7-r1.ebuild}| 9 ++-- 4 files changed, 145 insertions(+), 4 deletions(-) diff --git a/media-gfx/monica/files/monica-3.7-exit.patch b/media-gfx/monica/files/monica-3.7-exit.patch new file mode 100644 index ..afd347c28257 --- /dev/null +++ b/media-gfx/monica/files/monica-3.7-exit.patch @@ -0,0 +1,61 @@ +--- monica-3.7.orig/monica.cpp 2024-06-15 10:17:52.270992952 -0700 monica-3.7/monica.cpp 2024-06-15 10:53:54.255394576 -0700 +@@ -1276,7 +1276,7 @@ + int bcheck = system("echo $SHELL | grep bash"); + if (bcheck) { + fl_alert("Monica senses that BASH is not\nyour login shell...\n\nSince Monica uses bash init scripts to \nimplement gamma corrections on system login, \nyou will have to paste the call to monicarc \ninto your startup scripts by hand.\n\nAlternatively, you can make a direct call \nto xgamma in your X config file."); +- __builtin_exit (0); ++ exit (0); + } + + fn_r = get_shell_rc_path(); +@@ -1563,13 +1563,13 @@ + } + //- + void exit_cb(Fl_Widget *, void *) { +- __builtin_exit(0); ++ exit(0); + } + //- + void exit_save_cb(Fl_Widget *, void *s) { + int res = write_monicarc((Sliders*)s); + if (res) res = add_monicarc_to_startup(); +- __builtin_exit(0); ++ exit(0); + } + //- + +@@ -1704,7 +1704,7 @@ + //if (no_ati_gamma && no_x_gamma) { + if (no_x_gamma) { + fl_alert("Monica cannot detect the presence\n of xgamma on your machine...\n\nIt is distributed with all versions of XFree86 \nand Xorg to date, so if you have X installed, \nit should be around or something might be \nwrong with your installation.\n\nXgamma is needed for Monica to function."); +- __builtin_exit (0); ++ exit (0); + } + //-- set global value of "xgamma" command string, accomodating ATI's fglrx_xgamma --- + //if ( ! no_ati_gamma ) { +@@ -1739,13 +1739,13 @@ + printf("Copyright (C) 2005 Paul Sherman\n\n"); + printf("Copyright (C) 2002 Tilo Riemer\n\n"); + printf("Monica is published under a BSD like licence.\nSee Monica -l\n\n"); +- __builtin_exit(0); ++ exit(0); + } + if ( (strcmp(argv[i], "-l") == 0) + || (strcmp(argv[i], "--licence") == 0) + || (strcmp(argv[i], "--license") == 0) ) { + printf("\n%s\n\n", LICENCE); +- __builtin_exit(0); ++ exit(0); + } + if ( (strcmp(argv[i], "-h") == 0) || (strcmp(argv[i], "--help") == 0) ) { + printf("\nUsage: Monica [options]\nwhere options are:\n"); +@@ -1766,7 +1766,7 @@ + printf("\t-s[cheme] scheme\n"); + printf("\t-t[itle] windowtitle\n\n"); + +- __builtin_exit(0); ++ exit(0); + } + if ( (strcmp(argv[i], "-o") == 0) || (strcmp(argv[i], "--onthefly") == 0) ) { + g_toggle_apply_on_the_fly_checkbox = 1; diff --git a/media-gfx/monica/files/monica-3.7-fprintf.patch b/media-gfx/monica/files/monica-3.7-fprintf.patch new file mode 100644 index ..55959e246f43 --- /dev/null +++ b/media-gfx/monica/files/monica-3.7-fprintf.patch @@ -0,0 +1,46 @@ +--- monica-3.7.orig/monica.cpp 2024-06-15 10:16:59.594465873 -0700 monica-3.7/monica.cpp 2024-06-15 10:17:18.277749251 -0700 +@@ -1301,9 +1301,9 @@ + while (fgets (buffer, BUF_SIZE, f_r)) { + if (strstr(buffer, ". .monicarc")) {//skip old entries + continue; +- } else fprintf(f_w, buffer); ++ } else fprintf(f_w, "%s", buffer); + } +-fprintf(f_w, ". .monicarc #monitor calibration"); ++fprintf(f_w, "%s", ". .monicarc #monitor calibration"); + fclose(f_w); + // script edited, so back up the original and put the ".tmp" in its place + re
[gentoo-commits] proj/elections:master commit in: council-202406/
commit: 2c02f8ca96134ed0e7a246216795aa0f530149f1 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jun 15 17:08:51 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jun 15 17:08:51 2024 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=2c02f8ca fix(council-202406): add missing _reopen_nominations Signed-off-by: Robin H. Johnson gentoo.org> council-202406/ballot-council-202406 | 1 + 1 file changed, 1 insertion(+) diff --git a/council-202406/ballot-council-202406 b/council-202406/ballot-council-202406 index 4c6140b..5cb5b89 100644 --- a/council-202406/ballot-council-202406 +++ b/council-202406/ballot-council-202406 @@ -1,3 +1,4 @@ +_reopen_nominations ajak arthurzam dilfridge
[gentoo-commits] proj/elections:master commit in: council-202406/
commit: e87ea39f8babfc96e8975dab59aac9dfc5cf4b76 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jun 15 05:19:37 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jun 15 05:19:37 2024 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=e87ea39f fix(council-202406): populate voters & ballot Signed-off-by: Robin H. Johnson gentoo.org> council-202406/ballot-council-202406 | 8 +++ council-202406/voters-council-202406 | 111 +++ 2 files changed, 119 insertions(+) diff --git a/council-202406/ballot-council-202406 b/council-202406/ballot-council-202406 new file mode 100644 index 000..4c6140b --- /dev/null +++ b/council-202406/ballot-council-202406 @@ -0,0 +1,8 @@ +ajak +arthurzam +dilfridge +mgorny +robbat2 +sam +soap +ulm diff --git a/council-202406/voters-council-202406 b/council-202406/voters-council-202406 new file mode 100644 index 000..0b86112 --- /dev/null +++ b/council-202406/voters-council-202406 @@ -0,0 +1,111 @@ +aballier +ago +ajak +alexxy +alicef +amadio +amynka +anarchy +andrewammerlaan +arkamar +arsen +arthurzam +asturm +billie +bircoph +bkohler +blueknight +blueness +candrews +ceamac +cedk +chewi +chiitoo +chithanh +chutzpah +concord +conikost +dilfridge +dlan +eras +expeditioneer +floppym +flow +fordfrog +gienah +gokturk +graaff +grobian +grozin +gyakovlev +hanno +hattya +heroxbd +idl0r +ionen +john_r_graham +jsmolic +jstein +juippis +kallamej +kangie +kensington +keri +kumba +leio +lordvan +lu_zero +maekke +maffblaster +marecki +matsl +matthew +mattst88 +mgorny +mjo +monsieurp +mpagano +mschiff +mva +naota +nativemad +neddyseagoon +nerdboy +nicolasbock +pacho +patrick +perfinion +pinkbyte +pjp +prometheanfire +radhermit +reavertm +rich0 +ris +robbat2 +sam +sarnex +sbraz +soap +sping +stasibear +steils +swegener +tamiko +titanofold +tomjbe +toralf +tupone +ulm +ultrabug +vapier +voyageur +williamh +wraeth +xen0n +xgqt +zerochaos +zmedico +zorry +zx2c4 +zzam
[gentoo-commits] proj/elections:master commit in: trustees-202406/
commit: cd93477147849791975e5265ff8a34a4c3815d06 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jun 15 05:17:06 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jun 15 05:17:06 2024 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=cd934771 fix(trustees-202406): populate voters & ballot Signed-off-by: Robin H. Johnson gentoo.org> trustees-202406/ballot-trustees-202406 | 4 +++ trustees-202406/voters-trustees-202406 | 56 ++ 2 files changed, 60 insertions(+) diff --git a/trustees-202406/ballot-trustees-202406 b/trustees-202406/ballot-trustees-202406 new file mode 100644 index 000..83c7dbd --- /dev/null +++ b/trustees-202406/ballot-trustees-202406 @@ -0,0 +1,4 @@ +_reopen_nominations +dilfridge +prometheanfire +soap diff --git a/trustees-202406/voters-trustees-202406 b/trustees-202406/voters-trustees-202406 new file mode 100644 index 000..7a9f910 --- /dev/null +++ b/trustees-202406/voters-trustees-202406 @@ -0,0 +1,56 @@ +ago +ajak +alexxy +alicef +amynka +anarchy +andrewammerlaan +antarus +arsen +arthurzam +bircoph +bkohler +blueknight +blueness +bman +dabbott +dilfridge +dwfreed +eras +floppym +graaff +grobian +hattya +jmbsvicetto +kallamej +kensington +klondike +kumba +lu_zero +maffblaster +marecki +mattst88 +mgorny +mpagano +neddyseagoon +patrick +perfinion +pinkbyte +prometheanfire +rich0 +robbat2 +sam +shentino +soap +steils +swift +tamiko +titanofold +tomjbe +tupone +ulm +voyageur +williamh +wraeth +zerochaos +zlogene
[gentoo-commits] proj/elections:master commit in: trustees-202406/
commit: 14b5f41e2f0e31a70eedf0b19080f7ad52760a5b Author: Robin H. Johnson gentoo org> AuthorDate: Sun Jun 2 00:13:31 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jun 2 00:13:31 2024 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=14b5f41e feat: add trustees-202406 Signed-off-by: Robin H. Johnson gentoo.org> trustees-202406/Votify.pm | 1 + trustees-202406/election-details | 7 +++ trustees-202406/officials-trustees-202406 | 3 +++ trustees-202406/start-trustees-202406 | 1 + trustees-202406/stop-trustees-202406 | 1 + 5 files changed, 13 insertions(+) diff --git a/trustees-202406/Votify.pm b/trustees-202406/Votify.pm new file mode 12 index 000..a6f4461 --- /dev/null +++ b/trustees-202406/Votify.pm @@ -0,0 +1 @@ +../Votify.pm \ No newline at end of file diff --git a/trustees-202406/election-details b/trustees-202406/election-details new file mode 100644 index 000..acfc586 --- /dev/null +++ b/trustees-202406/election-details @@ -0,0 +1,7 @@ +name: trustees-202406 +startDate: 2024-06-17 00:00:00 UTC +endDate: 2024-06-30 23:59:59 UTC +officials: kangie, andrewammerlaan, arthurzam +voters: https://projects.gentoo.org/elections/trustees/2024/voters-trustees-202406.txt +ballot: https://projects.gentoo.org/elections/trustees/2024/ballot-trustees-202406.txt +url: https://wiki.gentoo.org/wiki/Project:Elections/Trustees/202406 diff --git a/trustees-202406/officials-trustees-202406 b/trustees-202406/officials-trustees-202406 new file mode 100644 index 000..002c924 --- /dev/null +++ b/trustees-202406/officials-trustees-202406 @@ -0,0 +1,3 @@ +andrewammerlaan +arthurzam +kangie diff --git a/trustees-202406/start-trustees-202406 b/trustees-202406/start-trustees-202406 new file mode 100644 index 000..db95921 --- /dev/null +++ b/trustees-202406/start-trustees-202406 @@ -0,0 +1 @@ +1718582400 diff --git a/trustees-202406/stop-trustees-202406 b/trustees-202406/stop-trustees-202406 new file mode 100644 index 000..c52ac54 --- /dev/null +++ b/trustees-202406/stop-trustees-202406 @@ -0,0 +1 @@ +1719791999
[gentoo-commits] proj/elections:master commit in: council-202406/
commit: 1364d7ac987784088fd31e99b8feb7a16170d086 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Jun 2 00:13:25 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jun 2 00:13:25 2024 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=1364d7ac feat: add council-202406 Signed-off-by: Robin H. Johnson gentoo.org> council-202406/Votify.pm| 1 + council-202406/election-details | 7 +++ council-202406/officials-council-202406 | 3 +++ council-202406/start-council-202406 | 1 + council-202406/stop-council-202406 | 1 + 5 files changed, 13 insertions(+) diff --git a/council-202406/Votify.pm b/council-202406/Votify.pm new file mode 12 index 000..a6f4461 --- /dev/null +++ b/council-202406/Votify.pm @@ -0,0 +1 @@ +../Votify.pm \ No newline at end of file diff --git a/council-202406/election-details b/council-202406/election-details new file mode 100644 index 000..d1131d6 --- /dev/null +++ b/council-202406/election-details @@ -0,0 +1,7 @@ +name: council-202406 +startDate: 2024-06-17 00:00:00 UTC +endDate: 2024-06-30 23:59:59 UTC +officials: kangie, andrewammerlaan, prometheanfire +voters: https://projects.gentoo.org/elections/trustees/2024/voters-council-202406.txt +ballot: https://projects.gentoo.org/elections/trustees/2024/ballot-council-202406.txt +url: https://wiki.gentoo.org/wiki/Project:Elections/Council/202406 diff --git a/council-202406/officials-council-202406 b/council-202406/officials-council-202406 new file mode 100644 index 000..c0aabcb --- /dev/null +++ b/council-202406/officials-council-202406 @@ -0,0 +1,3 @@ +andrewammerlaan +kangie +prometheanfire diff --git a/council-202406/start-council-202406 b/council-202406/start-council-202406 new file mode 100644 index 000..db95921 --- /dev/null +++ b/council-202406/start-council-202406 @@ -0,0 +1 @@ +1718582400 diff --git a/council-202406/stop-council-202406 b/council-202406/stop-council-202406 new file mode 100644 index 000..c52ac54 --- /dev/null +++ b/council-202406/stop-council-202406 @@ -0,0 +1 @@ +1719791999
[gentoo-commits] proj/elections:master commit in: /
commit: 41002dc5a2d784967053a34de70c3ebe9578c3b4 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Jun 2 00:09:11 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jun 2 00:11:41 2024 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=41002dc5 build: make it easier to start a new election Signed-off-by: Robin H. Johnson gentoo.org> README.md | 37 +++- Votify.pm | 5 ++-- election-details.template | 8 + populate-election.sh | 74 +++ 4 files changed, 108 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 9cd9ec1..a61f1a0 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This handles all elections per the [Gentoo Elections](https://wiki.gentoo.org/wi The Condercet system is used, and most of this repository exists just to house the actual data needed to run each election, such as the start/stop time, -eligable voters, blank ballot etc. +eligible voters, blank ballot etc. Completed elections are available in the `completed/` directory. @@ -28,32 +28,43 @@ Instructions 1. Setup an election: - To create a new election, make a top-level directory with the exact name of -the election. Usually in the format of `{council,trustees}-MM`. +the election. Usually in the format of `{council,trustees}-MM`. All of the +following files should be in that directory. Let `${election_name}` be the name of the election. Any member of the elections project or infra may set this up. -- `Votify.pm`: symlink to `../Votify.pm` for tooling -- `ballot-${election_name}` - One entry per line, in alphabetical order. - The special candidate `_reopen_nominations` is valid in some elections. - The ballot order will be randomized per candidate, at voting time. - `election-details`: - key-value file with details about the election. + key-value file with details about the election, see `election-details.template` `name`: exact election name `startDate`, `endDate`: start & end time in UTC - `officials`: election officials, including the infra contact, (prohibited from being candidates) + `officials`: election officials, including the infra contact (prohibited from being candidates) `voters`: URL to list of members who may cast a ballot `ballot`: URL to sample ballot + `url`: URL to the Elections page for this specific election (optional, newer) + +Using the above file, and the `populate-election.sh` script, the remaining +files are created (pulling from URLs as needed.) + +- `Votify.pm`: symlink to `../Votify.pm` for tooling +- `ballot-${election_name}` + One entry per line, in alphabetical order. + The special candidate `_reopen_nominations` is valid in some elections. + The ballot order will be randomized per candidate, at voting time. - `officials-${election_name}`: list of election officials, including the infra contact - `start-${election_name}`: election start time, as epoch seconds. - `stop-${election_name}`: election end time, as epoch seconds. - `voters-${election_name}`: list of members who may cast a ballot -For developers, the one liner, worked example below, run on woodpecker, works. -ldapsearch -ZZ -x -D uid=neddyseagoon,ou=devs,dc=gentoo,dc=org -W '(&(gentooStatus=active)(!(gentooAccess=infra-system.group)))' uid gentoojoin -LLL | grep "^uid" | sed -e "s/^uid: //" | sort -n > voters-council-202306.txt -Some fine tuning to remove developers added to roll call after the cut off -may be required. +For developers, the one liner, worked example below, run on woodpecker, can create the `voters` file. +``` +ldapsearch -ZZ -x -w '' -S uid -LLL \ + '(&(gentooStatus=active)(!(gentooAccess=infra-system.group)))' \ + uid gentoojoin \ + |awk -F ': ' '/uid:/ {print $2}' > voters-council-202406 +``` +Some fine tuning to remove developers added to roll call after the cut off +may be required. Populate the files, commit & push to Git. At the start time, an official should verify that the ballot works. Ideally a non-infra official, who then diff --git a/Votify.pm b/Votify.pm index 49f21da..284dad2 100644 --- a/Votify.pm +++ b/Votify.pm @@ -1,6 +1,5 @@ -# $Id: Votify.pm,v 1.5 2005/05/16 23:58:09 agriffis Exp $ -# -# Copyright 2005-2016 Gentoo Foundation +#!/usr/bin/perl +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # # votify.pm: common classes for votify and countify diff --git a/election-details.template b/election-details.template new file mode 100644 index 000..0df3612 --- /dev/null +++ b/election-details.template @@ -0,0 +1,8 @@ +name: __TYPE__-__MM__ +startDate: ____-MM-DD 00:00:00 UTC +endDate: ____-MM-DD 23:59:59 UTC +officials: __OFFICIALS__ +voters: https://projects.gentoo
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15message/
commit: 4ce540cc11f80dd728d7763351458654044d9165 Author: Robin H. Johnson gentoo org> AuthorDate: Wed May 29 18:51:59 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 29 18:56:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce540cc app-misc/g15message: drop to maintainer-needed Signed-off-by: Robin H. Johnson gentoo.org> app-misc/g15message/metadata.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app-misc/g15message/metadata.xml b/app-misc/g15message/metadata.xml index 2b67979d0ccf..ef5d2548d49c 100644 --- a/app-misc/g15message/metadata.xml +++ b/app-misc/g15message/metadata.xml @@ -1,9 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - robb...@gentoo.org - + g15daemon
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15stats/
commit: 48e2617ffd4960450361a52859986e0047f855a1 Author: Robin H. Johnson gentoo org> AuthorDate: Wed May 29 18:51:59 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 29 18:56:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e2617f app-misc/g15stats: drop to maintainer-needed Signed-off-by: Robin H. Johnson gentoo.org> app-misc/g15stats/metadata.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app-misc/g15stats/metadata.xml b/app-misc/g15stats/metadata.xml index 2b67979d0ccf..ef5d2548d49c 100644 --- a/app-misc/g15stats/metadata.xml +++ b/app-misc/g15stats/metadata.xml @@ -1,9 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - robb...@gentoo.org - + g15daemon
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15/
commit: bf9f59b1846ad7735ee384bc841f8e1266c3b195 Author: Robin H. Johnson gentoo org> AuthorDate: Wed May 29 18:52:00 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 29 18:56:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9f59b1 dev-libs/libg15: drop to maintainer-needed Signed-off-by: Robin H. Johnson gentoo.org> dev-libs/libg15/metadata.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dev-libs/libg15/metadata.xml b/dev-libs/libg15/metadata.xml index 947c62c9e342..215d63df9cf8 100644 --- a/dev-libs/libg15/metadata.xml +++ b/dev-libs/libg15/metadata.xml @@ -1,9 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - robb...@gentoo.org - + g15tools
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15render/
commit: 155848521bc61f5ec1c8e8fd482b8c280190fc73 Author: Robin H. Johnson gentoo org> AuthorDate: Wed May 29 18:52:00 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 29 18:56:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15584852 dev-libs/libg15render: drop to maintainer-needed Signed-off-by: Robin H. Johnson gentoo.org> dev-libs/libg15render/metadata.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dev-libs/libg15render/metadata.xml b/dev-libs/libg15render/metadata.xml index 10e3efad11d7..00a0a854f2cd 100644 --- a/dev-libs/libg15render/metadata.xml +++ b/dev-libs/libg15render/metadata.xml @@ -1,9 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - robb...@gentoo.org - + g15tools menelkir/libg15render
[gentoo-commits] repo/gentoo:master commit in: sys-power/nut/files/, sys-power/nut/
commit: 2575dc7c05a83eeb1ae28e32d7067173861b3785 Author: Robin H. Johnson gentoo org> AuthorDate: Wed May 29 18:43:31 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 29 18:56:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2575dc7c sys-power/nut: fix systemd-analyze sandbox violation Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/932962 sys-power/nut/files/{systemd_notify.path => systemd_notify.patch} | 0 sys-power/nut/nut-2.8.2.ebuild| 5 +++-- sys-power/nut/nut-.ebuild | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys-power/nut/files/systemd_notify.path b/sys-power/nut/files/systemd_notify.patch similarity index 100% rename from sys-power/nut/files/systemd_notify.path rename to sys-power/nut/files/systemd_notify.patch diff --git a/sys-power/nut/nut-2.8.2.ebuild b/sys-power/nut/nut-2.8.2.ebuild index fbd9812f3c08..9a6702956acb 100644 --- a/sys-power/nut/nut-2.8.2.ebuild +++ b/sys-power/nut/nut-2.8.2.ebuild @@ -69,8 +69,9 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch" - "${FILESDIR}/systemd_notify.path" + "${FILESDIR}/systemd_notify.patch" ) +PATCH_NEEDS_AUTOGEN=1 pkg_pretend() { if use i2c; then @@ -102,7 +103,7 @@ pkg_setup() { src_prepare() { default - if [[ ${PV} == * ]] ; then + if [[ ${PV} == * ]] || [[ ${PATCH_NEEDS_AUTOGEN} == 1 ]] ; then ./autogen.sh || die fi diff --git a/sys-power/nut/nut-.ebuild b/sys-power/nut/nut-.ebuild index fbd9812f3c08..9a6702956acb 100644 --- a/sys-power/nut/nut-.ebuild +++ b/sys-power/nut/nut-.ebuild @@ -69,8 +69,9 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch" - "${FILESDIR}/systemd_notify.path" + "${FILESDIR}/systemd_notify.patch" ) +PATCH_NEEDS_AUTOGEN=1 pkg_pretend() { if use i2c; then @@ -102,7 +103,7 @@ pkg_setup() { src_prepare() { default - if [[ ${PV} == * ]] ; then + if [[ ${PV} == * ]] || [[ ${PATCH_NEEDS_AUTOGEN} == 1 ]] ; then ./autogen.sh || die fi
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
commit: 237ed657cb33ee84873ee60532572994d305a54b Author: Robin H. Johnson gentoo org> AuthorDate: Wed May 29 18:51:59 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 29 18:56:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=237ed657 app-misc/g15daemon: drop to maintainer-needed Signed-off-by: Robin H. Johnson gentoo.org> app-misc/g15daemon/metadata.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app-misc/g15daemon/metadata.xml b/app-misc/g15daemon/metadata.xml index 2b67979d0ccf..ef5d2548d49c 100644 --- a/app-misc/g15daemon/metadata.xml +++ b/app-misc/g15daemon/metadata.xml @@ -1,9 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - robb...@gentoo.org - + g15daemon
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15macro/
commit: 8d1167d256f1efb80c105494b4caa506b7daa89b Author: Robin H. Johnson gentoo org> AuthorDate: Wed May 29 18:51:59 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 29 18:56:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1167d2 app-misc/g15macro: drop to maintainer-needed Signed-off-by: Robin H. Johnson gentoo.org> app-misc/g15macro/metadata.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app-misc/g15macro/metadata.xml b/app-misc/g15macro/metadata.xml index 2b67979d0ccf..ef5d2548d49c 100644 --- a/app-misc/g15macro/metadata.xml +++ b/app-misc/g15macro/metadata.xml @@ -1,9 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - robb...@gentoo.org - + g15daemon
[gentoo-commits] repo/gentoo:master commit in: app-misc/g15composer/
commit: 07b75e4de56a1bf5d56be0ac3964bdcec7539c92 Author: Robin H. Johnson gentoo org> AuthorDate: Wed May 29 18:51:58 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 29 18:56:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b75e4d app-misc/g15composer: drop to maintainer-needed Signed-off-by: Robin H. Johnson gentoo.org> app-misc/g15composer/metadata.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app-misc/g15composer/metadata.xml b/app-misc/g15composer/metadata.xml index 947c62c9e342..215d63df9cf8 100644 --- a/app-misc/g15composer/metadata.xml +++ b/app-misc/g15composer/metadata.xml @@ -1,9 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - robb...@gentoo.org - + g15tools
[gentoo-commits] repo/gentoo:master commit in: sys-process/parallel/
commit: dd16e702c386875ce9a634d2aa4e4efadc4627c8 Author: Robin H. Johnson gentoo org> AuthorDate: Wed May 29 18:26:08 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 29 18:26:46 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd16e702 sys-process/parallel: bump to 20240522 Signed-off-by: Robin H. Johnson gentoo.org> sys-process/parallel/Manifest | 2 ++ sys-process/parallel/parallel-20240522.ebuild | 44 +++ 2 files changed, 46 insertions(+) diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest index ba30f9b1f36a..20db08cc4997 100644 --- a/sys-process/parallel/Manifest +++ b/sys-process/parallel/Manifest @@ -1,2 +1,4 @@ DIST parallel-20240222.tar.bz2 2570609 BLAKE2B 79a2b2810601b2613555ef76124b250ed0b614da30cfe250c0c4cfa578948bfaabce93cda0dcfff3d43cdf520b12f13b5569347569d95dbd3574b5e4aac411e2 SHA512 afbee9496e48ba4089b7f5ce5115d02d4e609d8f48ee2f715bbef62bda8b429da65d1457880d707d1f43482e751c75f5ede52489abed29ef8c110c55132fc547 DIST parallel-20240222.tar.bz2.sig 2080 BLAKE2B 982d4ea8c513f972905fdae6adebc3fb5756898f6fcd65563c87b3484bffec4a0ef3660265b2df343b4437c6930918101c886014c3332e30c9bac03031ccd471 SHA512 527bfc24ef29f60894538890d16bbff53c1df44b8d1a51750ec2f19207bbe66bddd19f6c4fb2e4778ed4f0166405c87769ee2681490b3ffa8cc627d8c33da810 +DIST parallel-20240522.tar.bz2 2571391 BLAKE2B 50a6b41959ac06d92dc7f10492a7c758504bfb2686d2cfb8c6092f8e6a272abaaa6e40d209b48e8dcfef42460fdffd31d7e0d789591b347bcaa5ca22a5ac58a9 SHA512 22156c2ba722696e8f85efcc5996e6811523c2545d8a3daf328801f09b1edb9665172ddce2cf738d1c6af87ac9da0268ec1e4b07178f81c4bea27f3903d78bfd +DIST parallel-20240522.tar.bz2.sig 2080 BLAKE2B 6b74a8487f5cb2400d0e81743007983e3d9ed7449ff0f05d1ca62dcc718dc8a843de414805c68776e2705264f59076ac756d3058c67ff666f11d4d3c4fdbf6dc SHA512 edd6624de644d751f44f51bc9b1b502032e9ee9d6085ad81a6cf7288d045ea69295908fc2d3c3da2b3bd0eeef922c5a27d746b9688ea700d4af7b1fb8893f62c diff --git a/sys-process/parallel/parallel-20240522.ebuild b/sys-process/parallel/parallel-20240522.ebuild new file mode 100644 index ..fd04358e548a --- /dev/null +++ b/sys-process/parallel/parallel-20240522.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/oletange.asc +inherit verify-sig + +DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines" +HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/"; +SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND=" + dev-lang/perl + dev-perl/Devel-Size + dev-perl/Text-CSV + virtual/perl-Data-Dumper + virtual/perl-File-Temp + virtual/perl-IO +" +DEPEND="${RDEPEND}" +BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 )" + +src_configure() { + # bug #908214 + unset PARALLEL_HOME + + econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html +} + +src_compile() { + # Silence a warning where it tries to use pod2pdf; force it to fallback + # to pre-generated PDF. + mkdir "${T}"/fake || die + ln -s "${BROOT}"/bin/false "${T}"/fake/pod2pdf || die + export PATH="${T}/fake:${PATH}" + + default +}
[gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
commit: fde10960ff6053e42cd0b2e882f9e3aa6ba3715b Author: Robin H. Johnson gentoo org> AuthorDate: Tue May 28 15:58:48 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 29 18:26:31 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde10960 sys-power/nut: fix newdoc bug introduced in d20e5788358b90edc2545386d0704981699f539c Closes: https://bugs.gentoo.org/show_bug.cgi?id=932868 Fixes: d20e5788358b90edc2545386d0704981699f539c Signed-off-by: Robin H. Johnson gentoo.org> sys-power/nut/nut-2.8.2.ebuild | 4 ++-- sys-power/nut/nut-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-power/nut/nut-2.8.2.ebuild b/sys-power/nut/nut-2.8.2.ebuild index e59050b0c4e5..fbd9812f3c08 100644 --- a/sys-power/nut/nut-2.8.2.ebuild +++ b/sys-power/nut/nut-2.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -190,7 +190,7 @@ src_install() { einstalldocs if use doc; then - newdoc lib/README.adoc + newdoc lib/README.adoc README.lib.adoc dodoc docs/*.txt docinto cables dodoc docs/cables/* diff --git a/sys-power/nut/nut-.ebuild b/sys-power/nut/nut-.ebuild index e59050b0c4e5..fbd9812f3c08 100644 --- a/sys-power/nut/nut-.ebuild +++ b/sys-power/nut/nut-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -190,7 +190,7 @@ src_install() { einstalldocs if use doc; then - newdoc lib/README.adoc + newdoc lib/README.adoc README.lib.adoc dodoc docs/*.txt docinto cables dodoc docs/cables/*
[gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
commit: 3f28b2a2c28b02f270a2d682fdfabfdee9cff0cd Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 27 21:06:02 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 27 21:08:11 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f28b2a2 sys-power/nut: bump Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/931652 sys-power/nut/Manifest | 1 + sys-power/nut/{nut-.ebuild => nut-2.8.2.ebuild} | 2 +- sys-power/nut/nut-.ebuild | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest index 20470d95ae84..feb2a82d2604 100644 --- a/sys-power/nut/Manifest +++ b/sys-power/nut/Manifest @@ -1,2 +1,3 @@ DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a DIST nut-2.8.0.tar.gz 3287640 BLAKE2B 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94 SHA512 3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577 +DIST nut-2.8.2.tar.gz 5599935 BLAKE2B 87187293d8acda72c2d807d6f41f2601a318540f63a0ea93782b115402c6b43a0b61ecc710fd6de126d25e59dd4e03681f2b859a87549e9d5f7617ac7b2dad8c SHA512 b6f8f22318e4a4fcb8073a63132b1cb083952c665191b82a7d6765a61b859575a4b0c2ba84ed17cfb8c88d34179876d64520dd2f75f02fe8707b406da2c0821c diff --git a/sys-power/nut/nut-.ebuild b/sys-power/nut/nut-2.8.2.ebuild similarity index 98% copy from sys-power/nut/nut-.ebuild copy to sys-power/nut/nut-2.8.2.ebuild index 22a0e6bc597a..e59050b0c4e5 100644 --- a/sys-power/nut/nut-.ebuild +++ b/sys-power/nut/nut-2.8.2.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then inherit git-r3 else SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"; - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64 fi S="${WORKDIR}/${MY_P}" diff --git a/sys-power/nut/nut-.ebuild b/sys-power/nut/nut-.ebuild index 22a0e6bc597a..e59050b0c4e5 100644 --- a/sys-power/nut/nut-.ebuild +++ b/sys-power/nut/nut-.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then inherit git-r3 else SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"; - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64 fi S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: sys-power/nut/
commit: 02546cec0e29db9953cf11a2ef554f2e504f29fa Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 27 21:07:41 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 27 21:08:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02546cec sys-power/nut: cleanup Signed-off-by: Robin H. Johnson gentoo.org> sys-power/nut/Manifest| 1 - sys-power/nut/metadata.xml| 51 --- sys-power/nut/nut-2.7.4-r8.ebuild | 274 -- sys-power/nut/nut-2.8.0-r2.ebuild | 221 -- 4 files changed, 547 deletions(-) diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest index feb2a82d2604..3a2d7103c03c 100644 --- a/sys-power/nut/Manifest +++ b/sys-power/nut/Manifest @@ -1,3 +1,2 @@ -DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a DIST nut-2.8.0.tar.gz 3287640 BLAKE2B 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94 SHA512 3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577 DIST nut-2.8.2.tar.gz 5599935 BLAKE2B 87187293d8acda72c2d807d6f41f2601a318540f63a0ea93782b115402c6b43a0b61ecc710fd6de126d25e59dd4e03681f2b859a87549e9d5f7617ac7b2dad8c SHA512 b6f8f22318e4a4fcb8073a63132b1cb083952c665191b82a7d6765a61b859575a4b0c2ba84ed17cfb8c88d34179876d64520dd2f75f02fe8707b406da2c0821c diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml index 4579366e6071..35a29398e316 100644 --- a/sys-power/nut/metadata.xml +++ b/sys-power/nut/metadata.xml @@ -26,57 +26,6 @@ Includes all UPS drivers that use SNMP. Includes all UPS drivers that use USB. Includes all UPS drivers that use XML. - Driver for Eltek UPS models with AL175 alarm module - Driver for UPSes supporting the serial BCM/XCP protocol - Driver for Belkin serial UPS equipment - Driver for Belkin "Universal UPS" and compatible - Driver for Best Power Fortress/Ferrups - Driver for old Best Fortress UPS equipment - Driver for Best Power Micro-Ferrups - Driver for Best Power / SOLA (Phoenixtec protocol) UPS equipment - Driver for multi-purpose UPS emulation - Driver for ETA UPS equipment - Driver for Ever UPS models - Driver for Gamatronic UPS equipment - Driver for contact-closure UPS equipment - Driver for ISBMEX UPS equipment - Driver for Liebert contact-closure UPS equipment - Driver for Liebert UPS, using the ESP-II serial protocol - Driver for Masterguard UPS equipment - Driver for Meta System UPS equipment - Driver for MGE UPS SYSTEMS UTalk protocol equipment - Driver for Microdowell Enterprise UPS series - Driver for SHUT Protocol UPS equipment - Driver for SHUT Protocol UPS equipment (older implementation) - Driver for Oneac UPS equipment - Driver for Opti-UPS (Viewsonic) UPS and Zinto D (ONLINE-USV) equipment - UPS driver for serial Powercom/Trust/Advice UPS equipment - Driver for Brazilian Microsol RHINO UPS equipment - Driver for SafeNet compatible UPS equipment - Driver for Brazilian Microsol SOLIS UPS equipment - Driver for Tripp-Lite SmartPro UPS equipment - Driver for Tripp-Lite SmartOnline (SU) UPS equipment - Driver for UPScode II compatible UPS equipment - Driver for IMV/Victron UPS unit Match, Match Lite, NetUps - Driver for PowerPanel Plus compatible UPS equipment - Driver for Megatec/Q1 protocol serial based UPS equipment - Fake driver to clone outlets for device grouping - Fake driver to clone outlets for device grouping - driver for the IVT Solar Controller Device - Driver for American Power Conversion Smart Protocol UPS equipment - Driver for American Power Conversion Smart Protocol UPS equipment - Driver for apcupsd client access - Driver for Riello UPS Protocol UPS equipment - Driver for Q* protocol serial and USB based UPS equipment - Driver for USB/HID UPS equipment - Experimental driver for UPSes supporting the BCM/XCP protocol over USB - Driver for ol
[gentoo-commits] repo/gentoo:master commit in: app-metrics/smartctl_exporter/
commit: b40a0f07d38fe6ddd1c58cc75e2ab45608c4a74e Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 27 05:50:38 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 27 05:50:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b40a0f07 app-metrics/smartctl_exporter: cleanup old versions Signed-off-by: Robin H. Johnson gentoo.org> app-metrics/smartctl_exporter/Manifest | 2 - .../smartctl_exporter-0.11.0.ebuild| 51 --- .../smartctl_exporter-0.12.0.ebuild| 57 -- 3 files changed, 110 deletions(-) diff --git a/app-metrics/smartctl_exporter/Manifest b/app-metrics/smartctl_exporter/Manifest index 2a229d2609cb..92c3f95cfa2d 100644 --- a/app-metrics/smartctl_exporter/Manifest +++ b/app-metrics/smartctl_exporter/Manifest @@ -1,5 +1,3 @@ -DIST smartctl_exporter-0.11.0-vendor.tar.xz 1348836 BLAKE2B 06999c2df7891d6579a227dc5eab44240f923f3466ce1da8443bc40afcb7d9c493f94d50a083ea26e03969b89c9cff4e977f9cffc8529dac5c323212c139dd9e SHA512 c54bf342e56db7086a3844d96f910a18b9d0e19a434b554421e9c70b02fdf3b2307da6662a0e02de93adedf948bbbcb7225659b26273e6106cbf73aa3dbd -DIST smartctl_exporter-0.11.0.tar.gz 29097 BLAKE2B 7e3d85588a83380f8d579a918677d9910ba1922212af65b1918a379315e9f2321f617c5d884fd72086019ddac353817da5d1ec71a8a8b0ecb3edb24f66dd75fa SHA512 2c86d051d17c55e3122130ad4733c5911310698a89d8782a61f3b5541cb7aa689994338125eaa5ee41fdcddbdd8316a6736c734ff5dee6fe0d6c0a2b131fff66 DIST smartctl_exporter-0.12.0-d33b5a391f4a18b3d9c0a194e57cdd3491130099.patch 4997 BLAKE2B cf03225eeaea9553e6e0686450efc574c3c0b9b67cce0866a514cdd19ef6d91f6c5e4253fad9ac10a99bc92c6057ca27cce3bde1ebe3942e2fe0fb8070c6e199 SHA512 2ca0ad57fb4cb92a5db6cffa650a7045eb5c309e3cecf227c971262617d94e4a32cdc1d9465a7030d9b24d243f1a717d92d3b327dc494fb18e57d9da67b59002 DIST smartctl_exporter-0.12.0-vendor.tar.xz 1400804 BLAKE2B 5c4ba0440860c86d3a3bd84308c97a6fe1eaf231776ed64840f6ebd3cad533bab5f8b97ee9f4c3d573b08442fc66f565c8b83a7f70fea889cf2e9e1337ce24cc SHA512 28e235eb6e560042ae0783a1fb1276ff07dff5e838f1f2d6a93886f0fdea85151b1c1c87c8476d42524f7e563a58ae30f354fa1138a93fcbe0f39ff7bcba0b3d DIST smartctl_exporter-0.12.0.tar.gz 91406 BLAKE2B 9ab0fa3e4dcee1e21a566cd9677b99f579f60e761d40d9ab1dd75380bbff9c189d9895ee2e914d1b6bdeee0c5b6d185c71ae62f4ce7585b3954192091cc96e25 SHA512 8f2cc973fd967c9ab737dcaa7456f019cb574ac3297bd5d15559167cde51f8076bcb48c7befb7efb869e056c1c5e404f4bb2774e8fe020736354ede4ae3e77f3 diff --git a/app-metrics/smartctl_exporter/smartctl_exporter-0.11.0.ebuild b/app-metrics/smartctl_exporter/smartctl_exporter-0.11.0.ebuild deleted file mode 100644 index 93fd041d43a9.. --- a/app-metrics/smartctl_exporter/smartctl_exporter-0.11.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Export smartctl statistics to prometheus" -HOMEPAGE="https://github.com/prometheus-community/smartctl_exporter"; -# Upstream LICENSE file is wrong see https://github.com/prometheus-community/smartctl_exporter/pull/113 -LICENSE="Apache-2.0" -SLOT="0" -BDEPEND="dev-util/promu" -DEPEND="dev-lang/go" -RDEPEND="sys-apps/smartmontools" -KEYWORDS="~amd64 ~x86" - -# uncomment the first setting of MY_PV for a normal release -# MY_PV="v${PV/_rc/-rc.}" -# set MY_PV to the full commit hash for a snapshot release -MY_PV_HASH= -: ${MY_PV_HASH_FOR_VENDOR:=${MY_PV_HASH}} -if [[ -n "${MY_PV_HASH}" ]]; then - MY_PV=${MY_PV_HASH} - SMARTCTL_EXPORTER_COMMIT=${MY_PV_HASH:0:8} - SRC_URI_UPSTREAM="${HOMEPAGE}/archive/${MY_PV}.tar.gz" -else - MY_PV=$PV - SMARTCTL_EXPORTER_COMMIT= - SRC_URI_UPSTREAM="${HOMEPAGE}/archive/refs/tags/v${PV}.tar.gz" -fi -MY_P=${PN}-${MY_PV} -SRC_URI_VENDOR="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}-vendor.tar.xz"; -SRC_URI=" - ${SRC_URI_UPSTREAM} -> ${P}.tar.gz - ${SRC_URI_VENDOR} - " - -src_prepare() { - default - if [[ -n $SMARTCTL_EXPORTER_COMMIT ]]; then - sed -i -e "s/{{.Revision}}/${SMARTCTL_EXPORTER_COMMIT}/" .promu.yml || die - fi -} - -src_compile() { - emake build PROMU='/usr/bin/promu' -} - -src_install() { - dodoc *.md - dobin ${PN} -} diff --git a/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0.ebuild b/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0.ebuild deleted file mode 100644 index 7f438ca5ce66.. --- a/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module systemd - -DESCRIPTION=&quo
[gentoo-commits] repo/gentoo:master commit in: app-metrics/smartctl_exporter/
commit: 54f790381e1ae4fb2d4d892980b8aa05f471ae86 Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 27 05:43:25 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 27 05:50:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f79038 app-metrics/smartctl_exporter: add merged upstream fix for nvme Signed-off-by: Robin H. Johnson gentoo.org> app-metrics/smartctl_exporter/Manifest | 1 + .../smartctl_exporter-0.12.0-r1.ebuild | 65 ++ 2 files changed, 66 insertions(+) diff --git a/app-metrics/smartctl_exporter/Manifest b/app-metrics/smartctl_exporter/Manifest index cbc7769c0037..2a229d2609cb 100644 --- a/app-metrics/smartctl_exporter/Manifest +++ b/app-metrics/smartctl_exporter/Manifest @@ -1,4 +1,5 @@ DIST smartctl_exporter-0.11.0-vendor.tar.xz 1348836 BLAKE2B 06999c2df7891d6579a227dc5eab44240f923f3466ce1da8443bc40afcb7d9c493f94d50a083ea26e03969b89c9cff4e977f9cffc8529dac5c323212c139dd9e SHA512 c54bf342e56db7086a3844d96f910a18b9d0e19a434b554421e9c70b02fdf3b2307da6662a0e02de93adedf948bbbcb7225659b26273e6106cbf73aa3dbd DIST smartctl_exporter-0.11.0.tar.gz 29097 BLAKE2B 7e3d85588a83380f8d579a918677d9910ba1922212af65b1918a379315e9f2321f617c5d884fd72086019ddac353817da5d1ec71a8a8b0ecb3edb24f66dd75fa SHA512 2c86d051d17c55e3122130ad4733c5911310698a89d8782a61f3b5541cb7aa689994338125eaa5ee41fdcddbdd8316a6736c734ff5dee6fe0d6c0a2b131fff66 +DIST smartctl_exporter-0.12.0-d33b5a391f4a18b3d9c0a194e57cdd3491130099.patch 4997 BLAKE2B cf03225eeaea9553e6e0686450efc574c3c0b9b67cce0866a514cdd19ef6d91f6c5e4253fad9ac10a99bc92c6057ca27cce3bde1ebe3942e2fe0fb8070c6e199 SHA512 2ca0ad57fb4cb92a5db6cffa650a7045eb5c309e3cecf227c971262617d94e4a32cdc1d9465a7030d9b24d243f1a717d92d3b327dc494fb18e57d9da67b59002 DIST smartctl_exporter-0.12.0-vendor.tar.xz 1400804 BLAKE2B 5c4ba0440860c86d3a3bd84308c97a6fe1eaf231776ed64840f6ebd3cad533bab5f8b97ee9f4c3d573b08442fc66f565c8b83a7f70fea889cf2e9e1337ce24cc SHA512 28e235eb6e560042ae0783a1fb1276ff07dff5e838f1f2d6a93886f0fdea85151b1c1c87c8476d42524f7e563a58ae30f354fa1138a93fcbe0f39ff7bcba0b3d DIST smartctl_exporter-0.12.0.tar.gz 91406 BLAKE2B 9ab0fa3e4dcee1e21a566cd9677b99f579f60e761d40d9ab1dd75380bbff9c189d9895ee2e914d1b6bdeee0c5b6d185c71ae62f4ce7585b3954192091cc96e25 SHA512 8f2cc973fd967c9ab737dcaa7456f019cb574ac3297bd5d15559167cde51f8076bcb48c7befb7efb869e056c1c5e404f4bb2774e8fe020736354ede4ae3e77f3 diff --git a/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0-r1.ebuild b/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0-r1.ebuild new file mode 100644 index ..a538f9f1c89b --- /dev/null +++ b/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module systemd + +DESCRIPTION="Export smartctl statistics to prometheus" +HOMEPAGE="https://github.com/prometheus-community/smartctl_exporter"; + +# uncomment the first setting of MY_PV for a normal release +# MY_PV="v${PV/_rc/-rc.}" +# set MY_PV to the full commit hash for a snapshot release +MY_PV_HASH= +: ${MY_PV_HASH_FOR_VENDOR:=${MY_PV_HASH}} +if [[ -n "${MY_PV_HASH}" ]]; then + MY_PV=${MY_PV_HASH} + SMARTCTL_EXPORTER_COMMIT=${MY_PV_HASH:0:8} + SRC_URI_UPSTREAM="${HOMEPAGE}/archive/${MY_PV}.tar.gz" +else + MY_PV=$PV + SMARTCTL_EXPORTER_COMMIT= + SRC_URI_UPSTREAM="${HOMEPAGE}/archive/refs/tags/v${PV}.tar.gz" +fi +MY_P=${PN}-${MY_PV} +SRC_URI_VENDOR="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}-vendor.tar.xz"; +UPSTREAM_PATCHES=( + 0.12.0:d33b5a391f4a18b3d9c0a194e57cdd3491130099 +) +SRC_URI=" + ${SRC_URI_UPSTREAM} -> ${P}.tar.gz + ${SRC_URI_VENDOR} + " +PATCHES=() +for p in $UPSTREAM_PATCHES; do + SRC_URI+=" https://github.com/prometheus-community/smartctl_exporter/commit/${p/*:}.patch -> ${PN}-${p/:/-}.patch" + PATCHES+=( "${DISTDIR}/${PN}-${p/:/-}.patch" ) +done + +# Upstream LICENSE file is wrong see https://github.com/prometheus-community/smartctl_exporter/pull/113 +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +BDEPEND="dev-util/promu" +DEPEND="dev-lang/go" +RDEPEND="sys-apps/smartmontools" + +src_prepare() { + default + if [[ -n $SMARTCTL_EXPORTER_COMMIT ]]; then + sed -i -e "s/{{.Revision}}/${SMARTCTL_EXPORTER_COMMIT}/" .promu.yml || die + fi +} + +src_compile() { + emake build PROMU='/usr/bin/promu' +} + +src_install() { + dodoc *.md + dobin ${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + systemd_dounit "${FILESDIR}/${PN}.service" + +}
[gentoo-commits] repo/gentoo:master commit in: app-metrics/smartctl_exporter/, app-metrics/smartctl_exporter/files/
commit: d72d66d2986700cc377c197d4cf19e91d266f597 Author: Robin H. Johnson gentoo org> AuthorDate: Sat May 25 17:23:06 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat May 25 17:26:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72d66d2 app-metrics/smartctl_exporter: bump Signed-off-by: Robin H. Johnson gentoo.org> app-metrics/smartctl_exporter/Manifest | 2 + .../files/smartctl_exporter.confd | 2 + .../files/smartctl_exporter.initd | 23 + .../files/smartctl_exporter.service| 22 + .../smartctl_exporter-0.12.0.ebuild| 57 ++ 5 files changed, 106 insertions(+) diff --git a/app-metrics/smartctl_exporter/Manifest b/app-metrics/smartctl_exporter/Manifest index 5e8be5f843f2..cbc7769c0037 100644 --- a/app-metrics/smartctl_exporter/Manifest +++ b/app-metrics/smartctl_exporter/Manifest @@ -1,2 +1,4 @@ DIST smartctl_exporter-0.11.0-vendor.tar.xz 1348836 BLAKE2B 06999c2df7891d6579a227dc5eab44240f923f3466ce1da8443bc40afcb7d9c493f94d50a083ea26e03969b89c9cff4e977f9cffc8529dac5c323212c139dd9e SHA512 c54bf342e56db7086a3844d96f910a18b9d0e19a434b554421e9c70b02fdf3b2307da6662a0e02de93adedf948bbbcb7225659b26273e6106cbf73aa3dbd DIST smartctl_exporter-0.11.0.tar.gz 29097 BLAKE2B 7e3d85588a83380f8d579a918677d9910ba1922212af65b1918a379315e9f2321f617c5d884fd72086019ddac353817da5d1ec71a8a8b0ecb3edb24f66dd75fa SHA512 2c86d051d17c55e3122130ad4733c5911310698a89d8782a61f3b5541cb7aa689994338125eaa5ee41fdcddbdd8316a6736c734ff5dee6fe0d6c0a2b131fff66 +DIST smartctl_exporter-0.12.0-vendor.tar.xz 1400804 BLAKE2B 5c4ba0440860c86d3a3bd84308c97a6fe1eaf231776ed64840f6ebd3cad533bab5f8b97ee9f4c3d573b08442fc66f565c8b83a7f70fea889cf2e9e1337ce24cc SHA512 28e235eb6e560042ae0783a1fb1276ff07dff5e838f1f2d6a93886f0fdea85151b1c1c87c8476d42524f7e563a58ae30f354fa1138a93fcbe0f39ff7bcba0b3d +DIST smartctl_exporter-0.12.0.tar.gz 91406 BLAKE2B 9ab0fa3e4dcee1e21a566cd9677b99f579f60e761d40d9ab1dd75380bbff9c189d9895ee2e914d1b6bdeee0c5b6d185c71ae62f4ce7585b3954192091cc96e25 SHA512 8f2cc973fd967c9ab737dcaa7456f019cb574ac3297bd5d15559167cde51f8076bcb48c7befb7efb869e056c1c5e404f4bb2774e8fe020736354ede4ae3e77f3 diff --git a/app-metrics/smartctl_exporter/files/smartctl_exporter.confd b/app-metrics/smartctl_exporter/files/smartctl_exporter.confd new file mode 100644 index ..5a8a1d649a60 --- /dev/null +++ b/app-metrics/smartctl_exporter/files/smartctl_exporter.confd @@ -0,0 +1,2 @@ +# arguments for smartctl exporter +command_args="" diff --git a/app-metrics/smartctl_exporter/files/smartctl_exporter.initd b/app-metrics/smartctl_exporter/files/smartctl_exporter.initd new file mode 100644 index ..b9e18a61449a --- /dev/null +++ b/app-metrics/smartctl_exporter/files/smartctl_exporter.initd @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 2016-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="smartctl metrics exporter" +pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} +user=root +group=root + +command="/usr/bin/smartctl_exporter" +command_args="${command_args}" +command_background="true" +command_user="${user}:${group}" +output_log="/var/log/smartctl_exporter/${RC_SVCNAME}.log" +error_log="/var/log/smartctl_exporter/${RC_SVCNAME}.log" + +depend() { + after net +} + +start_pre() { + checkpath -q -d -m 0755 -o ${user}:${group} /var/log/smartctl_exporter +} diff --git a/app-metrics/smartctl_exporter/files/smartctl_exporter.service b/app-metrics/smartctl_exporter/files/smartctl_exporter.service new file mode 100644 index ..c21aa5af5283 --- /dev/null +++ b/app-metrics/smartctl_exporter/files/smartctl_exporter.service @@ -0,0 +1,22 @@ +[Unit] +Description=smartctl exporter +Documentation=https://github.com/prometheus-community/smartctl_exporter +After=network-online.target + +[Service] +# Security improvements required in future, but needs care; ideally +# smartctl_exporter runs minimal privilege, but can invoke smartctl via sudo to +# touch disks. +# https://github.com/prometheus-community/smartctl_exporter/issues/146 +User=root +Group=root +Restart=on-failure +Type=exec +# TODO: find a good way to add args here +ExecStart=/usr/sbin/smartctl_exporter +ExecReload=/usr/bin/kill -HUP $MAINPID +TimeoutStopSec=20s +SendSIGKILL=no + +[Install] +WantedBy=multi-user.target diff --git a/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0.ebuild b/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0.ebuild new file mode 100644 index ..7f438ca5ce66 --- /dev/null +++ b/app-metrics/smartctl_exporter/smartctl_exporter-0.12.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +i
[gentoo-commits] proj/elections:master commit in: /
commit: f07952719a64905acf2face8ed2989a19edbcd9c Author: Robin H. Johnson gentoo org> AuthorDate: Sat May 25 17:02:48 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat May 25 17:02:48 2024 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=f0795271 README: improve details about infra steps Signed-off-by: Robin H. Johnson gentoo.org> README.md | 25 +++-- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 856b1f9..9cd9ec1 100644 --- a/README.md +++ b/README.md @@ -69,12 +69,14 @@ The URLs may link to either of two repos for the data: --- The regular way is to login to `dev.gentoo.org` and run `votify`. -2.2. Handle special ballots: --- +2.2. Handle special ballots (optional) +-- +This step requires an infra contact. + Some elections may have voters who cast ballots by irregular means: they should be accepted only via GPG-signed email to the election officials, who should agree that the signature is valid and matches a key that was already on -a list prior to the election. The infra contact should place the ballot in +a list prior to the election. The infra contact must place the ballot in `dev.gentoo.org:/home/$membername/.ballot-${election_name}-submitted` The elections mechanisms make no provision for truely secret ballot: election @@ -90,10 +92,15 @@ Trustees. Just wait. `election-stats-count` runs every 30 minutes by cronjob, and prints status files into the home directories of election officials: `voter-turnout-${election_name}`. + +4. Close of election: +- +This is the only step where the infra contact is absolutely required. + 4.a. Automated "Close of election" -- -Before the end of the election, run the script to schedule automated -`countify --collect`: +Before the end of the election, the infra contact must run the script to schedule +automated `countify --collect`: ``` $ sudo su # cd /etc/elections @@ -106,9 +113,15 @@ The job can be verified with: # at -c $JOB_ID ``` +If the election closing time is modified, the old job MUST be deleted before +the automated collection executes. +``` +# atq +# atrm $JOB_ID +``` + 4.b. Manual "Close of election" --- -This is the only step where the infra contact is absolutely required. The infra contact must run `countify --collect ${election_name}` as root, which will write the master ballot & confirmation stub file to all officials: ```
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: ea651959e3713ed09ebdec3c7ef274ca0e8350a3 Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 20 18:47:16 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 20 18:47:16 2024 + URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=ea651959 keyrings.inc.bash: avoid the SHA1 warning Signed-off-by: Robin H. Johnson gentoo.org> keyrings.inc.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyrings.inc.bash b/keyrings.inc.bash index 7c63e0d..6fe0dca 100644 --- a/keyrings.inc.bash +++ b/keyrings.inc.bash @@ -103,7 +103,8 @@ export_keys() { # 'gpg --export' returns zero if there was no error with the command itself # If there are no keys in the export set, then it ALSO does not write the destination file # and prints 'gpg: WARNING: nothing exported' to stderr - if ! gpg "${GPG_EXPORT_OPTS[@]}" --output "$TMP" --export "${@}"; then + # --quiet is needed to avoid "Note: third-party key signatures using the SHA1 algorithm are rejected" "(use option "--allow-weak-key-signatures" to override)" + if ! gpg --quiet "${GPG_EXPORT_OPTS[@]}" --output "$TMP" --export "${@}"; then echo "Unable to export keys to $DST: GPG returned non-zero" exit 1 fi
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: 38197eb2a9592c4de4d490fe1c6d164845773ca5 Author: Robin H. Johnson gentoo org> AuthorDate: Sun May 19 17:28:21 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun May 19 17:28:21 2024 + URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=38197eb2 keyrings.inc.bash: support export options Signed-off-by: Robin H. Johnson gentoo.org> keyrings.inc.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyrings.inc.bash b/keyrings.inc.bash index d2668e0..7c63e0d 100644 --- a/keyrings.inc.bash +++ b/keyrings.inc.bash @@ -103,7 +103,7 @@ export_keys() { # 'gpg --export' returns zero if there was no error with the command itself # If there are no keys in the export set, then it ALSO does not write the destination file # and prints 'gpg: WARNING: nothing exported' to stderr - if ! gpg --output "$TMP" --export "${@}"; then + if ! gpg "${GPG_EXPORT_OPTS[@]}" --output "$TMP" --export "${@}"; then echo "Unable to export keys to $DST: GPG returned non-zero" exit 1 fi
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: 3a1755377cb4beaa68914844e61b9a2566a6ee12 Author: Robin H. Johnson gentoo org> AuthorDate: Sun May 19 17:28:40 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun May 19 17:28:40 2024 + URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=3a175537 keyrings-export.bash: test export-clean variants in new files Signed-off-by: Robin H. Johnson gentoo.org> keyrings-export.bash | 42 ++ 1 file changed, 42 insertions(+) diff --git a/keyrings-export.bash b/keyrings-export.bash index 56e4e51..42f0b08 100755 --- a/keyrings-export.bash +++ b/keyrings-export.bash @@ -56,6 +56,48 @@ export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \ "${RETIRED_DEVS[@]}" \ && KEYRINGS+=( all-devs ) +# TEMPORARY: +# Verify export-clean vs stock export options. +export GPG_EXPORT_OPTS=( --export-options export-clean ) + +export_keys "${OUTPUT_DIR}"/keys/service-keys.export-clean.gpg \ + "${SYSTEM_KEYS[@]}" \ +&& KEYRINGS+=( service-keys.export-clean ) + +export_keys "${OUTPUT_DIR}"/keys/infra-service-keys.export-clean.gpg \ +"${INFRA_SYSTEM_KEYS[@]}" \ +&& KEYRINGS+=( infra-service-keys.export-clean ) + +export_keys "${OUTPUT_DIR}"/keys/committing-devs.export-clean.gpg \ + "${COMMITTING_DEVS[@]}" \ +&& KEYRINGS+=( committing-devs.export-clean ) + +export_keys "${OUTPUT_DIR}"/keys/active-devs.export-clean.gpg \ + "${COMMITTING_DEVS[@]}" \ + "${NONCOMMITTING_DEVS[@]}" \ +&& KEYRINGS+=( active-devs.export-clean ) + +export_keys "${OUTPUT_DIR}"/keys/infra-devs.export-clean.gpg \ + "${INFRA_DEVS[@]}" \ +&& KEYRINGS+=( infra-devs.export-clean ) + +export_keys "${OUTPUT_DIR}"/keys/retired-devs.export-clean.gpg \ + "${RETIRED_DEVS[@]}" \ +&& KEYRINGS+=( retired-devs.export-clean ) + +# Everybody together now +export_keys "${OUTPUT_DIR}"/keys/all-devs.export-clean.gpg \ + "${SYSTEM_KEYS[@]}" \ + "${INFRA_SYSTEM_KEYS[@]}" \ + "${COMMITTING_DEVS[@]}" \ + "${NONCOMMITTING_DEVS[@]}" \ + "${INFRA_DEVS[@]}" \ + "${RETIRED_DEVS[@]}" \ +&& KEYRINGS+=( all-devs.export-clean ) + +unset GPG_EXPORT_OPTS +# END TEMPORARY + for key in "${KEYRINGS[@]}" ; do if [[ ! -L "${OUTPUT_DIR}"/${key}.gpg ]] ; then # Compatibility symlink
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: 4eb498510530c9717576144ce80800310f070e35 Author: Robin H. Johnson gentoo org> AuthorDate: Sun May 19 17:25:34 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun May 19 17:25:34 2024 + URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=4eb49851 create-dev-keyrings.bash: this was split into other scripts and not used since 2019 >From infra crontabs in 2019 (public SKS was since removed): ``` -# regen dev keyrings every hour (we want to catch revocations early on) -0 * * * * gqa /usr/bin/nice /usr/local/bin/pidlock ${REPO}/create-dev-keyrings.bash ${OUTPUTDIR} +# regen keyrings +# Fetch from SKS, push to keys.g.o +0 * * * * gqa /usr/bin/nice /usr/local/bin/pidlock ${REPO}/keyrings-recv-sks.bash ; /usr/local/bin/pidlock ${REPO}/keyrings-send-keys.gentoo.org.bash +# Fetch from keys.g.o & export to keyring files +*/10 * * * * gqa /usr/bin/nice /usr/local/bin/pidlock ${REPO}/keyrings-recv-keys.gentoo.org.bash ; /usr/bin/nice /usr/local/bin/pidlock ${REPO}/keyrings-export.bash ${OUTPUTDIR} ``` Signed-off-by: Robin H. Johnson gentoo.org> create-dev-keyrings.bash | 60 1 file changed, 60 deletions(-) diff --git a/create-dev-keyrings.bash b/create-dev-keyrings.bash deleted file mode 100755 index 3ab1b58..000 --- a/create-dev-keyrings.bash +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash -# Import key updates from Keyservers -# -# TODO: -# - Turn off export in this script - -OUTPUT_DIR=${1:-.} -BASEDIR="$(dirname "$0")" -source "${BASEDIR}"/keyrings.inc.bash - -set -e -export_ldap_data_to_env - -export KEYSERVERS=( "${KS_SKS}" "${KS_OPENPGP}" "${KS_GENTOO}" ) -export KEYSERVER_TIMEOUT=20m - -grab_keys "${SYSTEM_KEYS[@]}" -export_keys "${OUTPUT_DIR}"/service-keys.gpg \ - "${SYSTEM_KEYS[@]}" - -grab_keys "${INFRA_SYSTEM_KEYS[@]}" -export_keys "${OUTPUT_DIR}"/infra-service-keys.gpg \ - "${INFRA_SYSTEM_KEYS[@]}" - -grab_keys "${COMMITTING_DEVS[@]}" -export_keys "${OUTPUT_DIR}"/committing-devs.gpg \ - "${COMMITTING_DEVS[@]}" - -grab_keys "${NONCOMMITTING_DEVS[@]}" -export_keys "${OUTPUT_DIR}"/active-devs.gpg \ - "${COMMITTING_DEVS[@]}" \ - "${NONCOMMITTING_DEVS[@]}" - -grab_keys "${INFRA_DEVS[@]}" -export_keys "${OUTPUT_DIR}"/infra-devs.gpg \ - "${INFRA_DEVS[@]}" - -# -- not all are on keyservers -# -- and are unlikely to turn up now -# -- this needs to fetch from some archive instead -#grab_keys "${RETIRED_DEVS[@]}" -export_keys "${OUTPUT_DIR}"/retired-devs.gpg \ - "${RETIRED_DEVS[@]}" - -# Everybody together now -export_keys "${OUTPUT_DIR}"/all-devs.gpg \ - "${SYSTEM_KEYS[@]}" \ - "${COMMITTING_DEVS[@]}" \ - "${NONCOMMITTING_DEVS[@]}" \ - "${INFRA_DEVS[@]}" \ - "${RETIRED_DEVS[@]}" - -# Populate keys.gentoo.org with the keys we have, since they might have come from SKS -export KEYSERVERS=( "${KS_GENTOO}" ) -export KEYSERVER_TIMEOUT=20m -push_keys "${SYSTEM_KEYS[@]}" -push_keys "${COMMITTING_DEVS[@]}" -push_keys "${NONCOMMITTING_DEVS[@]}" -push_keys "${INFRA_DEVS[@]}" -push_keys "${RETIRED_DEVS[@]}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/kup/
commit: cfc0ffd447137608965f49cf6c5f2a7a975a7e63 Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 13 12:15:36 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 13 12:16:26 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc0ffd4 dev-util/kup: add server config & manpage Signed-off-by: Robin H. Johnson gentoo.org> dev-util/kup/{kup-0.3.6-r1.ebuild => kup-0.3.6-r2.ebuild} | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-util/kup/kup-0.3.6-r1.ebuild b/dev-util/kup/kup-0.3.6-r2.ebuild similarity index 86% rename from dev-util/kup/kup-0.3.6-r1.ebuild rename to dev-util/kup/kup-0.3.6-r2.ebuild index 2dbef2793236..1e560c98a94d 100644 --- a/dev-util/kup/kup-0.3.6-r1.ebuild +++ b/dev-util/kup/kup-0.3.6-r2.ebuild @@ -28,8 +28,10 @@ src_prepare() { } src_install() { - dobin "${PN}" "${PN}-server" gpg-sign-all - doman "${PN}.1" + dobin "${PN}" "${PN}-server" gpg-sign-all genrings + doman "${PN}.1" "${PN}-server.1" + insinto /etc/kup + doins kup-server.cfg einstalldocs if use gitolite; then exeinto /usr/libexec/gitolite/commands/
[gentoo-commits] repo/gentoo:master commit in: www-apps/cgit/
commit: 328c2af92299ca33e642543ca64884402f8bcc56 Author: Robin H. Johnson gentoo org> AuthorDate: Wed May 8 03:11:46 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 8 03:15:13 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=328c2af9 www-apps/cgit: re-add series to support much newer Git Upstream has not made an official release since 2020, but master is more up to date, and trusted contributers have a branch with the latest Git support. This is important because Git v2.45.0 adds support for Bloom Filters in commit graphs, providing 10x performance in web displays. Reference: https://lore.kernel.org/git/robbat2-20240507T053331-859497691Z orbis-terrarum.net/T/#t Signed-off-by: Robin H. Johnson gentoo.org> www-apps/cgit/cgit-1.2.3-r203.ebuild | 6 -- ...{cgit-1.2.3-r203.ebuild => cgit--r1.ebuild} | 25 +++--- .../{cgit-1.2.3-r203.ebuild => cgit-.ebuild} | 22 --- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild b/www-apps/cgit/cgit-1.2.3-r203.ebuild index 8499426633d8..805171058e89 100644 --- a/www-apps/cgit/cgit-1.2.3-r203.ebuild +++ b/www-apps/cgit/cgit-1.2.3-r203.ebuild @@ -56,8 +56,10 @@ pkg_setup() { } src_configure() { - rmdir git || die - mv "${WORKDIR}"/git-"${GIT_V}" git || die + if ! [[ ${PV} =~ * ]]; then + rmdir git || die + mv "${WORKDIR}"/git-"${GIT_V}" git || die + fi echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild b/www-apps/cgit/cgit--r1.ebuild similarity index 85% copy from www-apps/cgit/cgit-1.2.3-r203.ebuild copy to www-apps/cgit/cgit--r1.ebuild index 8499426633d8..8b6fded5c051 100644 --- a/www-apps/cgit/cgit-1.2.3-r203.ebuild +++ b/www-apps/cgit/cgit--r1.ebuild @@ -9,20 +9,28 @@ PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp +inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" -GIT_V="2.25.1" +GIT_V="2.45.0" DESCRIPTION="a fast web-interface for git repositories" HOMEPAGE="https://git.zx2c4.com/cgit/about"; -SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz - https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"; +if [[ ${PV} =~ * ]]; then + SRC_URI="" + EGIT_REPO_URI="https://git.zx2c4.com/cgit"; + # v2.45.0 updates in this branch series + EGIT_COMMIT=dbadd856ba0537110338cfe58256b152d01388c0 + EGIT_BRANCH=ch/for-jason +else + SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz + https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"; +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" +KEYWORDS="" IUSE="doc +highlight +lua test" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -56,9 +64,10 @@ pkg_setup() { } src_configure() { - rmdir git || die - mv "${WORKDIR}"/git-"${GIT_V}" git || die - + if ! [[ ${PV} =~ * ]]; then + rmdir git || die + mv "${WORKDIR}"/git-"${GIT_V}" git || die + fi echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed" diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild b/www-apps/cgit/cgit-.ebuild similarity index 88% copy from www-apps/cgit/cgit-1.2.3-r203.ebuild copy to www-apps/cgit/cgit-.ebuild index 8499426633d8..1fab1a1e34a9 100644 --- a/www-apps/cgit/cgit-1.2.3-r203.ebuild +++ b/www-apps/cgit/cgit-.ebuild @@ -9,20 +9,25 @@ PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp +inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" -GIT_V="2.25.1" +GIT_V="2.39.0" DESCRIPTION="a fast web-interface for git repositories" HOMEPAGE="https://git.zx
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: f2a6be91995797d43c877b3e10cac14e839668eb Author: Robin H. Johnson gentoo org> AuthorDate: Sun May 5 23:26:34 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun May 5 23:28:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a6be91 net-misc/openvswitch: py312 support, fix dev-python/ovs dep, fix accidental direct to stable Signed-off-by: Robin H. Johnson gentoo.org> .../{openvswitch-2.17.9.ebuild => openvswitch-2.17.9-r1.ebuild} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.9.ebuild b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild similarity index 97% rename from net-misc/openvswitch/openvswitch-2.17.9.ebuild rename to net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild index 5443b1d05e16..1053a8bdd80b 100644 --- a/net-misc/openvswitch/openvswitch-2.17.9.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 MODULES_OPTIONAL_USE="modules" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools linux-mod-r1 python-single-r1 systemd tmpfiles @@ -14,14 +14,14 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"; LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="debug modules monitor +ssl unwind valgrind" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Check python/ovs/version.py in tarball for dev-python/ovs dep RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' - ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}] + ~dev-python/ovs-2.17.9[${PYTHON_USEDEP}] dev-python/twisted[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] ')
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 3836faf8cc556b42ed987cc8e4b44cfb638a540d Author: Robin H. Johnson gentoo org> AuthorDate: Sun May 5 23:27:52 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun May 5 23:28:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3836faf8 net-misc/openvswitch: cleanup v2.17.6 Signed-off-by: Robin H. Johnson gentoo.org> net-misc/openvswitch/Manifest | 1 - net-misc/openvswitch/openvswitch-2.17.6.ebuild | 174 - 2 files changed, 175 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index ac6553668f58..19823fb47223 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,3 +1,2 @@ -DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544 SHA512 ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8 DIST openvswitch-2.17.8.tar.gz 8097747 BLAKE2B d37ae60481255476d41aa94086f6a597107b23176f7ff47eeff9d85a5904da3685886663451317e0b9e512fb049b4024e291f320752aa90fe798ff08f49772c5 SHA512 c94685b67f9f25c81a590696d36c431fadf09c2504b06565011c2945ef242c5039508b312992597822f8ee274ce615ca58bc6bb2aa0a9cf1346bc2dcada70fa1 DIST openvswitch-2.17.9.tar.gz 8136490 BLAKE2B cdb5ec81fb9ac04786fc1230d60c6c9bbf7ec2929cf5ab40bb1e0e7442480383d0ad8f24f14df4901cab8f39a6532445cf1810c9b9e3a779d7d15bfe35101a37 SHA512 b91212f9c10a208bca9d15cd5a219ae24b7e9bf8b5c8fdebc21cd9fa8229bc655f9f3591d79dd30c1a8212daed15d5a26bf9532b3496e3660bc8b62012f45636 diff --git a/net-misc/openvswitch/openvswitch-2.17.6.ebuild b/net-misc/openvswitch/openvswitch-2.17.6.ebuild deleted file mode 100644 index ff783ad71bfb.. --- a/net-misc/openvswitch/openvswitch-2.17.6.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MODULES_OPTIONAL_USE="modules" -PYTHON_COMPAT=( python3_{10..11} ) - -inherit autotools linux-mod python-single-r1 systemd tmpfiles - -DESCRIPTION="Production quality, multilayer virtual switch" -HOMEPAGE="https://www.openvswitch.org"; -SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"; - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" -IUSE="debug modules monitor +ssl unwind valgrind" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Check python/ovs/version.py in tarball for dev-python/ovs dep -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - ') - debug? ( dev-lang/perl ) - unwind? ( sys-libs/libunwind:= ) - ssl? ( dev-libs/openssl:= )" -DEPEND="${RDEPEND} - sys-apps/util-linux[caps] - valgrind? ( dev-debug/valgrind )" -BDEPEND="virtual/pkgconfig - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - ')" - -PATCHES=( - "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" - "${FILESDIR}/openvswitch-2.17.6-groff-1.23.0.patch" -) - -CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" -MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" -BUILD_TARGETS="all" - -pkg_setup() { - if use modules ; then - CONFIG_CHECK+=" ~!OPENVSWITCH" - kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" - kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" - linux-mod_pkg_setup - else - CONFIG_CHECK+=" ~OPENVSWITCH" - linux-info_pkg_setup - fi -} - -src_prepare() { - default - - # Never build kernelmodules, doing this manually - sed -i \ - -e '/^SUBDIRS/d' \ - datapath/Makefile.in || die "sed failed" - - eautoreconf -} - -src_configure() { - set_arch_to_kernel - python_setup - - # monitor is statically enabled for bug #596206 - # use monitor || export ovs_cv_python="no" - # pyside is staticly disabled - export ovs_cv_pyuic4="no" - - # flake8 is primarily a style guide tool, running it as part of the tests - # in Gentoo does not make much sense, only breaks them: bug #607280 - export ovs_cv_flake8="no" - - # Only adds a diagram to the man page,
[gentoo-commits] proj/elections:master commit in: completed/trustees-202306/
commit: cf701655e2f563af48f896a7eaf3f6f2c82fb756 Author: Robin H. Johnson gentoo org> AuthorDate: Sun May 5 18:27:29 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun May 5 18:27:29 2024 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=cf701655 trustees-202306: capture casting-voters-trustees-202306 Signed-off-by: Robin H. Johnson gentoo.org> .../trustees-202306/casting-voters-trustees-202306 | 32 ++ 1 file changed, 32 insertions(+) diff --git a/completed/trustees-202306/casting-voters-trustees-202306 b/completed/trustees-202306/casting-voters-trustees-202306 new file mode 100644 index 000..ca23b13 --- /dev/null +++ b/completed/trustees-202306/casting-voters-trustees-202306 @@ -0,0 +1,32 @@ +ajak +amynka +andrewammerlaan +arthurzam +bircoph +dabbott +dilfridge +eras +graaff +grobian +hattya +jmbsvicetto +klondike +kumba +lu_zero +marecki +mattst88 +mgorny +mpagano +neddyseagoon +perfinion +pinkbyte +rich0 +robbat2 +sam +soap +swift +tamiko +tomjbe +tupone +ulm +voyageur
[gentoo-commits] proj/elections:master commit in: council-202306/, completed/trustees-202306/, completed/council-202306/, ...
commit: 04b69f95e1ec217ce1a98451e61c9850d88a82ea Author: Robin H. Johnson gentoo org> AuthorDate: Sun Aug 27 22:16:09 2023 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Aug 27 22:16:09 2023 + URL:https://gitweb.gentoo.org/proj/elections.git/commit/?id=04b69f95 archive council-202306 & trustees-202306 Signed-off-by: Robin H. Johnson gentoo.org> {council-202306 => completed/council-202306}/Votify.pm | 0 {council-202306 => completed/council-202306}/ballot-council-202306 | 0 {council-202306 => completed/council-202306}/election-details| 0 {council-202306 => completed/council-202306}/officials-council-202306| 0 {council-202306 => completed/council-202306}/start-council-202306| 0 {council-202306 => completed/council-202306}/stop-council-202306 | 0 {council-202306 => completed/council-202306}/voters-council-202306 | 0 {trustees-202306 => completed/trustees-202306}/Votify.pm | 0 {trustees-202306 => completed/trustees-202306}/ballot-trustees-202306| 0 {trustees-202306 => completed/trustees-202306}/election-details | 0 {trustees-202306 => completed/trustees-202306}/officials-trustees-202306 | 0 {trustees-202306 => completed/trustees-202306}/start-trustees-202306 | 0 {trustees-202306 => completed/trustees-202306}/stop-trustees-202306 | 0 {trustees-202306 => completed/trustees-202306}/voters-trustees-202306| 0 14 files changed, 0 insertions(+), 0 deletions(-) diff --git a/council-202306/Votify.pm b/completed/council-202306/Votify.pm similarity index 100% rename from council-202306/Votify.pm rename to completed/council-202306/Votify.pm diff --git a/council-202306/ballot-council-202306 b/completed/council-202306/ballot-council-202306 similarity index 100% rename from council-202306/ballot-council-202306 rename to completed/council-202306/ballot-council-202306 diff --git a/council-202306/election-details b/completed/council-202306/election-details similarity index 100% rename from council-202306/election-details rename to completed/council-202306/election-details diff --git a/council-202306/officials-council-202306 b/completed/council-202306/officials-council-202306 similarity index 100% rename from council-202306/officials-council-202306 rename to completed/council-202306/officials-council-202306 diff --git a/council-202306/start-council-202306 b/completed/council-202306/start-council-202306 similarity index 100% rename from council-202306/start-council-202306 rename to completed/council-202306/start-council-202306 diff --git a/council-202306/stop-council-202306 b/completed/council-202306/stop-council-202306 similarity index 100% rename from council-202306/stop-council-202306 rename to completed/council-202306/stop-council-202306 diff --git a/council-202306/voters-council-202306 b/completed/council-202306/voters-council-202306 similarity index 100% rename from council-202306/voters-council-202306 rename to completed/council-202306/voters-council-202306 diff --git a/trustees-202306/Votify.pm b/completed/trustees-202306/Votify.pm similarity index 100% rename from trustees-202306/Votify.pm rename to completed/trustees-202306/Votify.pm diff --git a/trustees-202306/ballot-trustees-202306 b/completed/trustees-202306/ballot-trustees-202306 similarity index 100% rename from trustees-202306/ballot-trustees-202306 rename to completed/trustees-202306/ballot-trustees-202306 diff --git a/trustees-202306/election-details b/completed/trustees-202306/election-details similarity index 100% rename from trustees-202306/election-details rename to completed/trustees-202306/election-details diff --git a/trustees-202306/officials-trustees-202306 b/completed/trustees-202306/officials-trustees-202306 similarity index 100% rename from trustees-202306/officials-trustees-202306 rename to completed/trustees-202306/officials-trustees-202306 diff --git a/trustees-202306/start-trustees-202306 b/completed/trustees-202306/start-trustees-202306 similarity index 100% rename from trustees-202306/start-trustees-202306 rename to completed/trustees-202306/start-trustees-202306 diff --git a/trustees-202306/stop-trustees-202306 b/completed/trustees-202306/stop-trustees-202306 similarity index 100% rename from trustees-202306/stop-trustees-202306 rename to completed/trustees-202306/stop-trustees-202306 diff --git a/trustees-202306/voters-trustees-202306 b/completed/trustees-202306/voters-trustees-202306 similarity index 100% rename from trustees-202306/voters-trustees-202306 rename to completed/trustees-202306/voters-trustees-202306
[gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/
commit: a8638768e9f8db85d28d34727c768bd3d5cb7249 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Apr 21 15:08:42 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Apr 21 15:09:11 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8638768 sys-block/blktrace: missing doc dep Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/874858 sys-block/blktrace/blktrace-1.3.0-r1.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys-block/blktrace/blktrace-1.3.0-r1.ebuild b/sys-block/blktrace/blktrace-1.3.0-r1.ebuild index 9f6d161916e2..cfd56e795983 100644 --- a/sys-block/blktrace/blktrace-1.3.0-r1.ebuild +++ b/sys-block/blktrace/blktrace-1.3.0-r1.ebuild @@ -16,11 +16,13 @@ IUSE="doc" RDEPEND="dev-libs/libaio" # This is a Linux specific app! +# dev-texlive/texlive-latexextra for placeins.sty DEPEND="${RDEPEND} sys-kernel/linux-headers doc? ( virtual/latex-base >=app-text/texlive-core-2014 + dev-texlive/texlive-latexextra ) "
[gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/
commit: f2d465249bb54366d84f6c4c9689dbc6cc5cc80f Author: Robin H. Johnson gentoo org> AuthorDate: Sun Apr 21 15:05:40 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Apr 21 15:09:11 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d46524 sys-block/blktrace: QA direct cc call Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/930357 sys-block/blktrace/blktrace-1.3.0-r1.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys-block/blktrace/blktrace-1.3.0-r1.ebuild b/sys-block/blktrace/blktrace-1.3.0-r1.ebuild index f894d58430b3..9f6d161916e2 100644 --- a/sys-block/blktrace/blktrace-1.3.0-r1.ebuild +++ b/sys-block/blktrace/blktrace-1.3.0-r1.ebuild @@ -32,12 +32,13 @@ src_compile() { emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}" if use doc; then export VARTEXFONTS="${T}/fonts" - emake docs + emake docs CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}" fi } src_install() { - emake install DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" + # Do not remove the CC/FLAGS here; bug 930357 + emake install DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}" einstalldocs use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf }
[gentoo-commits] repo/gentoo:master commit in: sys-apps/clrngd/files/, sys-apps/clrngd/
commit: 92d715d96d8618e6f5538e1ca6739ef584bd5a2d Author: Robin H. Johnson gentoo org> AuthorDate: Sun Apr 14 16:35:02 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Apr 15 15:02:30 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d715d9 sys-apps/clrngd: cleanup init Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/484696 sys-apps/clrngd/clrngd-1.0.3-r2.ebuild | 35 ++ sys-apps/clrngd/files/clrngd-init.d-r2 | 14 ++ 2 files changed, 49 insertions(+) diff --git a/sys-apps/clrngd/clrngd-1.0.3-r2.ebuild b/sys-apps/clrngd/clrngd-1.0.3-r2.ebuild new file mode 100644 index ..8f8098302781 --- /dev/null +++ b/sys-apps/clrngd/clrngd-1.0.3-r2.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Clock randomness gathering daemon" +HOMEPAGE="http://echelon.pl/pubs/"; +SRC_URI="http://echelon.pl/pubs/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.3-implicit-func-declaration.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf --bindir="${EPREFIX}"/usr/sbin +} + +src_install() { + default + + newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} + newconfd "${FILESDIR}"/${PN}-conf.d ${PN} +} diff --git a/sys-apps/clrngd/files/clrngd-init.d-r2 b/sys-apps/clrngd/files/clrngd-init.d-r2 new file mode 100644 index ..5a7bc5be924d --- /dev/null +++ b/sys-apps/clrngd/files/clrngd-init.d-r2 @@ -0,0 +1,14 @@ +#!/sbin/openrc-run +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +name='clrngd' +command='/usr/sbin/clrngd' +command_args="${clrngd_opts:-${DELAYTIME}}" +description="Clock entropy for RNG" + +depend() { + after random + before net + provide entropy +}
[gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/files/
commit: b7e21df46f74f27f04c332e2ae01864b3390d1d0 Author: Matthew White inventati org> AuthorDate: Sun Mar 31 08:29:53 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Mar 31 16:27:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e21df4 app-misc/ddcutil: fix command not found error Fixes: * QA Notice: command not found: * * ./configure: line 2975: 0: command not found Closes: https://bugs.gentoo.org/922205 Package-Manager: portage-3.0.63 Signed-off-by: Matthew White inventati.org> X-cherry-picked: 0eb622b9779318b160ed865c095d3bdd4508d96c) Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/36012 app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch index 07897eb74e80..deabd2bfedbc 100644 --- a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch +++ b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch @@ -19,7 +19,7 @@ index c12f15c..27d2124 100644 dnl AC_MSG_NOTICE([DBG = |$DBG|]) -AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test "x$ddcutil_version_suffix" != "x"] ) -+AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, 0) ++AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test 0]) AS_IF( [test 0$DBG -ne 0], AC_MSG_NOTICE([debug messages enabled]),
[gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/, net-misc/sks/
commit: 10e3fa8b58a6d0224cba3d2b2e2df958891879f0 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Mar 25 05:52:58 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Mar 25 05:55:35 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10e3fa8b net-misc/sks: match init.d behavior - support args to systemd service - ensure paths are correctly owned (/var/lib/sks/{PTree,KDB} must exist) - sks-recon must start after sks-db Signed-off-by: Robin H. Johnson gentoo.org> net-misc/sks/files/sks-db.service | 7 ++- net-misc/sks/files/sks-recon.service | 7 +-- ...sks-1.1.6_p20200624-r1.ebuild => sks-1.1.6_p20200624-r2.ebuild} | 0 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/net-misc/sks/files/sks-db.service b/net-misc/sks/files/sks-db.service index bbc3ba7e2b2d..b48db1add6ff 100644 --- a/net-misc/sks/files/sks-db.service +++ b/net-misc/sks/files/sks-db.service @@ -3,8 +3,13 @@ Description=SKS database thread After=network.target [Service] -ExecStart=/usr/bin/sks db +Environment=SKS_DIR=/var/lib/sks +EnvironmentFile=-/etc/sysconfig/sks +ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --directory ${SKS_DIR} ${SKS_DIR}/SKS ${SKS_DIR}/PTree +ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --file ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/* +ExecStart=/usr/bin/sks db ${SKS_OPTIONS} ${SKS_DB_OPTIONS} User=sks +# WorkingDirectory cannot use a variable WorkingDirectory=/var/lib/sks [Install] diff --git a/net-misc/sks/files/sks-recon.service b/net-misc/sks/files/sks-recon.service index 97ee52ffc0ed..d56731d1c961 100644 --- a/net-misc/sks/files/sks-recon.service +++ b/net-misc/sks/files/sks-recon.service @@ -1,10 +1,13 @@ [Unit] Description=SKS key reconnaissance thread -After=network.target +After=network.target sks-db.service [Service] -ExecStart=/usr/bin/sks recon +Environment=SKS_DIR=/var/lib/sks +EnvironmentFile=-/etc/sysconfig/sks +ExecStart=/usr/bin/sks recon ${SKS_OPTIONS} ${SKS_RECON_OPTIONS} User=sks +# WorkingDirectory cannot use a variable WorkingDirectory=/var/lib/sks [Install] diff --git a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild similarity index 100% rename from net-misc/sks/sks-1.1.6_p20200624-r1.ebuild rename to net-misc/sks/sks-1.1.6_p20200624-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: app-admin/fifo-cronolog/
commit: 244c1a8fbec377a129414d299666e087b01e50f3 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Mar 25 05:32:14 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Mar 25 05:32:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244c1a8f app-admin/fifo-cronolog: fix systemd unit Signed-off-by: Robin H. Johnson gentoo.org> app-admin/fifo-cronolog/Manifest | 1 - .../fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild| 29 -- ...-1.2.3.ebuild => fifo-cronolog-1.2.3-r1.ebuild} | 2 +- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/app-admin/fifo-cronolog/Manifest b/app-admin/fifo-cronolog/Manifest index a35f7f1febc4..959d598d56fb 100644 --- a/app-admin/fifo-cronolog/Manifest +++ b/app-admin/fifo-cronolog/Manifest @@ -1,2 +1 @@ -DIST fifo-cronolog-1.1.1.tar.bz2 3124 BLAKE2B 6e9cb35e0ed1b54c3baed4451742840dc1144294fc675822c1260d4d7d885a52f8835e60dcbed57c714e40e94e6d51b3ba78af9b9892883f5f520a7c57d30df8 SHA512 3ac809d5cfc951764aaf31d50ee394b0dde9ced16f53daa91c81bdb218af2bab410ff945ebfdeb8307a55bda3292c0a55eb500c3cb73595e17228ef739455d90 DIST fifo-cronolog-1.2.3.tar.gz 4518 BLAKE2B c227304d98b2467a1ed7352399b1e53aba4dc005fa30a1be73b8cc96d61ee49d5f6a3703ccddd1ffef652c4090e9b5dfed9cce3f1254b959a1ccc07aac78b3f6 SHA512 557be1a663c5754a293092078b8a3710474bb1939c1ee65e4c560056238ca646e941e4ad82c0a90c02834fc90ddb2aae9047a4e73d42cf8c2c013f2a5d2c839c diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild deleted file mode 100644 index 06b9ddeebf9e.. --- a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish and so on" -HOMEPAGE="https://cgit.gentoo.org/proj/fifo-cronolog.git"; -SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"; - -LICENSE="BSD-2 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="app-admin/cronolog" - -src_install() { - dosbin fifo-cronolog - - newinitd fifo-cronolog.initd fifo-cronolog - newconfd fifo-cronolog.confd fifo-cronolog - - dosym fifo-cronolog /usr/sbin/squid-cronolog -} - -pkg_postinst() { - elog "Warning: app-admin/squid-cronolog has been renamed to app-admin/fifo-cronolog." - elog "This also applies to the binary 'squid-cronolog' but there is a symlink for now" - elog "Please fix your scripts/configs." -} diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild similarity index 95% rename from app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild rename to app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild index 06e5d7dd386b..27cfe32f20a1 100644 --- a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild +++ b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3-r1.ebuild @@ -27,7 +27,7 @@ src_install() { newinitd openrc/fifo-cronolog.initd fifo-cronolog newconfd openrc/fifo-cronolog.confd fifo-cronolog - systemd_douserunit systemd/fifo-cronolog@.service + systemd_dounit systemd/fifo-cronolog@.service dodoc README.md systemd/fifo-crono...@example.service.env }
[gentoo-commits] repo/gentoo:master commit in: app-metrics/bind_exporter/
commit: a31db516d1fef6769c875871c751886a7b5a7a87 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Mar 25 05:18:32 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Mar 25 05:20:15 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a31db516 app-metrics/bind_exporter: QA: fix RedundantVersion Signed-off-by: Robin H. Johnson gentoo.org> app-metrics/bind_exporter/Manifest | 1 - .../bind_exporter/bind_exporter-0.3.0.ebuild | 55 .../bind_exporter/bind_exporter-0.6.1.ebuild | 58 -- 3 files changed, 114 deletions(-) diff --git a/app-metrics/bind_exporter/Manifest b/app-metrics/bind_exporter/Manifest index 9c17ec11501a..262a8c84766b 100644 --- a/app-metrics/bind_exporter/Manifest +++ b/app-metrics/bind_exporter/Manifest @@ -1,3 +1,2 @@ -DIST bind_exporter-0.3.0.tar.gz 1796507 BLAKE2B a79b9e0d159d3deb83f1a040325ad34bc0d4ae50b6af205dce4ebf8d7152ccbd4b7d46fda40bf76db953996ddf4237ca13058250478b08cca51b8bea08ccc31b SHA512 762901a63a9493f852e5514429f55b10400931f0a77d2e11c7565e93e1ff759eb30d3bbc9278451bb9df358a983aa099bd55cf57241cf36187d2789c89a3852d DIST bind_exporter-0.6.1-vendor.tar.xz 1300068 BLAKE2B 058f4f61ff9c403a5672390dd3944dec9a6b4b1dcf8ac7bcb6943494d43c116236e23f4b0437d5b2e91cb0d936377ba896740594d90b50ce99a61963713ab70c SHA512 9fd880655ac9657d49c0d250b22e46c53a63c0a2d4097763ca8856da36f75527d515a4e4cde7dd68c2c5cbf4ea784c07d9bd5e38a01eeb2d308a585c31d5c19b DIST bind_exporter-0.6.1.tar.gz 48904 BLAKE2B ad2def162e0fac5e857328bb142bc20655d0d1ea4a9d90a3bd8d305a3d86f9247671ca92f90d5ccdcb1a8bd147ed56858a9782feeac019b87666b4b18b7219c1 SHA512 d710b7228587e12a101a1d626ec5e0290b0740074f3976eee02463165030b361d3b6df556ab949d632488582ef6d4a3197270afc197d6d756a99c16e55c5448c diff --git a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild b/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild deleted file mode 100644 index 1f984c920f02.. --- a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module -GIT_COMMIT=c34ff3d6b4817f42e74b2b05b3797cf99683b4a9 - -DESCRIPTION="Prometheus exporter for BIND" -HOMEPAGE="https://github.com/digitalocean/bind_exporter"; -SRC_URI="https://github.com/digitalocean/bind_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 BSD MIT" -SLOT="0" -KEYWORDS="~amd64" - -COMMON_DEPEND="acct-group/bind_exporter - acct-user/bind_exporter" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" -BDEPEND="dev-util/promu" - -src_prepare() { - default - sed -i -e "/-s$/d" -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die -} - -src_compile() { - mkdir -p bin || die - promu build -v --prefix bin || die -} - -src_test() { - emake test-flags= test -} - -src_install() { - dobin bin/${PN} - dodoc {README,CHANGELOG}.md - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} -} - -pkg_postinst() { - elog "Make sure BIND was built with libxml2 support. You can check with the" - elog "following command: named -V | grep libxml2." - elog "Configure BIND to open a statistics channel. It's recommended to run" - elog "the bind_exporter next to BIND, so it's only necessary to open a port" - elog "locally." - elog "" - elog "statistics-channels {" - elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };" - elog "};" -} diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild b/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild deleted file mode 100644 index 85c7fb1fd672.. --- a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module -GIT_COMMIT=c34ff3d6b4817f42e74b2b05b3797cf99683b4a9 - -DESCRIPTION="Prometheus exporter for BIND" -HOMEPAGE="https://github.com/prometheus-community/bind_exporter"; -SRC_URI=" - https://github.com/prometheus-community/bind_exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~robbat2/distfiles/bind_exporter-${PV}-vendor.tar.xz - " - -LICENSE="Apache-2.0 BSD MIT" -SLOT="0" -KEYWORDS="~amd64" - -COMMON_DEPEND="acct-group/bind_exporter - acct-user/bind_exporter" -DEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-metrics/bind_exporter/files/, app-metrics/bind_exporter/
commit: 1351ede7b9e4a9e6d004d2f3d019e8d9ba907b78 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Mar 25 05:16:53 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Mar 25 05:20:15 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1351ede7 app-metrics/bind_exporter: systemd, match other distros for config Signed-off-by: Robin H. Johnson gentoo.org> .../bind_exporter/bind_exporter-0.6.1-r1.ebuild| 60 ++ .../bind_exporter/files/bind_exporter.service | 11 2 files changed, 71 insertions(+) diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild new file mode 100644 index ..333599e97b8f --- /dev/null +++ b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module systemd +GIT_COMMIT=c34ff3d6b4817f42e74b2b05b3797cf99683b4a9 + +DESCRIPTION="Prometheus exporter for BIND" +HOMEPAGE="https://github.com/prometheus-community/bind_exporter"; +SRC_URI=" + https://github.com/prometheus-community/bind_exporter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~robbat2/distfiles/bind_exporter-${PV}-vendor.tar.xz + " + +LICENSE="Apache-2.0 BSD MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +COMMON_DEPEND="acct-group/bind_exporter + acct-user/bind_exporter" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +BDEPEND="dev-util/promu" + +src_prepare() { + default + sed -i -e "/-s$/d" -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die +} + +src_compile() { + mkdir -p bin || die + promu build -v --prefix bin || die +} + +src_test() { + emake test-flags= test +} + +src_install() { + dobin bin/${PN} + dodoc {README,CHANGELOG}.md + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + systemd_dounit "${FILESDIR}"/${PN}.service + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} +} + +pkg_postinst() { + elog "Make sure BIND was built with libxml2 support. You can check with the" + elog "following command: named -V | grep libxml2." + elog "Configure BIND to open a statistics channel. It's recommended to run" + elog "the bind_exporter next to BIND, so it's only necessary to open a port" + elog "locally." + elog "" + elog "statistics-channels {" + elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };" + elog "};" +} diff --git a/app-metrics/bind_exporter/files/bind_exporter.service b/app-metrics/bind_exporter/files/bind_exporter.service new file mode 100644 index ..ad2a237a061a --- /dev/null +++ b/app-metrics/bind_exporter/files/bind_exporter.service @@ -0,0 +1,11 @@ +[Unit] +Description=Bind Exporter +Documentation="https://github.com/prometheus-community/bind_exporter"; + +[Service] +User=bind_exporter +EnvironmentFile=/etc/sysconfig/bind_exporter +ExecStart=/usr/sbin/bind_exporter $OPTIONS + +[Install] +WantedBy=multi-user.target
[gentoo-commits] repo/gentoo:master commit in: app-metrics/bind_exporter/
commit: 3569befa2b4ea88a83cdfb0a5dc4114934ff867e Author: Robin H. Johnson gentoo org> AuthorDate: Mon Mar 25 05:18:05 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Mar 25 05:20:15 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3569befa app-metrics/bind_exporter: QA: fix EmptyGlobalAssignment Signed-off-by: Robin H. Johnson gentoo.org> app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild| 1 - app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild | 1 - app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild| 1 - 3 files changed, 3 deletions(-) diff --git a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild b/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild index 683d0803b1fa..1f984c920f02 100644 --- a/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild +++ b/app-metrics/bind_exporter/bind_exporter-0.3.0.ebuild @@ -12,7 +12,6 @@ SRC_URI="https://github.com/digitalocean/bind_exporter/archive/v${PV}.tar.gz -> LICENSE="Apache-2.0 BSD MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="" COMMON_DEPEND="acct-group/bind_exporter acct-user/bind_exporter" diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild index 333599e97b8f..5d586670b4e6 100644 --- a/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild +++ b/app-metrics/bind_exporter/bind_exporter-0.6.1-r1.ebuild @@ -15,7 +15,6 @@ SRC_URI=" LICENSE="Apache-2.0 BSD MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="" COMMON_DEPEND="acct-group/bind_exporter acct-user/bind_exporter" diff --git a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild b/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild index 6f9020afafd7..85c7fb1fd672 100644 --- a/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild +++ b/app-metrics/bind_exporter/bind_exporter-0.6.1.ebuild @@ -15,7 +15,6 @@ SRC_URI=" LICENSE="Apache-2.0 BSD MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="" COMMON_DEPEND="acct-group/bind_exporter acct-user/bind_exporter"
[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/
commit: a2573c506caae02d4cdd45c7480e8ada4f463069 Author: Robin H. Johnson gentoo org> AuthorDate: Thu Mar 14 18:26:10 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Mar 14 18:33:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2573c50 app-admin/testdisk: bump Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/900116 Closes: https://bugs.gentoo.org/892904 app-admin/testdisk/Manifest| 1 + app-admin/testdisk/metadata.xml| 1 + app-admin/testdisk/testdisk-7.2.ebuild | 104 + 3 files changed, 106 insertions(+) diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest index eb6decb01775..99ef2a164156 100644 --- a/app-admin/testdisk/Manifest +++ b/app-admin/testdisk/Manifest @@ -1 +1,2 @@ DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5 +DIST testdisk-7.2.tar.bz2 855781 BLAKE2B 224fae052fa9264ee83fdf6804159c77257b9db4c96ff36c7cb1dc184ec4a9f0955f0d817de24ef1e5fe69e7ef1a20c140e73fc130fb092e6df3b02df2845239 SHA512 f99dd1c8f547c3d06e5459ba072438192a49d76c569de7915994beb269645092522d8136a212999382f88ca1d29c50f6482306d47197dc0994d168bcd4141f26 diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml index adbd9697dcd6..0cde64481bdc 100644 --- a/app-admin/testdisk/metadata.xml +++ b/app-admin/testdisk/metadata.xml @@ -13,6 +13,7 @@ Include the ability to read NTFS filesystems Include reiserfs reading ability Include ewf library + Enable sudo helper integration cgsecurity/testdisk diff --git a/app-admin/testdisk/testdisk-7.2.ebuild b/app-admin/testdisk/testdisk-7.2.ebuild new file mode 100644 index ..e30e7c0a8b9f --- /dev/null +++ b/app-admin/testdisk/testdisk-7.2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic qmake-utils xdg-utils + +DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool" +HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"; +SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"; + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +IUSE="ewf jpeg ntfs gui reiserfs static +sudo zlib" + +REQUIRED_USE="static? ( !gui )" + +QA_CONFIG_IMPL_DECL_SKIP=( + 'ntfs_mbstoucs' # configure script checking NTFS, has fallbacks +) + +# WARNING: reiserfs support does NOT work with reiserfsprogs +# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). +# sudo is detected during configure for extra functionality, see bug #892904 +DEPEND=" + sudo? ( app-admin/sudo ) + static? ( + sys-apps/util-linux[static-libs] + sys-fs/e2fsprogs[static-libs] + sys-libs/ncurses:0[static-libs] + jpeg? ( media-libs/libjpeg-turbo:=[static-libs] ) + ntfs? ( sys-fs/ntfs3g[static-libs] ) + reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) + zlib? ( sys-libs/zlib[static-libs] ) + !arm? ( ewf? ( app-forensics/libewf[static-libs] ) ) + ) + !static? ( + sys-apps/util-linux + sys-fs/e2fsprogs + sys-libs/ncurses:0= + jpeg? ( media-libs/libjpeg-turbo:= ) + ntfs? ( sys-fs/ntfs3g:= ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) + zlib? ( sys-libs/zlib ) + !arm? ( ewf? ( app-forensics/libewf:= ) ) + ) +" +RDEPEND=" + sudo? ( app-admin/sudo ) + !static? ( ${DEPEND} ) +" +BDEPEND="gui? ( dev-qt/linguist-tools:5 )" + +DOCS=() + +PATCHES=( +) + +src_configure() { + export MOC="$(qt5_get_bindir)/moc" + export PATH="$(qt5_get_bindir):${PATH}" + + local myconf=( + --without-ntfs # old NTFS implementation, use ntfs-3g instead. + $(use_with ewf) + $(use_with jpeg) + $(use_with ntfs ntfs3g) + $(use_enable gui qt) + $(use_enable sudo) + $(use_with reiserfs) + $(use_with zlib) + ) + + # this static method is the same used by upstream for their 'static' make + # targ
[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/files/, sys-fs/mdadm/
commit: 16001ee3172451f6574dbe8c5b7f71ac0d43d3e2 Author: Robin H. Johnson gentoo org> AuthorDate: Thu Mar 14 03:39:47 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Mar 14 03:42:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16001ee3 sys-fs/mdadm: bump Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/833000 sys-fs/mdadm/Manifest | 2 + .../files/mdadm-4.3-in_initrd-collision.patch | 45 sys-fs/mdadm/files/mdadm-4.3-ldflags.patch | 11 ++ sys-fs/mdadm/mdadm-4.3.ebuild | 124 + sys-fs/mdadm/metadata.xml | 3 + 5 files changed, 185 insertions(+) diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest index 961f422d5fb6..51cfc9e15326 100644 --- a/sys-fs/mdadm/Manifest +++ b/sys-fs/mdadm/Manifest @@ -1,2 +1,4 @@ DIST mdadm-4.2.tar.xz 453624 BLAKE2B de7c4318dc5479de41378233869ab84ca2cd0e8a42310157b1acb969e7152af61556fbbe6f17bf6af4dfaf5543e49b1c982d2baeedf1c39b32f4db7f5502 SHA512 57897a2b7fb8b0b88bece50501099872bb45ddb076cfc323d563588096d2b66b1ecba3724534943f651ace2bfe591482570700616500dc3398552e4f9ff0c37d +DIST mdadm-4.3.tar.xz 465820 BLAKE2B 3b6955339adb6c254a69d698e3b807838f8840e37f7f94280f4a1fbffb082ee694309f4b6f9adc8edfa2071fde324bf00ae0493d5b2e6c8d87796783dfa3ee1c SHA512 e44977f2f80d2471cb313803a60c92dafe8282ac06bbbfd41ae90ca493c64a3da94db924538788d045fd7f0667333912dabedb0b070f9abf5c0540b32e0fa08f DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B dd04f2dd044d0bca85920eaf5c79a288d69c47a7ad7e36509a126c01ef63bd045d7e0530450650028de39d74ad852995ca080c3a73dbcb1cf1b3783118109f35 SHA512 3d36533d2713b663606919b2bfec18b15e18a6a0194e333e38e4a58f175da96af7b1fe16f0c36ee148e14492a4e0710b9fad6ac7856495b63c0176ebb7333be6 +DIST mdadm_4.3-1.debian.tar.xz 86972 BLAKE2B 52af9ddacc402d8c3318bac31b4cd5ac3045e564832546146ba0a18d6a43866ae2c21270ac15f48df98c4f76af0eeae41679ea9e0e265dad44914bd58f27d689 SHA512 1c5203523f0c7fe271d850ab4ad376a449e870f8f1549dc4460adede1f59a1a364e741562954297e7848bae19d1cfe273a31f1bfaf739dd37559a0666abd8517 diff --git a/sys-fs/mdadm/files/mdadm-4.3-in_initrd-collision.patch b/sys-fs/mdadm/files/mdadm-4.3-in_initrd-collision.patch new file mode 100644 index ..54e4aadacb58 --- /dev/null +++ b/sys-fs/mdadm/files/mdadm-4.3-in_initrd-collision.patch @@ -0,0 +1,45 @@ +Fix collision with libudev symbols when statically linking. + +https://bugs.gentoo.org/830485 +--- a/mdadm.h b/mdadm.h +@@ -1665,7 +1665,7 @@ + extern void udev_block(char *devnm); + extern void udev_unblock(void); + +-extern int in_initrd(void); ++extern int mdadm_in_initrd(void); + + struct cmap_hooks { + void *cmap_handle; /* corosync lib related */ +--- a/mdmon.c b/mdmon.c +@@ -309,7 +309,7 @@ + {NULL, 0, NULL, 0} + }; + +- if (in_initrd()) { ++ if (mdadm_in_initrd()) { + /* +* set first char of argv[0] to @. This is used by +* systemd to signal that the task was launched from +--- a/util.c b/util.c +@@ -1960,7 +1960,7 @@ + int len; + pid_t pid; + int status; +- char *prefix = in_initrd() ? "initrd-" : ""; ++ char *prefix = mdadm_in_initrd() ? "initrd-" : ""; + char pathbuf[1024]; + char *paths[4] = { + pathbuf, +@@ -2219,7 +2219,7 @@ + return 0; + } + +-int in_initrd(void) ++int mdadm_in_initrd(void) + { + /* This is based on similar function in systemd. */ + struct statfs s; diff --git a/sys-fs/mdadm/files/mdadm-4.3-ldflags.patch b/sys-fs/mdadm/files/mdadm-4.3-ldflags.patch new file mode 100644 index ..e8e93d424592 --- /dev/null +++ b/sys-fs/mdadm/files/mdadm-4.3-ldflags.patch @@ -0,0 +1,11 @@ +--- mdadm-4.3/Makefile.orig2024-03-13 20:11:48.949678469 -0700 mdadm-4.3/Makefile 2024-03-13 20:11:52.773671814 -0700 +@@ -132,7 +132,7 @@ + MON_LDFLAGS += -pthread + endif + +-LDFLAGS = -Wl,-z,now,-z,noexecstack ++LDFLAGS += -Wl,-z,now,-z,noexecstack + + # If you want a static binary, you might uncomment these + # LDFLAGS += -static diff --git a/sys-fs/mdadm/mdadm-4.3.ebuild b/sys-fs/mdadm/mdadm-4.3.ebuild new file mode 100644 index ..c78553aa7558 --- /dev/null +++ b/sys-fs/mdadm/mdadm-4.3.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic systemd toolchain-funcs udev + +DESCRIPTION="Tool for running RAID systems - replacement for the raidtools" +HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"; +DEB_PF="4.3-1" +SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz + mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz" + +L
[gentoo-commits] repo/gentoo:master commit in: profiles/arch/ia64/, profiles/arch/riscv/, profiles/arch/loong/
commit: 0cc6106b2176e61bec384012fa9350b29e64c307 Author: Robin H. Johnson gentoo org> AuthorDate: Thu Mar 14 03:41:21 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Mar 14 03:42:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc6106b profiles: mask sys-fs/mdadm[corosync] Signed-off-by: Robin H. Johnson gentoo.org> profiles/arch/ia64/package.use.mask | 4 profiles/arch/loong/package.use.mask | 4 profiles/arch/riscv/package.use.mask | 4 3 files changed, 12 insertions(+) diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask index 881702046ca8..17bf844ce195 100644 --- a/profiles/arch/ia64/package.use.mask +++ b/profiles/arch/ia64/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Robin H. Johnson (2024-03-08) # mongodb dependencies are not keyworded mail-mta/postfix mongodb diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask index c4cc43e2ff78..5a384dacc36e 100644 --- a/profiles/arch/loong/package.use.mask +++ b/profiles/arch/loong/package.use.mask @@ -1,6 +1,10 @@ # Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Robin H. Johnson (2024-02-16) # Test dependencies not keyworded on this arch. www-servers/nginx test diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask index 5f0957463d47..524b442bf6fd 100644 --- a/profiles/arch/riscv/package.use.mask +++ b/profiles/arch/riscv/package.use.mask @@ -1,6 +1,10 @@ # Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Robin H. Johnson (2024-02-18) # alembic not stable yet media-gfx/openvdb alembic
[gentoo-commits] repo/gentoo:master commit in: app-admin/fifo-cronolog/
commit: 3dc3292d11e8e576338d48f03266c5594983daa8 Author: Robin H. Johnson gentoo org> AuthorDate: Wed Mar 13 16:23:57 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed Mar 13 16:24:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc3292d app-admin/fifo-cronolog: replace mirror://gentoo/ Signed-off-by: Robin H. Johnson gentoo.org> app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild | 2 +- app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild index 1a34cb0f1110..06b9ddeebf9e 100644 --- a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild +++ b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish and so on" HOMEPAGE="https://cgit.gentoo.org/proj/fifo-cronolog.git"; -SRC_URI="mirror://gentoo/${P}.tar.bz2" +SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"; LICENSE="BSD-2 GPL-2" SLOT="0" diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild index 940b4376a493..06e5d7dd386b 100644 --- a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild +++ b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild @@ -7,7 +7,7 @@ inherit systemd DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish and so on" HOMEPAGE="https://gitweb.gentoo.org/proj/fifo-cronolog.git"; -SRC_URI="mirror://gentoo/${P}.tar.gz" +SRC_URI="http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz"; LICENSE="BSD-2 GPL-2" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: app-admin/fifo-cronolog/
commit: 0dd86ed01ecd13b32a282d228937be391ceebb6b Author: Robin H. Johnson gentoo org> AuthorDate: Wed Mar 13 05:23:50 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed Mar 13 05:24:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd86ed0 app-admin/fifo-cronolog: bump, systemd support Signed-off-by: Robin H. Johnson gentoo.org> app-admin/fifo-cronolog/Manifest | 1 + app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild | 38 ++ 2 files changed, 39 insertions(+) diff --git a/app-admin/fifo-cronolog/Manifest b/app-admin/fifo-cronolog/Manifest index ba3b49b49b23..a35f7f1febc4 100644 --- a/app-admin/fifo-cronolog/Manifest +++ b/app-admin/fifo-cronolog/Manifest @@ -1 +1,2 @@ DIST fifo-cronolog-1.1.1.tar.bz2 3124 BLAKE2B 6e9cb35e0ed1b54c3baed4451742840dc1144294fc675822c1260d4d7d885a52f8835e60dcbed57c714e40e94e6d51b3ba78af9b9892883f5f520a7c57d30df8 SHA512 3ac809d5cfc951764aaf31d50ee394b0dde9ced16f53daa91c81bdb218af2bab410ff945ebfdeb8307a55bda3292c0a55eb500c3cb73595e17228ef739455d90 +DIST fifo-cronolog-1.2.3.tar.gz 4518 BLAKE2B c227304d98b2467a1ed7352399b1e53aba4dc005fa30a1be73b8cc96d61ee49d5f6a3703ccddd1ffef652c4090e9b5dfed9cce3f1254b959a1ccc07aac78b3f6 SHA512 557be1a663c5754a293092078b8a3710474bb1939c1ee65e4c560056238ca646e941e4ad82c0a90c02834fc90ddb2aae9047a4e73d42cf8c2c013f2a5d2c839c diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild new file mode 100644 index ..940b4376a493 --- /dev/null +++ b/app-admin/fifo-cronolog/fifo-cronolog-1.2.3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish and so on" +HOMEPAGE="https://gitweb.gentoo.org/proj/fifo-cronolog.git"; +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="BSD-2 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="app-admin/cronolog" + +src_compile() { + emake all +} + +src_install() { + dosbin fifo-cronolog + dosym fifo-cronolog /usr/sbin/squid-cronolog + dosbin fifo-cronolog-setup + + newinitd openrc/fifo-cronolog.initd fifo-cronolog + newconfd openrc/fifo-cronolog.confd fifo-cronolog + + systemd_douserunit systemd/fifo-cronolog@.service + dodoc README.md systemd/fifo-crono...@example.service.env +} + +pkg_postinst() { + elog "Warning: app-admin/squid-cronolog has been renamed to app-admin/fifo-cronolog." + elog "This also applies to the binary 'squid-cronolog' but there is a symlink for now" + elog "Please fix your scripts/configs." +}
[gentoo-commits] proj/fifo-cronolog:master commit in: /
commit: 80ac76208eade31ad0df6b347481049c20608a39 Author: Robin H. Johnson gentoo org> AuthorDate: Wed Mar 13 04:51:37 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed Mar 13 04:51:37 2024 + URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=80ac7620 build: add hacky dist rule Signed-off-by: Robin H. Johnson gentoo.org> .gitignore | 4 +++- Makefile | 8 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 29b8ac9..718dc26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ - *.o fifo-cronolog +*.tgz +*.tar.gz +*.tar diff --git a/Makefile b/Makefile index 7894e74..74c132a 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,14 @@ BINDIR = /usr/sbin/ SYSTEMD_TARGET = /usr/lib/systemd/system/ SYSTEMD_UNIT = systemd/fifo-cronolog@.service +VERSION = $(shell awk -F'"' '/#define VERSION/{print $$2}' $(SRC) ) +DISTFILE_EXT = tar.gz +DISTFILE = $(BIN)-$(VERSION).$(DISTFILE_EXT) + +dist: + if test -e $(DISTFILE) ; then echo "$(DISTFILE) already exists" ; exit 1 ; fi + git archive --format $(DISTFILE_EXT) --prefix $(BIN)-$(VERSION)/ v$(VERSION) >$(DISTFILE).tmp && mv $(DISTFILE).tmp $(DISTFILE) + all: $(BIN) $(BIN): $(OBJ)
[gentoo-commits] proj/fifo-cronolog: New tag: v1.2.1
commit: Commit: Robin H. Johnson gentoo org> CommitDate: Tue Mar 12 18:14:59 2024 + New tag: v1.2.1
[gentoo-commits] proj/fifo-cronolog:master commit in: /
commit: 81713dc3efcbec5ae3006580a97aef519bfc7c2b Author: Robin H. Johnson gentoo org> AuthorDate: Tue Mar 12 18:06:26 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Tue Mar 12 18:06:26 2024 + URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=81713dc3 fix: bump version to ship docs Signed-off-by: Robin H. Johnson gentoo.org> fifo-cronolog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fifo-cronolog.c b/fifo-cronolog.c index f7ff19f..c2875d6 100644 --- a/fifo-cronolog.c +++ b/fifo-cronolog.c @@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause #include #include -#define VERSION "1.2.0" +#define VERSION "1.2.1" char *pidfile;
[gentoo-commits] proj/fifo-cronolog:master commit in: /
commit: 33db6ad55a866b9944d8038e036c7dce65e26eea Author: Robin H. Johnson gentoo org> AuthorDate: Tue Mar 12 18:05:47 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Tue Mar 12 18:05:47 2024 + URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=33db6ad5 doc: add README & AUTHORS Signed-off-by: Robin H. Johnson gentoo.org> AUTHORS | 2 ++ README.md | 22 ++ 2 files changed, 24 insertions(+) diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000..2ca8fed --- /dev/null +++ b/AUTHORS @@ -0,0 +1,2 @@ +Christian Ruppert +Robin H. Johnson diff --git a/README.md b/README.md new file mode 100644 index 000..7ec95e7 --- /dev/null +++ b/README.md @@ -0,0 +1,22 @@ +fifo-cronolog +- +This is a little tool that connects a named pipe/FIFO into the stdin of `cronolog`. + +This is useful for cases where the logging destination cannot be specified as a +program. It was originally written to do logging from Squid, but later re-used +for Nginx & other tools. + +Cronolog's canonical example, in an Apache configuration +``` +TransferLog "|/www/sbin/cronolog /www/logs/%Y/%m/%d/access.log" +``` + +Is converted into: +1. Fifo-cronolog as (via your init system, so it gets restarted): +``` +fifo-cronolog /run/apache-access.pid /run/apache-access.fifo /www/logs/%Y/%m/%d/access.log +``` +2. Apache configuration: +``` +TransferLog "/run/apache-access.fifo" +```
[gentoo-commits] proj/fifo-cronolog:master commit in: /
commit: a88407d7924b0f45947807981cc8d3327d2c56d4 Author: Robin H. Johnson gentoo org> AuthorDate: Tue Mar 12 18:14:15 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Tue Mar 12 18:14:15 2024 + URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=a88407d7 build: add simple install target Signed-off-by: Robin H. Johnson gentoo.org> Makefile | 10 ++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 3baecf8..7894e74 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,13 @@ CFLAGS += -Wall BIN = fifo-cronolog +HELPER = fifo-cronolog-setup SRC = $(BIN).c OBJ = $(patsubst %.c,%.o,$(SRC)) +BINDIR = /usr/sbin/ +SYSTEMD_TARGET = /usr/lib/systemd/system/ +SYSTEMD_UNIT = systemd/fifo-cronolog@.service + all: $(BIN) $(BIN): $(OBJ) @@ -14,4 +19,9 @@ $(BIN): $(OBJ) clean: $(RM) $(BIN) $(OBJ) +install: + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(SYSTEMD_TARGET) + install -m0755 -D $(BIN) $(HELPER) $(DESTDIR)$(BINDIR) + install -m0644 -D $(SYSTEMD_UNIT) $(DESTDIR)$(SYSTEMD_TARGET) + # vim: set ts=4 sw=4 tw=80:
[gentoo-commits] proj/fifo-cronolog:master commit in: /
commit: 09b3b06ecff704b6b001d6398f506dce9456301f Author: Robin H. Johnson gentoo org> AuthorDate: Tue Mar 12 18:05:24 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Tue Mar 12 18:05:24 2024 + URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=09b3b06e build: cleanup Makefile Signed-off-by: Robin H. Johnson gentoo.org> Makefile | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cca4e8b..3baecf8 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,17 @@ CFLAGS += -Wall +BIN = fifo-cronolog +SRC = $(BIN).c +OBJ = $(patsubst %.c,%.o,$(SRC)) -all: fifo-cronolog +all: $(BIN) -fifo-cronolog: fifo-cronolog.o +$(BIN): $(OBJ) $(CC) $(LDFLAGS) -o $@ $< -fifo-cronolog.o: fifo-cronolog.c +.c.o: $(CC) $(CFLAGS) -c -o $@ $< clean: - $(RM) fifo-cronolog{,.o} + $(RM) $(BIN) $(OBJ) # vim: set ts=4 sw=4 tw=80:
[gentoo-commits] proj/fifo-cronolog: New tag: v1.2.0
commit: Commit: Robin H. Johnson gentoo org> CommitDate: Tue Mar 12 13:09:31 2024 + New tag: v1.2.0
[gentoo-commits] proj/fifo-cronolog:master commit in: /, systemd/, openrc/
commit: dd64f64db665840b35cd980291f1c14711ac42d2 Author: Robin H. Johnson gentoo org> AuthorDate: Tue Mar 12 13:07:07 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Tue Mar 12 13:08:54 2024 + URL:https://gitweb.gentoo.org/proj/fifo-cronolog.git/commit/?id=dd64f64d feat: systemd support Signed-off-by: Robin H. Johnson gentoo.org> .gitignore| 3 +++ fifo-cronolog-setup | 17 ++ fifo-cronolog.c | 27 +++ fifo-cronolog.confd => openrc/fifo-cronolog.confd | 0 fifo-cronolog.initd => openrc/fifo-cronolog.initd | 0 systemd/README.md | 4 systemd/fifo-cronolog@.service| 10 + systemd/fifo-crono...@example.service.env | 4 8 files changed, 41 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..29b8ac9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ + +*.o +fifo-cronolog diff --git a/fifo-cronolog-setup b/fifo-cronolog-setup new file mode 100755 index 000..55f46f0 --- /dev/null +++ b/fifo-cronolog-setup @@ -0,0 +1,17 @@ +#!/bin/bash +# Copyright 2024-2024, Gentoo Foundation +# SPDX-License-Identifier: BSD-2-Clause +FIFO=$1 +FIFO_OWNER=$2 +FIFO_PERMS=$3 +if [ ! -e "${FIFO}" ]; then + mkfifo "$FIFO" || exit 1 +fi +if [ -p "${FIFO}" ]; then + chown "$FIFO_OWNER" "$FIFO" || exit 1 + chmod "$FIFO_PERMS" "$FIFO" || exit 1 +else + echo "${FIFO} is not a valid FIFO!" 1>&2 + exit 1 +fi +exit 0 diff --git a/fifo-cronolog.c b/fifo-cronolog.c index de87827..f7ff19f 100644 --- a/fifo-cronolog.c +++ b/fifo-cronolog.c @@ -1,27 +1,6 @@ /* -Copyright (c) 2007-2010, Gentoo Foundation -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. +Copyright 2010-2024, Gentoo Foundation +SPDX-License-Identifier: BSD-2-Clause */ #include @@ -35,7 +14,7 @@ POSSIBILITY OF SUCH DAMAGE. #include #include -#define VERSION "1.1.1" +#define VERSION "1.2.0" char *pidfile; diff --git a/fifo-cronolog.confd b/openrc/fifo-cronolog.confd similarity index 100% rename from fifo-cronolog.confd rename to openrc/fifo-cronolog.confd diff --git a/fifo-cronolog.initd b/openrc/fifo-cronolog.initd similarity index 100% rename from fifo-cronolog.initd rename to openrc/fifo-cronolog.initd diff --git a/systemd/README.md b/systemd/README.md new file mode 100644 index 000..1d88021 --- /dev/null +++ b/systemd/README.md @@ -0,0 +1,4 @@ +1. Put env into `/etc/systemd-env/`, using the entire name of the unit, with instance suffix, and an extra `.env`, + e.g. `/etc/systemd-env/fifo-crono...@example.service.env` +2. `systemctl enable fifo-cronolog@example` +3. Use systemd overrides if you need to add dependencies. diff --git a/systemd/fifo-cronolog@.service b/systemd/fifo-cronolog@.service new file mode 100644 index 000..0ab0962 --- /dev/null +++ b/systemd/fifo-cronolog@.service @@ -0,0 +1,10 @@ +[Unit] +Description=fifo-cronolog.%i +[Service] +Type=forking +EnvironmentFile=/etc/systemd-env/%n.env +PIDFile=/run/%N.pid +ExecStartPre=/usr/sbin/fifo-cronolog-setup $FIFO $FIFO_OWNER $FIFO_PERMS +ExecStart=/usr/sbin/fifo-cronolog /run/%N.pid $FIFO $LOGS +[Install] +WantedBy=multi-user.target diff --git a/systemd/fifo-crono...@example.service.env b/systemd/fifo-crono...@example.service.env new file mode 100644 index 000..370d157 --- /dev/null +++ b/systemd/fifo-crono...@example.service.env @@ -0,0 +1,4 @@ +FIFO="/tmp/example.fifo" +FIFO_OWNER="somebody:somegroup" +FIFO_PERMS="0600" +LOGS="/var/log/example/%Y%m%d.log"
[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/
commit: af6ddf9d58876f7ae3a4a8eb632635092c3ba229 Author: Robin H. Johnson gentoo org> AuthorDate: Thu Mar 7 13:57:19 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Mar 7 14:07:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6ddf9d sys-block/fio: bump to 3.36 Also make pandas dependency optional due to size (used for only one processing script). Signed-off-by: Robin H. Johnson gentoo.org> sys-block/fio/Manifest| 1 + sys-block/fio/fio-3.36.ebuild | 169 ++ sys-block/fio/metadata.xml| 1 + 3 files changed, 171 insertions(+) diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest index 9a507fbd2a6d..661b1471fba9 100644 --- a/sys-block/fio/Manifest +++ b/sys-block/fio/Manifest @@ -1,3 +1,4 @@ DIST fio-3.27.tar.bz2 960330 BLAKE2B 7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170 SHA512 9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99 DIST fio-3.30.tar.bz2 6001772 BLAKE2B a4941cd415e6444bb9871274580efdf82281a1e52dc3caaa235f63176e3564fb1dc08e1e4586c555f9c25975d7e6220fe53209ed7218da713b9cb9135de0fc05 SHA512 1fb2ae9c28028147edabceff734fc41bf07ce504af98afdb0951920b724b15d647f2b0852262c177279ad6b4dbbf24be458db7f939d1c80069e0f8e7bc8aa10d DIST fio-3.34.tar.bz2 7049859 BLAKE2B 297fef62098bc3bc5476ebc7794566172c182059ce35d57a84bf87f6cedf08f234371d363fd08570e675eef9fbc7eae8d79755826d4312d543a16a144b4afc3f SHA512 912da2d7c7c4e0ad6c64a2e8c5254d23e5b6286c54d3ebf23d6bd2e0b5a9e4d2a53a75da3c807467b0fbe637b4ff23d64f1166fc45d6cce1d13d239f233548d0 +DIST fio-3.36.tar.bz2 7229204 BLAKE2B a9265ae8817486ddda1b63c35c79814b7854ec29106a188110b22ba82fc41a015b076626daa577a43189804a768f5465395b8daa74ceb31c949e03eca091a23b SHA512 925cab44619991052085216253c9c5637f7319f52d92f4cc946df60ab1a964dbfa0bbb0ecd171d6dc21ae1402375a6cf1e7b8ac94df0c03889f849aeb2da8890 diff --git a/sys-block/fio/fio-3.36.ebuild b/sys-block/fio/fio-3.36.ebuild new file mode 100644 index ..5c3e73c4de29 --- /dev/null +++ b/sys-block/fio/fio-3.36.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit python-r1 toolchain-funcs + +MY_PV="${PV/_rc/-rc}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Jens Axboe's Flexible IO tester" +HOMEPAGE="https://brick.kernel.dk/snaps/"; +SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="aio curl glusterfs gnuplot gtk io-uring nfs numa pandas python rbd rdma static tcmalloc test valgrind zbc zlib" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + gnuplot? ( python ) + io-uring? ( aio )" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" + +# GTK+:2 does not offer static libaries. +# xnvme +# libblkio +# pmem2 +LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] ) + curl? ( + net-misc/curl:=[static-libs(+)] + dev-libs/openssl:0=[static-libs(+)] + ) + nfs? ( net-fs/libnfs:=[static-libs(+)] ) + glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) + gtk? ( dev-libs/glib:2[static-libs(+)] ) + io-uring? ( sys-libs/liburing:=[static-libs(+)] ) + numa? ( sys-process/numactl[static-libs(+)] ) + rbd? ( sys-cluster/ceph[static-libs(+)] ) + rdma? ( sys-cluster/rdma-core[static-libs(+)] ) + tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] ) + zbc? ( >=sys-block/libzbc-5 ) + zlib? ( sys-libs/zlib[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + gtk? ( x11-libs/gtk+:2 )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + test? ( dev-util/cunit ) + valgrind? ( dev-debug/valgrind )" +RDEPEND+=" + python? ( + ${PYTHON_DEPS} + pandas? ( dev-python/pandas[${PYTHON_USEDEP}] ) + ) + gnuplot? ( sci-visualization/gnuplot )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/fio-2.2.13-libmtd.patch +) + +src_prepare() { + default + + sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die + + # Many checks don't have configure flags. + sed -i \ + -e "s:\:$(tc-getPKG_CONFIG):" \ + -e '/if compile_prog "" "-lzbc" "libzbc" *; *then/ '"s::if $(usex zbc true false) ; then:" \ + -e '/if compile_prog "" "-lz" "zl
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/
commit: 581399753bb491755cff0ff177496db2fdaaec32 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Feb 24 22:29:51 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Feb 24 22:29:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58139975 sys-kernel/genkernel: fix DEPEND Signed-off-by: Robin H. Johnson gentoo.org> sys-kernel/genkernel/genkernel-4.3.10.ebuild | 1 - sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild | 1 - sys-kernel/genkernel/genkernel-4.3.3.ebuild| 1 - sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild | 1 - sys-kernel/genkernel/genkernel-4.3.5.ebuild| 1 - sys-kernel/genkernel/genkernel-4.3.6.ebuild| 1 - sys-kernel/genkernel/genkernel-4.3.7.ebuild| 1 - sys-kernel/genkernel/genkernel-4.3.8.ebuild| 1 - 8 files changed, 8 deletions(-) diff --git a/sys-kernel/genkernel/genkernel-4.3.10.ebuild b/sys-kernel/genkernel/genkernel-4.3.10.ebuild index c18ee7e3f88f..c9fabf38f930 100644 --- a/sys-kernel/genkernel/genkernel-4.3.10.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.10.ebuild @@ -110,7 +110,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # because genkernel will usually build things like LVM2, cryptsetup, # mdadm... during initramfs generation which will require these # things. -DEPEND="" RDEPEND="${PYTHON_DEPS} app-alternatives/cpio >=app-misc/pax-utils-1.2.2 diff --git a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild index 770af1eccda7..3971e796aaec 100644 --- a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild @@ -108,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # because genkernel will usually build things like LVM2, cryptsetup, # mdadm... during initramfs generation which will require these # things. -DEPEND="" RDEPEND="${PYTHON_DEPS} app-alternatives/cpio >=app-misc/pax-utils-1.2.2 diff --git a/sys-kernel/genkernel/genkernel-4.3.3.ebuild b/sys-kernel/genkernel/genkernel-4.3.3.ebuild index 8155ec397784..8618d193cec9 100644 --- a/sys-kernel/genkernel/genkernel-4.3.3.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.3.ebuild @@ -108,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # because genkernel will usually build things like LVM2, cryptsetup, # mdadm... during initramfs generation which will require these # things. -DEPEND="" RDEPEND="${PYTHON_DEPS} app-alternatives/cpio >=app-misc/pax-utils-1.2.2 diff --git a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild index 68809b365657..8070ca6813a0 100644 --- a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild @@ -108,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # because genkernel will usually build things like LVM2, cryptsetup, # mdadm... during initramfs generation which will require these # things. -DEPEND="" RDEPEND="${PYTHON_DEPS} app-alternatives/cpio >=app-misc/pax-utils-1.2.2 diff --git a/sys-kernel/genkernel/genkernel-4.3.5.ebuild b/sys-kernel/genkernel/genkernel-4.3.5.ebuild index f210468636c1..ffe2daf3137c 100644 --- a/sys-kernel/genkernel/genkernel-4.3.5.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.5.ebuild @@ -108,7 +108,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # because genkernel will usually build things like LVM2, cryptsetup, # mdadm... during initramfs generation which will require these # things. -DEPEND="" RDEPEND="${PYTHON_DEPS} app-alternatives/cpio >=app-misc/pax-utils-1.2.2 diff --git a/sys-kernel/genkernel/genkernel-4.3.6.ebuild b/sys-kernel/genkernel/genkernel-4.3.6.ebuild index 7b5171fc41c2..92efe7ddce6c 100644 --- a/sys-kernel/genkernel/genkernel-4.3.6.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.6.ebuild @@ -110,7 +110,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # because genkernel will usually build things like LVM2, cryptsetup, # mdadm... during initramfs generation which will require these # things. -DEPEND="" RDEPEND="${PYTHON_DEPS} app-alternatives/cpio >=app-misc/pax-utils-1.2.2 diff --git a/sys-kernel/genkernel/genkernel-4.3.7.ebuild b/sys-kernel/genkernel/genkernel-4.3.7.ebuild index 9d8206aa81a2..b7e8a4a01a2f 100644 --- a/sys-kernel/genkernel/genkernel-4.3.7.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.7.ebuild @@ -110,7 +110,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # because genkernel will usually build things like LVM2, cryptsetup, # mdadm... during initramfs generation which will require these # things. -DEPEND="" RDEPEND="${PYTHON_DEPS} app-alternatives/cpio >=app-misc/pax-utils-1.2.2 diff --git a/sys-kernel/genkernel/genkernel-4.3.8.ebuil
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/
commit: e0a5cdb8d740ce21fbda02dff51e3742d6095594 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Feb 24 22:32:45 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Feb 24 22:32:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a5cdb8 sys-kernel/genkernel: fix PYTHON_COMPAT Signed-off-by: Robin H. Johnson gentoo.org> sys-kernel/genkernel/genkernel-4.3.10.ebuild | 2 +- sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild | 2 +- sys-kernel/genkernel/genkernel-4.3.3.ebuild| 2 +- sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild | 2 +- sys-kernel/genkernel/genkernel-4.3.5.ebuild| 2 +- sys-kernel/genkernel/genkernel-4.3.6.ebuild| 2 +- sys-kernel/genkernel/genkernel-4.3.7.ebuild| 2 +- sys-kernel/genkernel/genkernel-4.3.8.ebuild| 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys-kernel/genkernel/genkernel-4.3.10.ebuild b/sys-kernel/genkernel/genkernel-4.3.10.ebuild index c9fabf38f930..231d78668417 100644 --- a/sys-kernel/genkernel/genkernel-4.3.10.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.10.ebuild @@ -6,7 +6,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 python-single-r1 diff --git a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild index 3971e796aaec..e1b47412c7c8 100644 --- a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild @@ -6,7 +6,7 @@ EAPI="7" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 python-single-r1 diff --git a/sys-kernel/genkernel/genkernel-4.3.3.ebuild b/sys-kernel/genkernel/genkernel-4.3.3.ebuild index 8618d193cec9..7b750e86b11a 100644 --- a/sys-kernel/genkernel/genkernel-4.3.3.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.3.ebuild @@ -6,7 +6,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 python-single-r1 diff --git a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild index 8070ca6813a0..2801dccffcc4 100644 --- a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 python-single-r1 diff --git a/sys-kernel/genkernel/genkernel-4.3.5.ebuild b/sys-kernel/genkernel/genkernel-4.3.5.ebuild index ffe2daf3137c..d37e61489cda 100644 --- a/sys-kernel/genkernel/genkernel-4.3.5.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.5.ebuild @@ -6,7 +6,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 python-single-r1 diff --git a/sys-kernel/genkernel/genkernel-4.3.6.ebuild b/sys-kernel/genkernel/genkernel-4.3.6.ebuild index 92efe7ddce6c..07190a27fbea 100644 --- a/sys-kernel/genkernel/genkernel-4.3.6.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.6.ebuild @@ -6,7 +6,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 python-single-r1 diff --git a/sys-kernel/genkernel/genkernel-4.3.7.ebuild b/sys-kernel/genkernel/genkernel-4.3.7.ebuild index b7e8a4a01a2f..03810b3f08bc 100644 --- a/sys-kernel/genkernel/genkernel-4.3.7.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.7.ebuild @@ -6,7 +6,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 python-single-r1 diff --git a/sys-kernel/genkernel/genkernel-4.3.8.ebuild b/sys-kernel/genkernel/genkernel-4.3.8.ebuild index b7e8a4a01a2f..03810b3f08bc 100644 --- a/sys-kernel/genkernel/genkernel-4.3.8.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.8.ebuild @@ -6,7 +6,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 python-single-r1
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/
commit: 4a32b6fd118760218704b844122d506ff7388a22 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Feb 24 22:29:20 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Feb 24 22:29:20 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a32b6fd sys-kernel/genkernel: fix RESTRICT Signed-off-by: Robin H. Johnson gentoo.org> sys-kernel/genkernel/genkernel-4.3.10.ebuild | 1 - sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild | 1 - sys-kernel/genkernel/genkernel-4.3.3.ebuild| 1 - sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild | 1 - sys-kernel/genkernel/genkernel-4.3.5.ebuild| 1 - sys-kernel/genkernel/genkernel-4.3.6.ebuild| 1 - sys-kernel/genkernel/genkernel-4.3.7.ebuild| 1 - sys-kernel/genkernel/genkernel-4.3.8.ebuild| 1 - sys-kernel/genkernel/genkernel-.ebuild | 1 - 9 files changed, 9 deletions(-) diff --git a/sys-kernel/genkernel/genkernel-4.3.10.ebuild b/sys-kernel/genkernel/genkernel-4.3.10.ebuild index 505fe3f356e7..c18ee7e3f88f 100644 --- a/sys-kernel/genkernel/genkernel-4.3.10.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.10.ebuild @@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/ LICENSE="GPL-2" SLOT="0" -RESTRICT="" IUSE="ibm +firmware" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild index 571e5a35cd86..770af1eccda7 100644 --- a/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild @@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/ LICENSE="GPL-2" SLOT="0" -RESTRICT="" IUSE="ibm +firmware" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-kernel/genkernel/genkernel-4.3.3.ebuild b/sys-kernel/genkernel/genkernel-4.3.3.ebuild index 5cc642be67ca..8155ec397784 100644 --- a/sys-kernel/genkernel/genkernel-4.3.3.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.3.ebuild @@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/ LICENSE="GPL-2" SLOT="0" -RESTRICT="" IUSE="ibm +firmware" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild index 49d4b62d53d8..68809b365657 100644 --- a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild @@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/ LICENSE="GPL-2" SLOT="0" -RESTRICT="" IUSE="ibm +firmware" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-kernel/genkernel/genkernel-4.3.5.ebuild b/sys-kernel/genkernel/genkernel-4.3.5.ebuild index 860214201405..f210468636c1 100644 --- a/sys-kernel/genkernel/genkernel-4.3.5.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.5.ebuild @@ -100,7 +100,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/ LICENSE="GPL-2" SLOT="0" -RESTRICT="" IUSE="ibm +firmware" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-kernel/genkernel/genkernel-4.3.6.ebuild b/sys-kernel/genkernel/genkernel-4.3.6.ebuild index 8b6f12a6146d..7b5171fc41c2 100644 --- a/sys-kernel/genkernel/genkernel-4.3.6.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.6.ebuild @@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/ LICENSE="GPL-2" SLOT="0" -RESTRICT="" IUSE="ibm +firmware" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-kernel/genkernel/genkernel-4.3.7.ebuild b/sys-kernel/genkernel/genkernel-4.3.7.ebuild index 6de5f5963238..9d8206aa81a2 100644 --- a/sys-kernel/genkernel/genkernel-4.3.7.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.7.ebuild @@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/ LICENSE="GPL-2" SLOT="0" -RESTRICT="" IUSE="ibm +firmware" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-kernel/genkernel/genkernel-4.3.8.ebuild b/sys-kernel/genkernel/genkernel-4.3.8.ebuild index 6de5f5963238..9d8206aa81a2 100644 --- a/sys-kernel/genkernel/genkernel-4.3.8.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.8.ebuild @@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/ LICENSE="GPL-2" SLOT="0" -RESTRICT="" IUSE="ibm +firmware" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-kernel/genkernel/genkernel-.ebuild b/sys-kernel/genkernel/genkernel-.ebuild index b7d26415b641..46254b9348ab 100644 --- a/sys-kernel/genkernel/genkernel-.ebuild +++ b/sys-kernel/genkernel/genkernel-.ebuild @@ -102,7 +102,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/ LICENSE="GPL-2" SLOT="0" -RESTRICT="" IUSE="ibm +firmware" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/
commit: 722edc45751c56ef50fc1cbf0c2a4e76d7f009e4 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Feb 24 22:28:51 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Feb 24 22:28:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722edc45 sys-kernel/genkernel: fix whitespace Signed-off-by: Robin H. Johnson gentoo.org> sys-kernel/genkernel/genkernel-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/sys-kernel/genkernel/genkernel-.ebuild b/sys-kernel/genkernel/genkernel-.ebuild index 516580fbbd15..b7d26415b641 100644 --- a/sys-kernel/genkernel/genkernel-.ebuild +++ b/sys-kernel/genkernel/genkernel-.ebuild @@ -133,7 +133,6 @@ RDEPEND="${PYTHON_DEPS} firmware? ( sys-kernel/linux-firmware ) " - PATCHES=( )
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/
commit: c8d92c708aa800c05c5f29bf4d6c52c7fc10ec80 Author: Timothy Kenno Handojo gmail com> AuthorDate: Thu Feb 22 08:13:42 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Feb 24 22:06:40 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d92c70 sys-kernel/genkernel: Updated python version Signed-off-by: Timothy Kenno Handojo gmail.com> Signed-off-by: Robin H. Johnson gentoo.org> sys-kernel/genkernel/genkernel-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-kernel/genkernel/genkernel-.ebuild b/sys-kernel/genkernel/genkernel-.ebuild index deb515ad14ff..516580fbbd15 100644 --- a/sys-kernel/genkernel/genkernel-.ebuild +++ b/sys-kernel/genkernel/genkernel-.ebuild @@ -6,7 +6,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 python-single-r1
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/
commit: 2c49d2ffed7cc4365cf8dc9e8df340ae0b1bfc14 Author: Timothy Kenno Handojo gmail com> AuthorDate: Wed Feb 21 12:25:52 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Feb 24 22:06:39 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c49d2ff sys-kernel/genkernel: modernize build script Signed-off-by: Timothy Kenno Handojo gmail.com> Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/35089 sys-kernel/genkernel/genkernel-.ebuild | 76 +- 1 file changed, 11 insertions(+), 65 deletions(-) diff --git a/sys-kernel/genkernel/genkernel-.ebuild b/sys-kernel/genkernel/genkernel-.ebuild index 6de5f5963238..deb515ad14ff 100644 --- a/sys-kernel/genkernel/genkernel-.ebuild +++ b/sys-kernel/genkernel/genkernel-.ebuild @@ -111,7 +111,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # because genkernel will usually build things like LVM2, cryptsetup, # mdadm... during initramfs generation which will require these # things. -DEPEND="" +DEPEND=" + app-text/asciidoc +" RDEPEND="${PYTHON_DEPS} app-alternatives/cpio >=app-misc/pax-utils-1.2.2 @@ -128,11 +130,9 @@ RDEPEND="${PYTHON_DEPS} dev-build/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) - firmware? ( sys-kernel/linux-firmware )" + firmware? ( sys-kernel/linux-firmware ) +" -if [[ ${PV} == * ]]; then - DEPEND="${DEPEND} app-text/asciidoc" -fi PATCHES=( ) @@ -163,73 +163,19 @@ src_prepare() { popd >/dev/null || die fi - # Update software.sh - sed -i \ - -e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\ - -e "s:VERSION_BOOST:${VERSION_BOOST}:"\ - -e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\ - -e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\ - -e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\ - -e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\ - -e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\ - -e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\ - -e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\ - -e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\ - -e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\ - -e "s:VERSION_FUSE:${VERSION_FUSE}:"\ - -e "s:VERSION_GPG:${VERSION_GPG}:"\ - -e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\ - -e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\ - -e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\ - -e "s:VERSION_KMOD:${VERSION_KMOD}:"\ - -e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\ - -e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\ - -e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\ - -e "s:VERSION_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\ - -e "s:VERSION_LVM:${VERSION_LVM}:"\ - -e "s:VERSION_LZO:${VERSION_LZO}:"\ - -e "s:VERSION_MDADM:${VERSION_MDADM}:"\ - -e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\ - -e "s:VERSION_POPT:${VERSION_POPT}:"\ - -e "s:VERSION_STRACE:${VERSION_STRACE}:"\ - -e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\ - -e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\ - -e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\ - -e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\ - -e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\ - -e "s:VERSION_XZ:${VERSION_XZ}:"\ - -e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\ - -e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\ - "${S}"/defaults/software.sh \ - || die "Could not adjust versions" + # Export all the versions that may be used by genkernel build. + for v in $(set |awk -F= '/^VERSION_/{print $1}') ; do + export ${v} + done } src_compile() { - if [[ ${PV} == * ]] ; then - emake - fi + emake PREFIX=/usr } src_install() { - insinto /etc - doins "${S}"/genkernel.conf - - doman genkernel.8 + emake DESTDIR="${D}" PREFIX=/usr install dodoc AUTHORS ChangeLog README TODO - dobin genkernel - rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf - - if use ibm ; then - cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die - else - cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die - fi - - insinto /usr/share/genkernel - doins -r "${S}"/* - - fperms +x /usr/share/genkernel/gen_worker.sh - fperms +x /usr/share/genkernel/path_expander.py python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py
[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/
commit: 472cbf6119a834698effe44ed3d00f1c6109aecf Author: Robin H. Johnson gentoo org> AuthorDate: Mon Feb 19 22:31:21 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Feb 19 22:31:52 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=472cbf61 sys-fs/mdadm: cleanup Signed-off-by: Robin H. Johnson gentoo.org> sys-fs/mdadm/Manifest | 2 - sys-fs/mdadm/mdadm-4.1.ebuild | 94 --- 2 files changed, 96 deletions(-) diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest index d352735ae923..961f422d5fb6 100644 --- a/sys-fs/mdadm/Manifest +++ b/sys-fs/mdadm/Manifest @@ -1,4 +1,2 @@ -DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433 DIST mdadm-4.2.tar.xz 453624 BLAKE2B de7c4318dc5479de41378233869ab84ca2cd0e8a42310157b1acb969e7152af61556fbbe6f17bf6af4dfaf5543e49b1c982d2baeedf1c39b32f4db7f5502 SHA512 57897a2b7fb8b0b88bece50501099872bb45ddb076cfc323d563588096d2b66b1ecba3724534943f651ace2bfe591482570700616500dc3398552e4f9ff0c37d -DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 3cb5e42dcbd218a71e55127cecda6f2594a1b1691e17c05f52a8cd0ba05b556d2812772e53d78de025738d7c2de059df3f878b8290ba3906b3d75ef435bfb698 SHA512 e9b04abf195d7bda9fb0197eb926c01a69b879ef82c72af6497116cea9be8f0823408dddbe5c6c033f5fae554a8fec17299e361fa48045e033c87dcee1a0bb63 DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B dd04f2dd044d0bca85920eaf5c79a288d69c47a7ad7e36509a126c01ef63bd045d7e0530450650028de39d74ad852995ca080c3a73dbcb1cf1b3783118109f35 SHA512 3d36533d2713b663606919b2bfec18b15e18a6a0194e333e38e4a58f175da96af7b1fe16f0c36ee148e14492a4e0710b9fad6ac7856495b63c0176ebb7333be6 diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild deleted file mode 100644 index 21649c23547f.. --- a/sys-fs/mdadm/mdadm-4.1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic multilib systemd toolchain-funcs udev - -DESCRIPTION="Tool for running RAID systems - replacement for the raidtools" -HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"; -DEB_PF="4.1-3" -SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz - mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -[[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" -IUSE="static" - -BDEPEND="virtual/pkgconfig - app-arch/xz-utils" -RDEPEND=">=sys-apps/util-linux-2.16" -DEPEND="${RDEPEND}" - -# The tests edit values in /proc and run tests on software raid devices. -# Thus, they shouldn't be run on systems with active software RAID devices. -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188 -) - -mdadm_emake() { - # We should probably make corosync & libdlm into USE flags. #573782 - local args=( - PKG_CONFIG="$(tc-getPKG_CONFIG)" - CC="$(tc-getCC)" - CWFLAGS="-Wall" - CXFLAGS="${CFLAGS}" - UDEVDIR="$(get_udevdir)" - SYSTEMD_DIR="$(systemd_get_systemunitdir)" - COROSYNC="-DNO_COROSYNC" - DLM="-DNO_DLM" - - # https://bugs.gentoo.org/732276 - STRIP= - - "$@" - ) - emake "${args[@]}" -} - -src_compile() { - use static && append-ldflags -static - mdadm_emake all -} - -src_test() { - mdadm_emake test - - sh ./test || die -} - -src_install() { - mdadm_emake DESTDIR="${D}" install install-systemd - dodoc ChangeLog INSTALL TODO README* ANNOUNCE-* - - insinto /etc - newins mdadm.conf-example mdadm.conf - newinitd "${FILESDIR}"/mdadm.rc mdadm - newconfd "${FILESDIR}"/mdadm.confd mdadm - newinitd "${FILESDIR}"/mdraid.rc mdraid - newconfd "${FILESDIR}"/mdraid.confd mdraid - - # From the Debian patchset - into /usr - dodoc "${WORKDIR}"/debian/README.checkarray - dosbin "${WORKDIR}"/debian/checkarray - insinto /etc/default - newins "${FILESDIR}"/etc-default-mdadm mdadm - - exeinto /etc/cron.weekly - newexe "${FILESDIR}"/mdadm.weekly mdadm -} - -pkg_postinst() { - if ! systemd_is
[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/files/, sys-fs/mdadm/
commit: b0152d3ed507c45608377046bc2f65a48b47ec10 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Feb 19 20:32:53 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Feb 19 21:00:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0152d3e sys-fs/mdadm: improve mdmonitor on systemd Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/628968 sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch | 36 ++ sys-fs/mdadm/mdadm-4.2-r3.ebuild | 104 +++ 2 files changed, 140 insertions(+) diff --git a/sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch b/sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch new file mode 100644 index ..bd09da553820 --- /dev/null +++ b/sys-fs/mdadm/files/mdadm-4.2-mdadm_env.patch @@ -0,0 +1,36 @@ +--- mdadm-4.2/systemd/SUSE-mdadm_env.sh2021-12-30 11:43:35.0 -0800 mdadm-4.2/systemd/SUSE-mdadm_env.sh2024-02-19 12:20:56.509632098 -0800 +@@ -6,6 +7,12 @@ + + MDADM_SCAN="yes" + ++# Gentoo: source conf.d ++mdadmd_CONFIG=/etc/conf.d/mdadm ++if test -r $mdadmd_CONFIG; then ++ . $mdadmd_CONFIG ++fi ++ + # Following adapted from /etc/init.d/mdadmd on openSUSE + + mdadmd_CONFIG=/etc/sysconfig/mdadm +@@ -42,7 +49,8 @@ + fi + + mkdir -p /run/sysconfig +-echo "MDADM_MONITOR_ARGS=$MDADM_RAIDDEVICES $MDADM_DELAY $MDADM_MAIL $MDADM_PROGRAM $MDADM_SCAN $MDADM_SEND_MAIL $MDADM_CONFIG" > /run/sysconfig/mdadm ++# Gentoo: added $MDADM_OPTS to the end. ++echo "MDADM_MONITOR_ARGS=$MDADM_RAIDDEVICES $MDADM_DELAY $MDADM_MAIL $MDADM_PROGRAM $MDADM_SCAN $MDADM_SEND_MAIL $MDADM_CONFIG $MDADM_OPTS" > /run/sysconfig/mdadm + if [ -n "$MDADM_CHECK_DURATION" ]; then + echo "MDADM_CHECK_DURATION=$MDADM_CHECK_DURATION" >> /run/sysconfig/mdadm + fi +--- mdadm-4.2.orig/Makefile2024-02-19 12:27:19.512400849 -0800 mdadm-4.2/Makefile 2024-02-19 12:27:39.517338433 -0800 +@@ -298,7 +298,7 @@ + $(INSTALL) -D -m 755 .install.tmp.3 $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \ + rm -f .install.tmp.3; \ + done +- if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(LIB_DIR)/mdadm_env.sh ;fi ++ $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(LIB_DIR)/mdadm_env.sh + + install-bin: mdadm mdmon + $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm diff --git a/sys-fs/mdadm/mdadm-4.2-r3.ebuild b/sys-fs/mdadm/mdadm-4.2-r3.ebuild new file mode 100644 index ..0b2549330957 --- /dev/null +++ b/sys-fs/mdadm/mdadm-4.2-r3.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic systemd toolchain-funcs udev + +DESCRIPTION="Tool for running RAID systems - replacement for the raidtools" +HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"; +DEB_PF="4.2~rc2-7" +SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz + mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +[[ "${PV}" = *_rc* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="static systemd +udev" + +REQUIRED_USE="static? ( !udev )" + +BDEPEND="app-arch/xz-utils + virtual/pkgconfig" +DEPEND="udev? ( virtual/libudev:= )" +RDEPEND="${DEPEND} + >=sys-apps/util-linux-2.16" + +# The tests edit values in /proc and run tests on software raid devices. +# Thus, they shouldn't be run on systems with active software RAID devices. +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}"-3.4-sysmacros.patch #580188 + "${FILESDIR}/${PN}"-4.2-in_initrd-collision.patch #830461 + "${FILESDIR}/${PN}"-4.2-mdadm_env.patch #628968 +) + +mdadm_emake() { + # We should probably make corosync & libdlm into USE flags. #573782 + local args=( + PKG_CONFIG="$(tc-getPKG_CONFIG)" + CC="$(tc-getCC)" + CWFLAGS="-Wall" + CXFLAGS="${CFLAGS}" + UDEVDIR="$(get_udevdir)" + SYSTEMD_DIR="$(systemd_get_systemunitdir)" + COROSYNC="-DNO_COROSYNC" + DLM="-DNO_DLM" + + # https://bugs.gentoo.org/732276 + STRIP= + + "$@" + ) + emake "${args[@]}" +} + +src_compile() { + use static && append-ldflags -static + + # CPPFLAGS won't work for this + use udev || append-cflags -DNO_LIBUDEV
[gentoo-commits] repo/gentoo:master commit in: sys-fs/mdadm/
commit: 8e652d5963af48b187620ca32b1798bbffca52a9 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Feb 19 20:34:11 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Feb 19 21:00:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e652d59 sys-fs/mdadm: QA fix missing udev_reload Signed-off-by: Robin H. Johnson gentoo.org> Closes: https://bugs.gentoo.org/851894 sys-fs/mdadm/mdadm-4.2-r3.ebuild | 5 + 1 file changed, 5 insertions(+) diff --git a/sys-fs/mdadm/mdadm-4.2-r3.ebuild b/sys-fs/mdadm/mdadm-4.2-r3.ebuild index 0b2549330957..176f5e80c06c 100644 --- a/sys-fs/mdadm/mdadm-4.2-r3.ebuild +++ b/sys-fs/mdadm/mdadm-4.2-r3.ebuild @@ -93,6 +93,7 @@ src_install() { } pkg_postinst() { + udev_reload if ! systemd_is_booted; then if [[ -z ${REPLACING_VERSIONS} ]] ; then # Only inform people the first time they install. @@ -102,3 +103,7 @@ pkg_postinst() { fi fi } + +pkg_postrm() { + udev_reload +}
[gentoo-commits] proj/genkernel:master commit in: /
commit: 8f90911e1e4b622ee4c716f118b7021e291e90f1 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Feb 17 05:53:39 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Feb 17 05:53:39 2024 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8f90911e doc: point to gitweb for old ChangeLog Signed-off-by: Robin H. Johnson gentoo.org> HACKING | 6 ++ 1 file changed, 6 insertions(+) diff --git a/HACKING b/HACKING index 62bbd37..19aa5f9 100644 --- a/HACKING +++ b/HACKING @@ -42,3 +42,9 @@ Rolling a release: git shortlog ${PREV_TAG}..v${PV} | xsel to generate the mail body. + +Changes: +Changelogs prior to 2012 are available in Changelog.old [1], removed from +regular distribution in commit 4ec9886457a58330843f5c46a38e73fda9957410. + +[1] https://gitweb.gentoo.org/proj/genkernel.git/tree/ChangeLog.old?id=71507545eec3031ade9b4f9a314c53216f2c97f2
[gentoo-commits] proj/genkernel:master commit in: /
commit: 96e15a9bc9c9462f7eb5986bb77e155ca92dd797 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Feb 17 05:55:17 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Feb 17 05:55:17 2024 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=96e15a9b build: fix manpage install Signed-off-by: Robin H. Johnson gentoo.org> Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5f8e031..1e20ef5 100644 --- a/Makefile +++ b/Makefile @@ -216,7 +216,7 @@ install: all install $(BUILD_DIR)/software.sh $(DESTDIR)/$(PREFIX)/share/genkernel/defaults - install -d $(DESTDIR)/$(MANDIR) + install -d $(DESTDIR)/$(MANDIR)/man8 install $(BUILD_DIR)/genkernel.8 $(DESTDIR)/$(MANDIR)/man8 # No trailing blank lines please.
[gentoo-commits] proj/genkernel:master commit in: /
commit: 5e5966d0b507fbb2cb96fe8ff5083101e72360e6 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Feb 17 05:14:32 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Feb 17 05:14:32 2024 + URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5e5966d0 build: merge Modernize Makefile Closes: https://github.com/gentoo/genkernel/pull/56 Thanks: Timothy Kenno Handojo gmail.com> Signed-off-by: Robin H. Johnson gentoo.org> Makefile | 136 --- defaults/software.sh | 68 +- 2 files changed, 163 insertions(+), 41 deletions(-)