public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/musl:master commit in: dev-libs/libcgroup/, dev-libs/libcgroup/files/
@ 2017-01-08 21:33 Aric Belsito
  0 siblings, 0 replies; 2+ messages in thread
From: Aric Belsito @ 2017-01-08 21:33 UTC (permalink / raw
  To: gentoo-commits

commit:     bb869aa04de2430f54c61d229d6e1ae80c2c065f
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Jan  8 21:01:24 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Jan  8 21:01:24 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=bb869aa0

dev-libs/libcgroup: Use sys-libs/musl-fts

Only change from the in-tree version

 dev-libs/libcgroup/Manifest                        |   1 +
 dev-libs/libcgroup/files/cgconfig.confd-r1         |   7 +
 dev-libs/libcgroup/files/cgconfig.initd-r1         |  53 +++++
 dev-libs/libcgroup/files/cgred.confd-r2            |   5 +
 dev-libs/libcgroup/files/cgred.initd-r1            |  24 +++
 .../files/libcgroup-0.41-reorder-headers.patch     |  28 +++
 .../files/libcgroup-0.41-replace_DECLS.patch       | 225 +++++++++++++++++++++
 .../files/libcgroup-0.41-replace_INLCUDES.patch    |  74 +++++++
 dev-libs/libcgroup/libcgroup-0.41-r4.ebuild        |  93 +++++++++
 dev-libs/libcgroup/metadata.xml                    |  19 ++
 10 files changed, 529 insertions(+)

diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
new file mode 100644
index 0000000..62dae46
--- /dev/null
+++ b/dev-libs/libcgroup/Manifest
@@ -0,0 +1 @@
+DIST libcgroup-0.41.tar.bz2 500120 SHA256 e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd WHIRLPOOL 3941ec9362dd7da1c5d1b9eaf2b44303982a04d460ab92946201b1fe952c2f94e19950e9a08104c262eb982d8e64bcf290f1b95115aaba11d8b1457b715a3646

diff --git a/dev-libs/libcgroup/files/cgconfig.confd-r1 b/dev-libs/libcgroup/files/cgconfig.confd-r1
new file mode 100644
index 0000000..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 0000000..0615259
--- /dev/null
+++ b/dev-libs/libcgroup/files/cgconfig.initd-r1
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-r2 b/dev-libs/libcgroup/files/cgred.confd-r2
new file mode 100644
index 0000000..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/files/cgred.initd-r1 b/dev-libs/libcgroup/files/cgred.initd-r1
new file mode 100644
index 0000000..6bc7ef5
--- /dev/null
+++ b/dev-libs/libcgroup/files/cgred.initd-r1
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/files/libcgroup-0.41-reorder-headers.patch b/dev-libs/libcgroup/files/libcgroup-0.41-reorder-headers.patch
new file mode 100644
index 0000000..78a3d09
--- /dev/null
+++ b/dev-libs/libcgroup/files/libcgroup-0.41-reorder-headers.patch
@@ -0,0 +1,28 @@
+libcgroup-internal.h: reorder the header stacking.
+
+`man 3 fts` not only specifies the headers to be included, but
+also the order.  <fts.h> must be included after <sys/types.h>
+and <sys/stats.h>.  On glibc and uClibc systems, an incorrect
+order does not pose a problem, but on musl this leads to undefine
+types such as dev_t and friends.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+diff -Naur libcgroup-0.41.orig/src/libcgroup-internal.h libcgroup-0.41/src/libcgroup-internal.h
+--- libcgroup-0.41.orig/src/libcgroup-internal.h	2015-07-13 21:08:26.740965713 -0400
++++ libcgroup-0.41/src/libcgroup-internal.h	2015-07-13 21:09:40.774962164 -0400
+@@ -21,12 +21,12 @@
+ #endif
+ 
+ #include "config.h"
+-#include <fts.h>
+ #include <libcgroup.h>
+ #include <limits.h>
+ #include <pthread.h>
+-#include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
++#include <fts.h>
+ #include <setjmp.h>
+ 
+ /* Maximum number of mount points/controllers */

diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch b/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch
new file mode 100644
index 0000000..7701093
--- /dev/null
+++ b/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch
@@ -0,0 +1,225 @@
+Replace __BEGIN_DECLS and __END_DECLS with extern "C".
+
+The macros __BEGIN_DECLS and __END_DECLS are a GNU-ism found in
+glibc and uClibc, but not musl.  We replace them by the more general
+extern "C" { ... } block exposed only if we have __cplusplus.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+diff -Naur libcgroup-0.41.orig/include/libcgroup/config.h libcgroup-0.41/include/libcgroup/config.h
+--- libcgroup-0.41.orig/include/libcgroup/config.h	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/include/libcgroup/config.h	2015-07-11 23:19:20.451977284 +0000
+@@ -9,7 +9,9 @@
+ #include <features.h>
+ #endif
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /**
+  * @defgroup group_config 5. Configuration
+@@ -107,6 +109,8 @@
+  * @}
+  * @}
+  */
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif /*_LIBCGROUP_CONFIG_H*/
+diff -Naur libcgroup-0.41.orig/include/libcgroup/error.h libcgroup-0.41/include/libcgroup/error.h
+--- libcgroup-0.41.orig/include/libcgroup/error.h	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/include/libcgroup/error.h	2015-07-11 23:19:34.253977328 +0000
+@@ -9,7 +9,9 @@
+ #include <features.h>
+ #endif
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /**
+  * @defgroup group_errors 6. Error handling
+@@ -99,6 +101,8 @@
+  * @}
+  * @}
+  */
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif /* _LIBCGROUP_INIT_H */
+diff -Naur libcgroup-0.41.orig/include/libcgroup/groups.h libcgroup-0.41/include/libcgroup/groups.h
+--- libcgroup-0.41.orig/include/libcgroup/groups.h	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/include/libcgroup/groups.h	2015-07-11 23:19:40.305977347 +0000
+@@ -11,7 +11,9 @@
+ #include <stdbool.h>
+ #endif
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /**
+  * Flags for cgroup_delete_cgroup_ext().
+@@ -577,6 +579,8 @@
+  */
+ 
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif /* _LIBCGROUP_GROUPS_H */
+diff -Naur libcgroup-0.41.orig/include/libcgroup/init.h libcgroup-0.41/include/libcgroup/init.h
+--- libcgroup-0.41.orig/include/libcgroup/init.h	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/include/libcgroup/init.h	2015-07-11 23:19:46.369977366 +0000
+@@ -9,7 +9,9 @@
+ #include <features.h>
+ #endif
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /**
+  * @defgroup group_init 1. Initialization
+@@ -58,6 +60,8 @@
+  * @}
+  * @}
+  */
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif /* _LIBCGROUP_INIT_H */
+diff -Naur libcgroup-0.41.orig/include/libcgroup/iterators.h libcgroup-0.41/include/libcgroup/iterators.h
+--- libcgroup-0.41.orig/include/libcgroup/iterators.h	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/include/libcgroup/iterators.h	2015-07-11 23:19:53.353977388 +0000
+@@ -11,7 +11,9 @@
+ #include <features.h>
+ #endif
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /**
+  * @defgroup group_iterators 3. Iterators
+@@ -423,6 +425,8 @@
+  * @}
+  */
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif /* _LIBCGROUP_ITERATORS_H */
+diff -Naur libcgroup-0.41.orig/include/libcgroup/log.h libcgroup-0.41/include/libcgroup/log.h
+--- libcgroup-0.41.orig/include/libcgroup/log.h	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/include/libcgroup/log.h	2015-07-11 23:19:58.922977406 +0000
+@@ -11,7 +11,9 @@
+ 
+ #include <stdarg.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /**
+  * @defgroup group_log 7. Logging
+@@ -142,6 +144,8 @@
+  * @}
+  * @}
+  */
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif /* _LIBCGROUP_LOG_H */
+diff -Naur libcgroup-0.41.orig/include/libcgroup/tasks.h libcgroup-0.41/include/libcgroup/tasks.h
+--- libcgroup-0.41.orig/include/libcgroup/tasks.h	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/include/libcgroup/tasks.h	2015-07-11 23:20:03.329977420 +0000
+@@ -12,7 +12,9 @@
+ #include <stdbool.h>
+ #endif
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /** Flags for cgroup_change_cgroup_uid_gid(). */
+ enum cgflags {
+@@ -204,6 +206,8 @@
+  * @}
+  * @}
+  */
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif /* _LIBCGROUP_TASKS_H */
+diff -Naur libcgroup-0.41.orig/src/daemon/cgrulesengd.h libcgroup-0.41/src/daemon/cgrulesengd.h
+--- libcgroup-0.41.orig/src/daemon/cgrulesengd.h	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/src/daemon/cgrulesengd.h	2015-07-11 23:20:34.282977519 +0000
+@@ -17,7 +17,9 @@
+ 
+ #include <features.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ #include "config.h"
+ #include "libcgroup.h"
+@@ -119,7 +121,9 @@
+  */
+ void cgre_catch_term(int signum);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif /* _CGRULESENGD_H */
+ 
+diff -Naur libcgroup-0.41.orig/src/libcgroup-internal.h libcgroup-0.41/src/libcgroup-internal.h
+--- libcgroup-0.41.orig/src/libcgroup-internal.h	2015-07-11 23:16:37.497976764 +0000
++++ libcgroup-0.41/src/libcgroup-internal.h	2015-07-11 23:20:22.299977481 +0000
+@@ -16,7 +16,9 @@
+ 
+ #define __LIBCG_INTERNAL
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ #include "config.h"
+ #include <fts.h>
+@@ -279,6 +281,8 @@
+  */
+ int cg_chmod_path(const char *path, mode_t mode, int owner_is_umask);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif

diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch b/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch
new file mode 100644
index 0000000..191de87
--- /dev/null
+++ b/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch
@@ -0,0 +1,74 @@
+Replace INCLUDES with AM_CPPFLAGS in Makefile.am
+
+We replace the deprecated INCLUDES with AM_CPPFLAGS in all
+Makefile.am's.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+diff -Naur libcgroup-0.41.orig/src/Makefile.am libcgroup-0.41/src/Makefile.am
+--- libcgroup-0.41.orig/src/Makefile.am	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/src/Makefile.am	2015-07-13 14:36:38.922428040 +0000
+@@ -9,7 +9,7 @@
+ 
+ CLEANFILES = lex.c parse.c parse.h
+ 
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ lib_LTLIBRARIES = libcgroup.la
+ libcgroup_la_SOURCES = parse.h parse.y lex.l api.c config.c libcgroup-internal.h libcgroup.map wrapper.c log.c
+ libcgroup_la_LIBADD = -lpthread
+diff -Naur libcgroup-0.41.orig/src/bindings/Makefile.am libcgroup-0.41/src/bindings/Makefile.am
+--- libcgroup-0.41.orig/src/bindings/Makefile.am	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/src/bindings/Makefile.am	2015-07-13 14:37:12.267428146 +0000
+@@ -1,5 +1,5 @@
+ SUBDIRS = .
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ lib_LTLIBRARIES = _libcgroup.la
+ _libcgroup_la_SOURCES = libcgroup.c
+@@ -11,5 +11,5 @@
+ 
+ libcgroup.c: libcgroup.p $(top_srcdir)/include/libcgroup.h
+ 	cp libcgroup.p libcgroup.i
+-	$(CC) $(INCLUDES) -DSWIG -E $(top_srcdir)/include/libcgroup.h >> libcgroup.i
++	$(CC) $(CPPFLAGS) -DSWIG -E $(top_srcdir)/include/libcgroup.h >> libcgroup.i
+ 	$(SWIG) -python -o libcgroup.c libcgroup.i
+diff -Naur libcgroup-0.41.orig/src/daemon/Makefile.am libcgroup-0.41/src/daemon/Makefile.am
+--- libcgroup-0.41.orig/src/daemon/Makefile.am	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/src/daemon/Makefile.am	2015-07-13 14:36:55.781428093 +0000
+@@ -1,4 +1,4 @@
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ 
+ if WITH_DAEMON
+ 
+diff -Naur libcgroup-0.41.orig/src/pam/Makefile.am libcgroup-0.41/src/pam/Makefile.am
+--- libcgroup-0.41.orig/src/pam/Makefile.am	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/src/pam/Makefile.am	2015-07-13 14:36:28.768428007 +0000
+@@ -1,4 +1,4 @@
+-INCLUDES = -I $(top_srcdir)/include
++AM_CPPFLAGS = -I $(top_srcdir)/include
+ 
+ if WITH_PAM
+ 
+diff -Naur libcgroup-0.41.orig/src/tools/Makefile.am libcgroup-0.41/src/tools/Makefile.am
+--- libcgroup-0.41.orig/src/tools/Makefile.am	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/src/tools/Makefile.am	2015-07-13 14:36:19.098427976 +0000
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
+ LDADD = $(top_builddir)/src/.libs/libcgroup.la
+ 
+ if WITH_TOOLS
+diff -Naur libcgroup-0.41.orig/tests/Makefile.am libcgroup-0.41/tests/Makefile.am
+--- libcgroup-0.41.orig/tests/Makefile.am	2014-01-13 14:05:56.000000000 +0000
++++ libcgroup-0.41/tests/Makefile.am	2015-07-13 14:37:23.146428181 +0000
+@@ -1,6 +1,6 @@
+ SUBDIRS = tools
+ 
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ LDADD = $(top_builddir)/src/.libs/libcgroup.la
+ 
+ # compile the tests, but do not install them

diff --git a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild
new file mode 100644
index 0000000..d4e31fe
--- /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/musl-fts )
+	"
+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
+}

diff --git a/dev-libs/libcgroup/metadata.xml b/dev-libs/libcgroup/metadata.xml
new file mode 100644
index 0000000..c35d422
--- /dev/null
+++ b/dev-libs/libcgroup/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<longdescription>
+		This package provides configuration and command-line tools, as well as a
+		rules processing daemon for working with kernel control groups.
+	</longdescription>
+	<use>
+		<flag name="daemon">Install the configuration tools and init/config files.</flag>
+		<flag name="tools">Install the cgroup rules processing daemon and init/config files.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">libcg</remote-id>
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-libs/libcgroup/, dev-libs/libcgroup/files/
@ 2017-01-15 21:46 Aric Belsito
  0 siblings, 0 replies; 2+ messages in thread
From: Aric Belsito @ 2017-01-15 21:46 UTC (permalink / raw
  To: gentoo-commits

commit:     0045471cfa7d93b29e2e422842c77014756c11f1
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Jan 15 21:44:17 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Jan 15 21:44:17 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=0045471c

dev-libs/libcgroup: Remove

sys-libs/fts-standalone now uses musl-fts

 dev-libs/libcgroup/Manifest                        |  10 -
 dev-libs/libcgroup/files/cgconfig.confd-r1         |   7 -
 dev-libs/libcgroup/files/cgconfig.initd-r1         |  53 -----
 dev-libs/libcgroup/files/cgred.confd-r2            |   5 -
 dev-libs/libcgroup/files/cgred.initd-r1            |  24 ---
 .../files/libcgroup-0.41-reorder-headers.patch     |  28 ---
 .../files/libcgroup-0.41-replace_DECLS.patch       | 225 ---------------------
 .../files/libcgroup-0.41-replace_INLCUDES.patch    |  74 -------
 dev-libs/libcgroup/libcgroup-0.41-r4.ebuild        |  93 ---------
 dev-libs/libcgroup/metadata.xml                    |  19 --
 10 files changed, 538 deletions(-)

diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
deleted file mode 100644
index b65811b..0000000
--- a/dev-libs/libcgroup/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX cgconfig.confd-r1 205 SHA256 500b3f3a35eaa94b42ba6f9895498e4bfad44bbf36655782a2de3f78e9e1a23e SHA512 f5f1d0d09266417276f93434ad47116452e1ab18d736ce08e7c63f797b2d2180a490cdef1f3dd9d960c88426f1dc5b12dcf72b09de765d52d281feceffe7550d WHIRLPOOL 1d4c05b253f67ff5a8a6a927e21abc355567814d166b070416b8bddca60122e28b82cce00390b4f9b0c5472b54a18562c7e5d16eaa73e2a36d4824eb67a8ce2f
-AUX cgconfig.initd-r1 1059 SHA256 327168f18bfcfc26f7ee00c209846485176153c8005fb4282be27530f57aa6cc SHA512 2ea392388818a0858920bedee82382e474ca713e29651a1f84e2bbb26ef00a4ac94cf48d8130d1999a699ab670021ac234521b556afbf190705263cf025030f1 WHIRLPOOL 8a984da549cf75410a5bb7482a8b9edaf7bd6fd7219481e30cb72ec72f293ef6866d740a0a93af5b456fe934065247d7cb2857e490614b7af1693ff5631fb755
-AUX cgred.confd-r2 160 SHA256 52b8d2f417e21c0cd80289286483b554d6ab6bd33d2bb3f279736d869aee6d49 SHA512 5b83b2413e36184671cfd7d654fa0b06940360790aed3c235cdb8eb168c17a703c1a72654fdbf57459ac493f79fd87e90deb33e89297929ca5f681dfa80a7078 WHIRLPOOL 365e6da43baacbf0ea56d11df1a001f0e7db803f9886764b5c7835c1e21862b4bcf328b64a99b35ab76624eda7818bf36bb4c40950fc9a24c978ca882596cbe5
-AUX cgred.initd-r1 464 SHA256 538feab7fafe9d16c3018bd22bc8b3d3581287212dcc85108a6374709bdeb14d SHA512 7b5ba784d896a9be9bed28f57b22017235e0814baec3556ce81f3acc02914319e5e12c2a76e59a0a36f18ab6625467db8e3ca0f4d33ab88d83a8d1065da91311 WHIRLPOOL 1c0ba9854fc70602ef28f550fe8716c5f92282ad0d790016384f73317c0e933d4ea9aa30980a50c16b026805e23d7f46fec5f7cae158d689d9cb7749469dfbf5
-AUX libcgroup-0.41-reorder-headers.patch 953 SHA256 92cab0cc9dc4d8728892dcea7aaba3990b51cec94dd5b8ba36f1d997f114d773 SHA512 4f8d4b49668dc0ddae373ab922422a0e933cb6c46af05d01da498c657b5a8df1ea62e644b8ac3db7e7818d33ba21c06d1902b7915f6aaf76f8f96107515433d4 WHIRLPOOL acefa8c8835a66afb6710b040452ecaa179293e8b182f59a82aba85bd6ac2c1bb448270cfe8b8098dd80b7cde1d33ca3bd65c2b4d7babf75bb0896e6101d2381
-AUX libcgroup-0.41-replace_DECLS.patch 5193 SHA256 488cad79e7d4bf8d82b8ddd695d550ff151850027980daa921ccfef5d3f4823b SHA512 c7601810e491764c30e8adfadd65e1b1b578a07af24df62cc9a7b291622d806fc196a98e01957b5acbd3bca072617bd0ff54cae200a8e6c21b5cca4d18cd45db WHIRLPOOL b02b3aa0ac7053d2bd8a359eae1ff552760e63f424594d7fa2e4130656adde861445660509a5d00a4fcc6cb49edfcaca80197d0ba8ba84575a87e0465ad9feb7
-AUX libcgroup-0.41-replace_INLCUDES.patch 3064 SHA256 eef2516f9d4b99bf724491704a078ec4f5b73636718035a56aa334a213ac08da SHA512 17c8fa471347da4973969b954f966501d54889050766dfdd225235dd4539bb4249d57e719fa7a894aadc2e0f7296d233c89c44c96291a9266c958ca3a319541b WHIRLPOOL 3da9801690571e4a66b94304ecf7c2884d739ebc789803a03d3f1f14163f47ee4e90649164d3092bc3a0aee57404805a2ca852fc2ac237df6c9a55dde6696616
-DIST libcgroup-0.41.tar.bz2 500120 SHA256 e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd WHIRLPOOL 3941ec9362dd7da1c5d1b9eaf2b44303982a04d460ab92946201b1fe952c2f94e19950e9a08104c262eb982d8e64bcf290f1b95115aaba11d8b1457b715a3646
-EBUILD libcgroup-0.41-r4.ebuild 2249 SHA256 b7a50ff625590ed17479e2c8a593ff7b36f37350a42a6f51db18257ef0020b0a SHA512 70579d2bf68a6df38d782721a8bdcfb311f3678ebba9f03bcc311a917182857c38215577ef25eaf5a788e8504f432aee6295371647c261a617a1d630efe8c0fe WHIRLPOOL 2d9273ed6dd9b609b9bbd10722d5292ad951bf7094d05a94244b8d861c29b8cdb0a16dd389bf6a692d03fb867170edc819eae544b7e644c670c1579e16e04ba4
-MISC metadata.xml 700 SHA256 b12f2a4aca9f4bb76f4acbf944c615752ac5cfeb1fa81936f2985939f2dfeac8 SHA512 faddc728ee6971cbf5e52bc89999f3bec9d312fe04d2c876a2ee69e6533ca1ba85350d0b504bff0c7da668b58a3531606fb3d67cb4f6925c08f65df2190ec0c1 WHIRLPOOL d3c54727fd68b0cb46d80eb40a3794ba99cae0f504556619251b1124a350d60baa33e6e4487a30444c62eec5e677197b1384195e00bf5d619caace5a78225c4e

diff --git a/dev-libs/libcgroup/files/cgconfig.confd-r1 b/dev-libs/libcgroup/files/cgconfig.confd-r1
deleted file mode 100644
index 334958e..0000000
--- a/dev-libs/libcgroup/files/cgconfig.confd-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/cgconfig: config file for /etc/init.d/cgconfig
-
-# Configuration file location
-CG_CONFIGFILE=/etc/cgroup/cgconfig.conf
-
-# Enable calssifying pid according to rules if necessary
-CG_CLASSIFY=No

diff --git a/dev-libs/libcgroup/files/cgconfig.initd-r1 b/dev-libs/libcgroup/files/cgconfig.initd-r1
deleted file mode 100644
index 0615259..0000000
--- a/dev-libs/libcgroup/files/cgconfig.initd-r1
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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-r2 b/dev-libs/libcgroup/files/cgred.confd-r2
deleted file mode 100644
index cdc7a7c..0000000
--- a/dev-libs/libcgroup/files/cgred.confd-r2
+++ /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="-n"

diff --git a/dev-libs/libcgroup/files/cgred.initd-r1 b/dev-libs/libcgroup/files/cgred.initd-r1
deleted file mode 100644
index 6bc7ef5..0000000
--- a/dev-libs/libcgroup/files/cgred.initd-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/files/libcgroup-0.41-reorder-headers.patch b/dev-libs/libcgroup/files/libcgroup-0.41-reorder-headers.patch
deleted file mode 100644
index 78a3d09..0000000
--- a/dev-libs/libcgroup/files/libcgroup-0.41-reorder-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-libcgroup-internal.h: reorder the header stacking.
-
-`man 3 fts` not only specifies the headers to be included, but
-also the order.  <fts.h> must be included after <sys/types.h>
-and <sys/stats.h>.  On glibc and uClibc systems, an incorrect
-order does not pose a problem, but on musl this leads to undefine
-types such as dev_t and friends.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Naur libcgroup-0.41.orig/src/libcgroup-internal.h libcgroup-0.41/src/libcgroup-internal.h
---- libcgroup-0.41.orig/src/libcgroup-internal.h	2015-07-13 21:08:26.740965713 -0400
-+++ libcgroup-0.41/src/libcgroup-internal.h	2015-07-13 21:09:40.774962164 -0400
-@@ -21,12 +21,12 @@
- #endif
- 
- #include "config.h"
--#include <fts.h>
- #include <libcgroup.h>
- #include <limits.h>
- #include <pthread.h>
--#include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fts.h>
- #include <setjmp.h>
- 
- /* Maximum number of mount points/controllers */

diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch b/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch
deleted file mode 100644
index 7701093..0000000
--- a/dev-libs/libcgroup/files/libcgroup-0.41-replace_DECLS.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-Replace __BEGIN_DECLS and __END_DECLS with extern "C".
-
-The macros __BEGIN_DECLS and __END_DECLS are a GNU-ism found in
-glibc and uClibc, but not musl.  We replace them by the more general
-extern "C" { ... } block exposed only if we have __cplusplus.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Naur libcgroup-0.41.orig/include/libcgroup/config.h libcgroup-0.41/include/libcgroup/config.h
---- libcgroup-0.41.orig/include/libcgroup/config.h	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/config.h	2015-07-11 23:19:20.451977284 +0000
-@@ -9,7 +9,9 @@
- #include <features.h>
- #endif
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- /**
-  * @defgroup group_config 5. Configuration
-@@ -107,6 +109,8 @@
-  * @}
-  * @}
-  */
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif /*_LIBCGROUP_CONFIG_H*/
-diff -Naur libcgroup-0.41.orig/include/libcgroup/error.h libcgroup-0.41/include/libcgroup/error.h
---- libcgroup-0.41.orig/include/libcgroup/error.h	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/error.h	2015-07-11 23:19:34.253977328 +0000
-@@ -9,7 +9,9 @@
- #include <features.h>
- #endif
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- /**
-  * @defgroup group_errors 6. Error handling
-@@ -99,6 +101,8 @@
-  * @}
-  * @}
-  */
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif /* _LIBCGROUP_INIT_H */
-diff -Naur libcgroup-0.41.orig/include/libcgroup/groups.h libcgroup-0.41/include/libcgroup/groups.h
---- libcgroup-0.41.orig/include/libcgroup/groups.h	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/groups.h	2015-07-11 23:19:40.305977347 +0000
-@@ -11,7 +11,9 @@
- #include <stdbool.h>
- #endif
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- /**
-  * Flags for cgroup_delete_cgroup_ext().
-@@ -577,6 +579,8 @@
-  */
- 
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif /* _LIBCGROUP_GROUPS_H */
-diff -Naur libcgroup-0.41.orig/include/libcgroup/init.h libcgroup-0.41/include/libcgroup/init.h
---- libcgroup-0.41.orig/include/libcgroup/init.h	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/init.h	2015-07-11 23:19:46.369977366 +0000
-@@ -9,7 +9,9 @@
- #include <features.h>
- #endif
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- /**
-  * @defgroup group_init 1. Initialization
-@@ -58,6 +60,8 @@
-  * @}
-  * @}
-  */
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif /* _LIBCGROUP_INIT_H */
-diff -Naur libcgroup-0.41.orig/include/libcgroup/iterators.h libcgroup-0.41/include/libcgroup/iterators.h
---- libcgroup-0.41.orig/include/libcgroup/iterators.h	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/iterators.h	2015-07-11 23:19:53.353977388 +0000
-@@ -11,7 +11,9 @@
- #include <features.h>
- #endif
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- /**
-  * @defgroup group_iterators 3. Iterators
-@@ -423,6 +425,8 @@
-  * @}
-  */
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif /* _LIBCGROUP_ITERATORS_H */
-diff -Naur libcgroup-0.41.orig/include/libcgroup/log.h libcgroup-0.41/include/libcgroup/log.h
---- libcgroup-0.41.orig/include/libcgroup/log.h	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/log.h	2015-07-11 23:19:58.922977406 +0000
-@@ -11,7 +11,9 @@
- 
- #include <stdarg.h>
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- /**
-  * @defgroup group_log 7. Logging
-@@ -142,6 +144,8 @@
-  * @}
-  * @}
-  */
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif /* _LIBCGROUP_LOG_H */
-diff -Naur libcgroup-0.41.orig/include/libcgroup/tasks.h libcgroup-0.41/include/libcgroup/tasks.h
---- libcgroup-0.41.orig/include/libcgroup/tasks.h	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/include/libcgroup/tasks.h	2015-07-11 23:20:03.329977420 +0000
-@@ -12,7 +12,9 @@
- #include <stdbool.h>
- #endif
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- /** Flags for cgroup_change_cgroup_uid_gid(). */
- enum cgflags {
-@@ -204,6 +206,8 @@
-  * @}
-  * @}
-  */
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif /* _LIBCGROUP_TASKS_H */
-diff -Naur libcgroup-0.41.orig/src/daemon/cgrulesengd.h libcgroup-0.41/src/daemon/cgrulesengd.h
---- libcgroup-0.41.orig/src/daemon/cgrulesengd.h	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/daemon/cgrulesengd.h	2015-07-11 23:20:34.282977519 +0000
-@@ -17,7 +17,9 @@
- 
- #include <features.h>
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- #include "config.h"
- #include "libcgroup.h"
-@@ -119,7 +121,9 @@
-  */
- void cgre_catch_term(int signum);
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif /* _CGRULESENGD_H */
- 
-diff -Naur libcgroup-0.41.orig/src/libcgroup-internal.h libcgroup-0.41/src/libcgroup-internal.h
---- libcgroup-0.41.orig/src/libcgroup-internal.h	2015-07-11 23:16:37.497976764 +0000
-+++ libcgroup-0.41/src/libcgroup-internal.h	2015-07-11 23:20:22.299977481 +0000
-@@ -16,7 +16,9 @@
- 
- #define __LIBCG_INTERNAL
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- #include "config.h"
- #include <fts.h>
-@@ -279,6 +281,8 @@
-  */
- int cg_chmod_path(const char *path, mode_t mode, int owner_is_umask);
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif

diff --git a/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch b/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch
deleted file mode 100644
index 191de87..0000000
--- a/dev-libs/libcgroup/files/libcgroup-0.41-replace_INLCUDES.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Replace INCLUDES with AM_CPPFLAGS in Makefile.am
-
-We replace the deprecated INCLUDES with AM_CPPFLAGS in all
-Makefile.am's.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Naur libcgroup-0.41.orig/src/Makefile.am libcgroup-0.41/src/Makefile.am
---- libcgroup-0.41.orig/src/Makefile.am	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/Makefile.am	2015-07-13 14:36:38.922428040 +0000
-@@ -9,7 +9,7 @@
- 
- CLEANFILES = lex.c parse.c parse.h
- 
--INCLUDES = -I$(top_srcdir)/include
-+AM_CPPFLAGS = -I$(top_srcdir)/include
- lib_LTLIBRARIES = libcgroup.la
- libcgroup_la_SOURCES = parse.h parse.y lex.l api.c config.c libcgroup-internal.h libcgroup.map wrapper.c log.c
- libcgroup_la_LIBADD = -lpthread
-diff -Naur libcgroup-0.41.orig/src/bindings/Makefile.am libcgroup-0.41/src/bindings/Makefile.am
---- libcgroup-0.41.orig/src/bindings/Makefile.am	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/bindings/Makefile.am	2015-07-13 14:37:12.267428146 +0000
-@@ -1,5 +1,5 @@
- SUBDIRS = .
--INCLUDES = -I$(top_srcdir)/include
-+AM_CPPFLAGS = -I$(top_srcdir)/include
- 
- lib_LTLIBRARIES = _libcgroup.la
- _libcgroup_la_SOURCES = libcgroup.c
-@@ -11,5 +11,5 @@
- 
- libcgroup.c: libcgroup.p $(top_srcdir)/include/libcgroup.h
- 	cp libcgroup.p libcgroup.i
--	$(CC) $(INCLUDES) -DSWIG -E $(top_srcdir)/include/libcgroup.h >> libcgroup.i
-+	$(CC) $(CPPFLAGS) -DSWIG -E $(top_srcdir)/include/libcgroup.h >> libcgroup.i
- 	$(SWIG) -python -o libcgroup.c libcgroup.i
-diff -Naur libcgroup-0.41.orig/src/daemon/Makefile.am libcgroup-0.41/src/daemon/Makefile.am
---- libcgroup-0.41.orig/src/daemon/Makefile.am	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/daemon/Makefile.am	2015-07-13 14:36:55.781428093 +0000
-@@ -1,4 +1,4 @@
--INCLUDES = -I $(top_srcdir)/include
-+AM_CPPFLAGS = -I $(top_srcdir)/include
- 
- if WITH_DAEMON
- 
-diff -Naur libcgroup-0.41.orig/src/pam/Makefile.am libcgroup-0.41/src/pam/Makefile.am
---- libcgroup-0.41.orig/src/pam/Makefile.am	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/pam/Makefile.am	2015-07-13 14:36:28.768428007 +0000
-@@ -1,4 +1,4 @@
--INCLUDES = -I $(top_srcdir)/include
-+AM_CPPFLAGS = -I $(top_srcdir)/include
- 
- if WITH_PAM
- 
-diff -Naur libcgroup-0.41.orig/src/tools/Makefile.am libcgroup-0.41/src/tools/Makefile.am
---- libcgroup-0.41.orig/src/tools/Makefile.am	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/src/tools/Makefile.am	2015-07-13 14:36:19.098427976 +0000
-@@ -1,4 +1,4 @@
--INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include
-+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
- LDADD = $(top_builddir)/src/.libs/libcgroup.la
- 
- if WITH_TOOLS
-diff -Naur libcgroup-0.41.orig/tests/Makefile.am libcgroup-0.41/tests/Makefile.am
---- libcgroup-0.41.orig/tests/Makefile.am	2014-01-13 14:05:56.000000000 +0000
-+++ libcgroup-0.41/tests/Makefile.am	2015-07-13 14:37:23.146428181 +0000
-@@ -1,6 +1,6 @@
- SUBDIRS = tools
- 
--INCLUDES = -I$(top_srcdir)/include
-+AM_CPPFLAGS = -I$(top_srcdir)/include
- LDADD = $(top_builddir)/src/.libs/libcgroup.la
- 
- # compile the tests, but do not install them

diff --git a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild
deleted file mode 100644
index d4e31fe..0000000
--- a/dev-libs/libcgroup/libcgroup-0.41-r4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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/musl-fts )
-	"
-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
-}

diff --git a/dev-libs/libcgroup/metadata.xml b/dev-libs/libcgroup/metadata.xml
deleted file mode 100644
index c35d422..0000000
--- a/dev-libs/libcgroup/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<longdescription>
-		This package provides configuration and command-line tools, as well as a
-		rules processing daemon for working with kernel control groups.
-	</longdescription>
-	<use>
-		<flag name="daemon">Install the configuration tools and init/config files.</flag>
-		<flag name="tools">Install the cgroup rules processing daemon and init/config files.</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">libcg</remote-id>
-	</upstream>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-15 21:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-08 21:33 [gentoo-commits] proj/musl:master commit in: dev-libs/libcgroup/, dev-libs/libcgroup/files/ Aric Belsito
  -- strict thread matches above, loose matches on Subject: below --
2017-01-15 21:46 Aric Belsito

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox