Load all common settings before including specific files. Bug 469908 by Hank Leininger

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536

3 files changed, 18 insertions, 14 deletions

diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog
index 5b6af3ee07a8..4e7162924c28 100644
--- a/app-admin/logrotate/ChangeLog
+++ b/app-admin/logrotate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/logrotate
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.140 2013/05/10 19:52:17 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.141 2013/05/18 09:41:04 nimiux Exp $
+
+  18 May 2013; Chema Alonso <nimiux@gentoo.org> files/logrotate.conf:
+  Load all common settings before including specific files. Bug 469908 by Hank
+  Leininger
 
   10 May 2013; Chema Alonso <nimiux@gentoo.org>
   -files/logrotate-3.7.7-datehack.patch,
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 22e01ad75cbd..68462fcd34d3 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -12,22 +12,22 @@ AUX logrotate-3.8.4-datehack.patch 436 SHA256 4e06899d6c341bb4e7c01ebcca8faa99fa
 AUX logrotate-3.8.4-fbsd.patch 1405 SHA256 410248cc639b6d669bcef610fbb78adcfbf8c0f0b472450457bdb044397d71aa SHA512 f10c59342b1c0e5a5f1c38ffc554c65128380fd377e8deb507f304f36d9d4a50c0db213d20e31621741cc6f82152f8a26a4097295b035ecc144c88aca7fdde4c WHIRLPOOL 17438ccf7a653f92ecede8ee8b491cf8378e16a39576b119d1e1ba1c9d0447316ddb5e933b28eef120e8a1f7d7f621b7f933768e1d2964b34b36c14895c1c4d5
 AUX logrotate-3.8.4-ignore-hidden.patch 547 SHA256 9acc7d88058d93a3f9c718292ff313d6b12000e78c82cd1855f22adaf1f5af6d SHA512 a6acba8d73b60f66ce5e6e053b07de4fd6225edf2216069592b9c95426377c5cd143685140c76349924699427db56cf83e8c7828af6748be9ce2b3445dbf20f8 WHIRLPOOL 76a7378b53826603685ef38820f7393dfa44792374a89c005ae4af3913e6722a7f5ed5251b62855f00e64225cdd56388df8ec17fd212d079d8860635186de9ec
 AUX logrotate-3.8.4-noasprintf.patch 1204 SHA256 fc9f549b5069bec5b59af125bbfd1852c71ee0e81dba489d24cc3f9219b948b1 SHA512 6485643cfb0852dc81d9496bea89b0479fc65135c1ef99a680b57186d7188e7365ce9b64f0dd45f3405591ce3f1a1dd4bf07aafcb8a4889a34ac7a0f49ae6648 WHIRLPOOL 42fa66747304f6d6586b9fbd44136756aecfcab3edc98df2327a03076cc52bcec7065cde09496f9f28cbf6692b4d555c614be4df0385a3598b9951e8cc27c360
-AUX logrotate.conf 872 SHA256 4ea141e6d9003c267295b75652732a80af300df170424a5cc8587126ef48696f SHA512 e275c0d4a1e078d049f8269745bc9ac8296378e44d2424f8b5107f3cfdb20ad94d17874cd80057fc8f71ae0ed44c993dd74cd9cb2d83644fd7ce2809eae55eea WHIRLPOOL a4cb1b3feaf51a63643c40a54ce8ace0cead1b7df22d7cf5f9b102029edcd4491353f305e075997156b0f048e4da5c009574af992b9198c6659949d91e6e29cf
+AUX logrotate.conf 872 SHA256 887d558c5c1b64adf88a28032c25e1c8b57d0490c818c11273e546492a11e0b8 SHA512 3c8ca642f687a3b549356c5419c38042d912e15e506798285dcf134d9ffbf01370ae9d2bd5c49161a0a2148148c18ae4a285de719c10a074dd11fdbb2aaee142 WHIRLPOOL ae9e496c236f339e09c0f93e52357b192e2dd81167f6e4ba5c877a42eee1d3fe727cf670cd7f7cc6e4db212b04630dd1e5b5417ce66aa029130e66b4d3529bcf
 AUX logrotate.cron 52 SHA256 5eeae7dfbd54f74108d49cda8285211898d29ab7d547dee267803299e7339560 SHA512 5d5797b0f4490ff39b48319165db2cb4e821d9930a45d0550de8dc541ce899eb1e7cab7b9dc3d7a350835ddb8f6702246f1b50e0930037f3c52c82ee129f1acf WHIRLPOOL a9537ebcfd51d911f4f8ffbc430618d6bf510b6f442414f61e6f4c203f9c268d939aaec9b151c29bbd6a292348f386cdd0a1685d324749b110ef14d59439d647
 DIST logrotate-3.8.3.tar.gz 52210 SHA256 0776bf491171edbcc3ba577751fc912e721e99b834c14251df8109fd3bfa1977 SHA512 34bd24a4740191f8a2e3941fbebcade308becc60cb7aca6ccde93662afe8341dbf7d9177dfe1bd4c124b3aa2829d0ad999fa4bba9101e479f077c55b26fe7119 WHIRLPOOL a9bdec35bf6bc6bedf6ecc0245e6b1780fb2a2910b67ba0704d41f4939c12e2aac948e9f4fb43c5ccbd7d5a54c30f12229fff35b4ca884fc0d3f725b62dbf208
 DIST logrotate-3.8.4.tar.gz 55610 SHA256 d363e9212527ada6e566ad04e18d21eb7d70a3bfd0710671c7b75a2c0dd96e29 SHA512 c3a509d8d9140b4a584c9ca731df10d8df17abfd38fc1263d19b2d25560cd047cf2036c7a5ffa738036599f55616b3c73456af63c40ec087672a263e8895aee0 WHIRLPOOL af914183c0f1358f3e9ce06509b922af43bd5a0e9a942a8b3d546b0966540fb27920cf8d61141d50d99f7157ee35e8f90b42fb4765bc5c4bc3400a9c17b1c156
 EBUILD logrotate-3.8.3.ebuild 1906 SHA256 59eea1e2bebe91e077ece6598219d7faca98236d3cb61c07ade8313e3b2e1514 SHA512 306014eacdd00e26d9b2fee2e02dbf1c330aebaa9d1f43def8e636f116a7f69e396261c217c9b8561203c3651b679a2f13477283cde3ce252970ff287d27db8e WHIRLPOOL 85e90b52b92a097a211c0d09e43e83fb720a7b35043819d69039383af1efab33b50b18bb88f47f6d242618fc84023fd60c4914b2ffbe65e6be8adbeda082690d
 EBUILD logrotate-3.8.4.ebuild 1797 SHA256 3b43cc49c01a329e8ccca6e8a4389d4d1397b24ca024554895b625b21c595bf5 SHA512 a0e32d91b634d236815cae834d8f479b9b4b405c65b498d00a303999aa1ca1bdc7cb6f226332741d3d4bf1993e285f1d0be94ccad6695311f536ee186786093f WHIRLPOOL 5ba008baffe6643fcbb78b21cb18af4e1fe6333a866a777a0ddd1f32ff2a2717eabc0550939e29be30d2d72282b00f84b57419226a146221130a87679cb78a5e
