File rdist-6.1.5.diff of Package rdist

Overview Repositories Revisions Requests Users Attributes Meta

File rdist-6.1.5.diff of Package rdist (Revision bc0d5ece61a4a0891d308df7f863557c)

Currently displaying revision bc0d5ece61a4a0891d308df7f863557c , Show latest

--- Makefile
+++ Makefile
@@ -17,9 +17,10 @@
 SHELL=/bin/sh
 
 all install install.man: FRC
-	@for t in $(TARGETS); do \
+	@for t in $(TARGETS); do ( \
 		echo Making \"$@\" in \"$$t\"; \
 		(cd $$t; ${MAKE} $@); \
+		) || exit 1; \
 	done
 
 clean:
--- Makefile.local
+++ Makefile.local
@@ -15,6 +15,18 @@
 # or add your own line.
 #
 #BIN_DIR	= /usr/bin
+BIN_DIR = /usr/bin
+MAN_DIR = /usr/share/man
+MAN_1_DIR = $(MAN_DIR)/man1
+MAN_8_DIR = $(MAN_DIR)/man8
+RDIST_MODE = 755
+RDISTD_MODE = 755
+MAN_MODE = 644
+
+INSTALL = install
+YACC = bison -y
+
+OPT = -Wall -O2 -pipe
 
 #
 # Add any local definitions you want pass to the compiler to DEFS_LOCAL
--- build/os-type
+++ build/os-type
@@ -83,6 +83,7 @@
 if [ -z "${OS}" -a ! -z "${uname}" ]; then
 	case "`$uname -a | tr '[A-Z]' '[a-z]'`" in
 		    osf1*)	OS=break;;
+		*linux*)  ;; # get out your barf bag!
 		*"4.0"*)	OS=svr4;;	# There has to be a better way
 		*" dcosx "*)	OS=dcosx;;
 		*"cx/ux"*)	OS=cxux;;
--- config/os-linux.h
+++ config/os-linux.h
@@ -93,8 +93,8 @@
 /*
  * Our types, usually these are uid_t and gid_t.
  */
-typedef uid_t UID_T;	/* Must be signed */
-typedef gid_t GID_T;	/* Must be signed */
+typedef int UID_T;	/* Must be signed */
+typedef int GID_T;	/* Must be signed */
 
 /*
  * Generic pointer, used by memcpy, malloc, etc.  Usually char or void.
--- doc/Makefile.real
+++ doc/Makefile.real
@@ -10,13 +10,13 @@
 
 CLIENT_DEST 	= ${MAN_1_DIR}/${CLIENT}.${MAN_1_SECT}
 SERVER_DEST 	= ${MAN_8_DIR}/${SERVER}.${MAN_8_SECT}
-INSTALL_ARGS	= -c -o ${MAN_OWNER} -g ${MAN_GROUP} -m ${MAN_MODE} 
+INSTALL_ARGS	= -c -m ${MAN_MODE}
 
 all:
 
 doc:
 
-install:
+install: install.man
 
 install.man: rdist.man rdistd.man
 	${INSTALL} ${INSTALL_ARGS} rdist.man ${CLIENT_DEST}
--- doc/rdist.man
+++ doc/rdist.man
@@ -171,7 +171,7 @@
 .I rdist
 was compiled with the location of the old rdist
 (usually either
-.I /usr/ucb/oldrdist
+.I /usr/bin/oldrdist
 or
 .I /usr/old/rdist)
 and that program is available at run time.
@@ -511,7 +511,7 @@
 may be a colon seperated list of possible pathnames.
 In this case, the first component of the path to exist is used.
 i.e. 
-.B "/usr/ucb/rsh:/usr/bin/remsh",
+.B "/usr/bin/rsh:/usr/bin/remsh",
 .B /usr/bsd/rsh.
 .TP
 .B "\-t \fItimeout\fR"
--- include/defs.h
+++ include/defs.h
@@ -320,10 +320,18 @@
  * System function declarations
  */
 char 			       *hasmntopt();
+#ifndef strchr
 char			       *strchr();
+#endif
+#ifndef strdup
 char		 	       *strdup();
+#endif
+#ifndef strrchr
 char		 	       *strrchr();
+#endif
+#ifndef strtok
 char 			       *strtok();
+#endif
 
 /*
  * Our own declarations.
--- src/Makefile.real
+++ src/Makefile.real
@@ -8,7 +8,7 @@
 # $Id: Makefile.real,v 1.12 1998/11/10 04:03:46 mcooper Exp $
 #
 
-IN_ARGS		= -c -g ${BIN_GROUP}
+IN_ARGS		= -c 
 
 HFILES		= ../config/config.h ../config/config-data.h \
 			../config/config-def.h ../config/os-$(OS).h \
@@ -52,9 +52,9 @@
 		$(COMMONOBJS) $(MISSINGOBJS)
 
 install:
-	$(INSTALL) ${IN_ARGS} -o $(BIN_OWNER) -m ${RDIST_MODE} \
+	$(INSTALL) ${IN_ARGS} -m ${RDIST_MODE} \
 		$(CLIENT_BIN) $(BIN_DIR)/$(CLIENT)
-	$(INSTALL) ${IN_ARGS} -o ${BIN_OWNER} -m ${RDISTD_MODE} \
+	$(INSTALL) ${IN_ARGS} -m ${RDISTD_MODE} \
 		$(SERVER_BIN) $(BIN_DIR)/$(SERVER)
 
 install.man:

Places

File rdist-6.1.5.diff of Package rdist (Revision bc0d5ece61a4a0891d308df7f863557c)

Places