Bug 169307 - [patch] [new port] sysutils/rsyslog6
Summary: [patch] [new port] sysutils/rsyslog6
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Brad Davis
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-06-21 22:50 UTC by Brad Davis
Modified: 2012-08-16 23:04 UTC (History)
0 users

See Also:


Attachments
file.diff (4.26 KB, patch)
2012-06-21 22:50 UTC, Brad Davis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Brad Davis freebsd_committer freebsd_triage 2012-06-21 22:50:12 UTC
        Port of rsyslog 6.2.2

Fix: - Repo copy the sysutils/rsyslog6-devel* ports to sysutils/rsyslog*
        - Apply the following patch:
Comment 1 Mark Linimon freebsd_committer freebsd_triage 2012-06-22 03:31:51 UTC
Responsible Changed
From-To: freebsd-ports-bugs->portmgr

involves repocopy.
Comment 2 Mark Linimon freebsd_committer freebsd_triage 2012-06-22 04:23:22 UTC
State Changed
From-To: open->repocopy

involves repocopy.
Comment 3 Joe Marcus Clarke freebsd_committer freebsd_triage 2012-06-24 19:15:20 UTC
State Changed
From-To: repocopy->open

The rsyslog ports already exist in the repo.  Resurrect the ones you need 
with appropriate comments.  If you need other specific repocopies, 
reclassify the PR with a list. 


Comment 4 Joe Marcus Clarke freebsd_committer freebsd_triage 2012-06-24 19:15:20 UTC
Responsible Changed
From-To: portmgr->brd

The rsyslog ports already exist in the repo.  Resurrect the ones you need 
with appropriate comments.  If you need other specific repocopies, 
reclassify the PR with a list.
Comment 5 Brad Davis freebsd_committer freebsd_triage 2012-06-26 22:02:19 UTC
Responsible Changed
From-To: brd->portmgr

Marcus, this needs to be repocopied to sysutils/rsyslog6, not sysutils/rsyslog. 


Thanks, 
Brad Davis
Comment 6 Kenyon Ralph 2012-06-27 19:47:33 UTC
Why would we regress in version? The current port has 6.3.6. I can't
tell if this bug http://bugzilla.adiscon.com/show_bug.cgi?id=308 would
be fixed in 6.2.2, for example, but it should be fixed in the latest
6.3.11.

-- 
Kenyon Ralph
Comment 7 Brad Davis freebsd_committer freebsd_triage 2012-07-16 18:43:11 UTC
Responsible Changed
From-To: portmgr->brd

No need for repocopy now that we have swtiched to SVN.
Comment 8 Brad Davis freebsd_committer freebsd_triage 2012-07-16 18:51:03 UTC
Hi Kenyon,

I just wanted to reply to your message about ports/169307.

You are right that the rsyslog6-current version is 6.3.6, but the 6.3
branch is the beta version and the 6.2 branch is the stable version.

See: http://www.rsyslog.com/download/


Regards,
Brad Davis
Comment 9 dfilter service freebsd_committer freebsd_triage 2012-08-16 22:52:54 UTC
Author: brd (doc committer)
Date: Thu Aug 16 21:52:44 2012
New Revision: 302660
URL: http://svn.freebsd.org/changeset/ports/302660

Log:
  - Add rsyslog6*, the stable branch of rsyslog-6 at version 6.2.2
  - Take maintainer
  
  PR:		ports/169307
  Approved by:	pgollucci

Added:
  head/sysutils/rsyslog6/
     - copied from r302659, head/sysutils/rsyslog6-devel/
  head/sysutils/rsyslog6-dbi/
     - copied from r302659, head/sysutils/rsyslog6-devel-dbi/
  head/sysutils/rsyslog6-gnutls/
     - copied from r302659, head/sysutils/rsyslog6-devel-gnutls/
  head/sysutils/rsyslog6-gssapi/
     - copied from r302659, head/sysutils/rsyslog6-devel-gssapi/
  head/sysutils/rsyslog6-mysql/
     - copied from r302659, head/sysutils/rsyslog6-devel-mysql/
  head/sysutils/rsyslog6-pgsql/
     - copied from r302659, head/sysutils/rsyslog6-devel-pgsql/
  head/sysutils/rsyslog6-relp/
     - copied from r302659, head/sysutils/rsyslog6-devel-relp/
  head/sysutils/rsyslog6-rfc3195/
     - copied from r302659, head/sysutils/rsyslog6-devel-rfc3195/
  head/sysutils/rsyslog6-snmp/
     - copied from r302659, head/sysutils/rsyslog6-devel-snmp/
Deleted:
  head/sysutils/rsyslog6/files/patch-grammar__lexer.l
  head/sysutils/rsyslog6/files/patch-plugins__im3195__im3195.c
  head/sysutils/rsyslog6/files/patch-plugins__imklog__bsd.c
  head/sysutils/rsyslog6/files/patch-plugins__imklog__imklog.h
