Date: Thu, 21 Dec 2000 22:17:50 +0000 (GMT) From: George Reid <greid@dogma.freebsd-uk.eu.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/23728: [PATCH] net/zephyr has unfetchable distfile Message-ID: <Pine.BSF.4.21.0012212215460.86714-100000@sobek.openirc.co.uk> Resent-Message-ID: <200012212220.eBLMK1C33689@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 23728 >Category: ports >Synopsis: [PATCH] net/zephyr has unfetchable distfile >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Dec 21 14:20:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: George Reid >Release: FreeBSD 5.0-CURRENT i386 >Organization: FreeBSD UKUG >Environment: n/a >Description: Port net/zephyr has an unfetchable distfile. The included patch fixes the port, updating it to the latest (and final) version. Patches from the previous version are merged. >How-To-Repeat: Try to build :) >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/zephyr/Makefile,v retrieving revision 1.10 diff -r1.10 Makefile 9c9 < PORTVERSION= 2.0.4 --- > PORTVERSION= 20000421 11c11,12 < MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/dist/ --- > MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/ > DISTNAME= zephyr-20000421 14a16,17 > WRKSRC= ${WRKDIR}/zephyr > 23,24c26 < MAN8= syslogd.8 zpopnotify.8 zshutdown_notify.8 zstat.8 \ < zephyrd.8 zhm.8 --- > MAN8= zpopnotify.8 zshutdown_notify.8 zstat.8 zephyrd.8 zhm.8 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/zephyr/distinfo,v retrieving revision 1.2 diff -r1.2 distinfo 1c1 < MD5 (zephyr-2.0.4.tar.gz) = 866c287c45da2fa353484297ad570cf4 --- > MD5 (zephyr-20000421.tar.gz) = 7b7c50ece90fbf294af82b8fec63c0f1 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/zephyr/pkg-plist,v retrieving revision 1.7 diff -r1.7 pkg-plist 6a7 > bin/zmailnotify 9d9 < bin/zwgc 11,56c11 < etc/rc.d/zhm.sh < etc/zephyr/acl/class-registry.acl < etc/zephyr/acl/iui-filsrv.acl < etc/zephyr/acl/iui-hm_ctl.acl < etc/zephyr/acl/iui-hm_stat.acl < etc/zephyr/acl/iui-login.acl < etc/zephyr/acl/iui-operations.acl < etc/zephyr/acl/iui-ops.acl < etc/zephyr/acl/iui-user_locate.acl < etc/zephyr/acl/iui-wg_ctl.acl < etc/zephyr/acl/iui-zephyr_admin.acl < etc/zephyr/acl/iui-zephyr_ctl.acl < etc/zephyr/acl/iui-zmatch_all.acl < etc/zephyr/acl/iws-filsrv.acl < etc/zephyr/acl/iws-hm_ctl.acl < etc/zephyr/acl/iws-hm_stat.acl < etc/zephyr/acl/iws-login.acl < etc/zephyr/acl/iws-operations.acl < etc/zephyr/acl/iws-ops.acl < etc/zephyr/acl/iws-user_locate.acl < etc/zephyr/acl/iws-wg_ctl.acl < etc/zephyr/acl/iws-zephyr_admin.acl < etc/zephyr/acl/iws-zephyr_ctl.acl < etc/zephyr/acl/iws-zmatch_all.acl < etc/zephyr/acl/sub-filsrv.acl < etc/zephyr/acl/sub-hm_ctl.acl < etc/zephyr/acl/sub-hm_stat.acl < etc/zephyr/acl/sub-login.acl < etc/zephyr/acl/sub-operations.acl < etc/zephyr/acl/sub-ops.acl < etc/zephyr/acl/sub-user_locate.acl < etc/zephyr/acl/sub-wg_ctl.acl < etc/zephyr/acl/sub-zephyr_admin.acl < etc/zephyr/acl/sub-zephyr_ctl.acl < etc/zephyr/acl/sub-zmatch_all.acl < etc/zephyr/acl/xmt-filsrv.acl < etc/zephyr/acl/xmt-hm_ctl.acl < etc/zephyr/acl/xmt-hm_stat.acl < etc/zephyr/acl/xmt-login.acl < etc/zephyr/acl/xmt-operations.acl < etc/zephyr/acl/xmt-ops.acl < etc/zephyr/acl/xmt-user_locate.acl < etc/zephyr/acl/xmt-wg_ctl.acl < etc/zephyr/acl/xmt-zephyr_admin.acl < etc/zephyr/acl/xmt-zephyr_ctl.acl < etc/zephyr/acl/xmt-zmatch_all.acl --- > bin/zwgc 58c13 < etc/zephyr/zephyr.vars --- > etc/rc.d/zhm.sh 63c18,19 < sbin/syslogd --- > sbin/zshutdown_notify > sbin/zpopnotify 66,68d21 < sbin/zmailnotify < sbin/zpopnotify < sbin/zshutdown_notify 78d30 < @dirrm etc/zephyr/acl Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/net/zephyr/files/patch-aa,v retrieving revision 1.2 diff -r1.2 patch-aa 1,59c1,13 < *** configure.orig Wed Mar 3 20:37:09 1999 < --- configure Wed Mar 3 20:39:35 1999 < *************** < *** 44,50 **** < bindir='${exec_prefix}/bin' < sbindir='${exec_prefix}/sbin' < libexecdir='${exec_prefix}/libexec' < ! datadir='${prefix}/share' < sysconfdir='${prefix}/etc' < sharedstatedir='${prefix}/com' < localstatedir='${prefix}/var' < --- 44,50 ---- < bindir='${exec_prefix}/bin' < sbindir='${exec_prefix}/sbin' < libexecdir='${exec_prefix}/libexec' < ! datadir='${prefix}/share/zephyr' < sysconfdir='${prefix}/etc' < sharedstatedir='${prefix}/com' < localstatedir='${prefix}/var' < *************** < *** 547,563 **** < confdir=${confdir-'$(prefix)/etc/zephyr'} < sbindir=${sbindir-'$(exec_prefix)/sbin'} < lsbindir=${lsbindir-'$(exec_prefix)/sbin'} < ! SUPPORT_LIBS="et ss" < ! ET_LDFLAGS='-L$(BUILDTOP)/lib/et' < ! ETDEP='$(BUILDTOP)/lib/et/libcom_err.a' < ! SS_LDFLAGS='-L$(BUILDTOP)/lib/ss' < ! SSDEP='$(BUILDTOP)/lib/ss/libss.a' < ! COMPILE_ET='$(BUILDTOP)/lib/et/compile_et' < ! MK_CMDS='$(BUILDTOP)/lib/ss/mk_cmds' < INITPROGS=true < ! if test ! -d h/ss; then mkdir h/ss; fi < ! cp ${srcdir}/lib/et/com_err.h h < ! cp ${srcdir}/lib/ss/*.h h/ss < fi < < < --- 547,566 ---- < confdir=${confdir-'$(prefix)/etc/zephyr'} < sbindir=${sbindir-'$(exec_prefix)/sbin'} < lsbindir=${lsbindir-'$(exec_prefix)/sbin'} < ! # SUPPORT_LIBS="et ss" < ! # ET_LDFLAGS='-L$(BUILDTOP)/lib/et' < ! # ETDEP='$(BUILDTOP)/lib/et/libcom_err.a' < ! # SS_LDFLAGS='-L$(BUILDTOP)/lib/ss' < ! # SSDEP='$(BUILDTOP)/lib/ss/libss.a' < ! # COMPILE_ET='$(BUILDTOP)/lib/et/compile_et' < ! # MK_CMDS='$(BUILDTOP)/lib/ss/mk_cmds' < INITPROGS=true < ! # if test ! -d h/ss; then mkdir h/ss; fi < ! # cp ${srcdir}/lib/et/com_err.h h < ! # cp ${srcdir}/lib/ss/*.h h/ss < ! CPPFLAGS="${CPPFLAGS} -I/usr/include/kerberosIV" < ! COMPILE_ET=compile_et < ! MK_CMDS=mk_cmds < fi < < --- > --- 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 Index: files/patch-ab =================================================================== RCS file: /home/ncvs/ports/net/zephyr/files/patch-ab,v retrieving revision 1.1 diff -r1.1 patch-ab 1,20c1,13 < --- clients/xzwrite/Makefile.in.orig Fri Jul 7 23:55:14 1995 < +++ clients/xzwrite/Makefile.in Wed Mar 3 19:29:01 1999 < @@ -17,6 +17,7 @@ < VPATH=@srcdir@ < CC=@CC@ < INSTALL=@INSTALL@ < +SED=/usr/bin/sed < < DEBUG=-O < CFLAGS=$(DEBUG) -DDATADIR=\"$(datadir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \ < @@ -41,7 +42,8 @@ < install: xzwrite XZwrite < $(INSTALL) -m 755 -s xzwrite $(bindir) < $(INSTALL) -m 644 $(srcdir)/xzwrite.1 $(mandir)/man1 < - $(INSTALL) -m 644 XZwrite $(datadir) < + $(SED) -e 's#XX_PREFIX_XX#$(prefix)#' < XZwrite >XZwrite.tmp < + $(INSTALL) -m 644 XZwrite.tmp $(datadir)/XZwrite < $(INSTALL) -m 644 $(srcdir)/xzwrite.bitmap $(datadir) < < clean: --- > --- 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 Index: files/patch-ac =================================================================== RCS file: /home/ncvs/ports/net/zephyr/files/patch-ac,v retrieving revision 1.1 diff -r1.1 patch-ac 1,11c1,11 < --- clients/xzwrite/XZwrite.in.orig Wed Mar 3 19:57:39 1999 < +++ clients/xzwrite/XZwrite.in Wed Mar 3 20:05:46 1999 < @@ -17,7 +17,7 @@ < *readAnyone: on < *readXzwrite: on < < -*icon.bitmap: @datadir@/xzwrite.bitmap < +*icon.bitmap: XX_PREFIX_XX/share/zephyr/xzwrite.bitmap < *icon.translations: #override\ < <BtnDown>: set() \n\ < <Btn1Up>: OpenSend() unset() \n\ --- > --- 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' Index: files/patch-ad =================================================================== RCS file: /home/ncvs/ports/net/zephyr/files/patch-ad,v retrieving revision 1.1 diff -r1.1 patch-ad 1,182c1,13 < $NetBSD: patch-aa,v 1.2 1998/08/07 11:11:07 agc Exp $ < < *** h/zephyr/zephyr.h.in.orig 1996/06/12 04:42:56 < --- h/zephyr/zephyr.h.in 1996/11/22 22:04:51 < *************** < *** 73,78 **** < /* Unique ID format */ < typedef struct _ZUnique_Id_t { < ! struct in_addr zuid_addr; < ! struct timeval tv; < } ZUnique_Id_t; < < --- 73,78 ---- < /* Unique ID format */ < typedef struct _ZUnique_Id_t { < ! struct in_addr zuid_addr; < ! ZEPHYR_INT32 zuid_sec, zuid_usec; < } ZUnique_Id_t; < < *** lib/zephyr/ZParseNot.c.orig 1995/07/18 20:28:07 < --- lib/zephyr/ZParseNot.c 1996/11/22 22:04:52 < *************** < *** 154,161 **** < if (numfields) { < if (ZReadAscii(ptr, end-ptr, (unsigned char *)¬ice->z_uid, < ! sizeof(ZUnique_Id_t)) == 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); < numfields--; < next_field (ptr); < --- 154,161 ---- < if (numfields) { < if (ZReadAscii(ptr, end-ptr, (unsigned char *)¬ice->z_uid, < ! sizeof(notice->z_uid)) == ZERR_BADFIELD) < BAD_PACKET; < ! 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); < *************** < *** 268,275 **** < if (numfields) { < if (ZReadAscii(ptr, end-ptr, (unsigned char *)¬ice->z_multiuid, < ! sizeof(ZUnique_Id_t)) == 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); < numfields--; < next_field (ptr); < --- 268,275 ---- < if (numfields) { < if (ZReadAscii(ptr, end-ptr, (unsigned char *)¬ice->z_multiuid, < ! sizeof(notice->z_multiuid)) == ZERR_BADFIELD) < BAD_PACKET; < ! 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/zephyr/Zinternal.c.orig 1995/07/18 20:28:17 < --- lib/zephyr/Zinternal.c 1996/11/22 22:04:52 < *************** < *** 609,612 **** < --- 609,613 ---- < static char version[BUFSIZ]; /* default init should be all \0 */ < struct sockaddr_in name; < + struct timeval tv; < int namelen = sizeof(name); < < *************** < *** 628,634 **** < notice->z_multinotice = ""; < < ! (void) gettimeofday(¬ice->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); < < if ((retval = Z_GetMyAddr()) != ZERR_NONE) < --- 629,635 ---- < notice->z_multinotice = ""; < < ! (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); < < if ((retval = Z_GetMyAddr()) != ZERR_NONE) < *************** < *** 710,715 **** < ptr += strlen(ptr)+1; < < ! if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_uid, < ! sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN) < return (ZERR_HEADERLEN); < ptr += strlen(ptr)+1; < --- 711,716 ---- < ptr += strlen(ptr)+1; < < ! if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_uid, < ! sizeof(notice->z_uid)) == ZERR_FIELDLEN) < return (ZERR_HEADERLEN); < ptr += strlen(ptr)+1; < *************** < *** 761,766 **** < return (ZERR_HEADERLEN); < < ! if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_multiuid, < ! sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN) < return (ZERR_HEADERLEN); < ptr += strlen(ptr)+1; < --- 762,767 ---- < return (ZERR_HEADERLEN); < < ! if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_multiuid, < ! sizeof(notice->z_multiuid)) == ZERR_FIELDLEN) < return (ZERR_HEADERLEN); < ptr += strlen(ptr)+1; < *************** < *** 882,885 **** < --- 883,887 ---- < int offset, hdrsize, fragsize, ret_len, message_len, waitforack; < Code_t retval; < + struct timeval tv; < < hdrsize = len-notice->z_message_len; < *************** < *** 897,906 **** < 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); < if ((retval = Z_GetMyAddr()) != ZERR_NONE) < return (retval); < --- 899,905 ---- < partnotice.z_multinotice = multi; < if (offset > 0) { < ! (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); < if ((retval = Z_GetMyAddr()) != ZERR_NONE) < return (retval); < *** server/dispatch.c.orig 1996/06/06 05:56:58 < --- server/dispatch.c 1996/11/22 22:04:52 < *************** < *** 828,834 **** < /* search the not-yet-acked table for this packet, and flush it. */ < #if 0 < ! zdbug((LOG_DEBUG, "nack_cancel: %s:%08X,%08X", < inet_ntoa(notice->z_uid.zuid_addr), < ! notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec)); < #endif < hashval = NACKTAB_HASHVAL(*who, notice->z_uid); < --- 828,835 ---- < /* search the not-yet-acked table for this packet, and flush it. */ < #if 0 < ! zdbug((LOG_DEBUG, "nack_cancel: %s:%08lX,%08lX", < inet_ntoa(notice->z_uid.zuid_addr), < ! (u_long) notice->z_uid.zuid_sec, < ! (u_long) notice->z_uid.zuid_usec)); < #endif < hashval = NACKTAB_HASHVAL(*who, notice->z_uid); < *************** < *** 846,852 **** < < #if 1 < ! zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08X,%08X", < inet_ntoa (notice->z_uid.zuid_addr), < ! notice->z_uid.tv.tv_sec, notice->z_uid.tv.tv_usec)); < #endif < } < --- 847,854 ---- < < #if 1 < ! zdbug((LOG_DEBUG,"nack_cancel: nack not found %s:%08lX,%08lX", < inet_ntoa (notice->z_uid.zuid_addr), < ! (u_long) notice->z_uid.zuid_sec, < ! (u_long) notice->z_uid.zuid_usec)); < #endif < } --- > --- 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 */ Index: files/patch-ae =================================================================== RCS file: /home/ncvs/ports/net/zephyr/files/patch-ae,v retrieving revision 1.1 diff -r1.1 patch-ae 1,8c1,8 < --- lib/zephyr/Makefile.in.orig Sun Sep 19 17:17:01 1999 < +++ lib/zephyr/Makefile.in Sun Sep 19 17:17:21 1999 < @@ -21,7 +21,7 @@ < < DEBUG=-O < CFLAGS= $(DEBUG) -DCONFDIR=\"$(confdir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \ < - @X_CFLAGS@ @CPPFLAGS@ < + -I$(top_srcdir)/h/zephyr @X_CFLAGS@ @CPPFLAGS@ --- > --- 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} >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0012212215460.86714-100000>