Attachment 197830 Details for Bug 231265 – svn-diff-barnyard2_v3

[patch] svn-diff-barnyard2_v3

svn-diff-barnyard2 (text/plain), 2.17 KB, created by Walter Schwarzenfeld on 2018-10-06 13:10:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2018-10-06 13:10:57 UTC

Size: 2.17 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 480628)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> PORTNAME=	barnyard2
> PORTVERSION=	1.13
> DISTVERSIONPREFIX=	v2-
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	security
> 
> MAINTAINER=	bofh@FreeBSD.org
>Index: files/patch-spo__alert__fwsam.c
>===================================================================
>--- files/patch-spo__alert__fwsam.c	(nonexistent)
>+++ files/patch-spo__alert__fwsam.c	(working copy)
>@@ -0,0 +1,48 @@
>+--- src/output-plugins/spo_alert_fwsam.c.orig	2018-09-24 20:29:16 UTC
>++++ src/output-plugins/spo_alert_fwsam.c
>+@@ -115,7 +115,7 @@
>+ #include <sys/filio.h>
>+ #endif
>+ 
>+-typedef int SOCKET;
>++//typedef int SOCKET;
>+ 
>+ #ifndef INVALID_SOCKET
>+ #define INVALID_SOCKET  -1
>+@@ -617,7 +617,8 @@ int FWsamReadLine(char *buf,unsigned lon
>+         p=buf;
>+         while(isspace(*p))
>+           p++;
>+-        if(p>buf);
>++        if(p>buf)
>++	;
>+             strcpy(buf,p);
>+         if(*buf)
>+         {
>+@@ -961,7 +962,7 @@ void AlertFWsam(Packet *p, void *event, 
>+     FWsamPacket sampacket;
>+     FWsamStation *station=NULL;
>+     FWsamList *fwsamlist;
>+-    SOCKET stationsocket;
>++    int stationsocket;
>+     int i,len,deletestation,stationtry=0;
>+     char *encbuf,*decbuf;
>+     static unsigned long lastbsip[FWSAM_REPET_BLOCKS];
>+@@ -1387,7 +1388,7 @@ void AlertFWsam(Packet *p, void *event, 
>+ void FWsamCheckOut(FWsamStation *station)
>+ {
>+     FWsamPacket sampacket;
>+-    SOCKET stationsocket;
>++    int stationsocket;
>+     int i,len;
>+     char *encbuf,*decbuf;
>+ 
>+@@ -1538,7 +1539,7 @@ int FWsamCheckIn(FWsamStation *station)
>+     int i,len,stationok=TRUE;
>+     FWsamPacket sampacket;
>+     char *encbuf,*decbuf;
>+-    SOCKET stationsocket;
>++    int stationsocket;
>+ 
>+ 
>+     /* create a socket for the station */
>
>Property changes on: files/patch-spo__alert__fwsam.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 231265: 197464 | 197821 | 197830 | 197831