From b90912487ba66968d87a2026e842590f54c2c0f3 Mon Sep 17 00:00:00 2001
From: Markos Chandras <hwoarang@gentoo.org>
Date: Sun, 1 Mar 2015 15:55:55 +0000
Subject: Amend logrotate file to handle multiple servers. Bug #537286 by tom
 reinertson

Package-Manager: portage-2.2.17/cvs/Linux x86_64
---
 net-ftp/vsftpd/ChangeLog              |  5 ++++-
 net-ftp/vsftpd/Manifest               | 26 ++------------------------
 net-ftp/vsftpd/files/vsftpd.logrotate |  2 +-
 3 files changed, 7 insertions(+), 26 deletions(-)

(limited to 'net-ftp')

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 23e1322637c1..11a7615dfd69 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.181 2015/01/31 13:07:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.182 2015/03/01 15:55:51 hwoarang Exp $
+
+  01 Mar 2015; Markos Chandras <hwoarang@gentoo.org> files/vsftpd.logrotate:
+  Amend logrotate file to handle multiple servers. Bug #537286 by tom reinertson
 
 *vsftpd-3.0.2-r4 (31 Jan 2015)
 
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index c8118d449561..7ee0cf66477b 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX vsftpd-2.1.0-caps.patch 575 SHA256 4888021a25625041746b91025af0c2a2cb1fde758eda1d6c94098d4de0c1e370 SHA512 aeb407d9d0cf3940bc0fb1ef76c23cd19f68293e64d8a6a64e2a271b624a237fa3721b6a3476d59f0c6fabf69a418f9577fde351aba0e9aa96dc1362c02e1524 WHIRLPOOL bfad7367797f0fd0da502d9ebdcf13364123742642d384fb44220c0af2370997c5fbf9e72bf9eaabf47a449650702b1b73ac165a49ebc8687cb624e0caccbf99
 AUX vsftpd-2.2.0-dont-link-caps.patch 806 SHA256 fd164d4702ae866cb06ad245653b4f25c73d1d701a211b1f972b45b98ab55dd2 SHA512 b162f3afcc135bdecea63ef24a1f321e6723a1218a96a8897b3db67338f5cdceb6178c7cd0a155dee80af3e7b9198610562de7cff6986e7dfc93df79b5ee501c WHIRLPOOL cd7c6a94cc094af32097031aeca93873604d86f1d2ddaeb4980a18c82ab0061e95ca36484f157b68db9f81456e71fa02a6d01520f7ca9487bd2a266458c5a4cd
 AUX vsftpd-2.2.0-gentoo.patch 11049 SHA256 e1737c941837aaf8e060a649903934174528704feffd100f86180a7ec68f3760 SHA512 2c1ff970d92ae1646430aa5f1ffbf1f846d97765b19a9ea15355ce556ff493f8d0eb8564ec20afda32ac4fb04407b9618db64f0f5aab230a9e6a9ce513a22978 WHIRLPOOL 180088b91c055ef6bc74f796875bbcd6e3f7379587941d106eabaf6036c162340ff570ea7fdeea397e37a1d00db176feeb76c4c3b77de9766e60f29efae9a595
@@ -14,7 +11,7 @@ AUX vsftpd-3.0.2-remove-legacy-cap.patch 1739 SHA256 c18a5b1092d07c5ff5380553345
 AUX vsftpd-checkconfig.sh 785 SHA256 2de7c7c1edfe3ae0480e22d988a564db3bb873050929ebb6e8361d7a1288ddda SHA512 541702557231c79413ae77cf26c28398fea3cb332375f8d22e0c0a45706b04db954d268addd76fecbb8b0ab3109f1009c18b0599394ed33c4a6fc8dc647d889e WHIRLPOOL ac2d38c646a440edc093f8458cc2395c6da465d9719c10464ded9cba2c480b9398f8ece2d25920d10893dca0fc16ba8b3a583c55724f5a5b5de46eab671bab63
 AUX vsftpd.conf 3842 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0 SHA512 ab6c74a22eb30e504efca095ecb0675e058bd4290e4cd926433d011ec8423a33bc1da4d25d4de295e6ab8f001e1d4b3da03340b1b279fdc95461d393ab4f64d8 WHIRLPOOL 00ab13614d97e52c2b0e88587feb7276991090a0e94244695420dd87993fb25d30ea461bc4fc3770a38043cb09b3a714ddfc869c98d29033a61740018acbdf9a
 AUX vsftpd.init 1427 SHA256 4297952eeeb02b5c4f2f750742614513fa6a0c8d291a9a0adcec1ec0098fcd78 SHA512 2e18753f97d9e61083a395a96291e967420b438e66c0f5d385c1a55a133a7895f7a961749f83e33f7c1875a215d808402d3a63e98a5c07ffab6da03dab57edf9 WHIRLPOOL e149df8318a01fdd01c92e856f187c8b7cd2b38501a4edd1d8251017edbeeb8e3a9a44c0d49ce4fdf48d74d52f2649a43bc7871f99fe16c0ab36c9c4c73d017d
