diff options
author | José María Alonso <nimiux@gentoo.org> | 2013-08-13 15:33:13 +0000 |
---|---|---|
committer | José María Alonso <nimiux@gentoo.org> | 2013-08-13 15:33:13 +0000 |
commit | 456dcd44bc4735c002960e49bcfb3685b815a15f (patch) | |
tree | 19bbba35dc8f4051754c456c80598a85a6bfe646 /app-admin/logrotate | |
parent | Stable for amd64 wrt bug #479732 (diff) | |
download | historical-456dcd44bc4735c002960e49bcfb3685b815a15f.tar.gz historical-456dcd44bc4735c002960e49bcfb3685b815a15f.tar.bz2 historical-456dcd44bc4735c002960e49bcfb3685b815a15f.zip |
Drop old
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536
Diffstat (limited to 'app-admin/logrotate')
-rw-r--r-- | app-admin/logrotate/ChangeLog | 10 | ||||
-rw-r--r-- | app-admin/logrotate/Manifest | 24 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.3-atomic-create.patch | 46 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.3-datehack.patch | 12 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.3-fbsd.patch | 61 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.3-fix-acl-tests.patch | 84 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.3-ignore-hidden.patch | 14 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.3-noasprintf.patch | 55 | ||||
-rw-r--r-- | app-admin/logrotate/logrotate-3.8.3.ebuild | 79 |
9 files changed, 17 insertions, 368 deletions
diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog index 473a227080ff..cb812ed8fc8b 100644 --- a/app-admin/logrotate/ChangeLog +++ b/app-admin/logrotate/ChangeLog @@ -1,6 +1,14 @@ # 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.154 2013/08/13 14:01:21 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.155 2013/08/13 15:33:05 nimiux Exp $ + + 13 Aug 2013; Chema Alonso <nimiux@gentoo.org> -logrotate-3.8.3.ebuild, + -files/logrotate-3.8.3-atomic-create.patch, + -files/logrotate-3.8.3-datehack.patch, -files/logrotate-3.8.3-fbsd.patch, + -files/logrotate-3.8.3-fix-acl-tests.patch, + -files/logrotate-3.8.3-ignore-hidden.patch, + -files/logrotate-3.8.3-noasprintf.patch: + Drop old *logrotate-3.8.6 (13 Aug 2013) diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index 73498042e137..0b24b4a17888 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -1,12 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX logrotate-3.8.3-atomic-create.patch 1394 SHA256 59ad4013740be9a4687c8fc5fce2b55631add7b67244e6585e684645866fece3 SHA512 c5793d7ee76b30ef9573f30a3b20b8bb822b4c638f49957ff3e65bb2d3e29b254984b781fa0cd29f01c73cba9745b626ebf0698c06e2b4c2b98aaa360fc9a9fc WHIRLPOOL 301b277d61bc38f056318a332c1a335c67e83bb42755a3ecf8d89c718a6a3714f474bd33b2ee683771a0e071f272e8e4e7ebd8fd5c180cd9fc0edacfcae66040 -AUX logrotate-3.8.3-datehack.patch 436 SHA256 11053a511a1e6841dfd70cedf1cb541961f65d638f139bb1a1c84ff261dba8a8 SHA512 c3608f089f3465d9a93954e1eb98f7798678e76c14389ec79b1b7f36033b692e8cd57266f05584916d5398fc7c36f9566b340a7e7c7fdeff1fc09b7dcefa0da3 WHIRLPOOL 0939a7c11423982503bccd69aa439ce2bcaa538b3b212bc9fd5581a67ba65ba5d8d4fa9817da590d7cd2af1253c12d8ddbf16ecf41794dc725500499344646e0 -AUX logrotate-3.8.3-fbsd.patch 1524 SHA256 b0857af2e8d35c9e388fd997fbaba0cc26607a22e9166d9b8f010827c1329a53 SHA512 34013cf9415e79a730a6a2ddb4e59e7d58f9ee95db687bbc747c1274f6b3926bf010bab56c3edabb67d5ea922cd32e2957e1ceeb1a5bb6d42f8d084321ec73a0 WHIRLPOOL 9ca8f8fe9f8fb69ba72290b7eac94ad51b53d2fc427689783f1dc26572636ebe2ae79d27ba51546e9c26b0451dc064b7f450847b492145a8a4c306e605d248fc -AUX logrotate-3.8.3-fix-acl-tests.patch 1759 SHA256 2e29e4bd978ec07ef173b9ca7655dcc58a162ec4c354fcf84570e80614d0fb2d SHA512 9140bb887118f98466c9dcd08c58ebb8a1891baff1563284d78789a7e01b8f747200344595f7d529591391d91f37ce26a62d4c1aa43b23dd4ac3f0ff2d3a6d7f WHIRLPOOL 0d5e11b34f0b24b4dffeee735b6494514bd584aa68e305226406c47c67b63ce96c8dd9b88f0f661d939fe472fcee9e513090b4fec0cb9b4951417f73562b4eb7 -AUX logrotate-3.8.3-ignore-hidden.patch 547 SHA256 be387f0971b1236b241f2f42114cde4fd5eb8582df9cce6a9acf2ed636222b19 SHA512 7faa49f831c93b149218bd5142f226fbb7627500ba20ea97054cae30f63f6f56dfb868959e01e8a1e1e814460065e3e9235a101ff25ebbdcd57fd54035f14266 WHIRLPOOL 5401107d61827a81dbd05a605e6208170dfbd755c8e08da4ebf63fffd2e8a4fd05cd889714257693ccdd0c30cdde9f1e5b6cac15e55c059db3bcbe71269eb242 -AUX logrotate-3.8.3-noasprintf.patch 1204 SHA256 dba104967ed370eca3b56cce6e4a20175422072b40700372eca1931e725014a7 SHA512 c3fa4a3b7ad9ff308996f85a92ca96c3ce0f357c45a2bda76d0e3ad6b0fde4cee07b2b7c31d4c06bc50d5b40866342e288f0ba4ed9934457c94714468423f6e9 WHIRLPOOL e578d011bfa5c09d4c9d7904febb0cc8b010981bf5f82e6da82d2ffa5147836cb1615e28a144d643f48f250600669fbd89d625ddf2f8ad88c14cd6f249787bc7 AUX logrotate-3.8.4-atomic-create.patch 1311 SHA256 39982ff6e7d17f70b2361366d773f0c7233c5ea373f7d4f73ffb8b5fac855143 SHA512 49f8b06807f612b48e92c70892545c9a97ffd0f1c7e2e2292c926789cc0582a6481779907f9d105a7d46fb3b7ae529a55d4c59c3e2380103c9ca80b5a7b82289 WHIRLPOOL 8c54c11c5c36cee80c89a480b1cd5067656a85663714f77c5aeb454a8c9defd4f64e853afb6f94603e17ce451d3239ae09b7fbae46562ded4febbfc54f1e299c AUX logrotate-3.8.4-datehack.patch 436 SHA256 4e06899d6c341bb4e7c01ebcca8faa99fa9f4d4a12324be0a9af42e57f105894 SHA512 63e69ba1708b2a5c3c56287503f19852f19f6db1d38597a7bab8f358f992455eade3edeedfce39593ef2e6d17340f5a9fc30a768a1e1d68a69c10607b21f2f54 WHIRLPOOL e2f052a2365a7cee8fabc53b4b358f7d518c2fea9b52f0c6031654a6841522714d360e8f965a167534a66c11ebc8026688723e2f2370bb93afaf8c6964c633cf AUX logrotate-3.8.4-fbsd.patch 1405 SHA256 410248cc639b6d669bcef610fbb78adcfbf8c0f0b472450457bdb044397d71aa SHA512 f10c59342b1c0e5a5f1c38ffc554c65128380fd377e8deb507f304f36d9d4a50c0db213d20e31621741cc6f82152f8a26a4097295b035ecc144c88aca7fdde4c WHIRLPOOL 17438ccf7a653f92ecede8ee8b491cf8378e16a39576b119d1e1ba1c9d0447316ddb5e933b28eef120e8a1f7d7f621b7f933768e1d2964b34b36c14895c1c4d5 @@ -24,24 +18,22 @@ AUX logrotate-3.8.6-ignore-hidden.patch 548 SHA256 ce9eeeda18210bf8e1f7132063c39 AUX logrotate-3.8.6-noasprintf.patch 1264 SHA256 41b1274c7286ddc9ce697e6c27ec7780667dedb7ceb953bfb689ba947e752e93 SHA512 4c71ff2e1e3ab472a3a438ecc798958b055a2ce9ab12b9b4dfdb97fec0fe9f989e35a19ee0836f916ff43b05cf619c0dadf8efe930b39000be79e68cad340707 WHIRLPOOL f32370758461907f67f9a8d28b8234f0e552eb76eff94fb120b70c9beb56c74b809db8cbe3b0ec91159326442573c7ece3810fc2143508a7b60c8fc896ca1994 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 DIST logrotate-3.8.5.tar.gz 57818 SHA256 6b695bffeb54ed6f6c9a560780231a55c3548a24b96cb06f33b84f8cea600079 SHA512 7548a8a1841eccb28272ca13d7305315c921563486d3a31bda6e53699d450fdaeb819e181c003200042de869f3526b5fdf162dd4a2fe435264027c197d3f5f1c WHIRLPOOL 4491ebde1710c9f37045c6eed7a3191d86e315fb9bc9c43da68c3b1b0049da54d3270f0e38de4b4c08165b383a6909bd93e1a9f199814f7a3154b94e6f466251 DIST logrotate-3.8.6.tar.gz 58502 SHA256 0e0ef0609afe9ef2a2ef6cae307b5ca618ddd349923ccce6e064513afd4e9d92 SHA512 ecd70cc1043e38bfdbfa74f6932e688f16d5e99aa13edf804d8d556eccc6c8e00377f818cb566ff1124dcae5f88c1aa624a86fc3339ac4b29562ade6541c8750 WHIRLPOOL 261c46fa2821f136518efdf42a77d9e3a145e62d1dd325d4cc269aa72f344c1534710aeca52f4c1564bb812afe4201f12c068a020382dee6c1a06f6d19cf35b3 -EBUILD logrotate-3.8.3.ebuild 1917 SHA256 653f2aa4b3e1d1c2b542a9964749ef0aea6d7142a81a3fd76eca31d9dd1679e1 SHA512 9994018821ee4d5bfe78907400651d402a1f1c42b875e6ac205161f66c4bd0ae9596676a1db2bd221505fd0521ad6f4565730fb327cce8f80f82c5b50b3e89e9 WHIRLPOOL 8a7e0433a56c863e7f49c49a6b15211c06472163cebbc8ce9297a4287128516deca58db9517851e0466f84144b4fc569fd8f428265d78726245ae19ff1ad66c9 EBUILD logrotate-3.8.4.ebuild 1796 SHA256 efe204cf89c9478bea61394e287a98cda458711eb49118c8b1225148c917c3ba SHA512 0422156db9f1d8c6b3524cc5f76d35d918c75ed81f3dedfe2ddeef84a9b153a160b5c402cd2c8be11313aca327c8b642678711ea0f9bb0096ee97286567ff6df WHIRLPOOL bcc2af97a46aef8ebdbccd9ca41935da129056bd3bf896a77cb7e2c25ac0613f944f808525c4f082a6e2e30f9038216a877877bc849fe806d7efac642526ef2f EBUILD logrotate-3.8.5.ebuild 1809 SHA256 2397a398f24b415d0fe4cfe84db98be1e108b57321a7f07f0d032f507f8832af SHA512 15438364cf18bf56a276286cfaf0e374c907290a7cb586626795c8a6bad8945f5b30442864216a37adbe3319011251465d8ca18ef776e51ad76cf1c8e0cb65f9 WHIRLPOOL 98140618b746b70c1df4b9627b9604761c9fd94e10a9dd6d9ccc4a840c846affa4ec17710a04b68be808096b822ba15d8c24a4e50646cedcbcde08f312d85215 EBUILD logrotate-3.8.6.ebuild 1809 SHA256 b8e152385f6bc9ff2e7702c2297b0585bd3a7c40617af4f4c929d2874ef45d52 SHA512 0a86070fa186d948cd0ce647a60df0da70843efbe63ef85bc7f37758f8d8351a6f09c325620e23b809efa37699f507d0415e780ae0993a04730b9b39efdc023a WHIRLPOOL 8d0dac4a35238b641baaf2f65b0e67575fc2714dc7d55199e4690fd9511888541ae4bc6d87c327d03b9f37860efc85b6da2402e5ea3da7209ed29c794143c602 -MISC ChangeLog 22847 SHA256 0ddc0e987f3ce79564e41f9b27c29064a050aeba959d47ceafe993e7dcac27ed SHA512 e71b3a67a91113dfd680e5f897e03b13ada9d3f9f62ebecebd57a4c8f25e0eabe26f9afc8d9a4eb660f75424df07933e7488b6512273bbe05108c8866817c390 WHIRLPOOL ade52bfe2e86ddb3ee48561d8c3843293d32a99b2a5e4ffa18403a6bc5bd6ee337ade093e9f691648d1ac83b604dd913c4f65b667581dc639785a0940b958a39 +MISC ChangeLog 23189 SHA256 ee104c4b89b8d48f5e9016dbc935f38296f1c1a2a0748246f46fa9fea99767e7 SHA512 04e9bddf3b276c101cee69f42d5e97048d12dd48f3b37a94ac67e3c893f2b5b28c0577eaa107126a69f2250286fe019c9fa82f1e2ae3cec091d82813b3c8bbf2 WHIRLPOOL fc2222d7e6b8962f939c3ed7896789369a80f744a36274c5fccd2f3778b26093c2a57b571b0cafefa3dc50a2c5cd592b190162d2e7c1c49109cc22ce33028749 MISC metadata.xml 975 SHA256 a329700a1e76593184907198fff2f678e429294226461ac1a913fe58cbb28c8d SHA512 c7736be8ad13e6e31c6561ff0fdbc2e3df7f59069eafdc5b655f780d96d277795201b9db747bc3da24c932aaaad16d40aebf18b8fc679f7ae8fa528088828d4f WHIRLPOOL 931ab959ebfb43aaac9c8926f26e17750c38f155ed15905117e2c8ca3374db427db763c6b724db9eb7f05fcf600dac54ed8008c222410073d82e17e38b0a45be -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJSCjxnAAoJEA2sAkrWKOU2x2UH/A5nsowsrMyJO9UV5JlzdeUF -43nW6zPZDPj/B4+9ucC2EathjaMr1cf0TcAoBZhZ7ir/UzFxKTiFQRt9A+/Dz2j7 -gtY1hf/B4zm1JhRQgG0NsV/tC54DF/VjsHXQwXTEqYyEgVQO9sgqltkZhv1cCxGS -9kCMaytrRNKyqgUn5V1AqnhP5hxtSijKoCzwVwGdyiy4yaX8o/gVooui30AYxlgH -eCAM0AGz7NpnUfu7d3B0pkxK0Y8l9GUCs+jzr7F7j6PNDecfMuE5al0SAhExc7Nq -Q/l0qKXZiwgKYZw0janTPXS+QaizB10c6Nl1CDrBnD66Bikn7V3K10cFvgsJDgE= -=n0cE +iQEcBAEBCAAGBQJSClHhAAoJEA2sAkrWKOU2ymEH/iJDReeVhmzImWGZVOiHhf5g +4vs/7v1QygDN8ixfYvi29p+tDuIUAFQ9fnXiQ4u/H+g55jJA3t5SnQFW0OMsAyS1 +kXBt9m1cXqPmvtJkBTrbrQau97kWKtquNAkCl6aPMvky9Uy5Fmp+PZsoEBgSKkgP +muc6qyCS+u7VBsZsQtWZ3cftGzE/KMdAqdVJDB5vdFZfzbanCNVciSBNp/IRZ/a/ +HCes4B5uvpzpXzh69nApbgQQV15VWpcqOY1onD/hTLUnMmfYcH8w8tC0n/KN1ohT +0g4B3lwtZqxFKndYSb2pE5yCdnaPi7mUyRLlCGVRUfq6YRqOubEFyxR8vHoJEMk= +=/sgS -----END PGP SIGNATURE----- diff --git a/app-admin/logrotate/files/logrotate-3.8.3-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.8.3-atomic-create.patch deleted file mode 100644 index 4603728a9fbc..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.3-atomic-create.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nur a/logrotate.c b/logrotate.c ---- a/logrotate.c 2012-10-04 09:59:14.000000000 +0200 -+++ b/logrotate.c 2012-11-11 12:04:19.530008151 +0100 -@@ -296,16 +296,22 @@ - int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode) - { - int fd; -- struct stat sb_create; -- -- fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW), -- (S_IRUSR | S_IWUSR) & sb->st_mode); -+ struct stat sb_create; -+ char template[PATH_MAX + 1]; -+ char *fname; -+ mode_t umask_value; -+ snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName)); -+ umask_value = umask(0000); -+ fname = mktemp(template); -+ fd = open(fname, (flags | O_EXCL | O_NOFOLLOW), (S_IRUSR | S_IWUSR) & sb->st_mode); -+ umask(umask_value); - - if (fd < 0) { -- message(MESS_ERROR, "error creating output file %s: %s\n", -- fileName, strerror(errno)); -+ message(MESS_ERROR, "error creating unique temp file: %s\n", -+ strerror(errno)); - return -1; - } -+ - if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) { - message(MESS_ERROR, "error setting mode of %s: %s\n", - fileName, strerror(errno)); -@@ -347,6 +353,13 @@ - } - #endif - -+ if (rename(template, fileName)) { -+ message(MESS_ERROR, "error renaming temp file to %s: %s\n", -+ fileName, strerror(errno)); -+ close(fd); -+ return -1; -+ } -+ - return fd; - } - diff --git a/app-admin/logrotate/files/logrotate-3.8.3-datehack.patch b/app-admin/logrotate/files/logrotate-3.8.3-datehack.patch deleted file mode 100644 index 9d6e5f015d84..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.3-datehack.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur a/logrotate.c b/logrotate.c ---- a/logrotate.c 2012-10-04 09:59:14.000000000 +0200 -+++ b/logrotate.c 2012-11-09 20:50:01.659874980 +0100 -@@ -1832,7 +1832,7 @@ - } - - /* Hack to hide earlier bug */ -- if ((year != 1900) && (year < 1996 || year > 2100)) { -+ if ((year != 1900) && (year < 1970 || year > 2100)) { - message(MESS_ERROR, - "bad year %d for file %s in state file %s\n", year, - argv[0], stateFilename); diff --git a/app-admin/logrotate/files/logrotate-3.8.3-fbsd.patch b/app-admin/logrotate/files/logrotate-3.8.3-fbsd.patch deleted file mode 100644 index ab5e7c478456..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.3-fbsd.patch +++ /dev/null @@ -1,61 +0,0 @@ -Fix compilation on Gentoo/FreeBSD, no alloca.h here and PATH_MAX -is defined elsewhere. - -See bug 254795 - -diff -Nur a/config.c b/config.c ---- a/config.c 2012-10-04 09:59:14.000000000 +0200 -+++ b/config.c 2012-11-09 21:23:50.439863583 +0100 -@@ -1,6 +1,6 @@ - #include <sys/queue.h> - /* Alloca is defined in stdlib.h in NetBSD */ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) - #include <alloca.h> - #endif - #include <limits.h> -@@ -24,6 +24,9 @@ - #include <fnmatch.h> - #include <sys/mman.h> - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #include "basenames.h" - #include "log.h" - #include "logrotate.h" -diff -Nur a/logrotate.c b/logrotate.c ---- a/logrotate.c 2012-10-04 09:59:14.000000000 +0200 -+++ b/logrotate.c 2012-11-09 21:24:37.349863321 +0100 -@@ -1,6 +1,6 @@ - #include <sys/queue.h> - /* alloca() is defined in stdlib.h in NetBSD */ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) - #include <alloca.h> - #endif - #include <limits.h> -@@ -41,6 +41,9 @@ - - static acl_type prev_acl = NULL; - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #include "basenames.h" - #include "log.h" - #include "logrotate.h" -diff -Nur a/Makefile b/Makefile ---- a/Makefile 2012-10-04 09:59:14.000000000 +0200 -+++ b/Makefile 2012-11-09 21:25:24.569863057 +0100 -@@ -17,8 +17,10 @@ - - ifeq ($(WITH_ACL),yes) - CFLAGS += -DWITH_ACL -+ifneq ($(OS_NAME),FreeBSD) - LOADLIBES += -lacl - endif -+endif - - # HP-UX using GCC - ifeq ($(OS_NAME),HP-UX) diff --git a/app-admin/logrotate/files/logrotate-3.8.3-fix-acl-tests.patch b/app-admin/logrotate/files/logrotate-3.8.3-fix-acl-tests.patch deleted file mode 100644 index 1dcc18bc6505..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.3-fix-acl-tests.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -Nur a/Makefile b/Makefile ---- a/Makefile 2012-10-04 09:59:14.000000000 +0200 -+++ b/Makefile 2012-12-19 23:31:28.269943187 +0100 -@@ -116,7 +116,7 @@ - - .PHONY : test - test: $(TARGET) -- (cd test; ./test) -+ (cd test; ./test $(WITH_ACL)) - - install: - [ -d $(PREFIX)$(BINDIR) ] || mkdir -p $(PREFIX)$(BINDIR) -diff -Nur a/test/test b/test/test ---- a/test/test 2012-10-04 09:59:14.000000000 +0200 -+++ b/test/test 2012-12-19 23:46:19.449938180 +0100 -@@ -4,6 +4,14 @@ - M="-m ./mailer" - S=-"s state" - RLR="$LOGROTATE $M $S" -+TEST_ACL="$1" -+ -+# Check if setfacl command works -+ACL_TEST_FILE="test-`date +%Y-%m-%d-%H-%M-%S`" -+touch ${ACL_TEST_FILE} -+setfacl -m u:nobody:rwx ${ACL_TEST_FILE} > /dev/null 2>&1 -+ACL_OK="$?" -+rm ${ACL_TEST_FILE} - - cleanup() { - rm -f test*.log* anothertest*.log* state test-config. scriptout mail-out compress-args -@@ -686,6 +694,8 @@ - test.log.1 0 zero - EOF - -+if [[ "${TEST_ACL}" = "acl" && ${ACL_OK} -eq 0 ]] ; then -+ - cleanup 32 - - # ------------------------------- Test 32 ------------------------------------ -@@ -713,6 +723,13 @@ - test.log.1 0 zero - EOF - -+else -+ echo "Skipping test 32" -+ -+fi -+ -+if [[ "${TEST_ACL}" = "acl" && ${ACL_OK} -eq 0 ]] ; then -+ - cleanup 33 - - # ------------------------------- Test 33 ------------------------------------ -@@ -740,6 +757,11 @@ - test.log.1 0 zero - EOF - -+else -+ echo "Skipping test 33" -+ -+fi -+ - cleanup 34 - - # ------------------------------- Test 34 ------------------------------------ -@@ -759,6 +781,8 @@ - test.log 0 zero - EOF - -+if [[ "${TEST_ACL}" = "acl" && ${ACL_OK} -eq 0 ]] ; then -+ - cleanup 35 - - # ------------------------------- Test 35 ------------------------------------ -@@ -786,4 +810,9 @@ - test.log.1 0 zero - EOF - -+else -+ echo "Skipping test 35" -+ -+fi -+ - cleanup diff --git a/app-admin/logrotate/files/logrotate-3.8.3-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.8.3-ignore-hidden.patch deleted file mode 100644 index 13bf52873c91..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.3-ignore-hidden.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur a/config.c b/config.c ---- a/config.c 2012-10-04 09:59:14.000000000 +0200 -+++ b/config.c 2012-11-09 20:57:07.139872584 +0100 -@@ -255,7 +255,9 @@ - char *pattern; - - /* Check if fname is '.' or '..'; if so, return false */ -- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2]))) -+ /* Don't include 'hidden' files either; this breaks Gentoo -+ portage config file management http://bugs.gentoo.org/87683 */ -+ if (fname[0] == '.') - return 0; - - /* Check if fname is ending in a taboo-extension; if so, return false */ diff --git a/app-admin/logrotate/files/logrotate-3.8.3-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.8.3-noasprintf.patch deleted file mode 100644 index f810278a4892..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.3-noasprintf.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Nur a/config.c b/config.c ---- a/config.c 2012-10-04 09:59:14.000000000 +0200 -+++ b/config.c 2012-11-09 21:08:09.099868866 +0100 -@@ -45,39 +45,6 @@ - #include "asprintf.c" - #endif - --#if !defined(asprintf) --#include <stdarg.h> -- --int asprintf(char **string_ptr, const char *format, ...) --{ -- va_list arg; -- char *str; -- int size; -- int rv; -- -- va_start(arg, format); -- size = vsnprintf(NULL, 0, format, arg); -- size++; -- va_start(arg, format); -- str = malloc(size); -- if (str == NULL) { -- va_end(arg); -- /* -- * Strictly speaking, GNU asprintf doesn't do this, -- * but the caller isn't checking the return value. -- */ -- fprintf(stderr, "failed to allocate memory\\n"); -- exit(1); -- } -- rv = vsnprintf(str, size, format, arg); -- va_end(arg); -- -- *string_ptr = str; -- return (rv); --} -- --#endif -- - #if !defined(strndup) - char *strndup(const char *s, size_t n) - { -diff -Nur a/logrotate.h b/logrotate.h ---- a/logrotate.h 2012-10-04 09:59:14.000000000 +0200 -+++ b/logrotate.h 2012-11-09 21:08:29.829868750 +0100 -@@ -67,8 +67,5 @@ - extern int debug; - - int readAllConfigPaths(const char **paths); --#if !defined(asprintf) --int asprintf(char **string_ptr, const char *format, ...); --#endif - - #endif diff --git a/app-admin/logrotate/logrotate-3.8.3.ebuild b/app-admin/logrotate/logrotate-3.8.3.ebuild deleted file mode 100644 index 4ffd2f5fddb3..000000000000 --- a/app-admin/logrotate/logrotate-3.8.3.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.3.ebuild,v 1.12 2013/06/18 17:25:26 nimiux Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="Rotates, compresses, and mails system logs" -HOMEPAGE="https://fedorahosted.org/logrotate/" -SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="acl selinux" - -RDEPEND=" - >=dev-libs/popt-1.5 - selinux? ( - sys-libs/libselinux - sec-policy/selinux-logrotate - ) - acl? ( virtual/acl )" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-datehack.patch \ - "${FILESDIR}"/${P}-ignore-hidden.patch \ - "${FILESDIR}"/${P}-fbsd.patch \ - "${FILESDIR}"/${P}-noasprintf.patch \ - "${FILESDIR}"/${P}-atomic-create.patch \ - "${FILESDIR}"/${P}-fix-acl-tests.patch -} - -src_configure() { - return -} - -src_compile() { - local myconf - myconf="CC=$(tc-getCC)" - use selinux && myconf="${myconf} WITH_SELINUX=yes" - use acl && myconf="${myconf} WITH_ACL=yes" - emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}" -} - -src_test() { - WITH_ACL="$(usev acl)" default_src_test -} - -src_install() { - insinto /usr - dosbin logrotate - doman logrotate.8 - dodoc CHANGES examples/logrotate* - - exeinto /etc/cron.daily - doexe "${FILESDIR}"/logrotate.cron - - insinto /etc - doins "${FILESDIR}"/logrotate.conf - - keepdir /etc/logrotate.d -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "If you wish to have logrotate e-mail you updates, please" - elog "emerge virtual/mailx and configure logrotate in" - elog "/etc/logrotate.conf appropriately" - elog - elog "Additionally, /etc/logrotate.conf may need to be modified" - elog "for your particular needs. See man logrotate for details." - fi -} |