fix logrotate script wrt #490672

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

6 files changed, 55 insertions, 16 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 8a72a031703d..03dda1868f68 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.52 2014/01/31 13:23:02 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.53 2014/02/14 14:06:11 ultrabug Exp $
+
+  14 Feb 2014; Ultrabug <ultrabug@gentoo.org> glusterfs-3.4.0-r1.ebuild,
+  glusterfs-3.4.1.ebuild, glusterfs-3.4.2.ebuild, +files/glusterfs.logrotate:
+  fix 3.4.x logrotate script #490672 thx to Christian Affolter
 
 *glusterfs-3.4.2 (31 Jan 2014)
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 04157743940d..10793a9d7be3 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -21,6 +21,7 @@ AUX glusterfs-docdir.patch 1644 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc1
 AUX glusterfs-r1.initd 3187 SHA256 2feecfabc353f6210b5f39c3a93e8eb9fa0a62dca6aa32dd9bf6796220b8fb49 SHA512 3129c5201de92d596a8ecd182b411d77093318c7a2a0b064a0111c0498cfb61d821a2922f9075cb991c965027a0494ef2bf49285e07bd816c2f28b8a5775bfc6 WHIRLPOOL 782ac2629a870ba835378e27e0af5195b9bb19da76ef3fc2a99d4140022c7697f36a03c13b0fc8c389367bd92cad377a80307ae982d7d8d1f2ecc6a0533009a2
 AUX glusterfs.confd 129 SHA256 a9023ba1112ceb4597c654228f0beb0053ed695aeb32c65e0749a7157fab563d SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4 WHIRLPOOL 114f076456845087bf4dc28fb179cfea335f5f03b1d16098d836b5b0487c46fba4ee48d0bfab8cff7b2326b9585b327271d5c1d402db8289cafdf29f70ac063d
 AUX glusterfs.initd 3134 SHA256 ffa622d26add72dafc1b1f8e6de716b14a6d99911888a344dc7d236fb7667d6e SHA512 f4130303d892c1866efc9a1cff592ca9d62108455f910b92576950bffeb849e0854bd0f5faa0678efcd30a4b2d51370d7563d23fc14ffa954d419945dd3a3f96 WHIRLPOOL 452918fc22895cb4d2fea7fb19641c42eeac8964cf588cb5981ad1e551062e4a0648818135af196203ff228152360fe0740c4c4f6fc334b5ac6b9ba489a69cba
+AUX glusterfs.logrotate 611 SHA256 ec29f5830f6108fca793d6ac90bb49e644a991a073a736ccb76fd05f9a9f60a2 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791 WHIRLPOOL 10ced84d8035e3e7e5aaa013cd7c0c9761999e8ddca41ff2df3ed2be7a78add579d5c2b17a27b86d9a6fafdb607b9d175725208af72585d9fdc66b3bdb5fed3d
 AUX glusterfs.vim 139 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7 WHIRLPOOL 3006d9fea924fe274ac00dc5d711cfe642f347808889c3d5dbde764f0f0cd2ab27509fa75d37b95ccd98c33bc1db8d082e5d16a26e0f888b7189f9738b6ff963
 DIST glusterfs-3.1.2.tar.gz 2086469 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838 SHA512 69b61af7c6cd9f54f615f7cd50c6ffda670800c6045604449b130eaa43c90c9adcb518c1312134890cccf3a301066a5af3e97bd7ec9775b7f70ea6d0a4a67cd6 WHIRLPOOL 0ecc86ac943f4c8d9575b8b0ae2ef72002d6510945e1a687409277165eb7688c2e4db50532ae10777828646b782561dfd4314fa766d7a3bcf4762e8be7c34c79
 DIST glusterfs-3.2.7.tar.gz 2424292 SHA256 464c089ff9da5a8e17f7caeae48f1cad59973489dfe940a9f0d8db8bc14cd6c4 SHA512 c4a286e1ddfec6c92d011b5abe4f96321e39dff57294141fc44cda4578fa11582095362733092af9042b38528cb328208e9e46a33c40c70e672ffb4e38dcc013 WHIRLPOOL 843a615b334e1ee84c3bcef1a8aceb113eb6976656ae09c6cbf4dcb201f4d37d9cc8ef3ccd3cc4aeb879bffde556b9f6f7105c3c39afed94a19b9613cd8c4284
