Set default sftp path to point to the openssh binary #159894 by Lars Weiler.

Package-Manager: portage-2.1.2_rc4-r5

diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 3534833a5f7389367cd52bbd98757264d87e397a..af27eaf2563f44834a739bf76b712548f2d9c660 100644 (file)
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/dropbear
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.41 2006/08/05 20:50:25 chriswhite Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.42 2007/01/04 06:06:09 vapier Exp $
+
+  04 Jan 2007; Mike Frysinger <vapier@gentoo.org> dropbear-0.48.1.ebuild:
+  Set default sftp path to point to the openssh binary #159894 by Lars Weiler.
 
   05 Aug 2006; Chris White <chriswhite@gentoo.org> metadata.xml:
   metadata.xml translation by Yoshino-san in bug #135034

diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 9ffb47d5793e388f6e1444c5cd80a40b1808d4b8..2eeca650ab179750b2e3d73524a9b858fd8aac92 100644 (file)
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -21,34 +21,34 @@ AUX dropbear.init.d 913 RMD160 be9cd23f061b0773966812b7f48552253c312d35 SHA1 86c
 MD5 34fea1c967596ebcd6d10d38444f2b92 files/dropbear.init.d 913
 RMD160 be9cd23f061b0773966812b7f48552253c312d35 files/dropbear.init.d 913
 SHA256 b115e922fa679adca29e24464dd7ffb1a21a0962333d7822a11e0bcea29ea5ed files/dropbear.init.d 913
-DIST dropbear-0.47.tar.bz2 1418374
+DIST dropbear-0.47.tar.bz2 1418374 RMD160 d36aace7586e76bf21c4b62a090147cebaf85b12 SHA1 7a46a02f489b66cbf4c6383328ba22527a9d3109 SHA256 8888cf99c10936401b4f47a0d20018f1a006b05d09b2ff5f9d74e6303f9f92a8
 DIST dropbear-0.48.1.tar.gz 1473114 RMD160 055740e5978f91ca34d318e6a6f8052d182e8d7c SHA1 4dd349b5e3c1aa1b627c52a27f17f5eb7e85c146 SHA256 fa6c3567e293fa0aa249db695b9d5e43ef3f8c11bab74a9b42acc9a0a5c96742
 EBUILD dropbear-0.47-r1.ebuild 2104 RMD160 b37f29152ab5ac756322f300883d941cf66c0f84 SHA1 6b4405aa9e4da209afc759c1e483f08d26fc5c9a SHA256 8995a1e3e60702d6e53bfa3517420a24236652e29e0c254274677aba6764a4b8
 MD5 4d31f11ea8628646cbf69f9ab96fbea7 dropbear-0.47-r1.ebuild 2104
 RMD160 b37f29152ab5ac756322f300883d941cf66c0f84 dropbear-0.47-r1.ebuild 2104
 SHA256 8995a1e3e60702d6e53bfa3517420a24236652e29e0c254274677aba6764a4b8 dropbear-0.47-r1.ebuild 2104
-EBUILD dropbear-0.48.1.ebuild 2065 RMD160 8fbbd68507b7f75a9c186b54bffca82056bfed2e SHA1 98d08468caf05b7861846ff5492e31a2424cf90f SHA256 290d9845f3d5ba3f05570e7d6b01211d2a011ad182048f292e18106978f94f26
-MD5 f71b89f16bd993553d53965c4d5a2399 dropbear-0.48.1.ebuild 2065
-RMD160 8fbbd68507b7f75a9c186b54bffca82056bfed2e dropbear-0.48.1.ebuild 2065
-SHA256 290d9845f3d5ba3f05570e7d6b01211d2a011ad182048f292e18106978f94f26 dropbear-0.48.1.ebuild 2065
-MISC ChangeLog 5294 RMD160 cf21e13fd98a214c566692643bfa4f286c3c83bd SHA1 cd6f41e67abc47fb397dd9996c8282ecb46d2b10 SHA256 82de678b0b178e362be151d98d8d5eec4045c576c156bb4511d3d55074c8598f
-MD5 a3f7a052127820df623029474d80d0b0 ChangeLog 5294
-RMD160 cf21e13fd98a214c566692643bfa4f286c3c83bd ChangeLog 5294
-SHA256 82de678b0b178e362be151d98d8d5eec4045c576c156bb4511d3d55074c8598f ChangeLog 5294
+EBUILD dropbear-0.48.1.ebuild 2149 RMD160 3d68051b63fc2176ebe61d534be5495f2ce64b2b SHA1 12f9709aee1a96d6630278571ba0ea818593b2d0 SHA256 5d359a3ed70c549b59b81713b528e01a091411a1febb5e5c550307032ced3a26
+MD5 c3c6805039de712159ad4d79636f9734 dropbear-0.48.1.ebuild 2149
+RMD160 3d68051b63fc2176ebe61d534be5495f2ce64b2b dropbear-0.48.1.ebuild 2149
+SHA256 5d359a3ed70c549b59b81713b528e01a091411a1febb5e5c550307032ced3a26 dropbear-0.48.1.ebuild 2149
+MISC ChangeLog 5444 RMD160 e2e31b29c7d6cdd2afa51dcf814eccd0691622f0 SHA1 d6136f80f01a255d9c6ebdd8f668a617649265b7 SHA256 b04c1ab9446b641c914165657af26cf475faec01549cdae8c55795fbe70a2b01
+MD5 84c9c7cd472b44f3f4d6583baeb92004 ChangeLog 5444
+RMD160 e2e31b29c7d6cdd2afa51dcf814eccd0691622f0 ChangeLog 5444
+SHA256 b04c1ab9446b641c914165657af26cf475faec01549cdae8c55795fbe70a2b01 ChangeLog 5444
 MISC metadata.xml 1308 RMD160 3d63dd1fc0665e92bd4b0c52cc51973db3804adc SHA1 1dbbfd8727a6d8cd473be149284814aa65d65f9f SHA256 6f654db31c4e6b1d326b9d5384cd9f5bb170bdb742d54ab15a0229238c8a3aa1
 MD5 a3d6e6bdd4ebf16f2f36f4f487a37518 metadata.xml 1308
 RMD160 3d63dd1fc0665e92bd4b0c52cc51973db3804adc metadata.xml 1308
 SHA256 6f654db31c4e6b1d326b9d5384cd9f5bb170bdb742d54ab15a0229238c8a3aa1 metadata.xml 1308
