* [gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/, net-misc/cadaver/files/
@ 2024-04-16 23:54 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-04-16 23:54 UTC (permalink / raw
To: gentoo-commits
commit: 32688b27cd951855dc351aed45a6f1940397b612
Author: Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Tue Apr 16 00:19:54 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 23:38:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32688b27
net-misc/cadaver: add 0.24
This cherry-picks part of a recent upstream patch that adds support
for neon-0.33.x.
Closes: https://bugs.gentoo.org/925869
Closes: https://bugs.gentoo.org/922112
Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://github.com/gentoo/gentoo/pull/36274
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/cadaver/Manifest | 1 +
net-misc/cadaver/cadaver-0.24.ebuild | 45 ++++++++++++++++++++++
.../cadaver/files/cadaver-0.24-neon-0.33.patch | 26 +++++++++++++
3 files changed, 72 insertions(+)
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index c63115a8d408..3d3d9b0ed6ce 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1 +1,2 @@
DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
+DIST cadaver-0.24.tar.gz 808069 BLAKE2B 67e2f45a8c78972df9a972b6126e09ffdc8d7067d78bf748ca5c1b987f4138d0f278194c324206df294d77f7e797787edc612942168c6c78adc30f52bb3c996a SHA512 2c0131fd2f591350f6578385eedb353d81d87bae5582b2c8c96555cb51bf31fd15294898206bc7a8307b0e30e7adb1d47535e792cf28c5c1f5c2276bea0141a4
diff --git a/net-misc/cadaver/cadaver-0.24.ebuild b/net-misc/cadaver/cadaver-0.24.ebuild
new file mode 100644
index 000000000000..075ca4e70f1a
--- /dev/null
+++ b/net-misc/cadaver/cadaver-0.24.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2003-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Command-line WebDAV client"
+HOMEPAGE="https://notroj.github.io/cadaver/ https://github.com/notroj/cadaver"
+SRC_URI="https://notroj.github.io/cadaver/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
+IUSE="nls"
+
+BDEPEND="sys-devel/gettext"
+DEPEND=">=net-libs/neon-0.27.0:="
+RDEPEND="${DEPEND}"
+
+DOCS=( BUGS ChangeLog FAQ NEWS README.md THANKS TODO )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.23.2-disable-nls.patch
+ "${FILESDIR}"/${PN}-0.24-neon-0.33.patch
+)
+
+src_prepare() {
+ default
+
+ rm -r lib/expat || die "rm failed"
+ sed \
+ -e "/AC_CONFIG_FILES/s: neon/src/Makefile::" \
+ -i configure.ac || die "sed configure.ac failed"
+ sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed"
+ cp "${BROOT}"/usr/share/gettext/po/Makefile.in.in po || die "cp failed"
+
+ config_rpath_update .
+ AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable nls)
+}
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
new file mode 100644
index 000000000000..aad849ab3dd4
--- /dev/null
+++ b/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch
@@ -0,0 +1,26 @@
+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
+
+-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32])
++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32 33])
+
+ dnl Don't enable zlib or ACL support in neon
+ NEON_WITHOUT_ZLIB
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/, net-misc/cadaver/files/
@ 2024-04-16 23:54 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-04-16 23:54 UTC (permalink / raw
To: gentoo-commits
commit: c9dbd4fa234c88d579afd19236b3bc999ed36b53
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 23:54:05 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 23:54:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9dbd4fa
net-misc/cadaver: fix quoting w/ autoconf-2.72, respect CFLAGS during link
See https://github.com/gentoo/gentoo/pull/36274#issuecomment-2058032256.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/cadaver/cadaver-0.24.ebuild | 2 +
.../cadaver/files/cadaver-0.24-autoconf-2.72.patch | 63 ++++++++++++++++++++++
.../cadaver/files/cadaver-0.24-link-cflags.patch | 24 +++++++++
3 files changed, 89 insertions(+)
diff --git a/net-misc/cadaver/cadaver-0.24.ebuild b/net-misc/cadaver/cadaver-0.24.ebuild
index 2b63e89112aa..b9220d4366d2 100644
--- a/net-misc/cadaver/cadaver-0.24.ebuild
+++ b/net-misc/cadaver/cadaver-0.24.ebuild
@@ -23,6 +23,8 @@ DOCS=( BUGS ChangeLog FAQ NEWS README.md THANKS TODO )
PATCHES=(
"${FILESDIR}"/${PN}-0.23.2-disable-nls.patch
"${FILESDIR}"/${PN}-0.24-neon-0.33.patch
+ "${FILESDIR}"/${PN}-0.24-autoconf-2.72.patch
+ "${FILESDIR}"/${PN}-0.24-link-cflags.patch
)
src_prepare() {
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
new file mode 100644
index 000000000000..addf7f0345a9
--- /dev/null
+++ b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch
@@ -0,0 +1,63 @@
+https://github.com/notroj/cadaver/pull/42
+
+From 4f2ab67be45132ffdd9765d47b8457ca986b6fe3 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
+
+Without this, with autoconf-2.72 at least, we get:
+```
+$ ./configure
+[...]
+checking for pkg-config... /usr/sbin/pkg-config
+checking pkg-config is at least version 0.9.0... yes
+checking for tputs in -lcurses... ./configure: 5319: ac_fn_c_try_link: not found
+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,
+ [use_readline=$enableval],
+ [use_readline=yes]) dnl Defaults to ON (if found)
+
+-if test "$use_readline" = "yes"; then
+- AC_CHECK_LIB(curses, tputs, LIBS="$LIBS -lcurses",
+- AC_CHECK_LIB(ncurses, tputs))
+- 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([readline], [readline])
+
+- AC_SEARCH_LIBS(add_history, history,
+- AC_DEFINE(HAVE_ADD_HISTORY, 1, [Define if you have the add_history function])
++ AC_SEARCH_LIBS([add_history], [history],
++ AC_DEFINE([HAVE_ADD_HISTORY], [1], [Define if you have the add_history function])
+ )
+
+- AC_CHECK_HEADERS(history.h readline/history.h readline.h readline/readline.h)
++ AC_CHECK_HEADERS([history.h readline/history.h readline.h readline/readline.h])
+
+ # Check for rl_completion_matches as in readline 4.2
+- AC_CHECK_FUNCS(rl_completion_matches)
+-
++ AC_CHECK_FUNCS([rl_completion_matches])
++
+ msg_readline="enabled"
+-else
++], [
+ msg_readline="disabled"
+-fi
+-
+-])
+-
++])])
+
diff --git a/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch
new file mode 100644
index 000000000000..f4e537d6482a
--- /dev/null
+++ b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch
@@ -0,0 +1,24 @@
+From e798c0144d3042cf6139d1ab85d84a8416cf5f00 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 17 Apr 2024 00:51:57 +0100
+Subject: [PATCH] Makefile.in: include CFLAGS at link-time
+
+GCC's documentation recommends this [0] for e.g. LTO. As a trivial silly
+example, my -fdiagnostics-color=always was stripped out, so a warning
+I got wasn't in colour.
+
+[0] https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -56,7 +56,7 @@ all: $(TARGET)
+ .PHONY: subdirs install clean distclean
+
+ $(TARGET): $(ALLOBJS) subdirs
+- $(CC) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
+
+ .c.o:
+ $(CC) $(ALL_CFLAGS) -o $@ -c $<
+--
+2.44.0
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-16 23:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-16 23:54 [gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/, net-misc/cadaver/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-04-16 23:54 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox