diff options
author | 2013-10-26 16:27:50 +0000 | |
---|---|---|
committer | 2013-10-26 16:27:50 +0000 | |
commit | bb2e9b9e4f8cae731515bc7c11cc76c9ec4353d3 (patch) | |
tree | e97861447ffd09213177a009b0595a850b3e6e08 /app-admin | |
parent | app-misc/colordiff: Add missing dep on perl, #489474 (diff) | |
download | historical-bb2e9b9e4f8cae731515bc7c11cc76c9ec4353d3.tar.gz historical-bb2e9b9e4f8cae731515bc7c11cc76c9ec4353d3.tar.bz2 historical-bb2e9b9e4f8cae731515bc7c11cc76c9ec4353d3.zip |
Version bump
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/logrotate/ChangeLog | 11 | ||||
-rw-r--r-- | app-admin/logrotate/Manifest | 21 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.7-atomic-create.patch | 45 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.7-datehack.patch | 12 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.7-fbsd.patch | 57 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.7-ignore-hidden.patch | 14 | ||||
-rw-r--r-- | app-admin/logrotate/files/logrotate-3.8.7-noasprintf.patch | 55 | ||||
-rw-r--r-- | app-admin/logrotate/logrotate-3.8.7.ebuild | 70 |
8 files changed, 279 insertions, 6 deletions
diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog index 353f91304b2d..56c5bde9f742 100644 --- a/app-admin/logrotate/ChangeLog +++ b/app-admin/logrotate/ChangeLog @@ -1,6 +1,15 @@ # 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.159 2013/10/02 02:37:51 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.160 2013/10/26 16:27:42 nimiux Exp $ + +*logrotate-3.8.7 (26 Oct 2013) + + 26 Oct 2013; Chema Alonso <nimiux@gentoo.org> +logrotate-3.8.7.ebuild, + +files/logrotate-3.8.7-atomic-create.patch, + +files/logrotate-3.8.7-datehack.patch, +files/logrotate-3.8.7-fbsd.patch, + +files/logrotate-3.8.7-ignore-hidden.patch, + +files/logrotate-3.8.7-noasprintf.patch: + Version bump 02 Oct 2013; Jeroen Roovers <jer@gentoo.org> logrotate-3.8.6.ebuild: Stable for HPPA (bug #485886). diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest index 47e11bd989d6..12ded184afbd 100644 --- a/app-admin/logrotate/Manifest +++ b/app-admin/logrotate/Manifest @@ -16,20 +16,31 @@ AUX logrotate-3.8.6-datehack.patch 437 SHA256 e08bb9fe76ba744c6b91b8df4699a1fe08 AUX logrotate-3.8.6-fbsd.patch 1408 SHA256 b48b9f4e4c7cc903b0db7e3e974077979303a8ad8c5f17b73dedb78c25844787 SHA512 2351fd3a0bcfe1fe70c760c075e7f02bc409aeef3f66611a710c103cd2306810d37aa23e737df0f148af45add5b2f0355cb0eca7a2e044f176cd83c5bc2b77e9 WHIRLPOOL c96cf88a1bb4af7bce952eea3edc6c693171356b92be42a2fd8f7dda0e3ccb01ac1702ccce372d8037fbc08edaf519842845cc36af28efefc5264c392f301783 AUX logrotate-3.8.6-ignore-hidden.patch 548 SHA256 ce9eeeda18210bf8e1f7132063c395b186daa98e7a9b5087c1d1321d49fd0c1e SHA512 6ec0d2383072b0857cc8aee3cae2f2437dc384e832dc813ba661670ae1691e25bd3685080cb85af6aecb6de6d14a533a503603fae5f639beba6a5f613260a2b4 WHIRLPOOL 546e922167b78ed9c74b954255b03b98d49bd598c4d7212bda9f52152f3a93c6eb01e226401afa420191e5ba57f11ba5887f7deb113097263029aca62e35e06d AUX logrotate-3.8.6-noasprintf.patch 1264 SHA256 41b1274c7286ddc9ce697e6c27ec7780667dedb7ceb953bfb689ba947e752e93 SHA512 4c71ff2e1e3ab472a3a438ecc798958b055a2ce9ab12b9b4dfdb97fec0fe9f989e35a19ee0836f916ff43b05cf619c0dadf8efe930b39000be79e68cad340707 WHIRLPOOL f32370758461907f67f9a8d28b8234f0e552eb76eff94fb120b70c9beb56c74b809db8cbe3b0ec91159326442573c7ece3810fc2143508a7b60c8fc896ca1994 +AUX logrotate-3.8.7-atomic-create.patch 1350 SHA256 b6ff26737a6c5f83a87d11b241cb1d439cdda59df0fabbcc95504e717ca3f3ec SHA512 4e7a45ae8b33ae38e368491fd4ab9fb0138bebbbe47ffddb1e2832a59cd59cdff07147d73c5a14414b4f6b11203c6db454a6259f016c7b0a890d82df7ce41ae9 WHIRLPOOL a277c2c4a17380ebe369b6f0313d82f34fd295fb05822c8c5d6b8eb109c3fc19fcc8786c79a54d6bf8fca7bbb6b632ad6b61fae2dff45ab2853aca8affd8f95d +AUX logrotate-3.8.7-datehack.patch 437 SHA256 f8a6efbb9ad66339c5be50b36472bc3f15eb26bc2fe37f96a77e8efddc087ab3 SHA512 03563c553513b867321b8e3a776a0e8c203bf7f331314cbfd084f93ca1ea79d1a11abad85b09e797c79c04790208a11f17841ba4c9be296e3d9e216a320dfbb2 WHIRLPOOL 08f407c2c5d98e9457ee667a7d0bebcebb623754600b01f8a47b8081a016d7decfd557930e58dbeade79ccbe8976185ef05c155f6857211642a15ac02c8c0e11 +AUX logrotate-3.8.7-fbsd.patch 1408 SHA256 3c6139593557d033c4adcd757b24c5c877affe458ada62df114ef8e6d9d17d33 SHA512 daaf49e7ef3adfc7f55538e76eeac41ac515e2324da7c8ea7b068b182c73781cfecf70f08fdc53b67f2f5bfe33ffb1fb85cbc70a1b3d317b295ecaed31450159 WHIRLPOOL 855d8650e23cebd7a857448ec4ae97a4388a253b9f4b8686218685fc628aa7069ac88fe0dd49998092f20735d4ea9967898d5c7b5da00c31c7a2efc5666dc60d +AUX logrotate-3.8.7-ignore-hidden.patch 548 SHA256 a1df19c1b887918bc4adc19069e160f261c894d4167f3dffec2b8cd4202d0c23 SHA512 5c4ea381d5dc5fa0af968f14acedf767721d5c2671ddf6f876c487fb79ef65e1c64a762c32905335bb2fd5844985fcc504357db9a3dd17c7270a7b88b04998fa WHIRLPOOL 23a4df07778d1bb01ff127e7e2c18b588d88a8699901881adef01eb3cd5f25187ac917f608e6ff99d18b06d936cfd9a92d568ce52451906ab837ca9b4590c2df +AUX logrotate-3.8.7-noasprintf.patch 1264 SHA256 7307ca47518ec7a87fce3323ab3acc2c00e764e865ab72d11fb4947fb516fc50 SHA512 bc952f603d2202ff0760aea8262362a671be756fbf8c86aeffffff2d4d33537fa1e834b83f9d8e156cc905b6c0c9b480bb4ac2a86db833693b4d625de48bb613 WHIRLPOOL f0ff217a0dbd3edcd11b38ca5e0bb5a33978facc0698a626a369eb18785ca490107cad6ae5baf69357978bf5d27485306f8b819e93804dbdc5430a468b6d2752 AUX logrotate.conf 872 SHA256 887d558c5c1b64adf88a28032c25e1c8b57d0490c818c11273e546492a11e0b8 SHA512 3c8ca642f687a3b549356c5419c38042d912e15e506798285dcf134d9ffbf01370ae9d2bd5c49161a0a2148148c18ae4a285de719c10a074dd11fdbb2aaee142 WHIRLPOOL ae9e496c236f339e09c0f93e52357b192e2dd81167f6e4ba5c877a42eee1d3fe727cf670cd7f7cc6e4db212b04630dd1e5b5417ce66aa029130e66b4d3529bcf AUX logrotate.cron 52 SHA256 5eeae7dfbd54f74108d49cda8285211898d29ab7d547dee267803299e7339560 SHA512 5d5797b0f4490ff39b48319165db2cb4e821d9930a45d0550de8dc541ce899eb1e7cab7b9dc3d7a350835ddb8f6702246f1b50e0930037f3c52c82ee129f1acf WHIRLPOOL a9537ebcfd51d911f4f8ffbc430618d6bf510b6f442414f61e6f4c203f9c268d939aaec9b151c29bbd6a292348f386cdd0a1685d324749b110ef14d59439d647 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 +DIST logrotate-3.8.7.tar.gz 58898 SHA256 f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64 SHA512 6c0dc106e2a9e9d2cd7ac12af869bc152db7d046a1c6d1b75810fb2fc7a7f382b3c3f1dc54b9fb9a9eee248c1c66a9f5ce86804f15b49ac0210313c231b49e7f WHIRLPOOL 6ba7fd7eca8435575c96a5534fe9dbe098235ee2319f2ab8e279d94fa6de3ea0e53cd78eeabd643e4da049f585df9a901681b61d0d339131f45fe580aa0eb198 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 1802 SHA256 268999a3fb63c206d47b5456f01bd563da94ad9cebff61b770b1bdfa3fef1581 SHA512 6d2899fb27e75ccdadddbe0723b6523534e87fb213b266dcb4539b5eb2c4f1a26c60dcdee042c0181a53573f725dddbb3a01c904df9e471f334b05693baee7fb WHIRLPOOL f88b473da508165cef60197947446687cb253a9fec8cace73e2ca96f16f47d8e54ec2be46127653bff70172235de91fc8957ab62eeab40aee27fa2658f11c35f -MISC ChangeLog 23617 SHA256 d977043e6a3d871dd186695fad5a0d74e592129f1187cc1bb302d5297612e449 SHA512 24a5d6d5502589af3dab3e367b965d4e782c6222398a6b7911e299a7b741e8d4e06353528dc2bc70ac435db6327a57af7afde105e4f8efdb0c86efac08ab96f9 WHIRLPOOL 8edf14628a2f295faf8d1006e6496b4254acc47d5fddf4c793c202e46c1a93c2608c53f37d96f6ca4fd9d6025e3336a1fdb21c8eedda64a040fc18fedfe0fde7 +EBUILD logrotate-3.8.7.ebuild 1809 SHA256 d7225d53729efd75e31053d4aa3c68ca89226fe05df71ba95b4e771047c2c2ba SHA512 f05360a60cb7e3a018fdcaad3da040c2ba2256ebd85440a4374b6196782ac0f7a52fae5bc66c94c2c5bb1d27ece69db6a8b1bbe5b2a619941eb327fa06ebdbfe WHIRLPOOL e0fd3e7bec91da159e0dd96fa2adf27fa7786c57af78f0e94050c740615cdb78a70e8a26a76d644732ff366b1689af6e782090d80b23040d305e4efc3e3ea2ba +MISC ChangeLog 23952 SHA256 8ef59d01956c7e32f5e5de72553c099fb472fab00e1eeb1ef309ab68d961fa1b SHA512 cd3cb2b95c6b11a15e2a078dd42f789f1da3f0851513c732b6a02be6d8feb2567048bcd10d22e99e1778092a58050143d4c2a6079cf69e609862b73086831b59 WHIRLPOOL bc9793a0b45671a999fdd1989f147865e2a15fa42c2a39edd6a3698f61919f6517fa674c8790b950be3fdfc7b6d121df61650ab25e3569dcfef319efbe146c72 MISC metadata.xml 975 SHA256 a329700a1e76593184907198fff2f678e429294226461ac1a913fe58cbb28c8d SHA512 c7736be8ad13e6e31c6561ff0fdbc2e3df7f59069eafdc5b655f780d96d277795201b9db747bc3da24c932aaaad16d40aebf18b8fc679f7ae8fa528088828d4f WHIRLPOOL 931ab959ebfb43aaac9c8926f26e17750c38f155ed15905117e2c8ca3374db427db763c6b724db9eb7f05fcf600dac54ed8008c222410073d82e17e38b0a45be -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlJLhwAACgkQVWmRsqeSphMBIwCfWLYEC8ZWlXwKxRc8NHUfQoEb -nfsAni7jWEOBFOQhh6SxizQkwxVm8gvg -=nrM+ +iQEcBAEBCAAGBQJSa+28AAoJEA2sAkrWKOU2GVwIAK+c4CeOSHIW9oGwbuiP6fIM +RoywaGj1SiTvQpdx46os2c9rwfUzUQBLxafd9R+N8zLlQNHstOVXbi3diWlEKyl2 +41ZGrMd1wctGNYCbEWHGOLB85UZojC0yDkv+Gqd8STy95oPopDZstliS1/eA+yQE +IyUF7/LPftFLnsakyfwjHviCZXnTYOFdkpAYYDWAG/WGhY+N4WtacongBKtjtxIP +lpN+HZN9E3g4XgLeiQPTFTosGRsJGLHoFAmmdh9IuiU2ajkUK6tb8OkyIvWp1KBQ +ncK5jAZ5I9OdFcldj4ZedyiexTiAXa5e30/0/soznjEtZ/7KlSPz4JS/S1mfEbM= +=I47l -----END PGP SIGNATURE----- diff --git a/app-admin/logrotate/files/logrotate-3.8.7-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.8.7-atomic-create.patch new file mode 100644 index 000000000000..c5f1979ebb70 --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.7-atomic-create.patch @@ -0,0 +1,45 @@ +diff -Nuar a/logrotate.c b/logrotate.c +--- a/logrotate.c 2013-10-26 18:07:54.809999410 +0200 ++++ b/logrotate.c 2013-10-26 18:16:08.539999396 +0200 +@@ -304,15 +304,20 @@ + int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode) + { + int fd; +- struct stat sb_create; +- int acl_set = 0; +- +- fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW), +- (S_IRUSR | S_IWUSR) & sb->st_mode); ++ int acl_set = 0; ++ 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)) { +@@ -363,6 +368,13 @@ + } + } + ++ 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.7-datehack.patch b/app-admin/logrotate/files/logrotate-3.8.7-datehack.patch new file mode 100644 index 000000000000..7cb11734e304 --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.7-datehack.patch @@ -0,0 +1,12 @@ +diff -Nuar a/logrotate.c b/logrotate.c +--- a/logrotate.c 2013-10-10 10:43:36.000000000 +0200 ++++ b/logrotate.c 2013-10-26 17:56:06.549999428 +0200 +@@ -2046,7 +2046,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.7-fbsd.patch b/app-admin/logrotate/files/logrotate-3.8.7-fbsd.patch new file mode 100644 index 000000000000..345f46cd53fd --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.7-fbsd.patch @@ -0,0 +1,57 @@ +diff -Nuar a/config.c b/config.c +--- a/config.c 2013-10-26 18:05:54.729999413 +0200 ++++ b/config.c 2013-10-26 18:07:19.179999410 +0200 +@@ -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,10 @@ + #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 -Nuar a/logrotate.c b/logrotate.c +--- a/logrotate.c 2013-10-26 18:05:29.789999413 +0200 ++++ b/logrotate.c 2013-10-26 18:07:54.809999410 +0200 +@@ -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> +@@ -43,6 +43,10 @@ + + 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 -Nuar a/Makefile b/Makefile +--- a/Makefile 2013-06-10 13:29:16.000000000 +0200 ++++ b/Makefile 2013-10-26 18:06:42.569999411 +0200 +@@ -22,7 +22,9 @@ + + ifeq ($(WITH_ACL),yes) + CFLAGS += -DWITH_ACL ++ifneq ($(OS_NAME),FreeBSD) + LOADLIBES += -lacl ++endif + # See pretest + TEST_ACL=1 + else diff --git a/app-admin/logrotate/files/logrotate-3.8.7-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.8.7-ignore-hidden.patch new file mode 100644 index 000000000000..c12e66a829c2 --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.7-ignore-hidden.patch @@ -0,0 +1,14 @@ +diff -Nuar a/config.c b/config.c +--- a/config.c 2013-07-31 13:34:31.000000000 +0200 ++++ b/config.c 2013-10-26 17:57:58.309999425 +0200 +@@ -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.7-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.8.7-noasprintf.patch new file mode 100644 index 000000000000..53ce5a0f2c94 --- /dev/null +++ b/app-admin/logrotate/files/logrotate-3.8.7-noasprintf.patch @@ -0,0 +1,55 @@ +diff -Nuar a/config.c b/config.c +--- a/config.c 2013-10-26 18:07:19.179999410 +0200 ++++ b/config.c 2013-10-26 18:12:21.599999402 +0200 +@@ -49,39 +49,6 @@ + #include "asprintf.c" + #endif + +-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE) +-#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 -Nuar a/logrotate.h b/logrotate.h +--- a/logrotate.h 2013-06-10 13:29:16.000000000 +0200 ++++ b/logrotate.h 2013-10-26 18:12:37.429999402 +0200 +@@ -67,8 +67,5 @@ + extern int debug; + + int readAllConfigPaths(const char **paths); +-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE) +-int asprintf(char **string_ptr, const char *format, ...); +-#endif + + #endif diff --git a/app-admin/logrotate/logrotate-3.8.7.ebuild b/app-admin/logrotate/logrotate-3.8.7.ebuild new file mode 100644 index 000000000000..f5105ce28280 --- /dev/null +++ b/app-admin/logrotate/logrotate-3.8.7.ebuild @@ -0,0 +1,70 @@ +# 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.7.ebuild,v 1.1 2013/10/26 16:27:42 nimiux Exp $ + +EAPI=5 + +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 +} + +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_install() { + insinto /usr + dosbin logrotate + doman logrotate.8 + dodoc CHANGES examples/logrotate* + + exeinto /etc/cron.daily + newexe "${S}"/examples/logrotate.cron "${PN}" + + 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 +} |