head 1.16; access; symbols pkgsrc-2013Q2:1.16.0.50 pkgsrc-2013Q2-base:1.16 pkgsrc-2012Q4:1.16.0.48 pkgsrc-2012Q4-base:1.16 pkgsrc-2011Q4:1.16.0.46 pkgsrc-2011Q4-base:1.16 pkgsrc-2011Q2:1.16.0.44 pkgsrc-2011Q2-base:1.16 TNF:1.1.1 pkgsrc-2009Q4:1.16.0.42 pkgsrc-2009Q4-base:1.16 pkgsrc-2008Q4:1.16.0.40 pkgsrc-2008Q4-base:1.16 pkgsrc-2008Q3:1.16.0.38 pkgsrc-2008Q3-base:1.16 cube-native-xorg:1.16.0.36 cube-native-xorg-base:1.16 pkgsrc-2008Q2:1.16.0.34 pkgsrc-2008Q2-base:1.16 pkgsrc-2008Q1:1.16.0.32 pkgsrc-2008Q1-base:1.16 pkgsrc-2007Q4:1.16.0.30 pkgsrc-2007Q4-base:1.16 pkgsrc-2007Q3:1.16.0.28 pkgsrc-2007Q3-base:1.16 pkgsrc-2007Q2:1.16.0.26 pkgsrc-2007Q2-base:1.16 pkgsrc-2007Q1:1.16.0.24 pkgsrc-2007Q1-base:1.16 pkgsrc-2006Q4:1.16.0.22 pkgsrc-2006Q4-base:1.16 pkgsrc-2006Q3:1.16.0.20 pkgsrc-2006Q3-base:1.16 pkgsrc-2006Q2:1.16.0.18 pkgsrc-2006Q2-base:1.16 pkgsrc-2006Q1:1.16.0.16 pkgsrc-2006Q1-base:1.16 pkgsrc-2005Q4:1.16.0.14 pkgsrc-2005Q4-base:1.16 pkgsrc-2005Q3:1.16.0.12 pkgsrc-2005Q3-base:1.16 pkgsrc-2005Q2:1.16.0.10 pkgsrc-2005Q2-base:1.16 pkgsrc-2005Q1:1.16.0.8 pkgsrc-2005Q1-base:1.16 pkgsrc-2004Q4:1.16.0.6 pkgsrc-2004Q4-base:1.16 pkgsrc-2004Q3:1.16.0.4 pkgsrc-2004Q3-base:1.16 pkgsrc-2004Q2:1.16.0.2 pkgsrc-2004Q2-base:1.16 pkgsrc-2004Q1:1.15.0.2 pkgsrc-2004Q1-base:1.15 pkgsrc-2003Q4:1.14.0.4 pkgsrc-2003Q4-base:1.14 netbsd-1-6-1:1.14.0.2 netbsd-1-6-1-base:1.14 netbsd-1-6:1.12.0.8 netbsd-1-6-RELEASE-base:1.12 pkgviews:1.12.0.4 pkgviews-base:1.12 buildlink2:1.12.0.2 buildlink2-base:1.12 netbsd-1-5-PATCH003:1.12 netbsd-1-5-PATCH001:1.12 netbsd-1-5-RELEASE:1.12 netbsd-1-4-PATCH003:1.12 netbsd-1-4-PATCH002:1.11 comdex-fall-1999:1.8 netbsd-1-4-PATCH001:1.6 netbsd-1-4-RELEASE:1.6 netbsd-1-3-PATCH003:1.6 netbsd-1-3-PATCH002:1.3 HF-19971214:1.1.1.1; locks; strict; comment @# @; 1.16 date 2004.06.01.21.50.37; author kristerw; state dead; branches; next 1.15; 1.15 date 2004.02.21.13.55.01; author grant; state Exp; branches; next 1.14; 1.14 date 2003.01.04.11.51.30; author cjep; state Exp; branches; next 1.13; 1.13 date 2003.01.03.20.10.46; author cjep; state Exp; branches; next 1.12; 1.12 date 2000.03.20.02.25.49; author itojun; state Exp; branches; next 1.11; 1.11 date 2000.01.22.23.30.42; author tron; state Exp; branches; next 1.10; 1.10 date 99.12.25.05.28.35; author kim; state Exp; branches; next 1.9; 1.9 date 99.12.01.20.48.17; author bouyer; state Exp; branches; next 1.8; 1.8 date 99.09.18.22.04.57; author kim; state Exp; branches; next 1.7; 1.7 date 99.09.18.21.08.20; author kim; state Exp; branches; next 1.6; 1.6 date 98.08.07.11.13.49; author agc; state Exp; branches; next 1.5; 1.5 date 98.07.10.20.07.20; author tron; state Exp; branches; next 1.4; 1.4 date 98.05.24.18.57.41; author tron; state Exp; branches; next 1.3; 1.3 date 98.02.12.14.27.15; author mrg; state Exp; branches; next 1.2; 1.2 date 97.12.18.02.44.54; author mrg; state Exp; branches; next 1.1; 1.1 date 97.12.14.16.17.14; author hubertf; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.12.14.16.17.14; author hubertf; state Exp; branches; next ; desc @@ 1.16 log @Remove obsolete packages, per discussion on tech-pkg. @ text @$NetBSD: patch-ac,v 1.15 2004/02/21 13:55:01 grant Exp $ --- Makefile.in.orig 1999-05-12 21:19:31.000000000 +1000 +++ Makefile.in @@@@ -264,7 +264,7 @@@@ CC = @@CC@@ CFLAGS = @@CFLAGS@@ LDFLAGS = @@LDFLAGS@@ DEFS = @@DEFS@@ $(COMMERCIAL) -LIBS = @@LIBS@@ +LIBS = @@LIBS@@ @@HESIOD_LIBS@@ LIBOBJS = @@LIBOBJS@@ CONFOBJS = @@CONFOBJS@@ SSHCONFOBJS = @@SSHCONFOBJS@@ @@@@ -285,6 +285,9 @@@@ KERBEROS_INCS = @@KERBEROS_INCS@@ KERBEROS_LIBS = @@KERBEROS_LIBS@@ KERBEROS_OBJS = @@KERBEROS_OBJS@@ +HESIOD_ROOT = @@HESIOD_ROOT@@ +HESIOD_INCS = @@HESIOD_INCS@@ + RSAREFDEP = @@RSAREFDEP@@ WRAPLIBS = @@WRAPLIBS@@ @@@@ -304,7 +307,8 @@@@ GMPDIR = gmp-2.0.2-ssh-2 GMPLIBS = -L$(GMPDIR) -lgmp GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a -ZLIBDIR = zlib-1.0.4 +#ZLIBDIR = zlib-1.0.4 +ZLIBDIR = /usr/lib ZLIBDEP = $(ZLIBDIR)/libz.a ZLIBLIBS = -L$(ZLIBDIR) -lz @@@@ -316,13 +320,13 @@@@ X_LIBS = @@X_LIBS@@ X_PRE_LIBS = @@X_PRE_LIBS@@ X_EXTRA_LIBS = @@X_EXTRA_LIBS@@ -XLIBS = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(LIBS) +XLIBS = $(X_LDFLAGS) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(LIBS) COMMON_OBJS = $(LIBOBJS) $(CONFOBJS) \ rsa.o randoms.o md5.o buffer.o emulate.o packet.o compress.o \ xmalloc.o ttymodes.o newchannels.o bufaux.o authfd.o authfile.o \ crc32.o rsaglue.o cipher.o des.o match.o arcfour.o mpaux.o \ - userfile.o signals.o blowfish.o deattack.o + userfile.o signals.o blowfish.o deattack.o radix.o SSHD_OBJS = sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o pty.o \ log-server.o login.o hostfile.o canohost.o servconf.o tildexpand.o \ serverloop.o $(COMMON_OBJS) $(KERBEROS_OBJS) $(SSHDCONFOBJS) @@@@ -411,7 +415,7 @@@@ rfc-pg: rfc-pg.o $(CC) -o rfc-pg rfc-pg.o .c.o: - $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $< + $(CC) -c -I. $(KERBEROS_INCS) $(HESIOD_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $< sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP) -rm -f sshd @@@@ -459,14 +463,14 @@@@ GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c $(GMPDIR)/libgmp.a: cd $(GMPDIR); $(MAKE) -$(ZLIBDEP): - -if test '!' -d $(ZLIBDIR); then \ - mkdir $(ZLIBDIR); \ - cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \ - fi - cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \ - CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \ - -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a +#$(ZLIBDEP): +# -if test '!' -d $(ZLIBDIR); then \ +# mkdir $(ZLIBDIR); \ +# cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \ +# fi +# cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \ +# CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \ +# -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a $(RSAREFSRCDIR)/librsaref.a: -if test '!' -d $(RSAREFDIR); then \ @@@@ -523,10 +527,10 @@@@ hostinstall: $(PROGRAMS) make-dirs gener # (otherwise it can only log in as the user it runs as, and must be # bound to a non-privileged port). Also, password authentication may # not be available if non-root and using shadow passwords. -install: $(PROGRAMS) make-dirs generate-host-key install-configs +install: $(PROGRAMS) make-dirs install-configs -rm -f $(install_prefix)$(bindir)/ssh1.old - -chmod 755 $(install_prefix)$(bindir)/ssh1 - -chmod 755 $(install_prefix)$(bindir)/ssh + -chmod 555 $(install_prefix)$(bindir)/ssh1 + -chmod 555 $(install_prefix)$(bindir)/ssh -mv $(install_prefix)$(bindir)/ssh1 $(install_prefix)$(bindir)/ssh1.old $(INSTALL_PROGRAM) -o root -m $(SSH_INSTALL_MODE) ssh $(install_prefix)$(bindir)/ssh1 -if test -f $(install_prefix)$(bindir)/ssh2; then \ @@@@ -549,7 +553,7 @@@@ install: $(PROGRAMS) make-dirs generate- -for p in $(NORMAL_PROGRAMS) $(X_PROGRAMS) $(OTHER_PROGRAMS); do \ rm -f $(install_prefix)$(bindir)/$${p}1.old ; \ mv $(install_prefix)$(bindir)/$${p}1 $(install_prefix)$(bindir)/$${p}1.old; \ - $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(bindir)/$${p}1; \ + $(INSTALL_PROGRAM) $$p $(install_prefix)$(bindir)/$${p}1; \ if test -f $(install_prefix)$(bindir)/$${p}2; then \ echo "Ssh version 2 $$p utility found, installation doesn't touch $$p link"; \ else \ @@@@ -566,7 +570,7 @@@@ install: $(PROGRAMS) make-dirs generate- rm -f $(install_prefix)$(bindir)/$${p}1.old ; \ mv $(install_prefix)$(bindir)/$${p}1 $(install_prefix)$(bindir)/$${p}1.old; \ $(INSTALL_DATA) $$p $(install_prefix)$(bindir)/$${p}1; \ - chmod 755 $(install_prefix)$(bindir)/$${p}1; \ + chmod 555 $(install_prefix)$(bindir)/$${p}1; \ if test -f $(install_prefix)$(bindir)/$${p}2; then \ echo "Ssh version 2 $$p utility found, installation doesn't touch $$p link"; \ else \ @@@@ -582,7 +586,7 @@@@ install: $(PROGRAMS) make-dirs generate- -for p in $(SBIN_PROGRAMS); do \ rm -f $(install_prefix)$(sbindir)/$${p}1.old ; \ mv $(install_prefix)$(sbindir)/$${p}1 $(install_prefix)$(sbindir)/$${p}1.old; \ - $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(sbindir)/$${p}1; \ + $(INSTALL_PROGRAM) $$p $(install_prefix)$(sbindir)/$${p}1; \ if test -f $(install_prefix)$(sbindir)/$${p}2; then \ echo "Ssh version 2 $$p utility found, installation doesn't touch $$p link"; \ else \ @@@@ -596,7 +600,7 @@@@ install: $(PROGRAMS) make-dirs generate- $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; fi;\ done -for p in $(MAN1PAGES); do \ - $(INSTALL_DATA) -m 0644 $(srcdir)/$$p.1 $(install_prefix)$(man1dir)/$${p}1.1 ; \ + $(INSTALL_DATA) $(srcdir)/$$p.1 $(install_prefix)$(man1dir)/$${p}1.1 ; \ rm -f $(install_prefix)$(man1dir)/$$p.1 ;\ $(LN_S) $${p}1.1 $(install_prefix)$(man1dir)/$$p.1 ;\ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ @@@@ -615,7 +619,7 @@@@ install: $(PROGRAMS) make-dirs generate- $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`; \ fi -for p in $(MAN1GENERATED); do \ - $(INSTALL_DATA) -m 0644 $$p.1 $(install_prefix)$(man1dir)/$${p}1.1 ; \ + $(INSTALL_DATA) $$p.1 $(install_prefix)$(man1dir)/$${p}1.1 ; \ rm -f $(install_prefix)$(man1dir)/$$p.1 ; \ $(LN_S) $${p}1.1 $(install_prefix)$(man1dir)/$$p.1 ; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ @@@@ -625,7 +629,7 @@@@ install: $(PROGRAMS) make-dirs generate- fi; \ done -for p in $(MAN8GENERATED); do \ - $(INSTALL_DATA) -m 0644 $$p.8 $(install_prefix)$(man8dir)/$${p}1.8; \ + $(INSTALL_DATA) $$p.8 $(install_prefix)$(man8dir)/$${p}1.8; \ rm -f $(install_prefix)$(man8dir)/$$p.8 ; \ $(LN_S) $${p}1.8 $(install_prefix)$(man8dir)/$$p.8 ; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ @@@@ -636,12 +640,12 @@@@ install: $(PROGRAMS) make-dirs generate- install-configs: -if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \ - $(INSTALL_DATA) -m 0644 $(srcdir)/host_config.sample \ + $(INSTALL_DATA) $(srcdir)/host_config.sample \ $(install_prefix)$(HOST_CONFIG_FILE); fi -if test '!' -f $(install_prefix)$(SERVER_CONFIG_FILE); then \ cat $(srcdir)/server_config.sample | \ sed "s#_ETCDIR_#$(etcdir)#g" >/tmp/ssh_inst.$$$$; \ - $(INSTALL_DATA) -m 0644 /tmp/ssh_inst.$$$$ \ + $(INSTALL_DATA) /tmp/ssh_inst.$$$$ \ $(install_prefix)$(SERVER_CONFIG_FILE); \ rm -f /tmp/ssh_inst.$$$$; fi @@@@ -681,13 +685,13 @@@@ clean: -rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg cd $(GMPDIR); $(MAKE) clean # cd $(RSAREFSRCDIR); rm -f *.o *.a - cd $(ZLIBDIR); $(MAKE) clean +# cd $(ZLIBDIR); $(MAKE) clean distclean: clean -rm -f Makefile config.status config.cache config.log config.h -rm -f ssh.1 sshd.8 make-ssh-known-hosts.1 cd $(GMPDIR); $(MAKE) distclean - cd $(ZLIBDIR); $(MAKE) distclean +# cd $(ZLIBDIR); $(MAKE) distclean dist: dist-free @@@@ -720,8 +724,8 @@@@ dist-make-dir: gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - ) # tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -) # cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a - (cd $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -) - cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS +# (cd $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -) +# cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS #ifdef F_SECURE_COMMERCIAL # @@@@ -749,7 +753,7 @@@@ dist-increment-version: (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null depend: - $(MAKEDEP) -I$(srcdir) -I. -I$(GMPDIR) -I$(ZLIBDIR) $(DEFS) $(SRCS) + $(MAKEDEP) -I$(srcdir) -I. $(DEFS) $(SRCS) tags: -rm -f TAGS @ 1.15 log @replace inappropriate use of _OPSYS_RPATH_NAME with RPATH_FLAG and make sure that this argument precedes -lX11. @ text @d1 1 a1 1 $NetBSD$ @ 1.14 log @Instead of using -Wl,-R use -Wl,${_OPSYS_RPATH_NAME} (and pass this value to make). @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.13 2003/01/03 20:10:46 cjep Exp $ d3 1 a3 1 --- Makefile.in.orig Wed May 12 12:19:31 1999 d34 1 a34 3 @@@@ -314,7 +318,7 @@@@ RSAREFSRCDIR = $(RSAREFDIR)/source X_CFLAGS = @@X_CFLAGS@@ X_LIBS = @@X_LIBS@@ d36 1 a36 2 -X_EXTRA_LIBS = @@X_EXTRA_LIBS@@ +X_EXTRA_LIBS = @@X_EXTRA_LIBS@@ -Wl,$(_OPSYS_RPATH_NAME)$(X11BASE)/lib d38 2 a39 1 XLIBS = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(LIBS) d41 1 a41 1 @@@@ -322,7 +326,7 @@@@ COMMON_OBJS = $(LIBOBJS) $(CONFOBJS) \ @ 1.13 log @Pass -Wl,-R${X11BASE}/lib to cc to build ssh-askpass (instead of just -R) @ text @d1 1 a1 1 $NetBSD$ d39 1 a39 1 +X_EXTRA_LIBS = @@X_EXTRA_LIBS@@ -Wl,-R$(X11BASE)/lib @ 1.12 log @split security/ssh and security/ssh6. security/ssh6: IPv4/v6 ready, socks unavailable, kerberos available (not tested) security/ssh: IPv4 onlyready, socks available, kerberos available (not tested) should be integrated into one whenever socks support becomes aware of getaddrinfo/getnameinfo. two directories with tons of patches/patch-* is a maintenance headache. @ text @d3 3 a5 3 --- Makefile.in- Wed May 12 20:19:31 1999 +++ Makefile.in Mon Mar 20 09:41:02 2000 @@@@ -264,7 +264,7 @@@@ d14 1 a14 1 @@@@ -285,6 +285,9 @@@@ d24 1 a24 1 @@@@ -304,7 +307,8 @@@@ d34 1 a34 1 @@@@ -314,7 +318,7 @@@@ d39 1 a39 1 +X_EXTRA_LIBS = @@X_EXTRA_LIBS@@ -R$(X11BASE)/lib d43 1 a43 1 @@@@ -322,7 +326,7 @@@@ d52 1 a52 1 @@@@ -411,7 +415,7 @@@@ d61 1 a61 1 @@@@ -459,14 +463,14 @@@@ d84 1 a84 1 @@@@ -523,10 +527,10 @@@@ d98 1 a98 1 @@@@ -549,7 +553,7 @@@@ d107 1 a107 1 @@@@ -566,7 +570,7 @@@@ d116 1 a116 1 @@@@ -582,7 +586,7 @@@@ d125 1 a125 1 @@@@ -596,7 +600,7 @@@@ d134 1 a134 1 @@@@ -615,7 +619,7 @@@@ d143 1 a143 1 @@@@ -625,7 +629,7 @@@@ d152 1 a152 1 @@@@ -636,12 +640,12 @@@@ d167 1 a167 1 @@@@ -681,13 +685,13 @@@@ d183 1 a183 1 @@@@ -720,8 +724,8 @@@@ d194 1 a194 1 @@@@ -749,7 +753,7 @@@@ @ 1.11 log @Link "ssh-askpass" with run time library path for X11 libraries. Fixes PR pkg/9242 by Christian E. Hopps. @ text @d3 2 a4 2 --- Makefile.in.orig Wed May 12 13:19:31 1999 +++ Makefile.in Sun Jan 23 00:22:03 2000 @ 1.10 log @Folded in IPv6 and Kerberos IV patches, so that both can be compiled. This also fixes problems with Kerberos IV and V support clashing (you still have to choose one or the other at compile time, though). Compiles and runs on 1.4O -- needs testing on 1.4.2, and also some closer looking at certain patches (e.g. patch-au has a "#if 0" that could maybe be something else). @ text @d3 2 a4 2 --- Makefile.in.orig Wed May 12 07:19:31 1999 +++ Makefile.in Fri Dec 24 21:58:38 1999 d33 9 @ 1.9 log @Use $(INSTALL_DATA), not /usr/bin/install -c ... @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 1999/09/18 22:04:57 kim Exp $ d4 21 a24 2 +++ Makefile.in Sat Sep 18 17:25:37 1999 @@@@ -304,7 +304,8 @@@@ d34 19 a52 1 @@@@ -459,14 +460,14 @@@@ d75 1 a75 1 @@@@ -523,10 +524,10 @@@@ d89 1 a89 1 @@@@ -549,7 +550,7 @@@@ d98 1 a98 1 @@@@ -566,7 +567,7 @@@@ d107 1 a107 1 @@@@ -582,7 +583,7 @@@@ d116 1 a116 1 @@@@ -596,7 +597,7 @@@@ d125 1 a125 1 @@@@ -615,7 +616,7 @@@@ d134 1 a134 1 @@@@ -625,7 +626,7 @@@@ d143 1 a143 1 @@@@ -636,12 +637,12 @@@@ d158 1 a158 1 @@@@ -681,13 +682,13 @@@@ d174 1 a174 1 @@@@ -720,8 +721,8 @@@@ d185 1 a185 1 @@@@ -749,7 +750,7 @@@@ @ 1.8 log @Kerberos IV support (cannot have both IV and V at the same time). Note that I reverted some LIBZ stuff in patch-ac that was (while correct) not necessary and conflicted with the Kerberos patch. I have not tested the combination of Kerberos IV and INET6 (yet). @ text @d1 1 a1 1 $NetBSD$ d106 1 a106 1 @@@@ -636,12 +637,13 @@@@ d111 1 a111 2 + /usr/bin/install -c -o root -g wheel -m 0644 \ + $(srcdir)/host_config.sample \ d117 1 a117 1 + /usr/bin/install -c -o root -g wheel -m 0644 /tmp/ssh_inst.$$$$ \ d121 1 a121 1 @@@@ -681,13 +683,13 @@@@ d137 1 a137 1 @@@@ -720,8 +722,8 @@@@ d148 1 a148 1 @@@@ -749,7 +751,7 @@@@ @ 1.7 log @Regenerate offset and fuzzy patches. @ text @d4 3 a6 2 +++ Makefile.in Sat Sep 18 17:00:27 1999 @@@@ -305,8 +305,10 @@@@ d9 7 a15 20 ZLIBDIR = zlib-1.0.4 -ZLIBDEP = $(ZLIBDIR)/libz.a -ZLIBLIBS = -L$(ZLIBDIR) -lz +ZLIBINCDIR = /usr/include +ZLIBLIBDIR = /usr/lib +ZLIBDEP = $(ZLIBINCDIR)/libz.a +ZLIBLIBS = -L$(ZLIBLIBDIR) -lz RSAREFDIR = rsaref2 RSAREFSRCDIR = $(RSAREFDIR)/source @@@@ -411,7 +413,7 @@@@ $(CC) -o rfc-pg rfc-pg.o .c.o: - $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $< + $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $< sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP) -rm -f sshd @@@@ -459,14 +461,14 @@@@ d38 1 a38 1 @@@@ -523,10 +525,10 @@@@ d52 1 a52 1 @@@@ -549,7 +551,7 @@@@ d61 1 a61 1 @@@@ -566,7 +568,7 @@@@ d70 1 a70 1 @@@@ -582,7 +584,7 @@@@ d79 1 a79 1 @@@@ -596,7 +598,7 @@@@ d88 1 a88 1 @@@@ -615,7 +617,7 @@@@ d97 1 a97 1 @@@@ -625,7 +627,7 @@@@ d106 1 a106 1 @@@@ -636,12 +638,13 @@@@ d122 1 a122 1 @@@@ -681,13 +684,13 @@@@ d138 1 a138 1 @@@@ -720,8 +723,8 @@@@ d149 1 a149 1 @@@@ -749,7 +752,7 @@@@ @ 1.6 log @Add NetBSD RCS Ids. @ text @d3 3 a5 3 --- Makefile.in.orig Wed Jul 8 18:40:39 1998 +++ Makefile.in Fri Jul 10 21:55:03 1998 @@@@ -298,8 +298,10 @@@@ d18 1 a18 1 @@@@ -404,7 +406,7 @@@@ d27 1 a27 1 @@@@ -452,14 +454,14 @@@@ d50 1 a50 1 @@@@ -516,10 +518,10 @@@@ d64 1 a64 1 @@@@ -542,7 +544,7 @@@@ d73 1 a73 1 @@@@ -559,7 +561,7 @@@@ d82 1 a82 1 @@@@ -575,7 +577,7 @@@@ d91 1 a91 1 @@@@ -589,7 +591,7 @@@@ d100 1 a100 1 @@@@ -608,7 +610,7 @@@@ d109 1 a109 1 @@@@ -618,7 +620,7 @@@@ d118 1 a118 1 @@@@ -629,12 +631,13 @@@@ d134 1 a134 1 @@@@ -674,13 +677,13 @@@@ d150 1 a150 1 @@@@ -713,8 +716,8 @@@@ d161 1 a161 1 @@@@ -742,7 +745,7 @@@@ @ 1.5 log @Update "ssh" package to 1.2.26. @ text @d1 2 @ 1.4 log @Update "ssh" to 1.2.23 on request by mrg. @ text @d1 3 a3 3 --- Makefile.in.orig Tue May 12 00:37:58 1998 +++ Makefile.in Sun May 24 14:06:29 1998 @@@@ -280,8 +280,10 @@@@ d16 1 a16 1 @@@@ -385,7 +387,7 @@@@ d25 1 a25 1 @@@@ -433,14 +435,14 @@@@ d48 1 a48 1 @@@@ -497,10 +499,10 @@@@ d55 4 a59 2 - -chmod 755 $(install_prefix)$(bindir)/ssh1.old + -chmod 555 $(install_prefix)$(bindir)/ssh1.old d62 1 a62 2 echo "Ssh version 2 program found, installation doesn't touch ssh link"; \ @@@@ -523,7 +525,7 @@@@ d71 1 a71 1 @@@@ -540,7 +542,7 @@@@ d80 1 a80 1 @@@@ -556,7 +558,7 @@@@ d89 1 a89 1 @@@@ -570,7 +572,7 @@@@ d98 1 a98 1 @@@@ -589,7 +591,7 @@@@ d107 1 a107 1 @@@@ -599,7 +601,7 @@@@ d116 1 a116 1 @@@@ -610,12 +612,13 @@@@ d132 1 a132 1 @@@@ -655,13 +658,13 @@@@ d148 1 a148 1 @@@@ -694,8 +697,8 @@@@ d159 1 a159 1 @@@@ -723,7 +726,7 @@@@ @ 1.3 log @add features/fixes from in pr#4928 @ text @d1 166 a166 287 Index: Makefile.in *** Makefile.in.orig Tue Jan 20 05:24:13 1998 --- Makefile.in Mon Jan 26 19:49:03 1998 *************** *** 266,273 **** GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a ZLIBDIR = zlib-1.0.4 ! ZLIBDEP = $(ZLIBDIR)/libz.a ! ZLIBLIBS = -L$(ZLIBDIR) -lz RSAREFDIR = rsaref2 RSAREFSRCDIR = $(RSAREFDIR)/source --- 266,275 ---- GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a ZLIBDIR = zlib-1.0.4 ! ZLIBINCDIR = /usr/include ! ZLIBLIBDIR = /usr/lib ! ZLIBDEP = $(ZLIBINCDIR)/libz.a ! ZLIBLIBS = -L$(ZLIBLIBDIR) -lz RSAREFDIR = rsaref2 RSAREFSRCDIR = $(RSAREFDIR)/source *************** *** 371,377 **** $(CC) -o rfc-pg rfc-pg.o .c.o: ! $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $< sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP) -rm -f sshd --- 373,379 ---- $(CC) -o rfc-pg rfc-pg.o .c.o: ! $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $< sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP) -rm -f sshd *************** *** 419,432 **** $(GMPDIR)/libgmp.a: cd $(GMPDIR); $(MAKE) ! $(ZLIBDEP): ! -if test '!' -d $(ZLIBDIR); then \ ! mkdir $(ZLIBDIR); \ ! cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \ ! fi ! cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \ ! CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \ ! -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a $(RSAREFSRCDIR)/librsaref.a: -if test '!' -d $(RSAREFDIR); then \ --- 421,434 ---- $(GMPDIR)/libgmp.a: cd $(GMPDIR); $(MAKE) ! #$(ZLIBDEP): ! # -if test '!' -d $(ZLIBDIR); then \ ! # mkdir $(ZLIBDIR); \ ! # cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \ ! # fi ! # cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \ ! # CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \ ! # -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a $(RSAREFSRCDIR)/librsaref.a: -if test '!' -d $(RSAREFDIR); then \ *************** *** 483,492 **** # (otherwise it can only log in as the user it runs as, and must be # bound to a non-privileged port). Also, password authentication may # not be available if non-root and using shadow passwords. ! install: $(PROGRAMS) make-dirs generate-host-key install-configs -rm -f $(install_prefix)$(bindir)/ssh.old -mv $(install_prefix)$(bindir)/ssh $(install_prefix)$(bindir)/ssh.old ! -chmod 755 $(install_prefix)$(bindir)/ssh.old $(INSTALL_PROGRAM) -o root -m $(SSH_INSTALL_MODE) ssh $(install_prefix)$(bindir)/ssh -if test "`echo ssh | sed '$(transform)'`" '!=' ssh; then \ rm -f $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; \ --- 485,494 ---- # (otherwise it can only log in as the user it runs as, and must be # bound to a non-privileged port). Also, password authentication may # not be available if non-root and using shadow passwords. ! install: $(PROGRAMS) make-dirs install-configs -rm -f $(install_prefix)$(bindir)/ssh.old -mv $(install_prefix)$(bindir)/ssh $(install_prefix)$(bindir)/ssh.old ! -chmod 555 $(install_prefix)$(bindir)/ssh.old $(INSTALL_PROGRAM) -o root -m $(SSH_INSTALL_MODE) ssh $(install_prefix)$(bindir)/ssh -if test "`echo ssh | sed '$(transform)'`" '!=' ssh; then \ rm -f $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; \ *************** *** 501,507 **** -for p in $(NORMAL_PROGRAMS) $(X_PROGRAMS) $(OTHER_PROGRAMS); do \ rm -f $(install_prefix)$(bindir)/$$p.old ; \ mv $(install_prefix)$(bindir)/$$p $(install_prefix)$(bindir)/$$p.old; \ ! $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(bindir)/$$p; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \ $(LN_S) $$p \ --- 503,509 ---- -for p in $(NORMAL_PROGRAMS) $(X_PROGRAMS) $(OTHER_PROGRAMS); do \ rm -f $(install_prefix)$(bindir)/$$p.old ; \ mv $(install_prefix)$(bindir)/$$p $(install_prefix)$(bindir)/$$p.old; \ ! $(INSTALL_PROGRAM) $$p $(install_prefix)$(bindir)/$$p; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \ $(LN_S) $$p \ *************** *** 511,517 **** rm -f $(install_prefix)$(bindir)/$$p.old ; \ mv $(install_prefix)$(bindir)/$$p $(install_prefix)$(bindir)/$$p.old; \ $(INSTALL_DATA) $$p $(install_prefix)$(bindir)/$$p; \ ! chmod 755 $(install_prefix)$(bindir)/$$p; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \ $(LN_S) $$p \ --- 513,519 ---- rm -f $(install_prefix)$(bindir)/$$p.old ; \ mv $(install_prefix)$(bindir)/$$p $(install_prefix)$(bindir)/$$p.old; \ $(INSTALL_DATA) $$p $(install_prefix)$(bindir)/$$p; \ ! chmod 555 $(install_prefix)$(bindir)/$$p; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \ $(LN_S) $$p \ *************** *** 520,533 **** -for p in $(SBIN_PROGRAMS); do \ rm -f $(install_prefix)$(sbindir)/$$p.old ; \ mv $(install_prefix)$(sbindir)/$$p $(install_prefix)$(sbindir)/$$p.old; \ ! $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(sbindir)/$$p; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`;\ $(LN_S) $$p \ $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; fi;\ done -for p in $(MAN1PAGES); do \ ! $(INSTALL_DATA) -m 0644 $(srcdir)/$$p $(install_prefix)$(man1dir)/$$p ; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\ $(LN_S) $$p \ --- 522,535 ---- -for p in $(SBIN_PROGRAMS); do \ rm -f $(install_prefix)$(sbindir)/$$p.old ; \ mv $(install_prefix)$(sbindir)/$$p $(install_prefix)$(sbindir)/$$p.old; \ ! $(INSTALL_PROGRAM) $$p $(install_prefix)$(sbindir)/$$p; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`;\ $(LN_S) $$p \ $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; fi;\ done -for p in $(MAN1PAGES); do \ ! $(INSTALL_DATA) $(srcdir)/$$p $(install_prefix)$(man1dir)/$$p ; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\ $(LN_S) $$p \ *************** *** 542,548 **** $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`; \ fi -for p in $(MAN1GENERATED); do \ ! $(INSTALL_DATA) -m 0644 $$p $(install_prefix)$(man1dir)/$$p ; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\ $(LN_S) $$p \ --- 544,550 ---- $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`; \ fi -for p in $(MAN1GENERATED); do \ ! $(INSTALL_DATA) $$p $(install_prefix)$(man1dir)/$$p ; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\ $(LN_S) $$p \ *************** *** 550,556 **** fi; \ done -for p in $(MAN8GENERATED); do \ ! $(INSTALL_DATA) -m 0644 $$p $(install_prefix)$(man8dir)/$$p; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`;\ $(LN_S) $$p \ --- 552,558 ---- fi; \ done -for p in $(MAN8GENERATED); do \ ! $(INSTALL_DATA) $$p $(install_prefix)$(man8dir)/$$p; \ if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ rm -f $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`;\ $(LN_S) $$p \ *************** *** 559,570 **** install-configs: -if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \ ! $(INSTALL_DATA) -m 0644 $(srcdir)/host_config.sample \ $(install_prefix)$(HOST_CONFIG_FILE); fi -if test '!' -f $(install_prefix)$(SERVER_CONFIG_FILE); then \ cat $(srcdir)/server_config.sample | \ sed "s#_ETCDIR_#$(etcdir)#g" >/tmp/ssh_inst.$$$$; \ ! $(INSTALL_DATA) -m 0644 /tmp/ssh_inst.$$$$ \ $(install_prefix)$(SERVER_CONFIG_FILE); \ rm -f /tmp/ssh_inst.$$$$; fi --- 561,573 ---- install-configs: -if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \ ! /usr/bin/install -c -o root -g wheel -m 0644 \ ! $(srcdir)/host_config.sample \ $(install_prefix)$(HOST_CONFIG_FILE); fi -if test '!' -f $(install_prefix)$(SERVER_CONFIG_FILE); then \ cat $(srcdir)/server_config.sample | \ sed "s#_ETCDIR_#$(etcdir)#g" >/tmp/ssh_inst.$$$$; \ ! /usr/bin/install -c -o root -g wheel -m 0644 /tmp/ssh_inst.$$$$ \ $(install_prefix)$(SERVER_CONFIG_FILE); \ rm -f /tmp/ssh_inst.$$$$; fi *************** *** 594,606 **** -rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg cd $(GMPDIR); $(MAKE) clean # cd $(RSAREFSRCDIR); rm -f *.o *.a ! cd $(ZLIBDIR); $(MAKE) clean distclean: clean -rm -f Makefile config.status config.cache config.log config.h -rm -f ssh.1 sshd.8 make-ssh-known-hosts.1 cd $(GMPDIR); $(MAKE) distclean ! cd $(ZLIBDIR); $(MAKE) distclean dist: dist-free --- 597,609 ---- -rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg cd $(GMPDIR); $(MAKE) clean # cd $(RSAREFSRCDIR); rm -f *.o *.a ! # cd $(ZLIBDIR); $(MAKE) clean distclean: clean -rm -f Makefile config.status config.cache config.log config.h -rm -f ssh.1 sshd.8 make-ssh-known-hosts.1 cd $(GMPDIR); $(MAKE) distclean ! # cd $(ZLIBDIR); $(MAKE) distclean dist: dist-free *************** *** 633,640 **** gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - ) # tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -) # cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a ! (cd $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -) ! cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS #ifdef F_SECURE_COMMERCIAL # --- 636,643 ---- gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - ) # tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -) # cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a ! # (cd $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -) ! # cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS #ifdef F_SECURE_COMMERCIAL # *************** *** 662,668 **** (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null depend: ! $(MAKEDEP) -I$(srcdir) -I. -I$(GMPDIR) -I$(ZLIBDIR) $(DEFS) $(SRCS) tags: -rm -f TAGS --- 665,671 ---- (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null depend: ! $(MAKEDEP) -I$(srcdir) -I. $(DEFS) $(SRCS) tags: -rm -f TAGS @ 1.2 log @remove unnecessary patches, own to me, etcir=/etc. @ text @d1 287 a287 93 Index: Makefile.inc --- Makefile.in.orig Fri Aug 22 01:28:42 1997 +++ Makefile.in Mon Nov 24 15:14:18 1997 @@@@ -263,8 +263,10 @@@@ GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a ZLIBDIR = zlib-1.0.4 -ZLIBDEP = $(ZLIBDIR)/libz.a -ZLIBLIBS = -L$(ZLIBDIR) -lz +ZLIBINCDIR = /usr/include +ZLIBLIBDIR = /usr/lib +ZLIBDEP = $(ZLIBINCDIR)/libz.a +ZLIBLIBS = -L$(ZLIBLIBDIR) -lz RSAREFDIR = rsaref2 RSAREFSRCDIR = $(RSAREFDIR)/source @@@@ -368,7 +370,7 @@@@ $(CC) -o rfc-pg rfc-pg.o .c.o: - $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $< + $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $< sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP) -rm -f sshd @@@@ -416,14 +418,14 @@@@ $(GMPDIR)/libgmp.a: cd $(GMPDIR); $(MAKE) -$(ZLIBDEP): - -if test '!' -d $(ZLIBDIR); then \ - mkdir $(ZLIBDIR); \ - cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \ - fi - cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \ - CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \ - -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a +#$(ZLIBDEP): +# -if test '!' -d $(ZLIBDIR); then \ +# mkdir $(ZLIBDIR); \ +# cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \ +# fi +# cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \ +# CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \ +# -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a $(RSAREFSRCDIR)/librsaref.a: -if test '!' -d $(RSAREFDIR); then \ @@@@ -480,7 +482,7 @@@@ # (otherwise it can only log in as the user it runs as, and must be # bound to a non-privileged port). Also, password authentication may # not be available if non-root and using shadow passwords. -install: $(PROGRAMS) make-dirs generate-host-key install-configs +install: $(PROGRAMS) make-dirs install-configs -rm -f $(install_prefix)$(bindir)/ssh.old -mv $(install_prefix)$(bindir)/ssh $(install_prefix)$(bindir)/ssh.old -chmod 755 $(install_prefix)$(bindir)/ssh.old @@@@ -591,13 +593,13 @@@@ -rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg cd $(GMPDIR); $(MAKE) clean # cd $(RSAREFSRCDIR); rm -f *.o *.a - cd $(ZLIBDIR); $(MAKE) clean +# cd $(ZLIBDIR); $(MAKE) clean distclean: clean -rm -f Makefile config.status config.cache config.log config.h -rm -f ssh.1 sshd.8 make-ssh-known-hosts.1 cd $(GMPDIR); $(MAKE) distclean - cd $(ZLIBDIR); $(MAKE) distclean +# cd $(ZLIBDIR); $(MAKE) distclean dist: dist-free @@@@ -632,8 +634,8 @@@@ gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - ) # tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -) # cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a - (cd $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -) - cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS +# (cd $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -) +# cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS dist-free-make-tar: tar pcf $(DISTNAME).tar $(DISTNAME) @@@@ -656,7 +658,7 @@@@ (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null depend: - $(MAKEDEP) -I$(srcdir) -I. -I$(GMPDIR) -I$(ZLIBDIR) $(DEFS) $(SRCS) + $(MAKEDEP) -I$(srcdir) -I. $(DEFS) $(SRCS) tags: -rm -f TAGS @ 1.1 log @Initial revision @ text @d1 1 @ 1.1.1.1 log @Secure Shell package; Originally taken from FreeBSD, hacked by agc and finished by me. @ text @@