Index: head/sysutils/syslog-ng-devel/Makefile =================================================================== --- head/sysutils/syslog-ng-devel/Makefile (revision 371020) +++ head/sysutils/syslog-ng-devel/Makefile (revision 371021) @@ -1,162 +1,162 @@ # Created by: Ivan Lago # $FreeBSD$ PORTNAME= syslog-ng -PORTVERSION= 3.6.0r1 +PORTVERSION= 3.6.0r2 PKGNAMESUFFIX= -devel CATEGORIES= sysutils DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/) DISTFILES= syslog-ng_${DISTVERSION}.tar.gz MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${DISTVERSION}/source/ MAINTAINER= cy@FreeBSD.org COMMENT= Powerful syslogd replacement LIB_DEPENDS= libevtlog.so:${PORTSDIR}/sysutils/eventlog \ libpcre.so:${PORTSDIR}/devel/pcre CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ syslog-ng-devel-[0-9]* WRKSRC= $(WRKDIR)/$(PORTNAME)-$(DISTVERSION) MAKE_JOBS_UNSAFE= yes OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= SYS_SSL PORTS_SSL OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS -OPTIONS_DEFAULT= PORTS_SSL +OPTIONS_DEFAULT= PORTS_SSL JSON SYS_SSL_DESC= Build with OpenSSL support (from system) PORTS_SSL_DESC= Build with OpenSSL support (from ports) TCP_WRAPPERS_DESC= Build with TCP Wrappers SQL_DESC= Build with database (libdbi) support SPOOF_DESC= Build with spoof source support IPV6_DESC= Build with IPV6 support SMTP_DESC= Build with SMTP support JSON_DESC= Build with JSON-C support GEOIP_DESC= Build with GeoIP support REDIS_DESC= Build with Redis support USES= gmake libtool pathfix pkgconfig USE_LDCONFIG= yes USE_RC_SUBR= syslog-ng GNU_CONFIGURE= yes USE_GNOME= glib20 SUB_FILES= pkg-message INSTALL_TARGET= install-strip CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking \ --enable-debug \ --datadir=${PREFIX}/share/syslog-ng/ BROKEN_sparc64= Does not compile on sparc64: gcc core dump .include .if ${PORT_OPTIONS:MSYS_SSL} || ${PORT_OPTIONS:MPORTS_SSL} USE_OPENSSL= yes CONFIGURE_ARGS+= --enable-ssl CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \ OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl" PLIST_FILES+= lib/syslog-ng/libafsocket-tls.so .else CONFIGURE_ARGS+= --disable-ssl .endif .if ${PORT_OPTIONS:MPORTS_SSL} WITH_OPENSSL_PORT= yes .endif .if ${PORT_OPTIONS:MTCP_WRAPPERS} CONFIGURE_ARGS+= --enable-tcp-wrapper .else CONFIGURE_ARGS+= --disable-tcp-wrapper .endif .if ${PORT_OPTIONS:MSPOOF} LIB_DEPENDS+= libnet.so:${PORTSDIR}/net/libnet LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config CONFIGURE_ARGS+= --enable-spoof-source --with-libnet=${LOCALBASE}/bin CFLAGS+= `${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include LDFLAGS+= `${LIBNET_CONFIG} --libs` .else CONFIGURE_ARGS+= --disable-spoof-source .endif .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif .if ${PORT_OPTIONS:MGEOIP} CONFIGURE_ARGS+= --enable-geoip LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP CONFIGURE_ENV+= GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP" PLIST_FILES+= lib/syslog-ng/libtfgeoip.so .else CONFIGURE_ARGS+= --disable-geoip .endif .if ${PORT_OPTIONS:MREDIS} CONFIGURE_ARGS+= --enable-redis LIB_DEPENDS+= libhiredis.so:${PORTSDIR}/databases/hiredis PLIST_FILES+= lib/syslog-ng/libredis.so .else CONFIGURE_ARGS+= --disable-redis .endif .if ${PORT_OPTIONS:MSMTP} CONFIGURE_ARGS+= --with-libesmtp=/usr/local/ LIB_DEPENDS+= libesmtp.so:${PORTSDIR}/mail/libesmtp PLIST_FILES+= lib/syslog-ng/libafsmtp.so .else CONFIGURE_ARGS+= --disable-smtp .endif .if ${PORT_OPTIONS:MSQL} LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi CONFIGURE_ENV+= LIBDBI_LIBS="-ldbi" CONFIGURE_ARGS+= --enable-sql LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES+= lib/syslog-ng/libafsql.so .else CONFIGURE_ARGS+= --disable-sql .endif .if ${PORT_OPTIONS:MJSON} LIB_DEPENDS+= libjson.so:${PORTSDIR}/devel/json-c CONFIGURE_ARGS+= --enable-json PLIST_FILES+= lib/syslog-ng/libjson-plugin.so .else CONFIGURE_ARGS+= --disable-json .endif .if ${OSVERSION} >= 900034 CONFIGURE_ARGS+= --disable-linux-caps .endif post-patch: @${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' \ ${WRKSRC}/configure @${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist @${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample post-install: .if ${PORT_OPTIONS:MDOCS} ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS.md ${STAGEDIR}${DOCSDIR} .endif ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${STAGEDIR}${PREFIX}/man/man5/ ${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${PREFIX}/man/man8/ ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \ ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist \ ${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \ ${STAGEDIR}${PREFIX}/include/syslog-ng/ .include Index: head/sysutils/syslog-ng-devel/distinfo =================================================================== --- head/sysutils/syslog-ng-devel/distinfo (revision 371020) +++ head/sysutils/syslog-ng-devel/distinfo (revision 371021) @@ -1,2 +1,2 @@ -SHA256 (syslog-ng_3.6.0rc1.tar.gz) = bacca809ba2d8c24d3b5d678f22e733ae0714316b87958d4d3b2b3ea81b92636 -SIZE (syslog-ng_3.6.0rc1.tar.gz) = 3164949 +SHA256 (syslog-ng_3.6.0rc2.tar.gz) = e46c0dfcf99a905a0f42e4c9c429c48fc19e882f43c70ff0110e51ba1465aa1f +SIZE (syslog-ng_3.6.0rc2.tar.gz) = 3165637 Index: head/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample =================================================================== --- head/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample (revision 371020) +++ head/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample (revision 371021) @@ -1,185 +1,185 @@ @version:3.6 +@include "scl.conf" # # This sample configuration file is essentially equilivent to the stock # FreeBSD /etc/syslog.conf file. # # $FreeBSD: head/sysutils/syslog-ng/files/syslog-ng.conf.sample 340872 2014-01-24 00:14:07Z mat $ # # # options # options { chain_hostnames(off); flush_lines(0); threaded(yes); }; # # sources # -source src { unix-dgram("/var/run/log"); - unix-dgram("/var/run/logpriv" perm(0600)); - udp(); internal(); file("/dev/klog"); }; +source src { system(); + udp(); internal(); }; # # destinations # destination messages { file("/var/log/messages"); }; destination security { file("/var/log/security"); }; destination authlog { file("/var/log/auth.log"); }; destination maillog { file("/var/log/maillog"); }; destination lpd-errs { file("/var/log/lpd-errs"); }; destination xferlog { file("/var/log/xferlog"); }; destination cron { file("/var/log/cron"); }; destination debuglog { file("/var/log/debug.log"); }; destination consolelog { file("/var/log/console.log"); }; destination all { file("/var/log/all.log"); }; destination newscrit { file("/var/log/news/news.crit"); }; destination newserr { file("/var/log/news/news.err"); }; destination newsnotice { file("/var/log/news/news.notice"); }; destination slip { file("/var/log/slip.log"); }; destination ppp { file("/var/log/ppp.log"); }; destination console { file("/dev/console"); }; destination allusers { usertty("*"); }; #destination loghost { udp("loghost" port(514)); }; # # log facility filters # filter f_auth { facility(auth); }; filter f_authpriv { facility(authpriv); }; filter f_not_authpriv { not facility(authpriv); }; #filter f_console { facility(console); }; filter f_cron { facility(cron); }; filter f_daemon { facility(daemon); }; filter f_ftp { facility(ftp); }; filter f_kern { facility(kern); }; filter f_lpr { facility(lpr); }; filter f_mail { facility(mail); }; filter f_news { facility(news); }; filter f_security { facility(security); }; filter f_user { facility(user); }; filter f_uucp { facility(uucp); }; filter f_local0 { facility(local0); }; filter f_local1 { facility(local1); }; filter f_local2 { facility(local2); }; filter f_local3 { facility(local3); }; filter f_local4 { facility(local4); }; filter f_local5 { facility(local5); }; filter f_local6 { facility(local6); }; filter f_local7 { facility(local7); }; # # log level filters # filter f_emerg { level(emerg); }; filter f_alert { level(alert..emerg); }; filter f_crit { level(crit..emerg); }; filter f_err { level(err..emerg); }; filter f_warning { level(warning..emerg); }; filter f_notice { level(notice..emerg); }; filter f_info { level(info..emerg); }; filter f_debug { level(debug..emerg); }; filter f_is_debug { level(debug); }; # # program filters # filter f_ppp { program("ppp"); }; filter f_slip { program("startslip"); }; # # *.err;kern.warning;auth.notice;mail.crit /dev/console # log { source(src); filter(f_err); destination(console); }; log { source(src); filter(f_kern); filter(f_warning); destination(console); }; log { source(src); filter(f_auth); filter(f_notice); destination(console); }; log { source(src); filter(f_mail); filter(f_crit); destination(console); }; # # *.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err /var/log/messages # log { source(src); filter(f_notice); filter(f_not_authpriv); destination(messages); }; log { source(src); filter(f_kern); filter(f_debug); destination(messages); }; log { source(src); filter(f_lpr); filter(f_info); destination(messages); }; log { source(src); filter(f_mail); filter(f_crit); destination(messages); }; log { source(src); filter(f_news); filter(f_err); destination(messages); }; # # security.* /var/log/security # log { source(src); filter(f_security); destination(security); }; # # auth.info;authpriv.info /var/log/auth.log log { source(src); filter(f_auth); filter(f_info); destination(authlog); }; log { source(src); filter(f_authpriv); filter(f_info); destination(authlog); }; # # mail.info /var/log/maillog # log { source(src); filter(f_mail); filter(f_info); destination(maillog); }; # # lpr.info /var/log/lpd-errs # log { source(src); filter(f_lpr); filter(f_info); destination(lpd-errs); }; # # ftp.info /var/log/xferlog # log { source(src); filter(f_ftp); filter(f_info); destination(xferlog); }; # # cron.* /var/log/cron # log { source(src); filter(f_cron); destination(cron); }; # # *.=debug /var/log/debug.log # log { source(src); filter(f_is_debug); destination(debuglog); }; # # *.emerg * # log { source(src); filter(f_emerg); destination(allusers); }; # # uncomment this to log all writes to /dev/console to /var/log/console.log # console.info /var/log/console.log # #log { source(src); filter(f_console); filter(f_info); destination(consolelog); }; # # uncomment this to enable logging of all log messages to /var/log/all.log # touch /var/log/all.log and chmod it to mode 600 before it will work # *.* /var/log/all.log # #log { source(src); destination(all); }; # # uncomment this to enable logging to a remote loghost named loghost # *.* @loghost # #log { source(src); destination(loghost); }; # # uncomment these if you're running inn # news.crit /var/log/news/news.crit # news.err /var/log/news/news.err # news.notice /var/log/news/news.notice # #log { source(src); filter(f_news); filter(f_crit); destination(newscrit); }; #log { source(src); filter(f_news); filter(f_err); destination(newserr); }; #log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); }; # # !startslip # *.* /var/log/slip.log # log { source(src); filter(f_slip); destination(slip); }; # # !ppp # *.* /var/log/ppp.log # log { source(src); filter(f_ppp); destination(ppp); };