Modified:
  head/sysutils/Makefile
  head/sysutils/rsyslog6-dbi/Makefile
  head/sysutils/rsyslog6-gnutls/Makefile
  head/sysutils/rsyslog6-gssapi/Makefile
  head/sysutils/rsyslog6-mysql/Makefile
  head/sysutils/rsyslog6-pgsql/Makefile
  head/sysutils/rsyslog6-relp/Makefile
  head/sysutils/rsyslog6-rfc3195/Makefile
  head/sysutils/rsyslog6-snmp/Makefile
  head/sysutils/rsyslog6/Makefile
  head/sysutils/rsyslog6/distinfo
  head/sysutils/rsyslog6/pkg-plist

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/Makefile	Thu Aug 16 21:52:44 2012	(r302660)
@@ -770,6 +770,15 @@
     SUBDIR += rsyslog5-relp
     SUBDIR += rsyslog5-rfc3195
     SUBDIR += rsyslog5-snmp
+    SUBDIR += rsyslog6
+    SUBDIR += rsyslog6-dbi
+    SUBDIR += rsyslog6-gnutls
+    SUBDIR += rsyslog6-gssapi
+    SUBDIR += rsyslog6-mysql
+    SUBDIR += rsyslog6-pgsql
+    SUBDIR += rsyslog6-relp
+    SUBDIR += rsyslog6-rfc3195
+    SUBDIR += rsyslog6-snmp
     SUBDIR += rsyslog6-devel
     SUBDIR += rsyslog6-devel-dbi
     SUBDIR += rsyslog6-devel-gnutls

Modified: head/sysutils/rsyslog6-dbi/Makefile
==============================================================================
--- head/sysutils/rsyslog6-devel-dbi/Makefile	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/rsyslog6-dbi/Makefile	Thu Aug 16 21:52:44 2012	(r302660)
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 COMMENT=	LibDBI output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog6-devel
+MASTERDIR=	${.CURDIR}/../rsyslog6
 
 MNAME=	libdbi
 LIB_DEPENDS=	dbi.1:${PORTSDIR}/databases/libdbi

Modified: head/sysutils/rsyslog6-gnutls/Makefile
==============================================================================
--- head/sysutils/rsyslog6-devel-gnutls/Makefile	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/rsyslog6-gnutls/Makefile	Thu Aug 16 21:52:44 2012	(r302660)
@@ -8,7 +8,7 @@
 PORTREVISION=	2
 
 COMMENT=	GNUTLS module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog6-devel
+MASTERDIR=	${.CURDIR}/../rsyslog6
 
 MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls \

Modified: head/sysutils/rsyslog6-gssapi/Makefile
==============================================================================
--- head/sysutils/rsyslog6-devel-gssapi/Makefile	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/rsyslog6-gssapi/Makefile	Thu Aug 16 21:52:44 2012	(r302660)
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GSS API input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog6-devel
+MASTERDIR=	${.CURDIR}/../rsyslog6
 
 MNAME=	gssapi
 

Modified: head/sysutils/rsyslog6-mysql/Makefile
==============================================================================
--- head/sysutils/rsyslog6-devel-mysql/Makefile	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/rsyslog6-mysql/Makefile	Thu Aug 16 21:52:44 2012	(r302660)
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	MySQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog6-devel
+MASTERDIR=	${.CURDIR}/../rsyslog6
 
 MNAME=	mysql
 USE_MYSQL=	yes

Modified: head/sysutils/rsyslog6-pgsql/Makefile
==============================================================================
--- head/sysutils/rsyslog6-devel-pgsql/Makefile	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/rsyslog6-pgsql/Makefile	Thu Aug 16 21:52:44 2012	(r302660)
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	PostgreSQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog6-devel
+MASTERDIR=	${.CURDIR}/../rsyslog6
 
 MNAME=	pgsql
 USE_PGSQL=	yes

Modified: head/sysutils/rsyslog6-relp/Makefile
==============================================================================
--- head/sysutils/rsyslog6-devel-relp/Makefile	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/rsyslog6-relp/Makefile	Thu Aug 16 21:52:44 2012	(r302660)
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RELP input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog6-devel
+MASTERDIR=	${.CURDIR}/../rsyslog6
 
 MNAME=	relp
 LIB_DEPENDS=	relp.0:${PORTSDIR}/devel/librelp

Modified: head/sysutils/rsyslog6-rfc3195/Makefile
==============================================================================
--- head/sysutils/rsyslog6-devel-rfc3195/Makefile	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/rsyslog6-rfc3195/Makefile	Thu Aug 16 21:52:44 2012	(r302660)
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RFC3195 input support for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog6-devel
+MASTERDIR=	${.CURDIR}/../rsyslog6
 
 MNAME=	rfc3195
 LIB_DEPENDS+=	logging.0:${PORTSDIR}/devel/liblogging

Modified: head/sysutils/rsyslog6-snmp/Makefile
==============================================================================
--- head/sysutils/rsyslog6-devel-snmp/Makefile	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/rsyslog6-snmp/Makefile	Thu Aug 16 21:52:44 2012	(r302660)
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	SNMP trap sender for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog6-devel
+MASTERDIR=	${.CURDIR}/../rsyslog6
 
 MNAME=	snmp
 LIB_DEPENDS=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp

Modified: head/sysutils/rsyslog6/Makefile
==============================================================================
--- head/sysutils/rsyslog6-devel/Makefile	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/rsyslog6/Makefile	Thu Aug 16 21:52:44 2012	(r302660)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	6.3.6
+PORTVERSION=	6.2.2
 PORTREVISION?=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
@@ -14,20 +14,21 @@ MASTER_SITES=	http://www.rsyslog.com/fil
 PKGNAMESUFFIX?=	-${MNAME}
 .endif
 
-MAINTAINER=	pgollucci@FreeBSD.org
+MAINTAINER=	brd@FreeBSD.org
 COMMENT?=	Syslogd supporting SQL, TCP, and TLS
 
 USE_LDCONFIG=	yes
 
 LIB_DEPENDS+=	ee:${PORTSDIR}/devel/libee \
-		estr:${PORTSDIR}/devel/libestr
+		estr:${PORTSDIR}/devel/libestr \
+		sysinfo:${PORTSDIR}/devel/libsysinfo
 
 .ifdef MNAME
-RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6-devel
+RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6
 PLIST=		${.CURDIR}/pkg-plist
-LATEST_LINK=	rsyslog6-devel-${MNAME}
+LATEST_LINK=	rsyslog6-${MNAME}
 .else
-LATEST_LINK=	rsyslog6-devel
+LATEST_LINK=	rsyslog6
 .endif
 
 PORTSCOUT=	limit:^6
@@ -40,7 +41,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sane-hostname
 .endif
 
-CONFLICTS=	rsyslog-devel-[!6].[0-9]*
+CONFLICTS=	rsyslog-[!6].[0-9]*
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -56,7 +57,7 @@ CONFIGURE_ARGS+=--enable-rtinst --enable
 CPPFLAGS+=-march=i686
 .endif
 
-CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee"
+CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lsysinfo -lkvm"
 CFLAGS+=	${CPPFLAGS}
 
 .ifndef MNAME
@@ -98,8 +99,8 @@ BROKEN=		Does not link on i386: can't fi
 
 CONFIGURE_ARGS+=	--disable-rsyslogd --disable-klog
 
-DESCR?=		${.CURDIR}/../rsyslog6-devel/pkg-descr
-DISTINFO_FILE?=	${.CURDIR}/../rsyslog6-devel/distinfo
+DESCR?=		${.CURDIR}/../rsyslog6/pkg-descr
+DISTINFO_FILE?=	${.CURDIR}/../rsyslog6/distinfo
 .endif
 
 .if ${OSVERSION} < 700042

Modified: head/sysutils/rsyslog6/distinfo
==============================================================================
--- head/sysutils/rsyslog6-devel/distinfo	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/rsyslog6/distinfo	Thu Aug 16 21:52:44 2012	(r302660)
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-6.3.6.tar.gz) = 5674ccb45cf57670a24eeeed8a713962b9706b3ea5e7cebcee3ca51ee6d59108
-SIZE (rsyslog-6.3.6.tar.gz) = 2472350
+SHA256 (rsyslog-6.2.2.tar.gz) = c54b51f9f26d16e623d664c765268f3696721ceddfbee4e76b0dd89f04a6f471
+SIZE (rsyslog-6.2.2.tar.gz) = 2432745

Modified: head/sysutils/rsyslog6/pkg-plist
==============================================================================
--- head/sysutils/rsyslog6-devel/pkg-plist	Thu Aug 16 21:20:28 2012	(r302659)
+++ head/sysutils/rsyslog6/pkg-plist	Thu Aug 16 21:52:44 2012	(r302660)
@@ -141,7 +141,6 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_secure_tls.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_tls.html
-%%PORTDOCS%%%%DOCSDIR%%/scoping.html
 %%PORTDOCS%%%%DOCSDIR%%/syslog_parsing.html
 %%PORTDOCS%%%%DOCSDIR%%/syslog_protocol.html
 %%PORTDOCS%%%%DOCSDIR%%/tls_cert.jpg
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 10 Brad Davis freebsd_committer freebsd_triage 2012-08-16 23:04:01 UTC
State Changed
From-To: open->closed

- Committed