%n bind %v 4.9.4-P1 %c * %l * %b * %d * %f * %t bind-4.9.4-P1.tgz %w Misc %% %setup patch -u -p1 <<'ENDPATCH' diff -ru2N bind-4.9.4-P1/Makefile bind-MCC/Makefile --- bind-4.9.4-P1/Makefile Mon Aug 5 09:31:21 1996 +++ bind-MCC/Makefile Sun Oct 27 15:09:35 1996 @@ -64,5 +64,5 @@ INCL = include RES = res/libresolv.a -COMPLIB = compat/lib/lib44bsd.a +COMPLIB = # The default build parameters are given for 4.4 BSD. They should @@ -74,11 +74,11 @@ # CC = cc $(CPPFLAGS) -LDFLAGS = -CDEBUG = -O -g -CPPFLAGS= +LDFLAGS = -Wl,-warn-common +CDEBUG = -O6 -fomit-frame-pointer +CPPFLAGS= -DSYSV INDOT = XFER_INDOT = -LEX = lex -I -LIBS = -ll -lutil +LEX = flex +LIBS = -lfl PIDDIR = /var/run DESTBIN = /usr/bin @@ -89,7 +89,7 @@ DESTLIB = /usr/lib DESTINC = /usr/include -COMPINCL = compat/include +COMPINCL = LDS = -CATEXT = 0 +CATEXT = $$$$N INSTALL_COMPAT = install INSTALL = install @@ -97,7 +97,7 @@ AR = ar cru MANROFF = ( tbl | nroff -man ) -MANDIR = cat -PS = ps -IOT = ABRT +MANDIR = man +PS = ps -p +IOT = IOT SHCC = SHLD = @@ -662,6 +662,6 @@ "INCL=../${INCL}" "RES=../${RES}" "LEX=${LEX}" "LDFLAGS=${LDFLAGS}" \ "PIDDIR=${PIDDIR}" "DESTBIN=${DESTBIN}" "DESTSBIN=${DESTSBIN}" \ - "DESTEXEC=${DESTEXEC}" "COMPINCL=../${COMPINCL}" \ - "COMPLIB=../${COMPLIB}" "DESTLIB=${DESTLIB}" "DESTINC=${DESTINC}" \ + "DESTEXEC=${DESTEXEC}" "COMPINCL=${COMPINCL}" \ + "COMPLIB=${COMPLIB}" "DESTLIB=${DESTLIB}" "DESTINC=${DESTINC}" \ "DESTHELP=${DESTHELP}" "PIC=${PIC}" "SHCC=${SHCC}" "SHLD=${SHLD}" \ "AR=${AR}" "RANLIB=${RANLIB}" "LDS=${LDS}" 'ARPREF=${ARPREF}' \ @@ -673,5 +673,5 @@ SRC = .. -SUBDIRS = res $(SHRES) include compat named tools man +SUBDIRS = res $(SHRES) include named tools man all:: FRC diff -ru2N bind-4.9.4-P1/include/Makefile bind-MCC/include/Makefile --- bind-4.9.4-P1/include/Makefile Sun Aug 20 23:17:44 1995 +++ bind-MCC/include/Makefile Sun Oct 27 15:10:17 1996 @@ -61,5 +61,5 @@ MAKE="${MAKE}" -all depend clean install:: +all depend clean:: @for x in ${SUBDIRS}; do \ (cd $$x; pwd; ${MAKE} ${MARGS} $@); \ @@ -70,4 +70,5 @@ install:: +dummy: @set -x; for x in ${HFILES}; do \ ${INSTALL} -c -m 444 $$x ${DESTDIR}${DESTINC}/$$x; \ diff -ru2N bind-4.9.4-P1/include/resolv.h bind-MCC/include/resolv.h --- bind-4.9.4-P1/include/resolv.h Sun Jun 2 09:20:38 1996 +++ bind-MCC/include/resolv.h Sun Oct 27 15:11:15 1996 @@ -206,5 +206,4 @@ #define p_rr __p_rr #define p_option __p_option -#define res_randomid __res_randomid #define res_isourserver __res_isourserver #define res_nameinquery __res_nameinquery diff -ru2N bind-4.9.4-P1/man/Makefile bind-MCC/man/Makefile --- bind-4.9.4-P1/man/Makefile Tue Jun 20 21:27:20 1995 +++ bind-MCC/man/Makefile Sun Oct 27 15:28:50 1996 @@ -73,5 +73,5 @@ # MANROFF = cat # -MANROFF = ( tbl | nroff -man ) +MANROFF = cat # @@ -398,8 +398,16 @@ install: ${OUTFILES} \ ${DESTDIR}${DESTMAN}/${MANDIR}${CMD_EXT_DIR} \ - ${DESTDIR}${DESTMAN}/${MANDIR}${SYS_OPS_EXT_DIR} \ - ${DESTDIR}${DESTMAN}/${MANDIR}${LIB_NETWORK_EXT_DIR} \ - ${DESTDIR}${DESTMAN}/${MANDIR}${FORMAT_EXT_DIR} \ - ${DESTDIR}${DESTMAN}/${MANDIR}${DESC_EXT_DIR} + ${DESTDIR}${DESTMAN}/${MANDIR}${SYS_OPS_EXT_DIR} + @set -x; N=${CMD_EXT}; for f in ${CMD_BASE}; do \ + ${INSTALL} -m 444 $${f}.${CMD_OUT_EXT} \ + ${DESTDIR}${DESTMAN}/${MANDIR}${CMD_EXT_DIR}/$${f}.$${N}; \ + gzip -9f ${DESTDIR}${DESTMAN}/${MANDIR}${CMD_EXT_DIR}/$${f}.$${N}; \ + done + @set -x; N=${SYS_OPS_EXT}; for f in ${NAMED_BASE} ${NAMED_XFER_BASE} ${NSLOOKUP_BASE}; do \ + ${INSTALL} -m 444 $${f}.${SYS_OPS_OUT_EXT} \ + ${DESTDIR}${DESTMAN}/${MANDIR}${SYS_OPS_EXT_DIR}/${INDOT}$${f}.$${N}; \ + gzip -9f ${DESTDIR}${DESTMAN}/${MANDIR}${SYS_OPS_EXT_DIR}/${INDOT}$${f}.$${N}; \ + done +dummy: @set -x; N=${CMD_EXT}; for f in ${CMD_BASE}; do \ ${INSTALL} -c -m 444 ${MAN_OWNER} ${MAN_GROUP} \ diff -ru2N bind-4.9.4-P1/named/Makefile bind-MCC/named/Makefile --- bind-4.9.4-P1/named/Makefile Fri Dec 22 10:20:31 1995 +++ bind-MCC/named/Makefile Sun Oct 27 15:18:56 1996 @@ -95,5 +95,5 @@ IOT=ABRT -CFLAGS = ${CDEBUG} -I${INCL} -I${COMPINCL} ${DEFS} +CFLAGS = ${CDEBUG} -I${INCL} ${COMPINCL} ${DEFS} HDRS= db_defs.h db_glob.h ns_defs.h ns_glob.h named.h pathnames.h tree.h @@ -169,7 +169,10 @@ depend .depend: ${SRCS} ${XFERSRCS} - mkdep ${CPPFLAGS} -I${INCL} -I${COMPINCL} ${SRCS} ${XFERSRCS} + mkdep ${CPPFLAGS} -I${INCL} ${COMPINCL} ${SRCS} ${XFERSRCS} install: + install -s -m 544 named named.restart named.reload ndc ${DESTDIR}${DESTSBIN} + install -s -m 555 named-xfer ${DESTDIR}${PATH_XFER} +dummy: ${INSTALL} -c -s -o bin -g bin -m 555 \ named ${DESTDIR}${DESTSBIN}/${INDOT}named diff -ru2N bind-4.9.4-P1/named/Version.c bind-MCC/named/Version.c --- bind-4.9.4-P1/named/Version.c Thu Dec 15 06:24:14 1994 +++ bind-MCC/named/Version.c Sun Oct 27 15:20:04 1996 @@ -5,9 +5,9 @@ #ifndef lint -char sccsid[] = "@(#)named %VERSION% %WHEN% %WHOANDWHERE%"; +char sccsid[] = "@(#)named 4.9.4-P1"; char rcsid[] = "$Id: Version.c,v 8.1 1994/12/15 06:24:14 vixie Exp $"; #endif /* not lint */ -char Version[] = "named %VERSION% %WHEN%\n\t%WHOANDWHERE%"; +char Version[] = "named 4.9.4-P1"; #ifdef COMMENT diff -ru2N bind-4.9.4-P1/named/ns_defs.h bind-MCC/named/ns_defs.h --- bind-4.9.4-P1/named/ns_defs.h Mon May 20 16:10:01 1996 +++ bind-MCC/named/ns_defs.h Sun Oct 27 15:20:42 1996 @@ -342,5 +342,5 @@ * a code used as yet anyway. anant@isi.edu */ -#define NTTL 600 /* ttl for negative data: 10 minutes? */ +#define NTTL 7200 /* ttl for negative data: 10 minutes? */ #endif /*NCACHE*/ diff -ru2N bind-4.9.4-P1/res/Makefile bind-MCC/res/Makefile --- bind-4.9.4-P1/res/Makefile Mon Aug 5 09:31:35 1996 +++ bind-MCC/res/Makefile Sun Oct 27 15:22:58 1996 @@ -72,5 +72,5 @@ AROBJS= ${ARPREF} ${OBJS} ${ARSUFF} -CFLAGS= ${CDEBUG} -I${INCL} -I${COMPINCL} ${DEFS} ${LOCDEFS} +CFLAGS= ${CDEBUG} -I${INCL} ${COMPINCL} ${DEFS} ${LOCDEFS} SRCS= herror.c res_debug.c res_data.c \ @@ -80,9 +80,5 @@ inet_addr.c inet_ntop.c inet_pton.c -OBJS= herror.o res_debug.o res_data.o \ - res_comp.o res_init.o res_mkquery.o res_query.o res_send.o \ - getnetbyaddr.o getnetbyname.o getnetent.o getnetnamadr.o \ - gethnamaddr.o sethostent.o nsap_addr.o hostnamelen.o \ - inet_addr.o inet_ntop.o inet_pton.o +OBJS= res_debug.o res_comp.o inet_ntop.o inet_pton.o all: libresolv.a @@ -92,5 +88,5 @@ $(RANLIB) libresolv.a -install: ${DESTDIR}${DESTLIB}/libresolv.a +install: ${DESTDIR}${DESTLIB}/libresolv.a: libresolv.a @@ -108,5 +104,5 @@ depend: FRC - mkdep ${CPPFLAGS} -I${INCL} -I${COMPINCL} ${DEFS} ${SRCS} + mkdep ${CPPFLAGS} -I${INCL} ${COMPINCL} ${DEFS} ${SRCS} FRC: diff -ru2N bind-4.9.4-P1/tools/Makefile bind-MCC/tools/Makefile --- bind-4.9.4-P1/tools/Makefile Mon May 20 16:10:04 1996 +++ bind-MCC/tools/Makefile Sun Oct 27 15:24:20 1996 @@ -94,9 +94,9 @@ "DESTBIN=${DESTBIN}" "DESTSBIN=${DESTSBIN}" "DESTEXEC=${DESTEXEC}" \ "DESTLIB=${DESTLIB}" "DESTINC=${DESTINC}" "RANLIB=${RANLIB}" \ - "COMPINCL=../${COMPINCL}" "DESTHELP=${DESTHELP}" \ - "COMPLIB=../${COMPLIB}" "INSTALL=${INSTALL}" \ + "COMPINCL=${COMPINCL}" "DESTHELP=${DESTHELP}" \ + "COMPLIB=${COMPLIB}" "INSTALL=${INSTALL}" \ "CPPFLAGS=${CPPFLAGS}" -CFLAGS= $(CDEBUG) -I$(INCL) -I$(COMPINCL) +CFLAGS= $(CDEBUG) -I$(INCL) $(COMPINCL) SRCS= host.c dig.c dnsquery.c addr.c HOST_O= host.o @@ -140,5 +140,5 @@ (cd $$x; pwd; ${MAKE} ${MARGS} depend); \ done - mkdep -p ${CPPFLAGS} -I${INCL} -I${COMPINCL} ${SRCS} + mkdep -p ${CPPFLAGS} -I${INCL} ${COMPINCL} ${SRCS} install: FRC @@ -147,5 +147,5 @@ done @set -x; for x in ${BINARIES}; do \ - ${INSTALL} -s -c -m 755 $$x ${DESTDIR}${DESTBIN}/$$x; \ + ${INSTALL} -s -m 555 $$x ${DESTDIR}${DESTBIN}/$$x; \ done diff -ru2N bind-4.9.4-P1/tools/nslookup/Makefile bind-MCC/tools/nslookup/Makefile --- bind-4.9.4-P1/tools/nslookup/Makefile Fri Dec 22 10:20:43 1995 +++ bind-MCC/tools/nslookup/Makefile Sun Oct 27 15:25:56 1996 @@ -91,5 +91,5 @@ #COMPLIB= -CFLAGS= ${CDEBUG} -I${INCL} -I${COMPINCL} ${DEFS} +CFLAGS= ${CDEBUG} -I${INCL} ${COMPINCL} ${DEFS} CSRCS= main.c getinfo.c debug.c send.c skip.c list.c subr.c SRCS= ${CSRCS} commands.l @@ -110,9 +110,9 @@ depend: ${SRCS} - mkdep ${CPPFLAGS} -I${INCL} -I${COMPINCL} ${DEFS} ${SRCS} + mkdep ${CPPFLAGS} -I${INCL} ${COMPINCL} ${DEFS} ${SRCS} install: - ${INSTALL} -s -c -o bin -g bin -m 755 nslookup ${DESTDIR}${DESTBIN}/ - ${INSTALL} -c -o bin -g bin -m 444 nslookup.help \ + ${INSTALL} -s -m 555 nslookup ${DESTDIR}${DESTBIN}/ + ${INSTALL} -m 444 nslookup.help \ ${DESTDIR}${DESTHELP}/ ENDPATCH make * make install * rm -f /usr/bin/addr %%