[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/files/

[Jeroen Roovers]

commit:     ea3b141c4718cb016d9f1fabd8c41de5de159b89
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 19:57:21 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 19:57:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea3b141c

net-libs/libssh2: Drop obsolete patch.

Package-Manager: portage-2.3.2

 net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch b/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch
deleted file mode 100644
index f741a25..00000000
--- a/net-libs/libssh2/files/libssh2-1.4.2-pkgconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libssh2.pc.in
-+++ b/libssh2.pc.in
-@@ -12,6 +12,6 @@
- Description: Library for SSH-based communication
- Version: @LIBSSH2VER@
- Requires.private: @LIBSREQUIRED@
--Libs: -L${libdir} -lssh2 @LDFLAGS@ @LIBS@
-+Libs: -L${libdir} -lssh2 @LIBS@
- Libs.private: @LIBS@
- Cflags: -I${includedir}

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/files/

[Jeroen Roovers]

commit:     a55608f44e799e4fab03882909992053b8e25b90
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 09:16:12 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 09:16:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55608f4

net-libs/libssh2: Clean up patch

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/libssh2/files/libssh2-1.9.0-missing.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
index 7cc58d23963..2216a2fa66f 100644
--- a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
+++ b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
++++ tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
 @@ -0,0 +1,37 @@
 +#include "session_fixture.h"
 +
@@ -39,7 +39,7 @@
 +    return 0;
 +}
 --- /dev/null
-+++ b/tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
++++ tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
 @@ -0,0 +1,38 @@
 +#include "session_fixture.h"
 +
@@ -80,7 +80,7 @@
 +    return 0;
 +}
 --- /dev/null
-+++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
++++ tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
 @@ -0,0 +1,97 @@
 +#include "session_fixture.h"
 +

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/files/

[Jeroen Roovers]

commit:     6b96296c587c1909b642b0d22a33e3060776e45e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 13:28:57 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 13:30:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b96296c

Revert "net-libs/libssh2: Clean up patch"

This reverts commit a55608f44e799e4fab03882909992053b8e25b90.

Fixes: https://bugs.gentoo.org/688604
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/libssh2/files/libssh2-1.9.0-missing.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
index 2216a2fa66f..7cc58d23963 100644
--- a/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
+++ b/net-libs/libssh2/files/libssh2-1.9.0-missing.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
++++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
 @@ -0,0 +1,37 @@
 +#include "session_fixture.h"
 +
@@ -39,7 +39,7 @@
 +    return 0;
 +}
 --- /dev/null
-+++ tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
++++ b/tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
 @@ -0,0 +1,38 @@
 +#include "session_fixture.h"
 +
@@ -80,7 +80,7 @@
 +    return 0;
 +}
 --- /dev/null
-+++ tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
++++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
 @@ -0,0 +1,97 @@
 +#include "session_fixture.h"
 +

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/files/

[Sam James]

commit:     f7aa70157eaa0561b4eb24135380ce0e072576de
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Apr 11 23:34:42 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 00:27:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7aa7015

net-libs/libssh2: Update live patch

Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30562
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libssh2/files/libssh2-1.8.0-mansyntax_sh.patch | 49 ++++------------------
 1 file changed, 8 insertions(+), 41 deletions(-)

diff --git a/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch b/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch
index 3a33bf744167..c8b791f01789 100644
--- a/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch
+++ b/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch
@@ -1,41 +1,8 @@
---- a/tests/mansyntax.sh
-+++ b/tests/mansyntax.sh
-@@ -1,37 +1,2 @@
- #!/bin/sh
--set -e
--
--# Written by Mikhail Gusarov
--#
--# Run syntax checks for all manpages in the documentation tree.
--#
--
--srcdir=${srcdir:-$PWD}
--dstdir=${builddir:-$PWD}
--mandir=${srcdir}/../docs
--
--#
--# Only test if suitable man is available
--#
--if ! man --help | grep -q warnings; then
--  echo "man version not suitable, skipping tests"
--  exit 0
--fi
--
--ec=0
--
--trap "rm -f $dstdir/man3" EXIT
--
--ln -sf "$mandir" "$dstdir/man3"
--
--for manpage in $mandir/libssh2_*.*; do
--  echo "$manpage"
--  warnings=$(LANG=en_US.UTF-8 MANWIDTH=80 man -M "$dstdir" --warnings \
--    -E UTF-8 -l "$manpage" 2>&1 >/dev/null)
--  if [ -n "$warnings" ]; then
--    echo "$warnings"
--    ec=1
--  fi
--done
--
--exit $ec
-+:
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -179,5 +179,4 @@ mark_as_advanced(SH_EXECUTABLE MAN_EXECUTABLE GREP_EXECUTABLE)
+ if(SH_EXECUTABLE AND MAN_EXECUTABLE AND GREP_EXECUTABLE)
+   set(cmd "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
+   set(cmd "${cmd} ${CMAKE_CURRENT_SOURCE_DIR}/mansyntax.sh")
+-  add_test(mansyntax ${SH_EXECUTABLE} -c "${cmd}")
+ endif()

[gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/files/

[Conrad Kostecki]

commit:     bfdbba524846dd707241179cf7797245d7c41626
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Jun  1 15:46:16 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 21:28:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfdbba52

net-libs/libssh2: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31268
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch b/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch
deleted file mode 100644
index c8b791f01789..000000000000
--- a/net-libs/libssh2/files/libssh2-1.8.0-mansyntax_sh.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -179,5 +179,4 @@ mark_as_advanced(SH_EXECUTABLE MAN_EXECUTABLE GREP_EXECUTABLE)
- if(SH_EXECUTABLE AND MAN_EXECUTABLE AND GREP_EXECUTABLE)
-   set(cmd "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
-   set(cmd "${cmd} ${CMAKE_CURRENT_SOURCE_DIR}/mansyntax.sh")
--  add_test(mansyntax ${SH_EXECUTABLE} -c "${cmd}")
- endif()