diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2003-08-20 22:05:09 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2003-08-20 22:05:09 +0000 |
| commit | a1262455adc758ce6afa922fec939a79f47f5663 (patch) | |
| tree | 70cc734378f38c3b057ee467f8dee2e2b000ae14 | |
| parent | beb3fd2a28046a3d5935b7419cf115761544ea1a (diff) | |
Notes
| -rw-r--r-- | sysutils/upsmon/files/patch-aa | 10 | ||||
| -rw-r--r-- | sysutils/upsmon/files/patch-csocket.h | 12 | ||||
| -rw-r--r-- | sysutils/upsmon/files/patch-daemon.cc | 10 |
3 files changed, 27 insertions, 5 deletions
diff --git a/sysutils/upsmon/files/patch-aa b/sysutils/upsmon/files/patch-aa index 905ebd85c470..8100fda38c17 100644 --- a/sysutils/upsmon/files/patch-aa +++ b/sysutils/upsmon/files/patch-aa @@ -1,5 +1,5 @@ ---- makefile.bsdi.orig Tue Aug 4 14:18:38 1998 -+++ makefile.bsdi Sat Apr 29 13:11:52 2000 +--- makefile.bsdi.orig Tue Aug 4 23:18:38 1998 ++++ makefile.bsdi Wed Aug 20 23:55:50 2003 @@ -32,14 +32,14 @@ .SUFFIXES: #clear list of suffixes .SUFFIXES: .cc .o #rules for .c and .o @@ -7,16 +7,16 @@ -CC = gcc -CFLAGS_DEBUG = -O2 -Wall -DDEBUG -g -CFLAGS_NODEBUG = -O2 -Wall -g -+#CC = gcc ++CC = g++ +CFLAGS_DEBUG = -DDEBUG +CFLAGS_NODEBUG = .ifdef DEBUG -CFLAGS = $(CFLAGS_DEBUG) -+CFLAGS += $(CFLAGS_DEBUG) -pedantic ++CFLAGS += $(CFLAGS_DEBUG) .else -CFLAGS = $(CFLAGS_NODEBUG) -+CFLAGS += $(CFLAGS_NODEBUG) -pedantic ++CFLAGS += $(CFLAGS_NODEBUG) .endif UPSMOND_TARGET = upsmond diff --git a/sysutils/upsmon/files/patch-csocket.h b/sysutils/upsmon/files/patch-csocket.h new file mode 100644 index 000000000000..2d36a602223d --- /dev/null +++ b/sysutils/upsmon/files/patch-csocket.h @@ -0,0 +1,12 @@ +--- csocket.h.bak Wed Aug 20 17:08:31 2003 ++++ csocket.h Wed Aug 20 17:09:01 2003 +@@ -94,7 +94,7 @@ + int m_fdSocketNormal; // named stream socket descriptor - use for client/server exchange + int m_fdSocketServer; // server socket - used by server to listen for connections + int m_iLocalAddrLen; // local socket address length +- int m_iRemoteAddrLen; // local socket address length ++ socklen_t m_iRemoteAddrLen; // local socket address length + struct sockaddr_un m_saunLocal; // local socket address + struct sockaddr_un m_saunRemote; // remote socket address + char m_szSocketPath[MAX_PATHNAME]; // named stream socket path + diff --git a/sysutils/upsmon/files/patch-daemon.cc b/sysutils/upsmon/files/patch-daemon.cc new file mode 100644 index 000000000000..fcc5959f831a --- /dev/null +++ b/sysutils/upsmon/files/patch-daemon.cc @@ -0,0 +1,10 @@ +--- daemon.cc.bak Tue Aug 4 17:18:14 1998 ++++ daemon.cc Wed Aug 20 17:07:49 2003 +@@ -32,6 +32,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <stdlib.h> + #include <unistd.h> + #include "stddef.h" + #include "daemon.h" |