diff options
Diffstat (limited to 'security/ssh/files/patch-ac')
| -rw-r--r-- | security/ssh/files/patch-ac | 107 |
1 files changed, 26 insertions, 81 deletions
diff --git a/security/ssh/files/patch-ac b/security/ssh/files/patch-ac index 29bdcba285ff..02fc5eae34fd 100644 --- a/security/ssh/files/patch-ac +++ b/security/ssh/files/patch-ac @@ -1,70 +1,52 @@ ---- Makefile.in.orig Wed May 12 14:19:31 1999 -+++ Makefile.in Fri Apr 26 09:19:30 2002 -@@ -301,12 +301,17 @@ +--- Makefile.in.orig Mon Jul 3 10:07:39 2000 ++++ Makefile.in Fri Jun 21 17:50:07 2002 +@@ -307,13 +307,15 @@ + SHELL = /bin/sh - GMPDIR = gmp-2.0.2-ssh-2 --GMPLIBS = -L$(GMPDIR) -lgmp +-GMPDIR = gmp-2.0.2-ssh-2 +-GMPLIBS = @ssh_gmp_ldadd_options@ -GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a -+# We have the same libgmp in the system, so use it instead ++# We have the same libgmp in the base system, so use it instead +GMPINCDIR ?= /usr/include +GMPLIBDIR ?= /usr/lib +GMPLIBS = -L$(GMPLIBDIR) -lgmp +GMPDEP = $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/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 +-ZLIBDIR = zlib-1.0.4 ++ZLIBDIR = /usr/lib + ZLIBDEP = $(ZLIBDIR)/libz.a +-ZLIBLIBS = @ssh_zlib_ldadd_options@ +ZLIBLIBS = -lz RSAREFDIR = rsaref2 RSAREFSRCDIR = $(RSAREFDIR)/source -@@ -411,7 +416,7 @@ +@@ -418,7 +420,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$(GMPINCDIR) -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) $< ++ $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) $(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 -@@ -454,19 +459,19 @@ +@@ -461,12 +463,12 @@ sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts chmod +x make-ssh-known-hosts -GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \ -- mpz_mul.c mpz_cmp.c mpz_sqrtrem.c ++XXX_DONT_GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \ + mpz_mul.c mpz_cmp.c mpz_sqrtrem.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 -+#GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \ -+# mpz_mul.c mpz_cmp.c mpz_sqrtrem.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 ++XXX_DONT_$(GMPDIR)/libgmp.a: + cd $(GMPDIR); $(MAKE) - $(RSAREFSRCDIR)/librsaref.a: - -if test '!' -d $(RSAREFDIR); then \ -@@ -523,7 +528,7 @@ +-$(ZLIBDEP): ++XXX_DONT_$(ZLIBDEP): + -if test '!' -d $(ZLIBDIR); then \ + mkdir $(ZLIBDIR); \ + cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \ +@@ -530,7 +532,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. @@ -73,49 +55,12 @@ -rm -f $(install_prefix)$(bindir)/ssh1.old -chmod 755 $(install_prefix)$(bindir)/ssh1 -chmod 755 $(install_prefix)$(bindir)/ssh -@@ -679,15 +684,15 @@ - - clean: - -rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg -- cd $(GMPDIR); $(MAKE) clean -+# 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 $(GMPDIR); $(MAKE) distclean -+# cd $(ZLIBDIR); $(MAKE) distclean - - dist: dist-free - -@@ -716,12 +721,12 @@ - -mkdir $(DISTNAME) - cp $(DISTFILES) $(DISTNAME) - for i in $(DISTSRCS); do cp $(srcdir)/$$i $(DISTNAME); done -- (cd $(GMPDIR); make dist) -- gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - ) -+# (cd $(GMPDIR); make dist) -+# 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 +754,7 @@ +@@ -756,7 +758,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) ++ $(MAKEDEP) -I$(srcdir) -I. -I$(GMPINCDIR) $(DEFS) $(SRCS) tags: -rm -f TAGS |