-MISC ChangeLog 20762 SHA256 b14b0eea59af7524fcec3f8504fea1e39657e095711ef07a3e3a080e014ec271 SHA512 47145fde987f10a68182f2768039c93417f473daa65b5bba71efac29f2a11ea4bcfcbcfa4eee09fcc5e3e69bbc61094a84e232b4f6aa57d9bef7c079907ed3d6 WHIRLPOOL 89c5ce0d603053190918e5c84c21f563ada227de702ce055e26eb57a2ca0a44a5808ae0f806fc4437f6a07e04567de6d6b435384fc4c4605b8482fc575d04930
+MISC ChangeLog 20924 SHA256 8bde951dcf02c1526e0fbfd41d00a9f72073be2a168d98f95df53c48d9d4ce04 SHA512 94f69f3aa18260d22fd0e24d040fb32ff922ce3cbf5c13bd949f7efd9326e0da2d7fb465e7606d15f226f4a9d5a495ef3a4b5b8534b2817d5999b21fd0665656 WHIRLPOOL c72bb1fd8a5b5539d6df2a986c60f16a4bc35820f99067a5c40e04423f5aae875ca9390736031b3e946160161fead3bf34c5022b1445515ed5c4817af964c329
 MISC metadata.xml 975 SHA256 a329700a1e76593184907198fff2f678e429294226461ac1a913fe58cbb28c8d SHA512 c7736be8ad13e6e31c6561ff0fdbc2e3df7f59069eafdc5b655f780d96d277795201b9db747bc3da24c932aaaad16d40aebf18b8fc679f7ae8fa528088828d4f WHIRLPOOL 931ab959ebfb43aaac9c8926f26e17750c38f155ed15905117e2c8ca3374db427db763c6b724db9eb7f05fcf600dac54ed8008c222410073d82e17e38b0a45be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRjU/3AAoJEA2sAkrWKOU2QowH/i/FVv+NaeupN7747x7aCEmq
-P+O1dcoFskMim9xOkb7Rszy0BUvKr480is1oHTdpNBqdgNEZZ5g/IdyksEaZwFPB
-uaMPqxrJam4qDnxoxt39HBkESBstLdmNI+I8eBS+sXv78VMXRZNrSBZJ5b+ZQGJ+
-KI2aH5D79g2nNL1fM/bnXQDAwMPM+/mpBWndhxHRNcIjZd6czp1geFiEw6amFOfS
-euUHBLvT4h1X96T0yMBfJbJp5i4i3mstdx5SWkAua4mRUWB9wYomg6jM6kUoowcL
-zdma7qwmV4Z7SvggvD3Su5QLacWOG55Q5tNkWTlYC5a5YzDgkwzuY2KZHVCdBps=
-=khXe
+iQEcBAEBCAAGBQJRl0y5AAoJEA2sAkrWKOU2DnEIAKksOgMSpyefOpqNHn0kc21H
+7SZm4efU/5dDQqGVxXCzrPU8rf0nem7UB0pm5aQnWP8Xl9I/eAY84nFmu3ZcjuVv
+Pr1PA6jharnFouwk7pUZdDJYhIRls3tLtOxC6FAb2W3zKlN68vE69aqEiHKDBZKG
+qS2RZsHEMClGf0T8OwgNEhiyT46YA1mCl0MbYkdt5Of+1Jdku/cfV3f6hX6R+Dhh
+UYxecznsdPK74yhDYJlfEfNSn7p08sccCfu6ZbEIHClq6hPEPBA2nO4Wh+DTPKrP
+tUnSk+jicLQQzKYiyODXAM1NBOvOWM9239GR2gClk3KXp0U8UJ9Tumz/L0Z4lBc=
+=dT9t
 -----END PGP SIGNATURE-----
diff --git a/app-admin/logrotate/files/logrotate.conf b/app-admin/logrotate/files/logrotate.conf
index 690a5f7fe078..9059ce9b2071 100644
--- a/app-admin/logrotate/files/logrotate.conf
+++ b/app-admin/logrotate/files/logrotate.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.4 2013/05/10 19:45:39 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate.conf,v 1.5 2013/05/18 09:41:04 nimiux Exp $
 #
 # Logrotate default configuration file for Gentoo Linux
 #
@@ -20,13 +20,13 @@ dateext
 # uncomment this if you want your log files compressed
 compress
 
-# packages can drop log rotation information into this directory
-include /etc/logrotate.d
-
 notifempty
 nomail
 noolddir
 
+# packages can drop log rotation information into this directory
+include /etc/logrotate.d
+
 # no packages own wtmp and btmp -- we'll rotate them here
 /var/log/wtmp {
     monthly