diff options
| author | Michael Biebl <biebl@debian.org> | 2012-11-16 17:46:06 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-11-16 17:46:06 +0100 |
| commit | 4a99f34b61985d836c7c8abcbf121884d935777c (patch) | |
| tree | 16e1508f624fbffb17232fcdbebc2d1f070f5703 /debian/patches | |
| parent | d331c4ab7915b784fba54b62eeb26dac60bf75d2 (diff) | |
| download | rsyslog-4a99f34b61985d836c7c8abcbf121884d935777c.tar.gz | |
Drop patches which have been merged upstream.
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/02-imkmsg-includes.patch | 14 | ||||
| -rw-r--r-- | debian/patches/03-sysinfo.patch | 28 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 0 insertions, 44 deletions
diff --git a/debian/patches/02-imkmsg-includes.patch b/debian/patches/02-imkmsg-includes.patch deleted file mode 100644 index 8dda400..0000000 --- a/debian/patches/02-imkmsg-includes.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c -index 9ad98da..b771d68 100644 ---- a/plugins/imkmsg/kmsg.c -+++ b/plugins/imkmsg/kmsg.c -@@ -32,7 +32,9 @@ - #include <errno.h> - #include <string.h> - #include <ctype.h> -+#ifdef OS_LINUX - #include <sys/klog.h> -+#endif - #include <json/json.h> - - #include "rsyslog.h" diff --git a/debian/patches/03-sysinfo.patch b/debian/patches/03-sysinfo.patch deleted file mode 100644 index 6c31aad..0000000 --- a/debian/patches/03-sysinfo.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 331c77b..2930fa1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -115,7 +115,7 @@ AC_TYPE_SIGNAL - AC_FUNC_STAT - AC_FUNC_STRERROR_R - AC_FUNC_VPRINTF --AC_CHECK_FUNCS([flock basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync lseek64]) -+AC_CHECK_FUNCS([flock basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul sysinfo uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync lseek64]) - - # the check below is probably ugly. If someone knows how to do it in a better way, please - # let me know! -- rgerhards, 2010-10-06 -diff --git a/runtime/msg.c b/runtime/msg.c -index d874178..9f5c742 100644 ---- a/runtime/msg.c -+++ b/runtime/msg.c -@@ -2875,8 +2875,8 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, - *pbMustBeFreed = 0; - break; - case PROP_SYS_UPTIME: --# ifdef OS_SOLARIS -- pRes = (uchar*) "UPTIME NOT available under Solaris"; -+# ifndef HAVE_SYSINFO -+ pRes = (uchar*) "UPTIME NOT available on this system"; - *pbMustBeFreed = 0; - # else - { diff --git a/debian/patches/series b/debian/patches/series index e80e3af..2113a56 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ # Debian patches for rsyslog 01-dont_create_db.patch -02-imkmsg-includes.patch -03-sysinfo.patch |