summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-25 15:21:10 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-25 15:21:10 +0000
commit33c83a454f9c0c4104f6caf1f4a65ec6b9838ee5 (patch)
tree67855aa23053363c1c8ca1e30c3348c31fdc9774 /net-misc/openssh
parentUse bindnow-flags function instead of -Wl,-z,now. Also change the name of the... (diff)
downloadhistorical-33c83a454f9c0c4104f6caf1f4a65ec6b9838ee5.tar.gz
historical-33c83a454f9c0c4104f6caf1f4a65ec6b9838ee5.tar.bz2
historical-33c83a454f9c0c4104f6caf1f4a65ec6b9838ee5.zip
Use bindnow-flags function instead of -Wl,-z,now.
Package-Manager: portage-2.1_pre2
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog5
-rw-r--r--net-misc/openssh/Manifest10
-rw-r--r--net-misc/openssh/openssh-4.2_p1.ebuild4
3 files changed, 16 insertions, 3 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 0439f5ec26a2..57dc05752ce0 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.142 2005/12/10 02:41:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.143 2005/12/25 15:21:10 flameeyes Exp $
+
+ 25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> openssh-4.2_p1.ebuild:
+ Use bindnow-flags function instead of -Wl,-z,now.
10 Dec 2005; Mike Frysinger <vapier@gentoo.org> files/sshd.rc6:
Update init.d script to allow for multiple instances by Marius Mauch #114996.
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index ae6befc03739..f23bb7de8e43 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
MD5 ec01228f6a479f9deda35f218ed3a840 ChangeLog 23641
MD5 2fc26aef45c8705e6da5e3fe6650af47 files/digest-openssh-3.8.1_p1-r1 219
MD5 1c2b632d1118068966049ae41b33c012 files/digest-openssh-3.9_p1-r3 281
@@ -43,3 +46,10 @@ MD5 007223c0520d91c52557714c4bc6b0ca openssh-3.9_p1-r3.ebuild 5010
MD5 f57b335cd90d3ec4233a98c6617dce3b openssh-4.0_p1-r2.ebuild 5362
MD5 6a8c34205a609252e4811a9ff5fbb8bf openssh-4.1_p1-r1.ebuild 5323
MD5 89c6d6b39b132960a3874f09ef9db435 openssh-4.2_p1.ebuild 5287
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDrrjxAiZjviIA2XgRAlzJAKDI3TyV/ZpfZDqaXr6l1/3LKxW1yQCfbkEG
+oS7Wh8ouwCIH0hUYidiczqI=
+=OQhr
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/openssh-4.2_p1.ebuild b/net-misc/openssh/openssh-4.2_p1.ebuild
index 6fd13c5e8325..2c92aad7b54e 100644
--- a/net-misc/openssh/openssh-4.2_p1.ebuild
+++ b/net-misc/openssh/openssh-4.2_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1.ebuild,v 1.14 2005/10/30 05:48:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.2_p1.ebuild,v 1.15 2005/12/25 15:21:10 flameeyes Exp $
inherit eutils flag-o-matic ccc pam
@@ -74,7 +74,7 @@ src_unpack() {
fi
[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
- sed -i '/LD.*ssh-keysign/s:$: -Wl,-z,now:' Makefile.in || die "setuid"
+ sed -i '/LD.*ssh-keysign/s:$: '$(bindnow-flags)':' Makefile.in || die "setuid"
autoconf || die "autoconf failed"
}