From 4d628e9e3bfd5e07c9cbc4b4225957350e93183d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Thu, 25 Aug 2011 21:02:37 +0000 Subject: [PATCH] Fix option deprecation warning in init script, bug 375731 Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- app-admin/collectd/ChangeLog | 5 ++++- app-admin/collectd/Manifest | 30 ++++++++++++------------- app-admin/collectd/files/collectd.initd | 4 ++-- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog index abcd67d0b814..55d8e00715b8 100644 --- a/app-admin/collectd/ChangeLog +++ b/app-admin/collectd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/collectd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.24 2011/08/25 21:00:18 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.25 2011/08/25 21:02:37 dilfridge Exp $ + + 25 Aug 2011; Andreas K. Huettel files/collectd.initd: + Fix option deprecation warning in init script, bug 375731 25 Aug 2011; Andreas K. Huettel collectd-5.0.0-r1.ebuild, +files/collectd-5.0.0-yajl2-2.patch: diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest index 2f23306f79e6..90831246e7b7 100644 --- a/app-admin/collectd/Manifest +++ b/app-admin/collectd/Manifest @@ -12,28 +12,28 @@ AUX collectd-4.10.3-werror.patch 849 RMD160 1bf304deb3addbdeb4d7e12ea06f49dd3f85 AUX collectd-5.0.0-yajl2-2.patch 735 RMD160 58f634894c80b7c17656fde910a9917c46b15c17 SHA1 06b9c515587fcc39c2fb9c744db2e18d06628273 SHA256 06f82f3a8d350482a5ae1804db9f97948c02f527d9fdcdad8646c56e42cbc8fd AUX collectd-5.0.0-yajl2.patch 3586 RMD160 7bbd917f5dabd645a72b32d8bf70826014736e89 SHA1 32df19c19620adea658320e917f791690fb02342 SHA256 463ed3de9819000d37883698e25756d775fac232405310ae6a6b4494878e285d AUX collectd.confd 865 RMD160 edf4e29bc193128d913443ba5251935726b13194 SHA1 0987c9546a814d0f6c888f46828ad66b3a190a97 SHA256 c24b11a65cb25587aa534c529a2b394b7c190ac44e1849ea5e1bc02d1e0a1592 -AUX collectd.initd 1644 RMD160 70c454364fdcef21fa48467e9fd66d3d1e5907fd SHA1 a6bd53ce58210796b216687582fc7f58316ca7a9 SHA256 6a5e169cc00aa393e501788414a661051b6218f9ad9413b960da012a94c6d78a +AUX collectd.initd 1648 RMD160 75e310da33a8205dd166d93af2f877d1f8e4d2af SHA1 7f363f6b5f2f085e896e2130494701498a5146da SHA256 a8be14bf15922c423602c5cc595f69bb425c80983a7fd25df13b3caf15d4779a AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c DIST collectd-4.10.3.tar.bz2 1343806 RMD160 3c6257880de6385ee0ad891b5e8fff0916969be8 SHA1 fbeb672d9e1a32f9eb4a5df535519e2fdb8da636 SHA256 ffd1959273301b302c144057baf68128e62c42bcff156ba941336e7389439b65 DIST collectd-5.0.0.tar.bz2 1372805 RMD160 7b0b9060a4dbde937fa2263076fdd81f328f46aa SHA1 720746ee2542ddec9ef7b42b5f3e00412d1b3b43 SHA256 2df6ef3b90d588b82a16da479ad652fdd5837fb9e6fd04b728c6427a3d767e3c EBUILD collectd-4.10.3-r1.ebuild 12528 RMD160 2ad40970131dc4bc194a9d109d3120767b1d68c4 SHA1 46d610c1107d8f51aa5627e6a8ac1d036bf6a593 SHA256 c2b7de77077f354dc676b7d4785943037972803f238f1d3bb8a4d3aa5a256cda EBUILD collectd-5.0.0-r1.ebuild 12934 RMD160 5776853dc4a40b3fe9e46f660720d571637b0af6 SHA1 5e2d7db0f17b5f4fdaeb4b43c0cb6d14e5b91088 SHA256 88e045909af797e40aa637cf06e32124a0c28a6442ba25585878489ffa9c2c56 -MISC ChangeLog 5532 RMD160 9c05e1186c5e811029fb38d1df24e1b8d5d06e09 SHA1 3654d505b119459889f9f06c94514c5edc6253c8 SHA256 27dabb1ab44dd53250ba446be08660158b24fa62f91c7f2d9d22affb5a169250 +MISC ChangeLog 5672 RMD160 d04671e56a03ade72ebc16d7b8144f78e54fb0b8 SHA1 bcbe5e6a29124b83a689bcabcfc8a3de6ab12f2b SHA256 c0dfac55f1b17eef0ce285312835695e7df4d0480f83cf34f3bb42020d5ae2b3 MISC metadata.xml 11596 RMD160 bf74bfdd8c9a6083822a182c702a4f650e7237cf SHA1 8c0244c467028a172dd5b1f7beb537c039de2462 SHA256 63c1f6ffb3f2e6dea9015a97c5249d873899860020af7e0a8c2af7561099ee0e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJOVrf2AAoJENwGBM22xffeM/8P/2FQZHa1GziR76+BLpdlOq38 -WGvsiSR6Qb+u9kywlqbzvzCODYj/YMUkeEumeioYIfPCEI70cMkxsSjk57t0GKLv -YbTgOeI/VJIzk6s0bUojCjbZE2s5ANPvV1DgORYTr4OuuWoFDKnVbVeqN6DQ0WHN -yFqPkDXU1vZUCx/o5BjcPmBgXEws4YNBKZmvnVXO9WRRqGTQjOGQljt1jrsh0HaL -9B04wicx4IKvPWOaqCzn68ccrzy4JxI7DZ1tOlPADYPx+k1t4h1Tufs931B9F8a6 -uIKE1NfB8bxu5Zaajg/AMWcsZPQzKWc7/+WniwdW/oxZlZXq0CZxDEQ4KsE7EgLn -Pxi+YzAhnT3BFJhCe/XliByHXUh9biBVTwBD0mysTglub5jPWx+YU75tRayd6Dy1 -6M6Oa/lWldci/6efBnUydPufvAXrptzYva/nJQrcb/7cPU0Npad6vUakxcivL/aP -875kj7V7yRrner5F8XdScoGvyrANxiOnRcZhRSH37Pgh/fT6i2AyXwM6V84OfNfB -cBxZQyncNUFfM5Jn+w9XQkcIE8ViEmM/d+Rr0aQyjhdUzQGfo3crESJ4yHd/LaD0 -phRNqgzI8UHhWhAF/AV1wemXtiByzG9CA/1fX7npsEMvi3Hl21s87sMg2U0tCJc5 -yrOA4BNjLd4s/ctle/qK -=bzUR +iQIcBAEBCgAGBQJOVriAAAoJENwGBM22xffe50QQAIO8DNUSmogTDW8VXOO9wmwc +ER9Bdb2yo17mR/qs6mp7O2L+tExrQEGXIblq18XhFtzJN4NK6P9bmDrxmJHGszJp +gcIrgA5Cs54GO8GmKakxd8r9I32kDD/cJ/i+Rmfkp/FPhC6UdHqqJgeL9SXuBAFu +dkbrsnb4JbjeQdHx5Pr+c/FgbibM3OqyE2VcANx9XEZFrJGIBnWnwpFCrR/Xs7Y/ +TaTdnqJyacp1oY4X900YIGlQsfKO+Iif1qxs6LlbQlPOqIKbLKUgABbQl3DUbacA +eh1EnCd0Bqo5mq/+E3AiiOxaoJLWUSv5ijLsDXJkdQysYNmoBXoSdWjiALYtZz2d +VO80q1df90aoqe31PQWme4TLSJyii9H0iv9wmGerxOdlCuZsttujk9KFng7DYasM +TIQjFbo6bjBYFJsELywyxy/UUPsXCrbRkTSlDG9dtLhV1deIiDVf1FEytw0ux3Aj +DtTX7fLOC742t3i9DR1vspyMmELE443edNvrbis6KHW2+yhpy4nFAQMizBvg1UJB +PLIiPnErUINOb2L8byTqe2KjfPNPZSZsEtiDqQulbljDgwhmVMYcTXYRsFlaHJHf +rcYARUWC0NgT4K59wOx3hKEbhjdDyY8+0vaT/BGPnAFaZLAhsSXj4FanOzO0GPzL +ZlyS6Jx+Co23KA5qurNl +=mA79 -----END PGP SIGNATURE----- diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd index 6028c93f5efd..02cdc8cf539f 100644 --- a/app-admin/collectd/files/collectd.initd +++ b/app-admin/collectd/files/collectd.initd @@ -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/collectd/files/collectd.initd,v 1.4 2011/04/24 17:10:05 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.initd,v 1.5 2011/08/25 21:02:37 dilfridge Exp $ : ${COLLECTD_PIDFILE:='/var/run/collectd/collectd.pid'} : ${COLLECTD_CFGFILE:='/etc/collectd.conf'} @@ -46,7 +46,7 @@ start() { [ -d /var/run/collectd ] || mkdir /var/run/collectd && chown collectd:collectd /var/run/collectd ebegin "Starting collectd" - start-stop-daemon --start -c "${COLLECTD_USER}: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" -- 2.26.2