svn commit: r309779 - in head/sysutils: . rsyslog7 rsyslog7/files

Brad Davis brd at FreeBSD.org
Tue Jan 1 19:38:30 UTC 2013 

Author: brd (doc committer)
Date: Tue Jan  1 19:38:28 2013
New Revision: 309779
URL: http://svnweb.freebsd.org/changeset/ports/309779

Log:
  - Add rsyslog 7.2.4
  
  Changes:	http://www.rsyslog.com/changelog-for-7-2-4-v7-stable/
  
  Reviewed by:	swills

Added:
  head/sysutils/rsyslog7/
     - copied from r309776, head/sysutils/rsyslog6/
Modified:
  head/sysutils/Makefile
  head/sysutils/rsyslog7/Makefile
  head/sysutils/rsyslog7/distinfo
  head/sysutils/rsyslog7/files/patch-grammar__lexer.l
  head/sysutils/rsyslog7/pkg-plist

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Tue Jan  1 19:28:52 2013	(r309778)
+++ head/sysutils/Makefile	Tue Jan  1 19:38:28 2013	(r309779)
@@ -789,6 +789,7 @@
     SUBDIR += rsyslog6-devel-relp
     SUBDIR += rsyslog6-devel-rfc3195
     SUBDIR += rsyslog6-devel-snmp
+    SUBDIR += rsyslog7
     SUBDIR += rtty
     SUBDIR += ruby-quota
     SUBDIR += rubygem-SyslogLogger

Modified: head/sysutils/rsyslog7/Makefile
==============================================================================
--- head/sysutils/rsyslog6/Makefile	Tue Jan  1 17:45:31 2013	(r309776)
+++ head/sysutils/rsyslog7/Makefile	Tue Jan  1 19:38:28 2013	(r309779)
@@ -1,13 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	rsyslog
-PORTVERSION=	6.6.0
+PORTVERSION=	7.2.4
 PORTREVISION?=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
-.ifdef MNAME
-PKGNAMESUFFIX?=	-${MNAME}
-.endif
 
 MAINTAINER=	brd at FreeBSD.org
 COMMENT?=	Syslogd supporting SQL, TCP, and TLS
@@ -17,18 +14,90 @@ USE_LDCONFIG=	yes
 LIB_DEPENDS+=	ee:${PORTSDIR}/devel/libee \
 		estr:${PORTSDIR}/devel/libestr \
 		sysinfo:${PORTSDIR}/devel/libsysinfo \
-		json:${PORTSDIR}/devel/json-c/ \
+		json.0:${PORTSDIR}/devel/json-c/ \
 		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
 
-.ifdef MNAME
-RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6
-PLIST=		${.CURDIR}/pkg-plist
-LATEST_LINK=	rsyslog6-${MNAME}
-.else
-LATEST_LINK=	rsyslog6
+PORTSCOUT=	limit:^6
+
+OPTIONS_DEFINE=	DBI GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP
+
+DBI_DESC=	LibDBI output module for rsyslog
+GNUTLS_DESC=	GNUTLS module for rsyslog
+GSSAPI_DESC=	GSS API input/output module for rsyslog
+MYSQL_DESC=	MySQL output module for rsyslog
+PGSQL_DESC=	PostgreSQL output module for rsyslog
+RELP_DESC=	RELP input/output module for rsyslog
+RFC3195_DESC=	RFC3195 input support for rsyslog
+SNMP_DESC=	SNMP trap sender for rsyslog
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDBI}
+LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
+USE_PKGCONFIG=	yes
+CONFIGURE_ARGS+=--enable-libdbi
+PLIST_FILES+=	lib/rsyslog/omlibdbi.la \
+		lib/rsyslog/omlibdbi.so
+.endif
+
+.if ${PORT_OPTIONS:MGNUTLS}
+LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls \
+		gcrypt.18:${PORTSDIR}/security/libgcrypt
+USE_PKGCONFIG=	yes
+CONFIGURE_ARGS+=--enable-gnutls
+PLIST_FILES+=	lib/rsyslog/lmnsd_gtls.la \
+		lib/rsyslog/lmnsd_gtls.so
+.endif
+
+.if ${PORT_OPTIONS:MGSSAPI}
+CONFIGURE_ARGS+=--enable-gssapi-krb5
+PLIST_FILES+=	lib/rsyslog/imgssapi.la \
+		lib/rsyslog/imgssapi.so \
+		lib/rsyslog/lmgssutil.la \
+		lib/rsyslog/lmgssutil.so \
+		lib/rsyslog/omgssapi.la \
+		lib/rsyslog/omgssapi.so
+.endif
+
+.if ${PORT_OPTIONS:MMYSQL}
+USE_MYSQL=	yes
+CONFIGURE_ARGS+=--enable-mysql
+PLIST_FILES+=	lib/rsyslog/ommysql.so \
+					lib/rsyslog/ommysql.la
+.endif
+
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PGSQL=	yes
+CONFIGURE_ARGS+=--enable-pgsql
+PLIST_FILES+=	lib/rsyslog/ompgsql.so \
+					lib/rsyslog/ompgsql.la
+.endif
+
+.if ${PORT_OPTIONS:MRELP}
+LIB_DEPENDS+=	relp.0:${PORTSDIR}/devel/librelp
+USE_PKGCONFIG=	yes
+CONFIGURE_ARGS+=--enable-relp
+PLIST_FILES+=	lib/rsyslog/imrelp.la \
+		lib/rsyslog/imrelp.so \
+		lib/rsyslog/omrelp.la \
+		lib/rsyslog/omrelp.so
+.endif
+
+.if ${PORT_OPTIONS:MRFC3195}
+LIB_DEPENDS+=	logging.0:${PORTSDIR}/devel/liblogging
+USE_PKGCONFIG=	yes
+CONFIGURE_ARGS+=--enable-rfc3195
+PLIST_FILES+=	lib/rsyslog/im3195.la \
+		lib/rsyslog/im3195.so
+.endif
+
+.if ${PORT_OPTIONS:MSNMP}
+LIB_DEPENDS+=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
+CONFIGURE_ARGS+=--enable-snmp
+PLIST_FILES+=	lib/rsyslog/omsnmp.la \
+		lib/rsyslog/omsnmp.so
 .endif
 