@@ -33,15 +34,15 @@ EBUILD glusterfs-3.1.2.ebuild 3647 SHA256 e2835d83bf6e03f4b0bb9d4f7dd2749d045420
 EBUILD glusterfs-3.2.7.ebuild 3702 SHA256 2a32929580fad41bf449a79bc4e5d195bbab6c8560f0a937b9bdadb790fe7ff3 SHA512 2a9530fb240f220d9e3581053edf4fe18f1545223386c03e2b4f1a36fe2832cd8abc33110d234160bfc4a07f2532e1f2a7f4c976253b5fb45ef3a71b99833dde WHIRLPOOL 5a3d7d1b6349a266d2bdeb9be3061610c99bf8338cc724dba70d9db55e37b2a1fb10e798ae13130f010cc88445f58aa3006b459bf502184898de3c36cd21c3c5
 EBUILD glusterfs-3.3.0.ebuild 3796 SHA256 bc7ebd431067f8e8b8c7c15ab16a2701e6d5e1b45935ec48216c516c2c8ae7c6 SHA512 af2a53e1e3786e7366a88a1d9191e3fc66204163e25b497668bbbee7b96e64d28212362bcb9ab6807ee229f6469eeee70e10919f9453161ae4423fc62445bf30 WHIRLPOOL 851ffce2dce2dd372a0a5e1af9f147ec517e5ba2118fe2ea33ba6c013b3ae4ddb0e4fa3332c3a8e4f3dc629bb88a5faa540e479425366cb1780485558572fcd6
 EBUILD glusterfs-3.3.1-r2.ebuild 4071 SHA256 688fac9b91eacff4ebde95f0e60ee48bd3e0c0063f3603186e6f902e85b81d3d SHA512 e510359e5ea465cc1c8b3545b88b204671ed0d4b0bf2739ed8a5a324c12a1b04855c5fee5c8f1153b2916eb180fc9d225282af4982b3ff831d997ce90e8f8896 WHIRLPOOL dc55997fc5b0d8d9f59bb54406bab2c5699f9ce4f244b0465899906235a95942cc2f502e174a694c5a42206939195712dcddd2c8750417f5a7a4d04881e19924
-EBUILD glusterfs-3.4.0-r1.ebuild 4807 SHA256 d139f9afdb9bbac0a266c4b8f23ca52ea44eaac238e52334ac53ac3ed964adf9 SHA512 6a20785b9fc54051eb21be72a46e91d26e6ee600868652c5fbc6a34eeecb46c20b639e7d4b09b589a240b9ad90a64f8834bb347de131aa063f0772c773d2febc WHIRLPOOL d7e39699cd19f4ed7d96588bc6192f85a5fa53a5b2dcb5bcfb48a1ab95ef1376ef773999c8edee49ea2adab57fed11d321b100e9ad39682feaf5c1cfdd90968e
-EBUILD glusterfs-3.4.1.ebuild 4638 SHA256 52de73867da9937b29f954711716abe6662d6ac193b067a228d23df5ca25dbfe SHA512 5391f790471f0e22339302324335eb7a5c5e9c8366f2cce9047d5716eda6a0a19374c11b8af6d2534065e9592bb5f931209abd06af6b5938087962b8f6263ecb WHIRLPOOL 4ea3f7564ab94b02da6450e1871fe89cb54ee726a48067797c6aafada85d0960fd6fac129578250dd14a813f0dedfba4d3af4730632065fb7223c3df03638f10
-EBUILD glusterfs-3.4.2.ebuild 4638 SHA256 8219d6c8ef1ecd239c5220b6ab2e69cd0afecb0720a771444fd03b7312b59b45 SHA512 8b8a86101a9db80d9462938461e51ae7a2e300ec6090a695873cf4ffd0d26f1e5394ec28e73bdbc134ef5eb75cc3973fbdd07b6ef5d7a7b6a58ab907bf0df75d WHIRLPOOL ef996f38923d941a171defa242fdecc4a1aca844f5720f6954a0e608a0cb9c532bc8f548a2eaa592e99a4880163aa245843acaf1ff67f75efda534a2059db41e
-MISC ChangeLog 10251 SHA256 c1d3ce3e7d0e565d41cec51d6ff85c10e91b9dd1b136640d7c8e2de8e94750eb SHA512 85ec4a0ff6c37da3d26e2f89a6c6cb35b86c36d03c9cc6e34535c6b0ebecffce230545591c6d8a82195fdc435992dd053b59bf728903dd73cf8caa9e9d40932f WHIRLPOOL f87282dcc2e58dd7be78771773c21eca2f9845af7bec0cca8d4f99aec08fea41760febca42f16a5e1cdf65d80f6d4b47d31c0ff55ab8df881f0f1ab71c50e33a
+EBUILD glusterfs-3.4.0-r1.ebuild 4812 SHA256 07f79e9b2ab8b69ac05d7f7b1ba3ef16cb5b4d810e82f61d473212f3141f8949 SHA512 5b73d76ec01aff86fd93ac273fa6bee44b6e4ae0c9536b536d7677ab69c8342e7bc305b55bc8bdaa5f33707e30aa2987823ece900e24b48822b26f4bf20234b6 WHIRLPOOL b50617472d6355462c0faf524db981a828cb59f9f110009b0a590d846b254a8041196b2ced11ad1c7814e5e0e17a1a9626b9fc3fdb1bad5f59fdfd7b142853fc
+EBUILD glusterfs-3.4.1.ebuild 4645 SHA256 483cca116cd466ab68084bb739aebbb2e05e62f0bbea83ec379613e2c1a96695 SHA512 1606ef3daca5ba7ad8e81f8c2be6e36736a2fa17d1e55d161c12b0ff297980468bd6a0f9e3833b7fd305d7e6aacfa4df26955e3adb0dceb593debe9b0dc08333 WHIRLPOOL ca65b7a493a5e3bee2a8a91bcb78a46bf6cc56e1368c04613dea516e1a8392ce7d69f1272eb5786c5810866e73050f08323968548ba358cfc36332e8be3cd989
+EBUILD glusterfs-3.4.2.ebuild 4645 SHA256 7313fba60404ded2556f488a81bdb8e592e43a2c053f5535a6300b84a8c27d41 SHA512 3f1b921a3c18d35ec6e1b896edb9c14277bd7c90f25341084e0198ac55aadd6664edd795ddffa11aa8852ff164cfd49a1969319179e3b7efe55103f371defff3 WHIRLPOOL a8dd1569c3b93629729f50ef1db508fe1ada2db7c9456fd3a6e7a65a3eff7d4f27ae0e96f323acb46b6ac8f6fa84ec9cc5dbcf0d27bf6f912e58c4fdd93e6905
+MISC ChangeLog 10466 SHA256 1fd28132ee2c078f3179d2f80e21729c5c762efdef6f06c01c45cd10f00d03c9 SHA512 c92170e8b2a9e9c08c290d5db9a2b474a56d1df81b4eb36bf9415c2d70536763f68450b61cf076aa3ec7f04260fd1432bf8188608bd2743c9e1410aca8679b34 WHIRLPOOL c48fffa4ffcfe019e12bfa8ac8526951ca87d1a61c21a57949ad8fa814215bf810d3a052c813609aa074ee662e05c408f48da2cd4dee5a7a15c435535116189c
 MISC metadata.xml 1037 SHA256 82d258e1fbfe283fdf38d31124dff45c25f0fd457952d3a06c46bbe14b3e21f3 SHA512 b25f18244e5d026360570769c64f547b2ccb94b7ee780190c800b83350a5ae8577e7a00413935abb84d3765b42b90edb9b4dee35bb8772ec97f1a9f8dca5c297 WHIRLPOOL 79c89cd1e212f341778d51db8144bab8fe144ef3ad6701312f3399cf55fd9c543bc4623b5c7827e6010f89e33b2661f42f127b7ec8e7ed39727c5987510cc631
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLro7sACgkQKiQSS7ZY+hMSrQEAjukLf9weQmg1uGHCT76EvN8y
-cDFxgwdnInX+8FKCMn0BAIDB4oUXWSbZqjFa3HwT+kK5bec86z+U/TyrW6d4OTzZ
-=CpKH
+iF4EAREIAAYFAlL+ItkACgkQKiQSS7ZY+hMmbAEAi5D0sKUp47H0xBhuIBGeroCc
+vyQMtHc3jLLQuKn58kQBAJct9vk7Td3UCVwt/zayM9NUMJ3OVxjDdryU2jQMuhJf
+=YnMC
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/files/glusterfs.logrotate b/sys-cluster/glusterfs/files/glusterfs.logrotate
new file mode 100644
index 000000000000..07ae7b9e54dc
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs.logrotate
@@ -0,0 +1,34 @@
+# Rotate client logs
+/var/log/glusterfs/*.log {
+  weekly
+  rotate 52
+  missingok
+
+  # compress the logs, but from the .2 onwards
+  compress
+  delaycompress
+  notifempty
+
+  sharedscripts
+  postrotate
+  /usr/bin/killall -HUP glusterfs > /dev/null 2>&1 || true
+  /usr/bin/killall -HUP glusterd > /dev/null 2>&1 || true
+  endscript
+}
+
+# Rotate server logs
+/var/log/glusterfs/bricks/*.log {
+  weekly
+  rotate 52
+  missingok
+
+  # compress the logs, but from the .2 onwards
+  compress
+  delaycompress
+  notifempty
+
+  sharedscripts
+  postrotate
+  /usr/bin/killall -HUP glusterfsd > /dev/null 2>&1 || true
+  endscript
+}
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
index 8e26e8e1e2bd..805f664661b1 100644
--- a/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild,v 1.3 2013/10/16 12:20:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild,v 1.4 2014/02/14 14:06:11 ultrabug Exp $
 
 EAPI=5
 
@@ -87,7 +87,7 @@ src_install() {
 
 	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
 	insinto /etc/logrotate.d
-	newins extras/glusterfs-logrotate glusterfs
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
 
 	if use emacs ; then
 		elisp-install ${PN} extras/glusterfs-mode.el*
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild
index c01b4f30f35c..97e4670c7816 100644
--- a/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild,v 1.1 2013/12/31 09:04:47 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild,v 1.2 2014/02/14 14:06:11 ultrabug Exp $
 
 EAPI=5
 
@@ -84,7 +84,7 @@ src_install() {
 
 	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
 	insinto /etc/logrotate.d
-	newins extras/glusterfs-logrotate glusterfs
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
 
 	if use emacs ; then
 		elisp-install ${PN} extras/glusterfs-mode.el*
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild
index 110b65efae7f..4dbfabbeb5ad 100644
--- a/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild,v 1.1 2014/01/31 13:23:02 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild,v 1.2 2014/02/14 14:06:11 ultrabug Exp $
 
 EAPI=5
 
@@ -84,7 +84,7 @@ src_install() {
 
 	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
 	insinto /etc/logrotate.d
-	newins extras/glusterfs-logrotate glusterfs
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
 
 	if use emacs ; then
 		elisp-install ${PN} extras/glusterfs-mode.el*