diff options
author | José María Alonso <nimiux@gentoo.org> | 2012-11-11 15:30:59 +0000 |
---|---|---|
committer | José María Alonso <nimiux@gentoo.org> | 2012-11-11 15:30:59 +0000 |
commit | 36c261c4c4ef89f36d83357b1063d23d09e324b0 (patch) | |
tree | ecf47c7667369715b1cf0b8e515b4a612bec677a /app-admin/logrotate | |
parent | sys-block/fio: Version Bump (diff) | |
download | historical-36c261c4c4ef89f36d83357b1063d23d09e324b0.tar.gz historical-36c261c4c4ef89f36d83357b1063d23d09e324b0.tar.bz2 historical-36c261c4c4ef89f36d83357b1063d23d09e324b0.zip |
Version bump.
Package-Manager: portage-2.1.11.31/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 | 30 | ||||
-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 | 77 | ||||
-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, 371 insertions, 15 deletions
diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog index 7da96c65bd73..0c6eda920e8d 100644 --- a/app-admin/logrotate/ChangeLog +++ b/app-admin/logrotate/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-admin/logrotate # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.126 2012/10/29 23:56:50 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.127 2012/11/11 15:30:51 nimiux Exp $ + +*logrotate-3.8.3 (11 Nov 2012) + + 11 Nov 2012; 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: + Version bump to 3.8.3 29 Oct 2012; <naota@gentoo.org> +files/logrotate-3.8.2-fbsd.patch, logrotate-3.8.2.ebuild: diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index 5e239441879f..96882595dd80 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -8,28 +8,30 @@ AUX logrotate-3.8.0-ignore-hidden.patch 701 SHA256 2ac9d21993a2bb6f269e29472ac74 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 +AUX logrotate-3.8.3-fix-acl-tests.patch 1500 SHA256 b8374d6efaea9ecc5f37468c1e272409bc4adfb46512ec29c61de12e599874c1 SHA512 ac19a6874c5394f43db735df1077fdf2b663293509c9fa9d0f9dad8e5e0e242b6316af42812dcb8c9f76d1a0dcc7a658fe643d86c355365bbd7340f239786605 WHIRLPOOL 181fa021e4e701b8ae539d6ab287aef0ece887e61a6529a92010e9b79be3637f6f7e20b7e84b73d646db36de0376ee0531aa7756d54fa670d9fe3da2acc95b6e +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.conf 860 SHA256 5a0d6a2f331af0df8e0b87904ba522b64bfebc13f47b0a5717e03257d3f29ad7 SHA512 ada7ad4efc4d9ff0b8067db80af6c7be0f44f12f7bb705949cc76dd9f2818ec368be1dfc8432cf5ee2955c72d137fb609b7886a3d982045c18d4a809ef72c480 WHIRLPOOL ce50276ffd0a0ff8e347e724b08576c622112bcc535b0ce584fbcb4ea2f496d2ee09a1020f895a7b6d75f83b7b9df803d8db8b28c93c50eab9706588d5e3789f 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 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 -MISC ChangeLog 18375 SHA256 430224e180dcbb836e7fec424ea52fc7f399329c4b04a8f8961a5547a0803ae7 SHA512 94e35e175d41b27a465980e268e5746e0ed4fe7f8ba929d42839cdb652059378f607bc46a85002aba4d20359d87f015a5c42af5e8a8a7ccef732894e6881296f WHIRLPOOL 3b8ba76c70729d0d8c2009b676e2b457b6a8bd931e12ad3864f6ecd81fb5903cfc50bb94e9b51ed5207cc4a4fcbe5c0f06eb942c3d6bbd0cedd48c08c3998ef4 +EBUILD logrotate-3.8.3.ebuild 1915 SHA256 7375317da1f4167cc99cc540d4dd95d79477a80d3714923659f985c99b70d46c SHA512 647227e3636e9f8448400d2f5af2926ce6489432af77118d50a03c8b620ad64fc4655122601b2398ceb9d5bc4fcd85814b4c10d2c63c7ec1022e6d54911d8d2a WHIRLPOOL c91deeb7f21d8620c3c8c09328db12a37855c367d12f1c0d2fd8300cbf85b7cf7d6a4f49c3edbfd830daa55ee3139721a68f098f14b6d793c390f221fc851a4f +MISC ChangeLog 18763 SHA256 dfcb280a5fa46d1b25aefe7a7e0361dd95e4c19e0028561eacd1bbe4b2deeedb SHA512 75e4802d3775be6ce35010155fa8365909ee389f320b25d587ad1efd47f0598cf79a7c2f23092a2f4b92b51620d077126d949d25fadbcc9e05cab11484f78572 WHIRLPOOL 4c61a6640aedd0156eb786817b34fd1fa5afd0823d41daa6e7f799b43d699c6ea2f897bb559ad0e526c7a81613b8ac9a58c5ae78c1ccd2103c7d0ac278ea2497 MISC metadata.xml 975 SHA256 a329700a1e76593184907198fff2f678e429294226461ac1a913fe58cbb28c8d SHA512 c7736be8ad13e6e31c6561ff0fdbc2e3df7f59069eafdc5b655f780d96d277795201b9db747bc3da24c932aaaad16d40aebf18b8fc679f7ae8fa528088828d4f WHIRLPOOL 931ab959ebfb43aaac9c8926f26e17750c38f155ed15905117e2c8ca3374db427db763c6b724db9eb7f05fcf600dac54ed8008c222410073d82e17e38b0a45be -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQjxgmAAoJEDYO1FT4VRUUN2oP+QFOHobwTwCuX9SAxVW22ozY -GVVpgpR3Kn7LniY38OwYR2X7DraB5YRukg0EtpRcoiBn/EjQHDRgiUQQ/G5erWCM -+85yaONvCQdd98roYOYMKiX8BjbCc9a6MescpCloE8trV2dq1m+98ismMXk213if -ZMAwUORgg5bN0Quv6FTj8HNlz+UhjsP8K0phAvtPURJoUt9vF5Kp4EMV15Nra/AX -h5aINL3F5K8J5R3xioMPnYcre6h79adEI80H13Dkd3rDJ/hNoQiO4PQqEjnMeSI/ -mzJOdSsf6rhEwyLCH95F2jqViWFID+sUf8rBty68bvs9YwKYYCHXNLXwHNLwoTDX -wz0B2x2lNMrndgORCdoXjbqQH6H+xmCHD78ynZiCrowFiiMOHHLV3EvecH8HGij/ -9Dirvx14wh1vpXFCmeLNV/8PLacUqYHB5Wr7t4benCc1QrnhIWPhKeTm1l5NbAIz -i4rq0HlrD0iFvyNswyaSWERXSCfOJj6r7T1Pq2Q57qxtyl2p+q/oX8BitG3ZYJe2 -sydypXbAwktMH6cNbsKBg+uUUMeCW685a1XSE6d48odfxTGJuWO0AaZHrqciAj+g -X0l366enw8zVleKvqgu6916EWEFf8kaofb1OPVsXVZXJ1OlC6+o7/1FxCA4HYw1E -njDW0VC0clu8NhzpNRAu -=tKnq +iQEcBAEBCAAGBQJQn8T5AAoJEA2sAkrWKOU2Vt8IAJyO+qlhXgXCW3vYrpd/5IpZ +fcguS/GpbNK7Vch6J3IdG8Srto3MBhaUmmWWIy/NrmiCm/lGlNsPFMsaYMsPnmqb +gdYEJLwaQjnf9t3CZ2hTizFmWlcX6iXMlHuNygFCrhySAEDzUFDANq3bRPq5GjVo +fjb2zAzy3gUVqc/GB4KgSxo2sL9CXq9Gc1x7fUr2R0wSQwUI20giUehXsxGrtVwR +CFdhQ5ADjhbCAfRfTLEeAyxxlbFuVKtxXKbjLf/bnM68RcY8joK1kv+i9AS1p9GF +HZ1rGp92P/u6v3ejXT7yQLFSqjdRRFI8HLyKk9MKZ2L8MO4IB2SyBieHPy96Fa0= +=YVhg -----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 new file mode 100644 index 000000000000..4603728a9fbc --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.3-atomic-create.patch @@ -0,0 +1,46 @@ +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 new file mode 100644 index 000000000000..9d6e5f015d84 --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.3-datehack.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000000..ab5e7c478456 --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.3-fbsd.patch @@ -0,0 +1,61 @@ +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 new file mode 100644 index 000000000000..f69c92d9dd2e --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.3-fix-acl-tests.patch @@ -0,0 +1,77 @@ +diff -Nur a/Makefile b/Makefile +--- a/Makefile 2012-10-04 09:59:14.000000000 +0200 ++++ b/Makefile 2012-11-11 16:17:11.340052857 +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-11-11 16:03:55.410050512 +0100 +@@ -4,6 +4,7 @@ + M="-m ./mailer" + S=-"s state" + RLR="$LOGROTATE $M $S" ++TEST_ACL="$1" + + cleanup() { + rm -f test*.log* anothertest*.log* state test-config. scriptout mail-out compress-args +@@ -686,6 +687,8 @@ + test.log.1 0 zero + EOF + ++if [[ "${TEST_ACL}" = "acl" ]] ; then ++ + cleanup 32 + + # ------------------------------- Test 32 ------------------------------------ +@@ -713,6 +716,13 @@ + test.log.1 0 zero + EOF + ++else ++ echo "Skipping test 32" ++ ++fi ++ ++if [[ "${TEST_ACL}" = "acl" ]] ; then ++ + cleanup 33 + + # ------------------------------- Test 33 ------------------------------------ +@@ -740,6 +750,11 @@ + test.log.1 0 zero + EOF + ++else ++ echo "Skipping test 33" ++ ++fi ++ + cleanup 34 + + # ------------------------------- Test 34 ------------------------------------ +@@ -759,6 +774,8 @@ + test.log 0 zero + EOF + ++if [[ "${TEST_ACL}" = "acl" ]] ; then ++ + cleanup 35 + + # ------------------------------- Test 35 ------------------------------------ +@@ -786,4 +803,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 new file mode 100644 index 000000000000..13bf52873c91 --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.3-ignore-hidden.patch @@ -0,0 +1,14 @@ +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 new file mode 100644 index 000000000000..f810278a4892 --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.3-noasprintf.patch @@ -0,0 +1,55 @@ +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 new file mode 100644 index 000000000000..814bd5ad1bce --- /dev/null +++ b/app-admin/logrotate/logrotate-3.8.3.ebuild @@ -0,0 +1,79 @@ +# 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.3.ebuild,v 1.1 2012/11/11 15:30:51 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 ~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 +} |