-PORTSCOUT=	limit:^6
 
 .ifdef WITH_MYSQL_MICROSECONDS
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mysql-microseconds
@@ -38,7 +107,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sane-hostname
 .endif
 
-CONFLICTS=	rsyslog-[57].[0-9]*
+CONFLICTS=	rsyslog-[56].[0-9]*
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -57,7 +126,6 @@ CPPFLAGS+=-march=i686
 CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lsysinfo -lkvm"
 CFLAGS+=	${CPPFLAGS}
 
-.ifndef MNAME
 MAN8=	rsyslogd.8
 MAN5=	rsyslog.conf.5
 
@@ -86,15 +154,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
-.endif
-
-.ifdef MNAME
-
-CONFIGURE_ARGS+=	--disable-rsyslogd --disable-klog --disable-testbench --disable-omruleset
-
-DESCR?=		${.CURDIR}/../rsyslog6/pkg-descr
-DISTINFO_FILE?=	${.CURDIR}/../rsyslog6/distinfo
-.endif
 
 .if ${OSVERSION} < 700042
 USE_GCC=	4.2+

Modified: head/sysutils/rsyslog7/distinfo
==============================================================================
--- head/sysutils/rsyslog6/distinfo	Tue Jan  1 17:45:31 2013	(r309776)
+++ head/sysutils/rsyslog7/distinfo	Tue Jan  1 19:38:28 2013	(r309779)
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-6.6.0.tar.gz) = 80aabccf5945d7e26152a2ad29100e147d1fecb300397dc4ccda41acaf2ec33d
-SIZE (rsyslog-6.6.0.tar.gz) = 2672981
+SHA256 (rsyslog-7.2.4.tar.gz) = 90af55f696db3209a9ef28d8e8052c48917479dd994838f5ef678b1f701c4540
+SIZE (rsyslog-7.2.4.tar.gz) = 2702981

Modified: head/sysutils/rsyslog7/files/patch-grammar__lexer.l
==============================================================================
--- head/sysutils/rsyslog6/files/patch-grammar__lexer.l	Tue Jan  1 17:45:31 2013	(r309776)
+++ head/sysutils/rsyslog7/files/patch-grammar__lexer.l	Tue Jan  1 19:38:28 2013	(r309779)
@@ -1,9 +1,9 @@
---- grammar/lexer.l.orig	2012-09-09 19:56:44.000000000 -0600
-+++ grammar/lexer.l	2012-09-09 19:56:56.000000000 -0600
-@@ -87,7 +87,7 @@
+--- grammar/lexer.l.ori	2012-12-31 21:57:37.000000000 -0700
++++ grammar/lexer.l	2012-12-31 21:57:51.000000000 -0700
+@@ -88,7 +88,7 @@
+ /* somehow, I need these prototype even though the headers are 
   * included. I guess that's some autotools magic I don't understand...
   */
- //char *strdup(char*);
 -int fileno(FILE *stream);
 +//int fileno(FILE *stream);
  

Modified: head/sysutils/rsyslog7/pkg-plist
==============================================================================
--- head/sysutils/rsyslog6/pkg-plist	Tue Jan  1 17:45:31 2013	(r309776)
+++ head/sysutils/rsyslog7/pkg-plist	Tue Jan  1 19:38:28 2013	(r309779)
@@ -57,6 +57,7 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/imfile.html
 %%PORTDOCS%%%%DOCSDIR%%/imgssapi.html
 %%PORTDOCS%%%%DOCSDIR%%/imklog.html
+%%PORTDOCS%%%%DOCSDIR%%/imkmsg.html
 %%PORTDOCS%%%%DOCSDIR%%/impstats.html
 %%PORTDOCS%%%%DOCSDIR%%/imptcp.html
 %%PORTDOCS%%%%DOCSDIR%%/imrelp.html
@@ -75,6 +76,7 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/mmsnmptrapd.html
 %%PORTDOCS%%%%DOCSDIR%%/modules.html
 %%PORTDOCS%%%%DOCSDIR%%/multi_ruleset.html
+%%PORTDOCS%%%%DOCSDIR%%/multi_ruleset_legacy_format.html
 %%PORTDOCS%%%%DOCSDIR%%/netstream.html
 %%PORTDOCS%%%%DOCSDIR%%/ns_gtls.html
 %%PORTDOCS%%%%DOCSDIR%%/ns_ptcp.html
@@ -140,6 +142,7 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/rscript_abnf.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_actions.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_basic_structure.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_examples.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_file_syntax_differences.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_filter.html
@@ -178,6 +181,7 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/v4compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/v5compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/v6compatibility.html
+%%PORTDOCS%%%%DOCSDIR%%/v7compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/version_naming.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsyslog-example.conf
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%

More information about the svn-ports-all mailing list