diff options
author | cjep <cjep> | 2003-01-03 20:10:45 +0000 |
---|---|---|
committer | cjep <cjep> | 2003-01-03 20:10:45 +0000 |
commit | 232bba6b48df2773e798aea56776acbee4eb840c (patch) | |
tree | 3bf68602b450debb5ccdd72bd2e7206cb6331cb5 /security/ssh | |
parent | ca8f4c1ee5c5fe2acd97c1b46964a89830acf62a (diff) | |
download | pkgsrc-232bba6b48df2773e798aea56776acbee4eb840c.tar.gz |
Pass -Wl,-R${X11BASE}/lib to cc to build ssh-askpass (instead of just -R)
Diffstat (limited to 'security/ssh')
-rw-r--r-- | security/ssh/distinfo | 4 | ||||
-rw-r--r-- | security/ssh/patches/patch-ac | 44 |
2 files changed, 24 insertions, 24 deletions
diff --git a/security/ssh/distinfo b/security/ssh/distinfo index 66c3f5c0d14..ecb85d490d0 100644 --- a/security/ssh/distinfo +++ b/security/ssh/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.5 2002/08/07 13:27:51 agc Exp $ +$NetBSD: distinfo,v 1.6 2003/01/03 20:10:45 cjep Exp $ SHA1 (ssh-1.2.27.tar.gz) = 0e7d59c6a62b094bd51818599ae24f7de3462d14 Size (ssh-1.2.27.tar.gz) = 1022546 bytes SHA1 (patch-aa) = 6cf6e5043e1cd230064b73620ce7c86bf5673649 SHA1 (patch-ab) = 24f370975088dd33551df39ebc1e5cc204c5d7cb -SHA1 (patch-ac) = ab483a57f0dac564c046f4ec534c247c8dbec136 +SHA1 (patch-ac) = d2fb5f37b59e34b98d2c81f96cffbb29fa57bbe2 SHA1 (patch-ad) = 0fac0e4586db5257ea10dfba2e14f7f35c6bed49 SHA1 (patch-ae) = 559327d78036cd956443a739f3f0f52430dd9b2f SHA1 (patch-af) = 8a3246a9bd1520a4b8ad74584ee1c68b3ed671d3 diff --git a/security/ssh/patches/patch-ac b/security/ssh/patches/patch-ac index 687df517d47..d670f0be906 100644 --- a/security/ssh/patches/patch-ac +++ b/security/ssh/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ +$NetBSD: patch-ac,v 1.13 2003/01/03 20:10:46 cjep Exp $ ---- Makefile.in- Wed May 12 20:19:31 1999 -+++ Makefile.in Mon Mar 20 09:41:02 2000 -@@ -264,7 +264,7 @@ +--- Makefile.in.orig Wed May 12 12:19:31 1999 ++++ Makefile.in +@@ -264,7 +264,7 @@ CC = @CC@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ DEFS = @DEFS@ $(COMMERCIAL) @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ LIBOBJS = @LIBOBJS@ CONFOBJS = @CONFOBJS@ SSHCONFOBJS = @SSHCONFOBJS@ -@@ -285,6 +285,9 @@ +@@ -285,6 +285,9 @@ KERBEROS_INCS = @KERBEROS_INCS@ KERBEROS_LIBS = @KERBEROS_LIBS@ KERBEROS_OBJS = @KERBEROS_OBJS@ @@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ RSAREFDEP = @RSAREFDEP@ WRAPLIBS = @WRAPLIBS@ -@@ -304,7 +307,8 @@ +@@ -304,7 +307,8 @@ GMPDIR = gmp-2.0.2-ssh-2 GMPLIBS = -L$(GMPDIR) -lgmp GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a @@ -31,16 +31,16 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ ZLIBDEP = $(ZLIBDIR)/libz.a ZLIBLIBS = -L$(ZLIBDIR) -lz -@@ -314,7 +318,7 @@ +@@ -314,7 +318,7 @@ RSAREFSRCDIR = $(RSAREFDIR)/source X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -+X_EXTRA_LIBS = @X_EXTRA_LIBS@ -R$(X11BASE)/lib ++X_EXTRA_LIBS = @X_EXTRA_LIBS@ -Wl,-R$(X11BASE)/lib XLIBS = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(LIBS) -@@ -322,7 +326,7 @@ +@@ -322,7 +326,7 @@ 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 \ @@ -49,7 +49,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ 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 @@ +@@ -411,7 +415,7 @@ rfc-pg: rfc-pg.o $(CC) -o rfc-pg rfc-pg.o .c.o: @@ -58,7 +58,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP) -rm -f sshd -@@ -459,14 +463,14 @@ +@@ -459,14 +463,14 @@ GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c $(GMPDIR)/libgmp.a: cd $(GMPDIR); $(MAKE) @@ -81,7 +81,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ $(RSAREFSRCDIR)/librsaref.a: -if test '!' -d $(RSAREFDIR); then \ -@@ -523,10 +527,10 @@ +@@ -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. @@ -95,7 +95,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ -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 @@ +@@ -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; \ @@ -104,7 +104,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ 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 @@ +@@ -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; \ @@ -113,7 +113,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ 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 @@ +@@ -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; \ @@ -122,7 +122,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ 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 @@ +@@ -596,7 +600,7 @@ install: $(PROGRAMS) make-dirs generate- $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; fi;\ done -for p in $(MAN1PAGES); do \ @@ -131,7 +131,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ 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 @@ +@@ -615,7 +619,7 @@ install: $(PROGRAMS) make-dirs generate- $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`; \ fi -for p in $(MAN1GENERATED); do \ @@ -140,7 +140,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ 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 @@ +@@ -625,7 +629,7 @@ install: $(PROGRAMS) make-dirs generate- fi; \ done -for p in $(MAN8GENERATED); do \ @@ -149,7 +149,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ 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 @@ +@@ -636,12 +640,12 @@ install: $(PROGRAMS) make-dirs generate- install-configs: -if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \ @@ -164,7 +164,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ $(install_prefix)$(SERVER_CONFIG_FILE); \ rm -f /tmp/ssh_inst.$$$$; fi -@@ -681,13 +685,13 @@ +@@ -681,13 +685,13 @@ clean: -rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg cd $(GMPDIR); $(MAKE) clean # cd $(RSAREFSRCDIR); rm -f *.o *.a @@ -180,7 +180,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ dist: dist-free -@@ -720,8 +724,8 @@ +@@ -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 @@ -191,7 +191,7 @@ $NetBSD: patch-ac,v 1.12 2000/03/20 02:25:49 itojun Exp $ #ifdef F_SECURE_COMMERCIAL # -@@ -749,7 +753,7 @@ +@@ -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: |