sysklogd: fix build with gcc 6

This commit is contained in:
Juergen Daubert 2016-08-27 17:14:36 +02:00
parent ea10033fe9
commit 4289ffcbca
4 changed files with 24 additions and 14 deletions

View File

@ -1,6 +1,6 @@
41dfad9077311e159c793216adf90723 rotatelog
b34c927b05f072083d801deba5420e80 sysklogd
c70599ab0d037fde724f7210c2c8d7f8 sysklogd-1.5.1.tar.gz
65329b18bdabea65ef2b9b0f62562c05 sysklogd.diff
f713765b6840ee73733ff58120de52f5 sysklogd.diff
844e5e75944beb8cf4f39a0535e56ba4 syslog
f8d478b8d60c1d3879f4a10a955db6e5 syslog.conf

View File

@ -1,9 +1,9 @@
untrusted comment: verify with /etc/ports/core.pub
RWRJc1FUaeVeqrIcGPfH9ewZucgLljuMxxhaYfKi5pzwk3ldBuyqxUVUFT00z4sUULEv+QHEgNRziLY+x8dfP9v0+JU+3HWf8Q0=
SHA256 (Pkgfile) = cd32848a5cb098a6032b2e7c6f99da7c01cfd5b25f914259cd2fd6484dcacecd
RWRJc1FUaeVeqrioyv/W2jvqOFbCTggMkbENTDO+t2wHRkR5Gs0QGWPLjaBV74Sqd/LK51uVLT9f+OAIfrXr4S1uJB8DcdD9qQA=
SHA256 (Pkgfile) = a0a2c494adeecadee7c4a6ae6c37e6a757630e2c164930eb66b189d6011cb3af
SHA256 (.footprint) = 14108d5e1b1e66327161c257f42221c914adff192896cbbe5ffe81a58d8dacdc
SHA256 (sysklogd-1.5.1.tar.gz) = 5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201
SHA256 (sysklogd.diff) = a6481fee681399e820450675e6e05ed9b56ed0c02f0a3070efda9c6ba87436f1
SHA256 (sysklogd.diff) = 9e5772075428e2dd9d9f9c21eb64477a96bdf5424c3969f0be901073afc462a7
SHA256 (rotatelog) = 4f51230e8c371d61018d88f6d88d1c6bf6b9aee054302fbf4285c82084bdc98f
SHA256 (syslog) = fc29247aaee9baec087d29a6ffef469d8301bddef913bb7eee67151fceba7112
SHA256 (syslog.conf) = ee27b32b0aba103a8fc30b16ec441127d74a71cac9cd999cb082bdf4273f9f85

View File

@ -4,7 +4,7 @@
name=sysklogd
version=1.5.1
release=5
release=6
source=(http://www.infodrom.org/projects/$name/download/$name-$version.tar.gz \
sysklogd.diff rotatelog syslog syslog.conf sysklogd)

View File

@ -1,6 +1,6 @@
diff -aur sysklogd-1.5.1.orig/Makefile sysklogd-1.5.1/Makefile
--- sysklogd-1.5.1.orig/Makefile 2014-10-04 21:47:18.000000000 +0200
+++ sysklogd-1.5.1/Makefile 2016-03-06 19:25:06.859968348 +0100
diff -Nru sysklogd-1.5.1.orig/Makefile sysklogd-1.5.1/Makefile
--- sysklogd-1.5.1.orig/Makefile 2016-08-27 17:05:36.783075199 +0200
+++ sysklogd-1.5.1/Makefile 2016-08-27 17:05:52.512526347 +0200
@@ -20,7 +20,8 @@
CC= gcc
#SKFLAGS= -g -DSYSV -Wall
@ -11,12 +11,10 @@ diff -aur sysklogd-1.5.1.orig/Makefile sysklogd-1.5.1/Makefile
# -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
# -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
# $(shell getconf LFS_SKFLAGS)
diff --git a/ksym_mod.c b/ksym_mod.c
index 68cd6b6..2cdd104 100644
--- a/ksym_mod.c
+++ b/ksym_mod.c
@@ -189,7 +189,6 @@ extern int InitMsyms()
diff -Nru sysklogd-1.5.1.orig/ksym_mod.c sysklogd-1.5.1/ksym_mod.c
--- sysklogd-1.5.1.orig/ksym_mod.c 2016-08-27 17:05:36.783075199 +0200
+++ sysklogd-1.5.1/ksym_mod.c 2016-08-27 17:05:52.512526347 +0200
@@ -189,7 +189,6 @@
else
Syslog(LOG_ERR, "Error loading kernel symbols " \
"- %s\n", strerror(errno));
@ -24,3 +22,15 @@ index 68cd6b6..2cdd104 100644
return(0);
}
diff -Nru sysklogd-1.5.1.orig/syslogd.c sysklogd-1.5.1/syslogd.c
--- sysklogd-1.5.1.orig/syslogd.c 2016-08-27 17:05:36.783075199 +0200
+++ sysklogd-1.5.1/syslogd.c 2016-08-27 17:08:12.964223932 +0200
@@ -2094,7 +2094,7 @@
(void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */
wait ((int *)0);
#else
- union wait status;
+ int status;
while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
;