From e24fc5a76e33692955840943810df664a9a51ac1 Mon Sep 17 00:00:00 2001 From: seb Date: Tue, 16 Sep 2003 20:12:53 +0000 Subject: chat/zephyr-current was reimported as chat/zephyr. Approved by maintainer, sommerfeld@ --- chat/Makefile | 4 +-- chat/zephyr-current/DESCR | 6 ----- chat/zephyr-current/Makefile | 49 ------------------------------------ chat/zephyr-current/PLIST | 49 ------------------------------------ chat/zephyr-current/buildlink2.mk | 20 --------------- chat/zephyr-current/distinfo | 15 ----------- chat/zephyr-current/files/zhm.sh | 22 ---------------- chat/zephyr-current/patches/patch-aa | 13 ---------- chat/zephyr-current/patches/patch-ab | 15 ----------- chat/zephyr-current/patches/patch-ac | 13 ---------- chat/zephyr-current/patches/patch-ad | 16 ------------ chat/zephyr-current/patches/patch-ae | 46 --------------------------------- chat/zephyr-current/patches/patch-af | 14 ----------- chat/zephyr-current/patches/patch-ag | 24 ------------------ chat/zephyr-current/patches/patch-ah | 15 ----------- chat/zephyr-current/patches/patch-ai | 13 ---------- chat/zephyr-current/patches/patch-aj | 24 ------------------ chat/zephyr-current/patches/patch-ak | 13 ---------- 18 files changed, 2 insertions(+), 369 deletions(-) delete mode 100644 chat/zephyr-current/DESCR delete mode 100644 chat/zephyr-current/Makefile delete mode 100644 chat/zephyr-current/PLIST delete mode 100644 chat/zephyr-current/buildlink2.mk delete mode 100644 chat/zephyr-current/distinfo delete mode 100644 chat/zephyr-current/files/zhm.sh delete mode 100644 chat/zephyr-current/patches/patch-aa delete mode 100644 chat/zephyr-current/patches/patch-ab delete mode 100644 chat/zephyr-current/patches/patch-ac delete mode 100644 chat/zephyr-current/patches/patch-ad delete mode 100644 chat/zephyr-current/patches/patch-ae delete mode 100644 chat/zephyr-current/patches/patch-af delete mode 100644 chat/zephyr-current/patches/patch-ag delete mode 100644 chat/zephyr-current/patches/patch-ah delete mode 100644 chat/zephyr-current/patches/patch-ai delete mode 100644 chat/zephyr-current/patches/patch-aj delete mode 100644 chat/zephyr-current/patches/patch-ak (limited to 'chat') diff --git a/chat/Makefile b/chat/Makefile index 4496289ed49..11fddfbf487 100644 --- a/chat/Makefile +++ b/chat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2003/09/02 07:33:00 xtraeme Exp $ +# $NetBSD: Makefile,v 1.78 2003/09/16 20:12:53 seb Exp $ # COMMENT= Communication programs @@ -86,7 +86,7 @@ SUBDIR+= ymessenger SUBDIR+= ysm SUBDIR+= zenicb SUBDIR+= zenirc -SUBDIR+= zephyr-current +SUBDIR+= zephyr SUBDIR+= zephyr-mode SUBDIR+= zircon diff --git a/chat/zephyr-current/DESCR b/chat/zephyr-current/DESCR deleted file mode 100644 index b7edb9574a3..00000000000 --- a/chat/zephyr-current/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -This is the Project Athena Zephyr notification system 2001/05/28 -snapshot. - -Zephyr allows users to send messages to other users or to groups of -users. Users can view incoming Zephyr messages as windowgrams -(transient X windows) or as text on a terminal. diff --git a/chat/zephyr-current/Makefile b/chat/zephyr-current/Makefile deleted file mode 100644 index 060f4abd0e0..00000000000 --- a/chat/zephyr-current/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2003/07/29 18:55:56 jmmv Exp $ -# - -DISTNAME= zephyr-20010518 -PKGREVISION= 1 -WRKSRC= ${WRKDIR}/zephyr -CATEGORIES= chat net -MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/ - -MAINTAINER= sommerfeld@NetBSD.org -HOMEPAGE= http://web.mit.edu/olh/Zephyr/index.html -COMMENT= Project Athena's original Instant Messaging system - -USE_BUILDLINK2= YES -USE_PKGINSTALL= YES -GNU_CONFIGURE= YES -USE_X11= YES - -# N.B. the following assume NetBSD-only. -CPPFLAGS+= -I/usr/include/kerberosIV -I/usr/include/krb5 -LDFLAGS+= -lroken -lcrypto -lcom_err -ledit -lcurses -CONFIGURE_ARGS= --sysconfdir="${PKG_SYSCONFDIR}" -CONFIGURE_ARGS+="--with-krb4" -CONFIGURE_ARGS+="--with-hesiod" -CONFIGURE_ARGS+="--with-ares" - -ZEPHYR_DOCDIR= ${PREFIX}/share/doc/zephyr -ZEPHYR_DOCS= INSTALL NOTES OPERATING README USING - -PKG_SYSCONFSUBDIR= zephyr -OWN_DIRS= ${PKG_SYSCONFDIR}/acl -EGDIR= ${PREFIX}/share/examples/zephyr -CONF_FILES= ${EGDIR}/default.subscriptions \ - ${PKG_SYSCONFDIR}/default.subscriptions - -RCD_SCRIPTS= zhm - -pre-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA_DIR} ${ZEPHYR_DOCDIR} -.for f in ${ZEPHYR_DOCS} - ${INSTALL_DATA} ${WRKSRC}/$f ${ZEPHYR_DOCDIR} -.endfor -.undef f - -.include "../../devel/readline/buildlink2.mk" -.include "../../net/hesiod/buildlink2.mk" -.include "../../net/libares/buildlink2.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/chat/zephyr-current/PLIST b/chat/zephyr-current/PLIST deleted file mode 100644 index 077fb82a71a..00000000000 --- a/chat/zephyr-current/PLIST +++ /dev/null @@ -1,49 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2003/07/29 18:55:56 jmmv Exp $ -bin/xzwrite -bin/zaway -bin/zctl -bin/zleave -bin/zlocate -bin/zmailnotify -bin/znol -bin/zstat -bin/zwgc -bin/zwrite -etc/rc.d/zhm -include/zephyr/mit-copyright.h -include/zephyr/zephyr.h -include/zephyr/zephyr_err.h -lib/libzephyr.a -man/man1/xzwrite.1 -man/man1/zaway.1 -man/man1/zctl.1 -man/man1/zephyr.1 -man/man1/zleave.1 -man/man1/zlocate.1 -man/man1/zmailnotify.1 -man/man1/znol.1 -man/man1/zwgc.1 -man/man1/zwrite.1 -man/man8/zephyrd.8 -man/man8/zhm.8 -man/man8/zpopnotify.8 -man/man8/zshutdown_notify.8 -man/man8/zstat.8 -sbin/zephyrd -sbin/zhm -sbin/zpopnotify -sbin/zshutdown_notify -share/doc/zephyr/INSTALL -share/doc/zephyr/NOTES -share/doc/zephyr/OPERATING -share/doc/zephyr/README -share/doc/zephyr/USING -share/examples/zephyr/default.subscriptions -share/zephyr/XZwrite -share/zephyr/xzwrite.bitmap -share/zephyr/zwgc.desc -share/zephyr/zwgc_resources -@dirrm share/zephyr -@dirrm share/examples/zephyr -@dirrm share/doc/zephyr -@dirrm include/zephyr diff --git a/chat/zephyr-current/buildlink2.mk b/chat/zephyr-current/buildlink2.mk deleted file mode 100644 index 3fe2dc99d84..00000000000 --- a/chat/zephyr-current/buildlink2.mk +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/12/30 17:50:08 sommerfeld Exp $ - -.if !defined(ZEPHYR_BUILDLINK2_MK) -ZEPHYR_BUILDLINK2_MK= # defined - -BUILDLINK_DEPENDS.zephyr?= zephyr>=20010518 -BUILDLINK_PKGSRCDIR.zephyr?= ../../chat/zephyr-current - -BUILDLINK_PACKAGES+= zephyr -EVAL_PREFIX+= BUILDLINK_PREFIX.zephyr=zephyr -BUILDLINK_PREFIX.zephyr_DEFAULT= ${LOCALBASE} - -BUILDLINK_FILES.zephyr= include/zephyr/* -BUILDLINK_FILES.zephyr+= lib/libzephyr.* - -BUILDLINK_TARGETS+= zephyr-buildlink - -zephyr-buildlink: _BUILDLINK_USE - -.endif # ZEPHYR_BUILDLINK2_MK diff --git a/chat/zephyr-current/distinfo b/chat/zephyr-current/distinfo deleted file mode 100644 index bb3eda05f14..00000000000 --- a/chat/zephyr-current/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: distinfo,v 1.2 2003/07/29 18:55:56 jmmv Exp $ - -SHA1 (zephyr-20010518.tar.gz) = cd2fca9c2f0bfaa8e69c94813bedc87d66d3ac1c -Size (zephyr-20010518.tar.gz) = 342259 bytes -SHA1 (patch-aa) = f4338f0da9085e1780c52c9b2be2366b7a0f22c2 -SHA1 (patch-ab) = 61cbadf511806c1c16e489ac6d14de347b09277a -SHA1 (patch-ac) = db350fc16d88818d4cce287fad220a2c3e84dabe -SHA1 (patch-ad) = b0f8c408afc2e7fe9a673a5f2ec562a3e34e225c -SHA1 (patch-ae) = 76b4a43282f3d8d8d42d72f66c677a652ff33e22 -SHA1 (patch-af) = 4ebb22fa3c1b2ed351ee267be737d34d8292129c -SHA1 (patch-ag) = 2c756da1e62613333cca2b68ca9b5f6c96e0f147 -SHA1 (patch-ah) = 8282d416d24eafcb40ead93d4c376f1e8e80b207 -SHA1 (patch-ai) = bfa2d01d20884d31e58bd12a171938504d929e28 -SHA1 (patch-aj) = 3ec4b1624e2eecefe129ac53e870ce2fb2bce236 -SHA1 (patch-ak) = 7c2084aac1e4b30124c380fbc369cb6a6b41eb17 diff --git a/chat/zephyr-current/files/zhm.sh b/chat/zephyr-current/files/zhm.sh deleted file mode 100644 index 3ed3bb1a7b8..00000000000 --- a/chat/zephyr-current/files/zhm.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: zhm.sh,v 1.2 2003/07/29 18:55:58 jmmv Exp $ -# -# PROVIDE: zhm -# REQUIRE: DAEMON - -. /etc/rc.subr - -name="zhm" -rcvar="$name" -command="@PREFIX@/sbin/${name}" -pidfile="/var/run/${name}.pid" -required_files="@PKG_SYSCONFDIR@/server.list" -start_precmd="zhm_precmd" - -zhm_precmd() -{ - rc_flags="`cat @PKG_SYSCONFDIR@/server.list`" -} -load_rc_config "$name" -run_rc_command "$1" diff --git a/chat/zephyr-current/patches/patch-aa b/chat/zephyr-current/patches/patch-aa deleted file mode 100644 index 774c5e64994..00000000000 --- a/chat/zephyr-current/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/12/30 17:39:26 sommerfeld Exp $ - ---- lib/Makefile.in.orig Sat Jan 31 18:55:07 1998 -+++ lib/Makefile.in -@@ -42,7 +42,7 @@ libzephyr.a: ${OBJS} - - zephyr_err.c ${BUILDTOP}/h/zephyr/zephyr_err.h: zephyr_err.et - compile_et ${srcdir}/zephyr_err.et -- mv zephyr_err.h ${BUILDTOP}/h/zephyr -+ cp zephyr_err.h ${BUILDTOP}/h/zephyr - - .c.o: - ${CC} -c ${ALL_CFLAGS} $< diff --git a/chat/zephyr-current/patches/patch-ab b/chat/zephyr-current/patches/patch-ab deleted file mode 100644 index 5b76a1bfb27..00000000000 --- a/chat/zephyr-current/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/12/30 17:39:26 sommerfeld Exp $ - ---- lib/ZMkAuth.c.orig Fri Jan 22 18:19:16 1999 -+++ lib/ZMkAuth.c -@@ -42,7 +42,9 @@ Code_t ZMakeAuthentication(notice, buffe - char *cstart, *cend; - ZChecksum_t checksum; - CREDENTIALS cred; -- extern unsigned long des_quad_cksum(); -+#ifdef ERROR_TABLE_BASE_krb -+#define krb_err_base ERROR_TABLE_BASE_krb -+#endif - - now = time(0); - if (last_authent_time == 0 || (now - last_authent_time > 120)) { diff --git a/chat/zephyr-current/patches/patch-ac b/chat/zephyr-current/patches/patch-ac deleted file mode 100644 index f40d17197f5..00000000000 --- a/chat/zephyr-current/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/12/30 17:39:26 sommerfeld Exp $ - ---- clients/zctl/zctl.c.orig Thu Aug 12 20:19:38 1999 -+++ clients/zctl/zctl.c -@@ -12,7 +12,7 @@ - - #include - #include --#include -+#include - #include - #include - #include diff --git a/chat/zephyr-current/patches/patch-ad b/chat/zephyr-current/patches/patch-ad deleted file mode 100644 index fbe8bd9061f..00000000000 --- a/chat/zephyr-current/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/12/30 17:39:26 sommerfeld Exp $ - ---- server/zserver.h.orig Mon Feb 26 23:58:14 2001 -+++ server/zserver.h -@@ -268,9 +268,9 @@ void sweep_ticket_hash_table __P((void * - #ifndef NOENCRYPTION - Sched *check_key_sched_cache __P((des_cblock key)); - void add_to_key_sched_cache __P((des_cblock key, Sched *sched)); --int krb_set_key __P((char *key, int cvt)); -+int krb_set_key __P((void *key, int cvt)); - int krb_rd_req __P((KTEXT authent, char *service, char *instance, -- unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn)); -+ KRB_INT32 from_addr, AUTH_DAT *ad, char *fn)); - int krb_find_ticket __P((KTEXT authent, KTEXT ticket)); - int krb_get_lrealm __P((char *r, int n)); - #endif diff --git a/chat/zephyr-current/patches/patch-ae b/chat/zephyr-current/patches/patch-ae deleted file mode 100644 index 4c0f70dfe11..00000000000 --- a/chat/zephyr-current/patches/patch-ae +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/12/30 17:39:27 sommerfeld Exp $ - ---- server/kopt.c.orig Mon Feb 26 23:48:01 2001 -+++ server/kopt.c -@@ -161,7 +161,7 @@ void add_to_key_sched_cache(key, sched) - - int - krb_set_key(key,cvt) -- char *key; -+ void *key; - int cvt; - { - #ifdef NOENCRYPTION -@@ -172,7 +172,7 @@ krb_set_key(key,cvt) - int ret; - - if (cvt) -- string_to_key(key,serv_key); -+ string_to_key((char *)key,serv_key); - else - memcpy((char *)serv_key,key,8); - -@@ -187,6 +187,14 @@ krb_set_key(key,cvt) - #endif /* NOENCRYPTION */ - } - -+static u_long -+swap_u_long(u_long x) -+{ -+ return ((x & 0xff000000) >> 24) | -+ ((x & 0x00ff0000) >> 8) | -+ ((x & 0x0000ff00) << 8) | -+ ((x & 0x000000ff) << 24); -+} - - /* - * krb_rd_req() takes an AUTH_MSG_APPL_REQUEST or -@@ -234,7 +242,7 @@ krb_rd_req(authent,service,instance,from - KTEXT authent; /* The received message */ - char *service; /* Service name */ - char *instance; /* Service instance */ -- unsigned KRB_INT32 from_addr; /* Net address of originating host */ -+ KRB_INT32 from_addr; /* Net address of originating host */ - AUTH_DAT *ad; /* Structure to be filled in */ - char *fn; /* Filename to get keys from */ - { diff --git a/chat/zephyr-current/patches/patch-af b/chat/zephyr-current/patches/patch-af deleted file mode 100644 index 5038cea8748..00000000000 --- a/chat/zephyr-current/patches/patch-af +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/12/30 17:39:27 sommerfeld Exp $ - ---- server/kstuff.c.orig Tue Apr 10 19:28:20 2001 -+++ server/kstuff.c -@@ -124,6 +124,9 @@ SendKerberosData(fd, ticket, service, ho - char p[32]; - int written; - int size_to_write; -+#ifdef ERROR_TABLE_BASE_krb -+#define krb_err_base ERROR_TABLE_BASE_krb -+#endif - - rem = krb_mk_req(ticket, service, host, ZGetRealm(), (u_long) 0); - if (rem != KSUCCESS) diff --git a/chat/zephyr-current/patches/patch-ag b/chat/zephyr-current/patches/patch-ag deleted file mode 100644 index 9a717600fc5..00000000000 --- a/chat/zephyr-current/patches/patch-ag +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2003/07/29 18:55:59 jmmv Exp $ - ---- server/realm.c.orig 2001-02-27 05:51:07.000000000 +0100 -+++ server/realm.c -@@ -498,7 +498,7 @@ realm_init() - char list_file[128]; - char rlmprinc[ANAME_SZ+INST_SZ+REALM_SZ+3]; - -- sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, REALM_LIST_FILE); -+ sprintf(list_file, "%s/%s", SYSCONFDIR, REALM_LIST_FILE); - rlmnames = get_realm_lists(list_file); - if (!rlmnames) { - zdbug((LOG_DEBUG, "No other realms")); -@@ -1096,6 +1096,10 @@ realm_dump_realms(fp) - } - - #ifdef HAVE_KRB4 -+#ifdef ERROR_TABLE_BASE_krb -+#define krb_err_base ERROR_TABLE_BASE_krb -+#endif -+ - static void - realm_sendit_auth(notice, who, auth, realm, ack_to_sender) - ZNotice_t *notice; diff --git a/chat/zephyr-current/patches/patch-ah b/chat/zephyr-current/patches/patch-ah deleted file mode 100644 index 3bfaf282d05..00000000000 --- a/chat/zephyr-current/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2002/12/30 17:39:27 sommerfeld Exp $ - ---- zhm/zhm.c.orig Fri May 19 19:19:21 2000 -+++ zhm/zhm.c -@@ -22,7 +22,9 @@ int use_hesiod = 0; - #define srandom srand48 - #endif - --#define PIDDIR "/var/athena/" -+#ifndef PIDDIR -+#define PIDDIR "/var/run/" -+#endif - - int hmdebug, rebootflag, noflushflag, errflg, dieflag, inetd, oldpid, nofork; - int no_server = 1, nservchang, nserv, nclt; diff --git a/chat/zephyr-current/patches/patch-ai b/chat/zephyr-current/patches/patch-ai deleted file mode 100644 index c032779c864..00000000000 --- a/chat/zephyr-current/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2003/07/29 18:55:59 jmmv Exp $ - ---- Makefile.in.orig 1998-06-11 21:10:02.000000000 +0200 -+++ Makefile.in -@@ -31,8 +31,6 @@ install: - ${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}${sbindir} 755 - ${ENSUREDIR} ${DESTDIR}${includedir} 755 - ${ENSUREDIR} ${DESTDIR}${includedir}/zephyr 755 diff --git a/chat/zephyr-current/patches/patch-aj b/chat/zephyr-current/patches/patch-aj deleted file mode 100644 index 9dddefc8956..00000000000 --- a/chat/zephyr-current/patches/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2003/07/29 18:56:00 jmmv Exp $ - ---- server/main.c.orig 2001-02-27 05:50:08.000000000 +0100 -+++ server/main.c -@@ -140,14 +140,14 @@ main(argc, argv) - extern int optind; - - #ifndef HAVE_HESIOD -- sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, SERVER_LIST_FILE); -+ sprintf(list_file, "%s/%s", SYSCONFDIR, SERVER_LIST_FILE); - #endif - #ifdef HAVE_KRB4 -- sprintf(srvtab_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_SRVTAB); -- sprintf(tkt_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_TKFILE); -+ sprintf(srvtab_file, "%s/%s", SYSCONFDIR, ZEPHYR_SRVTAB); -+ sprintf(tkt_file, "%s/%s", SYSCONFDIR, ZEPHYR_TKFILE); - #endif -- sprintf(acl_dir, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_ACL_DIR); -- sprintf(subs_file, "%s/zephyr/%s", SYSCONFDIR, DEFAULT_SUBS_FILE); -+ sprintf(acl_dir, "%s/%s", SYSCONFDIR, ZEPHYR_ACL_DIR); -+ sprintf(subs_file, "%s/%s", SYSCONFDIR, DEFAULT_SUBS_FILE); - - /* set name */ - programname = strrchr(argv[0],'/'); diff --git a/chat/zephyr-current/patches/patch-ak b/chat/zephyr-current/patches/patch-ak deleted file mode 100644 index 4ed4c002586..00000000000 --- a/chat/zephyr-current/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2003/07/29 18:56:01 jmmv Exp $ - ---- server/Makefile.in.orig 2003-07-29 20:46:05.000000000 +0200 -+++ server/Makefile.in -@@ -52,7 +52,7 @@ install: - ${INSTALL} -m 755 -s zephyrd ${DESTDIR}${sbindir} - ${INSTALL} -m 644 ${srcdir}/zephyrd.8 ${DESTDIR}${mandir}/man8 - ${INSTALL} -m 644 ${srcdir}/default.subscriptions \ -- ${DESTDIR}${sysconfdir}/zephyr -+ ${DESTDIR}${datadir}/examples/zephyr - - clean: - rm -f ${OBJS} zephyrd zsrv_err.[ch] -- cgit v1.2.3