Date: Wed, 20 Aug 2003 17:15:07 -0400 (EDT) From: Robert Watson <rwatson@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/55819: upsmon port requires patches for 5.x Message-ID: <200308202115.h7KLF7Pv051045@fledge.watson.org> Resent-Message-ID: <200308202120.h7KLKCG1099349@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 55819
>Category: ports
>Synopsis: upsmon port requires patches for 5.x
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 20 14:20:12 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Robert Watson
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
FreeBSD Project
>Environment:
System: FreeBSD paprika 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Jul 3 19:43:36 EDT 2003 rwatson@paprika:/usr/obj/usr/src/sys/PAPRIKAMAC i386
>Description:
To build the sysutils/upsmon port, I needed the attached patches. They
correct problems associated with include file changes for -CURRENT,
type changes, and that gcc apparently implicitly meant g++ previously (?).
With these changes, upsd and upsstat appear to work well for me.
>How-To-Repeat:
>Fix:
--- Makefile.bak Wed Aug 20 17:09:12 2003
+++ Makefile Wed Aug 20 17:09:18 2003
@@ -32,7 +32,7 @@
.SUFFIXES: #clear list of suffixes
.SUFFIXES: .cc .o #rules for .c and .o
-CC = gcc
+CC = g++
CFLAGS_DEBUG = -O2 -Wall -DDEBUG -g
CFLAGS_NODEBUG = -O2 -Wall -g
--- 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
--- 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"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308202115.h7KLF7Pv051045>