diff options
27 files changed, 255 insertions, 32 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index b0c859ef2258..5cb032f572a4 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -715,6 +715,15 @@ SUBDIR += rsyslog5-relp SUBDIR += rsyslog5-rfc3195 SUBDIR += rsyslog5-snmp + SUBDIR += rsyslog55 + SUBDIR += rsyslog55-dbi + SUBDIR += rsyslog55-gnutls + SUBDIR += rsyslog55-gssapi + SUBDIR += rsyslog55-mysql + SUBDIR += rsyslog55-pgsql + SUBDIR += rsyslog55-relp + SUBDIR += rsyslog55-rfc3195 + SUBDIR += rsyslog55-snmp SUBDIR += rtty SUBDIR += ruby-log4r SUBDIR += ruby-quota diff --git a/sysutils/rsyslog55-dbi/Makefile b/sysutils/rsyslog55-dbi/Makefile index 7105b210b8a3..b6793ea85025 100644 --- a/sysutils/rsyslog55-dbi/Makefile +++ b/sysutils/rsyslog55-dbi/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ COMMENT= LibDBI output module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= libdbi LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi diff --git a/sysutils/rsyslog55-gnutls/Makefile b/sysutils/rsyslog55-gnutls/Makefile index 80c35be7d839..2147765a7f63 100644 --- a/sysutils/rsyslog55-gnutls/Makefile +++ b/sysutils/rsyslog55-gnutls/Makefile @@ -6,7 +6,7 @@ # COMMENT= GNUTLS module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= gnutls LIB_DEPENDS+= gnutls.40:${PORTSDIR}/security/gnutls diff --git a/sysutils/rsyslog55-gssapi/Makefile b/sysutils/rsyslog55-gssapi/Makefile index 2e90c606d787..99a5b391fb44 100644 --- a/sysutils/rsyslog55-gssapi/Makefile +++ b/sysutils/rsyslog55-gssapi/Makefile @@ -6,7 +6,7 @@ # COMMENT= GSS API input/output module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= gssapi diff --git a/sysutils/rsyslog55-mysql/Makefile b/sysutils/rsyslog55-mysql/Makefile index b40cac1b4073..a9ef36d84619 100644 --- a/sysutils/rsyslog55-mysql/Makefile +++ b/sysutils/rsyslog55-mysql/Makefile @@ -6,7 +6,7 @@ # COMMENT= MySQL output module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= mysql USE_MYSQL= yes diff --git a/sysutils/rsyslog55-pgsql/Makefile b/sysutils/rsyslog55-pgsql/Makefile index 1d867ee4c3b7..afb21f5d586d 100644 --- a/sysutils/rsyslog55-pgsql/Makefile +++ b/sysutils/rsyslog55-pgsql/Makefile @@ -6,7 +6,7 @@ # COMMENT= PostgreSQL output module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= pgsql USE_PGSQL= yes diff --git a/sysutils/rsyslog55-relp/Makefile b/sysutils/rsyslog55-relp/Makefile index 097271146148..7d4718ceb295 100644 --- a/sysutils/rsyslog55-relp/Makefile +++ b/sysutils/rsyslog55-relp/Makefile @@ -6,7 +6,7 @@ # COMMENT= RELP input/output module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= relp BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config diff --git a/sysutils/rsyslog55-rfc3195/Makefile b/sysutils/rsyslog55-rfc3195/Makefile index bff68245ad1c..f1e63689915f 100644 --- a/sysutils/rsyslog55-rfc3195/Makefile +++ b/sysutils/rsyslog55-rfc3195/Makefile @@ -6,7 +6,7 @@ # COMMENT= RFC3195 input support for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= rfc3195 BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config diff --git a/sysutils/rsyslog55-snmp/Makefile b/sysutils/rsyslog55-snmp/Makefile index 715d869c1c7f..83cd4f74d806 100644 --- a/sysutils/rsyslog55-snmp/Makefile +++ b/sysutils/rsyslog55-snmp/Makefile @@ -6,7 +6,7 @@ # COMMENT= SNMP trap sender for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= snmp LIB_DEPENDS= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp diff --git a/sysutils/rsyslog55/Makefile b/sysutils/rsyslog55/Makefile index a243e4a401bd..d05bd3037197 100644 --- a/sysutils/rsyslog55/Makefile +++ b/sysutils/rsyslog55/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rsyslog -PORTVERSION= 5.4.0 +PORTVERSION= 5.5.4 CATEGORIES= sysutils MASTER_SITES= http://download.rsyslog.com/rsyslog/ .ifdef MNAME @@ -17,12 +17,20 @@ MAINTAINER= cristianorolim@hotmail.com COMMENT?= Syslogd supporting SQL, TCP and TLS .ifdef MNAME -RUN_DEPENDS= rsyslog>=5:${PORTSDIR}/sysutils/rsyslog5 +RUN_DEPENDS= rsyslog>=5.5.0:${PORTSDIR}/sysutils/rsyslog55 PLIST= ${.CURDIR}/pkg-plist .endif -CONFLICTS= rsyslog-[!5].[0-9]* +.ifdef WITH_MYSQL_MICROSECONDS +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds +.endif + +.ifdef WITH_SANE_HOSTNAME +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname +.endif + +CONFLICTS= rsyslog-[!5].[0-9]* rsyslog-5.4.* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes @@ -52,6 +60,7 @@ post-patch: ${WRKSRC}/tools/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' + @${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: @@ -75,8 +84,8 @@ IGNORE= with gssapi module is only supported on FreeBSD 7.x or later CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog -DESCR?= ${.CURDIR}/../rsyslog5/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog5/distinfo +DESCR?= ${.CURDIR}/../rsyslog55/pkg-descr +MD5_FILE?= ${.CURDIR}/../rsyslog55/distinfo .endif .if ${OSVERSION} < 700042 diff --git a/sysutils/rsyslog55/distinfo b/sysutils/rsyslog55/distinfo index a4527494eeae..bbda583fd64b 100644 --- a/sysutils/rsyslog55/distinfo +++ b/sysutils/rsyslog55/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37 -SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228 -SIZE (rsyslog-5.4.0.tar.gz) = 2124201 +MD5 (rsyslog-5.5.4.tar.gz) = 824df2504955df1619e5ec2915d783aa +SHA256 (rsyslog-5.5.4.tar.gz) = 31853a551ea7ca960c59c9e33406b1748bdf311059c9d8a4ce98816d51b17cac +SIZE (rsyslog-5.5.4.tar.gz) = 2200136 diff --git a/sysutils/rsyslog55/files/extra-patch-mysql-microseconds b/sysutils/rsyslog55/files/extra-patch-mysql-microseconds new file mode 100644 index 000000000000..ec248b064741 --- /dev/null +++ b/sysutils/rsyslog55/files/extra-patch-mysql-microseconds @@ -0,0 +1,56 @@ +--- ./runtime/datetime.c.orig 2010-05-04 18:57:25.588028725 -0400 ++++ ./runtime/datetime.c 2010-05-04 18:59:12.390680038 -0400 +@@ -644,18 +644,30 @@ + pBuf[1] = (ts->year / 100) % 10 + '0'; + pBuf[2] = (ts->year / 10) % 10 + '0'; + pBuf[3] = ts->year % 10 + '0'; +- pBuf[4] = (ts->month / 10) % 10 + '0'; +- pBuf[5] = ts->month % 10 + '0'; +- pBuf[6] = (ts->day / 10) % 10 + '0'; +- pBuf[7] = ts->day % 10 + '0'; +- pBuf[8] = (ts->hour / 10) % 10 + '0'; +- pBuf[9] = ts->hour % 10 + '0'; +- pBuf[10] = (ts->minute / 10) % 10 + '0'; +- pBuf[11] = ts->minute % 10 + '0'; +- pBuf[12] = (ts->second / 10) % 10 + '0'; +- pBuf[13] = ts->second % 10 + '0'; +- pBuf[14] = '\0'; +- return 15; ++ pBuf[4] = '-'; ++ pBuf[5] = (ts->month / 10) % 10 + '0'; ++ pBuf[6] = ts->month % 10 + '0'; ++ pBuf[7] = '-'; ++ pBuf[8] = (ts->day / 10) % 10 + '0'; ++ pBuf[9] = ts->day % 10 + '0'; ++ pBuf[10] = ' '; ++ pBuf[11] = (ts->hour / 10) % 10 + '0'; ++ pBuf[12] = ts->hour % 10 + '0'; ++ pBuf[13] = ':'; ++ pBuf[14] = (ts->minute / 10) % 10 + '0'; ++ pBuf[15] = ts->minute % 10 + '0'; ++ pBuf[16] = ':'; ++ pBuf[17] = (ts->second / 10) % 10 + '0'; ++ pBuf[18] = ts->second % 10 + '0'; ++ pBuf[19] = '.'; ++ pBuf[20] = (ts->secfrac / 100000) % 10 + '0'; ++ pBuf[21] = (ts->secfrac / 10000) % 10 + '0'; ++ pBuf[22] = (ts->secfrac / 1000) % 10 + '0'; ++ pBuf[23] = (ts->secfrac / 100) % 10 + '0'; ++ pBuf[24] = (ts->secfrac / 10) % 10 + '0'; ++ pBuf[25] = ts->secfrac % 10 + '0'; ++ pBuf[26] = '\0'; ++ return 26; + + } + +--- ./runtime/msg.c.orig 2010-05-04 19:00:20.241528788 -0400 ++++ ./runtime/msg.c 2010-05-04 19:00:06.136349680 -0400 +@@ -1293,7 +1293,7 @@ + case tplFmtMySQLDate: + MsgLock(pM); + if(pM->pszTIMESTAMP_MySQL == NULL) { +- if((pM->pszTIMESTAMP_MySQL = MALLOC(15)) == NULL) { ++ if((pM->pszTIMESTAMP_MySQL = MALLOC(26)) == NULL) { + MsgUnlock(pM); + return ""; + } diff --git a/sysutils/rsyslog55/files/extra-patch-sane-hostname b/sysutils/rsyslog55/files/extra-patch-sane-hostname new file mode 100644 index 000000000000..bc7251475d81 --- /dev/null +++ b/sysutils/rsyslog55/files/extra-patch-sane-hostname @@ -0,0 +1,40 @@ +--- ./tools/syslogd.c.orig 2010-05-04 19:02:05.548362478 -0400 ++++ ./tools/syslogd.c 2010-05-04 19:02:27.452450741 -0400 +@@ -2611,37 +2611,6 @@ + net.getLocalHostname(&LocalFQDNName); + CHKmalloc(LocalHostName = (uchar*) strdup((char*)LocalFQDNName)); + glbl.SetLocalFQDNName(LocalFQDNName); /* set the FQDN before we modify it */ +- if((p = (uchar*)strchr((char*)LocalHostName, '.'))) { +- *p++ = '\0'; +- LocalDomain = p; +- } else { +- LocalDomain = (uchar*)""; +- +- /* It's not clearly defined whether gethostname() +- * should return the simple hostname or the fqdn. A +- * good piece of software should be aware of both and +- * we want to distribute good software. Joey +- * +- * Good software also always checks its return values... +- * If syslogd starts up before DNS is up & /etc/hosts +- * doesn't have LocalHostName listed, gethostbyname will +- * return NULL. +- */ +- /* TODO: gethostbyname() is not thread-safe, but replacing it is +- * not urgent as we do not run on multiple threads here. rgerhards, 2007-09-25 +- */ +- hent = gethostbyname((char*)LocalHostName); +- if(hent) { +- free(LocalHostName); +- CHKmalloc(LocalHostName = (uchar*)strdup(hent->h_name)); +- +- if((p = (uchar*)strchr((char*)LocalHostName, '.'))) +- { +- *p++ = '\0'; +- LocalDomain = p; +- } +- } +- } + + /* Convert to lower case to recognize the correct domain laterly */ + for(p = LocalDomain ; *p ; p++) diff --git a/sysutils/rsyslog55/pkg-plist b/sysutils/rsyslog55/pkg-plist index 4120023c3fba..3d534e897482 100644 --- a/sysutils/rsyslog55/pkg-plist +++ b/sysutils/rsyslog55/pkg-plist @@ -52,6 +52,7 @@ sbin/rsyslogd %%PORTDOCS%%%%DOCSDIR%%/imgssapi.html %%PORTDOCS%%%%DOCSDIR%%/imklog.html %%PORTDOCS%%%%DOCSDIR%%/imrelp.html +%%PORTDOCS%%%%DOCSDIR%%/imsolaris.html %%PORTDOCS%%%%DOCSDIR%%/imtcp.html %%PORTDOCS%%%%DOCSDIR%%/imuxsock.html %%PORTDOCS%%%%DOCSDIR%%/index.html @@ -93,6 +94,7 @@ sbin/rsyslogd %%PORTDOCS%%%%DOCSDIR%%/rsconf1_dropmsgswithmaliciousdnsptrrecords.html %%PORTDOCS%%%%DOCSDIR%%/rsconf1_droptrailinglfonreception.html %%PORTDOCS%%%%DOCSDIR%%/rsconf1_dynafilecachesize.html +%%PORTDOCS%%%%DOCSDIR%%/rsconf1_escape8bitcharsonreceive.html %%PORTDOCS%%%%DOCSDIR%%/rsconf1_escapecontrolcharactersonreceive.html %%PORTDOCS%%%%DOCSDIR%%/rsconf1_failonchownfailure.html %%PORTDOCS%%%%DOCSDIR%%/rsconf1_filecreatemode.html diff --git a/sysutils/rsyslog6-devel-dbi/Makefile b/sysutils/rsyslog6-devel-dbi/Makefile index 7105b210b8a3..b6793ea85025 100644 --- a/sysutils/rsyslog6-devel-dbi/Makefile +++ b/sysutils/rsyslog6-devel-dbi/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ COMMENT= LibDBI output module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= libdbi LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi diff --git a/sysutils/rsyslog6-devel-gnutls/Makefile b/sysutils/rsyslog6-devel-gnutls/Makefile index 80c35be7d839..2147765a7f63 100644 --- a/sysutils/rsyslog6-devel-gnutls/Makefile +++ b/sysutils/rsyslog6-devel-gnutls/Makefile @@ -6,7 +6,7 @@ # COMMENT= GNUTLS module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= gnutls LIB_DEPENDS+= gnutls.40:${PORTSDIR}/security/gnutls diff --git a/sysutils/rsyslog6-devel-gssapi/Makefile b/sysutils/rsyslog6-devel-gssapi/Makefile index 2e90c606d787..99a5b391fb44 100644 --- a/sysutils/rsyslog6-devel-gssapi/Makefile +++ b/sysutils/rsyslog6-devel-gssapi/Makefile @@ -6,7 +6,7 @@ # COMMENT= GSS API input/output module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= gssapi diff --git a/sysutils/rsyslog6-devel-mysql/Makefile b/sysutils/rsyslog6-devel-mysql/Makefile index b40cac1b4073..a9ef36d84619 100644 --- a/sysutils/rsyslog6-devel-mysql/Makefile +++ b/sysutils/rsyslog6-devel-mysql/Makefile @@ -6,7 +6,7 @@ # COMMENT= MySQL output module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= mysql USE_MYSQL= yes diff --git a/sysutils/rsyslog6-devel-pgsql/Makefile b/sysutils/rsyslog6-devel-pgsql/Makefile index 1d867ee4c3b7..afb21f5d586d 100644 --- a/sysutils/rsyslog6-devel-pgsql/Makefile +++ b/sysutils/rsyslog6-devel-pgsql/Makefile @@ -6,7 +6,7 @@ # COMMENT= PostgreSQL output module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= pgsql USE_PGSQL= yes diff --git a/sysutils/rsyslog6-devel-relp/Makefile b/sysutils/rsyslog6-devel-relp/Makefile index 097271146148..7d4718ceb295 100644 --- a/sysutils/rsyslog6-devel-relp/Makefile +++ b/sysutils/rsyslog6-devel-relp/Makefile @@ -6,7 +6,7 @@ # COMMENT= RELP input/output module for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= relp BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config diff --git a/sysutils/rsyslog6-devel-rfc3195/Makefile b/sysutils/rsyslog6-devel-rfc3195/Makefile index bff68245ad1c..f1e63689915f 100644 --- a/sysutils/rsyslog6-devel-rfc3195/Makefile +++ b/sysutils/rsyslog6-devel-rfc3195/Makefile @@ -6,7 +6,7 @@ # COMMENT= RFC3195 input support for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= rfc3195 BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config diff --git a/sysutils/rsyslog6-devel-snmp/Makefile b/sysutils/rsyslog6-devel-snmp/Makefile index 715d869c1c7f..83cd4f74d806 100644 --- a/sysutils/rsyslog6-devel-snmp/Makefile +++ b/sysutils/rsyslog6-devel-snmp/Makefile @@ -6,7 +6,7 @@ # COMMENT= SNMP trap sender for rsyslog -MASTERDIR= ${.CURDIR}/../rsyslog5 +MASTERDIR= ${.CURDIR}/../rsyslog55 MNAME= snmp LIB_DEPENDS= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile index a243e4a401bd..d05bd3037197 100644 --- a/sysutils/rsyslog6-devel/Makefile +++ b/sysutils/rsyslog6-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rsyslog -PORTVERSION= 5.4.0 +PORTVERSION= 5.5.4 CATEGORIES= sysutils MASTER_SITES= http://download.rsyslog.com/rsyslog/ .ifdef MNAME @@ -17,12 +17,20 @@ MAINTAINER= cristianorolim@hotmail.com COMMENT?= Syslogd supporting SQL, TCP and TLS .ifdef MNAME -RUN_DEPENDS= rsyslog>=5:${PORTSDIR}/sysutils/rsyslog5 +RUN_DEPENDS= rsyslog>=5.5.0:${PORTSDIR}/sysutils/rsyslog55 PLIST= ${.CURDIR}/pkg-plist .endif -CONFLICTS= rsyslog-[!5].[0-9]* +.ifdef WITH_MYSQL_MICROSECONDS +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds +.endif + +.ifdef WITH_SANE_HOSTNAME +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname +.endif + +CONFLICTS= rsyslog-[!5].[0-9]* rsyslog-5.4.* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes @@ -52,6 +60,7 @@ post-patch: ${WRKSRC}/tools/syslogd.c @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' + @${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: @@ -75,8 +84,8 @@ IGNORE= with gssapi module is only supported on FreeBSD 7.x or later CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog -DESCR?= ${.CURDIR}/../rsyslog5/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog5/distinfo +DESCR?= ${.CURDIR}/../rsyslog55/pkg-descr +MD5_FILE?= ${.CURDIR}/../rsyslog55/distinfo .endif .if ${OSVERSION} < 700042 diff --git a/sysutils/rsyslog6-devel/distinfo b/sysutils/rsyslog6-devel/distinfo index a4527494eeae..bbda583fd64b 100644 --- a/sysutils/rsyslog6-devel/distinfo +++ b/sysutils/rsyslog6-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37 -SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228 -SIZE (rsyslog-5.4.0.tar.gz) = 2124201 +MD5 (rsyslog-5.5.4.tar.gz) = 824df2504955df1619e5ec2915d783aa +SHA256 (rsyslog-5.5.4.tar.gz) = 31853a551ea7ca960c59c9e33406b1748bdf311059c9d8a4ce98816d51b17cac +SIZE (rsyslog-5.5.4.tar.gz) = 2200136 diff --git a/sysutils/rsyslog6-devel/files/extra-patch-mysql-microseconds b/sysutils/rsyslog6-devel/files/extra-patch-mysql-microseconds new file mode 100644 index 000000000000..ec248b064741 --- /dev/null +++ b/sysutils/rsyslog6-devel/files/extra-patch-mysql-microseconds @@ -0,0 +1,56 @@ +--- ./runtime/datetime.c.orig 2010-05-04 18:57:25.588028725 -0400 ++++ ./runtime/datetime.c 2010-05-04 18:59:12.390680038 -0400 +@@ -644,18 +644,30 @@ + pBuf[1] = (ts->year / 100) % 10 + '0'; + pBuf[2] = (ts->year / 10) % 10 + '0'; + pBuf[3] = ts->year % 10 + '0'; +- pBuf[4] = (ts->month / 10) % 10 + '0'; +- pBuf[5] = ts->month % 10 + '0'; +- pBuf[6] = (ts->day / 10) % 10 + '0'; +- pBuf[7] = ts->day % 10 + '0'; +- pBuf[8] = (ts->hour / 10) % 10 + '0'; +- pBuf[9] = ts->hour % 10 + '0'; +- pBuf[10] = (ts->minute / 10) % 10 + '0'; +- pBuf[11] = ts->minute % 10 + '0'; +- pBuf[12] = (ts->second / 10) % 10 + '0'; +- pBuf[13] = ts->second % 10 + '0'; +- pBuf[14] = '\0'; +- return 15; ++ pBuf[4] = '-'; ++ pBuf[5] = (ts->month / 10) % 10 + '0'; ++ pBuf[6] = ts->month % 10 + '0'; ++ pBuf[7] = '-'; ++ pBuf[8] = (ts->day / 10) % 10 + '0'; ++ pBuf[9] = ts->day % 10 + '0'; ++ pBuf[10] = ' '; ++ pBuf[11] = (ts->hour / 10) % 10 + '0'; ++ pBuf[12] = ts->hour % 10 + '0'; ++ pBuf[13] = ':'; ++ pBuf[14] = (ts->minute / 10) % 10 + '0'; ++ pBuf[15] = ts->minute % 10 + '0'; ++ pBuf[16] = ':'; ++ pBuf[17] = (ts->second / 10) % 10 + '0'; ++ pBuf[18] = ts->second % 10 + '0'; ++ pBuf[19] = '.'; ++ pBuf[20] = (ts->secfrac / 100000) % 10 + '0'; ++ pBuf[21] = (ts->secfrac / 10000) % 10 + '0'; ++ pBuf[22] = (ts->secfrac / 1000) % 10 + '0'; ++ pBuf[23] = (ts->secfrac / 100) % 10 + '0'; ++ pBuf[24] = (ts->secfrac / 10) % 10 + '0'; ++ pBuf[25] = ts->secfrac % 10 + '0'; ++ pBuf[26] = '\0'; ++ return 26; + + } + +--- ./runtime/msg.c.orig 2010-05-04 19:00:20.241528788 -0400 ++++ ./runtime/msg.c 2010-05-04 19:00:06.136349680 -0400 +@@ -1293,7 +1293,7 @@ + case tplFmtMySQLDate: + MsgLock(pM); + if(pM->pszTIMESTAMP_MySQL == NULL) { +- if((pM->pszTIMESTAMP_MySQL = MALLOC(15)) == NULL) { ++ if((pM->pszTIMESTAMP_MySQL = MALLOC(26)) == NULL) { + MsgUnlock(pM); + return ""; + } diff --git a/sysutils/rsyslog6-devel/files/extra-patch-sane-hostname b/sysutils/rsyslog6-devel/files/extra-patch-sane-hostname new file mode 100644 index 000000000000..bc7251475d81 --- /dev/null +++ b/sysutils/rsyslog6-devel/files/extra-patch-sane-hostname @@ -0,0 +1,40 @@ +--- ./tools/syslogd.c.orig 2010-05-04 19:02:05.548362478 -0400 ++++ ./tools/syslogd.c 2010-05-04 19:02:27.452450741 -0400 +@@ -2611,37 +2611,6 @@ + net.getLocalHostname(&LocalFQDNName); + CHKmalloc(LocalHostName = (uchar*) strdup((char*)LocalFQDNName)); + glbl.SetLocalFQDNName(LocalFQDNName); /* set the FQDN before we modify it */ +- if((p = (uchar*)strchr((char*)LocalHostName, '.'))) { +- *p++ = '\0'; +- LocalDomain = p; +- } else { +- LocalDomain = (uchar*)""; +- +- /* It's not clearly defined whether gethostname() +- * should return the simple hostname or the fqdn. A +- * good piece of software should be aware of both and +- * we want to distribute good software. Joey +- * +- * Good software also always checks its return values... +- * If syslogd starts up before DNS is up & /etc/hosts +- * doesn't have LocalHostName listed, gethostbyname will +- * return NULL. +- */ +- /* TODO: gethostbyname() is not thread-safe, but replacing it is +- * not urgent as we do not run on multiple threads here. rgerhards, 2007-09-25 +- */ +- hent = gethostbyname((char*)LocalHostName); +- if(hent) { +- free(LocalHostName); +- CHKmalloc(LocalHostName = (uchar*)strdup(hent->h_name)); +- +- if((p = (uchar*)strchr((char*)LocalHostName, '.'))) +- { +- *p++ = '\0'; +- LocalDomain = p; +- } +- } +- } + + /* Convert to lower case to recognize the correct domain laterly */ + for(p = LocalDomain ; *p ; p++) diff --git a/sysutils/rsyslog6-devel/pkg-plist b/sysutils/rsyslog6-devel/pkg-plist index 4120023c3fba..3d534e897482 100644 --- a/sysutils/rsyslog6-devel/pkg-plist +++ b/sysutils/rsyslog6-devel/pkg-plist @@ -52,6 +52,7 @@ sbin/rsyslogd %%PORTDOCS%%%%DOCSDIR%%/imgssapi.html %%PORTDOCS%%%%DOCSDIR%%/imklog.html %%PORTDOCS%%%%DOCSDIR%%/imrelp.html +%%PORTDOCS%%%%DOCSDIR%%/imsolaris.html %%PORTDOCS%%%%DOCSDIR%%/imtcp.html %%PORTDOCS%%%%DOCSDIR%%/imuxsock.html %%PORTDOCS%%%%DOCSDIR%%/index.html @@ -93,6 +94,7 @@ sbin/rsyslogd %%PORTDOCS%%%%DOCSDIR%%/rsconf1_dropmsgswithmaliciousdnsptrrecords.html %%PORTDOCS%%%%DOCSDIR%%/rsconf1_droptrailinglfonreception.html %%PORTDOCS%%%%DOCSDIR%%/rsconf1_dynafilecachesize.html +%%PORTDOCS%%%%DOCSDIR%%/rsconf1_escape8bitcharsonreceive.html %%PORTDOCS%%%%DOCSDIR%%/rsconf1_escapecontrolcharactersonreceive.html %%PORTDOCS%%%%DOCSDIR%%/rsconf1_failonchownfailure.html %%PORTDOCS%%%%DOCSDIR%%/rsconf1_filecreatemode.html |