Weekly portage-stable package updates 2026-06-08

sdk_container/src/third_party/portage-stable/app-admin/logrotate/files/logrotate-3.22.0-tests-locale.patch

@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/934983
+https://github.com/logrotate/logrotate/commit/04b21743980c4e236ca5e8de18173fbd3848573b
+
+From 04b21743980c4e236ca5e8de18173fbd3848573b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
+Date: Sat, 8 Jun 2024 17:59:40 +0200
+Subject: [PATCH] test: avoid locale dependent errno string
+
+String representations of errno values are locale dependent, thus avoid
+using them.
+---
+ test/test-0112.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test-0112.sh b/test/test-0112.sh
+index 812632b1..fa9eed65 100755
+--- a/test/test-0112.sh
++++ b/test/test-0112.sh
+@@ -23,7 +23,7 @@ test_reg.log.1.gz 1 zero
+ test_reg.log.2.gz 1 first
+ EOF
+
+-grep "test_fifo.log.1 (read-only) for compression: Operation not supported" error.log >/dev/null
++grep "^error: unable to open .*/test_fifo\.log\.1 (read-only) for compression: " error.log >/dev/null
+ if [ $? != 0 ]; then
+ 	echo "No error printed, but there should be one."
+ 	exit 3
+

sdk_container/src/third_party/portage-stable/app-admin/logrotate/files/logrotate-3.22.0-tests-selinux.patch

