From nobody@FreeBSD.org  Wed Jan  6 01:20:16 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 90A64106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  6 Jan 2010 01:20:16 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 7EEE98FC16
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  6 Jan 2010 01:20:16 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o061KG8x048422
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 6 Jan 2010 01:20:16 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o061KGoB048421;
	Wed, 6 Jan 2010 01:20:16 GMT
	(envelope-from nobody)
Message-Id: <201001060120.o061KGoB048421@www.freebsd.org>
Date: Wed, 6 Jan 2010 01:20:16 GMT
From: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer-update] - update sysutils/rsyslog5 to version 5.3.5
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         142368
>Category:       ports
>Synopsis:       [maintainer-update] - update sysutils/rsyslog5 to version 5.3.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 06 01:30:06 UTC 2010
>Closed-Date:    Thu Jan 07 04:53:16 UTC 2010
>Last-Modified:  Thu Jan 07 04:53:16 UTC 2010
>Originator:     Cristiano Rolim Pereira
>Release:        8.0-RELEASE
>Organization:
>Environment:
FreeBSD bsd8.casa 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Sat Nov 21 15:02:08 UTC 2009     root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
The attached diff updates sysutils/rsyslog5 to version 5.3.5.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN ../rsyslog5.orig/Makefile ./Makefile
--- ../rsyslog5.orig/Makefile	2010-01-05 10:29:53.000000000 -0200
+++ ./Makefile	2010-01-05 12:20:21.000000000 -0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	5.3.3
+PORTVERSION=	5.3.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.rsyslog.com/rsyslog/
 .ifdef MNAME
@@ -22,7 +22,7 @@
 PLIST=		${.CURDIR}/pkg-plist
 .endif
 
-CONFLICTS=	rsyslog-[2-4].[0-9]*
+CONFLICTS=	rsyslog-[!5].[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
diff -ruN ../rsyslog5.orig/distinfo ./distinfo
--- ../rsyslog5.orig/distinfo	2010-01-05 10:29:53.000000000 -0200
+++ ./distinfo	2010-01-05 10:20:20.000000000 -0200
@@ -1,4 +1,3 @@
-MD5 (rsyslog-5.3.3.tar.gz) = 837e50ff8d162e1a00ba0fd16b7f0d8d
-SHA256 (rsyslog-5.3.3.tar.gz) = 
-6cf261ce1ea2972d369e845374bfa4984eaab1d918375d4f2e301e18461a992b
-SIZE (rsyslog-5.3.3.tar.gz) = 2059714
+MD5 (rsyslog-5.3.5.tar.gz) = 9674d29619c9674cf331abdc64e6fffe
+SHA256 (rsyslog-5.3.5.tar.gz) = 6c75268632e0f54c099375f8e23094cdbe9bb832853792ba3d750bc6e47681ab
+SIZE (rsyslog-5.3.5.tar.gz) = 2095715
diff -ruN ../rsyslog5.orig/files/pkg-message.in ./files/pkg-message.in
--- ../rsyslog5.orig/files/pkg-message.in	2010-01-05 10:29:53.000000000 -0200
+++ ./files/pkg-message.in	2010-01-05 10:17:28.000000000 -0200
@@ -5,7 +5,7 @@
  rsyslogd_enable="YES"
 To avoid warnings about rsyslogd running in compatibility mode, add
 this:
- rsyslogd_flags="-c3"
+ rsyslogd_flags="-c5"
 It's recommended to copy syslog.conf(5) to
 %%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add
 this:
diff -ruN ../rsyslog5.orig/pkg-plist ./pkg-plist
--- ../rsyslog5.orig/pkg-plist	2010-01-05 10:29:53.000000000 -0200
+++ ./pkg-plist	2010-01-05 12:29:21.000000000 -0200
@@ -30,6 +30,8 @@
 lib/rsyslog/lmzlibw.so
 lib/rsyslog/ommail.la
 lib/rsyslog/ommail.so
+lib/rsyslog/omruleset.la
+lib/rsyslog/omruleset.so
 lib/rsyslog/omtesting.la
 lib/rsyslog/omtesting.so
 sbin/rsyslogd
@@ -107,6 +109,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_modload.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_repeatedmsgreduction.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_resetconfigvariables.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_rulesetcreatemainqueue.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_rulesetparser.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_umask.html
 %%PORTDOCS%%%%DOCSDIR%%/rscript_abnf.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf.html


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Wed Jan 6 06:14:58 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142368: commit references a PR
Date: Thu,  7 Jan 2010 04:46:17 +0000 (UTC)

 pgollucci    2010-01-07 04:46:04 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/rsyslog5    Makefile distinfo pkg-plist 
     sysutils/rsyslog5/files pkg-message.in 
   Log:
   - Update to 5.3.5
   
   PR:             ports/142368
   Submitted by:   Cristiano Rolim Pereira <cristianorolim@hotmail.com> (maintainer)
   
   Revision  Changes    Path
   1.10      +2 -2      ports/sysutils/rsyslog5/Makefile
   1.10      +3 -4      ports/sysutils/rsyslog5/distinfo
   1.4       +1 -1      ports/sysutils/rsyslog5/files/pkg-message.in
   1.7       +4 -0      ports/sysutils/rsyslog5/pkg-plist
 _______________________________________________
 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: pgollucci 
State-Changed-When: Thu Jan 7 04:53:15 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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