As announced on 27 March 2003 in <20030328052350.GA18971@rot13.obsecurity.org>,

remove these ports that have been broken for >4 months (in many cases much
longer) with no sign of a fix.

8 files changed, 0 insertions, 361 deletions

diff --git a/net/zephyr/files/patch-aa b/net/zephyr/files/patch-aa
deleted file mode 100644
index 1f20e69de1e0..000000000000
--- a/net/zephyr/files/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
---- clients/xzwrite/Makefile.in.orig	Wed May 26 17:22:09 1999
-+++ clients/xzwrite/Makefile.in		Thu Dec 21 21:57:19 2000
-@@ -50,8 +50,8 @@
- install: xzwrite XZwrite
- 	${INSTALL} -m 755 -s xzwrite ${DESTDIR}${bindir}
- 	${INSTALL} -m 644 ${srcdir}/xzwrite.1 ${DESTDIR}${mandir}/man1
--	${INSTALL} -m 644 XZwrite ${DESTDIR}${datadir}/zephyr
--	${INSTALL} -m 644 ${srcdir}/xzwrite.bitmap ${DESTDIR}${datadir}/zephyr
-+	${INSTALL} -m 644 XZwrite ${DESTDIR}${datadir}
-+	${INSTALL} -m 644 ${srcdir}/xzwrite.bitmap ${DESTDIR}${datadir}
- 
- clean:
- 	rm -f ${OBJS} xzwrite
---- zwgc/Makefile.in.orig	Mon Mar 12 14:51:08 2001
-+++ zwgc/Makefile.in	Mon Mar 12 14:51:38 2001
-@@ -85,8 +85,8 @@
- install: zwgc
- 	${INSTALL} -m 755 -s zwgc ${DESTDIR}${bindir}
- 	${INSTALL} -m 644 ${srcdir}/zwgc.1 ${DESTDIR}${mandir}/man1
--	${INSTALL} -m 644 ${srcdir}/zwgc.desc ${DESTDIR}${datadir}/zephyr
--	${INSTALL} -m 644 ${srcdir}/zwgc_resources ${DESTDIR}${datadir}/zephyr
-+	${INSTALL} -m 644 ${srcdir}/zwgc.desc ${DESTDIR}${datadir}
-+	${INSTALL} -m 644 ${srcdir}/zwgc_resources ${DESTDIR}${datadir}
- 
- clean:
- 	rm -f ${OBJS} zwgc port_dictionary.[ch] pointer_dictionary.[ch]
diff --git a/net/zephyr/files/patch-ab b/net/zephyr/files/patch-ab
deleted file mode 100644
index 18a08c48e0c1..000000000000
--- a/net/zephyr/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Thu Jun 11 20:10:02 1998
-+++ Makefile.in		Thu Dec 21 22:08:19 2000
-@@ -30,9 +30,8 @@
- 	${ENSUREDIR} ${DESTDIR}${bindir} 755
- 	${ENSUREDIR} ${DESTDIR}${libdir} 755
- 	${ENSUREDIR} ${DESTDIR}${datadir} 755
--	${ENSUREDIR} ${DESTDIR}${datadir}/zephyr 755
- 	${ENSUREDIR} ${DESTDIR}${sysconfdir} 755
--	${ENSUREDIR} ${DESTDIR}${sysconfdir}/zephyr/acl 755
-+	${ENSUREDIR} ${DESTDIR}${sysconfdir}/zephyr 755
- 	${ENSUREDIR} ${DESTDIR}${sbindir} 755
- 	${ENSUREDIR} ${DESTDIR}${includedir} 755
- 	${ENSUREDIR} ${DESTDIR}${includedir}/zephyr 755
diff --git a/net/zephyr/files/patch-ac b/net/zephyr/files/patch-ac
deleted file mode 100644
index 69a41fa3b411..000000000000
--- a/net/zephyr/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Apr 21 22:30:15 2000
-+++ configure		Thu Dec 21 20:19:25 2000
-@@ -50,7 +50,7 @@
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datadir='${prefix}/share/zephyr'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
diff --git a/net/zephyr/files/patch-ad b/net/zephyr/files/patch-ad
deleted file mode 100644
index 0b7a7d33efd6..000000000000
--- a/net/zephyr/files/patch-ad
+++ /dev/null
@@ -1,209 +0,0 @@
---- h/zephyr/zephyr.h.orig	Fri Jan 22 23:18:59 1999
-+++ h/zephyr/zephyr.h		Thu Dec 21 20:25:44 2000
-@@ -64,8 +64,8 @@
- 
- /* Unique ID format */
- typedef struct _ZUnique_Id_t {
--    struct	in_addr zuid_addr;
--    struct	timeval	tv;
-+    struct	      in_addr zuid_addr;
-+    ZEPHYR_INT32      zuid_sec, zuid_usec;
- } ZUnique_Id_t;
- 
- /* Checksum */
---- lib/ZParseNot.c.orig	Thu Aug 12 20:19:44 1999
-+++ lib/ZParseNot.c	Sun Mar 11 23:18:38 2001
-@@ -151,10 +151,10 @@
- 	
-     if (numfields) {
- 	if (ZReadAscii(ptr, end-ptr, (unsigned char *)&notice->z_uid,
--		       sizeof(ZUnique_Id_t)) == ZERR_BADFIELD)
-+		       sizeof(notice->z_uid)) == ZERR_BADFIELD)
- 	    BAD_PACKET;
--	notice->z_time.tv_sec = ntohl((u_long) notice->z_uid.tv.tv_sec);
--	notice->z_time.tv_usec = ntohl((u_long) notice->z_uid.tv.tv_usec);
-+	notice->z_time.tv_sec = ntohl((u_long) notice->z_uid.zuid_sec);
-+	notice->z_time.tv_usec = ntohl((u_long) notice->z_uid.zuid_usec);
- 	numfields--;
- 	next_field (ptr);
-     }
-@@ -265,10 +265,10 @@
- 
-     if (numfields) {
- 	if (ZReadAscii(ptr, end-ptr, (unsigned char *)&notice->z_multiuid,
--		       sizeof(ZUnique_Id_t)) == ZERR_BADFIELD)
-+		       sizeof(notice->z_multiuid)) == ZERR_BADFIELD)
- 	    BAD_PACKET;
--	notice->z_time.tv_sec = ntohl((u_long) notice->z_multiuid.tv.tv_sec);
--	notice->z_time.tv_usec = ntohl((u_long) notice->z_multiuid.tv.tv_usec);
-+	notice->z_time.tv_sec = ntohl((u_long) notice->z_multiuid.zuid_sec);
-+	notice->z_time.tv_usec = ntohl((u_long) notice->z_multiuid.zuid_usec);
- 	numfields--;
- 	next_field (ptr);
-     }
---- lib/Zinternal.c.orig	Sun Mar 11 23:20:05 2001
-+++ lib/Zinternal.c	Sun Mar 11 23:46:57 2001
-@@ -585,6 +585,7 @@
-     Code_t retval;
-     static char version[BUFSIZ]; /* default init should be all \0 */
-     struct sockaddr_in name;
-+    struct timeval tv;
-     int namelen = sizeof(name);
- 
-     if (!notice->z_sender)
-@@ -604,9 +605,9 @@
- 
-     notice->z_multinotice = "";
-     
--    (void) gettimeofday(&notice->z_uid.tv, (struct timezone *)0);
--    notice->z_uid.tv.tv_sec = htonl((u_long) notice->z_uid.tv.tv_sec);
--    notice->z_uid.tv.tv_usec = htonl((u_long) notice->z_uid.tv.tv_usec);
-+    (void) gettimeofday(&tv, (struct timezone *)0);
-+    notice->z_uid.zuid_sec = htonl((u_long) tv.tv_sec);
-+    notice->z_uid.zuid_usec = htonl((u_long) tv.tv_usec);
-     
-     (void) memcpy(&notice->z_uid.zuid_addr, &__My_addr, sizeof(__My_addr));
- 
-@@ -684,7 +685,7 @@
-     ptr += strlen(ptr)+1;
- 
-     if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_uid, 
--		   sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN)
-+		   sizeof(notice->z_uid)) == ZERR_FIELDLEN)
- 	return (ZERR_HEADERLEN);
-     ptr += strlen(ptr)+1;
- 
-@@ -738,7 +739,7 @@
- 	return (ZERR_HEADERLEN);
- 
-     if (ZMakeAscii(ptr, end-ptr, (unsigned char *)&notice->z_multiuid, 
--		   sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN)
-+		   sizeof(notice->z_multiuid)) == ZERR_FIELDLEN)
- 	return (ZERR_HEADERLEN);
-     ptr += strlen(ptr)+1;
- 	
-@@ -858,6 +859,7 @@
-     char multi[64];
-     int offset, hdrsize, fragsize, ret_len, message_len, waitforack;
-     Code_t retval;
-+    struct timeval tv;
-     
-     hdrsize = len-notice->z_message_len;
-     fragsize = Z_MAXPKTLEN-hdrsize-Z_FRAGFUDGE;
-@@ -873,12 +875,9 @@
- 	(void) sprintf(multi, "%d/%d", offset, notice->z_message_len);
- 	partnotice.z_multinotice = multi;
- 	if (offset > 0) {
--	    (void) gettimeofday(&partnotice.z_uid.tv,
--				(struct timezone *)0);
--	    partnotice.z_uid.tv.tv_sec =
--		htonl((u_long) partnotice.z_uid.tv.tv_sec);
--	    partnotice.z_uid.tv.tv_usec =
--		htonl((u_long) partnotice.z_uid.tv.tv_usec);
-+	    (void) gettimeofday(&tv, (struct timezone *)0);
-+	    partnotice.z_uid.zuid_sec = htonl((u_long) tv.tv_sec);
-+	    partnotice.z_uid.zuid_usec = htonl((u_long) tv.tv_usec);
- 	    (void) memcpy((char *)&partnotice.z_uid.zuid_addr, &__My_addr, 
- 			  sizeof(__My_addr));
- 	}
---- server/dispatch.c.orig	Sun Mar 11 23:27:40 2001
-+++ server/dispatch.c	Sun Mar 11 23:34:42 2001
-@@ -25,8 +25,8 @@
- #define NACKTAB_HASHVAL(sockaddr, uid)	(((sockaddr).sin_addr.s_addr ^ \
- 					  (sockaddr).sin_port ^ \
- 					  (uid).zuid_addr.s_addr ^ \
--					  (uid).tv.tv_sec ^ \
--					  (uid).tv.tv_usec) % NACKTAB_HASHSIZE)
-+					  (uid).zuid_sec ^ \
-+					  (uid).zuid_usec) % NACKTAB_HASHSIZE)
- #define HOSTS_SIZE_INIT			256
- 
- #ifdef DEBUG
-@@ -820,9 +820,10 @@
- 
-     /* search the not-yet-acked table for this packet, and flush it. */
- #if 0
--    zdbug((LOG_DEBUG, "nack_cancel: %s:%08X,%08X",
-+    zdbug((LOG_DEBUG, "nack_cancel: %s:%08lX,%08lX",
- 	   inet_ntoa(notice->z_uid.zuid_addr),
--	   notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
-+	   (u_long) notice->z_uid.zuid_sec,
-+	   (u_long) notice->z_uid.zuid_usec));
- #endif
-     hashval = NACKTAB_HASHVAL(*who, notice->z_uid);
-     for (nacked = nacktab[hashval]; nacked; nacked = nacked->next) {
-@@ -840,9 +841,10 @@
-     }
- 
- #if 1
--    zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08X,%08X",
-+    zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08lX,%08lX",
- 	   inet_ntoa (notice->z_uid.zuid_addr),
--	   notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
-+	   (u_long) notice->z_uid.zuid_sec,
-+	   (u_long) notice->z_uid.zuid_usec));
- #endif
- }
- 
---- server/realm.c.orig	Sun Mar 11 23:35:16 2001
-+++ server/realm.c	Sun Mar 11 23:40:06 2001
-@@ -240,9 +240,10 @@
-   ZPacket_t retval;
-   
- #if 0
--    zdbug((LOG_DEBUG, "rlm_nack_cancel: %s:%08X,%08X",
-+    zdbug((LOG_DEBUG, "rlm_nack_cancel: %s:%08lX,%08lX",
-            inet_ntoa(notice->z_uid.zuid_addr),
--           notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
-+	   (u_long) notice->z_uid.zuid_sec,
-+	   (u_long) notice->z_uid.zuid_usec));
- #endif
-   if (!which) {
-     syslog(LOG_ERR, "non-realm ack?");
-@@ -266,9 +267,10 @@
-     }
-   }
- #if 0
--    zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08X,%08X",
-+    zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08lX,%08lX",
-            inet_ntoa (notice->z_uid.zuid_addr),
--           notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec));
-+	   (u_long) notice->z_uid.zuid_sec,
-+	   (u_long) notice->z_uid.zuid_usec));
- #endif
-   return;
- }
-@@ -743,6 +745,7 @@
-   int buffer_len, hdrlen, offset, fragsize, ret_len, message_len;
-   int origoffset, origlen;
-   Code_t retval;
-+  struct timeval tv;
-   Unacked *nacked;
-   char buf[1024], multi[64];
-   CREDENTIALS cred;
-@@ -857,11 +860,9 @@
-       (void) sprintf(multi, "%d/%d", offset+origoffset, origlen);
-       partnotice.z_multinotice = multi;
-       if (offset > 0) {
--        (void) gettimeofday(&partnotice.z_uid.tv, (struct timezone *)0);
--        partnotice.z_uid.tv.tv_sec = htonl((u_long) 
--                                           partnotice.z_uid.tv.tv_sec);
--        partnotice.z_uid.tv.tv_usec = htonl((u_long) 
--                                            partnotice.z_uid.tv.tv_usec);
-+        (void) gettimeofday(&tv, (struct timezone *)0);
-+	partnotice.z_uid.zuid_sec = htonl((u_long) tv.tv_sec);
-+	partnotice.z_uid.zuid_usec = htonl((u_long) tv.tv_usec);
-         (void) memcpy((char *)&partnotice.z_uid.zuid_addr, &__My_addr, 
-                       sizeof(__My_addr));
-       }
---- server/server.c.orig	Sun Mar 11 23:40:14 2001
-+++ server/server.c	Sun Mar 11 23:40:44 2001
-@@ -22,7 +22,7 @@
- 
- #define SRV_NACKTAB_HASHSIZE		1023
- #define SRV_NACKTAB_HASHVAL(which, uid)	(((which) ^ (uid).zuid_addr.s_addr ^ \
--					  (uid).tv.tv_sec ^ (uid).tv.tv_usec) \
-+					  (uid).zuid_sec ^ (uid).zuid_usec) \
- 					 % SRV_NACKTAB_HASHSIZE)
- /*
-  * Server manager.  Deal with  traffic to and from other servers.
diff --git a/net/zephyr/files/patch-ae b/net/zephyr/files/patch-ae
deleted file mode 100644
index 9cdc49a5e835..000000000000
--- a/net/zephyr/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.in.orig	Sat Jan 31 23:55:07 1998
-+++ lib/Makefile.in		Thu Dec 21 20:36:28 2000
-@@ -22,7 +22,7 @@
- CPPFLAGS=@CPPFLAGS@
- CFLAGS=@CFLAGS@
- ALL_CFLAGS=${CFLAGS} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \
--	-I${BUILDTOP}/h ${CPPFLAGS}
-+	-I ${BUILDTOP}/h/zephyr -I${BUILDTOP}/h ${CPPFLAGS}
- 
- OBJS =	zephyr_err.o ZAsyncLocate.o ZCkAuth.o ZCkIfNot.o ZClosePort.o \
- 	ZCmpUID.o ZCmpUIDP.o ZFlsLocs.o ZFlsSubs.o ZFmtAuth.o ZFmtList.o \
diff --git a/net/zephyr/files/patch-af b/net/zephyr/files/patch-af
deleted file mode 100644
index ac3987a520d2..000000000000
--- a/net/zephyr/files/patch-af
+++ /dev/null
@@ -1,38 +0,0 @@
---- zwgc/main.c.orig	Fri Jan 22 18:20:22 1999
-+++ zwgc/main.c	Tue Nov 20 13:57:24 2001
-@@ -141,7 +141,7 @@
- 
- /*    var_clear_all_variables(); <<<>>> */
- 
--    sprintf(defdesc, "%s/zephyr/%s", DATADIR, DEFDESC);
-+    sprintf(defdesc, "%s/%s", DATADIR, DEFDESC);
-     input_file = locate_file(description_filename_override, USRDESC, defdesc);
-     if (input_file)
-       program = parse_file(input_file);
---- zwgc/X_driver.c.orig	Fri Jan 22 18:20:06 1999
-+++ zwgc/X_driver.c	Tue Nov 20 13:57:56 2001
-@@ -264,7 +264,7 @@
-       return(1);
- 
-     /* Read in our application-specific resources: */
--    sprintf(dbasename, "%s/zephyr/zwgc_resources", DATADIR);
-+    sprintf(dbasename, "%s/zwgc_resources", DATADIR);
-     temp_db1 = XrmGetFileDatabase(dbasename);
- 
-     /*
---- clients/xzwrite/interface.c.orig	Thu Apr 30 16:03:32 1998
-+++ clients/xzwrite/interface.c	Tue Nov 20 13:58:24 2001
-@@ -140,11 +140,11 @@
- 				  strlen(DATADIR) + 12);
- 	  if (path2 != NULL) {
- #ifdef HAVE_PUTENV
--	       sprintf(path2, "XFILESEARCHPATH=%s:%s/zephyr/%%N", path1,
-+	       sprintf(path2, "XFILESEARCHPATH=%s:%s/%%N", path1,
- 		       DATADIR);
- 	       putenv(path2);
- #else
--	       sprintf(path2, "%s:%s/zephyr/%%N", path1, DATADIR);
-+	       sprintf(path2, "%s:%s/%%N", path1, DATADIR);
- 	       setenv("XFILESEARCHPATH", path2, 1);
- 	       free(path2);
- #endif
diff --git a/net/zephyr/files/patch-ag b/net/zephyr/files/patch-ag
deleted file mode 100644
index 2585114f395a..000000000000
--- a/net/zephyr/files/patch-ag
+++ /dev/null
@@ -1,34 +0,0 @@
---- lib/ZInit.c.orig Fri Jan 22 18:19:14 1999
-+++ lib/ZInit.c	Wed Nov 21 16:32:06 2001
-@@ -36,6 +36,7 @@
-     int s, sinsize = sizeof(sin);
-     Code_t code;
-     ZNotice_t notice;
-+    char *realm = NULL;
- #ifdef HAVE_KRB4
-     char *krealm = NULL;
-     int krbval;
-@@ -104,7 +105,11 @@
- 	return (krbval);
-     }
- #else
--    strcpy(__Zephyr_realm, "local-realm");
-+    realm = ZGetVariable("realm");
-+    if (realm)
-+       strcpy(__Zephyr_realm, realm);
-+    else
-+       strcpy(__Zephyr_realm, "local-realm");
- #endif
- 
-     __My_addr.s_addr = INADDR_NONE;
---- lib/ZVariables.c.orig	Thu Jun  3 10:51:42 1999
-+++ lib/ZVariables.c	Mon Nov 26 08:51:56 2001
-@@ -36,7 +36,7 @@
-     if ((ret = get_varval(varfile, var)) != ZERR_NONE)
- 	return (ret);
- 
--    sprintf(varfile, "%s/zephyr.vars", SYSCONFDIR);
-+    sprintf(varfile, "%s/zephyr/zephyr.vars", SYSCONFDIR);
-     return (get_varval(varfile, var));
- }
- 
diff --git a/net/zephyr/files/zhm.sh b/net/zephyr/files/zhm.sh
deleted file mode 100644
index c516ccd6adff..000000000000
--- a/net/zephyr/files/zhm.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-PREFIX=${PREFIX-/usr/local}
-
-case $1 in
-start)
-	if [ -x ${PREFIX}/sbin/zhm -a -f ${PREFIX}/etc/zephyr/server.list ] ; then
-	     PATH=${PREFIX}/sbin:${PREFIX}/bin:$PATH ; export PATH
-	     zhm `cat ${PREFIX}/etc/zephyr/server.list` && echo -n ' zhm'
-	fi
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0