[arch-commits] Commit in libssh (7 files)
Antonio Rojas
arojas at archlinux.org
Sun May 24 16:48:03 UTC 2015
Date: Sunday, May 24, 2015 @ 18:48:03
Author: arojas
Revision: 239724
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libssh/repos/
libssh/repos/extra-i686/
libssh/repos/extra-i686/PKGBUILD
(from rev 239723, libssh/trunk/PKGBUILD)
libssh/repos/extra-i686/ssh_forward_listen.patch
(from rev 239723, libssh/trunk/ssh_forward_listen.patch)
libssh/repos/extra-x86_64/
libssh/repos/extra-x86_64/PKGBUILD
(from rev 239723, libssh/trunk/PKGBUILD)
libssh/repos/extra-x86_64/ssh_forward_listen.patch
(from rev 239723, libssh/trunk/ssh_forward_listen.patch)
---------------------------------------+
extra-i686/PKGBUILD | 54 ++++++++++++++++++++++++++++++++
extra-i686/ssh_forward_listen.patch | 28 ++++++++++++++++
extra-x86_64/PKGBUILD | 54 ++++++++++++++++++++++++++++++++
extra-x86_64/ssh_forward_listen.patch | 28 ++++++++++++++++
4 files changed, 164 insertions(+)
Copied: libssh/repos/extra-i686/PKGBUILD (from rev 239723, libssh/trunk/PKGBUILD)
===================================================================
--- repos/extra-i686/PKGBUILD (rev 0)
+++ repos/extra-i686/PKGBUILD 2015-05-24 16:48:03 UTC (rev 239724)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: ice-man <icemanf at gmail.com>
+# Contributor: sergeantspoon <sergeantspoon at archlinux.us>
+
+pkgname=libssh
+pkgver=0.7.0
+pkgrel=2
+pkgdesc="Library for accessing ssh client services through C libraries"
+url="http://www.libssh.org/"
+license=('LGPL')
+arch=('i686' 'x86_64')
+depends=('openssl')
+makedepends=('cmake' 'cmocka' 'doxygen')
+checkdepends=('openssh')
+source=(https://red.libssh.org/attachments/download/140/${pkgname}-${pkgver}.tar.xz
+ https://red.libssh.org/attachments/download/139/${pkgname}-${pkgver}.tar.asc 'ssh_forward_listen.patch')
+md5sums=('cf20c3bb6edfc853187985c3f649ca80'
+ 'SKIP'
+ '53ddfb95b84530d9bf5947e4dc98a875')
+validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn at cryptomilk.org>
+
+prepare() {
+ # disable the test. It is confused by our clean container setup.
+ # 'extra-x86-build' uses user 'nobody' that has a record in /etc/passwd file
+ # but $HOME envvar is set to '/build'. The test expects that $HOME corresponds to passwd file.
+ sed 's/unit_test(torture_path_expand_tilde_unix),//' -i libssh-${pkgver}/tests/unittests/torture_misc.c
+
+# Fix undefined symbol (FS#45055)
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/ssh_forward_listen.patch
+}
+
+build() {
+ mkdir build || true
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_GSSAPI=OFF \
+ -DWITH_TESTING=ON
+ make
+}
+
+check() {
+ cd build
+ make test
+}
+
+package(){
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: libssh/repos/extra-i686/ssh_forward_listen.patch (from rev 239723, libssh/trunk/ssh_forward_listen.patch)
===================================================================
--- repos/extra-i686/ssh_forward_listen.patch (rev 0)
+++ repos/extra-i686/ssh_forward_listen.patch 2015-05-24 16:48:03 UTC (rev 239724)
@@ -0,0 +1,28 @@
+From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001
+From: Mike DePaulo <mikedep333 at gmail.com>
+Date: Fri, 15 May 2015 22:22:13 -0400
+Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194)
+
+---
+ src/channels.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/channels.c b/src/channels.c
+index 7a4e71f..db5f83a 100644
+--- a/src/channels.c
++++ b/src/channels.c
+@@ -2206,6 +2206,11 @@ error:
+ }
+
+ /* DEPRECATED */
++int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) {
++ return ssh_channel_listen_forward(session, address, port, bound_port);
++}
++
++/* DEPRECATED */
+ ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) {
+ return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL);
+ }
+--
+2.1.4
+
Copied: libssh/repos/extra-x86_64/PKGBUILD (from rev 239723, libssh/trunk/PKGBUILD)
===================================================================
--- repos/extra-x86_64/PKGBUILD (rev 0)
+++ repos/extra-x86_64/PKGBUILD 2015-05-24 16:48:03 UTC (rev 239724)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: ice-man <icemanf at gmail.com>
+# Contributor: sergeantspoon <sergeantspoon at archlinux.us>
+
+pkgname=libssh
+pkgver=0.7.0
+pkgrel=2
+pkgdesc="Library for accessing ssh client services through C libraries"
+url="http://www.libssh.org/"
+license=('LGPL')
+arch=('i686' 'x86_64')
+depends=('openssl')
+makedepends=('cmake' 'cmocka' 'doxygen')
+checkdepends=('openssh')
+source=(https://red.libssh.org/attachments/download/140/${pkgname}-${pkgver}.tar.xz
+ https://red.libssh.org/attachments/download/139/${pkgname}-${pkgver}.tar.asc 'ssh_forward_listen.patch')
+md5sums=('cf20c3bb6edfc853187985c3f649ca80'
+ 'SKIP'
+ '53ddfb95b84530d9bf5947e4dc98a875')
+validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn at cryptomilk.org>
+
+prepare() {
+ # disable the test. It is confused by our clean container setup.
+ # 'extra-x86-build' uses user 'nobody' that has a record in /etc/passwd file
+ # but $HOME envvar is set to '/build'. The test expects that $HOME corresponds to passwd file.
+ sed 's/unit_test(torture_path_expand_tilde_unix),//' -i libssh-${pkgver}/tests/unittests/torture_misc.c
+
+# Fix undefined symbol (FS#45055)
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/ssh_forward_listen.patch
+}
+
+build() {
+ mkdir build || true
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_GSSAPI=OFF \
+ -DWITH_TESTING=ON
+ make
+}
+
+check() {
+ cd build
+ make test
+}
+
+package(){
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: libssh/repos/extra-x86_64/ssh_forward_listen.patch (from rev 239723, libssh/trunk/ssh_forward_listen.patch)
===================================================================
--- repos/extra-x86_64/ssh_forward_listen.patch (rev 0)
+++ repos/extra-x86_64/ssh_forward_listen.patch 2015-05-24 16:48:03 UTC (rev 239724)
@@ -0,0 +1,28 @@
+From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001
+From: Mike DePaulo <mikedep333 at gmail.com>
+Date: Fri, 15 May 2015 22:22:13 -0400
+Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194)
+
+---
+ src/channels.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/channels.c b/src/channels.c
+index 7a4e71f..db5f83a 100644
+--- a/src/channels.c
++++ b/src/channels.c
+@@ -2206,6 +2206,11 @@ error:
+ }
+
+ /* DEPRECATED */
++int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) {
++ return ssh_channel_listen_forward(session, address, port, bound_port);
++}
++
++/* DEPRECATED */
+ ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) {
+ return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL);
+ }
+--
+2.1.4
+
More information about the arch-commits
mailing list