Real fix this time for bug #254795; thanks Javier

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

3 files changed, 39 insertions, 12 deletions

diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog
index 4ad65d7b318d..460a7e49a595 100644
--- a/app-admin/logrotate/ChangeLog
+++ b/app-admin/logrotate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/logrotate
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.75 2009/01/14 16:26:28 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.76 2009/01/25 19:42:45 dang Exp $
+
+  25 Jan 2009; Daniel Gryniewicz <dang@gentoo.org>
+  files/logrotate-3.7.7-fbsd.patch:
+  Real fix this time for bug #254795; thanks Javier
 
   14 Jan 2009; Daniel Gryniewicz <dang@gentoo.org> logrotate-3.7.7.ebuild:
   Try again to fix fbsd; bug #254795
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index b7033f1d9063..46c1a52b20a7 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -9,7 +9,7 @@ AUX logrotate-3.7.1-no-tmpdir.patch 1266 RMD160 1311c0561551890958feab495ad2109c
 AUX logrotate-3.7.1-taboo-to-debug.patch 517 RMD160 624d7f18438d6728b29acf6628fd0c5d60766fe8 SHA1 3c6505a82197bf23a2fe13feeb9cda340d051b61 SHA256 6b67762f70eef9d20f1727aa3d88ddf77fbdc4bac7cb135adb3c30886f990046
 AUX logrotate-3.7.1-weekly.patch 1165 RMD160 8799169f501316796c68e98fef0b34af963231c1 SHA1 e8a269ee0099adb50307a06f79ee188c238d348f SHA256 fc0cf229212ac458555829e12bdc9886a75e1ea0fbefd89454686cef3a1a80ac
 AUX logrotate-3.7.7-datehack.patch 589 RMD160 5b9314e3cd6f100cb0272146baceda01777e9614 SHA1 b5e6fb929ba777446c24e086ff8031ee3cc7ca07 SHA256 f68e360afe0a9ab28fa42775bdf0b7ddf4ff925e19a3786bcd40e0067ee4856d
-AUX logrotate-3.7.7-fbsd.patch 842 RMD160 60130204a5f417269187c559cfddd9bdbf706bc9 SHA1 0bf1b66233fb2f645a95c29e7e244f8275b422b1 SHA256 c60e956f71d33e8c2f077172beed1e5751e657f134feb4a589dfaf886a69fae7
+AUX logrotate-3.7.7-fbsd.patch 983 RMD160 727327c302e48a3cbea73f3429322c72a67e323f SHA1 5ac5bc9e037c494bb92731deba67e4ca4ad7110b SHA256 961676ab9a0d7f4e5030c4a04531cefc681bfcac883e329c2e1abfc48e790b23
 AUX logrotate-3.7.7-ignore-hidden.patch 734 RMD160 7bc3628c64eaf1c39b6d7431e0a1a06f0979cd08 SHA1 85270672cf772b10fee234a00a20310d28f60722 SHA256 717ae92f87d0c1b53d8930efb7fe61d0884fb599a5fe706dcabc41c116cd093b
 AUX logrotate-3.7.7-weekly.patch 1228 RMD160 8dbaec65fd9c2cec3cef6c01b33f95fb9bfaae50 SHA1 bd03af7849e280a1cc00118194d5fad0211c57f5 SHA256 fef846a8cd140c1d6a182de81b76c65d0ececf1b463c6d5efdb84ed2aa3a2440
 AUX logrotate.conf 860 RMD160 a7ab0fef1822d135fb1d194ced8d8ae487f729d8 SHA1 c9f1e3cab04c7fcc1a3a4bac5b0c54a88ee81fdb SHA256 5a0d6a2f331af0df8e0b87904ba522b64bfebc13f47b0a5717e03257d3f29ad7
@@ -20,12 +20,12 @@ DIST logrotate-3.7.7.tar.gz 42867 RMD160 ce4b07541f4234b9d577b1acac9153fc008276d
 EBUILD logrotate-3.7.1-r2.ebuild 1772 RMD160 bcd15a34b30e7c9860053e65caf039c7913a23ea SHA1 dada17034e9190ce076eae0e8d788400b3968583 SHA256 8204cfc744e895514066f9e1849b76ffc77a7a96d03e6f0c23445f5c27013174
 EBUILD logrotate-3.7.2.ebuild 1548 RMD160 c4873a2a51ed7c0f26871fb60e6e03f457f2ccfb SHA1 7a45d2676ddfd699f9428929fbc6966c8154b11a SHA256 36145618ea4d8b7e84b5b6e449d7f60f5e71665ea8f4f5376c3e99d9caf66e9e
 EBUILD logrotate-3.7.7.ebuild 1776 RMD160 c4867a0b3779b58e5af9b94192962da374c4d3d6 SHA1 21f2dacd19f876a4b4b6cdf8624fefe7860e55dc SHA256 6c7981a44772d04cdecf97dc7cdded224179a02acef250244009d88b1515e3bb
-MISC ChangeLog 10538 RMD160 ed8bdd91e72ebb9ff02564487f0d0aa1dde96208 SHA1 547c17c960300ae8dc87678a727350a37babf3a0 SHA256 1a3843e97ac0e00bda31e8da918fa9d0ad8a3481d47ef556882c20823831b60a
+MISC ChangeLog 10678 RMD160 d194b5db66fa03f8e96e51159e7daa83ad2adb77 SHA1 7b36fffbc176f0b17f198114411e58962c502a9f SHA256 0eb3299b7c204a9e760212b67ef83160e2da973a93d696fe5b3601d5350ab030
 MISC metadata.xml 216 RMD160 9bd928268bad8d343ce07f1c2f875b7c296db426 SHA1 df32457660dc43f2fd8b867c0b01ff7aed8e8f98 SHA256 4285dde164ce71c8922ac0cb88e9ea655f517c2d5c25437090466df3988658c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFJbhJDomPajV0RnrERAvkTAJ9FccdSzWKIOj3Cci7d6eteUwD/bwCfUXLK
-uVOpBu2S3jyjf6TU9kpvHTY=
-=t/U0
+iD8DBQFJfMDDomPajV0RnrERAvJrAJ9ufYNiB6Y7jg5jRhzTUsLmOxCfPwCePI8X
+Iu41qnP1ZZcy3p/PiLUSxRA=
+=E01Q
 -----END PGP SIGNATURE-----
diff --git a/app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch b/app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch
index 3d42c17e5297..6bd2e5470c4a 100644
--- a/app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch
+++ b/app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch
@@ -1,6 +1,10 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN logrotate-3.7.7.orig/config.c logrotate-3.7.7/config.c
---- logrotate-3.7.7.orig/config.c	2008-05-09 03:28:59.000000000 -0400
-+++ logrotate-3.7.7/config.c	2009-01-13 16:48:13.000000000 -0500
+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
 @@ -1,5 +1,7 @@
  #include <sys/queue.h>
 +#ifndef NO_ALLOCA_H
@@ -9,9 +13,18 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN logrotate-3.7.7.orig/con
  #include <ctype.h>
  #include <dirent.h>
  #include <errno.h>
-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	2009-01-13 16:48:12.000000000 -0500
+@@ -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
 @@ -1,5 +1,7 @@
  #include <sys/queue.h>
 +#ifndef NO_ALLOCA_H
@@ -20,3 +33,13 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN logrotate-3.7.7.orig/log
  #include <ctype.h>
  #include <dirent.h>
  #include <errno.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"