-MD5 9d60e23c082173af1e4294b2c914c7d5 files/digest-dropbear-0.47-r1 67
-RMD160 0a875b6068534244bb48ebbbde0f3e654d46a081 files/digest-dropbear-0.47-r1 67
-SHA256 c3bdefd1f503b70f464ecab1c455313f607c9543ad6c6840ec7f5e31a58179b9 files/digest-dropbear-0.47-r1 67
+MD5 8b844f334e4afb9bf318e49b4941fa30 files/digest-dropbear-0.47-r1 247
+RMD160 7fd1de9e31cc2d40de4be1b3503e55eaebd3b261 files/digest-dropbear-0.47-r1 247
+SHA256 cbd597dd4802c0fbc4da501e036afb1bbd09630b6e37d33c23a05302f4783786 files/digest-dropbear-0.47-r1 247
 MD5 05a19958312c0eed46835f4271b6a358 files/digest-dropbear-0.48.1 250
 RMD160 815a00f515e5d79af772a535b37733e6617edc47 files/digest-dropbear-0.48.1 250
 SHA256 59c68d33551a8c07420eef53fc9e676c1876ca0a8e36515c1d03063c7f898357 files/digest-dropbear-0.48.1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFE0/lLFdQwWVoAgN4RAtdzAKDfGJncscJsVO3zoZ+IvgHKrXYd9QCgsvTx
-L57A231KWxHon61VmQEKNhA=
-=6CEW
+iD8DBQFFnJmm8bi6rjpTunYRAphBAJ9zhTD/zGPIHCR5Ys3dOhIe6lOXmgCgijyC
+HlxZCwwGy9iH8NzSUJqAaeQ=
+=FHAS
 -----END PGP SIGNATURE-----

diff --git a/net-misc/dropbear/dropbear-0.48.1.ebuild b/net-misc/dropbear/dropbear-0.48.1.ebuild
index 2c6d7921f08027891dbd64de4bfff32a03096fbb..ab8cd57ef45f587a1d251073990bd184f49df908 100644 (file)
--- a/net-misc/dropbear/dropbear-0.48.1.ebuild
+++ b/net-misc/dropbear/dropbear-0.48.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.48.1.ebuild,v 1.1 2006/06/07 13:07:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.48.1.ebuild,v 1.2 2007/01/04 06:06:09 vapier Exp $
 
 inherit eutils
 
@@ -38,6 +38,9 @@ src_unpack() {
        cd "${S}"
        epatch "${FILESDIR}"/dropbear-0.45-urandom.patch
        epatch "${FILESDIR}"/dropbear-0.46-dbscp.patch
+       sed -i \
+               -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+               options.h
 }
 
 src_compile() {

diff --git a/net-misc/dropbear/files/digest-dropbear-0.47-r1 b/net-misc/dropbear/files/digest-dropbear-0.47-r1
index 981333b6a4505076acfa91726b6c9d557b953a2d..c4f853da552f40955ef8f57151bfe9b179792e4e 100644 (file)
--- a/net-misc/dropbear/files/digest-dropbear-0.47-r1
+++ b/net-misc/dropbear/files/digest-dropbear-0.47-r1
@@ -1 +1,3 @@
 MD5 cf634614d52278d44dfd9c224a438bf2 dropbear-0.47.tar.bz2 1418374
+RMD160 d36aace7586e76bf21c4b62a090147cebaf85b12 dropbear-0.47.tar.bz2 1418374
+SHA256 8888cf99c10936401b4f47a0d20018f1a006b05d09b2ff5f9d74e6303f9f92a8 dropbear-0.47.tar.bz2 1418374