Репозитории ALT
S: | 1.8.0-alt1 |
5.1: | 1.4.1-alt30 |
4.1: | 1.4.1-alt28 |
4.0: | 1.4.1-alt27 |
3.0: | 1.4.1-alt20 |
Группа :: Система/Ядро и оборудование
Пакет: sysklogd
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: sysklogd-1.4.2-alt-format.patch
Скачать
Скачать
diff -urk.orig sysklogd.orig/klogd.h sysklogd/klogd.h
--- sysklogd.orig/klogd.h 1997-06-13 13:35:54 +0400
+++ sysklogd/klogd.h 2004-08-09 21:06:22 +0400
@@ -31,10 +31,16 @@
#include <syslog.h>
#include <string.h>
+#ifndef __attribute__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
+# define __attribute__(x)
+# endif
+#endif
/* Function prototypes. */
extern int InitKsyms(char *);
extern int InitMsyms(void);
extern char * ExpandKadds(char *, char *);
extern void SetParanoiaLevel(int);
-extern void Syslog(int priority, char *fmt, ...);
+extern void Syslog(int priority, char *fmt, ...)
+ __attribute__ ((__format__ (__printf__, 2, 3)));
diff -urk.orig sysklogd.orig/ksym_mod.c sysklogd/ksym_mod.c
--- sysklogd.orig/ksym_mod.c 2004-03-31 19:47:08 +0400
+++ sysklogd/ksym_mod.c 2004-08-09 20:54:03 +0400
@@ -412,7 +412,7 @@
if ( lseek64(memfd, address, SEEK_SET) < 0 )
{
Syslog(LOG_WARNING, "Error seeking in /dev/kmem\n");
- Syslog(LOG_WARNING, "Symbol %s, value %08x\n", symbol, address);
+ Syslog(LOG_WARNING, "Symbol %s, value %08lx\n", symbol, address);
return(0);
}
if ( read(memfd, \
diff -urk.orig sysklogd.orig/syslogd.c sysklogd/syslogd.c
--- sysklogd.orig/syslogd.c 2004-05-04 18:52:56 +0400
+++ sysklogd/syslogd.c 2004-08-09 21:06:04 +0400
@@ -570,6 +570,12 @@
#define _PATH_LOG "/dev/log"
#endif
+#ifndef __attribute__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
+# define __attribute__(x)
+# endif
+#endif
+
char *ConfFile = _PATH_LOGCONF;
char *PidFile = _PATH_LOGPID;
char ctty[] = _PATH_CONSOLE;
@@ -786,7 +792,8 @@
#if defined(__GLIBC__)
#define dprintf mydprintf
#endif /* __GLIBC__ */
-static void dprintf(char *, ...);
+static void dprintf(char *, ...)
+ __attribute__ ((__format__ (__printf__, 1, 2)));
static void allocate_log(void);
void sighup_handler();
@@ -1733,8 +1740,8 @@
else {
dprintf(" %s\n", f->f_un.f_forw.f_hname);
dprintf("Forwarding suspension not over, time " \
- "left: %d.\n", INET_SUSPEND_TIME - \
- fwd_suspend);
+ "left: %ld.\n",
+ (long)(INET_SUSPEND_TIME - fwd_suspend));
}
break;
@@ -1771,7 +1778,7 @@
}
else
dprintf("Forwarding suspension not over, time " \
- "left: %d\n", INET_SUSPEND_TIME - fwd_suspend);
+ "left: %ld\n", (long)(INET_SUSPEND_TIME - fwd_suspend));
break;
case F_FORW: