FreeBSD Bugzilla – Attachment 130672 Details for
Bug 174648
[patch] - update sysutils/rsyslog6 to version 6.6.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 6.65 KB, created by
cristianorolim
on 2012-12-22 23:10:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
cristianorolim
Created:
2012-12-22 23:10:00 UTC
Size:
6.65 KB
patch
obsolete
>diff -ruN ../rsyslog6.orig/Makefile ./Makefile >--- ../rsyslog6.orig/Makefile 2012-12-22 18:13:22.000000000 -0200 >+++ ./Makefile 2012-12-22 20:36:32.000000000 -0200 >@@ -1,7 +1,7 @@ > # $FreeBSD: ports/sysutils/rsyslog6/Makefile,v 1.4 2012/11/17 06:01:44 svnexp Exp $ > > PORTNAME= rsyslog >-PORTVERSION= 6.4.2 >+PORTVERSION= 6.6.0 > PORTREVISION?= 0 > CATEGORIES= sysutils > MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ >@@ -16,7 +16,9 @@ > > LIB_DEPENDS+= ee:${PORTSDIR}/devel/libee \ > estr:${PORTSDIR}/devel/libestr \ >- sysinfo:${PORTSDIR}/devel/libsysinfo >+ sysinfo:${PORTSDIR}/devel/libsysinfo \ >+ json:${PORTSDIR}/devel/json-c/ \ >+ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid > > .ifdef MNAME > RUN_DEPENDS= rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6 >@@ -62,7 +64,7 @@ > USE_RC_SUBR= ${PORTNAME}d > SUB_FILES= pkg-message > >-CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imtemplate --enable-testbench=no >+CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout > > post-patch: > @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure >@@ -88,7 +90,7 @@ > > .ifdef MNAME > >-CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog >+CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog --disable-testbench --disable-omruleset > > DESCR?= ${.CURDIR}/../rsyslog6/pkg-descr > DISTINFO_FILE?= ${.CURDIR}/../rsyslog6/distinfo >diff -ruN ../rsyslog6.orig/distinfo ./distinfo >--- ../rsyslog6.orig/distinfo 2012-12-22 18:13:22.000000000 -0200 >+++ ./distinfo 2012-12-22 18:15:02.000000000 -0200 >@@ -1,2 +1,2 @@ >-SHA256 (rsyslog-6.4.2.tar.gz) = ca92434c87f7390a5ea7ce6aea94c6cb05474bf778ec5d8ebc0b9a50f321749c >-SIZE (rsyslog-6.4.2.tar.gz) = 2518961 >+SHA256 (rsyslog-6.6.0.tar.gz) = 80aabccf5945d7e26152a2ad29100e147d1fecb300397dc4ccda41acaf2ec33d >+SIZE (rsyslog-6.6.0.tar.gz) = 2672981 >diff -ruN ../rsyslog6.orig/files/pkg-message.in ./files/pkg-message.in >--- ../rsyslog6.orig/files/pkg-message.in 2012-12-22 18:13:22.000000000 -0200 >+++ ./files/pkg-message.in 2012-12-22 20:39:57.000000000 -0200 >@@ -5,11 +5,6 @@ > syslogd_enable="NO" > rsyslogd_enable="YES" > >-To avoid warnings about rsyslogd running in compatibility mode, add >-this: >- >- 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 ../rsyslog6.orig/pkg-plist ./pkg-plist >--- ../rsyslog6.orig/pkg-plist 2012-12-22 18:13:22.000000000 -0200 >+++ ./pkg-plist 2012-12-22 20:49:02.000000000 -0200 >@@ -1,9 +1,13 @@ >+lib/rsyslog/imdiag.la >+lib/rsyslog/imdiag.so > lib/rsyslog/imfile.la > lib/rsyslog/imfile.so > lib/rsyslog/imklog.la > lib/rsyslog/imklog.so > lib/rsyslog/immark.la > lib/rsyslog/immark.so >+lib/rsyslog/impstats.la >+lib/rsyslog/impstats.so > lib/rsyslog/imtcp.la > lib/rsyslog/imtcp.so > lib/rsyslog/imudp.la >@@ -30,6 +34,8 @@ > lib/rsyslog/ommail.so > lib/rsyslog/omruleset.la > lib/rsyslog/omruleset.so >+lib/rsyslog/omstdout.la >+lib/rsyslog/omstdout.so > lib/rsyslog/omtesting.la > lib/rsyslog/omtesting.so > sbin/rsyslogd >@@ -37,10 +43,12 @@ > %%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 >@@ -54,6 +62,7 @@ > %%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 >@@ -61,6 +70,7 @@ > %%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 >@@ -68,15 +78,21 @@ > %%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 >@@ -85,6 +101,7 @@ > %%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 >@@ -111,8 +128,10 @@ > %%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 >@@ -122,8 +141,10 @@ > %%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf.html > %%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_actions.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 >@@ -156,6 +177,7 @@ > %%PORTDOCS%%%%DOCSDIR%%/v3compatibility.html > %%PORTDOCS%%%%DOCSDIR%%/v4compatibility.html > %%PORTDOCS%%%%DOCSDIR%%/v5compatibility.html >+%%PORTDOCS%%%%DOCSDIR%%/v6compatibility.html > %%PORTDOCS%%%%DOCSDIR%%/version_naming.html > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsyslog-example.conf > %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=130672">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 174648
: 130672