[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 6884eebac7f90b9188b76281689d95611437abd5 Author: Joonas Niilola gentoo org> AuthorDate: Sat Dec 9 07:14:48 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Dec 9 07:15:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6884eeba dev-libs/libcgroup: Stabilize 3.1.0 x86, #919434 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/libcgroup/libcgroup-3.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild index 932098b90584..9be7fa3c5048 100644 --- a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild +++ b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v${PV}/${P}.ta LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" IUSE="+daemon pam static-libs systemd test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 0094d98dbe6d08b407d0ffc394b9deb76665e722 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 8 08:51:21 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 8 08:51:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0094d98d dev-libs/libcgroup: Stabilize 3.1.0 amd64, #919434 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/libcgroup/libcgroup-3.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild index ac13225c99de..932098b90584 100644 --- a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild +++ b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v${PV}/${P}.ta LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="+daemon pam static-libs systemd test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 84a6aebc87f31ff3a0bef7b5154f2eb58d9474d7 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 8 08:47:56 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 8 08:47:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a6aebc dev-libs/libcgroup: Stabilize 3.1.0 arm, #919434 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/libcgroup/libcgroup-3.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild index 0e869ea6988f..ac13225c99de 100644 --- a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild +++ b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v${PV}/${P}.ta LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="+daemon pam static-libs systemd test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 1f0a4930c5617bcddb2eddcd66e2f3db21de4e9a Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 8 08:47:55 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 8 08:47:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f0a4930 dev-libs/libcgroup: Stabilize 3.1.0 arm64, #919434 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/libcgroup/libcgroup-3.1.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild index 2459a7f98d46..0e869ea6988f 100644 --- a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild +++ b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v${PV}/${P}.ta LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="+daemon pam static-libs systemd test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 3e37d1c31b943135dd7dbbce4e8fdbcabeff3c58 Author: Sam James gentoo org> AuthorDate: Wed Sep 27 04:05:41 2023 + Commit: Sam James gentoo org> CommitDate: Wed Sep 27 04:05:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e37d1c3 dev-libs/libcgroup: fix SRC_URI for 3.0.0-r1 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild b/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild index ab8c02a5f29f..426a7f3a4804 100644 --- a/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild +++ b/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild @@ -7,7 +7,7 @@ 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${PV}/${P}.tar.gz; +SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v$(ver_cut 1-2)/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: ab36340569e563d70d1830d7513256b4f8bcf659 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Sep 26 17:58:35 2023 + Commit: Sam James gentoo org> CommitDate: Wed Sep 27 04:02:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab363405 dev-libs/libcgroup: fix patching Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/33069 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/libcgroup-0.41-r6.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild index 4965b34297ac..10cbd06156f4 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild @@ -28,8 +28,8 @@ DEPEND="pam? ( sys-libs/pam )" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}"/${P}-replace-DECLS.patch - "${FILESDIR}"/${P}-replace-INLCUDES.patch + "${FILESDIR}"/${P}-replace_DECLS.patch + "${FILESDIR}"/${P}-replace_INLCUDES.patch "${FILESDIR}"/${P}-reorder-headers.patch "${FILESDIR}"/${P}-remove-umask.patch "${FILESDIR}"/${P}-slibtool.patch
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 7aaf9bca2a43fb025591756fec8095901c17e8ab Author: Sam James gentoo org> AuthorDate: Mon Sep 25 03:28:31 2023 + Commit: Sam James gentoo org> CommitDate: Mon Sep 25 03:29:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aaf9bca dev-libs/libcgroup: fix 3.1.0 Closes: https://bugs.gentoo.org/914623 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/libcgroup-3.1.0.ebuild | 35 --- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild index 9fdbb7a5bde3..2459a7f98d46 100644 --- a/dev-libs/libcgroup/libcgroup-3.1.0.ebuild +++ b/dev-libs/libcgroup/libcgroup-3.1.0.ebuild @@ -12,26 +12,22 @@ SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v${PV}/${P}.ta LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="+daemon pam static-libs test +tools" +IUSE="+daemon pam static-libs systemd test +tools" REQUIRED_USE="daemon? ( tools )" # Test failure needs investigation RESTRICT="!test? ( test ) test" -BDEPEND=" - sys-devel/bison - sys-devel/flex -" DEPEND=" elibc_musl? ( sys-libs/fts-standalone ) pam? ( sys-libs/pam ) + systemd? ( sys-apps/systemd:= ) " RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-3.0.0-configure-bashism.patch" - "${FILESDIR}/${PN}-3.0.0-musl-strerror_r.patch" -) +BDEPEND=" + sys-devel/bison + sys-devel/flex +" pkg_setup() { local CONFIG_CHECK="~CGROUPS" @@ -45,7 +41,7 @@ src_prepare() { default # Change rules file location - find src -name '*.c' -o -name '*.h' -0 \ + 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" @@ -67,12 +63,17 @@ src_configure() { append-ldflags -lfts fi + # Needs flex+bison + unset LEX YACC + local myconf=( - "$(use_enable static-libs static)" - "$(use_enable daemon)" - "$(use_enable pam)" - "$(use_enable tools)" - "$(use_enable test tests)" + --disable-python + $(use_enable static-libs static) + $(use_enable daemon) + $(use_enable pam) + $(use_enable systemd) + $(use_enable tools) + $(use_enable test tests) ) if use pam; then @@ -96,7 +97,7 @@ src_install() { insinto /etc/cgroup doins samples/config/cgconfig.conf doins samples/config/cgrules.conf - doins samples/config/cgsnapshot_blacklist.conf + doins samples/config/cgsnapshot_denylist.conf keepdir /etc/cgroup/cgconfig.d keepdir /etc/cgroup/cgrules.d
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 2a4354ef585892bed4cf5d534cc938c29d1ac90b Author: Sam James gentoo org> AuthorDate: Mon Sep 25 03:28:47 2023 + Commit: Sam James gentoo org> CommitDate: Mon Sep 25 03:29:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a4354ef dev-libs/libcgroup: drop 2.0 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/Manifest | 1 - dev-libs/libcgroup/libcgroup-2.0.ebuild | 98 - 2 files changed, 99 deletions(-) diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest index 169245e7cdd3..48d5b3481552 100644 --- a/dev-libs/libcgroup/Manifest +++ b/dev-libs/libcgroup/Manifest @@ -1,4 +1,3 @@ DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd -DIST libcgroup-2.0.tar.bz2 953191 BLAKE2B d4fe008a51a4f90047210a3c8e4ce48b1c4a126111ccc7fe919404b1782ea764404894a43a651e0d6b2674d02fb031cb56cf7a689c57600d856c03536524bb63 SHA512 b2c5d1128536bf49782415df2d1530cf48bdb287e5d2abdee68f9fa780d995d9bae79f97da5f0c437130d66054c96301b319cd1631a3b0efbc5bfe1e3414dc4b 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/libcgroup-2.0.ebuild b/dev-libs/libcgroup/libcgroup-2.0.ebuild deleted file mode 100644 index 989fc89b4af8.. --- a/dev-libs/libcgroup/libcgroup-2.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2022 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="https://github.com/libcgroup/libcgroup; -SRC_URI="https://github.com/${PN}/${PN}/releases/download/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=" - sys-devel/bison - sys-devel/flex - elibc_musl? ( sys-libs/fts-standalone ) -" -DEPEND="pam? ( sys-libs/pam )" -RDEPEND="${DEPEND}" - -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/*.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() { - 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/cgconfig.conf - doins samples/cgrules.conf - doins samples/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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: d5330dd7ca56fb085af21b82be4f92de94ebe4d9 Author: Sam James gentoo org> AuthorDate: Mon Sep 25 03:29:25 2023 + Commit: Sam James gentoo org> CommitDate: Mon Sep 25 03:29:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5330dd7 dev-libs/libcgroup: fix find arg Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild b/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild index 9fdbb7a5bde3..ab8c02a5f29f 100644 --- a/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild +++ b/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild @@ -45,7 +45,7 @@ src_prepare() { default # Change rules file location - find src -name '*.c' -o -name '*.h' -0 \ + 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"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/files/, dev-libs/libcgroup/
commit: 39c69db21c0c4d66fb2685b369b33b5ed3397ff2 Author: Paul Zander gmail com> AuthorDate: Wed Sep 6 15:02:49 2023 + Commit: Sam James gentoo org> CommitDate: Sun Sep 24 22:09:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39c69db2 dev-libs/libcgroup: bump 3.1.0, fix CG_CLASSIFY=Yes Fixes SRC_URI. Make CG_CLASSIFY=Yes work by adjusting executable path and add parsing of /etc/cgroup/cgconfig.d. Closes: https://bugs.gentoo.org/628802 Signed-off-by: Paul Zander gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32656 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/Manifest | 1 + dev-libs/libcgroup/files/cgconfig.confd-r2 | 8 ++ dev-libs/libcgroup/files/cgconfig.initd-r2 | 53 dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild | 115 +++ dev-libs/libcgroup/libcgroup-3.1.0.ebuild| 115 +++ 5 files changed, 292 insertions(+) diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest index fc793519300c..169245e7cdd3 100644 --- a/dev-libs/libcgroup/Manifest +++ b/dev-libs/libcgroup/Manifest @@ -1,3 +1,4 @@ DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd DIST libcgroup-2.0.tar.bz2 953191 BLAKE2B d4fe008a51a4f90047210a3c8e4ce48b1c4a126111ccc7fe919404b1782ea764404894a43a651e0d6b2674d02fb031cb56cf7a689c57600d856c03536524bb63 SHA512 b2c5d1128536bf49782415df2d1530cf48bdb287e5d2abdee68f9fa780d995d9bae79f97da5f0c437130d66054c96301b319cd1631a3b0efbc5bfe1e3414dc4b 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-r2 b/dev-libs/libcgroup/files/cgconfig.confd-r2 new file mode 100644 index ..2770c85e2ee1 --- /dev/null +++ b/dev-libs/libcgroup/files/cgconfig.confd-r2 @@ -0,0 +1,8 @@ +# /etc/conf.d/cgconfig: config file for /etc/init.d/cgconfig + +# Configuration file location +CG_CONFIGFILE="/etc/cgroup/cgconfig.conf" +CG_CONFIGDIR="/etc/cgroup/cgconfig.d" + +# Enable calssifying pid according to rules if necessary +CG_CLASSIFY=No diff --git a/dev-libs/libcgroup/files/cgconfig.initd-r2 b/dev-libs/libcgroup/files/cgconfig.initd-r2 new file mode 100644 index ..aaf3ea88031b --- /dev/null +++ b/dev-libs/libcgroup/files/cgconfig.initd-r2 @@ -0,0 +1,53 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +CGCONFIGPARSER="/usr/sbin/cgconfigparser" +CGCLASSIFY="/usr/bin/cgclassify" +: "${CG_CONFIGFILE:=/etc/cgroup/cgconfig.conf}" +: "${CG_CONFIGDIR:=/etc/cgroup/cgconfig.d}" +description="Control Group Configuration Service" + +start() +{ + ebegin "Setting up CGroups" + "${CGCONFIGPARSER}" "--load=${CG_CONFIGFILE}" "--load-directory=${CG_CONFIGDIR}" >/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 $(pgrep ''); do +${CGCLASSIFY} ${pid} || einfo "Classifying ${pid} failed" + 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/libcgroup-3.0.0-r1.ebuild b/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild new file mode 100644 index ..9fdbb7a5bde3 --- /dev/null +++ b/dev-libs/libcgroup/libcgroup-3.0.0-r1.ebuild @@ -0,0 +1,115 @@ +# Copyright
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 5b5b6d1345ab564461849fa26ffb7180d427de33 Author: Sam James gentoo org> AuthorDate: Fri Mar 17 17:21:39 2023 + Commit: Sam James gentoo org> CommitDate: Fri Mar 17 17:21:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5b6d13 dev-libs/libcgroup: Stabilize 3.0.0 x86, #901907 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/libcgroup-3.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild index 66f43a62f286..bcd109be15c0 100644 --- a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild +++ b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v$(ver_cut 1-2 LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" IUSE="+daemon pam static-libs test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: bd45ad557bb39c224d1f64da2c3895c960b9293f Author: Sam James gentoo org> AuthorDate: Fri Mar 17 16:58:19 2023 + Commit: Sam James gentoo org> CommitDate: Fri Mar 17 16:59:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd45ad55 dev-libs/libcgroup: Stabilize 3.0.0 amd64, #901907 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/libcgroup-3.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild index 120c33d1e2e4..66f43a62f286 100644 --- a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild +++ b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v$(ver_cut 1-2 LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="+daemon pam static-libs test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: d69e21d84fe11eb815df3303c2dacf6945675bcb Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 17 16:28:51 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 17 16:28:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69e21d8 dev-libs/libcgroup: Stabilize 3.0.0 arm, #901907 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/libcgroup/libcgroup-3.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild index aac0e688bf5a..120c33d1e2e4 100644 --- a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild +++ b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v$(ver_cut 1-2 LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="+daemon pam static-libs test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: e9fd0de599f9883e8e390daa077add042fb604a4 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 17 16:12:36 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 17 16:12:36 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9fd0de5 dev-libs/libcgroup: Stabilize 3.0.0 arm64, #901907 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/libcgroup/libcgroup-3.0.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild index a5009c1da4d8..aac0e688bf5a 100644 --- a/dev-libs/libcgroup/libcgroup-3.0.0.ebuild +++ b/dev-libs/libcgroup/libcgroup-3.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libcgroup/libcgroup/releases/download/v$(ver_cut 1-2 LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="+daemon pam static-libs test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/files/, dev-libs/libcgroup/
commit: 70e3169fa8441f6c76d9329edee258e6d5c44ee3 Author: Sam James gentoo org> AuthorDate: Sat Sep 10 12:47:49 2022 + Commit: Sam James gentoo org> CommitDate: Sat Sep 10 13:29:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e3169f dev-libs/libcgroup: add 3.0.0 Closes: https://bugs.gentoo.org/830071 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/Manifest| 1 + .../files/libcgroup-3.0.0-configure-bashism.patch | 35 +++ .../files/libcgroup-3.0.0-musl-strerror_r.patch| 45 dev-libs/libcgroup/libcgroup-3.0.0.ebuild | 113 + 4 files changed, 194 insertions(+) diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest index b9417a00e1e3..fc793519300c 100644 --- a/dev-libs/libcgroup/Manifest +++ b/dev-libs/libcgroup/Manifest @@ -1,2 +1,3 @@ DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd DIST libcgroup-2.0.tar.bz2 953191 BLAKE2B d4fe008a51a4f90047210a3c8e4ce48b1c4a126111ccc7fe919404b1782ea764404894a43a651e0d6b2674d02fb031cb56cf7a689c57600d856c03536524bb63 SHA512 b2c5d1128536bf49782415df2d1530cf48bdb287e5d2abdee68f9fa780d995d9bae79f97da5f0c437130d66054c96301b319cd1631a3b0efbc5bfe1e3414dc4b +DIST libcgroup-3.0.0.tar.gz 1125800 BLAKE2B 5d4999ac513de756ffe741d2e959c01d8500a2000f521dff31832e1ef545869fb9c8ae1c78d05aaa051e7e6e68266bd57a751ba3aa897966a83ff50128090ba5 SHA512 1e8a7c9a71d928ab0e354254b007b30fc159a30e441bd52a03ded142420c94e130594bb512680c62fc22f5193934fb78afc31453342b032d1db3197fd4c3e606 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 new file mode 100644 index ..1401953b53a7 --- /dev/null +++ b/dev-libs/libcgroup/files/libcgroup-3.0.0-configure-bashism.patch @@ -0,0 +1,35 @@ +https://github.com/libcgroup/libcgroup/pull/243 + +From a363c163fdeb48e0536545ece856899ed97e99b2 Mon Sep 17 00:00:00 2001 +From: Sam James +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 +--- 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 new file mode 100644 index ..cc1b0688c79b --- /dev/null +++ b/dev-libs/libcgroup/files/libcgroup-3.0.0-musl-strerror_r.patch @@ -0,0 +1,45 @@ +https://github.com/libcgroup/libcgroup/pull/236 + +From d190c0c548b3219b75e4c399aa89186e77bbe270 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- 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])) +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 24f61ea7a5cb897581601a445e721439bca7ba62 Author: Sam James gentoo org> AuthorDate: Fri Jul 29 03:07:38 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jul 29 03:07:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f61ea7 dev-libs/libcgroup: add github upstream metadata Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-libs/libcgroup/metadata.xml b/dev-libs/libcgroup/metadata.xml index 14096f675784..c66a006f7ab5 100644 --- a/dev-libs/libcgroup/metadata.xml +++ b/dev-libs/libcgroup/metadata.xml @@ -14,6 +14,7 @@ Install the cgroup rules processing daemon and init/config files. + libcgroup/libcgroup libcg
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 618f335d5f4cfcc2168e283c6a3c9ea9978dd8aa Author: Dmitry Baranov gmail com> AuthorDate: Thu Sep 16 12:14:32 2021 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Sep 18 22:24:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618f335d dev-libs/libcgroup: add 2.0 Closes: https://bugs.gentoo.org/813375 Signed-off-by: Dmitry Baranov gmail.com> Signed-off-by: Anthony G. Basile gentoo.org> dev-libs/libcgroup/Manifest | 1 + dev-libs/libcgroup/libcgroup-2.0.ebuild | 98 + 2 files changed, 99 insertions(+) diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest index 368f0cd8bec..b9417a00e1e 100644 --- a/dev-libs/libcgroup/Manifest +++ b/dev-libs/libcgroup/Manifest @@ -1 +1,2 @@ DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd +DIST libcgroup-2.0.tar.bz2 953191 BLAKE2B d4fe008a51a4f90047210a3c8e4ce48b1c4a126111ccc7fe919404b1782ea764404894a43a651e0d6b2674d02fb031cb56cf7a689c57600d856c03536524bb63 SHA512 b2c5d1128536bf49782415df2d1530cf48bdb287e5d2abdee68f9fa780d995d9bae79f97da5f0c437130d66054c96301b319cd1631a3b0efbc5bfe1e3414dc4b diff --git a/dev-libs/libcgroup/libcgroup-2.0.ebuild b/dev-libs/libcgroup/libcgroup-2.0.ebuild new file mode 100644 index 000..674b3f6e390 --- /dev/null +++ b/dev-libs/libcgroup/libcgroup-2.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 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="https://github.com/libcgroup/libcgroup; +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2; + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+daemon elibc_musl pam static-libs test +tools" +REQUIRED_USE="daemon? ( tools )" + +# Use mount cgroup to build directory +# sandbox restricted to trivial build, +RESTRICT="test" + +BDEPEND=" + sys-devel/bison + sys-devel/flex + elibc_musl? ( sys-libs/fts-standalone ) +" +DEPEND="pam? ( sys-libs/pam )" +RDEPEND="${DEPEND}" + +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/*.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() { + 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/cgconfig.conf + doins samples/cgrules.conf + doins samples/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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 4787450a82cbb93faac7b3c07ae669483e24281b Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 3 12:34:54 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 15 21:06:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4787450a dev-libs/libcgroup: Drop 0.41-r5, EAPI6-- Closes: https://bugs.gentoo.org/783873 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libcgroup/libcgroup-0.41-r5.ebuild | 102 1 file changed, 102 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild deleted file mode 100644 index a3ee8b14b97..000 --- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic linux-info pam - -DESCRIPTION="Tools and libraries to configure and manage kernel control groups" -HOMEPAGE="http://libcg.sourceforge.net/; -SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" -IUSE="+daemon elibc_musl pam static-libs test +tools" -RESTRICT="!test? ( test )" - -RDEPEND="pam? ( sys-libs/pam )" - -DEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - elibc_musl? ( sys-libs/fts-standalone ) - " -REQUIRED_USE="daemon? ( tools )" - -DOCS=(README_daemon README README_systemd INSTALL) -pkg_setup() { - local CONFIG_CHECK="~CGROUPS" - if use daemon; then - CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS" - fi - linux-info_pkg_setup -} - -PATCHES=( - "${FILESDIR}"/${P}-replace_DECLS.patch - "${FILESDIR}"/${P}-replace_INLCUDES.patch - "${FILESDIR}"/${P}-reorder-headers.patch - "${FILESDIR}"/${P}-remove-umask.patch -) - -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 - - 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_test() { - # Use mount cgroup to build directory - # sandbox restricted to trivial build, - # possible kill Diego tanderbox ;) - true -} - -src_install() { - default - find "${ED}" -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 - fi - - if use daemon; then - newconfd "${FILESDIR}"/cgred.confd-r2 cgred - newinitd "${FILESDIR}"/cgred.initd-r1 cgred - fi -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 73a2ad52afb8a9b45dbd27f110b43f476826a6d5 Author: Marek Szuba gentoo org> AuthorDate: Mon Jul 5 17:25:38 2021 + Commit: Marek Szuba gentoo org> CommitDate: Mon Jul 5 19:38:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a2ad52 dev-libs/libcgroup: keyword 0.41-r6 for ~riscv Signed-off-by: Marek Szuba gentoo.org> dev-libs/libcgroup/libcgroup-0.41-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild index 7e13c7a44ee..03f52674cd0 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86" IUSE="+daemon elibc_musl pam static-libs test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: a0b3ca799a8040cb662ecd9dfd947db7d7a2a9c7 Author: Sam James gentoo org> AuthorDate: Tue May 4 19:12:45 2021 + Commit: Sam James gentoo org> CommitDate: Tue May 4 19:12:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b3ca79 dev-libs/libcgroup: Stabilize 0.41-r6 arm, #783873 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/libcgroup-0.41-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild index 7eb7009a12c..7e13c7a44ee 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" IUSE="+daemon elibc_musl pam static-libs test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 1f5e8970c61940783d5ea23a39b23806c524e8f6 Author: Sam James gentoo org> AuthorDate: Sat May 1 18:10:45 2021 + Commit: Sam James gentoo org> CommitDate: Sat May 1 18:11:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f5e8970 dev-libs/libcgroup: Stabilize 0.41-r6 x86, #783873 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/libcgroup-0.41-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild index 572e67464b9..7eb7009a12c 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86" IUSE="+daemon elibc_musl pam static-libs test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: f0541d2391064a93d436851f86dda5078d435d23 Author: Sam James gentoo org> AuthorDate: Sat May 1 18:09:57 2021 + Commit: Sam James gentoo org> CommitDate: Sat May 1 18:11:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0541d23 dev-libs/libcgroup: Stabilize 0.41-r6 amd64, #783873 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/libcgroup-0.41-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild index 251a6ab8223..572e67464b9 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86" IUSE="+daemon elibc_musl pam static-libs test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: f6339cb34793b116cc9ae1a7d2beb26e9e0cbd5f Author: Sam James gentoo org> AuthorDate: Sat May 1 17:13:22 2021 + Commit: Sam James gentoo org> CommitDate: Sat May 1 17:13:22 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6339cb3 dev-libs/libcgroup: Stabilize 0.41-r6 arm64, #783873 Signed-off-by: Sam James gentoo.org> dev-libs/libcgroup/libcgroup-0.41-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild index 58ba8aad708..251a6ab8223 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86" IUSE="+daemon elibc_musl pam static-libs test +tools" REQUIRED_USE="daemon? ( tools )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/files/, dev-libs/libcgroup/
commit: 0bf2ad14f82df0cfe05eda3cf3cb1c157095a025 Author: Sam James gentoo org> AuthorDate: Wed Mar 24 19:51:26 2021 + Commit: Sam James gentoo org> CommitDate: Wed Mar 24 19:51:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf2ad14 dev-libs/libcgroup: fix build with slibtool Thanks-to: orbea riseup.net> Closes: https://bugs.gentoo.org/777450 Signed-off-by: Sam James gentoo.org> .../libcgroup/files/libcgroup-0.41-slibtool.patch | 59 ++ dev-libs/libcgroup/libcgroup-0.41-r6.ebuild| 3 +- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-slibtool.patch b/dev-libs/libcgroup/files/libcgroup-0.41-slibtool.patch new file mode 100644 index 000..114209116bf --- /dev/null +++ b/dev-libs/libcgroup/files/libcgroup-0.41-slibtool.patch @@ -0,0 +1,59 @@ +https://bugs.gentoo.org/777450 + +commit 0c710d2f82184984e73b643a8e752f55371c6bc8 +Author: orbea +Date: Sun Mar 21 13:24:23 2021 -0700 + +build: Remove .libs from Makefile.am files. + +Signed-off-by: orbea + +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/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild index 5aaf74bec12..58ba8aad708 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -47,6 +47,7 @@ PATCHES=( "${FILESDIR}"/${P}-replace_INLCUDES.patch "${FILESDIR}"/${P}-reorder-headers.patch "${FILESDIR}"/${P}-remove-umask.patch + "${FILESDIR}"/${P}-slibtool.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: cd260f71f43a9e3dfcab1f0d10b83c94db7770e2 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Oct 12 18:58:26 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Oct 12 18:58:26 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd260f71 dev-libs/libcgroup: migrate to sys-libs/pam Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> dev-libs/libcgroup/libcgroup-0.41-r5.ebuild | 2 +- dev-libs/libcgroup/libcgroup-0.41-r6.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild index 1acdb65f88b..a144fee7f9f 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" IUSE="+daemon elibc_musl pam static-libs test +tools" -RDEPEND="pam? ( virtual/pam )" +RDEPEND="pam? ( sys-libs/pam )" DEPEND=" ${RDEPEND} diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild index f0164a2fa06..5aaf74bec12 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild @@ -24,7 +24,7 @@ BDEPEND=" sys-devel/flex elibc_musl? ( sys-libs/fts-standalone ) " -DEPEND="pam? ( virtual/pam )" +DEPEND="pam? ( sys-libs/pam )" RDEPEND="${DEPEND}" PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/, dev-libs/libcgroup/files/
commit: 4de83263b965d169ff6e1a42b3238f543633256c Author: Bernardo Meurer gmail com> AuthorDate: Fri Aug 9 07:00:22 2019 + Commit: Michał Górny gentoo org> CommitDate: Sat Sep 21 09:15:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de83263 dev-libs/libcgroup: add systemd unit files Closes: https://bugs.gentoo.org/632204 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Bernardo Meurer standard.ai> Signed-off-by: Michał Górny gentoo.org> dev-libs/libcgroup/files/cgconfig.service | 17 + dev-libs/libcgroup/files/cgrules.service| 16 + dev-libs/libcgroup/libcgroup-0.41-r6.ebuild | 103 3 files changed, 136 insertions(+) diff --git a/dev-libs/libcgroup/files/cgconfig.service b/dev-libs/libcgroup/files/cgconfig.service new file mode 100644 index 000..d2948ff825b --- /dev/null +++ b/dev-libs/libcgroup/files/cgconfig.service @@ -0,0 +1,17 @@ +[Unit] +Description=Control Group configuration service + +# The service should be able to start as soon as possible, +# before any 'normal' services: +DefaultDependencies=no +Conflicts=shutdown.target +Before=basic.target shutdown.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/sbin/cgconfigparser -l /etc/cgroup/cgconfig.conf -s 1664 +ExecStop=/usr/sbin/cgclear -l /etc/cgroup/cgconfig.conf -e + +[Install] +WantedBy=sysinit.target diff --git a/dev-libs/libcgroup/files/cgrules.service b/dev-libs/libcgroup/files/cgrules.service new file mode 100644 index 000..2c6426bf952 --- /dev/null +++ b/dev-libs/libcgroup/files/cgrules.service @@ -0,0 +1,16 @@ +[Unit] +Description=Control Group rules service + +# The service should be able to start as soon as possible, +# before any 'normal' services: +DefaultDependencies=no +Conflicts=shutdown.target +Before=basic.target shutdown.target +After=cgconfig.service + +[Service] +Type=simple +ExecStart=/usr/sbin/cgrulesengd -n -f - + +[Install] +WantedBy=sysinit.target diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild new file mode 100644 index 000..14021a85a76 --- /dev/null +++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="+daemon elibc_musl pam static-libs test +tools" + +RDEPEND="pam? ( virtual/pam )" + +DEPEND=" + ${RDEPEND} + sys-devel/bison + sys-devel/flex + elibc_musl? ( sys-libs/fts-standalone ) + " +REQUIRED_USE="daemon? ( tools )" + +DOCS=(README_daemon README README_systemd INSTALL) +pkg_setup() { + local CONFIG_CHECK="~CGROUPS" + if use daemon; then + CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS" + fi + linux-info_pkg_setup +} + +PATCHES=( + "${FILESDIR}"/${P}-replace_DECLS.patch + "${FILESDIR}"/${P}-replace_INLCUDES.patch + "${FILESDIR}"/${P}-reorder-headers.patch + "${FILESDIR}"/${P}-remove-umask.patch +) + +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 + + 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_test() { + # Use mount cgroup to build directory + # sandbox restricted to trivial build, + # possible kill Diego tanderbox ;) + true +} + +src_install() { + default + prune_libtool_files --all + + insinto /etc/cgroup + doins samples/*.conf + + if use tools; then + newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig + newinitd
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: cd7a823cb532735ce9541172f7c2af69b6fc532f Author: Bernardo Meurer gmail com> AuthorDate: Sun Aug 11 00:42:22 2019 + Commit: Michał Górny gentoo org> CommitDate: Sat Sep 21 09:15:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7a823c dev-libs/libcgroup: EAPI-7 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Bernardo Meurer standard.ai> Signed-off-by: Michał Górny gentoo.org> dev-libs/libcgroup/libcgroup-0.41-r6.ebuild | 35 - 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild index 14021a85a76..f0164a2fa06 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools flag-o-matic linux-info pam systemd @@ -13,18 +13,27 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="+daemon elibc_musl pam static-libs test +tools" +REQUIRED_USE="daemon? ( tools )" -RDEPEND="pam? ( virtual/pam )" +# Use mount cgroup to build directory +# sandbox restricted to trivial build, +RESTRICT="test" -DEPEND=" - ${RDEPEND} +BDEPEND=" sys-devel/bison sys-devel/flex elibc_musl? ( sys-libs/fts-standalone ) - " -REQUIRED_USE="daemon? ( tools )" +" +DEPEND="pam? ( virtual/pam )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-replace-DECLS.patch + "${FILESDIR}"/${P}-replace-INLCUDES.patch + "${FILESDIR}"/${P}-reorder-headers.patch + "${FILESDIR}"/${P}-remove-umask.patch +) -DOCS=(README_daemon README README_systemd INSTALL) pkg_setup() { local CONFIG_CHECK="~CGROUPS" if use daemon; then @@ -56,6 +65,9 @@ src_prepare() { sed -i '/^SUBDIRS/s:tests::' Makefile.am || die fi + # Workaround configure.in + mv configure.in configure.ac || die + eautoreconf } @@ -75,16 +87,9 @@ src_configure() { ${my_conf} } -src_test() { - # Use mount cgroup to build directory - # sandbox restricted to trivial build, - # possible kill Diego tanderbox ;) - true -} - src_install() { default - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die insinto /etc/cgroup doins samples/*.conf
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/files/
commit: 852cd2d935f8630c4ab51e159669db75765b2862 Author: Bernardo Meurer standard ai> AuthorDate: Sat Sep 21 07:10:07 2019 + Commit: Michał Górny gentoo org> CommitDate: Sat Sep 21 09:15:22 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=852cd2d9 dev-libs/libcgroup: yank old files Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Bernardo Meurer standard.ai> Closes: https://github.com/gentoo/gentoo/pull/12652 Signed-off-by: Michał Górny gentoo.org> dev-libs/libcgroup/files/cgconfig.confd | 4 -- dev-libs/libcgroup/files/cgconfig.initd | 117 dev-libs/libcgroup/files/cgred.confd| 17 - dev-libs/libcgroup/files/cgred.initd| 41 --- 4 files changed, 179 deletions(-) diff --git a/dev-libs/libcgroup/files/cgconfig.confd b/dev-libs/libcgroup/files/cgconfig.confd deleted file mode 100644 index e41730ae0ea..000 --- a/dev-libs/libcgroup/files/cgconfig.confd +++ /dev/null @@ -1,4 +0,0 @@ -# /etc/conf.d/cgconfig: config file for /etc/init.d/cgconfig - -# Configuration file location -#CONFIG_FILE=/etc/cgroup/cgconfig.conf diff --git a/dev-libs/libcgroup/files/cgconfig.initd b/dev-libs/libcgroup/files/cgconfig.initd deleted file mode 100644 index f182b92ff84..000 --- a/dev-libs/libcgroup/files/cgconfig.initd +++ /dev/null @@ -1,117 +0,0 @@ -#!/sbin/openrc-run -# -# Control Groups Configuration Startup -# -# This script runs the cgconfigparser utility to parse and setup -# the control group filesystem. It uses ${CONFIG_FILE} -# and parses the configuration specified in there. -# -CGCONFIGPARSER="/usr/sbin/cgconfigparser" -CGROUP_FS="cgroup" -CONFIG_FILE=${CONFIG_FILE:-"/etc/cgroup/cgconfig.conf"} -MOUNTS_FILE="/proc/mounts" -RULES_FILE="/etc/cgroup/cgrules.conf" - -# Support multiple mount points -MAX_INDEX=0 -declare -a MOUNT_POINTS MOUNT_OPTIONS - -move_all_to_init_class() { - local i - for i in $(seq 1 ${MAX_INDEX}); do - cd ${MOUNT_POINTS[$i]} - - if grep -qw ${MOUNT_POINTS[$i]} ${MOUNTS_FILE}; then - local directory - for directory in $(find . -depth -type d); do - if [[ ${directory} != "." ]]; then - # cat fails with "Argument list too long" error - sed -nu p < ${directory}/tasks > tasks - rmdir ${directory} - fi - done - else - ewarn "Resource control filesystem not mounted" - fi - - cd - >/dev/null - done -} - -parse_mounts() { - local device mount_point fs_type options other - while read device mount_point fs_type options other; do - if grep -q ${device} <<< ${CGROUP_FS}; then - let MAX_INDEX++ - MOUNT_POINTS[${MAX_INDEX}]=${mount_point} - MOUNT_OPTIONS[${MAX_INDEX}]=${options} - fi - done < ${MOUNTS_FILE} -} - -umount_fs() { - local i - for i in $(seq 1 ${MAX_INDEX}); do - umount ${MOUNT_POINTS[$i]} - rmdir ${MOUNT_POINTS[$i]} - done -} - -start() { - ebegin "Starting cgconfig service" - - # Mount filesystem and create cgroups - if ! ${CGCONFIGPARSER} -l ${CONFIG_FILE} >/dev/null; then - eend 1 "Failed to parse ${CONFIG_FILE}" - return 1 - fi - - parse_mounts - - # Find default cgroup name in rules file - local default_cgroup - if [[ -f ${RULES_FILE} ]]; then - local user controller - read user controller default_cgroup <<< $(grep -m1 '^\*\s' ${RULES_FILE}) - if [[ $default_cgroup == "*" ]]; then - ewarn "${RULES_FILE} incorrect" - ewarn "Overriding it" - default_cgroup= - fi - fi - # Use predefined name if none was found - if [[ -z ${default_cgroup} ]]; then - default_cgroup=sysdefault - fi - - # Create a default cgroup for tasks to return back to - local i - for i in $(seq 1 ${MAX_INDEX}); do - # Ignore if directory already exists - mkdir -p ${MOUNT_POINTS[$i]}/${default_cgroup} - find ${MOUNT_POINTS[$i]}/ -name tasks | xargs chmod a+rw - chmod go-w ${MOUNT_POINTS[$i]}/tasks - - # Special rule for cpusets - if grep -qw cpuset <<< ${MOUNT_OPTIONS[$i]}; then - cat ${MOUNT_POINTS[$i]}/cpuset.cpus > ${MOUNT_POINTS[$i]}/${default_cgroup}/cpuset.cpus - cat ${MOUNT_POINTS[$i]}/cpuset.mems > ${MOUNT_POINTS[$i]}/${default_cgroup}/cpuset.mems - fi - - # Classify
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 1ba9d420bd28cc239bd023e1b0b2ea3c1834feb1 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Apr 21 02:34:24 2019 + Commit: Anthony G. Basile gentoo org> CommitDate: Sun Apr 21 02:34:24 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ba9d420 dev-libs/libcgroup: stable on arm64 Signed-off-by: Anthony G. Basile gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 dev-libs/libcgroup/libcgroup-0.41-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild index e848ee0fd07..1acdb65f88b 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" IUSE="+daemon elibc_musl pam static-libs test +tools" RDEPEND="pam? ( virtual/pam )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 49c9153d42df752c259e9fc53102a4c655ea41d0 Author: Anthony G. Basile gentoo org> AuthorDate: Tue Apr 16 12:48:19 2019 + Commit: Anthony G. Basile gentoo org> CommitDate: Tue Apr 16 12:48:19 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c9153d dev-libs/libcgroup: keyword ~arm64 Signed-off-by: Anthony G. Basile gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 dev-libs/libcgroup/libcgroup-0.41-r5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild index 6c256390301..e848ee0fd07 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm ~ppc ~ppc64 x86" +KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86" IUSE="+daemon elibc_musl pam static-libs test +tools" RDEPEND="pam? ( virtual/pam )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: a93b3a6f21c48494aba1a78f70ee1d94f9c1a8bb Author: Mike Frysinger chromium org> AuthorDate: Thu Jan 3 09:14:47 2019 + Commit: Mike Frysinger gentoo org> CommitDate: Thu Jan 3 09:14:58 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a93b3a6f dev-libs/libcgroup: avoid building tests when USE=-test Signed-off-by: Mike Frysinger gentoo.org> dev-libs/libcgroup/libcgroup-0.41-r5.ebuild | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild index a4301a5acce..6c256390301 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 arm ~ppc ~ppc64 x86" -IUSE="+daemon elibc_musl pam static-libs +tools" +IUSE="+daemon elibc_musl pam static-libs test +tools" RDEPEND="pam? ( virtual/pam )" @@ -51,6 +51,11 @@ src_prepare() { -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 + eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 2dcb5eb20a369a88ef45537fb0f439cd9684fc10 Author: Anthony G. Basile gentoo org> AuthorDate: Wed Nov 7 06:20:59 2018 + Commit: Anthony G. Basile gentoo org> CommitDate: Wed Nov 7 06:20:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcb5eb2 dev-libs/libcgroup: version 0.41-r5 stable on arm Signed-off-by: Anthony G. Basile gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-libs/libcgroup/libcgroup-0.41-r5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild index 3b10e13da1a..a4301a5acce 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" +KEYWORDS="amd64 arm ~ppc ~ppc64 x86" IUSE="+daemon elibc_musl pam static-libs +tools" RDEPEND="pam? ( virtual/pam )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 51b3436cf1ef8f547fa90f80e8ef120f03a11dde Author: Anthony G. Basile gentoo org> AuthorDate: Thu Aug 23 00:39:13 2018 + Commit: Anthony G. Basile gentoo org> CommitDate: Thu Aug 23 00:39:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b3436c dev-libs/libcgroup: remove vulnerable version, bug #664324 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/libcgroup/libcgroup-0.41-r4.ebuild | 95 - 1 file changed, 95 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild deleted file mode 100644 index ebd6a36c8af..000 --- a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic linux-info pam - -DESCRIPTION="Tools and libraries to configure and manage kernel control groups" -HOMEPAGE="http://libcg.sourceforge.net/; -SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" -IUSE="+daemon elibc_musl pam static-libs +tools" - -RDEPEND="pam? ( virtual/pam )" - -DEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - elibc_musl? ( sys-libs/fts-standalone ) - " -REQUIRED_USE="daemon? ( tools )" - -DOCS=(README_daemon README README_systemd INSTALL) -pkg_setup() { - local CONFIG_CHECK="~CGROUPS" - if use daemon; then - CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS" - fi - linux-info_pkg_setup -} - -PATCHES=( - "${FILESDIR}"/${P}-replace_DECLS.patch - "${FILESDIR}"/${P}-replace_INLCUDES.patch - "${FILESDIR}"/${P}-reorder-headers.patch -) - -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" - - 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_test() { - # Use mount cgroup to build directory - # sandbox restricted to trivial build, - # possible kill Diego tanderbox ;) - true -} - -src_install() { - default - prune_libtool_files --all - - insinto /etc/cgroup - doins samples/*.conf || die - - if use tools; then - newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig || die - newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig || die - fi - - if use daemon; then - newconfd "${FILESDIR}"/cgred.confd-r2 cgred || die - newinitd "${FILESDIR}"/cgred.initd-r1 cgred || die - fi -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 48c5e014fe36d069657854d60d241955039808c1 Author: Anthony G. Basile gentoo org> AuthorDate: Thu Aug 23 00:36:44 2018 + Commit: Anthony G. Basile gentoo org> CommitDate: Thu Aug 23 00:36:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48c5e014 dev-libs/libcgroup: 0.41-r5 stable on x86 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/libcgroup/libcgroup-0.41-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild index 4aee90f8419..3b10e13da1a 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" IUSE="+daemon elibc_musl pam static-libs +tools" RDEPEND="pam? ( virtual/pam )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 9baf9a9dafaaaba8a83fb4bd57b335532ee5c93e Author: Anthony G. Basile gentoo org> AuthorDate: Thu Aug 23 00:28:25 2018 + Commit: Anthony G. Basile gentoo org> CommitDate: Thu Aug 23 00:28:42 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9baf9a9d dev-libs/libcgroup: 0.41-r5 stable on amd64 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/libcgroup/libcgroup-0.41-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild index a17306a01ae..4aee90f8419 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="+daemon elibc_musl pam static-libs +tools" RDEPEND="pam? ( virtual/pam )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/, dev-libs/libcgroup/files/
commit: 33e9f4c81de754bbf76b893ea1133ed023f2a0e5 Author: Anthony G. Basile gentoo org> AuthorDate: Thu Aug 23 00:17:31 2018 + Commit: Anthony G. Basile gentoo org> CommitDate: Thu Aug 23 00:17:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e9f4c8 dev-libs/libcgroup: address CVE-2018-14348, bug #664324 Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../files/libcgroup-0.41-remove-umask.patch| 28 +++ dev-libs/libcgroup/libcgroup-0.41-r5.ebuild| 96 ++ 2 files changed, 124 insertions(+) diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch b/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch new file mode 100644 index 000..42286ae8785 --- /dev/null +++ b/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch @@ -0,0 +1,28 @@ +commit 0d88b73d189ea3440ccaab00418d6469f76fa590 +Author: Michal Hocko +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 +Acked-by: Balbir Singh + +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/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild new file mode 100644 index 000..a17306a01ae --- /dev/null +++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic linux-info pam + +DESCRIPTION="Tools and libraries to configure and manage kernel control groups" +HOMEPAGE="http://libcg.sourceforge.net/; +SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="+daemon elibc_musl pam static-libs +tools" + +RDEPEND="pam? ( virtual/pam )" + +DEPEND=" + ${RDEPEND} + sys-devel/bison + sys-devel/flex + elibc_musl? ( sys-libs/fts-standalone ) + " +REQUIRED_USE="daemon? ( tools )" + +DOCS=(README_daemon README README_systemd INSTALL) +pkg_setup() { + local CONFIG_CHECK="~CGROUPS" + if use daemon; then + CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS" + fi + linux-info_pkg_setup +} + +PATCHES=( + "${FILESDIR}"/${P}-replace_DECLS.patch + "${FILESDIR}"/${P}-replace_INLCUDES.patch + "${FILESDIR}"/${P}-reorder-headers.patch + "${FILESDIR}"/${P}-remove-umask.patch +) + +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" + + 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_test() { + # Use mount cgroup to build directory + # sandbox restricted to trivial build, + # possible kill Diego tanderbox ;) + true +} + +src_install() { + default + prune_libtool_files --all + + insinto /etc/cgroup + doins samples/*.conf || die + + if use tools; then + newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig || die + newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig || die + fi + + if use daemon; then + newconfd "${FILESDIR}"/cgred.confd-r2 cgred || die + newinitd "${FILESDIR}"/cgred.initd-r1 cgred || die + fi +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: bfb7658468adba0e3d0b24965584296bb24f29d6 Author: Anthony G. Basile gentoo org> AuthorDate: Wed Aug 15 22:52:44 2018 + Commit: Anthony G. Basile gentoo org> CommitDate: Wed Aug 15 22:52:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfb76584 dev-libs/libcgroup: keyword for ~arm Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/libcgroup/libcgroup-0.41-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild index 67b609f2dfe..ebd6a36c8af 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" IUSE="+daemon elibc_musl pam static-libs +tools" RDEPEND="pam? ( virtual/pam )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 5ac232c7f6ed5284380c565a461605f68bdf00cb Author: Marty E. Plummer startmail com> AuthorDate: Fri Apr 20 16:34:22 2018 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Apr 21 11:15:12 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac232c7 dev-libs/libcgroup: epatch->PATCHES=() Also dropped unneeded eutils eclass. Package-Manager: Portage-2.3.31, Repoman-2.3.9 dev-libs/libcgroup/libcgroup-0.41-r4.ebuild | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild index 0f827edbd6f..67b609f2dfe 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 -inherit autotools eutils flag-o-matic linux-info pam +inherit autotools flag-o-matic linux-info pam DESCRIPTION="Tools and libraries to configure and manage kernel control groups" HOMEPAGE="http://libcg.sourceforge.net/; @@ -33,11 +33,14 @@ pkg_setup() { linux-info_pkg_setup } -src_prepare() { - epatch "${FILESDIR}"/${P}-replace_DECLS.patch - epatch "${FILESDIR}"/${P}-replace_INLCUDES.patch - epatch "${FILESDIR}"/${P}-reorder-headers.patch +PATCHES=( + "${FILESDIR}"/${P}-replace_DECLS.patch + "${FILESDIR}"/${P}-replace_INLCUDES.patch + "${FILESDIR}"/${P}-reorder-headers.patch +) +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" @@ -47,7 +50,6 @@ src_prepare() { -i src/pam/Makefile.am || die "sed failed" sed -e 's#/var/run#/run#g' -i configure.in || die "sed failed" - eapply_user eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 2d0414b30f474f195c7e4ba5b3d3db5b5d6cdbd5 Author: Anthony G. Basile gentoo org> AuthorDate: Thu Dec 21 21:31:18 2017 + Commit: Anthony G. Basile gentoo org> CommitDate: Thu Dec 21 21:32:27 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0414b3 dev-libs/libcgroup: bump to EAPI 6 Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-libs/libcgroup/libcgroup-0.41-r4.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild index ba50ec3ea55..0f827edbd6f 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" inherit autotools eutils flag-o-matic linux-info pam @@ -47,6 +47,7 @@ src_prepare() { -i src/pam/Makefile.am || die "sed failed" sed -e 's#/var/run#/run#g' -i configure.in || die "sed failed" + eapply_user eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: c73f76d776826207382fc2ca4bc2d577caebb90a Author: Anthony G. Basile gentoo org> AuthorDate: Thu Dec 21 21:19:54 2017 + Commit: Anthony G. Basile gentoo org> CommitDate: Thu Dec 21 21:32:25 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c73f76d7 dev-libs/libcgroup: 0.41-r4 stable on x86 Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-libs/libcgroup/libcgroup-0.41-r4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild index 37deb466f20..ba50ec3ea55 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="+daemon elibc_musl pam static-libs +tools" RDEPEND="pam? ( virtual/pam )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 01225a1a3ebb0df92c4a63532994e146cab84fb8 Author: Anthony G. Basile gentoo org> AuthorDate: Thu Dec 21 21:32:05 2017 + Commit: Anthony G. Basile gentoo org> CommitDate: Thu Dec 21 21:32:29 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01225a1a dev-libs/libcgroup: remove older version Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-libs/libcgroup/libcgroup-0.41.ebuild | 104 --- 1 file changed, 104 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41.ebuild b/dev-libs/libcgroup/libcgroup-0.41.ebuild deleted file mode 100644 index 033edd31d68..000 --- a/dev-libs/libcgroup/libcgroup-0.41.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -AUTOTOOLS_AUTORECONF=1 - -inherit eutils linux-info pam autotools-utils - -DESCRIPTION="Tools and libraries to configure and manage kernel control groups" -HOMEPAGE="http://libcg.sourceforge.net/; -SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" -IUSE="+daemon debug pam static-libs +tools debug" - -RDEPEND="pam? ( virtual/pam )" - -DEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - " -REQUIRED_USE="daemon? ( tools )" - -DOCS=(README_daemon README README_systemd INSTALL) -pkg_setup() { - local CONFIG_CHECK="~CGROUPS" - if use daemon; then - CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS" - fi - linux-info_pkg_setup -} - -src_prepare() { - - # 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:\(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" - - autotools-utils_src_prepare -} - -src_configure() { - local my_conf - - if use pam; then - my_conf=" --enable-pam-module-dir=$(getpam_mod_dir) " - fi - - local myeconfargs=( - $(use_enable daemon) - $(use_enable debug) - $(use_enable pam) - $(use_enable tools) - ${my_conf} - ) - autotools-utils_src_configure -} - -src_test() { - # Use mount cgroup to build directory - # sandbox restricted to trivial build, - # possible kill Diego tanderbox ;) - true -} - -src_install() { - autotools-utils_src_install - prune_libtool_files --all - - insinto /etc/cgroup - doins samples/*.conf || die - - if use tools; then - newconfd "${FILESDIR}"/cgconfig.confd cgconfig || die - newinitd "${FILESDIR}"/cgconfig.initd cgconfig || die - fi - - if use daemon; then - newconfd "${FILESDIR}"/cgred.confd cgred || die - newinitd "${FILESDIR}"/cgred.initd cgred || die - fi -} - -pkg_postinst() { - elog "Read the kernel docs on cgroups, related schedulers, and the" - elog "block I/O controllers. The Redhat Resource Management Guide" - elog "is also helpful. DO NOT enable the cgroup namespace subsytem" - elog "if you want a custom config, rule processing, etc. This option" - elog "should only be enabled for a VM environment. The UID wildcard" - elog "rules seem to work only without a custom config (since wildcards" - elog "don't work in config blocks). Specific user-id configs *do*" - elog "work, but be careful about how the mem limits add up if using" - elog "the memory.limit_* directives. There should be a basic task" - elog "partitioning into the default group when running cgred with no" - elog "specific config blocks or rules (other than the mount directive)." - elog "See the docs for the pam module config, and as always, RTFM..." -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 4b8105266335723a47ed7440fb6c61bc15b992a9 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Oct 10 13:28:03 2016 + Commit: Anthony G. Basile gentoo org> CommitDate: Mon Oct 10 13:28:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b810526 dev-libs/libcgroup: 0.41-r4 stable on amd64 Package-Manager: portage-2.2.28 dev-libs/libcgroup/libcgroup-0.41-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild index d8a72b3..1689676 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 ~x86" IUSE="+daemon elibc_musl pam static-libs +tools" RDEPEND="pam? ( virtual/pam )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/, dev-libs/libcgroup/files/
commit: 914b1707958ce227568068b5db2b00726d37f7ed Author: Anthony G. Basile gentoo org> AuthorDate: Sun Jun 12 23:49:34 2016 + Commit: Anthony G. Basile gentoo org> CommitDate: Sun Jun 12 23:49:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914b1707 dev-libs/libcgroup: remove older unstable versions Package-Manager: portage-2.2.28 dev-libs/libcgroup/files/cgred.confd-r1 | 5 -- dev-libs/libcgroup/libcgroup-0.41-r2.ebuild | 106 dev-libs/libcgroup/libcgroup-0.41-r3.ebuild | 92 3 files changed, 203 deletions(-) diff --git a/dev-libs/libcgroup/files/cgred.confd-r1 b/dev-libs/libcgroup/files/cgred.confd-r1 deleted file mode 100644 index e351434..000 --- a/dev-libs/libcgroup/files/cgred.confd-r1 +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/conf.d/cgred.conf: config file for /etc/init.d/cgred - -# Options to pass to cgrulesengd; -# See the cgrulesengd(8) man page for more info. -CGRED_OPTS="" diff --git a/dev-libs/libcgroup/libcgroup-0.41-r2.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r2.ebuild deleted file mode 100644 index ab19abc..000 --- a/dev-libs/libcgroup/libcgroup-0.41-r2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit autotools eutils flag-o-matic linux-info pam - -DESCRIPTION="Tools and libraries to configure and manage kernel control groups" -HOMEPAGE="http://libcg.sourceforge.net/; -SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+daemon elibc_musl pam static-libs +tools" - -RDEPEND="pam? ( virtual/pam )" - -DEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - elibc_musl? ( sys-libs/fts-standalone ) - " -REQUIRED_USE="daemon? ( tools )" - -DOCS=(README_daemon README README_systemd INSTALL) -pkg_setup() { - local CONFIG_CHECK="~CGROUPS" - if use daemon; then - CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS" - fi - linux-info_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-replace_DECLS.patch - epatch "${FILESDIR}"/${P}-replace_INLCUDES.patch - epatch "${FILESDIR}"/${P}-reorder-headers.patch - - # 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:\(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" - - 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_test() { - # Use mount cgroup to build directory - # sandbox restricted to trivial build, - # possible kill Diego tanderbox ;) - true -} - -src_install() { - default - prune_libtool_files --all - - insinto /etc/cgroup - doins samples/*.conf || die - - if use tools; then - newconfd "${FILESDIR}"/cgconfig.confd cgconfig || die - newinitd "${FILESDIR}"/cgconfig.initd cgconfig || die - fi - - if use daemon; then - newconfd "${FILESDIR}"/cgred.confd cgred || die - newinitd "${FILESDIR}"/cgred.initd cgred || die - fi -} - -pkg_postinst() { - elog "Read the kernel docs on cgroups, related schedulers, and the" - elog "block I/O controllers. The Redhat Resource Management Guide" - elog "is also helpful. DO NOT enable the cgroup namespace subsytem" - elog "if you want a custom config, rule processing, etc. This option" - elog "should only be enabled for a VM environment. The UID wildcard" - elog "rules seem to work only without a custom config (since wildcards" - elog "don't work in config blocks). Specific user-id configs *do*" - elog "work, but be careful about how the mem limits add up if using" - elog "the memory.limit_* directives. There should be a basic task" - elog "partitioning into the default group when running cgred with no" - elog "specific config blocks or rules (other than the mount directive)." - elog "See the docs for the pam module config, and as always, RTFM..." -} diff --git a/dev-libs/libcgroup/libcgroup-0.41-r3.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r3.ebuild deleted file mode 100644 index 23304ad..000 ---
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/, dev-libs/libcgroup/files/
commit: b2d6d5c661e5c5031a41f085404e8d01fa9e60a3 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Jun 12 23:47:12 2016 + Commit: Anthony G. Basile gentoo org> CommitDate: Sun Jun 12 23:49:47 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d6d5c6 dev-libs/libcgroup: fix cgred service, bug #584962 Thanks Nicolas Porcel yahoo.fr> Package-Manager: portage-2.2.28 dev-libs/libcgroup/files/cgred.confd-r2 | 5 ++ dev-libs/libcgroup/libcgroup-0.41-r4.ebuild | 93 + 2 files changed, 98 insertions(+) diff --git a/dev-libs/libcgroup/files/cgred.confd-r2 b/dev-libs/libcgroup/files/cgred.confd-r2 new file mode 100644 index 000..cdc7a7c --- /dev/null +++ b/dev-libs/libcgroup/files/cgred.confd-r2 @@ -0,0 +1,5 @@ +# /etc/conf.d/cgred.conf: config file for /etc/init.d/cgred + +# Options to pass to cgrulesengd; +# See the cgrulesengd(8) man page for more info. +CGRED_OPTS="-n" diff --git a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild new file mode 100644 index 000..d8a72b3 --- /dev/null +++ b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit autotools eutils flag-o-matic linux-info pam + +DESCRIPTION="Tools and libraries to configure and manage kernel control groups" +HOMEPAGE="http://libcg.sourceforge.net/; +SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="+daemon elibc_musl pam static-libs +tools" + +RDEPEND="pam? ( virtual/pam )" + +DEPEND=" + ${RDEPEND} + sys-devel/bison + sys-devel/flex + elibc_musl? ( sys-libs/fts-standalone ) + " +REQUIRED_USE="daemon? ( tools )" + +DOCS=(README_daemon README README_systemd INSTALL) +pkg_setup() { + local CONFIG_CHECK="~CGROUPS" + if use daemon; then + CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS" + fi + linux-info_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-replace_DECLS.patch + epatch "${FILESDIR}"/${P}-replace_INLCUDES.patch + epatch "${FILESDIR}"/${P}-reorder-headers.patch + + # 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" + + 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_test() { + # Use mount cgroup to build directory + # sandbox restricted to trivial build, + # possible kill Diego tanderbox ;) + true +} + +src_install() { + default + prune_libtool_files --all + + insinto /etc/cgroup + doins samples/*.conf || die + + if use tools; then + newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig || die + newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig || die + fi + + if use daemon; then + newconfd "${FILESDIR}"/cgred.confd-r2 cgred || die + newinitd "${FILESDIR}"/cgred.initd-r1 cgred || die + fi +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/, dev-libs/libcgroup/files/
commit: a8cc51c8c561a5b98aa079858de05b2b869b6e76 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Nov 16 23:09:14 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Mon Nov 16 23:09:33 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cc51c8 dev-libs/libcgroup: refactor the init scripts. Thanks tokiclover eclipso.email Package-Manager: portage-2.2.20.1 dev-libs/libcgroup/files/cgconfig.confd-r1 | 7 +++ dev-libs/libcgroup/files/cgconfig.initd-r1 | 53 + dev-libs/libcgroup/files/cgred.confd-r1 | 5 ++ dev-libs/libcgroup/files/cgred.initd-r1 | 24 dev-libs/libcgroup/libcgroup-0.41-r3.ebuild | 92 + 5 files changed, 181 insertions(+) diff --git a/dev-libs/libcgroup/files/cgconfig.confd-r1 b/dev-libs/libcgroup/files/cgconfig.confd-r1 new file mode 100644 index 000..334958e --- /dev/null +++ b/dev-libs/libcgroup/files/cgconfig.confd-r1 @@ -0,0 +1,7 @@ +# /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 new file mode 100644 index 000..f10d994 --- /dev/null +++ b/dev-libs/libcgroup/files/cgconfig.initd-r1 @@ -0,0 +1,53 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /etc/init.d/cgconfig,v 1.1 2015/02/18 09:53:59 tokiclover Exp $ + +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/cgred.confd-r1 b/dev-libs/libcgroup/files/cgred.confd-r1 new file mode 100644 index 000..e351434 --- /dev/null +++ b/dev-libs/libcgroup/files/cgred.confd-r1 @@ -0,0 +1,5 @@ +# /etc/conf.d/cgred.conf: config file for /etc/init.d/cgred + +# Options to pass to cgrulesengd; +# See the cgrulesengd(8) man page for more info. +CGRED_OPTS="" diff --git a/dev-libs/libcgroup/files/cgred.initd-r1 b/dev-libs/libcgroup/files/cgred.initd-r1 new file mode 100644 index 000..85cbb05 --- /dev/null +++ b/dev-libs/libcgroup/files/cgred.initd-r1 @@ -0,0 +1,24 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /etc/init.d/cgred,v 1.1 2015/02/14 09:53:59 tokiclover Exp $ + +command="/usr/sbin/cgrulesengd" +command_args="${CGRED_OPTS}" +command_background="1" +pidfile="/var/run/cgred.pid" +description="CGroups Rules Engine Daemon" +extra_started_commands="reload" + +depend() +{ + need cgconfig + use logger +} + +reload() +{ + ebegin "Reloading CGroup Rules Engine Daemon" + kill -USR2 $(cat "${pidfile}") + eend $? +} diff --git a/dev-libs/libcgroup/libcgroup-0.41-r3.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r3.ebuild new file mode 100644 index 000..23304ad --- /dev/null +++ b/dev-libs/libcgroup/libcgroup-0.41-r3.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit autotools eutils flag-o-matic linux-info pam + +DESCRIPTION="Tools and libraries to configure and manage kernel control groups" +HOMEPAGE="http://libcg.sourceforge.net/; +SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="+daemon elibc_musl debug pam static-libs +tools" + +RDEPEND="pam? ( virtual/pam )" + +DEPEND=" + ${RDEPEND} + sys-devel/bison +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 58f3d19a35639011e67ec7131032bc0c07f3f7fe Author: Anthony G. Basile gentoo org> AuthorDate: Sun Sep 6 15:52:18 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sun Sep 6 15:53:45 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58f3d19a dev-libs/libcgroup: don't skip make install, bug #559772 Package-Manager: portage-2.2.20.1 dev-libs/libcgroup/libcgroup-0.41-r1.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r1.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r1.ebuild index 439a642..ab19abc 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r1.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r1.ebuild @@ -58,6 +58,7 @@ src_configure() { use elibc_musl && append-ldflags "-lfts" econf \ + $(use_enable static-libs static) \ $(use_enable daemon) \ $(use_enable pam) \ $(use_enable tools) \ @@ -72,6 +73,7 @@ src_test() { } src_install() { + default prune_libtool_files --all insinto /etc/cgroup
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcgroup/
commit: 19ff011f07a4fe0387485e68b2e90d00ba6d89d2 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Sep 6 16:44:51 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Sun Sep 6 16:45:14 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19ff011f dev-libs/libcgroup: rev bump to 0.41-r2 to push out changes Package-Manager: portage-2.2.20.1 dev-libs/libcgroup/{libcgroup-0.41-r1.ebuild => libcgroup-0.41-r2.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dev-libs/libcgroup/libcgroup-0.41-r1.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r2.ebuild similarity index 100% rename from dev-libs/libcgroup/libcgroup-0.41-r1.ebuild rename to dev-libs/libcgroup/libcgroup-0.41-r2.ebuild