diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2013-04-29 17:27:40 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2013-04-29 17:27:40 +0000 |
| commit | 8bc51cc784ca83f4074c168eaf50bcd625092045 (patch) | |
| tree | 2f306e69138fd9876e343c4a08d8e69bf5cc513f /app-admin | |
| parent | Linux patch 3.9.0. (diff) | |
| download | historical-8bc51cc784ca83f4074c168eaf50bcd625092045.tar.gz historical-8bc51cc784ca83f4074c168eaf50bcd625092045.tar.bz2 historical-8bc51cc784ca83f4074c168eaf50bcd625092045.zip | |
depend() shouldn't talk to the user
Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/syslog-ng/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/syslog-ng/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/syslog-ng/files/3.4/syslog-ng.rc6 | 14 |
3 files changed, 13 insertions, 10 deletions
diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog index 684008d0e0aa..ffb11473c0f3 100644 --- a/app-admin/syslog-ng/ChangeLog +++ b/app-admin/syslog-ng/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/syslog-ng # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.331 2013/04/28 05:24:13 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.332 2013/04/29 17:27:28 mr_bones_ Exp $ + + 29 Apr 2013; Michael Sterrett <mr_bones_@gentoo.org> files/3.4/syslog-ng.rc6: + depend() shouldn't talk to the user 28 Apr 2013; Michael Sterrett <mr_bones_@gentoo.org> files/syslog-ng.rc6.3: add after bootmisc for the 3.2 version as well diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index f4f6960b4efe..e9462f365852 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -3,7 +3,7 @@ AUX 3.4/syslog-ng.conf.gentoo 1431 SHA256 7894f4ad578002678586c22a0d67122b260931 AUX 3.4/syslog-ng.conf.gentoo.fbsd 776 SHA256 362fcf26001c70d9b7c80e57abbd01de34d8a38832f7288f266139e9944ceda2 SHA512 0f0bc5bb661507d8e9c04a03eb0d817a163ef361296954762832ff5bae096f8651c5082e7383e10bdfd0c0f01c9a2f5cd9c8e5d6a49326096e14e8a90a4eb1d1 WHIRLPOOL bea1d6f39eb8c9cab59b51e040f77b06d546b21de15fde2af3e44e739cac1246003528ab2c82d3a8b1cdb800d977980c8fcff5f949bb0b26b179f8a433161a31 AUX 3.4/syslog-ng.conf.gentoo.hardened 4658 SHA256 5efb3976249fd44d01af2c287f35e9c3a61e74909b4f7d9f63dabc32eb4e3f74 SHA512 d326832592b016b3fec1119ff90c4898fc4351bbeccff32295712229e955b72ea80a282cbcb527862371c5899446ee4747f95fe898e36338c47683121598140e WHIRLPOOL e1eb845712cbff8a3a3f656689b1c8a1573882cc9850211bba22eb5cf46adc2337799fa4992d17e5e32a67ea7ae4f7ff65034dcb1606a6ccb82f565d1ef80098 AUX 3.4/syslog-ng.confd 1496 SHA256 d28c269c8aa2876a389aefdc76b18bcd30eb6653ea1e54a0eb6fb596568643b6 SHA512 792258acfb78caabc2078f0c7c1fb6c61fe0ad91ca45d4901a0257d687e51edbf81ca67a304ead345579855ae2ba0a7fd8b82f1e80e798d4b6c339c31b687afb WHIRLPOOL 3552c19038489743740acf5e77df83d54bb750547055a6c0711a2d6ec9b97fb1389e33142e2fdbc42a9dc84c69b67329657bf1c519492e2c0a2a71a7a8c78444 -AUX 3.4/syslog-ng.rc6 2175 SHA256 ce3abded20b3ecdcddf11ef93bf54b6a0898407d37dee370a7a20cb3664976bb SHA512 f0766bb8bb0d864a7eaec0b3c8dfd9377d75db606f5812640f90411d3f6c06d7e31cf88c95357acad14f1f4e08ad7adf68ecf005b2a8f92d58e7fb8c5c6f6174 WHIRLPOOL f4fa34fa41a457ad4063dd6bdd03dc5a3b5c3168cf1be4a1ccf6fcde3aaceafd95c2af6aa24f467042edf13a008dac766d8b5f3e375cd847e09c7308bfdc72fa +AUX 3.4/syslog-ng.rc6 2179 SHA256 a42ff91afc44570c9bd75bb2f04febbc09a500f4f4c5af75bc937ed7abbb2f4f SHA512 d096388ab45aa5d67f2ec0d4d10fe491670469dddd001f900cd994fb1e20cfea152105d64e9e1037de57341b518874b30cb94ed7a9f969f77ecf9b5b8581faa1 WHIRLPOOL bf1babcb7aa74004f4b989f5e8a474ac72f680b4404130c4f820893c6b23c30211d6a3332defb82fdb457e72102771caef25d8b97827212283e2565ea5b596e7 AUX syslog-ng-3.3.5-afsocket.patch 1384 SHA256 d363ad6ee2d994ff7f3e32b6ea2ad3889033023332ffd76d963313716dc0dc59 SHA512 8704cf813778e72ce70f8e8b88c53ebf570880ff591c5b3d9c4239e72fa97223f9e492473096b82b89b61edeb2cadcd8bb9794fb0a83b4755ad691637b193929 WHIRLPOOL d7c5aeaec98eeeda80713033c891fa916b52f9591e46031b0b032a1a8340c29fb41ebb3d96203f0d5e3670a07502061f0e1c08e14d766870fdc4d30e40dab41e AUX syslog-ng-3.3.5-compile.patch 250 SHA256 831476d524a2fb32fe944a960f5adb4f97fde6ded8d84eb1ad9ef00b5f1a9354 SHA512 ad865b18cb8ea8509abeced4f42b9fd303e2a3f41ff9c58fd23ee5331b6248409a54963ee15dc5803c9f69532809048fd996e9197e9d459b03ccbd3ba2b5c9fd WHIRLPOOL 3f36605448b10eeddf6aeaeede64815edc5b48371c65270d6b83758477cdfcc79e7361521ff00f5922da5b1aff5c17c6e1ed4b36ef649f4c3a95020ccec2d422 AUX syslog-ng-3.3.5-gprocess.patch 1583 SHA256 da5267e191690a38d63304f5943e79a3384bbb797f38e10604af85595e925402 SHA512 6a08ebaa96a54cdbb441d95632f98e74bf410f9c2db74238c60b0eca02094eab6c237d38d000cb63995586914b2414f8e8aa7d0c1e9f031befeaf03b04bf3056 WHIRLPOOL d9bf12718783fb66727381eed0040d2b3f4c61be9498ac1dd87a57a14eff418ad9dea854c6edbc11c8bf82c902016c8742a8cb09973189b2991c6db322a1ce9f @@ -27,5 +27,5 @@ DIST syslog-ng_3.4.1.tar.gz 3347306 SHA256 ca5613a808ea92cb72669d8e1c141bf86405e EBUILD syslog-ng-3.2.5.ebuild 2852 SHA256 2f0de5b0f8296b0d4e4d00c206bea5b1b28f31ff1c51879ec72dd3aa8f306375 SHA512 c751b8975e62c884d1c5f034b53e10d27d08f0b9e745f63e5e150e3e2b77dfedb43223443172b9150cac5737ed541f22205173d4bcd9816b3878a3e4a89c42eb WHIRLPOOL c4bda63c10d006f7cc7dbeb78a9f272a10d70ca33bb060953c92f5b7b33c618d4f94f4b0b3022c010cd0c5d389fe261dcd638ec9e8813f3c1ae1ee88e100350d EBUILD syslog-ng-3.3.5-r1.ebuild 3892 SHA256 d06a5677c44a132c0c1e62b12ad9abcb65fe4cd15d0de7f4ff9f61b24a34a9f9 SHA512 aaa0973f261ab6a82c9d0e41fb5c8cb3c3aef488da63aff955bb2bffb092a86adb8ec49be6508ed5e264e3363528b6427b75f39bafffc2b8c849361ce71f2a46 WHIRLPOOL ed81d17b1db01e696267cce2e2d6fd94dd1eca46bba9a3bedba0c130991e69bf80828f6dd16f93c06c34d9ae137073dec7bd710e67ed9efb700e64e83f373d42 EBUILD syslog-ng-3.4.1.ebuild 3549 SHA256 148291bc3b6c8df46e88af22c9f0bd22442babf1aa5296db7ce7e9a3db662de0 SHA512 39c20c62c0d6fff6dc889133a36de8a431342148c242365d3ffbd2ee6b2e499c75f4671859b7e5f879ac529d443cd15f57824f227d667dc35b84a99857f23c1e WHIRLPOOL a09e144c8561803f635f01bb855be1841f4ea740c6dc4d378a3d2e64e71cb4b99f45f96be434f7f527e85fe7c5963bca49dca554c5a5d465bea841e3ff429b15 -MISC ChangeLog 46012 SHA256 1c5fbde19a8f8bd29a631a190b42fdc28e12e90803100f34f56d21490a52ace9 SHA512 fa0fbf809bacb87728df12cad2b6beb251ea745567774cf0480da67edb82a4100d30158ce29495e182c8a968aa5dc3af15a4d632a8b50d8ee6d650d8c5d1533f WHIRLPOOL eef99dc5c2fc8ede6c32e4c9c803ea6f544715851a44f7f277bc60d0e3caa14461b83055cc7b2e83df22c661a6c86bcda49f161da6b92989197e7537f73c8236 +MISC ChangeLog 46131 SHA256 80dd140bb4cfbd6955594d0a99d8401f6f009178c32bc5342f88181d8db5c4c8 SHA512 91bbd202272c90d023175ff9f9047d61b512b8e5025feadfd81ee0fe158b1f4231c6d9c8294a34cb136cfa7c80fccf403058dd50806467a5d52f5d1d4af0980e WHIRLPOOL 3510c4f22e3965c3f4cf9fdc25853b5bfe443b4ee79cd53638434d9ade342cb44fcd94e85f719b33d6c067e69af71a6d6deece6e483d2e4a3f7afe6232e3f39b MISC metadata.xml 622 SHA256 080a769b5f0dd360ac36a746667a70a85a8e857553da07dc5272005c097125ba SHA512 afc895b14a063c88fac179d3a588e0d77e507a7bd8a9bd93091989f5df959e002696d281364ef28d293546b191e2ab8a67eba59d2e1006f97640b57a302c4e1c WHIRLPOOL c634c831dc48c370a21f37abf5c4a96a0c11463fa69dd26c632f0b294af5f1372416d4bfb941eaa842cdc247587684aff14498e65e490cc4e16db6ae2aaff1b2 diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.4/syslog-ng.rc6 index 152bdd30ad36..11c324d62c60 100644 --- a/app-admin/syslog-ng/files/3.4/syslog-ng.rc6 +++ b/app-admin/syslog-ng/files/3.4/syslog-ng.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.1 2013/04/28 04:50:34 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.2 2013/04/29 17:27:28 mr_bones_ Exp $ SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf} SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/lib/syslog-ng} @@ -23,12 +23,6 @@ description_checkconfig="Check the configuration file that will be used by \"sta description_reload="Reload the configuration without exiting" depend() { - if [ ! -e "${SYSLOG_NG_CONFIGFILE}" ] ; then - eerror "You need to create ${SYSLOG_NG_CONFIGFILE} first." - eerror "An example can be found in /usr/share/doc/syslog" - - return 1 - fi config "${SYSLOG_NG_CONFIGFILE}" use clock need hostname localmount @@ -37,6 +31,12 @@ depend() { } checkconfig() { + if [ ! -e "${SYSLOG_NG_CONFIGFILE}" ] ; then + eerror "You need to create ${SYSLOG_NG_CONFIGFILE} first." + eerror "An example can be found in /usr/share/doc/syslog-ng*" + + return 1 + fi ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})" syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}" eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})" |