Update to a new beta, from 3.2beta1 to 3.3.0beta1.

This commit is contained in:
Cy Schubert 2011-06-03 03:41:08 +00:00
parent 1b279feeb7
commit ef3cc099a7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=275006
8 changed files with 192 additions and 16 deletions

View file

@ -6,18 +6,18 @@
# #
PORTNAME= syslog-ng PORTNAME= syslog-ng
PORTVERSION= 3.2b1 PORTVERSION= 3.3.0b1
PORTREVISION= 1 PORTREVISION= 1
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/3.2beta1/source/ MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/3.3.0beta1/source/
PKGNAMESUFFIX= 3-devel PKGNAMESUFFIX= 3-devel
DISTFILES= $(PORTNAME)_3.2beta1.tar.gz DISTFILES= $(PORTNAME)_3.3.0beta1.tar.gz
MAINTAINER= cy@FreeBSD.org MAINTAINER= cy@FreeBSD.org
COMMENT= A powerful syslogd replacement COMMENT= A powerful syslogd replacement
CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]*
WRKSRC= $(WRKDIR)/$(PORTNAME)-3.2beta1 WRKSRC= $(WRKDIR)/$(PORTNAME)-3.3.0beta1
OPTIONS= SSL "Build with OpenSSL support (from ports)" off \ OPTIONS= SSL "Build with OpenSSL support (from ports)" off \
TCP_WRAPPERS "Build with TCP Wrappers" off \ TCP_WRAPPERS "Build with TCP Wrappers" off \
@ -30,7 +30,7 @@ OPTIONS= SSL "Build with OpenSSL support (from ports)" off \
LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog
MAN1= pdbtool.1 MAN1= loggen.1 pdbtool.1 syslog-ng-ctl.1
MAN5= syslog-ng.conf.5 MAN5= syslog-ng.conf.5
MAN8= syslog-ng.8 MAN8= syslog-ng.8
@ -105,6 +105,7 @@ CONFIGURE_ENV+= LIBDBI_CFLAGS="-I/usr/local/include" \
post-patch: post-patch:
@${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/lib/syslog-ng.h @${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/lib/syslog-ng.h
@${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' ${WRKSRC}/configure
@${MV} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
.if ${OSVERSION} >= 900007 .if ${OSVERSION} >= 900007
@${REINPLACE_CMD} \ @${REINPLACE_CMD} \
-e 's|utmp|utmpx|' -e 's|getutent|getutxent|' \ -e 's|utmp|utmpx|' -e 's|getutent|getutxent|' \

View file

@ -1,2 +1,2 @@
SHA256 (syslog-ng_3.2beta1.tar.gz) = bd02617812ba8ed058f6205053c31055145cfa811f227b8c9dc16947d640a127 SHA256 (syslog-ng_3.3.0beta1.tar.gz) = 7836baf85bafebaa31bf16c689e69a8f89e60fa1bac853eaddc9dd595a081e60
SIZE (syslog-ng_3.2beta1.tar.gz) = 1367074 SIZE (syslog-ng_3.3.0beta1.tar.gz) = 2203917

View file

@ -0,0 +1,11 @@
--- lib/Makefile.am.orig 2011-05-07 06:18:15.000000000 -0700
+++ lib/Makefile.am 2011-06-01 13:02:37.000000000 -0700
@@ -13,7 +13,7 @@
module_LTLIBRARIES = libsyslog-ng-crypto.la
libsyslog_ng_crypto_la_LIBADD = @CORE_DEPS_LIBS@ libsyslog-ng.la
-libsyslog_ng_crypto_la_LDFLAGS = -no-undefined
+libsyslog_ng_crypto_la_LDFLAGS = -no-undefined -avoid-versions
# this is intentionally formatted so conflicts are less likely to arise. one name in every line.
pkginclude_HEADERS = \

View file

@ -1,18 +1,83 @@
@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
etc/modules.conf etc/modules.conf
etc/scl.conf etc/scl.conf
etc/syslog-ng.conf @exec test -f %D/etc/syslog-ng.conf || cp -p %D/etc/syslog-ng.conf.sample %D/etc/syslog-ng.conf
@unexec if cmp -s %D/etc/syslog-ng.conf %D/etc/syslog-ng.conf.sample; then rm -f %D/etc/syslog-ng.conf; fi
etc/syslog-ng.conf.sample etc/syslog-ng.conf.sample
bin/loggen bin/loggen
bin/pdbtool bin/pdbtool
bin/update-patterndb bin/update-patterndb
sbin/syslog-ng sbin/syslog-ng
sbin/syslog-ng-ctl sbin/syslog-ng-ctl
include/syslog-ng/afinter.h
include/syslog-ng/alarms.h
include/syslog-ng/apphook.h
include/syslog-ng/atomic.h
include/syslog-ng/block-ref-parser.h
include/syslog-ng/center.h
include/syslog-ng/cfg-lexer.h
include/syslog-ng/cfg-parser.h
include/syslog-ng/cfg.h
include/syslog-ng/children.h
include/syslog-ng/compat.h
include/syslog-ng/control.h
include/syslog-ng/crypto.h
include/syslog-ng/dgroup.h
include/syslog-ng/dnscache.h
include/syslog-ng/driver.h
include/syslog-ng/filter-expr-parser.h
include/syslog-ng/filter.h
include/syslog-ng/gprocess.h
include/syslog-ng/gsockaddr.h
include/syslog-ng/gsocket.h
include/syslog-ng/logmatcher.h
include/syslog-ng/logmpx.h
include/syslog-ng/logmsg.h
include/syslog-ng/logparser.h
include/syslog-ng/logpipe.h
include/syslog-ng/logprocess.h
include/syslog-ng/logproto.h
include/syslog-ng/logqueue-fifo.h
include/syslog-ng/logqueue.h
include/syslog-ng/logreader.h
include/syslog-ng/logrewrite.h
include/syslog-ng/logsource.h
include/syslog-ng/logstamp.h
include/syslog-ng/logtransport.h
include/syslog-ng/logwriter.h
include/syslog-ng/mainloop.h
include/syslog-ng/memtrace.h
include/syslog-ng/messages.h
include/syslog-ng/misc.h
include/syslog-ng/msg-format.h
include/syslog-ng/nvtable.h
include/syslog-ng/parser-expr-parser.h
include/syslog-ng/persist-state.h
include/syslog-ng/plugin.h
include/syslog-ng/pragma-parser.h
include/syslog-ng/rewrite-expr-parser.h
include/syslog-ng/serialize.h
include/syslog-ng/sgroup.h
include/syslog-ng/stats.h
include/syslog-ng/str-format.h
include/syslog-ng/syslog-names.h
include/syslog-ng/syslog-ng.h
include/syslog-ng/tags.h
include/syslog-ng/templates.h
include/syslog-ng/timeutils.h
include/syslog-ng/tls-support.h
include/syslog-ng/tlscontext.h
include/syslog-ng/tlstransport.h
include/syslog-ng/utils.h
include/syslog-ng/value-pairs.h
lib/libsyslog-ng.la lib/libsyslog-ng.la
lib/libsyslog-ng.so lib/libsyslog-ng.so
lib/libsyslog-ng.so.0 lib/libsyslog-ng.so.0
lib/pkgconfig/syslog-ng.pc
lib/syslog-ng/libaffile.la lib/syslog-ng/libaffile.la
lib/syslog-ng/libaffile.so lib/syslog-ng/libaffile.so
lib/syslog-ng/libafmongodb.la
lib/syslog-ng/libafmongodb.so
lib/syslog-ng/libafprog.la lib/syslog-ng/libafprog.la
lib/syslog-ng/libafprog.so lib/syslog-ng/libafprog.so
lib/syslog-ng/libafsocket-notls.la lib/syslog-ng/libafsocket-notls.la
@ -34,14 +99,22 @@ lib/syslog-ng/libdbparser.la
lib/syslog-ng/libdbparser.so lib/syslog-ng/libdbparser.so
lib/syslog-ng/libdummy.la lib/syslog-ng/libdummy.la
lib/syslog-ng/libdummy.so lib/syslog-ng/libdummy.so
lib/syslog-ng/libsyslog-ng-crypto.la
lib/syslog-ng/libsyslog-ng-crypto.so
lib/syslog-ng/libsyslog-ng-crypto.so.0
lib/syslog-ng/libsyslogformat.la lib/syslog-ng/libsyslogformat.la
lib/syslog-ng/libsyslogformat.so lib/syslog-ng/libsyslogformat.so
lib/syslog-ng/libtfjson.la
lib/syslog-ng/libtfjson.so
share/include/scl/pacct/plugin.conf share/include/scl/pacct/plugin.conf
share/include/scl/syslogconf/README share/include/scl/syslogconf/README
share/include/scl/syslogconf/convert-syslogconf.awk share/include/scl/syslogconf/convert-syslogconf.awk
share/include/scl/syslogconf/plugin.conf share/include/scl/syslogconf/plugin.conf
share/include/scl/system/generate-system-source.sh share/include/scl/system/generate-system-source.sh
share/include/scl/system/plugin.conf share/include/scl/system/plugin.conf
share/tools/cfg-grammar.y
share/tools/lex-rules.am
share/tools/merge-grammar.pl
share/xsd/patterndb-1.xsd share/xsd/patterndb-1.xsd
share/xsd/patterndb-2.xsd share/xsd/patterndb-2.xsd
share/xsd/patterndb-3.xsd share/xsd/patterndb-3.xsd
@ -53,10 +126,13 @@ share/xsd/patterndb-3.xsd
%%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml %%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml
%%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm etc/patterndb.d @dirrm etc/patterndb.d
@dirrm include/syslog-ng
@dirrmtry lib/pkgconfig
@dirrm lib/syslog-ng @dirrm lib/syslog-ng
@dirrm share/include/scl/system @dirrm share/include/scl/system
@dirrm share/include/scl/syslogconf @dirrm share/include/scl/syslogconf
@dirrm share/include/scl/pacct @dirrm share/include/scl/pacct
@dirrm share/include/scl @dirrm share/include/scl
@dirrm share/include @dirrm share/include
@dirrmtry share/tools
@dirrm share/xsd @dirrm share/xsd

View file

@ -6,18 +6,18 @@
# #
PORTNAME= syslog-ng PORTNAME= syslog-ng
PORTVERSION= 3.2b1 PORTVERSION= 3.3.0b1
PORTREVISION= 1 PORTREVISION= 1
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/3.2beta1/source/ MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/3.3.0beta1/source/
PKGNAMESUFFIX= 3-devel PKGNAMESUFFIX= 3-devel
DISTFILES= $(PORTNAME)_3.2beta1.tar.gz DISTFILES= $(PORTNAME)_3.3.0beta1.tar.gz
MAINTAINER= cy@FreeBSD.org MAINTAINER= cy@FreeBSD.org
COMMENT= A powerful syslogd replacement COMMENT= A powerful syslogd replacement
CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]*
WRKSRC= $(WRKDIR)/$(PORTNAME)-3.2beta1 WRKSRC= $(WRKDIR)/$(PORTNAME)-3.3.0beta1
OPTIONS= SSL "Build with OpenSSL support (from ports)" off \ OPTIONS= SSL "Build with OpenSSL support (from ports)" off \
TCP_WRAPPERS "Build with TCP Wrappers" off \ TCP_WRAPPERS "Build with TCP Wrappers" off \
@ -30,7 +30,7 @@ OPTIONS= SSL "Build with OpenSSL support (from ports)" off \
LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog
MAN1= pdbtool.1 MAN1= loggen.1 pdbtool.1 syslog-ng-ctl.1
MAN5= syslog-ng.conf.5 MAN5= syslog-ng.conf.5
MAN8= syslog-ng.8 MAN8= syslog-ng.8
@ -105,6 +105,7 @@ CONFIGURE_ENV+= LIBDBI_CFLAGS="-I/usr/local/include" \
post-patch: post-patch:
@${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/lib/syslog-ng.h @${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/lib/syslog-ng.h
@${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' ${WRKSRC}/configure
@${MV} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
.if ${OSVERSION} >= 900007 .if ${OSVERSION} >= 900007
@${REINPLACE_CMD} \ @${REINPLACE_CMD} \
-e 's|utmp|utmpx|' -e 's|getutent|getutxent|' \ -e 's|utmp|utmpx|' -e 's|getutent|getutxent|' \

View file

@ -1,2 +1,2 @@
SHA256 (syslog-ng_3.2beta1.tar.gz) = bd02617812ba8ed058f6205053c31055145cfa811f227b8c9dc16947d640a127 SHA256 (syslog-ng_3.3.0beta1.tar.gz) = 7836baf85bafebaa31bf16c689e69a8f89e60fa1bac853eaddc9dd595a081e60
SIZE (syslog-ng_3.2beta1.tar.gz) = 1367074 SIZE (syslog-ng_3.3.0beta1.tar.gz) = 2203917

View file

@ -0,0 +1,11 @@
--- lib/Makefile.am.orig 2011-05-07 06:18:15.000000000 -0700
+++ lib/Makefile.am 2011-06-01 13:02:37.000000000 -0700
@@ -13,7 +13,7 @@
module_LTLIBRARIES = libsyslog-ng-crypto.la
libsyslog_ng_crypto_la_LIBADD = @CORE_DEPS_LIBS@ libsyslog-ng.la
-libsyslog_ng_crypto_la_LDFLAGS = -no-undefined
+libsyslog_ng_crypto_la_LDFLAGS = -no-undefined -avoid-versions
# this is intentionally formatted so conflicts are less likely to arise. one name in every line.
pkginclude_HEADERS = \

View file

@ -1,18 +1,83 @@
@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
etc/modules.conf etc/modules.conf
etc/scl.conf etc/scl.conf
etc/syslog-ng.conf @exec test -f %D/etc/syslog-ng.conf || cp -p %D/etc/syslog-ng.conf.sample %D/etc/syslog-ng.conf
@unexec if cmp -s %D/etc/syslog-ng.conf %D/etc/syslog-ng.conf.sample; then rm -f %D/etc/syslog-ng.conf; fi
etc/syslog-ng.conf.sample etc/syslog-ng.conf.sample
bin/loggen bin/loggen
bin/pdbtool bin/pdbtool
bin/update-patterndb bin/update-patterndb
sbin/syslog-ng sbin/syslog-ng
sbin/syslog-ng-ctl sbin/syslog-ng-ctl
include/syslog-ng/afinter.h
include/syslog-ng/alarms.h
include/syslog-ng/apphook.h
include/syslog-ng/atomic.h
include/syslog-ng/block-ref-parser.h
include/syslog-ng/center.h
include/syslog-ng/cfg-lexer.h
include/syslog-ng/cfg-parser.h
include/syslog-ng/cfg.h
include/syslog-ng/children.h
include/syslog-ng/compat.h
include/syslog-ng/control.h
include/syslog-ng/crypto.h
include/syslog-ng/dgroup.h
include/syslog-ng/dnscache.h
include/syslog-ng/driver.h
include/syslog-ng/filter-expr-parser.h
include/syslog-ng/filter.h
include/syslog-ng/gprocess.h
include/syslog-ng/gsockaddr.h
include/syslog-ng/gsocket.h
include/syslog-ng/logmatcher.h
include/syslog-ng/logmpx.h
include/syslog-ng/logmsg.h
include/syslog-ng/logparser.h
include/syslog-ng/logpipe.h
include/syslog-ng/logprocess.h
include/syslog-ng/logproto.h
include/syslog-ng/logqueue-fifo.h
include/syslog-ng/logqueue.h
include/syslog-ng/logreader.h
include/syslog-ng/logrewrite.h
include/syslog-ng/logsource.h
include/syslog-ng/logstamp.h
include/syslog-ng/logtransport.h
include/syslog-ng/logwriter.h
include/syslog-ng/mainloop.h
include/syslog-ng/memtrace.h
include/syslog-ng/messages.h
include/syslog-ng/misc.h
include/syslog-ng/msg-format.h
include/syslog-ng/nvtable.h
include/syslog-ng/parser-expr-parser.h
include/syslog-ng/persist-state.h
include/syslog-ng/plugin.h
include/syslog-ng/pragma-parser.h
include/syslog-ng/rewrite-expr-parser.h
include/syslog-ng/serialize.h
include/syslog-ng/sgroup.h
include/syslog-ng/stats.h
include/syslog-ng/str-format.h
include/syslog-ng/syslog-names.h
include/syslog-ng/syslog-ng.h
include/syslog-ng/tags.h
include/syslog-ng/templates.h
include/syslog-ng/timeutils.h
include/syslog-ng/tls-support.h
include/syslog-ng/tlscontext.h
include/syslog-ng/tlstransport.h
include/syslog-ng/utils.h
include/syslog-ng/value-pairs.h
lib/libsyslog-ng.la lib/libsyslog-ng.la
lib/libsyslog-ng.so lib/libsyslog-ng.so
lib/libsyslog-ng.so.0 lib/libsyslog-ng.so.0
lib/pkgconfig/syslog-ng.pc
lib/syslog-ng/libaffile.la lib/syslog-ng/libaffile.la
lib/syslog-ng/libaffile.so lib/syslog-ng/libaffile.so
lib/syslog-ng/libafmongodb.la
lib/syslog-ng/libafmongodb.so
lib/syslog-ng/libafprog.la lib/syslog-ng/libafprog.la
lib/syslog-ng/libafprog.so lib/syslog-ng/libafprog.so
lib/syslog-ng/libafsocket-notls.la lib/syslog-ng/libafsocket-notls.la
@ -34,14 +99,22 @@ lib/syslog-ng/libdbparser.la
lib/syslog-ng/libdbparser.so lib/syslog-ng/libdbparser.so
lib/syslog-ng/libdummy.la lib/syslog-ng/libdummy.la
lib/syslog-ng/libdummy.so lib/syslog-ng/libdummy.so
lib/syslog-ng/libsyslog-ng-crypto.la
lib/syslog-ng/libsyslog-ng-crypto.so
lib/syslog-ng/libsyslog-ng-crypto.so.0
lib/syslog-ng/libsyslogformat.la lib/syslog-ng/libsyslogformat.la
lib/syslog-ng/libsyslogformat.so lib/syslog-ng/libsyslogformat.so
lib/syslog-ng/libtfjson.la
lib/syslog-ng/libtfjson.so
share/include/scl/pacct/plugin.conf share/include/scl/pacct/plugin.conf
share/include/scl/syslogconf/README share/include/scl/syslogconf/README
share/include/scl/syslogconf/convert-syslogconf.awk share/include/scl/syslogconf/convert-syslogconf.awk
share/include/scl/syslogconf/plugin.conf share/include/scl/syslogconf/plugin.conf
share/include/scl/system/generate-system-source.sh share/include/scl/system/generate-system-source.sh
share/include/scl/system/plugin.conf share/include/scl/system/plugin.conf
share/tools/cfg-grammar.y
share/tools/lex-rules.am
share/tools/merge-grammar.pl
share/xsd/patterndb-1.xsd share/xsd/patterndb-1.xsd
share/xsd/patterndb-2.xsd share/xsd/patterndb-2.xsd
share/xsd/patterndb-3.xsd share/xsd/patterndb-3.xsd
@ -53,10 +126,13 @@ share/xsd/patterndb-3.xsd
%%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml %%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml
%%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm etc/patterndb.d @dirrm etc/patterndb.d
@dirrm include/syslog-ng
@dirrmtry lib/pkgconfig
@dirrm lib/syslog-ng @dirrm lib/syslog-ng
@dirrm share/include/scl/system @dirrm share/include/scl/system
@dirrm share/include/scl/syslogconf @dirrm share/include/scl/syslogconf
@dirrm share/include/scl/pacct @dirrm share/include/scl/pacct
@dirrm share/include/scl @dirrm share/include/scl
@dirrm share/include @dirrm share/include
@dirrmtry share/tools
@dirrm share/xsd @dirrm share/xsd