Date: Wed, 12 Dec 2012 20:39:53 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308793 - in head/security/aide: . files Message-ID: <201212122039.qBCKdriQ042906@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Wed Dec 12 20:39:52 2012 New Revision: 308793 URL: http://svnweb.freebsd.org/changeset/ports/308793 Log: Fix FreeBSD 8.X compile issue discussed in aide mailing list (http://www.mail-archive.com/aide@cs.tut.fi/msg01621.html). Submitted by: ume Added: head/security/aide/files/patch-include__aide.h (contents, props changed) head/security/aide/files/patch-src__db_file.c (contents, props changed) Modified: head/security/aide/Makefile Modified: head/security/aide/Makefile ============================================================================== --- head/security/aide/Makefile Wed Dec 12 20:25:52 2012 (r308792) +++ head/security/aide/Makefile Wed Dec 12 20:39:52 2012 (r308793) @@ -7,6 +7,7 @@ PORTNAME= aide PORTVERSION= 0.15.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF \ http://www.cs.tut.fi/~rammer/ Added: head/security/aide/files/patch-include__aide.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/aide/files/patch-include__aide.h Wed Dec 12 20:39:52 2012 (r308793) @@ -0,0 +1,13 @@ +Index: include/aide.h +diff -u include/aide.h.orig include/aide.h +--- include/aide.h.orig 2010-08-09 02:39:31.000000000 +0900 ++++ include/aide.h 2012-10-30 02:24:36.845508733 +0900 +@@ -68,7 +68,7 @@ + # define HAVE_STRTOIMAX + #endif + +-#if SIZEOF_OFF64_T == SIZEOF_LONG_LONG ++#if AIDE_OFF_TYPE == off64_t && SIZEOF_OFF64_T == SIZEOF_LONG_LONG || AIDE_OFF_TYPE == off_t && SIZEOF_OFF_T == SIZEOF_LONG_LONG + # ifdef HAVE_STRTOLL + # define AIDE_STRTOLL_FUNC strtoll + # else Added: head/security/aide/files/patch-src__db_file.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/aide/files/patch-src__db_file.c Wed Dec 12 20:39:52 2012 (r308793) @@ -0,0 +1,13 @@ +Index: src/db_file.c +diff -u -p src/db_file.c.orig src/db_file.c +--- src/db_file.c.orig 2010-08-09 02:39:31.000000000 +0900 ++++ src/db_file.c 2012-10-30 02:25:43.671508126 +0900 +@@ -674,7 +674,7 @@ int db_writelong(AIDE_OFF_TYPE i,FILE* f + dofprintf(" "); + } + +-#if SIZEOF_OFF64_T == SIZEOF_LONG_LONG ++#if AIDE_OFF_TYPE == off64_t && SIZEOF_OFF64_T == SIZEOF_LONG_LONG || AIDE_OFF_TYPE == off_t && SIZEOF_OFF_T == SIZEOF_LONG_LONG + return dofprintf("%lli",(long long)i); + #else + return dofprintf("%li",i);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212122039.qBCKdriQ042906>