diff options
author | José María Alonso <nimiux@gentoo.org> | 2013-05-10 19:52:24 +0000 |
---|---|---|
committer | José María Alonso <nimiux@gentoo.org> | 2013-05-10 19:52:24 +0000 |
commit | b00470a23d00cd7966c942270f6c53644b788315 (patch) | |
tree | cf95494f1de053ce4190260692aead7f83e252b9 /app-admin/logrotate | |
parent | Add (diff) | |
download | historical-b00470a23d00cd7966c942270f6c53644b788315.tar.gz historical-b00470a23d00cd7966c942270f6c53644b788315.tar.bz2 historical-b00470a23d00cd7966c942270f6c53644b788315.zip |
Clean old
Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536
Diffstat (limited to 'app-admin/logrotate')
-rw-r--r-- | app-admin/logrotate/ChangeLog | 12 | ||||
-rw-r--r-- | app-admin/logrotate/Manifest | 27 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.7.7-datehack.patch | 12 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.0-atomic-create.patch | 78 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.0-fbsd.patch | 29 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.0-ignore-hidden.patch | 14 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.1-noasprintf.patch | 55 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.2-atomic-create.patch | 40 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.2-fbsd.patch | 59 | ||||
-rw-r--r-- | app-admin/logrotate/logrotate-3.8.1.ebuild | 74 | ||||
-rw-r--r-- | app-admin/logrotate/logrotate-3.8.2.ebuild | 72 |
11 files changed, 19 insertions, 453 deletions
diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog index 6ab2ee2137dd..5b6af3ee07a8 100644 --- a/app-admin/logrotate/ChangeLog +++ b/app-admin/logrotate/ChangeLog @@ -1,6 +1,16 @@ # 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.139 2013/05/10 19:45:40 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.140 2013/05/10 19:52:17 nimiux Exp $ + + 10 May 2013; Chema Alonso <nimiux@gentoo.org> + -files/logrotate-3.7.7-datehack.patch, + -files/logrotate-3.8.0-atomic-create.patch, + -files/logrotate-3.8.0-fbsd.patch, + -files/logrotate-3.8.0-ignore-hidden.patch, -logrotate-3.8.1.ebuild, + -files/logrotate-3.8.1-noasprintf.patch, -logrotate-3.8.2.ebuild, + -files/logrotate-3.8.2-atomic-create.patch, + -files/logrotate-3.8.2-fbsd.patch: + Clean old *logrotate-3.8.4 (10 May 2013) diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index 16090dda7491..22e01ad75cbd 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -1,13 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX logrotate-3.7.7-datehack.patch 589 SHA256 f68e360afe0a9ab28fa42775bdf0b7ddf4ff925e19a3786bcd40e0067ee4856d SHA512 de1fe9066744c4a9c63d1f4569541c9bf94be904e314c4cd25bb03633ee35b986d430fecccbc880bf5aa06c9011871719c53b6f40b7a6dcfcc77a4c7a4523eb0 WHIRLPOOL c411c64d417216600ae4bba38acd77dbcda52363cf1f645396b346470db0bfcca32d0c7103e453cfa18a998df3530c1a2f004988e5e40b69fc29ffdbdead3791 -AUX logrotate-3.8.0-atomic-create.patch 2260 SHA256 eb53819354e9679189769727c76a69ce3daa9483a759a38f43e119781238fbb7 SHA512 c50c6b12b711d003c5566a8b58ec950caeb5d7c3ac7cb488248148da3875fe616399b99762421b3712cc3f6706fd66e12f8dded91b198ac77d1760bcc80d60b8 WHIRLPOOL 43ddcb8b9f9b6b92adc585682cb38da5a2725f1beabd2e15673f97e11dae7080aba7a7955d65cac1a1b51e3756371cf6dce62986f3b7b547df3b35d5617edb3e -AUX logrotate-3.8.0-fbsd.patch 645 SHA256 daa17ac29dd3ce2d4d714599816a8cb8d5716c3634833232ebeae69e81dd0b2b SHA512 994eea4fa2c94888d6cb6e9515f0eb668928291d5b6c8c18479de513d323fb3d7bf5f626e0a4d028614fc7f6551974351a63815e9ea78ab827f18555f607bd58 WHIRLPOOL e28e8abdc29661a1ede9753f0cc9de9d362fa1e460e218a8580031adad17005e1f91d7641e7e1eed93bb6360ed97cea8d7b11c09b79c72aa19f356a2ae87d416 -AUX logrotate-3.8.0-ignore-hidden.patch 701 SHA256 2ac9d21993a2bb6f269e29472ac7427ad07636b3567540c149c835fdbb84e1b5 SHA512 70fac218e948f619be0fb62eda4ae792d182579ffc664df72cb29d6dd9ad6f0805c1d91ccbcc4e28f9a8bb8e6725b9812e9a3e32eaae931ca833e27bf9d06f4c WHIRLPOOL c5c2dd0289c9e80ca14cfb524ae3ad9e92141a99c7917dc5a9bd444ba2f8e2337297167f6303352e2a3357bed148cd9708de0c68337515f03b6c00ae0aedef65 -AUX logrotate-3.8.1-noasprintf.patch 1452 SHA256 03e67f55ef2997f10b5b0c5a527c3c966a32e02993e1a8690f70d61c5cb716c3 SHA512 3187973dc2a465e7f49c900ceb7ffd7f81d03aa7e7dbc3e025660c3fa496c31cf912e99447aecd02907a49e3b493039e6da0a72c7b82209af604bb7d29743059 WHIRLPOOL 80f6c889ddbb93173b5a5a00f9b3d68890d10fb34f2c0268f7970a9710ef88bef7205d9efadaf1f529c5c7d70cb58aabc1fae7ec28dab9c0d46033d3d194bf92 -AUX logrotate-3.8.2-atomic-create.patch 1201 SHA256 2acc84de40c1e8525e3d1fb7e6e772073a87799a8bcf32985c36c076c9187bdd SHA512 9677792bb1600f8e84cc55fd869ab0a7df9f0c778e8f1c5766e10916a4c9e06451c3472c26ea69dce2ace6123853c00f03e1cd9aad7e4401c9a7268130f50720 WHIRLPOOL 9bf34e662d6fc383ff8f5c8a96761e5d30e03823b5ddab1f7c138f5e6af4c48cd60a70f6c8588ed2c303708cda57fcea9c0c6c673ad2364003b4235b14089d3f -AUX logrotate-3.8.2-fbsd.patch 1302 SHA256 4ddfa4214d9c0b8a675ad1da28005248b6c2a42162ca18a1c4b5cf794940ab8e SHA512 ec8541ba426dbb7ac40f2b363c093c941da7bde1eb0e804978e77e58b20230ad4d0255caa6b898e211c868a70041c9a5bf21748e86cc7030ee4510be580b2b4b WHIRLPOOL 3e6b6d4b9e9fdaf8bb7dad7d387fb12d53b0c703cba43503c7c1debf8740753d66ed5880e3ea805fb112786fefc5714c6295c50afa941348be5cf8b4526bc191 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 @@ -21,24 +14,20 @@ AUX logrotate-3.8.4-ignore-hidden.patch 547 SHA256 9acc7d88058d93a3f9c718292ff31 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.cron 52 SHA256 5eeae7dfbd54f74108d49cda8285211898d29ab7d547dee267803299e7339560 SHA512 5d5797b0f4490ff39b48319165db2cb4e821d9930a45d0550de8dc541ce899eb1e7cab7b9dc3d7a350835ddb8f6702246f1b50e0930037f3c52c82ee129f1acf WHIRLPOOL a9537ebcfd51d911f4f8ffbc430618d6bf510b6f442414f61e6f4c203f9c268d939aaec9b151c29bbd6a292348f386cdd0a1685d324749b110ef14d59439d647 -DIST logrotate-3.8.1.tar.gz 48827 SHA256 c12471e70ae8bc923bd5c4f25e8fd6483b68c6301f3cd79f7cfe37bc5b370169 SHA512 d1467f0c894f44edf46a3049d61ef09e4ae4cc361f3a88e38b2126ebe0650604c6a2b4e1c751ca35538ddb13b25dcee52fa4c21ccefbd040ae1e50c4bb126b09 WHIRLPOOL decd2d6be262c0ab1efc1d0b1b2639f50d16238ab8e781e31008b67e9917a670cd7ff7dfe98ec879b7d1fbb7f12d9f018a1173f44e574737931ab5f81cc221c0 -DIST logrotate-3.8.2.tar.gz 51213 SHA256 1cb9496e48fc4b8fe63d85d27be8567e9131541fe11e4d4d5993730afc578cab SHA512 ccf21a06a8af5535f0e6de05dc5b02c3e7efdfe6117cb0fc3f4d8d41e8c579bddad3aeba7dfa63cea0bcf78f5cfbe010ff9c7b580ea868229bf3069f29906162 WHIRLPOOL bcc9a27ca1afa29e56ea366cc6ed034ecbc93995d3bda63e24e0b593cbe181091b4f525726130becdbd9bda8d136f36da40105316c80d4576613948b5f3a7fe7 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.1.ebuild 1832 SHA256 f2f6f3f864751dc71f941431a695a6ce9199984f50df359b6d3d4b598afb0002 SHA512 6e894773740d5c05813279ddd0529ea80e87d2bb471d9b4cab1e6e685b8f20d9b819de604d37965e774bba1c5ecc5484d207f45753cdd2e319c09cc2cfb292b8 WHIRLPOOL 7a49d8568b57b13ad1194de86f50a221487c5f9fbc07583e65f75e7a79a5cd43335a713a597893fa438754418f2d1f0357dd8b0ae9b098a9a2cb40c715458dbc -EBUILD logrotate-3.8.2.ebuild 1810 SHA256 f2b413ea1d384dce708462f83e01f5f1b0d5065ecc2a85c0b1f303c71992756e SHA512 3f0517fb3b14f268a220e3c10b4722a79ad545964019038511a340749a151f95f5f0976d03f56059f68e64596a7557d0b5037b19de3908a75d282354dfddf2c5 WHIRLPOOL 89f5408b75b9908b0fed23a4411a3ded26033dfefef64590b698248890e09783b93a744a9489dfc940c6b28afe327e59fbe9c834626a7e5dbcd21da97223ba6e 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 20355 SHA256 7ea18a824fc13d82c83ed0775daa1978a08a83a0fb58386a5157e3393f610add SHA512 1aaf75df6ba06a5e868c5899ff2db1a92a870717a2cb6cf9f8c97217f7f694bf6fc0df8f8007fea2bcf2cf71821b3b5d69e1d451c2028042fa3f6b5ee968126a WHIRLPOOL 61dc946dd1eca8d89f32fcadb60176c71b54ab1578e3361ae3f4fb1eea74e7b406234a17d05a15c655e5983903579ae8ede3b0708a5a4456a3740ce2e75d95ab +MISC ChangeLog 20762 SHA256 b14b0eea59af7524fcec3f8504fea1e39657e095711ef07a3e3a080e014ec271 SHA512 47145fde987f10a68182f2768039c93417f473daa65b5bba71efac29f2a11ea4bcfcbcfa4eee09fcc5e3e69bbc61094a84e232b4f6aa57d9bef7c079907ed3d6 WHIRLPOOL 89c5ce0d603053190918e5c84c21f563ada227de702ce055e26eb57a2ca0a44a5808ae0f806fc4437f6a07e04567de6d6b435384fc4c4605b8482fc575d04930 MISC metadata.xml 975 SHA256 a329700a1e76593184907198fff2f678e429294226461ac1a913fe58cbb28c8d SHA512 c7736be8ad13e6e31c6561ff0fdbc2e3df7f59069eafdc5b655f780d96d277795201b9db747bc3da24c932aaaad16d40aebf18b8fc679f7ae8fa528088828d4f WHIRLPOOL 931ab959ebfb43aaac9c8926f26e17750c38f155ed15905117e2c8ca3374db427db763c6b724db9eb7f05fcf600dac54ed8008c222410073d82e17e38b0a45be -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRjU58AAoJEA2sAkrWKOU2sbsH/iRx/eKUM4IldXM1M4ECzFwp -8lMkhcCbLp7eg37J4OD5g3/rqrVpWeqXzGKlThpRFo5gIJPxKpydpdLPOQRYp/ma -GRGHEZBcw/lYH2TLhHshUIEA09OqZhIDidmHJ+h8wRoOY66gfBYuAZX80B4y3QMm -9nMOJh7aBG1s5snaesXa11SQSB3e+FcrLDgCdioZHqfnaLdnmmWu14WT8hy/P8uD -EIW2VJptMUabV63v+DnkTe2mLEz8yWiY2PGHjdz+GbrhSoi8ndRPapMs3KqgT7F7 -Fm4iqGik3Y90m3lQQkxMscsptRV5uyNNhqTlu+lj6ixTWro73V45mHXsxov2fWY= -=HUN4 +iQEcBAEBCAAGBQJRjU/3AAoJEA2sAkrWKOU2QowH/i/FVv+NaeupN7747x7aCEmq +P+O1dcoFskMim9xOkb7Rszy0BUvKr480is1oHTdpNBqdgNEZZ5g/IdyksEaZwFPB +uaMPqxrJam4qDnxoxt39HBkESBstLdmNI+I8eBS+sXv78VMXRZNrSBZJ5b+ZQGJ+ +KI2aH5D79g2nNL1fM/bnXQDAwMPM+/mpBWndhxHRNcIjZd6czp1geFiEw6amFOfS +euUHBLvT4h1X96T0yMBfJbJp5i4i3mstdx5SWkAua4mRUWB9wYomg6jM6kUoowcL +zdma7qwmV4Z7SvggvD3Su5QLacWOG55Q5tNkWTlYC5a5YzDgkwzuY2KZHVCdBps= +=khXe -----END PGP SIGNATURE----- diff --git a/app-admin/logrotate/files/logrotate-3.7.7-datehack.patch b/app-admin/logrotate/files/logrotate-3.7.7-datehack.patch deleted file mode 100644 index c023cba0b7a5..000000000000 --- a/app-admin/logrotate/files/logrotate-3.7.7-datehack.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN logrotate-3.7.7.orig/logrotate.c logrotate-3.7.7/logrotate.c ---- logrotate-3.7.7.orig/logrotate.c 2008-05-14 06:31:35.000000000 -0400 -+++ logrotate-3.7.7/logrotate.c 2008-12-23 11:09:09.000000000 -0500 -@@ -1443,7 +1443,7 @@ static int readState(char *stateFilename - } - - /* 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.0-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.8.0-atomic-create.patch deleted file mode 100644 index 35f409c5d81a..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.0-atomic-create.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/logrotate.c logrotate-3.8.0/logrotate.c ---- logrotate-3.8.0.orig/logrotate.c 2011-06-21 04:12:02.000000000 -0400 -+++ logrotate-3.8.0/logrotate.c 2011-07-18 11:40:48.775713520 -0400 -@@ -260,33 +260,50 @@ static int runScript(char *logfn, char * - int createOutputFile(char *fileName, int flags, struct stat *sb) - { - int fd; -+ char template[PATH_MAX + 1]; -+ char *fname; -+ mode_t umask_value; -+ snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName)); - -- fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW), -- (S_IRUSR | S_IWUSR) & sb->st_mode); -+ 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)); -- 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)); -- close(fd); -- return -1; -- } -- if (fchown(fd, sb->st_uid, sb->st_gid)) { -- message(MESS_ERROR, "error setting owner of %s: %s\n", -- fileName, strerror(errno)); -- close(fd); -- return -1; -- } -- if (fchmod(fd, sb->st_mode)) { -- message(MESS_ERROR, "error setting mode of %s: %s\n", -- fileName, strerror(errno)); -- close(fd); -- return -1; -+ if (fd < 0) { -+ 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)); -+ close(fd); -+ return -1; - } -+ -+ if (fchown(fd, sb->st_uid, sb->st_gid)) { -+ message(MESS_ERROR, "error setting owner of %s: %s\n", -+ fileName, strerror(errno)); -+ close(fd); -+ return -1; -+ } -+ -+ if (fchmod(fd, sb->st_mode)) { -+ message(MESS_ERROR, "error setting mode of %s: %s\n", -+ fileName, strerror(errno)); -+ close(fd); -+ return -1; -+ } -+ -+ 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.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.8.0-fbsd.patch deleted file mode 100644 index 2c3a750b9771..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.0-fbsd.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix compilation on Gentoo/FreeBSD, no alloca.h here and PATH_MAX -is defined elsewhere. - -See bug 254795 - ---- logrotate-3.7.7.orig/config.c -+++ logrotate-3.7.7/config.c -@@ -21,6 +21,9 @@ - #include <wctype.h> - #include <fnmatch.h> - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #include "basenames.h" - #include "log.h" - #include "logrotate.h" ---- logrotate-3.7.7.orig/logrotate.c -+++ logrotate-3.7.7/logrotate.c -@@ -24,6 +24,9 @@ - int selinux_enforce = 0; - #endif - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #include "basenames.h" - #include "log.h" - #include "logrotate.h" diff --git a/app-admin/logrotate/files/logrotate-3.8.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.8.0-ignore-hidden.patch deleted file mode 100644 index 12d4aefd6e7a..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.0-ignore-hidden.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/config.c logrotate-3.8.0/config.c ---- logrotate-3.8.0.orig/config.c 2011-06-21 04:12:02.000000000 -0400 -+++ logrotate-3.8.0/config.c 2011-07-06 18:35:08.796595341 -0400 -@@ -228,7 +228,9 @@ static int checkFile(const char *fname) - 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.1-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.8.1-noasprintf.patch deleted file mode 100644 index cc25fcf8dde8..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.1-noasprintf.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.1.orig/config.c logrotate-3.8.1/config.c ---- logrotate-3.8.1.orig/config.c 2011-08-31 08:39:04.000000000 -0400 -+++ logrotate-3.8.1/config.c 2011-10-12 12:15:04.975340954 -0400 -@@ -42,39 +42,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 '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.1.orig/logrotate.h logrotate-3.8.1/logrotate.h ---- logrotate-3.8.1.orig/logrotate.h 2011-08-31 08:39:04.000000000 -0400 -+++ logrotate-3.8.1/logrotate.h 2011-10-12 12:13:01.258887623 -0400 -@@ -67,8 +67,5 @@ extern int numLogs; - 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/files/logrotate-3.8.2-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.8.2-atomic-create.patch deleted file mode 100644 index e0d3f5e26cf6..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.2-atomic-create.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Nuar a/logrotate.c b/logrotate.c ---- a/logrotate.c 2012-08-01 12:56:47.000000000 +0200 -+++ b/logrotate.c 2012-08-02 18:01:20.960383277 +0200 -@@ -293,13 +293,19 @@ - { - int fd; - 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)); - -- fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW), -- (S_IRUSR | S_IWUSR) & sb->st_mode); -+ 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)) { -@@ -328,6 +334,12 @@ - close(fd); - return -1; - } -+ 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.2-fbsd.patch b/app-admin/logrotate/files/logrotate-3.8.2-fbsd.patch deleted file mode 100644 index 3dc9a9c447d8..000000000000 --- a/app-admin/logrotate/files/logrotate-3.8.2-fbsd.patch +++ /dev/null @@ -1,59 +0,0 @@ -Fix compilation on Gentoo/FreeBSD, no alloca.h here and PATH_MAX -is defined elsewhere. - -See bug 254795 - ---- logrotate-3.8.2.orig/config.c -+++ logrotate-3.8.2/config.c -@@ -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> -@@ -21,6 +21,9 @@ - #include <wctype.h> - #include <fnmatch.h> - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #include "basenames.h" - #include "log.h" - #include "logrotate.h" ---- logrotate-3.8.2.orig/logrotate.c -+++ logrotate-3.8.2/logrotate.c -@@ -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 @@ - int selinux_enforce = 0; - #endif - -+#if !defined(PATH_MAX) && defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #include "basenames.h" - #include "log.h" - #include "logrotate.h" - ---- logrotate-3.8.2.orig/Makefile -+++ logrotate-3.8.2/Makefile -@@ -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/logrotate-3.8.1.ebuild b/app-admin/logrotate/logrotate-3.8.1.ebuild deleted file mode 100644 index 921b78c43285..000000000000 --- a/app-admin/logrotate/logrotate-3.8.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.1.ebuild,v 1.7 2012/02/12 14:37:50 armin76 Exp $ - -EAPI="2" - -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 ~mips ppc ppc64 s390 sh sparc x86 ~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() { - strip-flags - - epatch \ - "${FILESDIR}"/${PN}-3.7.7-datehack.patch \ - "${FILESDIR}"/${PN}-3.8.0-ignore-hidden.patch \ - "${FILESDIR}"/${PN}-3.8.0-fbsd.patch \ - "${FILESDIR}"/${PN}-3.8.0-atomic-create.patch \ - "${FILESDIR}"/${PN}-3.8.1-noasprintf.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}" || die "emake failed" -} - -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() { - 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." -} diff --git a/app-admin/logrotate/logrotate-3.8.2.ebuild b/app-admin/logrotate/logrotate-3.8.2.ebuild deleted file mode 100644 index e0b8617b22f2..000000000000 --- a/app-admin/logrotate/logrotate-3.8.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.2.ebuild,v 1.9 2012/10/29 23:56:50 naota Exp $ - -EAPI="2" - -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 ~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}"/${PN}-3.7.7-datehack.patch \ - "${FILESDIR}"/${PN}-3.8.0-ignore-hidden.patch \ - "${FILESDIR}"/${PN}-3.8.2-fbsd.patch \ - "${FILESDIR}"/${PN}-3.8.1-noasprintf.patch \ - "${FILESDIR}"/${PN}-3.8.2-atomic-create.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}" || die "emake failed" -} - -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() { - 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." -} |