Permalink
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: 9b574762fd10148e4e8cba9fbe5121dbb9ad4914
  foo-overlay: 36c88de95cb1aa0be7ceb4c1210f724a00147ceb
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: ca99e58b5f8f675db880346a44039de6bd5446e3
  mythtv: 232ca207c520eb294db060a770aafd30ffa25afb
  • Loading branch information...
1 parent 6c4ea07 commit 8316711670062fd661ecfd1e723a0bc5f9812cc2 @danielrobbins danielrobbins committed Dec 24, 2012
Showing 329 changed files with 3,089 additions and 3,563 deletions.
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.3.ebuild,v 1.6 2012/12/23 16:58:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.3.ebuild,v 1.7 2012/12/24 12:55:47 maekke Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE="acl selinux"
RDEPEND="
@@ -2,3 +2,4 @@ DIST mcollective-1.0.1.tgz 169558 SHA256 4dec52151faedd2baa1226102237b894864716d
DIST mcollective-1.1.4.tgz 918332 SHA256 f7c911f17d6af5e98c30d212ee1dcb2829573b23c92a0ec7c2cd1e3f3d364265 SHA512 096cfd433c817343960f3f18ba29947acf72a66c79c38bda130302d3ac801b1f80183444b080f5c1e56352d99f80f16af21f2dec07af24049a0e54f6601d11bd WHIRLPOOL aa0fdfd5fcda125d6e1b9aaead2233b66a2faca86b6c9907f1c7ff2d3fd47d16e2554eb6391ced45e307a2274e16e0201f79a44ee499ed9c913333a6d8de0091
DIST mcollective-1.2.1.tgz 928316 SHA256 45da06779a1cf9e4efc6f533fa93fe378c6427d6ecc519eea4b53c7ec087b578 SHA512 2e7223f06fc645a1070a5127d111a9619c77b5a03dedd937d25a15881983c6719fc5bde6e94fa7a7d40e21286452061e707968421fc55b0e06b217365638a972 WHIRLPOOL f52f03f07dd537d996e7e8dd39d17605b66d0e30cdba8edd5e9312ab25a795deb90477b9d8aacd672b3f292206e3fd5836c3922c5523bbd693a405a012ceb057
DIST mcollective-2.0.0.tgz 940145 SHA256 4b6e7dc51b86b92f86ddecab59fc376e063f8579433b6a6bdae0d12618b54f0a SHA512 1b64bdc4795dd0bd19772ae8dfccc4516cc865a635a97db5e08dc2b7de88c0904ecc6a9f77f6e49fcc5736d1b9e2f1dedfb6f81eb161b9a322ecabf82d10975a WHIRLPOOL 6f106cfe687a8670a649c9fe48de57e4bf5e37487414545f5908333cbae336fc23f5cafd40a60ce0954f09eee4716e026ac12c46edbc065e484a6f174eb5c4ac
+DIST mcollective-2.2.0.tgz 1011060 SHA256 602b58f70d1bf8f010c0e7e48034da9e971ec9ed51162c5a193d815aa72409f9 SHA512 3544ad68a737bc6ae3571ff4bfe9d51882c7d4104f52431f5dc1a3a8d2197820265ce15954c7f0c75d202bc84ce036f28e624642c09bd71651ab5a99fb469533 WHIRLPOOL c66c411e796af50d55b83db3a625c1c13c067c0be8cf9c7f85928dcbb5afd1ee1c96530cea79aa41ed4eda930f655c49e3e8b3c746a4fcd65552a6256c1b6602
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/files/mcollectived.initd,v 1.1 2011/03/01 02:18:33 ramereth Exp $
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the Apache License, Version 2.0
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/files/mcollectived.initd,v 1.2 2012/12/24 08:29:38 ramereth Exp $
mcollectived="/usr/sbin/mcollectived"
pidfile="/var/run/mcollectived"
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/mcollective-2.2.0.ebuild,v 1.1 2012/12/24 08:29:38 ramereth Exp $
+
+EAPI="4"
+
+USE_RUBY="ruby18 ree18"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="http://marionette-collective.org/"
+SRC_URI="http://puppetlabs.com/downloads/mcollective/${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND="dev-ruby/stomp"
+
+src_compile() {
+ einfo "nothing to compile"
+}
+
+each_ruby_install() {
+ doruby -r lib/*
+ insinto /usr/share/mcollective
+ doins -r plugins
+ use client && dosbin bin/mc-* bin/mco
+ dosbin bin/mcollectived
+ if use doc ; then
+ dohtml -r website/*
+ insinto /usr/share/doc/${P}/ext
+ doins -r ext/*
+ fi
+ newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+ insinto /etc/mcollective
+ cd etc
+ for cfg in *.dist ; do
+ newins "${cfg}" "${cfg%%.dist}"
+ sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+ "${D}"/etc/mcollective/${cfg%%.dist}
+ done
+ insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+ einfo "Mcollective requires a stomp server installed and functioning before"
+ einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+ einfo "any other stomp compatible server should work."
+ einfo
+ einfo "It is recommended you read the \'getting started\' guide [2] if this"
+ einfo "is a new installation"
+ einfo
+ einfo "[1] http://activemq.apache.org/"
+ einfo "[2] http://code.google.com/p/mcollective/wiki/GettingStarted"
+}
@@ -3,3 +3,4 @@ DIST sysstat-10.0.4.tar.bz2 276962 SHA256 55d6664bdfe72b3291100627a5e301189d2918
DIST sysstat-10.0.5.tar.bz2 282403 SHA256 3e96fdc8d6710f4b642757ff88e3c4296d55838b64ff102feaaf2175f66e875b SHA512 d40cb67c61f499445dee803ac54af50704aa49a4d20b11b5aaaf8966ab6eacfbc72d30c933cf678e324d283818cb5a0beb55cddeb689b0c3a1fdeb4813b4ac63 WHIRLPOOL 868cbbcc179e5810a9b5f1af214974f949c15f0b7f8a114554f85aeb23a755be17fa76f0c24303de9b274c438097d2c2f5f48b421c275977b8bea58e49d01ac4
DIST sysstat-10.1.1.tar.bz2 291513 SHA256 e39e3a5f1f4cd88f2182c1bfc0524e1a0c7a559c1e8294656b5fcd293d99e6c5 SHA512 1f4dbeecb9c240eb76abe45cea7ab22ef01c3774d06c81ed7a9811ed778a10c4975cb870e62009a459b42d232f109b7c6a5f32a2ae70d7f66c9b22bf2f1c73db WHIRLPOOL 4c78a3590f53e36e1155edd82be0c58a05e0c2dbaa9dff5b2c8f1355f1627a2ce2e9c20f411c57ef06b33e9f8ab68f73f62d7f04eb2f23e3d6c5716c11a19773
DIST sysstat-10.1.2.tar.bz2 293308 SHA256 996a5193c6508c6acdbabb0bfa6728170a918644221948ffe900e83a4f444502 SHA512 63f302fd6cd0e6231032fc78a754941cd404bd2ab46ca8c4187aa8f9438643ea984bc8d6db67c201572ab9e790952c36f6302ab5e0795247d8883fe365f9327b WHIRLPOOL f5598cc7cf096fb0cac632c3208bed33b447d90efd65b02c38d97887d4533affb0fab9329da1cd3332caaf5326d5475f436e67b46361336c4a7d2bbd7a4f9544
+DIST sysstat-10.1.3.tar.bz2 295045 SHA256 ea0c07f170a765aa080e912087c15bf11453d5bf0d01fd7465d1bb760a1d7f12 SHA512 7225cad806a0da84f4032d668a157f285cbff18480ec0b44533aff22f8fa7d0ddc885efa505aefb83acb18f25c6673a4e7e147b65c2a3747bb6300466a3668d1 WHIRLPOOL daa39d10c949228f60375dd032fee154b7c5928ada9eecdf5c76391471760d942465c6b3847808d804fc19b64a804d79a0f7827316d8c12e8c40f38c15062dc7
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.1.3.ebuild,v 1.2 2012/12/24 17:35:33 jer Exp $
+
+EAPI="4"
+
+inherit eutils multilib
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cron debug +doc isag nls lm_sensors"
+
+SYSSTAT_LINGUAS="
+ af cs da de eo es eu fi fr hr id it ja ky lv mt nb nl nn pl pt pt_BR ro ru
+ sk sr sv uk vi zh_CN zh_TW
+"
+
+for SYSSTAT_LINGUA in ${SYSSTAT_LINGUAS}; do
+ IUSE="${IUSE} linguas_${SYSSTAT_LINGUA}"
+done
+
+RDEPEND="
+ cron? ( sys-process/cronbase )
+ isag? (
+ dev-lang/tk
+ dev-vcs/rcs
+ sci-visualization/gnuplot
+ )
+ nls? ( virtual/libintl )
+ lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ local po_count li_count lingua NLSDIR="${S}/nls"
+
+ count() { echo ${#}; }
+ po_count=$(count ${NLSDIR}/*.po)
+ li_count=$(count ${SYSSTAT_LINGUAS})
+ [[ ${po_count} = ${li_count} ]] \
+ || die "Number of LINGUAS does not match number of .po files"
+ unset count
+
+ for lingua in ${SYSSTAT_LINGUAS}; do
+ if ! use linguas_${lingua}; then
+ rm -f "${NLSDIR}/${lingua}.po" || die
+ fi
+ done
+ epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
+}
+
+src_configure() {
+ sa_lib_dir=/usr/$(get_libdir)/sa \
+ conf_dir=/etc \
+ rcdir=Gentoo-does-not-use-rc.d \
+ econf \
+ $(use_enable cron install-cron) \
+ $(use_enable debug debuginfo) \
+ $(use_enable doc documentation ) \
+ $(use_enable isag install-isag) \
+ $(use_enable lm_sensors sensors) \
+ $(use_enable nls)
+}
+
+src_compile() {
+ emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ keepdir /var/log/sa
+
+ use cron && dodir /etc/cron.{daily,hourly}
+
+ emake \
+ DESTDIR="${D}" \
+ DOC_DIR=/usr/share/doc/${PF} \
+ install
+
+ dodoc contrib/sargraph/sargraph
+
+ newinitd "${FILESDIR}"/sysstat.init.d sysstat
+
+ use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
@@ -1,73 +0,0 @@
-diff --git a/src/plugins/kdb/db2/lockout.c b/src/plugins/kdb/db2/lockout.c
-index 498c0de..5f973fb 100644
---- a/src/plugins/kdb/db2/lockout.c
-+++ b/src/plugins/kdb/db2/lockout.c
-@@ -158,13 +158,23 @@ krb5_db2_lockout_audit(krb5_context context,
- return 0;
- }
-
-+ if (entry == NULL)
-+ return 0;
-+
- code = lookup_lockout_policy(context, entry, &max_fail,
- &failcnt_interval,
- &lockout_duration);
- if (code != 0)
- return code;
-
-- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry));
-+ /*
-+ * Don't continue to modify the DB for an already locked account.
-+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+ * this check is unneeded, but in rare cases, we can fail with an
-+ * integrity error or preauth failure before a policy check.)
-+ */
-+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+ return 0;
-
- if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) {
- /*
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-index 626ed1f..68e8ec4 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-@@ -131,6 +131,7 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
- CHECK_LDAP_HANDLE(ldap_context);
-
- if (is_principal_in_realm(ldap_context, searchfor) != 0) {
-+ st = KRB5_KDB_NOENTRY;
- *more = 0;
- krb5_set_error_message (context, st, "Principal does not belong to realm");
- goto cleanup;
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-index 020c77a..24b9493 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-@@ -150,15 +150,25 @@ krb5_ldap_lockout_audit(krb5_context context,
- return 0;
- }
-
-+ if (entry == NULL)
-+ return 0;
-+
- code = lookup_lockout_policy(context, entry, &max_fail,
- &failcnt_interval,
- &lockout_duration);
- if (code != 0)
- return code;
-
-- entry->mask = 0;
-+ /*
-+ * Don't continue to modify the DB for an already locked account.
-+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+ * this check is unneeded, but in rare cases, we can fail with an
-+ * integrity error or preauth failure before a policy check.)
-+ */
-+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+ return 0;
-
-- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry));
-+ entry->mask = 0;
-
- if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) {
- /*
@@ -1,33 +0,0 @@
-diff --git a/src/kdc/kdc_authdata.c b/src/kdc/kdc_authdata.c
-index b5de64d..cc44e29 100644
---- a/src/kdc/kdc_authdata.c
-+++ b/src/kdc/kdc_authdata.c
-@@ -495,7 +495,7 @@ merge_authdata (krb5_context context,
- krb5_boolean copy,
- krb5_boolean ignore_kdc_issued)
- {
-- size_t i, nadata = 0;
-+ size_t i, j, nadata = 0;
- krb5_authdata **authdata = *out_authdata;
-
- if (in_authdata == NULL || in_authdata[0] == NULL)
-@@ -529,16 +529,16 @@ merge_authdata (krb5_context context,
- in_authdata = tmp;
- }
-
-- for (i = 0; in_authdata[i] != NULL; i++) {
-+ for (i = 0, j = 0; in_authdata[i] != NULL; i++) {
- if (ignore_kdc_issued &&
- is_kdc_issued_authdatum(context, in_authdata[i], 0)) {
- free(in_authdata[i]->contents);
- free(in_authdata[i]);
- } else
-- authdata[nadata + i] = in_authdata[i];
-+ authdata[nadata + j++] = in_authdata[i];
- }
-
-- authdata[nadata + i] = NULL;
-+ authdata[nadata + j] = NULL;
-
- free(in_authdata);
-
Oops, something went wrong.

0 comments on commit 8316711

Please sign in to comment.