Date: Sat, 25 May 2013 20:01:58 +0000 (UTC) From: Brad Davis <brd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319070 - in head/sysutils: . rsyslog7 rsyslog7-devel rsyslog7-devel/files Message-ID: <201305252001.r4PK1wkD076641@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brd (doc committer) Date: Sat May 25 20:01:57 2013 New Revision: 319070 URL: http://svnweb.freebsd.org/changeset/ports/319070 Log: - Update sysutils/rsyslog7 to 7.2.7 - Partially based on work in [1] - Convert to PORTDOCS= and PORTEXAMPLES= - Pet portlint - Add sysutils/rsyslog7-devel at version 7.3.15 PR: 176601 [1] Submitted by: Cristiano Rolim Pereira <cristianorolim at outlook.com> [1] Reviewed by: koobs@, jgh@ Added: head/sysutils/rsyslog7-devel/ - copied from r319068, head/sysutils/rsyslog7/ head/sysutils/rsyslog7-devel/files/patch-plugins--impstats--impstats.c (contents, props changed) head/sysutils/rsyslog7-devel/files/patch-runtime--cryprov.h (contents, props changed) head/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.c (contents, props changed) head/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.h (contents, props changed) head/sysutils/rsyslog7-devel/files/patch-runtime--lmcry_gcry.c (contents, props changed) head/sysutils/rsyslog7-devel/files/patch-runtime--queue.c (contents, props changed) head/sysutils/rsyslog7-devel/files/patch-runtime--stream.h (contents, props changed) Modified: head/sysutils/Makefile head/sysutils/rsyslog7-devel/Makefile head/sysutils/rsyslog7-devel/distinfo head/sysutils/rsyslog7-devel/pkg-descr head/sysutils/rsyslog7-devel/pkg-plist head/sysutils/rsyslog7/Makefile head/sysutils/rsyslog7/distinfo head/sysutils/rsyslog7/pkg-descr head/sysutils/rsyslog7/pkg-plist Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Sat May 25 19:48:21 2013 (r319069) +++ head/sysutils/Makefile Sat May 25 20:01:57 2013 (r319070) @@ -813,6 +813,7 @@ SUBDIR += rsyslog6-devel-rfc3195 SUBDIR += rsyslog6-devel-snmp SUBDIR += rsyslog7 + SUBDIR += rsyslog7-devel SUBDIR += rtty SUBDIR += ruby-quota SUBDIR += rubygem-SyslogLogger Modified: head/sysutils/rsyslog7-devel/Makefile ============================================================================== --- head/sysutils/rsyslog7/Makefile Sat May 25 19:12:28 2013 (r319068) +++ head/sysutils/rsyslog7-devel/Makefile Sat May 25 20:01:57 2013 (r319070) @@ -1,25 +1,30 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 7.2.4 -PORTREVISION?= 2 +PORTVERSION= 7.3.15 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER= brd@FreeBSD.org -COMMENT?= Syslogd supporting SQL, TCP, and TLS +COMMENT= Syslogd supporting SQL, TCP, and TLS +GNU_CONFIGURE= yes USE_LDCONFIG= yes -LIB_DEPENDS+= ee:${PORTSDIR}/devel/libee \ +LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \ estr:${PORTSDIR}/devel/libestr \ - sysinfo:${PORTSDIR}/devel/libsysinfo \ json.0:${PORTSDIR}/devel/json-c \ + sysinfo:${PORTSDIR}/devel/libsysinfo \ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid +BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt \ + rst2man:${PORTSDIR}/textproc/py-docutils + PORTSCOUT= limit:^6 +PORTDOCS= * +PORTEXAMPLES= * -OPTIONS_DEFINE= DBI GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP +OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP DBI_DESC= LibDBI output module for rsyslog GNUTLS_DESC= GNUTLS module for rsyslog @@ -38,6 +43,8 @@ USES+= pkgconfig CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ lib/rsyslog/omlibdbi.so +.else +CONFIGURE_ARGS+=--disable-libdbi .endif .if ${PORT_OPTIONS:MGNUTLS} @@ -47,6 +54,8 @@ USES+= pkgconfig CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ lib/rsyslog/lmnsd_gtls.so +.else +CONFIGURE_ARGS+=--disable-gnutls .endif .if ${PORT_OPTIONS:MGSSAPI} @@ -57,6 +66,8 @@ PLIST_FILES+= lib/rsyslog/imgssapi.la \ lib/rsyslog/lmgssutil.so \ lib/rsyslog/omgssapi.la \ lib/rsyslog/omgssapi.so +.else +CONFIGURE_ARGS+=--disable-gssapi-krb5 .endif .if ${PORT_OPTIONS:MMYSQL} @@ -64,6 +75,8 @@ USE_MYSQL= yes CONFIGURE_ARGS+=--enable-mysql PLIST_FILES+= lib/rsyslog/ommysql.so \ lib/rsyslog/ommysql.la +.else +CONFIGURE_ARGS+=--disable-mysql .endif .if ${PORT_OPTIONS:MPGSQL} @@ -71,6 +84,8 @@ USE_PGSQL= yes CONFIGURE_ARGS+=--enable-pgsql PLIST_FILES+= lib/rsyslog/ompgsql.so \ lib/rsyslog/ompgsql.la +.else +CONFIGURE_ARGS+=--disable-pgsql .endif .if ${PORT_OPTIONS:MRELP} @@ -81,6 +96,8 @@ PLIST_FILES+= lib/rsyslog/imrelp.la \ lib/rsyslog/imrelp.so \ lib/rsyslog/omrelp.la \ lib/rsyslog/omrelp.so +.else +CONFIGURE_ARGS+=--disable-relp .endif .if ${PORT_OPTIONS:MRFC3195} @@ -89,6 +106,8 @@ USES+= pkgconfig CONFIGURE_ARGS+=--enable-rfc3195 PLIST_FILES+= lib/rsyslog/im3195.la \ lib/rsyslog/im3195.so +.else +CONFIGURE_ARGS+=--disable-rfc3195 .endif .if ${PORT_OPTIONS:MSNMP} @@ -96,9 +115,10 @@ LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ lib/rsyslog/omsnmp.so +.else +CONFIGURE_ARGS+=--disable-snmp .endif - .ifdef WITH_MYSQL_MICROSECONDS EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds .endif @@ -111,7 +131,6 @@ CONFLICTS= rsyslog-[56].[0-9]* CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -GNU_CONFIGURE= yes .ifdef WITH_DEBUG CONFIGURE_ARGS+=--enable-rtinst --enable-debug @@ -143,12 +162,12 @@ post-patch: @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: -.ifndef NOPORTDOCS +.if ${PORT_OPTIONS:MDOCS} @${INSTALL} -d ${DOCSDIR}/ @${INSTALL_DATA} ${WRKSRC}/doc/*html ${DOCSDIR}/ @${INSTALL_DATA} ${WRKSRC}/doc/*jpg ${DOCSDIR}/ .endif -.ifndef NOPORTEXAMPLES +.if ${PORT_OPTIONS:MEXAMPLES} @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} .endif Modified: head/sysutils/rsyslog7-devel/distinfo ============================================================================== --- head/sysutils/rsyslog7/distinfo Sat May 25 19:12:28 2013 (r319068) +++ head/sysutils/rsyslog7-devel/distinfo Sat May 25 20:01:57 2013 (r319070) @@ -1,2 +1,2 @@ -SHA256 (rsyslog-7.2.4.tar.gz) = 90af55f696db3209a9ef28d8e8052c48917479dd994838f5ef678b1f701c4540 -SIZE (rsyslog-7.2.4.tar.gz) = 2702981 +SHA256 (rsyslog-7.3.15.tar.gz) = 8468c58ae28b713bfb19073fba7335644ea26e18aebcb5b83af679d3e5702cbd +SIZE (rsyslog-7.3.15.tar.gz) = 2920543 Added: head/sysutils/rsyslog7-devel/files/patch-plugins--impstats--impstats.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog7-devel/files/patch-plugins--impstats--impstats.c Sat May 25 20:01:57 2013 (r319070) @@ -0,0 +1,10 @@ +--- plugins/impstats/impstats.c.ori 2013-05-24 20:36:41.000000000 -0600 ++++ plugins/impstats/impstats.c 2013-05-24 20:36:56.000000000 -0600 +@@ -39,6 +39,7 @@ + #include "glbl.h" + #include "statsobj.h" + #include "prop.h" ++#include <sys/stat.h> + + MODULE_TYPE_INPUT + MODULE_TYPE_NOKEEP Added: head/sysutils/rsyslog7-devel/files/patch-runtime--cryprov.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog7-devel/files/patch-runtime--cryprov.h Sat May 25 20:01:57 2013 (r319070) @@ -0,0 +1,11 @@ +--- runtime/cryprov.h.ori 2013-05-24 19:47:48.000000000 -0600 ++++ runtime/cryprov.h 2013-05-24 20:20:40.000000000 -0600 +@@ -33,7 +33,7 @@ + rsRetVal (*Destruct)(void *ppThis); + rsRetVal (*OnFileOpen)(void *pThis, uchar *fn, void *pFileInstData); + rsRetVal (*Encrypt)(void *pFileInstData, uchar *buf, size_t *lenBuf); +- rsRetVal (*OnFileClose)(void *pFileInstData, off64_t offsLogfile); ++ rsRetVal (*OnFileClose)(void *pFileInstData, off_t offsLogfile); + ENDinterface(cryprov) + #define cryprovCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */ + #endif /* #ifndef INCLUDED_CRYPROV_H */ Added: head/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.c Sat May 25 20:01:57 2013 (r319070) @@ -0,0 +1,20 @@ +--- runtime/libgcry.c.ori 2013-05-24 20:24:27.000000000 -0600 ++++ runtime/libgcry.c 2013-05-24 20:24:52.000000000 -0600 +@@ -171,7 +171,7 @@ + * no matter what happens. + */ + static void +-eiClose(gcryfile gf, off64_t offsLogfile) ++eiClose(gcryfile gf, off_t offsLogfile) + { + char offs[21]; + size_t len; +@@ -213,7 +213,7 @@ + } + + int +-gcryfileDestruct(gcryfile gf, off64_t offsLogfile) ++gcryfileDestruct(gcryfile gf, off_t offsLogfile) + { + int r = 0; + if(gf == NULL) Added: head/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.h Sat May 25 20:01:57 2013 (r319070) @@ -0,0 +1,11 @@ +--- runtime/libgcry.h.ori 2013-05-24 20:23:45.000000000 -0600 ++++ runtime/libgcry.h 2013-05-24 20:24:03.000000000 -0600 +@@ -49,7 +49,7 @@ + rsRetVal rsgcrySetAlgo(gcryctx ctx, uchar *modename); + gcryctx gcryCtxNew(void); + void rsgcryCtxDel(gcryctx ctx); +-int gcryfileDestruct(gcryfile gf, off64_t offsLogfile); ++int gcryfileDestruct(gcryfile gf, off_t offsLogfile); + rsRetVal rsgcryInitCrypt(gcryctx ctx, gcryfile *pgf, uchar *fname); + int rsgcryEncrypt(gcryfile pF, uchar *buf, size_t *len); + Added: head/sysutils/rsyslog7-devel/files/patch-runtime--lmcry_gcry.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog7-devel/files/patch-runtime--lmcry_gcry.c Sat May 25 20:01:57 2013 (r319070) @@ -0,0 +1,11 @@ +--- runtime/lmcry_gcry.c.ori 2013-05-24 20:25:10.000000000 -0600 ++++ runtime/lmcry_gcry.c 2013-05-24 20:25:25.000000000 -0600 +@@ -216,7 +216,7 @@ + } + + static rsRetVal +-OnFileClose(void *pF, off64_t offsLogfile) ++OnFileClose(void *pF, off_t offsLogfile) + { + DEFiRet; + gcryfileDestruct(pF, offsLogfile); Added: head/sysutils/rsyslog7-devel/files/patch-runtime--queue.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog7-devel/files/patch-runtime--queue.c Sat May 25 20:01:57 2013 (r319070) @@ -0,0 +1,11 @@ +--- runtime/queue.c.ori 2013-05-24 20:22:54.000000000 -0600 ++++ runtime/queue.c 2013-05-24 20:23:07.000000000 -0600 +@@ -1449,7 +1449,7 @@ + DoDeleteBatchFromQStore(qqueue_t *pThis, int nElem) + { + int i; +- off64_t bytesDel; ++ off_t bytesDel; + DEFiRet; + + ISOBJ_TYPE_assert(pThis, qqueue); Added: head/sysutils/rsyslog7-devel/files/patch-runtime--stream.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog7-devel/files/patch-runtime--stream.h Sat May 25 20:01:57 2013 (r319070) @@ -0,0 +1,10 @@ +--- runtime/stream.h.ori 2013-05-24 20:21:51.000000000 -0600 ++++ runtime/stream.h 2013-05-24 20:21:11.000000000 -0600 +@@ -207,6 +207,6 @@ + + /* prototypes */ + PROTOTYPEObjClassInit(strm); +-rsRetVal strmMultiFileSeek(strm_t *pThis, int fileNum, off64_t offs, off64_t *bytesDel); ++rsRetVal strmMultiFileSeek(strm_t *pThis, int fileNum, off_t offs, off_t *bytesDel); + + #endif /* #ifndef STREAM_H_INCLUDED */ Modified: head/sysutils/rsyslog7-devel/pkg-descr ============================================================================== --- head/sysutils/rsyslog7/pkg-descr Sat May 25 19:12:28 2013 (r319068) +++ head/sysutils/rsyslog7-devel/pkg-descr Sat May 25 20:01:57 2013 (r319070) @@ -14,6 +14,6 @@ suitable for enterprise-class, encryptio chains while at the same time being very easy to setup for the novice user. -Tracking v6-devel +Tracking v7-devel WWW: http://www.rsyslog.com/ Modified: head/sysutils/rsyslog7-devel/pkg-plist ============================================================================== --- head/sysutils/rsyslog7/pkg-plist Sat May 25 19:12:28 2013 (r319068) +++ head/sysutils/rsyslog7-devel/pkg-plist Sat May 25 20:01:57 2013 (r319070) @@ -14,6 +14,8 @@ lib/rsyslog/imudp.la lib/rsyslog/imudp.so lib/rsyslog/imuxsock.la lib/rsyslog/imuxsock.so +lib/rsyslog/lmcry_gcry.la +lib/rsyslog/lmcry_gcry.so lib/rsyslog/lmnet.la lib/rsyslog/lmnet.so lib/rsyslog/lmnetstrms.la @@ -39,151 +41,4 @@ lib/rsyslog/omstdout.so lib/rsyslog/omtesting.la lib/rsyslog/omtesting.so sbin/rsyslogd -%%PORTDOCS%%%%DOCSDIR%%/bugs.html -%%PORTDOCS%%%%DOCSDIR%%/build_from_repo.html -%%PORTDOCS%%%%DOCSDIR%%/contributors.html -%%PORTDOCS%%%%DOCSDIR%%/debug.html -%%PORTDOCS%%%%DOCSDIR%%/dev_oplugins.html -%%PORTDOCS%%%%DOCSDIR%%/dev_queue.html -%%PORTDOCS%%%%DOCSDIR%%/droppriv.html -%%PORTDOCS%%%%DOCSDIR%%/expression.html -%%PORTDOCS%%%%DOCSDIR%%/features.html -%%PORTDOCS%%%%DOCSDIR%%/free_support.html -%%PORTDOCS%%%%DOCSDIR%%/generic_design.html -%%PORTDOCS%%%%DOCSDIR%%/gssapi.html -%%PORTDOCS%%%%DOCSDIR%%/history.html -%%PORTDOCS%%%%DOCSDIR%%/how2help.html -%%PORTDOCS%%%%DOCSDIR%%/im3195.html -%%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 -%%PORTDOCS%%%%DOCSDIR%%/imsolaris.html -%%PORTDOCS%%%%DOCSDIR%%/imtcp.html -%%PORTDOCS%%%%DOCSDIR%%/imudp.html -%%PORTDOCS%%%%DOCSDIR%%/imuxsock.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/install.html -%%PORTDOCS%%%%DOCSDIR%%/ipv6.html -%%PORTDOCS%%%%DOCSDIR%%/licensing.html -%%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.html -%%PORTDOCS%%%%DOCSDIR%%/manual.html -%%PORTDOCS%%%%DOCSDIR%%/messageparser.html -%%PORTDOCS%%%%DOCSDIR%%/mmnormalize.html -%%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 -%%PORTDOCS%%%%DOCSDIR%%/omfile.html -%%PORTDOCS%%%%DOCSDIR%%/omfwd.html -%%PORTDOCS%%%%DOCSDIR%%/omhdfs.html -%%PORTDOCS%%%%DOCSDIR%%/omlibdbi.html -%%PORTDOCS%%%%DOCSDIR%%/ommail.html -%%PORTDOCS%%%%DOCSDIR%%/ommysql.html -%%PORTDOCS%%%%DOCSDIR%%/omoracle.html -%%PORTDOCS%%%%DOCSDIR%%/ompipe.html -%%PORTDOCS%%%%DOCSDIR%%/omprog.html -%%PORTDOCS%%%%DOCSDIR%%/omrelp.html -%%PORTDOCS%%%%DOCSDIR%%/omruleset.html -%%PORTDOCS%%%%DOCSDIR%%/omsnmp.html -%%PORTDOCS%%%%DOCSDIR%%/omstdout.html -%%PORTDOCS%%%%DOCSDIR%%/omudpspoof.html -%%PORTDOCS%%%%DOCSDIR%%/omusrmsg.html -%%PORTDOCS%%%%DOCSDIR%%/omuxsock.html -%%PORTDOCS%%%%DOCSDIR%%/pmlastmsg.html -%%PORTDOCS%%%%DOCSDIR%%/property_replacer.html -%%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_abortonuncleanconfig.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionexeconlywhenpreviousissuspended.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionresumeinterval.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_allowedsender.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_controlcharacterescapeprefix.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprintcfsyslinehandlerlist.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprintmodulelist.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprinttemplatelist.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dircreatemode.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dirgroup.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dirowner.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dropmsgswithmaliciousdnsptrrecords.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_droptrailinglfonreception.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dynafilecachesize.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_escape8bitcharsonreceive.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_escapecontrolcharactersonreceive.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_failonchownfailure.html -%%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 -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_includeconfig.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_mainmsgqueuesize.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_markmessageperiod.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_maxopenfiles.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_moddir.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_modload.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_omfileforcechown.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 -%%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 -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_global.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_lines.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_modules.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_nomatch.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_output.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_templates.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_high_database_rate.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_secure_tls.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_tls.html -%%PORTDOCS%%%%DOCSDIR%%/syslog_parsing.html -%%PORTDOCS%%%%DOCSDIR%%/syslog_protocol.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert.jpg -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_100.jpg -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_ca.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_ca.jpg -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_client.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_errmsgs.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_machine.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_scenario.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_server.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_summary.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_udp_relay.html -%%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html -%%PORTDOCS%%%%DOCSDIR%%/v3compatibility.html -%%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%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry lib/rsyslog Modified: head/sysutils/rsyslog7/Makefile ============================================================================== --- head/sysutils/rsyslog7/Makefile Sat May 25 19:48:21 2013 (r319069) +++ head/sysutils/rsyslog7/Makefile Sat May 25 20:01:57 2013 (r319070) @@ -1,25 +1,28 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 7.2.4 -PORTREVISION?= 2 +PORTVERSION= 7.2.7 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER= brd@FreeBSD.org -COMMENT?= Syslogd supporting SQL, TCP, and TLS +COMMENT= Syslogd supporting SQL, TCP, and TLS -USE_LDCONFIG= yes - -LIB_DEPENDS+= ee:${PORTSDIR}/devel/libee \ +LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \ estr:${PORTSDIR}/devel/libestr \ - sysinfo:${PORTSDIR}/devel/libsysinfo \ json.0:${PORTSDIR}/devel/json-c \ + sysinfo:${PORTSDIR}/devel/libsysinfo \ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid +USE_LDCONFIG= yes + PORTSCOUT= limit:^6 +PORTDOCS= * +PORTEXAMPLES= * + -OPTIONS_DEFINE= DBI GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP + +OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP DBI_DESC= LibDBI output module for rsyslog GNUTLS_DESC= GNUTLS module for rsyslog @@ -38,6 +41,8 @@ USES+= pkgconfig CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ lib/rsyslog/omlibdbi.so +.else +CONFIGURE_ARGS+=--disable-libdbi .endif .if ${PORT_OPTIONS:MGNUTLS} @@ -47,6 +52,8 @@ USES+= pkgconfig CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ lib/rsyslog/lmnsd_gtls.so +.else +CONFIGURE_ARGS+=--disable-gnutls .endif .if ${PORT_OPTIONS:MGSSAPI} @@ -57,6 +64,8 @@ PLIST_FILES+= lib/rsyslog/imgssapi.la \ lib/rsyslog/lmgssutil.so \ lib/rsyslog/omgssapi.la \ lib/rsyslog/omgssapi.so +.else +CONFIGURE_ARGS+=--disable-gssapi-krb5 .endif .if ${PORT_OPTIONS:MMYSQL} @@ -64,6 +73,8 @@ USE_MYSQL= yes CONFIGURE_ARGS+=--enable-mysql PLIST_FILES+= lib/rsyslog/ommysql.so \ lib/rsyslog/ommysql.la +.else +CONFIGURE_ARGS+=--disable-mysql .endif .if ${PORT_OPTIONS:MPGSQL} @@ -71,6 +82,8 @@ USE_PGSQL= yes CONFIGURE_ARGS+=--enable-pgsql PLIST_FILES+= lib/rsyslog/ompgsql.so \ lib/rsyslog/ompgsql.la +.else +CONFIGURE_ARGS+=--disable-pgsql .endif .if ${PORT_OPTIONS:MRELP} @@ -81,6 +94,8 @@ PLIST_FILES+= lib/rsyslog/imrelp.la \ lib/rsyslog/imrelp.so \ lib/rsyslog/omrelp.la \ lib/rsyslog/omrelp.so +.else +CONFIGURE_ARGS+=--disable-relp .endif .if ${PORT_OPTIONS:MRFC3195} @@ -89,6 +104,8 @@ USES+= pkgconfig CONFIGURE_ARGS+=--enable-rfc3195 PLIST_FILES+= lib/rsyslog/im3195.la \ lib/rsyslog/im3195.so +.else +CONFIGURE_ARGS+=--disable-rfc3195 .endif .if ${PORT_OPTIONS:MSNMP} @@ -96,9 +113,10 @@ LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ lib/rsyslog/omsnmp.so +.else +CONFIGURE_ARGS+=--disable-snmp .endif - .ifdef WITH_MYSQL_MICROSECONDS EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds .endif @@ -143,12 +161,12 @@ post-patch: @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: -.ifndef NOPORTDOCS +.if ${PORT_OPTIONS:MDOCS} @${INSTALL} -d ${DOCSDIR}/ @${INSTALL_DATA} ${WRKSRC}/doc/*html ${DOCSDIR}/ @${INSTALL_DATA} ${WRKSRC}/doc/*jpg ${DOCSDIR}/ .endif -.ifndef NOPORTEXAMPLES +.if ${PORT_OPTIONS:MEXAMPLES} @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} .endif Modified: head/sysutils/rsyslog7/distinfo ============================================================================== --- head/sysutils/rsyslog7/distinfo Sat May 25 19:48:21 2013 (r319069) +++ head/sysutils/rsyslog7/distinfo Sat May 25 20:01:57 2013 (r319070) @@ -1,2 +1,2 @@ -SHA256 (rsyslog-7.2.4.tar.gz) = 90af55f696db3209a9ef28d8e8052c48917479dd994838f5ef678b1f701c4540 -SIZE (rsyslog-7.2.4.tar.gz) = 2702981 +SHA256 (rsyslog-7.2.7.tar.gz) = 4833533a140c1aebed069082ad579ac25e488b647d4d508167dc6e4de75af96d +SIZE (rsyslog-7.2.7.tar.gz) = 2761741 Modified: head/sysutils/rsyslog7/pkg-descr ============================================================================== --- head/sysutils/rsyslog7/pkg-descr Sat May 25 19:48:21 2013 (r319069) +++ head/sysutils/rsyslog7/pkg-descr Sat May 25 20:01:57 2013 (r319070) @@ -14,6 +14,6 @@ suitable for enterprise-class, encryptio chains while at the same time being very easy to setup for the novice user. -Tracking v6-devel +Tracking v7-devel WWW: http://www.rsyslog.com/ Modified: head/sysutils/rsyslog7/pkg-plist ============================================================================== --- head/sysutils/rsyslog7/pkg-plist Sat May 25 19:48:21 2013 (r319069) +++ head/sysutils/rsyslog7/pkg-plist Sat May 25 20:01:57 2013 (r319070) @@ -39,151 +39,4 @@ lib/rsyslog/omstdout.so lib/rsyslog/omtesting.la lib/rsyslog/omtesting.so sbin/rsyslogd -%%PORTDOCS%%%%DOCSDIR%%/bugs.html -%%PORTDOCS%%%%DOCSDIR%%/build_from_repo.html -%%PORTDOCS%%%%DOCSDIR%%/contributors.html -%%PORTDOCS%%%%DOCSDIR%%/debug.html -%%PORTDOCS%%%%DOCSDIR%%/dev_oplugins.html -%%PORTDOCS%%%%DOCSDIR%%/dev_queue.html -%%PORTDOCS%%%%DOCSDIR%%/droppriv.html -%%PORTDOCS%%%%DOCSDIR%%/expression.html -%%PORTDOCS%%%%DOCSDIR%%/features.html -%%PORTDOCS%%%%DOCSDIR%%/free_support.html -%%PORTDOCS%%%%DOCSDIR%%/generic_design.html -%%PORTDOCS%%%%DOCSDIR%%/gssapi.html -%%PORTDOCS%%%%DOCSDIR%%/history.html -%%PORTDOCS%%%%DOCSDIR%%/how2help.html -%%PORTDOCS%%%%DOCSDIR%%/im3195.html -%%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 -%%PORTDOCS%%%%DOCSDIR%%/imsolaris.html -%%PORTDOCS%%%%DOCSDIR%%/imtcp.html -%%PORTDOCS%%%%DOCSDIR%%/imudp.html -%%PORTDOCS%%%%DOCSDIR%%/imuxsock.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/install.html -%%PORTDOCS%%%%DOCSDIR%%/ipv6.html -%%PORTDOCS%%%%DOCSDIR%%/licensing.html -%%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.html -%%PORTDOCS%%%%DOCSDIR%%/manual.html -%%PORTDOCS%%%%DOCSDIR%%/messageparser.html -%%PORTDOCS%%%%DOCSDIR%%/mmnormalize.html -%%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 -%%PORTDOCS%%%%DOCSDIR%%/omfile.html -%%PORTDOCS%%%%DOCSDIR%%/omfwd.html -%%PORTDOCS%%%%DOCSDIR%%/omhdfs.html -%%PORTDOCS%%%%DOCSDIR%%/omlibdbi.html -%%PORTDOCS%%%%DOCSDIR%%/ommail.html -%%PORTDOCS%%%%DOCSDIR%%/ommysql.html -%%PORTDOCS%%%%DOCSDIR%%/omoracle.html -%%PORTDOCS%%%%DOCSDIR%%/ompipe.html -%%PORTDOCS%%%%DOCSDIR%%/omprog.html -%%PORTDOCS%%%%DOCSDIR%%/omrelp.html -%%PORTDOCS%%%%DOCSDIR%%/omruleset.html -%%PORTDOCS%%%%DOCSDIR%%/omsnmp.html -%%PORTDOCS%%%%DOCSDIR%%/omstdout.html -%%PORTDOCS%%%%DOCSDIR%%/omudpspoof.html -%%PORTDOCS%%%%DOCSDIR%%/omusrmsg.html -%%PORTDOCS%%%%DOCSDIR%%/omuxsock.html -%%PORTDOCS%%%%DOCSDIR%%/pmlastmsg.html -%%PORTDOCS%%%%DOCSDIR%%/property_replacer.html -%%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_abortonuncleanconfig.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionexeconlywhenpreviousissuspended.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionresumeinterval.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_allowedsender.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_controlcharacterescapeprefix.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprintcfsyslinehandlerlist.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprintmodulelist.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprinttemplatelist.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dircreatemode.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dirgroup.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dirowner.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dropmsgswithmaliciousdnsptrrecords.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_droptrailinglfonreception.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dynafilecachesize.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_escape8bitcharsonreceive.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_escapecontrolcharactersonreceive.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_failonchownfailure.html -%%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 -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_includeconfig.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_mainmsgqueuesize.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_markmessageperiod.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_maxopenfiles.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_moddir.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_modload.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_omfileforcechown.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 -%%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 -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_global.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_lines.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_modules.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_nomatch.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_output.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_templates.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_high_database_rate.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_secure_tls.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_tls.html -%%PORTDOCS%%%%DOCSDIR%%/syslog_parsing.html -%%PORTDOCS%%%%DOCSDIR%%/syslog_protocol.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert.jpg -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_100.jpg -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_ca.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_ca.jpg -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_client.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_errmsgs.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_machine.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_scenario.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_server.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_summary.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_udp_relay.html -%%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html -%%PORTDOCS%%%%DOCSDIR%%/v3compatibility.html -%%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%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry lib/rsyslog
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305252001.r4PK1wkD076641>