Subject: diffs to compile beta6 on IRIX 5.x

From: Eilon Gishri <[email-masked]>
Date: Mon, 16 Oct 1995 17:09:35 +0200 (IST)

Hi,
  Those are the diffs to compile wu-ftpd-2.4.2-beta6 on Irix 5.x.
I'm not sure, but I think I'm missing utmpx.h in logwtmp.c, though it works.
if it doesn't we might have to include testing for "defined(__sgi)" after the
"ifdef SVR4".

Anyway, please include support for Irix 5.x in the next release.

			Eilon.

diff -u --recursive --new-file wu-ftpd-2.4.2-beta-6.orig/build wu-ftpd-2.4.2-beta-6/build
--- wu-ftpd-2.4.2-beta-6.orig/build	Sun Oct 15 08:34:56 1995
+++ wu-ftpd-2.4.2-beta-6/build	Mon Oct 16 16:39:21 1995
@@ -21,6 +21,7 @@
   osf    : OSF/1
   ptx    : ???
   sgi    : SGI Irix 4.0.5a
+  sg5    : SGI Irix 5.x
   sny    : Sony NewsOS
   sol    : SunOS 5.x / Solaris 2.x 
   s41    : SunOS 4.1.x (requires acc or gcc 2.3.3 or better)
diff -u --recursive --new-file wu-ftpd-2.4.2-beta-6.orig/makefiles/Makefile.sg5 wu-ftpd-2.4.2-beta-6/makefiles/Makefile.sg5
--- wu-ftpd-2.4.2-beta-6.orig/makefiles/Makefile.sg5	Thu Jan  1 02:00:00 1970
+++ wu-ftpd-2.4.2-beta-6/makefiles/Makefile.sg5	Mon Oct 16 16:38:31 1995
@@ -0,0 +1,31 @@
+BINDIR=		/usr/etc
+ETCDIR=		/etc
+MANDIR=		/usr/man
+MANEXT=		8
+INSTALL=	./util/install
+
+
+all:
+	@ echo 'Use the "build" command (shell script) to make ftpd.'
+	@ echo 'You can say "build help" for details on how it works.'
+
+install: bin/ftpd bin/ftpcount bin/ftpshut
+	-mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old
+	@echo installing binaries.
+	${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd
+	${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
+	${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
+	${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
+	@echo installing manpages.
+	${INSTALL} -c -o bin -g bin -m 755 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
+	${INSTALL} -c -o bin -g bin -m 755 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
+	${INSTALL} -c -o bin -g bin -m 755 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
+	${INSTALL} -c -o bin -g bin -m 755 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
+	${INSTALL} -c -o bin -g bin -m 755 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
+	${INSTALL} -c -o bin -g bin -m 755 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
+	${INSTALL} -c -o bin -g bin -m 755 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
+	${INSTALL} -c -o bin -g bin -m 755 doc/xferlog.5 ${MANDIR}/man5/xferlog.5
+
+
+
+
diff -u --recursive --new-file wu-ftpd-2.4.2-beta-6.orig/src/config/config.sg5 wu-ftpd-2.4.2-beta-6/src/config/config.sg5
--- wu-ftpd-2.4.2-beta-6.orig/src/config/config.sg5	Thu Jan  1 02:00:00 1970
+++ wu-ftpd-2.4.2-beta-6/src/config/config.sg5	Mon Oct 16 16:41:28 1995
@@ -0,0 +1,38 @@
+#define HAVE_SYMLINK
+#undef  F_SETOWN
+#undef  IP_TOS
+#define HAVE_DIRENT
+#define HAVE_D_NAMLEN
+#undef  HAVE_FLOCK
+#define HAVE_FTW
+#define HAVE_GETCWD
+#define HAVE_GETDTABLESIZE
+#undef  HAVE_PSTAT
+#undef  HAVE_ST_BLKSIZE
+#undef  HAVE_SYSINFO
+#undef  HAVE_UT_UT_HOST
+#define HAVE_VPRINTF
+#define OVERWRITE
+#undef  REGEX
+#define SETPROCTITLE
+#undef  SHADOW_PASSWORD
+#define SVR4
+#define UPLOAD
+#define USG
+#define vfork	fork
+
+#include <malloc.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#ifndef FACILITY
+#define FACILITY LOG_DAEMON
+#endif
+
+#ifndef NCARGS
+#define NCARGS 20480
+#endif
+
+typedef void	SIGNAL_TYPE;
+
+#include "../config.h"
diff -u --recursive --new-file wu-ftpd-2.4.2-beta-6.orig/src/makefiles/Makefile.sg5 wu-ftpd-2.4.2-beta-6/src/makefiles/Makefile.sg5
--- wu-ftpd-2.4.2-beta-6.orig/src/makefiles/Makefile.sg5	Thu Jan  1 02:00:00 1970
+++ wu-ftpd-2.4.2-beta-6/src/makefiles/Makefile.sg5	Mon Oct 16 16:41:03 1995
@@ -0,0 +1,51 @@
+CC       = cc
+IFLAGS   = -I.. -I../support
+LFLAGS   = -L../support
+CFLAGS   = -cckr -O -DDEBUG ${IFLAGS} ${LFLAGS}
+LIBES    = -lsupport
+LIBC     = 
+LINTFLAGS=	
+LKERB    = -lauth -lckrb -lkrb -ldes
+MKDEP    = ../util/mkdep
+
+SRCS   = ftpd.c ftpcmd.c glob.c logwtmp.c popen.c vers.c access.c extensions.c \
+		 realpath.c acl.c private.c authenticate.c conversions.c hostacc.c
+OBJS   = ftpd.o ftpcmd.o glob.o logwtmp.o popen.o vers.o access.o extensions.o \
+		 realpath.o acl.o private.o authenticate.o conversions.o hostacc.o
+
+all: ftpd ftpcount ftpshut ckconfig
+
+ftpcount:	ftpcount.c pathnames.h
+	${CC} ${CFLAGS} -o $@ ftpcount.c vers.o ${LIBES}
+
+ftpshut:    ftpshut.c pathnames.h
+	${CC} ${CFLAGS} -o $@ ftpshut.c vers.o ${LIBES}
+
+ftpd: ${OBJS} ${LIBC}
+	${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBES}
+
+ckconfig:   ckconfig.c
+	${CC} ${CFLAGS} -o $@ ckconfig.c
+
+index:	index.o ${LIBC}
+	${CC} -Bstatic -o $@ index.o
+
+vers.o: ftpd.c ftpcmd.y
+	sh newvers.sh
+	${CC} ${CFLAGS} -c vers.c
+
+clean:
+	rm -f ${OBJS} ftpd ftpcmd.c ftpshut ftpshut.o ftpcount ftpcount.o
+	rm -f core index index.o
+
+cleandir: clean
+	rm -f tags .depend
+
+depend: ${SRCS}
+	${MKDEP} ${CFLAGS} ${SRCS}
+
+lint: ${SRCS}
+	lint ${CFLAGS} ${LINTFLAGS} ${SRCS}
+
+tags: ${SRCS}
+	ctags ${SRCS}
diff -u --recursive --new-file wu-ftpd-2.4.2-beta-6.orig/support/makefiles/Makefile.sg5 wu-ftpd-2.4.2-beta-6/support/makefiles/Makefile.sg5
--- wu-ftpd-2.4.2-beta-6.orig/support/makefiles/Makefile.sg5	Thu Jan  1 02:00:00 1970
+++ wu-ftpd-2.4.2-beta-6/support/makefiles/Makefile.sg5	Mon Oct 16 16:38:57 1995
@@ -0,0 +1,48 @@
+CC     = cc
+AR     = ar cq
+RANLIB = touch
+LIBC   = /usr/lib/libc.a
+IFLAGS = 
+LFLAGS = 
+CFLAGS = -O -DDEBUG ${IFLAGS} ${LFLAGS}
+
+SRCS   = getusershell.c fnmatch.c strcasestr.c strsep.c authuser.c
+OBJS   = getusershell.o fnmatch.o strcasestr.o strsep.o authuser.o
+
+all: $(OBJS)
+	-rm -f libsupport.a
+	${AR} libsupport.a $(OBJS)
+	${RANLIB} libsupport.a
+
+clean:
+	-rm -f *.o libsupport.a
+
+ftp.h:
+	install -c -m 444 ftp.h /usr/include/arpa
+
+paths.h:
+	install -c -m 444 paths.h /usr/include
+
+fnmatch.o: fnmatch.c
+	${CC} ${CFLAGS} -c fnmatch.c
+
+getusershell.o: getusershell.c
+	${CC} ${CFLAGS} -c getusershell.c
+
+strerror.o: strerror.c
+	${CC} ${CFLAGS} -c strerror.c
+
+strdup.o: strdup.c
+	${CC} ${CFLAGS} -c strdup.c
+
+strcasestr.o: strcasestr.c
+	${CC} ${CFLAGS} -c strcasestr.c
+
+strsep.o: strsep.c
+	${CC} ${CFLAGS} -c strsep.c
+
+authuser.o: authuser.c
+	${CC} ${CFLAGS} -c authuser.c
+
+ftw.o: ftw.c
+	${CC} ${CFLAGS} -c ftw.c

-- 
		Eilon Gishri, Tel-Aviv University Computation Center
		Home 03-5078671
		E-mail: [email-masked]