File diald-top-2.1pl4.diff of Package diald
--- Makefile
+++ Makefile
@@ -27,14 +27,14 @@
install: install-client install-server
install-client: client
- ${INSTALL} -o root -g root -m 755 -d ${CLIENT_INSTALL_DIR}
- ${INSTALL} -o root -g root -m 755 -d ${MAN_DIR}
- ${INSTALL} -o ${OWNER} -g ${GROUP} ${INSTALLFLAGS} -m ${CLIENTMODE} \
+ ${INSTALL} -m 755 -d ${CLIENT_INSTALL_DIR}
+ ${INSTALL} -m 755 -d ${MAN_DIR}
+ ${INSTALL} ${INSTALLFLAGS} -m ${CLIENTMODE} \
${CLIENTBINS} ${CLIENT_INSTALL_DIR}
${INSTALL} -m 644 diald-top.8 ${MAN_DIR}
install-server: server
- ${INSTALL} -o root -g root -m 755 -d ${SERVER_INSTALL_DIR}
- ${INSTALL} -o ${OWNER} -g ${GROUP} ${INSTALLFLAGS} -m ${SERVERMODE} \
+ ${INSTALL} -m 755 -d ${SERVER_INSTALL_DIR}
+ ${INSTALL} ${INSTALLFLAGS} -m ${SERVERMODE} \
${SERVERBINS} ${SERVER_INSTALL_DIR}
--- Makefile.def
+++ Makefile.def
@@ -9,10 +9,10 @@
# Installation directories
-prefix = ${ROOT}/usr/local
+prefix = ${ROOT}/usr/
CLIENT_INSTALL_DIR = ${prefix}/bin
SERVER_INSTALL_DIR = ${prefix}/bin
-MAN_DIR = ${prefix}/man/man8
+MAN_DIR = ${prefix}/share/man/man8
# The OWNER, GROUP and MODE settings are not as obvious as they may appear.
# Please read the INSTALL file to find out what these should be
@@ -25,7 +25,7 @@
# Build Tools
CC = gcc
-LEX = flex -CFe
+LEX = flex -Ce
YACC = bison -dvy
INSTALL = install
@@ -46,7 +46,7 @@
INCCURSES = -I/usr/include/ncurses
LIBCURSES = -lncurses
LIBLEX = -lfl
-LIBRESOLV = -lresolv
+LIBRESOLV =
# The named pipe that diald is using as a control FIFO. You must run
--- client/diald-top.c
+++ client/diald-top.c
@@ -146,6 +146,7 @@
update_screen();
}
}
+ return 0;
}
int
--- client/monitor.y
+++ client/monitor.y
@@ -176,6 +176,7 @@
lex_free( $2 );
}
| _WOULDBLOCK
+ ;
%%
static char rcsid[] =
@@ -190,4 +191,5 @@
fprintf(stderr, "lookahead symbol = %d\n", yychar);
if (quit_if_parse_error)
exit(1);
+ return 0;
}
--- client/resolve.c
+++ client/resolve.c
@@ -28,6 +28,7 @@
/*
* Included Header Files
*/
+#include <unistd.h>
#include <stdio.h>
#include <string.h>
#include <netdb.h>