-AUX vsftpd.logrotate 53 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3 SHA512 6b0d718ffdc0b6a68d5092b36a03106d2c4e4fa6873a178c85345acfb3847ef839a475eadb56171d79ec243ae2bf8725cae0ae486b182afe065b181f87c831c5 WHIRLPOOL e155b30b59319cc5dac69c7446273ab20b4e56f696cce6ab8c83c3310529e0da70969edefaf94c912f121d3df526368ad9aafd291c6cf2f6a9b2d7b69d88b0aa
+AUX vsftpd.logrotate 54 SHA256 2037b22eee79bf20b7047ca291af4e73fce63db303a3682fcf0d9d601029e3bf SHA512 cee63caaf5e3db620e57132dc1a531cfd39ce790ac64e22b649cf3fac8b825cf188425bdf19cd376aa3f31ea114c8889ee307b6e7f9a2cbd155324f64084d5fc WHIRLPOOL 3930bf8f67b5d0bd843c69a587ab089df7c34f861252337c46a1424f127d84ba894df79b839e585661e33777aadb066e6f6b5f680d2b9fb96d0f6ec54e8f61e6
 AUX vsftpd.service 218 SHA256 5c93a836c0be34d785197ba01541b6cd9db6f8992c4ea081c07a6111cc98290d SHA512 f032f64ed5fab15b1c9543579090cdca007d0a759073e7c4aa0f0ef0f852f6787610f776ce63d0d922ccfbadd480df81ed9a62e6e0f399327d770f9b70c34df9 WHIRLPOOL c91aabb3b89dc3faa002cd998329d44677f756ee2901492324e37b3f7dbcc29b83c53032891ef1d802ea70d01b060f091970c20a06b36d2cae9358269df6f4e4
 AUX vsftpd.socket 104 SHA256 9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9 SHA512 4c56607dde0ccc4773edf905c1d52b66fff774e6aa8b20a23f9443a04838a9ad8a1df535a0bb27660e9a4528d1d7c90b53fd6dd1fa3d4862e87ed06a1a8a87b7 WHIRLPOOL 435e23297ff200ab68cb2813d2024279ed7d21e7d03f1c732c8ef06baf4b92c330edd496798c197078f07b08c4680c9c70e8dcc8aa4d35872d0cc556298b9fc9
 AUX vsftpd.xinetd 432 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f SHA512 f5c232345c06a7f3a7b32ff0281c386e6956e1b91d0331436bf8eb39e479ad1e37335424c35f22f12fb70416caa1f6a317b03e701caa4e0499acd556db64e909 WHIRLPOOL 7ffd1ede197d387e38ffa6e584c86be2fc35c4938b75ebd793daff562f6e99e95aaf0c5e58ee0a74a76686115e5e32e19dd5b27d8a64dd255de1ad7aae74d5fc
@@ -27,24 +24,5 @@ EBUILD vsftpd-3.0.2-r2.ebuild 3701 SHA256 e41e00d023e9329ee79812a46403d061431440
 EBUILD vsftpd-3.0.2-r3.ebuild 3775 SHA256 22b245665d5c6e8108800c3849fa75f2abdafe981d71a2ef714e2d7e1f839677 SHA512 16deaa9e9b2baa65f663c9a2f026343bf448332b11d1a90777151bd515b88063373f53fa0f446bad0b5392c5f92a6581955000544eb7c499186d3b5bdba71208 WHIRLPOOL 03ffc8b3ea268747bffc57cc3777d7cf0e79de3952f1e3436bf66ecea54e96ab5fa5f96230151ae8118d8bc543728d65f184747e13de10361c017521a1418b3f
 EBUILD vsftpd-3.0.2-r4.ebuild 3775 SHA256 40d691eecc96e96c5b79ef70e4a7c0071f0d14fb664782d9fec432ff66c3d80c SHA512 7b2a2a0a03e49d998fe22f101295d738da934b5b90e488ae5ac1e51708ea18531fed1e2026da41a0093dbb1d3ad09ae8377ad364c20a3c26743b021feb8a9048 WHIRLPOOL 0ba75561a938236a2267fc0b4f8a4b25d0f52798a23e40b499bd050c26ab6e869b2ae65fd8d61432923c583f136d23149920ea0e3a1850a49a06f6265c178c96
 EBUILD vsftpd-3.0.2.ebuild 3261 SHA256 2fbe8a15ec3becfa9b6d026131910e0bbba05e441f529ae00700912118220186 SHA512 abbd58887a36cdcbfd384b2cfcb66f1fd7aaef465a1efc61a456ff62cbd24067d5056e35592ea445997ab5537c613e168481dbca52bd903c9ad2270ca80f2e78 WHIRLPOOL b7ea0221b0b49d61a5b45fec8f98fa63bb1fdb995cce08833163c11a052560b459897eac6db2943813bdd9324f62e8c98238475db0c1e821196e178fe989fff7
