[arch-commits] Commit in libssh/trunk (PKGBUILD libssh-fix-read-config.patch)

[Antonio Rojas via arch-commits]

Date: Friday, August 17, 2018 @ 17:00:02
  Author: arojas
Revision: 332103

Update to 0.8.1

Modified:
  libssh/trunk/PKGBUILD
Deleted:
  libssh/trunk/libssh-fix-read-config.patch

--+
 PKGBUILD |   25 +
 libssh-fix-read-config.patch |   29 -
 2 files changed, 9 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-17 16:36:02 UTC (rev 332102)
+++ PKGBUILD2018-08-17 17:00:02 UTC (rev 332103)
@@ -7,19 +7,17 @@
 
 pkgbase=libssh
 pkgname=(libssh libssh-docs)
-pkgver=0.7.5
-pkgrel=2
+pkgver=0.8.1
+pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/;
 license=(LGPL)
 arch=(x86_64)
-depends=(libgcrypt zlib) # use openssl again for 0.8
-makedepends=(cmake cmocka doxygen)
-source=(https://www.libssh.org/files/${pkgver%.*}/$pkgname-$pkgver.tar.{xz,asc}
-libssh-fix-read-config.patch)
-sha256sums=('54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'
-'SKIP'
-'fe877d6be0b6e97361d8d841b3cbf9dc36b34d3ba92d5ba50af0f23487ac786a')
+depends=(openssl zlib)
+makedepends=(cmake cmocka doxygen python)
+source=(https://www.libssh.org/files/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.asc})
+sha256sums=('d17f1267b4a5e46c0fbe66d39a3e702b8cefe788928f2eb6e339a18bb00b1924'
+'SKIP')
 validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider 

 
 prepare() {
@@ -26,13 +24,9 @@
   # 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
+  sed 's/cmocka_unit_test(torture_path_expand_tilde_unix),//' -i 
libssh-${pkgver}/tests/unittests/torture_misc.c
 
   mkdir -p build
-
-  cd $pkgname-$pkgver
-  # Fix reading SSH configuration files
-  patch -p1 -i ../libssh-fix-read-config.patch
 }
 
 build() {
@@ -40,8 +34,7 @@
   cmake ../$pkgname-$pkgver \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DWITH_GSSAPI=OFF \
--DWITH_GCRYPT=ON \
--DWITH_TESTING=ON
+-DUNIT_TESTING=ON
   make
   make doc
 }

Deleted: libssh-fix-read-config.patch
===
--- libssh-fix-read-config.patch2018-08-17 16:36:02 UTC (rev 332102)
+++ libssh-fix-read-config.patch2018-08-17 17:00:02 UTC (rev 332103)
@@ -1,29 +0,0 @@
-From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001
-From: "Artyom V. Poptsov" 
-Date: Sun, 4 Jun 2017 11:54:55 +0300
-Subject: config: Bugfix: Don't skip unseen opcodes
-
-libssh fails to read the configuration from a config file due to a
-wrong check in 'ssh_config_parse_line' procedure in 'config.c'; it's
-effectively skipping every opcode (and therefore every option) from
-the file.  The change fixes that behaviour.
-
-Signed-off-by: Artyom V. Poptsov 
-Reviewed-by: Andreas Schneider 

- src/config.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/config.c b/src/config.c
-index 6478fc5f..519926e7 100644
 a/src/config.c
-+++ b/src/config.c
-@@ -219,7 +219,7 @@ static int ssh_config_parse_line(ssh_session session, 
const char *line,
- 
-   opcode = ssh_config_get_opcode(keyword);
-   if (*parsing == 1 && opcode != SOC_HOST) {
--  if (seen[opcode] == 0) {
-+  if (seen[opcode] != 0) {
-   return 0;
-   }
-   seen[opcode] = 1;

[arch-commits] Commit in libssh/trunk (PKGBUILD libssh-fix-read-config.patch)

[Christian Hesse via arch-commits]

Date: Monday, August 6, 2018 @ 22:04:55
  Author: eworm
Revision: 331055

fix patch

Added:
  libssh/trunk/libssh-fix-read-config.patch
Modified:
  libssh/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 libssh-fix-read-config.patch |   29 +
 2 files changed, 31 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-06 22:04:48 UTC (rev 331054)
+++ PKGBUILD2018-08-06 22:04:55 UTC (rev 331055)
@@ -16,10 +16,10 @@
 depends=(libgcrypt zlib) # use openssl again for 0.8
 makedepends=(cmake cmocka doxygen)
 source=(https://www.libssh.org/files/${pkgver%.*}/$pkgname-$pkgver.tar.{xz,asc}
-
libssh-fix-read-config.patch::https://git.libssh.org/projects/libssh.git/patch/?id=5333be59)
+libssh-fix-read-config.patch)
 sha256sums=('54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095'
 'SKIP'
-'c39bed86f34a377015fb6d6552700a3838c5cae1a4a83b3e859539785aeabdba')
+'fe877d6be0b6e97361d8d841b3cbf9dc36b34d3ba92d5ba50af0f23487ac786a')
 validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider 

 
 prepare() {

Added: libssh-fix-read-config.patch
===
--- libssh-fix-read-config.patch(rev 0)
+++ libssh-fix-read-config.patch2018-08-06 22:04:55 UTC (rev 331055)
@@ -0,0 +1,29 @@
+From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001
+From: "Artyom V. Poptsov" 
+Date: Sun, 4 Jun 2017 11:54:55 +0300
+Subject: config: Bugfix: Don't skip unseen opcodes
+
+libssh fails to read the configuration from a config file due to a
+wrong check in 'ssh_config_parse_line' procedure in 'config.c'; it's
+effectively skipping every opcode (and therefore every option) from
+the file.  The change fixes that behaviour.
+
+Signed-off-by: Artyom V. Poptsov 
+Reviewed-by: Andreas Schneider 
+---
+ src/config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/config.c b/src/config.c
+index 6478fc5f..519926e7 100644
+--- a/src/config.c
 b/src/config.c
+@@ -219,7 +219,7 @@ static int ssh_config_parse_line(ssh_session session, 
const char *line,
+ 
+   opcode = ssh_config_get_opcode(keyword);
+   if (*parsing == 1 && opcode != SOC_HOST) {
+-  if (seen[opcode] == 0) {
++  if (seen[opcode] != 0) {
+   return 0;
+   }
+   seen[opcode] = 1;