Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Jun 2011 07:59:50 -0500 (CDT)
From:      Jim Riggs <ports@christianserving.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        pgollucci@FreeBSD.org
Subject:   ports/158346: [PATCH] sysutils/rsyslog: update to 6.1.9
Message-ID:  <20110627125950.1EA5827D82F@zion.christianserving.org>
Resent-Message-ID: <201106271320.p5RDKBgs097497@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         158346
>Category:       ports
>Synopsis:       [PATCH] sysutils/rsyslog: update to 6.1.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 27 13:20:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jim Riggs
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD syslog 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011
>Description:
- Update to 6.1.9
- This update requires the devel/libee and devel/libestr ports submitted separately.

Removed file(s):
- files/patch-Makefile.in

Port maintainer (pgollucci@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- rsyslog-6.1.9.patch begins here ---
diff -ruN --exclude=CVS /root/rsyslog6-devel.orig/Makefile /root/rsyslog6-devel/Makefile
--- /root/rsyslog6-devel.orig/Makefile	2011-06-05 13:43:14.000000000 -0500
+++ /root/rsyslog6-devel/Makefile	2011-06-21 14:47:50.761917180 -0500
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	6.1.1
-PORTREVISION?=	1
+PORTVERSION=	6.1.9
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 .ifdef MNAME
@@ -17,11 +16,15 @@
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT?=	Syslogd supporting SQL, TCP and TLS
 
+USE_LDCONFIG=	yes
+
 .ifdef MNAME
 RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6-devel
 PLIST=		${.CURDIR}/pkg-plist
 LATEST_LINK=	rsyslog6-devel-${MNAME}
 .else
+LIB_DEPENDS=	ee:${PORTSDIR}/devel/libee \
+		estr:${PORTSDIR}/devel/libestr
 LATEST_LINK=	rsyslog6-devel
 .endif
 
@@ -35,7 +38,7 @@
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sane-hostname
 .endif
 
-CONFLICTS=	rsyslog-devel-[!6].[0-9]* 
+CONFLICTS=	rsyslog-devel-[!6].[0-9]*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
@@ -48,7 +51,7 @@
 .if ${ARCH} == "i386"
 CPPFLAGS+=-march=i686
 .endif
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" LIBESTR_CFLAGS="${CPPFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr"  LIBEE_CFLAGS="${CPPFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee"
 
 .ifndef MNAME
 MAN8=	rsyslogd.8
diff -ruN --exclude=CVS /root/rsyslog6-devel.orig/distinfo /root/rsyslog6-devel/distinfo
--- /root/rsyslog6-devel.orig/distinfo	2010-12-10 00:44:20.000000000 -0600
+++ /root/rsyslog6-devel/distinfo	2011-06-20 12:08:51.138101000 -0500
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-6.1.1.tar.gz) = 970d1ae88ea544ff916a61c572afbe7a4617ef675b6a017812bb67a78265f00f
-SIZE (rsyslog-6.1.1.tar.gz) = 2312617
+SHA256 (rsyslog-6.1.9.tar.gz) = b6672a95ada4946e4e7caa8cb163f3bcb271cf838b39801736019ea7bb1f034e
+SIZE (rsyslog-6.1.9.tar.gz) = 2407312
diff -ruN --exclude=CVS /root/rsyslog6-devel.orig/files/patch-Makefile.in /root/rsyslog6-devel/files/patch-Makefile.in
--- /root/rsyslog6-devel.orig/files/patch-Makefile.in	2010-12-10 00:44:20.000000000 -0600
+++ /root/rsyslog6-devel/files/patch-Makefile.in	1969-12-31 18:00:00.000000000 -0600
@@ -1,19 +0,0 @@
---- ./Makefile.in.orig	2010-11-30 10:45:25.000000000 +0000
-+++ ./Makefile.in	2010-12-10 06:41:03.768306480 +0000
-@@ -54,7 +54,6 @@
- @ENABLE_PGSQL_TRUE@am__append_11 = plugins/ompgsql
- @ENABLE_SNMP_TRUE@am__append_12 = plugins/omsnmp
- @ENABLE_CUST1_TRUE@am__append_13 = plugins/cust1
--@ENABLE_IMTEMPLATE_TRUE@am__append_14 = plugins/imtemplate
- @ENABLE_OMSTDOUT_TRUE@am__append_15 = plugins/omstdout
- @ENABLE_PMLASTMSG_TRUE@am__append_16 = plugins/pmlastmsg
- @ENABLE_PMRFC3164SD_TRUE@am__append_17 = plugins/pmrfc3164sd
-@@ -203,7 +202,7 @@
- 	plugins/omgssapi plugins/imgssapi plugins/omrelp \
- 	plugins/imrelp plugins/ommysql plugins/omlibdbi \
- 	plugins/ompgsql plugins/omsnmp plugins/cust1 \
--	plugins/imtemplate plugins/omstdout plugins/pmlastmsg \
-+	plugins/omstdout plugins/pmlastmsg \
- 	plugins/pmrfc3164sd plugins/omruleset plugins/omdbalerting \
- 	plugins/omudpspoof plugins/omuxsock plugins/omhdfs \
- 	plugins/omtemplate plugins/imfile plugins/imptcp \
diff -ruN --exclude=CVS /root/rsyslog6-devel.orig/pkg-plist /root/rsyslog6-devel/pkg-plist
--- /root/rsyslog6-devel.orig/pkg-plist	2010-12-10 00:44:20.000000000 -0600
+++ /root/rsyslog6-devel/pkg-plist	2011-06-21 14:44:19.036128528 -0500
@@ -6,6 +6,8 @@
 lib/rsyslog/immark.so
 lib/rsyslog/imtcp.la
 lib/rsyslog/imtcp.so
+lib/rsyslog/imtemplate.la
+lib/rsyslog/imtemplate.so
 lib/rsyslog/imudp.la
 lib/rsyslog/imudp.so
 lib/rsyslog/imuxsock.la
@@ -49,8 +51,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/imfile.html
 %%PORTDOCS%%%%DOCSDIR%%/imgssapi.html
 %%PORTDOCS%%%%DOCSDIR%%/imklog.html
-%%PORTDOCS%%%%DOCSDIR%%/imptcp.html
 %%PORTDOCS%%%%DOCSDIR%%/impstats.html
+%%PORTDOCS%%%%DOCSDIR%%/imptcp.html
 %%PORTDOCS%%%%DOCSDIR%%/imrelp.html
 %%PORTDOCS%%%%DOCSDIR%%/imsolaris.html
 %%PORTDOCS%%%%DOCSDIR%%/imtcp.html
@@ -61,6 +63,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/licensing.html
 %%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/mmnormalize.html
+%%PORTDOCS%%%%DOCSDIR%%/mmsnmptrapd.html
 %%PORTDOCS%%%%DOCSDIR%%/modules.html
 %%PORTDOCS%%%%DOCSDIR%%/multi_ruleset.html
 %%PORTDOCS%%%%DOCSDIR%%/netstream.html
--- rsyslog-6.1.9.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110627125950.1EA5827D82F>