[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/

[Sam James]

commit:     f693b5749c6e6b42ac428f9fc43e629d45ede5bc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 23:42:42 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 23:42:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f693b574

net-misc/cadaver: drop version change hunk from neon-0.33 patch

We don't want to identify as a newer version as it might affect e.g.
--version output.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch b/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch
index aad849ab3dd4..9b6d1a2dceb7 100644
--- a/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch
+++ b/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch
@@ -2,19 +2,8 @@ Trimmed from diffing upstream d0de5ee5276e83ac1b5ff6bde56084a565bff5fb
 to 3c8ecfe9bc8a7fbee58425be69aea89ae3f718e9, which included some
 extraneous bits.
 
-diff --git a/configure.ac b/configure.ac
-index 3ca7151..fbdd034 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1,7 +1,7 @@
- dnl configure script
- 
- AC_PREREQ([2.69])
--AC_INIT([cadaver],[0.24],,,[https://github.com/notroj/cadaver])
-+AC_INIT([cadaver],[0.25-dev],,,[https://github.com/notroj/cadaver])
- 
- AC_CONFIG_SRCDIR(src/cadaver.c)
- AC_CONFIG_HEADERS([config.h])
 @@ -35,7 +35,7 @@ AS_HELP_STRING([--disable-netrc],[enable .netrc support]),,
  
  NEON_WITH_LIBS

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/

[Sam James]

commit:     d99c0736502c7e23dd852a61b9c8ea299d711f02
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 23:55:19 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 23:55:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99c0736

net-misc/cadaver: add PR link to other patch too

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/cadaver/files/cadaver-0.24-link-cflags.patch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch
index f4e537d6482a..d2e18eefade4 100644
--- a/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch
+++ b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch
@@ -1,3 +1,5 @@
+https://github.com/notroj/cadaver/pull/42
+
 From e798c0144d3042cf6139d1ab85d84a8416cf5f00 Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
 Date: Wed, 17 Apr 2024 00:51:57 +0100

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/

[Sam James]

commit:     ba4c126af687ad37e09cf102c9e0d4f1399cf433
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 00:02:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 00:02:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4c126a

net-misc/cadaver: slightly tweak autoconf-2.72 patch

One more instance we should quote for good measure.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch
index addf7f0345a9..6051c719e36f 100644
--- a/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch
+++ b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch
@@ -1,6 +1,6 @@
 https://github.com/notroj/cadaver/pull/42
 
-From 4f2ab67be45132ffdd9765d47b8457ca986b6fe3 Mon Sep 17 00:00:00 2001
+From 2eab7a8225b6fc0c6fd4773794abe83561f2d733 Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
 Date: Wed, 17 Apr 2024 00:48:11 +0100
 Subject: [PATCH] m4: fix quoting in readline.m4
@@ -16,12 +16,6 @@ no
 checking for tputs in -lncurses... no
 [...]
 ```
----
- m4/readline.m4 | 25 +++++++++++--------------
- 1 file changed, 11 insertions(+), 14 deletions(-)
-
-diff --git a/m4/readline.m4 b/m4/readline.m4
-index c0ab8af..9d650b9 100644
 --- a/m4/readline.m4
 +++ b/m4/readline.m4
 @@ -9,24 +9,21 @@ AC_ARG_ENABLE(readline,
@@ -34,7 +28,7 @@ index c0ab8af..9d650b9 100644
 -	AC_CHECK_LIB(readline, readline)
 +AS_IF([test "$use_readline" = "yes"], [
 +	AC_CHECK_LIB([curses], [tputs], [LIBS="$LIBS -lcurses"],
-+		[AC_CHECK_LIB(ncurses, tputs)])
++		[AC_CHECK_LIB([ncurses], [tputs])])
 +	AC_CHECK_LIB([readline], [readline])
  
 -	AC_SEARCH_LIBS(add_history, history,
@@ -60,4 +54,6 @@ index c0ab8af..9d650b9 100644
 -])
 -
 +])])
+-- 
+2.44.0