ports/148240: security/barnyard2, port upgrade to new version

[Paul Schmehl]

>Number:         148240
>Category:       ports
>Synopsis:       security/barnyard2, port upgrade to new version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 29 18:20:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Paul Schmehl
>Release:        FreeBSD 8.0-STABLE i386
>Organization:
University of Texas at Dallas
>Environment:
System: FreeBSD hostname.utdallas.edu 8.0-STABLE FreeBSD 8.0-STABLE #15: Mon Apr 26 09:09:25 CDT 2010 root@:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	security/barnyard2, upgrade to version 1.8
	fix problem with edited conf file being overwritten
	correct paths in default conf file
>How-To-Repeat:
	
>Fix:

	

--- patch-Makefile begins here ---
--- Makefile.orig	2010-06-28 15:28:01.000000000 -0500
+++ Makefile	2010-06-29 09:48:25.000000000 -0500
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	barnyard2
-PORTVERSION=	1.7
+PORTVERSION=	1.8
 CATEGORIES=	security
 MASTER_SITES=	http://www.securixlive.com/download/barnyard2/
 
@@ -45,7 +45,6 @@
 post-install:
 
 .for f in barnyard2.conf
-	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}-sample
 	[ -f ${PREFIX}/etc/${f} ] || \
 	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}
 .endfor
--- patch-Makefile ends here ---

--- patch-distinfo begins here ---
--- distinfo.orig	2010-06-28 15:28:07.000000000 -0500
+++ distinfo	2010-06-29 09:23:10.000000000 -0500
@@ -1,3 +1,3 @@
-MD5 (barnyard2-1.7.tar.gz) = 6801649c45287799354e0a458af737ef
-SHA256 (barnyard2-1.7.tar.gz) = a9bd56c2887111f3c114e82fc9277ee759a5005374081136e76d950ff390fd1b
-SIZE (barnyard2-1.7.tar.gz) = 652605
+MD5 (barnyard2-1.8.tar.gz) = 72fc6c490db6ea6a0f46c27d24998067
+SHA256 (barnyard2-1.8.tar.gz) = 1abfe6530d721debd98921421722b02c844c289564730b1e85729e4915b2bb7a
+SIZE (barnyard2-1.8.tar.gz) = 654290
--- patch-distinfo ends here ---

--- patch-etc__Makefile.in begins here ---
--- ./etc/Makefile.in.orig	2010-06-29 09:45:13.000000000 -0500
+++ ./etc/Makefile.in	2010-06-29 09:46:22.000000000 -0500
@@ -249,7 +249,7 @@
 	done | $(am__base_list) | \
 	while read files; do \
 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)/$$files-sample" || exit $$?; \
 	done
 
 uninstall-sysconfDATA:
--- patch-etc__Makefile.in ends here ---

--- patch-etc__barnyard2.conf begins here ---
--- ./etc/barnyard2.conf.orig	2010-06-29 13:06:14.000000000 -0500
+++ ./etc/barnyard2.conf	2010-06-29 13:07:49.000000000 -0500
@@ -26,10 +26,10 @@
 
 # set the appropriate paths to the file(s) your Snort process is using.
 #
-config reference_file:	    /etc/snort/reference.config
-config classification_file: /etc/snort/classification.config
-config gen_file:            /etc/snort/gen-msg.map
-config sid_file:	        /etc/snort/sid-msg.map
+config reference_file:	    /usr/local/etc/snort/reference.config
+config classification_file: /usr/local/etc/snort/classification.config
+config gen_file:            /usr/local/etc/snort/gen-msg.map
+config sid_file:	        /usr/local/etc/snort/sid-msg.map
 
 # define dedicated references similar to that of snort.
 #
@@ -50,7 +50,7 @@
 #
 # Example:
 #   For a snort process as follows:
-#     snort -i eth0 -c /etc/snort.conf
+#     snort -i eth0 -c /usr/local/etc/snort.conf
 #
 #   Typical options would be:
 #     config hostname:	thor
--- patch-etc__barnyard2.conf ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: