From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/, dev-libs/libcgroup/files/
Date: Tue, 20 May 2025 14:06:44 +0000 (UTC) [thread overview]
Message-ID: <1747749980.2c639721106f1d791e5968c809c6fa104bf780b0.sam@gentoo> (raw)
commit: 2c639721106f1d791e5968c809c6fa104bf780b0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 20 13:22:53 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 20 14:06:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c639721
dev-libs/libcgroup: drop 0.41-r6, 3.0.0, 3.0.0-r1
Closes: https://bugs.gentoo.org/948939
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libcgroup/Manifest | 2 -
dev-libs/libcgroup/files/cgconfig.confd-r1 | 7 -
dev-libs/libcgroup/files/cgconfig.initd-r1 | 52 -----
.../files/libcgroup-0.41-remove-umask.patch | 28 ---
| 28 ---
.../files/libcgroup-0.41-replace_DECLS.patch | 225 ---------------------
.../files/libcgroup-0.41-replace_INLCUDES.patch | 74 -------
.../libcgroup/files/libcgroup-0.41-slibtool.patch | 59 ------
.../files/libcgroup-3.0.0-configure-bashism.patch | 35 ----
.../files/libcgroup-3.0.0-musl-strerror_r.patch | 45 -----
dev-libs/libcgroup/libcgroup-0.41-r6.ebuild | 102 ----------
dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild | 115 -----------
dev-libs/libcgroup/libcgroup-3.0.0.ebuild | 113 -----------
13 files changed, 885 deletions(-)
diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
index 48d5b3481552..03340db8b09c 100644
--- a/dev-libs/libcgroup/Manifest
+++ b/dev-libs/libcgroup/Manifest
@@ -1,3 +1 @@
-DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd
-DIST libcgroup-3.0.0.tar.gz 1125800 BLAKE2B 5d4999ac513de756ffe741d2e959c01d8500a2000f521dff31832e1ef545869fb9c8ae1c78d05aaa051e7e6e68266bd57a751ba3aa897966a83ff50128090ba5 SHA512 1e8a7c9a71d928ab0e354254b007b30fc159a30e441bd52a03ded142420c94e130594bb512680c62fc22f5193934fb78afc31453342b032d1db3197fd4c3e606
DIST libcgroup-3.1.0.tar.gz 1223547 BLAKE2B 3cd3ca779b4453df71aba584ad8fe654fb55478ad89b36ba5deccf46e3ef331b11dc32a9a72dfa525784558701a72fd0777e05275233e599015ae93269661534 SHA512 84272e811422f2105e275ccadbd333fe6da495da5504cd97acd3101718e27b52e0f56b62f847933b32d613e15c170d1b998d85a89c1591e8ce37c33043f3e00b
diff --git a/dev-libs/libcgroup/files/cgconfig.confd-r1 b/dev-libs/libcgroup/files/cgconfig.confd-r1
deleted file mode 100644
index 334958ef3b8f..000000000000
--- a/dev-libs/libcgroup/files/cgconfig.confd-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/cgconfig: config file for /etc/init.d/cgconfig
-
-# Configuration file location
-CG_CONFIGFILE=/etc/cgroup/cgconfig.conf
-
-# Enable calssifying pid according to rules if necessary
-CG_CLASSIFY=No
diff --git a/dev-libs/libcgroup/files/cgconfig.initd-r1 b/dev-libs/libcgroup/files/cgconfig.initd-r1
deleted file mode 100644
index e0fef9caab21..000000000000
--- a/dev-libs/libcgroup/files/cgconfig.initd-r1
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CGCONFIGPARSER="/usr/sbin/cgconfigparser"
-CGCLASSIFY="/usr/sbin/cgclassify"
-: ${CG_CONFIGFILE:=/etc/cgroup/cgconfig.conf}
-description="Control Group Configuration Service"
-
-start()
-{
- ebegin "Setting up CGroups"
- ${CGCONFIGPARSER} --load=${CG_CONFIGFILE} >/dev/null 2>&1
- eend "$?"
-}
-
-start_post()
-{
- # Classify PID according to the rules if requested
- yesno "${CG_CLASSIFY}" || return 0
- ebegin "Classifying PID to CGroups"
- local pid
- for pid in $(ps --no-headers -eL o tid); do
- ${CGCLASSIFY} ${pid}
- done
- eend "$?"
-}
-
-stop()
-{
- cgconfig_umount
-}
-
-cgconfig_umount()
-{
- local ctrl eq mnt_pnt mnt_pts
-
- while read ctrl eq mnt_pnt; do
- case "${ctrl}" in
- (\#*) continue ;;
- (mount*) mnt_pts=true;;
- (\}*) mnt_pts= ;;
- (*)
- [ -n "${mnt_pts}" ] || continue
- mnt_pnt="${mnt_pnt%;}"
- ebegin "Unmounting ${mnt_pnt}"
- umount "${mnt_pnt}"
- eend "$?"
- ;;
- esac
- done < "${CG_CONFIGFILE}"
-}
diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch b/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch
deleted file mode 100644
index 42286ae8785f..000000000000
--- a/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 0d88b73d189ea3440ccaab00418d6469f76fa590
-Author: Michal Hocko <mhocko@suse.com>
-Date: Wed Jul 18 11:24:29 2018 +0200
-
- cgrulesengd: remove umask(0)
-
- One of our partners has noticed that cgred daemon is creating a log file
- (/var/log/cgred) with too wide permissions (0666) and that is seen as
- a security bug because an untrusted user can write to otherwise
- restricted area. CVE-2018-14348 has been assigned to this issue.
-
- Signed-off-by: Michal Hocko <mhocko@suse.com>
- Acked-by: Balbir Singh <bsingharora@gmail.com>
-
-diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c
-index ea51f11..0d288f3 100644
---- a/src/daemon/cgrulesengd.c
-+++ b/src/daemon/cgrulesengd.c
-@@ -889,9 +889,6 @@ int cgre_start_daemon(const char *logp, const int logf,
- } else if (pid > 0) {
- exit(EXIT_SUCCESS);
- }
--
-- /* Change the file mode mask. */
-- umask(0);
- } else {
- flog(LOG_DEBUG, "Not using daemon mode\n");
- pid = getpid();
diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-reorder-headers.patch b/dev-libs/libcgroup/files/libcgroup-0.41-reorder-headers.patch
deleted file mode 100644
index 78a3d09a3a08..000000000000
--- a/dev-libs/libcgroup/files/libcgroup-0.41-reorder-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-libcgroup-internal.h: reorder the header stacking.
-
-`man 3 fts` not only specifies the headers to be included, but
-also the order. <fts.h> must be included after <sys/types.h>
-and <sys/stats.h>. On glibc and uClibc systems, an incorrect
-order does not pose a problem, but on musl this leads to undefine
-types such as dev_t and friends.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Naur libcgroup-0.41.orig/src/libcgroup-internal.h libcgroup-0.41/src/libcgroup-internal.h
---- libcgroup-0.41.orig/src/libcgroup-internal.h 2015-07-13 21:08:26.740965713 -0400
-+++ libcgroup-0.41/src/libcgroup-internal.h 2015-07-13 21:09:40.774962164 -0400
-@@ -21,12 +21,12 @@
- #endif
-
- #include "config.h"
--#include <fts.h>
- #include <libcgroup.h>
- #include <limits.h>
- #include <pthread.h>
--#include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fts.h>
- #include <setjmp.h>
-
- /* Maximum number of mount points/controllers */
diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch b/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch
deleted file mode 100644
index 770109310c67..000000000000
--- a/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-Replace __BEGIN_DECLS and __END_DECLS with extern "C".
-
-The macros __BEGIN_DECLS and __END_DECLS are a GNU-ism found in
-glibc and uClibc, but not musl. We replace them by the more general
-extern "C" { ... } block exposed only if we have __cplusplus.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Naur libcgroup-0.41.orig/include/libcgroup/config.h libcgroup-0.41/include/libcgroup/config.h
---- libcgroup-0.41.orig/include/libcgroup/config.h 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/config.h 2015-07-11 23:19:20.451977284 +0000
-@@ -9,7 +9,9 @@
- #include <features.h>
- #endif
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /**
- * @defgroup group_config 5. Configuration
-@@ -107,6 +109,8 @@
- * @}
- * @}
- */
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /*_LIBCGROUP_CONFIG_H*/
-diff -Naur libcgroup-0.41.orig/include/libcgroup/error.h libcgroup-0.41/include/libcgroup/error.h
---- libcgroup-0.41.orig/include/libcgroup/error.h 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/error.h 2015-07-11 23:19:34.253977328 +0000
-@@ -9,7 +9,9 @@
- #include <features.h>
- #endif
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /**
- * @defgroup group_errors 6. Error handling
-@@ -99,6 +101,8 @@
- * @}
- * @}
- */
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* _LIBCGROUP_INIT_H */
-diff -Naur libcgroup-0.41.orig/include/libcgroup/groups.h libcgroup-0.41/include/libcgroup/groups.h
---- libcgroup-0.41.orig/include/libcgroup/groups.h 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/groups.h 2015-07-11 23:19:40.305977347 +0000
-@@ -11,7 +11,9 @@
- #include <stdbool.h>
- #endif
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /**
- * Flags for cgroup_delete_cgroup_ext().
-@@ -577,6 +579,8 @@
- */
-
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* _LIBCGROUP_GROUPS_H */
-diff -Naur libcgroup-0.41.orig/include/libcgroup/init.h libcgroup-0.41/include/libcgroup/init.h
---- libcgroup-0.41.orig/include/libcgroup/init.h 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/init.h 2015-07-11 23:19:46.369977366 +0000
-@@ -9,7 +9,9 @@
- #include <features.h>
- #endif
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /**
- * @defgroup group_init 1. Initialization
-@@ -58,6 +60,8 @@
- * @}
- * @}
- */
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* _LIBCGROUP_INIT_H */
-diff -Naur libcgroup-0.41.orig/include/libcgroup/iterators.h libcgroup-0.41/include/libcgroup/iterators.h
---- libcgroup-0.41.orig/include/libcgroup/iterators.h 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/iterators.h 2015-07-11 23:19:53.353977388 +0000
-@@ -11,7 +11,9 @@
- #include <features.h>
- #endif
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /**
- * @defgroup group_iterators 3. Iterators
-@@ -423,6 +425,8 @@
- * @}
- */
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* _LIBCGROUP_ITERATORS_H */
-diff -Naur libcgroup-0.41.orig/include/libcgroup/log.h libcgroup-0.41/include/libcgroup/log.h
---- libcgroup-0.41.orig/include/libcgroup/log.h 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/log.h 2015-07-11 23:19:58.922977406 +0000
-@@ -11,7 +11,9 @@
-
- #include <stdarg.h>
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /**
- * @defgroup group_log 7. Logging
-@@ -142,6 +144,8 @@
- * @}
- * @}
- */
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* _LIBCGROUP_LOG_H */
-diff -Naur libcgroup-0.41.orig/include/libcgroup/tasks.h libcgroup-0.41/include/libcgroup/tasks.h
---- libcgroup-0.41.orig/include/libcgroup/tasks.h 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/tasks.h 2015-07-11 23:20:03.329977420 +0000
-@@ -12,7 +12,9 @@
- #include <stdbool.h>
- #endif
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /** Flags for cgroup_change_cgroup_uid_gid(). */
- enum cgflags {
-@@ -204,6 +206,8 @@
- * @}
- * @}
- */
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* _LIBCGROUP_TASKS_H */
-diff -Naur libcgroup-0.41.orig/src/daemon/cgrulesengd.h libcgroup-0.41/src/daemon/cgrulesengd.h
---- libcgroup-0.41.orig/src/daemon/cgrulesengd.h 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/daemon/cgrulesengd.h 2015-07-11 23:20:34.282977519 +0000
-@@ -17,7 +17,9 @@
-
- #include <features.h>
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- #include "config.h"
- #include "libcgroup.h"
-@@ -119,7 +121,9 @@
- */
- void cgre_catch_term(int signum);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif /* _CGRULESENGD_H */
-
-diff -Naur libcgroup-0.41.orig/src/libcgroup-internal.h libcgroup-0.41/src/libcgroup-internal.h
---- libcgroup-0.41.orig/src/libcgroup-internal.h 2015-07-11 23:16:37.497976764 +0000
-+++ libcgroup-0.41/src/libcgroup-internal.h 2015-07-11 23:20:22.299977481 +0000
-@@ -16,7 +16,9 @@
-
- #define __LIBCG_INTERNAL
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- #include "config.h"
- #include <fts.h>
-@@ -279,6 +281,8 @@
- */
- int cg_chmod_path(const char *path, mode_t mode, int owner_is_umask);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif
diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch b/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch
deleted file mode 100644
index 191de87d814d..000000000000
--- a/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Replace INCLUDES with AM_CPPFLAGS in Makefile.am
-
-We replace the deprecated INCLUDES with AM_CPPFLAGS in all
-Makefile.am's.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Naur libcgroup-0.41.orig/src/Makefile.am libcgroup-0.41/src/Makefile.am
---- libcgroup-0.41.orig/src/Makefile.am 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/Makefile.am 2015-07-13 14:36:38.922428040 +0000
-@@ -9,7 +9,7 @@
-
- CLEANFILES = lex.c parse.c parse.h
-
--INCLUDES = -I$(top_srcdir)/include
-+AM_CPPFLAGS = -I$(top_srcdir)/include
- lib_LTLIBRARIES = libcgroup.la
- libcgroup_la_SOURCES = parse.h parse.y lex.l api.c config.c libcgroup-internal.h libcgroup.map wrapper.c log.c
- libcgroup_la_LIBADD = -lpthread
-diff -Naur libcgroup-0.41.orig/src/bindings/Makefile.am libcgroup-0.41/src/bindings/Makefile.am
---- libcgroup-0.41.orig/src/bindings/Makefile.am 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/bindings/Makefile.am 2015-07-13 14:37:12.267428146 +0000
-@@ -1,5 +1,5 @@
- SUBDIRS = .
--INCLUDES = -I$(top_srcdir)/include
-+AM_CPPFLAGS = -I$(top_srcdir)/include
-
- lib_LTLIBRARIES = _libcgroup.la
- _libcgroup_la_SOURCES = libcgroup.c
-@@ -11,5 +11,5 @@
-
- libcgroup.c: libcgroup.p $(top_srcdir)/include/libcgroup.h
- cp libcgroup.p libcgroup.i
-- $(CC) $(INCLUDES) -DSWIG -E $(top_srcdir)/include/libcgroup.h >> libcgroup.i
-+ $(CC) $(CPPFLAGS) -DSWIG -E $(top_srcdir)/include/libcgroup.h >> libcgroup.i
- $(SWIG) -python -o libcgroup.c libcgroup.i
-diff -Naur libcgroup-0.41.orig/src/daemon/Makefile.am libcgroup-0.41/src/daemon/Makefile.am
---- libcgroup-0.41.orig/src/daemon/Makefile.am 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/daemon/Makefile.am 2015-07-13 14:36:55.781428093 +0000
-@@ -1,4 +1,4 @@
--INCLUDES = -I $(top_srcdir)/include
-+AM_CPPFLAGS = -I $(top_srcdir)/include
-
- if WITH_DAEMON
-
-diff -Naur libcgroup-0.41.orig/src/pam/Makefile.am libcgroup-0.41/src/pam/Makefile.am
---- libcgroup-0.41.orig/src/pam/Makefile.am 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/pam/Makefile.am 2015-07-13 14:36:28.768428007 +0000
-@@ -1,4 +1,4 @@
--INCLUDES = -I $(top_srcdir)/include
-+AM_CPPFLAGS = -I $(top_srcdir)/include
-
- if WITH_PAM
-
-diff -Naur libcgroup-0.41.orig/src/tools/Makefile.am libcgroup-0.41/src/tools/Makefile.am
---- libcgroup-0.41.orig/src/tools/Makefile.am 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/tools/Makefile.am 2015-07-13 14:36:19.098427976 +0000
-@@ -1,4 +1,4 @@
--INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include
-+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
- LDADD = $(top_builddir)/src/.libs/libcgroup.la
-
- if WITH_TOOLS
-diff -Naur libcgroup-0.41.orig/tests/Makefile.am libcgroup-0.41/tests/Makefile.am
---- libcgroup-0.41.orig/tests/Makefile.am 2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/tests/Makefile.am 2015-07-13 14:37:23.146428181 +0000
-@@ -1,6 +1,6 @@
- SUBDIRS = tools
-
--INCLUDES = -I$(top_srcdir)/include
-+AM_CPPFLAGS = -I$(top_srcdir)/include
- LDADD = $(top_builddir)/src/.libs/libcgroup.la
-
- # compile the tests, but do not install them
diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-slibtool.patch b/dev-libs/libcgroup/files/libcgroup-0.41-slibtool.patch
deleted file mode 100644
index 114209116bf6..000000000000
--- a/dev-libs/libcgroup/files/libcgroup-0.41-slibtool.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://bugs.gentoo.org/777450
-
-commit 0c710d2f82184984e73b643a8e752f55371c6bc8
-Author: orbea <orbea@riseup.net>
-Date: Sun Mar 21 13:24:23 2021 -0700
-
- build: Remove .libs from Makefile.am files.
-
- Signed-off-by: orbea <orbea@riseup.net>
-
-diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am
-index 8bb7334..c59641b 100644
---- a/src/bindings/Makefile.am
-+++ b/src/bindings/Makefile.am
-@@ -5,7 +5,7 @@ lib_LTLIBRARIES = _libcgroup.la
- _libcgroup_la_SOURCES = libcgroup.c
- _libcgroup_la_LDFLAGS = $(shell python-config --ldflags) -module -avoid-version
- _libcgroup_la_CFLAGS = $(shell python-config --cflags)
--_libcgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la
-+_libcgroup_la_LIBADD = $(top_builddir)/src/libcgroup.la
- SWIG=swig
-
-
-diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
-index 2e08a4d..c8dbe67 100644
---- a/src/daemon/Makefile.am
-+++ b/src/daemon/Makefile.am
-@@ -4,7 +4,7 @@ if WITH_DAEMON
-
- sbin_PROGRAMS = cgrulesengd
- cgrulesengd_SOURCES = cgrulesengd.c cgrulesengd.h
--cgrulesengd_LDADD = $(top_builddir)/src/.libs/libcgroup.la -lrt
-+cgrulesengd_LDADD = $(top_builddir)/src/libcgroup.la -lrt
- cgrulesengd_LDFLAGS = -L$(top_builddir)/src/.libs
-
- endif
-diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am
-index 852ceae..df173c2 100644
---- a/src/pam/Makefile.am
-+++ b/src/pam/Makefile.am
-@@ -5,6 +5,6 @@ if WITH_PAM
- pamlib_LTLIBRARIES = pam_cgroup.la
- pam_cgroup_la_SOURCES = pam_cgroup.c
- pam_cgroup_la_LDFLAGS = -module
--pam_cgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la -lpam
-+pam_cgroup_la_LIBADD = $(top_builddir)/src/libcgroup.la -lpam
-
- endif
-diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
-index 0280d4a..cb0b8f3 100644
---- a/src/tools/Makefile.am
-+++ b/src/tools/Makefile.am
-@@ -1,5 +1,5 @@
- AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
--LDADD = $(top_builddir)/src/.libs/libcgroup.la
-+LDADD = $(top_builddir)/src/libcgroup.la
-
- if WITH_TOOLS
-
diff --git a/dev-libs/libcgroup/files/libcgroup-3.0.0-configure-bashism.patch b/dev-libs/libcgroup/files/libcgroup-3.0.0-configure-bashism.patch
deleted file mode 100644
index 1401953b53a7..000000000000
--- a/dev-libs/libcgroup/files/libcgroup-3.0.0-configure-bashism.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/libcgroup/libcgroup/pull/243
-
-From a363c163fdeb48e0536545ece856899ed97e99b2 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 10 Sep 2022 13:52:57 +0100
-Subject: [PATCH] configure.ac: fix bashism
-
-configure scripts need to be runnable with a POSIX-compliant /bin/sh.
-
-On many (but not all!) systems, /bin/sh is provided by Bash, so errors
-like this aren't spotted. Notably Debian defaults to /bin/sh provided
-by dash which doesn't tolerate such bashisms as '=='.
-
-This retains compatibility with bash.
-
-Fixes configure warnings/errors like:
-```
-checking whether to build static libraries... no
-./configure: 14089: test: xno: unexpected operator
-checking for x86_64-pc-linux-gnu-g++... x86_64-pc-linux-gnu-g++
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,7 +137,7 @@ AC_ARG_ENABLE([opaque-hierarchy],
- AC_ARG_ENABLE([tests],
- [AS_HELP_STRING([--enable-tests],[compile libcgroup tests [default=yes]])],
- [
-- if test "x$enableval" == xno; then
-+ if test "x$enableval" = xno; then
- with_tests=false
- else
- with_tests=true
-
diff --git a/dev-libs/libcgroup/files/libcgroup-3.0.0-musl-strerror_r.patch b/dev-libs/libcgroup/files/libcgroup-3.0.0-musl-strerror_r.patch
deleted file mode 100644
index cc1b0688c79b..000000000000
--- a/dev-libs/libcgroup/files/libcgroup-3.0.0-musl-strerror_r.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/libcgroup/libcgroup/pull/236
-
-From d190c0c548b3219b75e4c399aa89186e77bbe270 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 23 Aug 2022 20:03:09 -0700
-Subject: [PATCH] api: Use GNU strerror_r when available
-
-GNU strerror_r is only available in glibc, musl impelents the XSI
-version which is slightly different, therefore check if GNU version is
-available before using it, otherwise use the XSI compliant version.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/configure.ac
-+++ b/configure.ac
-@@ -183,6 +183,11 @@ AC_FUNC_REALLOC
- AC_FUNC_STAT
- AC_CHECK_FUNCS([getmntent hasmntopt memset mkdir rmdir strdup])
-
-+orig_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -D_GNU_SOURCE"
-+AC_FUNC_STRERROR_R
-+CFLAGS="$orig_CFLAGS"
-+
- AC_SEARCH_LIBS(
- [fts_open],
- [fts],
---- a/src/api.c
-+++ b/src/api.c
-@@ -4571,9 +4571,13 @@ const char *cgroup_strerror(int code)
- {
- int idx = code % ECGROUPNOTCOMPILED;
-
-- if (code == ECGOTHER)
-+ if (code == ECGOTHER) {
-+#ifdef STRERROR_R_CHAR_P
- return strerror_r(cgroup_get_last_errno(), errtext, MAXLEN);
--
-+#else
-+ return strerror_r(cgroup_get_last_errno(), errtext, sizeof (errtext)) ? "unknown error" : errtext;
-+#endif
-+ }
- if (idx >= sizeof(cgroup_strerror_codes)/sizeof(cgroup_strerror_codes[0]))
- return "Invalid error code";
-
-
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
deleted file mode 100644
index 623f41b99e99..000000000000
--- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info pam systemd
-
-DESCRIPTION="Tools and libraries to configure and manage kernel control groups"
-HOMEPAGE="http://libcg.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/libcg/${PN}/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="+daemon pam static-libs test +tools"
-REQUIRED_USE="daemon? ( tools )"
-
-# Use mount cgroup to build directory
-# sandbox restricted to trivial build,
-RESTRICT="test"
-
-BDEPEND="
- app-alternatives/yacc
- app-alternatives/lex
- elibc_musl? ( sys-libs/fts-standalone )
-"
-DEPEND="pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-replace_DECLS.patch
- "${FILESDIR}"/${P}-replace_INLCUDES.patch
- "${FILESDIR}"/${P}-reorder-headers.patch
- "${FILESDIR}"/${P}-remove-umask.patch
- "${FILESDIR}"/${P}-slibtool.patch
-)
-
-pkg_setup() {
- local CONFIG_CHECK="~CGROUPS"
- if use daemon; then
- CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS"
- fi
- linux-info_pkg_setup
-}
-
-src_prepare() {
- default
- # Change rules file location
- sed -e 's:/etc/cgrules.conf:/etc/cgroup/cgrules.conf:' \
- -i src/libcgroup-internal.h || die "sed failed"
- sed -e 's:/etc/cgconfig.conf:/etc/cgroup/cgconfig.conf:' \
- -i src/libcgroup-internal.h || die "sed failed"
- sed -e 's:\(pam_cgroup_la_LDFLAGS.*\):\1\ -avoid-version:' \
- -i src/pam/Makefile.am || die "sed failed"
- sed -e 's#/var/run#/run#g' -i configure.in || die "sed failed"
-
- # If we're not running tests, don't bother building them.
- if ! use test; then
- sed -i '/^SUBDIRS/s:tests::' Makefile.am || die
- fi
-
- # Workaround configure.in
- mv configure.in configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local my_conf
-
- if use pam; then
- my_conf=" --enable-pam-module-dir=$(getpam_mod_dir) "
- fi
-
- use elibc_musl && append-ldflags "-lfts"
- econf \
- $(use_enable static-libs static) \
- $(use_enable daemon) \
- $(use_enable pam) \
- $(use_enable tools) \
- ${my_conf}
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-
- insinto /etc/cgroup
- doins samples/*.conf
-
- if use tools; then
- newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig
- newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig
- systemd_dounit "${FILESDIR}"/cgconfig.service
- systemd_dounit "${FILESDIR}"/cgrules.service
- fi
-
- if use daemon; then
- newconfd "${FILESDIR}"/cgred.confd-r2 cgred
- newinitd "${FILESDIR}"/cgred.initd-r1 cgred
- fi
-}
diff --git a/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild b/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild
deleted file mode 100644
index 980bb7d03807..000000000000
--- a/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info pam systemd
-
-DESCRIPTION="Tools and libraries to configure and manage kernel control groups"
-HOMEPAGE="https://github.com/libcgroup/libcgroup"
-SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+daemon pam static-libs test +tools"
-REQUIRED_USE="daemon? ( tools )"
-
-# Test failure needs investigation
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
- app-alternatives/yacc
- app-alternatives/lex
-"
-DEPEND="
- elibc_musl? ( sys-libs/fts-standalone )
- pam? ( sys-libs/pam )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.0-configure-bashism.patch"
- "${FILESDIR}/${PN}-3.0.0-musl-strerror_r.patch"
-)
-
-pkg_setup() {
- local CONFIG_CHECK="~CGROUPS"
- if use daemon; then
- CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS"
- fi
- linux-info_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Change rules file location
- find src -name '*.c' -o -name '*.h' -print0 \
- | xargs -0 sed -i '/^#define/s:/etc/cg:/etc/cgroup/cg:'
- sed -i 's:/etc/cg:/etc/cgroup/cg:' \
- doc/man/cg* samples/config/*.conf README* || die "sed failed"
-
- # Drop native libcgconfig init config
- sed -i '/^man_MANS/s:cgred.conf.5::' \
- doc/man/Makefile.am || die "sed failed"
-
- # If we're not running tests, don't bother building them.
- if ! use test; then
- sed -i '/^SUBDIRS/s:tests::' Makefile.am || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- if use elibc_musl; then
- append-ldflags -lfts
- fi
-
- local myconf=(
- "$(use_enable static-libs static)"
- "$(use_enable daemon)"
- "$(use_enable pam)"
- "$(use_enable tools)"
- "$(use_enable test tests)"
- )
-
- if use pam; then
- myconf+=( "--enable-pam-module-dir=$(getpam_mod_dir)" )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- # Run just the unit tests rather than the full lot as they
- # need fewer permissions, no containers, etc.
- emake -C tests/gunit check
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-
- insinto /etc/cgroup
- doins samples/config/cgconfig.conf
- doins samples/config/cgrules.conf
- doins samples/config/cgsnapshot_blacklist.conf
-
- keepdir /etc/cgroup/cgconfig.d
- keepdir /etc/cgroup/cgrules.d
-
- if use tools; then
- newconfd "${FILESDIR}/cgconfig.confd-r2" cgconfig
- newinitd "${FILESDIR}/cgconfig.initd-r2" cgconfig
- systemd_dounit "${FILESDIR}/cgconfig.service"
- systemd_dounit "${FILESDIR}/cgrules.service"
- fi
-
- if use daemon; then
- newconfd "${FILESDIR}/cgred.confd-r2" cgred
- newinitd "${FILESDIR}/cgred.initd-r1" cgred
- fi
-}
diff --git a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild
deleted file mode 100644
index 296dd1071c8b..000000000000
--- a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic linux-info pam systemd
-
-DESCRIPTION="Tools and libraries to configure and manage kernel control groups"
-HOMEPAGE="https://github.com/libcgroup/libcgroup"
-SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="+daemon pam static-libs test +tools"
-REQUIRED_USE="daemon? ( tools )"
-
-# Test failure needs investigation
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
- app-alternatives/yacc
- app-alternatives/lex
-"
-DEPEND="
- elibc_musl? ( sys-libs/fts-standalone )
- pam? ( sys-libs/pam )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.0-configure-bashism.patch
- "${FILESDIR}"/${PN}-3.0.0-musl-strerror_r.patch
-)
-
-pkg_setup() {
- local CONFIG_CHECK="~CGROUPS"
- if use daemon; then
- CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS"
- fi
- linux-info_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Change rules file location
- find src -name *.c -o -name *.h \
- | xargs sed -i '/^#define/s:/etc/cg:/etc/cgroup/cg:'
- sed -i 's:/etc/cg:/etc/cgroup/cg:' \
- doc/man/cg* samples/config/*.conf README* || die "sed failed"
-
- # Drop native libcgconfig init config
- sed -i '/^man_MANS/s:cgred.conf.5::' \
- doc/man/Makefile.am || die "sed failed"
-
- # If we're not running tests, don't bother building them.
- if ! use test; then
- sed -i '/^SUBDIRS/s:tests::' Makefile.am || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- use elibc_musl && append-ldflags -lfts
-
- local my_conf=(
- $(use_enable static-libs static)
- $(use_enable daemon)
- $(use_enable pam)
- $(use_enable tools)
- $(use_enable test tests)
- )
-
- if use pam; then
- my_conf+=( --enable-pam-module-dir="$(getpam_mod_dir)" )
- fi
-
- econf "${my_conf[@]}"
-}
-
-src_test() {
- # Run just the unit tests rather than the full lot as they
- # need fewer permissions, no containers, etc.
- emake -C tests/gunit check
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-
- insinto /etc/cgroup
- doins samples/config/cgconfig.conf
- doins samples/config/cgrules.conf
- doins samples/config/cgsnapshot_blacklist.conf
-
- keepdir /etc/cgroup/cgconfig.d
- keepdir /etc/cgroup/cgrules.d
-
- if use tools; then
- newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig
- newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig
- systemd_dounit "${FILESDIR}"/cgconfig.service
- systemd_dounit "${FILESDIR}"/cgrules.service
- fi
-
- if use daemon; then
- newconfd "${FILESDIR}"/cgred.confd-r2 cgred
- newinitd "${FILESDIR}"/cgred.initd-r1 cgred
- fi
-}
next reply other threads:[~2025-05-20 14:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-20 14:06 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-20 14:06 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/, dev-libs/libcgroup/files/ Sam James
2019-09-21 9:15 Michał Górny
2018-08-23 0:18 Anthony G. Basile
2016-06-12 23:47 Anthony G. Basile
2016-06-12 23:47 Anthony G. Basile
2015-11-16 23:02 Anthony G. Basile
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1747749980.2c639721106f1d791e5968c809c6fa104bf780b0.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox