Attachment #125674 for bug #169307

View | Details | Raw Unified | Return to bug 169307
Collapse All | Expand All




#

PORTNAME=      rsyslog
PORTVERSION=   6.2.2
PORTREVISION?= 0
CATEGORIES=    sysutils
MASTER_SITES=  http://www.rsyslog.com/files/download/rsyslog/

USE_LDCONFIG=  yes

LIB_DEPENDS+=  ee:${PORTSDIR}/devel/libee \
               estr:${PORTSDIR}/devel/libestr \
               sysinfo:${PORTSDIR}/devel/libsysinfo

.ifdef MNAME
RUN_DEPENDS=   rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6-devel

CPPFLAGS+=-march=i686
.endif

CONFIGURE_ENV+=        LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFL
CFLAGS+=       ${CPPFLAGS}

.ifndef MNAME

Lines 1-2 Link Here

(-)rsyslog6/distinfo 2012-06-21 09:11:40.000000000 -0600 (-2 / +2 lines)
1	SHA256 (rsyslog-6.3.6.tar.gz) = 5674ccb45cf57670a24eeeed8a713962b9706b3ea5e7cebcee3ca51ee6d59108	1	SHA256 (rsyslog-6.2.2.tar.gz) = c54b51f9f26d16e623d664c765268f3696721ceddfbee4e76b0dd89f04a6f471
2	SIZE (rsyslog-6.3.6.tar.gz) = 2472350	2	SIZE (rsyslog-6.2.2.tar.gz) = 2432745

Lines 1-11 Link Here

(-)rsyslog6/files/patch-grammar__lexer.l 1969-12-31 17:00:00.000000000 -0700 (-11 lines)
1	--- ./grammar/lexer.l.orig 2011-09-15 06:01:15.000000000 +0000
2	+++ ./grammar/lexer.l 2012-01-17 01:17:22.081763540 +0000
3	@@ -87,7 +87,7 @@
4	* included. I guess that's some autotools magic I don't understand...
5	*/
6	//char strdup(char);
7	-int fileno(FILE *stream);
8	+//int fileno(FILE *stream);
9
10	%}
11




--- ./plugins/imklog/bsd.c.orig        2012-01-17 01:18:16.381760139 +0000
+++ ./plugins/imklog/bsd.c     2012-01-17 01:20:48.523313199 +0000
@@ -93,7 +93,7 @@
  * entry point. -- rgerhards, 2008-04-09
  */
 rsRetVal
-klogWillRun(void)
+klogWillRun(modConfData_t *pModConf)
 {
       DEFiRet;
 
@@ -176,7 +176,7 @@
 /* to be called in the module's AfterRun entry point
  * rgerhards, 2008-04-09
  */
-rsRetVal klogAfterRun(void)
+rsRetVal klogAfterRun(modConfData_t *pModConf)
 {
         DEFiRet;
       if(fklog != -1)
@@ -190,7 +190,7 @@
  * "message pull" mechanism.
  * rgerhards, 2008-04-09
  */
-rsRetVal klogLogKMsg(void)
+rsRetVal klogLogKMsg(modConfData_t *pModConf)
 {
         DEFiRet;
       readklog();

Lines 1-11 Link Here

(-)rsyslog6/files/patch-plugins__imklog__imklog.h 1969-12-31 17:00:00.000000000 -0700 (-11 lines)
1	--- ./plugins/imklog/imklog.h.orig 2012-01-17 01:19:00.125759823 +0000
2	+++ ./plugins/imklog/imklog.h 2012-01-17 01:19:09.879756857 +0000
3	@@ -60,7 +60,7 @@
4	* believe it is appropriate for the job that needs to be done.
5	* rgerhards, 2008-04-09
6	*/
7	-#if 0
8	+#if 1
9	extern int symbols_twice;
10	extern int use_syscall;
11	extern int symbol_lookup;

Lines 141-147 Link Here

(-)rsyslog6/pkg-plist 2012-06-21 14:02:53.000000000 -0600 (-1 lines)
141	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_secure_tls.html	141	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_secure_tls.html
142	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html	142	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html
143	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_tls.html	143	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_tls.html
144	%%PORTDOCS%%%%DOCSDIR%%/scoping.html
145	%%PORTDOCS%%%%DOCSDIR%%/syslog_parsing.html	144	%%PORTDOCS%%%%DOCSDIR%%/syslog_parsing.html
146	%%PORTDOCS%%%%DOCSDIR%%/syslog_protocol.html	145	%%PORTDOCS%%%%DOCSDIR%%/syslog_protocol.html
147	%%PORTDOCS%%%%DOCSDIR%%/tls_cert.jpg	146	%%PORTDOCS%%%%DOCSDIR%%/tls_cert.jpg

Return to bug 169307

Lines 6-12 Link Here

(-)rsyslog6/Makefile 2012-06-21 13:56:09.000000000 -0600 (-3 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= rsyslog	8	PORTNAME= rsyslog
9	PORTVERSION= 6.3.6	9	PORTVERSION= 6.2.2
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	CATEGORIES= sysutils	11	CATEGORIES= sysutils
12	MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/	12	MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
Lines 20-26 Link Here
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21		21
22	LIB_DEPENDS+= ee:${PORTSDIR}/devel/libee \	22	LIB_DEPENDS+= ee:${PORTSDIR}/devel/libee \
23	estr:${PORTSDIR}/devel/libestr	23	estr:${PORTSDIR}/devel/libestr \
		24	sysinfo:${PORTSDIR}/devel/libsysinfo
24		25
25	.ifdef MNAME	26	.ifdef MNAME
26	RUN_DEPENDS= rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6-devel	27	RUN_DEPENDS= rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6-devel
Lines 56-62 Link Here
56	CPPFLAGS+=-march=i686	57	CPPFLAGS+=-march=i686
57	.endif	58	.endif
58		59
59	CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFL	60	CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFL
60	CFLAGS+= ${CPPFLAGS}	61	CFLAGS+= ${CPPFLAGS}
61		62
62	.ifndef MNAME	63	.ifndef MNAME

Lines 1-29 Link Here

(-)rsyslog6/files/patch-plugins__imklog__bsd.c 1969-12-31 17:00:00.000000000 -0700 (-29 lines)
1	--- ./plugins/imklog/bsd.c.orig 2012-01-17 01:18:16.381760139 +0000
2	+++ ./plugins/imklog/bsd.c 2012-01-17 01:20:48.523313199 +0000
3	@@ -93,7 +93,7 @@
4	* entry point. -- rgerhards, 2008-04-09
5	*/
6	rsRetVal
7	-klogWillRun(void)
8	+klogWillRun(modConfData_t *pModConf)
9	{
10	DEFiRet;
11
12	@@ -176,7 +176,7 @@
13	/* to be called in the module's AfterRun entry point
14	* rgerhards, 2008-04-09
15	*/
16	-rsRetVal klogAfterRun(void)
17	+rsRetVal klogAfterRun(modConfData_t *pModConf)
18	{
19	DEFiRet;
20	if(fklog != -1)
21	@@ -190,7 +190,7 @@
22	* "message pull" mechanism.
23	* rgerhards, 2008-04-09
24	*/
25	-rsRetVal klogLogKMsg(void)
26	+rsRetVal klogLogKMsg(modConfData_t *pModConf)
27	{
28	DEFiRet;
29	readklog();