| 1 |
commit: e49aa71844018901ffc7a641855693742ac5fa96 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 27 07:42:16 2016 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 27 07:42:16 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e49aa718 |
| 7 |
|
| 8 |
net-libs/libssh: Store patch locally instead of hot-linking. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
net-libs/libssh/Manifest | 1 - |
| 13 |
.../libssh/files/libssh-0.6.5-compilefix.patch | 29 ++++++++++++++++++++++ |
| 14 |
net-libs/libssh/libssh-0.6.5.ebuild | 5 ++-- |
| 15 |
3 files changed, 31 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest |
| 18 |
index a35a89f..c94a38d 100644 |
| 19 |
--- a/net-libs/libssh/Manifest |
| 20 |
+++ b/net-libs/libssh/Manifest |
| 21 |
@@ -1,4 +1,3 @@ |
| 22 |
-DIST libssh-0.6.5-compilefix.patch 737 SHA256 952c6a617791c35fe8d44a47d1252aebd2d844f40480170b14391c80f2092fff SHA512 fa9d8322778ca93b6ae62e0012722a2df94179891f5bafefc67a7502f4bc96ec86768e07f374f37486641614298472227eb48aa5747dabf840636e9f1ce9cbde WHIRLPOOL 575bca37a3dbe892e44b362c02f370cc13f94ef2706c435a9d3e2604941cece285637dd6831c27337ab5fc76c4e8588092f106e2ea963dc15d46129cecd1f2cb |
| 23 |
DIST libssh-0.6.5.tar.xz 281564 SHA256 0fd52763e033d5e9b1cd55f60a74e619731c5ba630938eec95682dbe4cf7dc2c SHA512 55d614ff311a29a20b93094ac1dd16a2ad1345368b874a0e385f0c235e8defde8816948ab04eab68ade477a0a6901b317c7884df1ba3078cf12db89dfc4169cc WHIRLPOOL 9801eee45a178306b0645d75c268df381d206a8c566695d8b6c228ea7f5638a313bdbdf990ad7bd299c24d280595007b44fd16449ee3a0643b6e2084bb148d09 |
| 24 |
DIST libssh-0.7.2.tar.xz 350540 SHA256 a32c45b9674141cab4bde84ded7d53e931076c6b0f10b8fd627f3584faebae62 SHA512 9cb15254478e2522e736688052e0862c856e2c1321d090c9b9d9562504fcb59cee344c07576eeee9c6d0ac5ead137d9ff05216d973c457c6a17ffa9fba475f5a WHIRLPOOL bf878264b900bfbbfe76f08d1c22e5ca2f1300024fc561841ed3fbef374ceab7a08ba0211c093d90d7e4047a896cce9f73e78268300362beaec194025eda1ed8 |
| 25 |
DIST libssh-0.7.3.tar.xz 350464 SHA256 26ef46be555da21112c01e4b9f5e3abba9194485c8822ab55ba3d6496222af98 SHA512 6797ea9492c9d07e0169163e6559a7880dd368ee763eff297b3cbddda5e892703cf32506f9513e7d9b5135984e1e888c4893b342df07da1b7ee30968c9185869 WHIRLPOOL f22c3f4ef8c3cbf4e93c5603224ae4d0f598639a471bc002c0917243c487e1de61a79db09308bcb570791cd1ab3b95f43d44f92652a7f0ec596d552cab0031c5 |
| 26 |
|
| 27 |
diff --git a/net-libs/libssh/files/libssh-0.6.5-compilefix.patch b/net-libs/libssh/files/libssh-0.6.5-compilefix.patch |
| 28 |
new file mode 100644 |
| 29 |
index 0000000..658c159 |
| 30 |
--- /dev/null |
| 31 |
+++ b/net-libs/libssh/files/libssh-0.6.5-compilefix.patch |
| 32 |
@@ -0,0 +1,29 @@ |
| 33 |
+From 6e0dee7845cea22f59bd353ef42b31cb67170030 Mon Sep 17 00:00:00 2001 |
| 34 |
+From: Andreas Schneider <asn@××××××××××.org> |
| 35 |
+Date: Thu, 2 Apr 2015 15:02:29 +0200 |
| 36 |
+Subject: poll: Fix compilation with struct ssh_timestamp |
| 37 |
+ |
| 38 |
+Signed-off-by: Andreas Schneider <asn@××××××××××.org> |
| 39 |
+(cherry picked from commit e0a73d3dbe909f8e2cb486ed344e5beb8148032e) |
| 40 |
+--- |
| 41 |
+ src/poll.c | 2 +- |
| 42 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 43 |
+ |
| 44 |
+diff --git a/src/poll.c b/src/poll.c |
| 45 |
+index dfa687a..05faba7 100644 |
| 46 |
+--- a/src/poll.c |
| 47 |
++++ b/src/poll.c |
| 48 |
+@@ -35,9 +35,9 @@ |
| 49 |
+ #include "libssh/poll.h" |
| 50 |
+ #include "libssh/socket.h" |
| 51 |
+ #include "libssh/session.h" |
| 52 |
++#include "libssh/misc.h" |
| 53 |
+ #ifdef WITH_SERVER |
| 54 |
+ #include "libssh/server.h" |
| 55 |
+-#include "libssh/misc.h" |
| 56 |
+ #endif |
| 57 |
+ |
| 58 |
+ |
| 59 |
+-- |
| 60 |
+cgit v0.12 |
| 61 |
+ |
| 62 |
|
| 63 |
diff --git a/net-libs/libssh/libssh-0.6.5.ebuild b/net-libs/libssh/libssh-0.6.5.ebuild |
| 64 |
index 46cce2b..30b9ff4 100644 |
| 65 |
--- a/net-libs/libssh/libssh-0.6.5.ebuild |
| 66 |
+++ b/net-libs/libssh/libssh-0.6.5.ebuild |
| 67 |
@@ -9,8 +9,7 @@ inherit eutils cmake-multilib multilib |
| 68 |
|
| 69 |
DESCRIPTION="Access a working SSH implementation by means of a library" |
| 70 |
HOMEPAGE="http://www.libssh.org/" |
| 71 |
-SRC_URI="https://red.libssh.org/attachments/download/121/${MY_P}.tar.xz -> ${P}.tar.xz |
| 72 |
- https://git.libssh.org/projects/libssh.git/patch/?id=6e0dee7845cea22f59bd353ef42b31cb67170030 -> ${PN}-0.6.5-compilefix.patch" |
| 73 |
+SRC_URI="https://red.libssh.org/attachments/download/121/${MY_P}.tar.xz -> ${P}.tar.xz" |
| 74 |
|
| 75 |
LICENSE="LGPL-2.1" |
| 76 |
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" |
| 77 |
@@ -35,7 +34,7 @@ S=${WORKDIR}/${MY_P} |
| 78 |
|
| 79 |
PATCHES=( |
| 80 |
"${FILESDIR}"/${PN}-0.5.0-tests.patch |
| 81 |
- "${DISTDIR}"/${P}-compilefix.patch |
| 82 |
+ "${FILESDIR}"/${P}-compilefix.patch |
| 83 |
) |
| 84 |
|
| 85 |
src_prepare() { |
Archives