ports/138152: [patch] - update sysutils/rsyslog4 to version 4.4.0

Mon Aug 24 23:30:03 UTC 2009

>Number:         138152
>Category:       ports
>Synopsis:       [patch] - update sysutils/rsyslog4 to version 4.4.0
>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:   Mon Aug 24 23:30:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Cristiano Rolim Pereira
>Release:        7.2-RELEASE
>Organization:
>Environment:
FreeBSD bsd7.casa 7.2-RELEASE-p2 FreeBSD 7.2-RELEASE-p2 #0: Wed Jun 24 00:14:35 UTC 2009     root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
The attached diff updates sysutils/rsyslog4 to version 4.4.0.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN ../rsyslog4.orig/Makefile ./Makefile

--- ../rsyslog4.orig/Makefile	2009-07-18 12:26:38.000000000 -0300
+++ ./Makefile	2009-08-23 18:06:40.000000000 -0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	4.3.0
+PORTVERSION=	4.4.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.rsyslog.com/rsyslog/
 .ifdef MNAME
@@ -44,7 +44,7 @@
 USE_RC_SUBR=	${PORTNAME}d
 SUB_FILES=	pkg-message
 
-CONFIGURE_ARGS+=--enable-imfile --enable-mail --enable-imtemplate
+CONFIGURE_ARGS+=--enable-imfile --enable-mail --enable-imtemplate --enable-testbench=no
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
diff -ruN ../rsyslog4.orig/distinfo ./distinfo
--- ../rsyslog4.orig/distinfo	2009-07-18 12:26:38.000000000 -0300
+++ ./distinfo	2009-08-23 18:07:00.000000000 -0300
@@ -1,3 +1,3 @@
-MD5 (rsyslog-4.3.0.tar.gz) = 9faa3e5f3ce20998f371a2797ad87578
-SHA256 (rsyslog-4.3.0.tar.gz) = 54d8c352e7ac8320df6e20ba82105c2b65dbfb53bd6955225e5b368b27922fec
-SIZE (rsyslog-4.3.0.tar.gz) = 1399336
+MD5 (rsyslog-4.4.0.tar.gz) = 38840527892e215e5b69fde55af815d5
+SHA256 (rsyslog-4.4.0.tar.gz) = 4f517ed5e42f66e43501c2299c7af6d3d89f2ec60c9538a972134d0c08e97f9e
+SIZE (rsyslog-4.4.0.tar.gz) = 2040945
diff -ruN ../rsyslog4.orig/files/patch-Makefile.am ./files/patch-Makefile.am
--- ../rsyslog4.orig/files/patch-Makefile.am	1969-12-31 21:00:00.000000000 -0300
+++ ./files/patch-Makefile.am	2009-08-24 16:29:22.000000000 -0300
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2009-08-24 16:25:47.000000000 -0300
++++ Makefile.am	2009-08-24 16:26:23.000000000 -0300
+@@ -126,7 +126,7 @@
+ 
+ # tests are added as last element, because tests may need different
+ # modules that need to be generated first
+-SUBDIRS += tests
++#SUBDIRS += tests
+ 
+ 
+ # make sure "make distcheck" tries to build all modules. This means that
diff -ruN ../rsyslog4.orig/files/patch-Makefile.in ./files/patch-Makefile.in
--- ../rsyslog4.orig/files/patch-Makefile.in	1969-12-31 21:00:00.000000000 -0300
+++ ./files/patch-Makefile.in	2009-08-24 16:32:42.000000000 -0300
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2009-08-24 16:31:48.000000000 -0300
++++ Makefile.in	2009-08-24 16:32:10.000000000 -0300
+@@ -169,7 +169,7 @@
+ 	plugins/ompgsql plugins/omsnmp plugins/cust1 \
+ 	plugins/imtemplate plugins/omstdout plugins/omtemplate \
+ 	plugins/imfile plugins/imdiag plugins/ommail plugins/omprog \
+-	plugins/im3195 plugins/omoracle tests
++	plugins/im3195 plugins/omoracle
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -401,7 +401,7 @@
+ 	$(am__append_10) $(am__append_11) $(am__append_12) \
+ 	$(am__append_13) $(am__append_14) $(am__append_15) \
+ 	$(am__append_16) $(am__append_17) $(am__append_18) \
+-	$(am__append_19) $(am__append_20) tests
++	$(am__append_19) $(am__append_20)
+ 
+ # make sure "make distcheck" tries to build all modules. This means that
+ # a developer must always have an environment where every supporting library
diff -ruN ../rsyslog4.orig/pkg-descr ./pkg-descr
--- ../rsyslog4.orig/pkg-descr	2009-07-18 12:26:38.000000000 -0300
+++ ./pkg-descr	2009-07-18 12:30:21.000000000 -0300
@@ -13,6 +13,4 @@
 enterprise-class, encryption protected syslog relay chains while at the same
 time being very easy to setup for the novice user.
 
-Version 4.x.x is still in devel stage and can show stability issues.
-
 WWW: http://www.rsyslog.com/
diff -ruN ../rsyslog4.orig/pkg-plist ./pkg-plist
--- ../rsyslog4.orig/pkg-plist	2009-07-18 12:26:38.000000000 -0300
+++ ./pkg-plist	2009-08-24 16:57:49.000000000 -0300
@@ -20,6 +20,8 @@
 lib/rsyslog/lmnsd_ptcp.so
 lib/rsyslog/lmregexp.la
 lib/rsyslog/lmregexp.so
+lib/rsyslog/lmstrmsrv.la
+lib/rsyslog/lmstrmsrv.so
 lib/rsyslog/lmtcpclt.la
 lib/rsyslog/lmtcpclt.so
 lib/rsyslog/lmtcpsrv.la
@@ -70,6 +72,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic.jpg
 %%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic_small.jpg
 %%PORTDOCS%%%%DOCSDIR%%/queues.html
+%%PORTDOCS%%%%DOCSDIR%%/queues_analogy.html
 %%PORTDOCS%%%%DOCSDIR%%/rainerscript.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionexeconlywhenpreviousissuspended.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionresumeinterval.html
@@ -89,6 +92,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_filecreatemode.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_filegroup.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_fileowner.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_generateconfiggraph.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_gssforwardservicename.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_gsslistenservicename.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_gssmode.html


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

