diff options
| author | grant <grant> | 2004-02-21 13:55:01 +0000 |
|---|---|---|
| committer | grant <grant> | 2004-02-21 13:55:01 +0000 |
| commit | 197897035f669f3fd472ae3125a7895631506b00 (patch) | |
| tree | 2dd222ce355a8d53233168f06c4a320aa84622f2 | |
| parent | b55e4286d41efb4fc8e706a736556bc7c58de5ff (diff) | |
| download | pkgsrc-197897035f669f3fd472ae3125a7895631506b00.tar.gz | |
replace inappropriate use of _OPSYS_RPATH_NAME with RPATH_FLAG and
make sure that this argument precedes -lX11.
| -rw-r--r-- | security/ssh/Makefile | 5 | ||||
| -rw-r--r-- | security/ssh/distinfo | 4 | ||||
| -rw-r--r-- | security/ssh/patches/patch-ac | 16 |
3 files changed, 12 insertions, 13 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile index b08dd0ad558..4e3d1d4edba 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.108 2004/02/21 06:30:05 xtraeme Exp $ +# $NetBSD: Makefile,v 1.109 2004/02/21 13:55:01 grant Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -35,7 +35,8 @@ GNU_CONFIGURE= YES SSH_CONF_DIR= ${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-etcdir=${SSH_CONF_DIR} -MAKE_FLAGS+= _OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME} +X_LDFLAGS= -Wl,${RPATH_FLAG}${X11BASE}/lib +MAKE_ENV+= X_LDFLAGS="${X_LDFLAGS}" .if ${OPSYS} == "NetBSD" CONFIGURE_ARGS+= --with-libwrap diff --git a/security/ssh/distinfo b/security/ssh/distinfo index 9bd5f49d366..628cbc260b4 100644 --- a/security/ssh/distinfo +++ b/security/ssh/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.7 2003/01/04 11:51:30 cjep Exp $ +$NetBSD: distinfo,v 1.8 2004/02/21 13:55:01 grant 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) = 8ec0adaae86c690166dd87b779b8af509664df0e +SHA1 (patch-ac) = 87d3e930e32f820e9dd3fc497468c30249dbcda4 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 dd34c72efd8..9d4fed60dda 100644 --- a/security/ssh/patches/patch-ac +++ b/security/ssh/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.14 2003/01/04 11:51:30 cjep Exp $ +$NetBSD: patch-ac,v 1.15 2004/02/21 13:55:01 grant Exp $ ---- Makefile.in.orig Wed May 12 12:19:31 1999 +--- Makefile.in.orig 1999-05-12 21:19:31.000000000 +1000 +++ Makefile.in @@ -264,7 +264,7 @@ CC = @CC@ CFLAGS = @CFLAGS@ @@ -31,16 +31,14 @@ $NetBSD: patch-ac,v 1.14 2003/01/04 11:51:30 cjep Exp $ ZLIBDEP = $(ZLIBDIR)/libz.a ZLIBLIBS = -L$(ZLIBDIR) -lz -@@ -314,7 +318,7 @@ RSAREFSRCDIR = $(RSAREFDIR)/source - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ +@@ -316,13 +320,13 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ -+X_EXTRA_LIBS = @X_EXTRA_LIBS@ -Wl,$(_OPSYS_RPATH_NAME)$(X11BASE)/lib + X_EXTRA_LIBS = @X_EXTRA_LIBS@ - XLIBS = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(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) -@@ -322,7 +326,7 @@ COMMON_OBJS = $(LIBOBJS) $(CONFOBJS) \ + 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 \ |