| 1 |
dang 09/01/25 19:42:46 |
| 2 |
|
| 3 |
Modified: logrotate-3.7.7-fbsd.patch |
| 4 |
Log: |
| 5 |
Real fix this time for bug #254795; thanks Javier |
| 6 |
(Portage version: 2.1.6.7/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: logrotate-3.7.7-fbsd.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/logrotate/files/logrotate-3.7.7-fbsd.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- logrotate-3.7.7-fbsd.patch 13 Jan 2009 21:52:35 -0000 1.1 |
| 22 |
+++ logrotate-3.7.7-fbsd.patch 25 Jan 2009 19:42:46 -0000 1.2 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN logrotate-3.7.7.orig/config.c logrotate-3.7.7/config.c |
| 25 |
---- logrotate-3.7.7.orig/config.c 2008-05-09 03:28:59.000000000 -0400 |
| 26 |
-+++ logrotate-3.7.7/config.c 2009-01-13 16:48:13.000000000 -0500 |
| 27 |
+Fix compilation on Gentoo/FreeBSD, no alloca.h here and PATH_MAX |
| 28 |
+is defined elsewhere. |
| 29 |
+ |
| 30 |
+See bug 254795 |
| 31 |
+ |
| 32 |
+--- logrotate-3.7.7.orig/config.c |
| 33 |
++++ logrotate-3.7.7/config.c |
| 34 |
@@ -1,5 +1,7 @@ |
| 35 |
#include <sys/queue.h> |
| 36 |
+#ifndef NO_ALLOCA_H |
| 37 |
@@ -9,9 +13,18 @@ |
| 38 |
#include <ctype.h> |
| 39 |
#include <dirent.h> |
| 40 |
#include <errno.h> |
| 41 |
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN logrotate-3.7.7.orig/logrotate.c logrotate-3.7.7/logrotate.c |
| 42 |
---- logrotate-3.7.7.orig/logrotate.c 2008-05-14 06:31:35.000000000 -0400 |
| 43 |
-+++ logrotate-3.7.7/logrotate.c 2009-01-13 16:48:12.000000000 -0500 |
| 44 |
+@@ -21,6 +21,9 @@ |
| 45 |
+ #include <wctype.h> |
| 46 |
+ #include <fnmatch.h> |
| 47 |
+ |
| 48 |
++#if !defined(PATH_MAX) && defined(__FreeBSD__) |
| 49 |
++#include <sys/param.h> |
| 50 |
++#endif |
| 51 |
+ #include "basenames.h" |
| 52 |
+ #include "log.h" |
| 53 |
+ #include "logrotate.h" |
| 54 |
+--- logrotate-3.7.7.orig/logrotate.c |
| 55 |
++++ logrotate-3.7.7/logrotate.c |
| 56 |
@@ -1,5 +1,7 @@ |
| 57 |
#include <sys/queue.h> |
| 58 |
+#ifndef NO_ALLOCA_H |
| 59 |
@@ -20,3 +33,13 @@ |
| 60 |
#include <ctype.h> |
| 61 |
#include <dirent.h> |
| 62 |
#include <errno.h> |
| 63 |
+@@ -24,6 +24,9 @@ |
| 64 |
+ int selinux_enforce = 0; |
| 65 |
+ #endif |
| 66 |
+ |
| 67 |
++#if !defined(PATH_MAX) && defined(__FreeBSD__) |
| 68 |
++#include <sys/param.h> |
| 69 |
++#endif |
| 70 |
+ #include "basenames.h" |
| 71 |
+ #include "log.h" |
| 72 |
+ #include "logrotate.h" |
Archives