- Update the patches to fix the build.

Pointy hat to:	me
Noticed by:	Andrzej Tobola < ato AT iem.pw.edu.pl >
This commit is contained in:
Brad Davis 2012-08-18 06:24:20 +00:00
parent c9e0bf5215
commit dfe7a32277
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=302703
3 changed files with 12 additions and 43 deletions

View File

@ -1,29 +0,0 @@
--- ./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();

View File

@ -1,11 +0,0 @@
--- ./plugins/imklog/imklog.h.orig 2012-01-17 01:19:00.125759823 +0000
+++ ./plugins/imklog/imklog.h 2012-01-17 01:19:09.879756857 +0000
@@ -60,7 +60,7 @@
* believe it is appropriate for the job that needs to be done.
* rgerhards, 2008-04-09
*/
-#if 0
+#if 1
extern int symbols_twice;
extern int use_syscall;
extern int symbol_lookup;

View File

@ -1,6 +1,15 @@
--- ./plugins/imuxsock/imuxsock.c.orig 2011-09-15 06:01:15.000000000 +0000
+++ ./plugins/imuxsock/imuxsock.c 2012-01-17 01:17:22.085759310 +0000
@@ -727,9 +727,7 @@
--- plugins/imuxsock/imuxsock.c.orig 2012-06-18 02:13:18.000000000 -0600
+++ plugins/imuxsock/imuxsock.c 2012-08-16 16:37:27.000000000 -0600
@@ -81,7 +81,7 @@
/* emulate struct ucred for platforms that do not have it */
#ifndef HAVE_SCM_CREDENTIALS
-struct ucred { int pid; };
+struct ucred { int pid; uid_t uid; gid_t gid; };
#endif
/* handle some defines missing on more than one platform */
@@ -891,9 +891,7 @@
int iMaxLine;
struct msghdr msgh;
struct iovec msgiov;