diff options
Diffstat (limited to 'sysutils/rsyslog6-devel/files')
-rw-r--r-- | sysutils/rsyslog6-devel/files/extra-patch-mysql-microseconds | 56 | ||||
-rw-r--r-- | sysutils/rsyslog6-devel/files/extra-patch-sane-hostname | 40 | ||||
-rw-r--r-- | sysutils/rsyslog6-devel/files/pkg-message.in | 30 | ||||
-rw-r--r-- | sysutils/rsyslog6-devel/files/rsyslogd.in | 25 |
4 files changed, 0 insertions, 151 deletions
diff --git a/sysutils/rsyslog6-devel/files/extra-patch-mysql-microseconds b/sysutils/rsyslog6-devel/files/extra-patch-mysql-microseconds deleted file mode 100644 index ec248b064741..000000000000 --- a/sysutils/rsyslog6-devel/files/extra-patch-mysql-microseconds +++ /dev/null @@ -1,56 +0,0 @@ ---- ./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 deleted file mode 100644 index bc7251475d81..000000000000 --- a/sysutils/rsyslog6-devel/files/extra-patch-sane-hostname +++ /dev/null @@ -1,40 +0,0 @@ ---- ./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/files/pkg-message.in b/sysutils/rsyslog6-devel/files/pkg-message.in deleted file mode 100644 index 644cf3b61481..000000000000 --- a/sysutils/rsyslog6-devel/files/pkg-message.in +++ /dev/null @@ -1,30 +0,0 @@ -=================================================================== -To start using rsyslogd(8), stop syslogd(8) if it's running and -add the following lines to rc.conf(5): - - syslogd_enable="NO" - rsyslogd_enable="YES" - -To avoid warnings about rsyslogd running in compatibility mode, add -this: - - rsyslogd_flags="-c5" - -It's recommended to copy syslog.conf(5) to -%%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add -this: - - rsyslogd_config="/etc/syslog.conf" - -Add the following (3) lines to the beginning of the config file, for -basic functionality: - - $ModLoad immark.so # provides --MARK-- message capability - $ModLoad imuxsock.so # provides support for local system logging - $ModLoad imklog.so # kernel logging - -newsyslog(8) has the path of syslogd's pid file hardcoded. To -make it work seamlessly with rsyslog, add this: - - rsyslogd_pidfile="/var/run/syslog.pid" -=================================================================== diff --git a/sysutils/rsyslog6-devel/files/rsyslogd.in b/sysutils/rsyslog6-devel/files/rsyslogd.in deleted file mode 100644 index 7fd9b1089b54..000000000000 --- a/sysutils/rsyslog6-devel/files/rsyslogd.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - - -# PROVIDE: rsyslogd -# REQUIRE: mountcritremote cleanvar newsyslog ldconfig -# BEFORE: SERVERS - -. /etc/rc.subr - -name=rsyslogd -rcvar=`set_rcvar` -command="%%PREFIX%%/sbin/${name}" -load_rc_config $name -: ${rsyslogd_enable:="NO"} -: ${rsyslogd_pidfile:="/var/run/rsyslogd.pid"} -: ${rsyslogd_config:="%%PREFIX%%/etc/rsyslog.conf"} -pidfile="${rsyslogd_pidfile}" -command_args="-i ${pidfile} -f ${rsyslogd_config}" -required_files="${rsyslogd_config}" -extra_commands="reload" - -run_rc_command "$1" |