From ohauer@FreeBSD.org  Mon Apr  4 23:58:13 2011
Return-Path: <ohauer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BC17106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Apr 2011 23:58:13 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from u18-124.dslaccess.de (unknown [194.231.39.124])
	by mx1.freebsd.org (Postfix) with ESMTP id DFB878FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Apr 2011 23:58:12 +0000 (UTC)
Received: by u18-124.dslaccess.de (Postfix, from userid 1100)
	id 912D0207BA; Tue,  5 Apr 2011 01:58:08 +0200 (CEST)
Message-Id: <20110404235808.912D0207BA@u18-124.dslaccess.de>
Date: Tue,  5 Apr 2011 01:58:08 +0200 (CEST)
From: Olli Hauer <ohauer@FreeBSD.org>
Reply-To: Olli Hauer <ohauer@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Paul Schmehl <pauls@utdallas.edu>
Subject: [patch] new port security/barnyard2-sguil
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         156188
>Category:       ports
>Synopsis:       [patch] new port security/barnyard2-sguil
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ohauer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 05 00:00:25 UTC 2011
>Closed-Date:    Sun May 15 17:35:20 UTC 2011
>Last-Modified:  Sun May 15 17:35:20 UTC 2011
>Originator:     Olli Hauer
>Release:        FreeBSD 7.4-RELEASE i386
>Organization:
>Environment:

>Description:
security/barnyard is gone now and security/barnyard-sguil should be removed
additional.

Since we do not need any patches to build this new port I don't prefer a repocopy.

The attached patch expires the old security/barnyard-sguil port and connects
the new port security/barnyard2-sguil to the tree.

Build was tested against pgsql-8.4.7 amd mysql-5.5.10 without issues.

Build logs:
http://people.freebsd.org/~ohauer/diffs/barnyard2-sguil_mysql.log
http://people.freebsd.org/~ohauer/diffs/barnyard2-sguil_pgsql.log

>How-To-Repeat:

>Fix:

--- barnyard2-sguil.patch begins here ---
--- /dev/null	2011-04-05 01:33:50.000000000 +0200
+++ barnyard2-sguil/Makefile	2011-04-05 01:31:09.000000000 +0200
@@ -0,0 +1,17 @@
+# New ports collection makefile for:	barnyard2-sguil
+# Date created:				23 Jan 2006
+# Whom:					pauls
+#
+# $FreeBSD$
+#
+
+PKGNAMESUFFIX=	-sguil
+COMMENT=	An output system for Snort or Suricata
+
+LIB_DEPENDS+=	tcl84.1:${PORTSDIR}/lang/tcl84
+
+MASTERDIR=	${.CURDIR}/../barnyard2
+
+CONFIGURE_ARGS+=	--with-tcl
+
+.include "${MASTERDIR}/Makefile"
Index: barnyard-sguil/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/barnyard-sguil/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- barnyard-sguil/Makefile	4 Apr 2011 21:50:12 -0000	1.5
+++ barnyard-sguil/Makefile	4 Apr 2011 23:34:52 -0000
@@ -9,7 +9,9 @@
 COMMENT=	An output system for Snort (patched for sguil)
 PORTREVISION=	1
 
-BROKEN= barnyard is gone and port does not build with barnyard2
+IGNORE=		Use security/barnyard2-squil instead
+EXPIRATION=	2011-04-30
+
 
 LIB_DEPENDS+=	tcl84.1:${PORTSDIR}/lang/tcl84
 
--- barnyard2-sguil.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ohauer 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Apr 5 00:00:40 UTC 2011 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156188 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/156188: commit references a PR
Date: Sun, 15 May 2011 17:10:50 +0000 (UTC)

 ohauer      2011-05-15 17:09:38 UTC
 
   FreeBSD ports repository
 
   Modified files:
     .                    MOVED 
     security             Makefile 
     security/barnyard2   Makefile 
   Added files:
     security/barnyard2/files patch-configure 
     security/barnyard2-sguil Makefile 
   Removed files:
     security/barnyard-sguil Makefile 
     security/barnyard-sguil/files patch-barnyard.conf 
                                   patch-configure.in 
                                   patch-op-sguil.c 
                                   patch-op_plugbase.c 
                                   patch-op_sguil.h 
   Log:
   - add patch to barnyard2 to allow build with postgresql and tcl
     (reported and fixed upstream)
   - display option TCL only for Master port, it makes no sense if
     the slave can de-select a required option
   - remove broken barnyard-sguil (master port was removed 2011-04-04)
   - add new port barnyard2-sguil [1]
   - add entry to MOVED
   
   PR:             ports/156188 [1]
   Submitted by:   me
   Approved by:    maintainer timeout
   
   Revision  Changes    Path
   1.2459    +3 -1      ports/MOVED
   1.1171    +1 -1      ports/security/Makefile
   1.6       +0 -21     ports/security/barnyard-sguil/Makefile (dead)
   1.3       +0 -150    ports/security/barnyard-sguil/files/patch-barnyard.conf (dead)
   1.3       +0 -74     ports/security/barnyard-sguil/files/patch-configure.in (dead)
   1.2       +0 -1873   ports/security/barnyard-sguil/files/patch-op-sguil.c (dead)
   1.2       +0 -20     ports/security/barnyard-sguil/files/patch-op_plugbase.c (dead)
   1.2       +0 -26     ports/security/barnyard-sguil/files/patch-op_sguil.h (dead)
   1.1       +12 -0     ports/security/barnyard2-sguil/Makefile (new)
   1.9       +10 -8     ports/security/barnyard2/Makefile
   1.1       +190 -0    ports/security/barnyard2/files/patch-configure (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: ohauer 
State-Changed-When: Sun May 15 17:34:23 UTC 2011 
State-Changed-Why:  
Committed, with minor changes 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156188 
>Unformatted:
