From owner-svn-ports-all@FreeBSD.ORG Mon Sep 10 04:23:05 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 451C8106564A; Mon, 10 Sep 2012 04:23:05 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2EFCC8FC08; Mon, 10 Sep 2012 04:23:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8A4N5jg091107; Mon, 10 Sep 2012 04:23:05 GMT (envelope-from brd@svn.freebsd.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8A4N47N091100; Mon, 10 Sep 2012 04:23:04 GMT (envelope-from brd@svn.freebsd.org) Message-Id: <201209100423.q8A4N47N091100@svn.freebsd.org> From: Brad Davis Date: Mon, 10 Sep 2012 04:23:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304020 - in head/sysutils: rsyslog6 rsyslog6-gnutls rsyslog6/files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2012 04:23:05 -0000 Author: brd (doc committer) Date: Mon Sep 10 04:23:04 2012 New Revision: 304020 URL: http://svn.freebsd.org/changeset/ports/304020 Log: - Update to 6.4.1 - Unmark as BROKEN on i386 with SNMP Changes: http://www.rsyslog.com/changelog-for-6-4-1-v6-stable/ Added: head/sysutils/rsyslog6/files/patch-grammar__lexer.l (contents, props changed) Modified: head/sysutils/rsyslog6-gnutls/Makefile head/sysutils/rsyslog6/Makefile head/sysutils/rsyslog6/distinfo head/sysutils/rsyslog6/files/patch-plugins__imuxsock__imuxsock.c head/sysutils/rsyslog6/pkg-plist Modified: head/sysutils/rsyslog6-gnutls/Makefile ============================================================================== --- head/sysutils/rsyslog6-gnutls/Makefile Mon Sep 10 03:13:46 2012 (r304019) +++ head/sysutils/rsyslog6-gnutls/Makefile Mon Sep 10 04:23:04 2012 (r304020) @@ -5,8 +5,6 @@ # $FreeBSD$ # -PORTREVISION= 2 - COMMENT= GNUTLS module for rsyslog MASTERDIR= ${.CURDIR}/../rsyslog6 Modified: head/sysutils/rsyslog6/Makefile ============================================================================== --- head/sysutils/rsyslog6/Makefile Mon Sep 10 03:13:46 2012 (r304019) +++ head/sysutils/rsyslog6/Makefile Mon Sep 10 04:23:04 2012 (r304020) @@ -6,7 +6,7 @@ # PORTNAME= rsyslog -PORTVERSION= 6.2.2 +PORTVERSION= 6.4.1 PORTREVISION?= 0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -93,10 +93,6 @@ post-install: .ifdef MNAME -.if ${MNAME} == "snmp" && ${ARCH} == "i386" && ${OSVERSION} >= 800000 -BROKEN= Does not link on i386: can't find symbol snmp_timeout in libnetsnmp -.endif - CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog DESCR?= ${.CURDIR}/../rsyslog6/pkg-descr Modified: head/sysutils/rsyslog6/distinfo ============================================================================== --- head/sysutils/rsyslog6/distinfo Mon Sep 10 03:13:46 2012 (r304019) +++ head/sysutils/rsyslog6/distinfo Mon Sep 10 04:23:04 2012 (r304020) @@ -1,2 +1,2 @@ -SHA256 (rsyslog-6.2.2.tar.gz) = c54b51f9f26d16e623d664c765268f3696721ceddfbee4e76b0dd89f04a6f471 -SIZE (rsyslog-6.2.2.tar.gz) = 2432745 +SHA256 (rsyslog-6.4.1.tar.gz) = 6150e81f3338c8624c0e91dbfc83ce753b180993f12a211525a4ac59891efb21 +SIZE (rsyslog-6.4.1.tar.gz) = 2526465 Added: head/sysutils/rsyslog6/files/patch-grammar__lexer.l ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog6/files/patch-grammar__lexer.l Mon Sep 10 04:23:04 2012 (r304020) @@ -0,0 +1,11 @@ +--- 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 @@ + * 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/rsyslog6/files/patch-plugins__imuxsock__imuxsock.c ============================================================================== --- head/sysutils/rsyslog6/files/patch-plugins__imuxsock__imuxsock.c Mon Sep 10 03:13:46 2012 (r304019) +++ head/sysutils/rsyslog6/files/patch-plugins__imuxsock__imuxsock.c Mon Sep 10 04:23:04 2012 (r304020) @@ -1,6 +1,15 @@ ---- ./plugins/imuxsock/imuxsock.c.orig 2011-09-15 06:01:15.000000000 +0000 -+++ ./plugins/imuxsock/imuxsock.c 2012-01-17 01:17:22.085759310 +0000 -@@ -727,9 +727,7 @@ +--- plugins/imuxsock/imuxsock.c.orig 2012-09-06 04:05:36.000000000 -0600 ++++ plugins/imuxsock/imuxsock.c 2012-09-09 20:03:06.000000000 -0600 +@@ -81,7 +81,7 @@ + + /* emulate struct ucred for platforms that do not have it */ + #ifndef HAVE_SCM_CREDENTIALS +-struct ucred { int pid; }; ++struct ucred { int pid; uid_t uid; gid_t gid; }; + #endif + + /* handle some defines missing on more than one platform */ +@@ -895,9 +895,7 @@ int iMaxLine; struct msghdr msgh; struct iovec msgiov; Modified: head/sysutils/rsyslog6/pkg-plist ============================================================================== --- head/sysutils/rsyslog6/pkg-plist Mon Sep 10 03:13:46 2012 (r304019) +++ head/sysutils/rsyslog6/pkg-plist Mon Sep 10 04:23:04 2012 (r304020) @@ -6,8 +6,6 @@ lib/rsyslog/immark.la lib/rsyslog/immark.so lib/rsyslog/imtcp.la lib/rsyslog/imtcp.so -lib/rsyslog/imtemplate.la -lib/rsyslog/imtemplate.so lib/rsyslog/imudp.la lib/rsyslog/imudp.so lib/rsyslog/imuxsock.la