@@ -0,0 +1,184 @@
+https://github.com/logrotate/logrotate/issues/632
+https://github.com/logrotate/logrotate/pull/633
+
+From d2e090a9c0ba62aeab8c415aecf3067297f3eccc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
+Date: Sat, 3 Aug 2024 19:07:38 +0200
+Subject: [PATCH] Avoid opening log file for getting SELinux context
+
+Currently setSecCtxByName() uses open_logfile() to get a file descriptor
+to the current log file to retrieve its security context.
+open_logfile() performs additional checks, like whether the file is a
+regular file, which alter the control flow between systems with SELinux
+enabled and disabled.  This can be observed in the reported issue #632.
+Use lgetfilecon_raw() instead to have the same behavior for SELinux
+enabled and disabled systems and delay the checks for invalid log files
+to code executed in both cases.
+
+Closes: #632
+---
+ logrotate.c | 89 ++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 51 insertions(+), 38 deletions(-)
+
+diff --git a/logrotate.c b/logrotate.c
+index ba779950..c62e7c78 100644
+--- a/logrotate.c
++++ b/logrotate.c
+@@ -361,27 +361,9 @@ static int movefd(int oldfd, int newfd)
+     return rc;
+ }
+
+-static int setSecCtx(int fdSrc, const char *src, char **pPrevCtx)
+-{
+ #ifdef WITH_SELINUX
+-    char *srcCtx;
+-    *pPrevCtx = NULL;
+-
+-    if (!selinux_enabled)
+-        /* pretend success */
+-        return 0;
+-
+-    /* read security context of fdSrc */
+-    if (fgetfilecon_raw(fdSrc, &srcCtx) < 0) {
+-        if (errno == ENOTSUP)
+-            /* pretend success */
+-            return 0;
+-
+-        message(MESS_ERROR, "getting file context %s: %s\n", src,
+-                strerror(errno));
+-        return selinux_enforce;
+-    }
+-
++static int setSecCtx(char *srcCtx, char **pPrevCtx)
++{
+     /* save default security context for restoreSecCtx() */
+     if (getfscreatecon_raw(pPrevCtx) < 0) {
+         message(MESS_ERROR, "getting default context: %s\n", strerror(errno));
+@@ -401,37 +383,68 @@ static int setSecCtx(int fdSrc, const char *src, char **pPrevCtx)
+
+     message(MESS_DEBUG, "set default create context to %s\n", srcCtx);
+     freecon(srcCtx);
++
++    return 0;
++}
++#endif /* WITH_SELINUX */
++
++static int setSecCtxByFd(int fdSrc, const char *src, char **pPrevCtx)
++{
++#ifdef WITH_SELINUX
++    char *srcCtx;
++    *pPrevCtx = NULL;
++
++    if (!selinux_enabled)
++        /* pretend success */
++        return 0;
++
++    /* read security context of fdSrc */
++    if (fgetfilecon_raw(fdSrc, &srcCtx) < 0) {
++        if (errno == ENOTSUP)
++            /* pretend success */
++            return 0;
++
++        message(MESS_ERROR, "getting file context %s: %s\n", src,
++                strerror(errno));
++        return selinux_enforce;
++    }
++
++    return setSecCtx(srcCtx, pPrevCtx);
+ #else
+     (void) fdSrc;
+     (void) src;
+     (void) pPrevCtx;
+-#endif
+     return 0;
++#endif /* WITH_SELINUX */
+ }
+
+-static int setSecCtxByName(const char *src, const struct logInfo *log, char **pPrevCtx)
++static int setSecCtxByName(const char *src, char **pPrevCtx)
+ {
+-    int hasErrors = 0;
+ #ifdef WITH_SELINUX
+-    int fd;
++    char *srcCtx;
++    *pPrevCtx = NULL;
+
+     if (!selinux_enabled)
+         /* pretend success */
+         return 0;
+
+-    fd = open_logfile(src, log, 0);
+-    if (fd < 0) {
+-        message(MESS_ERROR, "error opening %s: %s\n", src, strerror(errno));
+-        return 1;
++    /* read security context of src */
++    if (lgetfilecon_raw(src, &srcCtx) < 0) {
++        if (errno == ENOTSUP)
++            /* pretend success */
++            return 0;
++
++        message(MESS_ERROR, "getting file context %s: %s\n", src,
++                strerror(errno));
++        return selinux_enforce;
+     }
+-    hasErrors = setSecCtx(fd, src, pPrevCtx);
+-    close(fd);
++
++    return setSecCtx(srcCtx, pPrevCtx);
+ #else
+     (void) src;
+-    (void) log;
+     (void) pPrevCtx;
+-#endif
+-    return hasErrors;
++    return 0;
++#endif /* WITH_SELINUX */
+ }
+
+ static void restoreSecCtx(char **pPrevCtx)
+@@ -874,7 +887,7 @@ static int compressLogFile(const char *name, const struct logInfo *log, const st
+         return 1;
+     }
+
+-    if (setSecCtx(inFile, name, &prevCtx) != 0) {
++    if (setSecCtxByFd(inFile, name, &prevCtx) != 0) {
+         /* error msg already printed */
+         close(inFile);
+         return 1;
+@@ -1307,7 +1320,7 @@ static int copyTruncate(const char *currLog, const char *saveLog, const struct s
+         if (!skip_copy) {
+             char *prevCtx;
+
+-            if (setSecCtx(fdcurr, currLog, &prevCtx) != 0) {
++            if (setSecCtxByFd(fdcurr, currLog, &prevCtx) != 0) {
+                 /* error msg already printed */
+                 goto fail;
+             }
+@@ -1905,7 +1918,7 @@ static int prerotateSingleLog(const struct logInfo *log, unsigned logNum,
+     message(MESS_DEBUG, "dateext suffix '%s'\n", dext_str);
+     message(MESS_DEBUG, "glob pattern '%s'\n", dext_pattern);
+
+-    if (setSecCtxByName(log->files[logNum], log, &prev_context) != 0) {
++    if (setSecCtxByName(log->files[logNum], &prev_context) != 0) {
+         /* error msg already printed */
+         return 1;
+     }
+@@ -2186,7 +2199,7 @@ static int rotateSingleLog(const struct logInfo *log, unsigned logNum,
+     if (!hasErrors) {
+
+         if (!(log->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY))) {
+-            if (setSecCtxByName(log->files[logNum], log, &savedContext) != 0) {
++            if (setSecCtxByName(log->files[logNum], &savedContext) != 0) {
+                 /* error msg already printed */
+                 return 1;
+             }
+@@ -2730,7 +2743,7 @@ static int writeState(const char *stateFilename)
+
+     /* get attributes, to assign them to the new state file */
+
+-    if (setSecCtx(fdcurr, stateFilename, &prevCtx) != 0) {
++    if (setSecCtxByFd(fdcurr, stateFilename, &prevCtx) != 0) {
+         /* error msg already printed */
+         free(tmpFilename);
+         close(fdcurr);
+

sdk_container/src/third_party/portage-stable/app-admin/logrotate/logrotate-3.22.0-r1.ebuild

@@ -0,0 +1,113 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/logrotate/logrotate"
+	inherit autotools git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/cgzones.asc
+	inherit verify-sig
+
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz.asc )"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-cgzones )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl +cron selinux"
+
+DEPEND="
+	>=dev-libs/popt-1.5
+	acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )
+"
+RDEPEND="
+	${DEPEND}
+	cron? ( virtual/cron )
+	selinux? ( sec-policy/selinux-logrotate )
+"
+
+STATEFILE="${EPREFIX}/var/lib/misc/logrotate.status"
+OLDSTATEFILE="${EPREFIX}/var/lib/logrotate.status"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.15.0-ignore-hidden.patch
+	"${FILESDIR}"/${P}-tests-locale.patch
+	"${FILESDIR}"/${P}-tests-selinux.patch
+)
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' examples/logrotate.{cron,service} || die
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with acl) \
+		$(use_with selinux) \
+		--with-state-file-path="${STATEFILE}"
+}
+
+src_install() {
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+
+	move_old_state_file
+
+	tmpfiles_process ${PN}.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}

sdk_container/src/third_party/portage-stable/app-admin/logrotate/logrotate-3.22.0.ebuild

@@ -1,19 +1,30 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/cgzones.asc
-inherit systemd tmpfiles verify-sig
+inherit systemd tmpfiles
 
 DESCRIPTION="Rotates, compresses, and mails system logs"
 HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz.asc )"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/logrotate/logrotate"
+	inherit autotools git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/cgzones.asc
+	inherit verify-sig
+
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz.asc )"
+
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-cgzones )"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="acl +cron selinux"
 
 DEPEND="
@@ -26,7 +37,6 @@ RDEPEND="
 	cron? ( virtual/cron )
 	selinux? ( sec-policy/selinux-logrotate )
 "
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-cgzones )"
 
 STATEFILE="${EPREFIX}/var/lib/misc/logrotate.status"
 OLDSTATEFILE="${EPREFIX}/var/lib/logrotate.status"
@@ -53,6 +63,8 @@ src_prepare() {
 	default
 
 	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' examples/logrotate.{cron,service} || die
+
+	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {