diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-admin/collectd/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-admin/collectd/files')
-rw-r--r-- | app-admin/collectd/files/collectd-4.10.2-libocci.patch | 20 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd-4.10.2-nohal.patch | 23 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd-4.10.3-werror.patch | 24 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd-5.1.0-libperl.patch | 30 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd-5.1.1-lt.patch | 32 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd-5.4.1-libocci.patch | 21 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd-5.4.1-libperl.patch | 29 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd-5.4.1-lt.patch | 32 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd-5.4.1-nohal.patch | 24 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd.confd | 22 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd.initd | 60 | ||||
-rw-r--r-- | app-admin/collectd/files/logrotate | 9 |
12 files changed, 326 insertions, 0 deletions
diff --git a/app-admin/collectd/files/collectd-4.10.2-libocci.patch b/app-admin/collectd/files/collectd-4.10.2-libocci.patch new file mode 100644 index 000000000000..2ae42dc14163 --- /dev/null +++ b/app-admin/collectd/files/collectd-4.10.2-libocci.patch @@ -0,0 +1,20 @@ +diff -r -u collectd-4.10.2.orig/configure.in collectd-4.10.2/configure.in +--- collectd-4.10.2.orig/configure.in 2010-11-28 03:27:47.000000000 +0100 ++++ collectd-4.10.2/configure.in 2010-11-28 03:28:23.000000000 +0100 +@@ -2446,14 +2446,14 @@ + ]) + if test "x$ORACLE_HOME" != "x" + then +- with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public" ++ with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public -locci" + + if test -e "$ORACLE_HOME/lib/ldflags" + then + with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"` + fi + #with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh" +- with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh" ++ with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh -locci" + fi + if test "x$with_oracle" = "xyes" + then diff --git a/app-admin/collectd/files/collectd-4.10.2-nohal.patch b/app-admin/collectd/files/collectd-4.10.2-nohal.patch new file mode 100644 index 000000000000..a82a3bc78034 --- /dev/null +++ b/app-admin/collectd/files/collectd-4.10.2-nohal.patch @@ -0,0 +1,23 @@ +diff -ruN collectd-4.10.2.orig/configure.in collectd-4.10.2/configure.in +--- collectd-4.10.2.orig/configure.in 2010-11-27 11:10:38.000000000 +0100 ++++ collectd-4.10.2/configure.in 2011-02-07 21:55:22.000000000 +0100 +@@ -1109,18 +1109,7 @@ + AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes") + + dnl Check for HAL (hardware abstraction library) +-with_libhal="yes" +-AC_CHECK_LIB(hal,libhal_device_property_exists, +- [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])], +- [with_libhal="no"]) +-if test "x$with_libhal" = "xyes"; then +- if test "x$PKG_CONFIG" != "x"; then +- BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`" +- BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`" +- AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS) +- AC_SUBST(BUILD_WITH_LIBHAL_LIBS) +- fi +-fi ++with_libhal="no" + + m4_divert_once([HELP_WITH], [ + collectd additional packages:]) diff --git a/app-admin/collectd/files/collectd-4.10.3-werror.patch b/app-admin/collectd/files/collectd-4.10.3-werror.patch new file mode 100644 index 000000000000..6ddb508cdc1f --- /dev/null +++ b/app-admin/collectd/files/collectd-4.10.3-werror.patch @@ -0,0 +1,24 @@ +diff -ruN collectd-4.10.3.orig/src/Makefile.am collectd-4.10.3/src/Makefile.am +--- collectd-4.10.3.orig/src/Makefile.am 2011-03-26 17:08:53.000000000 +0100 ++++ collectd-4.10.3/src/Makefile.am 2011-04-24 22:56:39.521229944 +0200 +@@ -7,7 +7,7 @@ + endif + + if COMPILER_IS_GCC +-AM_CFLAGS = -Wall -Werror ++AM_CFLAGS = -Wall + endif + + AM_CPPFLAGS = -DPREFIX='"${prefix}"' +diff -ruN collectd-4.10.3.orig/src/libcollectdclient/Makefile.am collectd-4.10.3/src/libcollectdclient/Makefile.am +--- collectd-4.10.3.orig/src/libcollectdclient/Makefile.am 2011-03-26 17:04:26.000000000 +0100 ++++ collectd-4.10.3/src/libcollectdclient/Makefile.am 2011-04-24 22:57:12.231229943 +0200 +@@ -1,7 +1,7 @@ + AUTOMAKE_OPTIONS = foreign no-dependencies + + if COMPILER_IS_GCC +-AM_CFLAGS = -Wall -Werror ++AM_CFLAGS = -Wall + endif + + pkginclude_HEADERS = client.h lcc_features.h diff --git a/app-admin/collectd/files/collectd-5.1.0-libperl.patch b/app-admin/collectd/files/collectd-5.1.0-libperl.patch new file mode 100644 index 000000000000..9a44d5b57ad8 --- /dev/null +++ b/app-admin/collectd/files/collectd-5.1.0-libperl.patch @@ -0,0 +1,30 @@ +diff --git a/configure.in b/configure.in +index 1cfc2fc..384c298 100644 +--- a/configure.in ++++ b/configure.in +@@ -2944,11 +2944,13 @@ if test "x$with_libperl" = "xyes" \ + then + SAVE_CFLAGS="$CFLAGS" + SAVE_LDFLAGS="$LDFLAGS" ++ SAVE_LIBS="$LIBS" + dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string) + PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts` + PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts` + CFLAGS="$CFLAGS $PERL_CFLAGS" + LDFLAGS="$LDFLAGS $PERL_LDFLAGS" ++ LIBS="$LIBS -lperl -lpthread" + + AC_CACHE_CHECK([for libperl], + [c_cv_have_libperl], +@@ -2967,7 +2969,10 @@ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string + Nullsv); + ]]), + [c_cv_have_libperl="yes"], +- [c_cv_have_libperl="no"] ++ [ ++ c_cv_have_libperl="no" ++ LIBS="$SAVE_LIBS" ++ ] + ) + ) +
\ No newline at end of file diff --git a/app-admin/collectd/files/collectd-5.1.1-lt.patch b/app-admin/collectd/files/collectd-5.1.1-lt.patch new file mode 100644 index 000000000000..4aa734b1efa4 --- /dev/null +++ b/app-admin/collectd/files/collectd-5.1.1-lt.patch @@ -0,0 +1,32 @@ +diff --git a/Makefile.am b/Makefile.am +index 5267123..a7e0d0c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,4 @@ +-ACLOCAL_AMFLAGS = -I libltdl/m4 +- +-SUBDIRS = libltdl src bindings . ++SUBDIRS = src bindings . + + INCLUDES = $(LTDLINCL) + +diff --git a/configure.in b/configure.in +index eff8d61..a22a561 100644 +--- a/configure.in ++++ b/configure.in +@@ -7,7 +7,6 @@ AC_CONFIG_AUX_DIR([libltdl/config]) + m4_ifdef([LT_PACKAGE_VERSION], + # libtool >= 2.2 + [ +- LT_CONFIG_LTDL_DIR([libltdl]) + LT_INIT([dlopen]) + LTDL_INIT([convenience]) + AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.]) +@@ -19,7 +18,6 @@ m4_ifdef([LT_PACKAGE_VERSION], + AC_SUBST(LTDLINCL) + AC_SUBST(LIBLTDL) + AC_LIBTOOL_DLOPEN +- AC_CONFIG_SUBDIRS(libltdl) + AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.]) + ] + )
\ No newline at end of file diff --git a/app-admin/collectd/files/collectd-5.4.1-libocci.patch b/app-admin/collectd/files/collectd-5.4.1-libocci.patch new file mode 100644 index 000000000000..14b7d6992bb6 --- /dev/null +++ b/app-admin/collectd/files/collectd-5.4.1-libocci.patch @@ -0,0 +1,21 @@ +diff --git configure.ac configure.ac +index 7029e1e..72f6ff4 100644 +--- configure.ac ++++ configure.ac +@@ -2941,14 +2941,14 @@ AC_ARG_WITH(oracle, [AS_HELP_STRING([--with-oracle@<:@=ORACLE_HOME@:>@], [Path t + ]) + if test "x$ORACLE_HOME" != "x" + then +- with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public" ++ with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public -locci" + + if test -e "$ORACLE_HOME/lib/ldflags" + then + with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"` + fi + #with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh" +- with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh" ++ with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh -locci" + fi + if test "x$with_oracle" = "xyes" + then
\ No newline at end of file diff --git a/app-admin/collectd/files/collectd-5.4.1-libperl.patch b/app-admin/collectd/files/collectd-5.4.1-libperl.patch new file mode 100644 index 000000000000..4f60802240ac --- /dev/null +++ b/app-admin/collectd/files/collectd-5.4.1-libperl.patch @@ -0,0 +1,29 @@ +diff --git configure.ac configure.ac +index ce8a9bc..eaa464e 100644 +--- configure.ac ++++ configure.ac +@@ -3109,11 +3109,13 @@ if test "x$with_libperl" = "xyes" \ + then + SAVE_CFLAGS="$CFLAGS" + SAVE_LDFLAGS="$LDFLAGS" ++ SAVE_LIBS="$LIBS" + dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string) + PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts` + PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts` + CFLAGS="$CFLAGS $PERL_CFLAGS" + LDFLAGS="$LDFLAGS $PERL_LDFLAGS" ++ LIBS="$LIBS -lperl -lpthread" + + AC_CACHE_CHECK([for libperl], + [c_cv_have_libperl], +@@ -3132,7 +3134,10 @@ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string + ]]] + )], + [c_cv_have_libperl="yes"], +- [c_cv_have_libperl="no"] ++ [ ++ c_cv_have_libperl="no" ++ LIBS="$SAVE_LIBS" ++ ] + ) + ) diff --git a/app-admin/collectd/files/collectd-5.4.1-lt.patch b/app-admin/collectd/files/collectd-5.4.1-lt.patch new file mode 100644 index 000000000000..bac1809f1c30 --- /dev/null +++ b/app-admin/collectd/files/collectd-5.4.1-lt.patch @@ -0,0 +1,32 @@ +diff --git Makefile.am Makefile.am +index 5267123..a7e0d0c 100644 +--- Makefile.am ++++ Makefile.am +@@ -1,6 +1,4 @@ +-ACLOCAL_AMFLAGS = -I libltdl/m4 +- +-SUBDIRS = libltdl src bindings . ++SUBDIRS = src bindings . + + INCLUDES = $(LTDLINCL) + +diff --git configure.ac configure.ac +index eaa464e..d652d46 100644 +--- configure.ac ++++ configure.ac +@@ -7,7 +7,6 @@ AC_CONFIG_AUX_DIR([libltdl/config]) + m4_ifdef([LT_PACKAGE_VERSION], + # libtool >= 2.2 + [ +- LT_CONFIG_LTDL_DIR([libltdl]) + LT_INIT([dlopen]) + LTDL_INIT([convenience]) + AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.]) +@@ -19,7 +18,6 @@ m4_ifdef([LT_PACKAGE_VERSION], + AC_SUBST(LTDLINCL) + AC_SUBST(LIBLTDL) + AC_LIBTOOL_DLOPEN +- AC_CONFIG_SUBDIRS(libltdl) + AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.]) + ] + )
\ No newline at end of file diff --git a/app-admin/collectd/files/collectd-5.4.1-nohal.patch b/app-admin/collectd/files/collectd-5.4.1-nohal.patch new file mode 100644 index 000000000000..9978296e8df6 --- /dev/null +++ b/app-admin/collectd/files/collectd-5.4.1-nohal.patch @@ -0,0 +1,24 @@ +diff --git configure.ac configure.ac +index 7029e1e..ad5e336 100644 +--- configure.ac ++++ configure.ac +@@ -1351,18 +1351,7 @@ AC_CHECK_LIB(resolv, res_search, + AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes") + + dnl Check for HAL (hardware abstraction library) +-with_libhal="yes" +-AC_CHECK_LIB(hal,libhal_device_property_exists, +- [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])], +- [with_libhal="no"]) +-if test "x$with_libhal" = "xyes"; then +- if test "x$PKG_CONFIG" != "x"; then +- BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`" +- BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`" +- AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS) +- AC_SUBST(BUILD_WITH_LIBHAL_LIBS) +- fi +-fi ++with_libhal="no" + + m4_divert_once([HELP_WITH], [ + collectd additional packages:])
\ No newline at end of file diff --git a/app-admin/collectd/files/collectd.confd b/app-admin/collectd/files/collectd.confd new file mode 100644 index 000000000000..979b7255b0fc --- /dev/null +++ b/app-admin/collectd/files/collectd.confd @@ -0,0 +1,22 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Nice value used to launch collectd, to change priority of the process. As +# you usually will want to run it in background, a default of 5 is used. +# +#COLLECTD_NICELVL='5' + +# Location of configuration file. Modify if you don't like the standard one. +# +#COLLECTD_CFGFILE='/etc/collectd.conf' + +# File used to store the PID file. Usually you won't need to touch it. +# +#COLLECTD_PIDFILE='/var/run/collectd/collectd.pid' + +# User to run collectd as (default is collectd, change to root or give +# collectd user appropriate privileges if you use one of the plugins that +# require it, as e.g. ping or iptables plugins) +# +#COLLECTD_USER='collectd' diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd new file mode 100644 index 000000000000..4f48a116c37f --- /dev/null +++ b/app-admin/collectd/files/collectd.initd @@ -0,0 +1,60 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +: ${COLLECTD_PIDFILE:='/var/run/collectd/collectd.pid'} +: ${COLLECTD_CFGFILE:='/etc/collectd.conf'} +: ${COLLECTD_NICELVL:='5'} +: ${COLLECTD_USER:='collectd'} + +extra_commands="configtest" + +depend() { + use net +} + +configtest() { + ebegin "Checking ${SVCNAME} configuration" + checkconfig + eend $? +} + +checkconfig() { + if [ $(sed '/^$\|^#/d' ${COLLECTD_CFGFILE} | grep -c 'LoadPlugin\w\+oracle') != 0 ] ; then + if [ -e /etc/env.d/50oracle-instantclient-basic ] ; then + . /etc/env.d/50oracle-instantclient-basic + export ORACLE_HOME + export TNS_ADMIN + else + ewarn "Unable to set Oracle environment, Oracle plugin wont work" + fi + fi + + /usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}" 1>/dev/null 2>&1 + ret=$? + if [ $ret -ne 0 ]; then + eerror "${SVCNAME} has detected an error in your setup:" + /usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}" + fi + + return $ret +} + +start() { + checkconfig || return 1 + [ -d /var/run/collectd ] || mkdir /var/run/collectd && chown collectd:collectd /var/run/collectd + + ebegin "Starting collectd" + start-stop-daemon --start --user "${COLLECTD_USER}:collectd" \ + --nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \ + -P "${COLLECTD_PIDFILE}" -C "${COLLECTD_CFGFILE}" + eend $? "Failed to start collectd" +} + +stop() { + ebegin "Stopping collectd" + start-stop-daemon --stop \ + --pidfile "${COLLECTD_PIDFILE}" + eend $? "Failed to stop collectd" +} diff --git a/app-admin/collectd/files/logrotate b/app-admin/collectd/files/logrotate new file mode 100644 index 000000000000..5d344f6208f1 --- /dev/null +++ b/app-admin/collectd/files/logrotate @@ -0,0 +1,9 @@ +# +# /etc/logrotate.d/collectd +# +/var/log/collectd.log { + daily + rotate 5 + notifempty + missingok +} |