Index: head/security/barnyard/Makefile =================================================================== --- head/security/barnyard/Makefile (revision 204980) +++ head/security/barnyard/Makefile (revision 204981) @@ -1,60 +1,68 @@ # New ports collection makefile for: barnyard # Date created: 1 Feb 2005 # Whom: pauls # # $FreeBSD$ # PORTNAME= barnyard PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= barnyard MAINTAINER= pauls@utdallas.edu COMMENT?= An output system for Snort RUN_DEPENDS+= ${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort -OPTIONS= MYSQL "Enable MySQL support" off \ +OPTIONS= MYSQL "Enable MySQL support" on \ POSTGRESQL "Enable PostgreSQL support" off USE_AUTOTOOLS= autoheader:261 aclocal:19 USE_RC_SUBR= barnyard.sh GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} SLAVEDIRS= security/barnyard-sguil6 SUB_FILES= pkg-message DOCS= AUTHORS COPYING LICENSE.QPL README PORTDOCS= BUGS ChangeLog FAQ INSTALL NEWS USAGE .include .if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+= --enable-mysql .endif .if defined(WITH_POSTGRESQL) USE_PGSQL= yes CONFIGURE_ARGS+= --enable-postgres +.endif + +.if ${ARCH} == "amd64" || ${ARCH} =="ia64" || ${ARCH} == "sparc64" +EXTRA_PATCHES+= ${FILESDIR}/64-bit-barnyard.h \ + ${FILESDIR}/64-bit-input-plugins-dp-alert.h \ + ${FILESDIR}/64-bit-util.h \ + ${FILESDIR}/64-bit-event.h \ + ${FILESDIR}/64-bit-util.c .endif post-install: .for f in barnyard.conf ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}-sample [ -f ${PREFIX}/etc/${f} ] || \ ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f} .endfor .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/security/barnyard/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/security/barnyard/files/64-bit-barnyard.h =================================================================== --- head/security/barnyard/files/64-bit-barnyard.h (nonexistent) +++ head/security/barnyard/files/64-bit-barnyard.h (revision 204981) @@ -0,0 +1,12 @@ +--- src/barnyard.h 2004-05-01 12:43:29.000000000 -0400 ++++ src/barnyard.h 2007-08-11 23:22:53.000000000 -0400 +@@ -34,7 +34,8 @@ + + typedef struct _SnortPktHeader + { +- struct timeval ts; /* packet timestamp */ ++ // struct timeval ts; /* packet timestamp */ ++ struct pcap_timeval ts; /* packet timestamp */ + u_int32_t caplen; /* packet capture length */ + u_int32_t pktlen; /* packet "real" length */ + } SnortPktHeader; Property changes on: head/security/barnyard/files/64-bit-barnyard.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/security/barnyard/files/64-bit-event.h =================================================================== --- head/security/barnyard/files/64-bit-event.h (nonexistent) +++ head/security/barnyard/files/64-bit-event.h (revision 204981) @@ -0,0 +1,23 @@ +--- src/event.h 2003-05-02 22:44:12.000000000 -0400 ++++ src/event.h 2007-08-12 00:13:44.000000000 -0400 +@@ -19,6 +19,11 @@ + #include + #include + ++struct pcap_timeval { ++ u_int32_t tv_sec; /* seconds */ ++ u_int32_t tv_usec; /* microseconds */ ++}; ++ + typedef struct _Event + { + u_int32_t sig_generator; /* which part of snort generated the alert? */ +@@ -30,6 +35,7 @@ + u_int32_t event_reference; /* reference to other events that have gone off, + * such as in the case of tagged packets... + */ +- struct timeval ref_time; /* reference time for the event reference */ ++ // struct timeval ref_time; /* reference time for the event reference */ ++ struct pcap_timeval ref_time; /* reference time for the event reference */ + } Event; + #endif /* __EVENT_H__ */ Property changes on: head/security/barnyard/files/64-bit-event.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/security/barnyard/files/64-bit-input-plugins-dp-alert.h =================================================================== --- head/security/barnyard/files/64-bit-input-plugins-dp-alert.h (nonexistent) +++ head/security/barnyard/files/64-bit-input-plugins-dp-alert.h (revision 204981) @@ -0,0 +1,12 @@ +--- src/input-plugins/dp_alert.h 2004-02-19 20:59:48.000000000 -0500 ++++ src/input-plugins/dp_alert.h 2007-08-11 23:24:25.000000000 -0400 +@@ -34,7 +34,8 @@ + typedef struct _UnifiedAlertRecord + { + Event event; +- struct timeval ts; /* event timestamp */ ++ // struct timeval ts; /* event timestamp */ ++ struct pcap_timeval ts; /* event timestamp */ + u_int32_t sip; /* src ip */ + u_int32_t dip; /* dest ip */ + u_int16_t sp; /* src port */ Property changes on: head/security/barnyard/files/64-bit-input-plugins-dp-alert.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/security/barnyard/files/64-bit-util.c =================================================================== --- head/security/barnyard/files/64-bit-util.c (nonexistent) +++ head/security/barnyard/files/64-bit-util.c (revision 204981) @@ -0,0 +1,12 @@ +--- src/util.c 2004-03-06 17:30:15.000000000 -0500 ++++ src/util.c 2007-08-12 00:14:52.000000000 -0400 +@@ -514,7 +514,8 @@ + + static char tmpbuf[256]; + +-int RenderTimeval(struct timeval *tv, char *timebuf, size_t len) ++// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len) ++int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len) + { + struct tm *lt; + time_t timet; Property changes on: head/security/barnyard/files/64-bit-util.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/security/barnyard/files/64-bit-util.h =================================================================== --- head/security/barnyard/files/64-bit-util.h (nonexistent) +++ head/security/barnyard/files/64-bit-util.h (revision 204981) @@ -0,0 +1,12 @@ +--- src/util.h 2004-03-06 19:23:50.000000000 -0500 ++++ src/util.h 2007-08-11 23:23:46.000000000 -0400 +@@ -39,7 +39,8 @@ + void ClearDumpBuf(); + void GoDaemon(); + size_t RenderTimestamp(time_t timet, char *timebuf, size_t len); +-int RenderTimeval(struct timeval *tv, char *timebuf, size_t len); ++// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len); ++int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len); + int CreatePidFile(char *filename); + int String2Long(char *string, long *result); + int String2ULong(char *string, unsigned long *result); Property changes on: head/security/barnyard/files/64-bit-util.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property