-MISC ChangeLog 26000 SHA256 b7af54c3ba3380bd9f5e8778ea19a8eae2081209e9064969c315149d5cc2698d SHA512 5a3807d8434251b3e886f68dcd7b86de58f8a595226ec4ba274f343aa8d33b3e8c753811be2bed7c3babd8502065b25ecfd80342878066bcce5da74410838252 WHIRLPOOL 20f91bd353d6ec56027bb6212a959e0d431707317ae84b07c9299df1405c22f346989666e37d8de2392639af988c377b8acf4f174db7e9751274b29daee1a7d5
+MISC ChangeLog 26159 SHA256 53608c6d2d96acbce4c07ae9132408b4d3aefc849038107dae44fde136237a5d SHA512 7d197cfab0e5645a7a2b3e25bb381472a666ae288fc9d3e95c54ee2b5cb89d49a9968d5610a6b7d472bc48af7f740ceb941af86ac50f3705988e06a1d4ab8027 WHIRLPOOL 68b8d437d9416b7de49d8645f76e1ba6212a77c13c8ede810793b0d347fb29a1c37e3c959196a2c51697b3a4028fbeb7d0294ac13d6a383cd588e5a89f27887e
 MISC metadata.xml 664 SHA256 769529e78a4d3270ae5c627e09783ffd6e122e24c5e931317d0832b6273ee586 SHA512 84392c28c30904caba637a5f90fc73512f028f706f5a805c1181a9fc63b93e9794dc17ade2016d969796b32c6ab6b8530f549298b099ae67c65d03a62d64955b WHIRLPOOL a4690e0bf4b66e94d072b0f6d0297da7fd208277b3302862087f2d274438167c97f2a33a6ad43e76fea2f754190e2b40cfc6a7d7ee562538ef6c479d08f36d0c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ7BAEBCABmBQJUzNOjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88mBYP91YhzPmiYSW3OwCCtiWAR7iS
-mUbaDnRkeLxBC7yElBGl9Ex/NDBhqP80aAVixSdMKV0wndueqW6Wy85lWX424+Gv
-53GW0f7kgXrs0dDMVdKDrSgTAUtreNnQVUxfpJN7pBC8I4d8H552vyeNvuH06lhS
-eksx6XsUtuTBXGL4MwpU157vxFILNETZhbsLEwOMQjIhEcEEycac9s24RerqsLlo
-hGjJv54yJZ+I3BBDuhjgWOXXtslJI2KQeduo/vQqMdWYFhHAusj6TQchoNfgbybw
-uCQvOsK22uNtp78m5JR+h4YA21GIfX/qthMrXV01dPrpTANmCOgYSGqkjIwPIVnU
-rpltGwbdJCo1hd1PgV9I9raEzfS5zHUkIxkdPOc5HIYta/MfYq94j+uRTAMQ4buE
-ORFAjEBTcjghs0wBhKbUjV2VsReDj94aCm7qsR5jTBsIOnAaB062t5a2TyLPdcVh
-z1cLis4xfDuJ4VhhPhlcx9yZAgmRyYc9HBZwbmcRZ6+fu2dMALrsjoRxDPOTU/4C
-xl1e1eEeKr91p/ugPMt4ci58eC/h16WdXOtqY4mO3xzev8CptCHlbR5h7UZ/pzmn
-k+eemTzvMzp8fcar2ERPhoICBLy/kfYqUyobyV3a0bgQrO4tsQYKWjIqsilLHjKZ
-POppmF+NLBUr/Zot7oM=
-=tKCG
------END PGP SIGNATURE-----
diff --git a/net-ftp/vsftpd/files/vsftpd.logrotate b/net-ftp/vsftpd/files/vsftpd.logrotate
index f443e2eb8b0a..b28a2a42628c 100644
--- a/net-ftp/vsftpd/files/vsftpd.logrotate
+++ b/net-ftp/vsftpd/files/vsftpd.logrotate
@@ -1,4 +1,4 @@
-/var/log/vsftpd.log {
+/var/log/vsftpd*.log {
     missingok
     notifempty
 }
-- 
cgit v1.2.3-65-gdbad