From 97bacba3ead078e5db8b87ab651a3ffa7d82f60f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 17 Apr 2024 12:04:28 +0100 Subject: gentoo auto-resync : 17:04:2024 - 12:04:27 --- net-misc/cadaver/Manifest | 5 ++ net-misc/cadaver/cadaver-0.24.ebuild | 47 +++++++++++++++++ .../cadaver/files/cadaver-0.24-autoconf-2.72.patch | 59 ++++++++++++++++++++++ .../cadaver/files/cadaver-0.24-link-cflags.patch | 26 ++++++++++ .../cadaver/files/cadaver-0.24-neon-0.33.patch | 15 ++++++ 5 files changed, 152 insertions(+) create mode 100644 net-misc/cadaver/cadaver-0.24.ebuild create mode 100644 net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch create mode 100644 net-misc/cadaver/files/cadaver-0.24-link-cflags.patch create mode 100644 net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch (limited to 'net-misc/cadaver') diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest index e5dfd7219f77..496014c9f9fc 100644 --- a/net-misc/cadaver/Manifest +++ b/net-misc/cadaver/Manifest @@ -1,4 +1,9 @@ AUX cadaver-0.23.2-disable-nls.patch 326 BLAKE2B a7eb4f01180e584824c1019e5d1b667c907c94041037f48a76bd3f862fe77581ecf74cad5a2806795229b6c0d334c59b971d7ccd7fff773fce4511baf82383aa SHA512 02a77a24ee2d14d2aa2da4853691aa9386140959f3af2bdaf092f2cadc7a59d426482f40b1fb35adfd7eefffda5c93378b4481c18ca2092db2339eb599912b20 +AUX cadaver-0.24-autoconf-2.72.patch 1703 BLAKE2B 7b67da6ab3f060ef9883a2610ed998237f2e5b8fcd7354698f35972e7f5ba7cbea396e2894a90e15e21d5b51b411d02cbf821dae4e7a1fdbd2ac1c0da07953c2 SHA512 e7f6e256cba14a3123880d1134c69fefba3932c7559e5a22637e84006dbf1113d7e6efeff933c5786d4691de36b5c4bf33573fd388a09d25f04b03cfea60051b +AUX cadaver-0.24-link-cflags.patch 794 BLAKE2B 29c51e857111ad798bd44d60de37a7aef8a936e5e8342f0332257dde658007d0d99260baf0f21f1a47345e376fa8caca363dffe3d2bf678ec4129acba03b8d5c SHA512 687f73683f610bfc810f46a7566e75e957d97512399b90fe31d8ca71f8c3e9dc7ff4de10cbc6e5428b19f7260c725f0b721bcd4870e1327386a7d2dd843d8850 +AUX cadaver-0.24-neon-0.33.patch 454 BLAKE2B 8f6f3a5e94503c864fecc7a6f26a0f57407fc7bde0a03f7d533e7277ef77dcaf4b5e79c3eadf0ad0bcf7d50702e5f59d8ab6ef1ad311da9c27eb7d3fad833410 SHA512 617429d983a1547e9849ce17f6ab23237c884d22a56e50652e0570b0ac42b33cde86e983c90957c7aedd83be50d9f8cf313ae8e60d38d950b22cce219edb8d2c DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41 +DIST cadaver-0.24.tar.gz 808069 BLAKE2B 67e2f45a8c78972df9a972b6126e09ffdc8d7067d78bf748ca5c1b987f4138d0f278194c324206df294d77f7e797787edc612942168c6c78adc30f52bb3c996a SHA512 2c0131fd2f591350f6578385eedb353d81d87bae5582b2c8c96555cb51bf31fd15294898206bc7a8307b0e30e7adb1d47535e792cf28c5c1f5c2276bea0141a4 EBUILD cadaver-0.23.3-r1.ebuild 1124 BLAKE2B 689eacfd7413e99fc6969e0080e1f994124771c7db219662d25415199f8668d1d76992266501f47dc83d4a166602e9743718635a0f30b7913b8946c0b3ee231b SHA512 98fc802b3cf5eb7315f52ef619427bcfecbbfb65297b41ee5059f1b9d2c458b55e5a71e86405ba25163123c492428c6078b13d1e8b0419d83dcc73383dba1349 +EBUILD cadaver-0.24.ebuild 1143 BLAKE2B 1f9c108bd6c4b1fb7a04942ec4edc80fb8cd3b937b2197b65bb20febd27929cfc7a73da231b4c053c59ec8a207f668bfa1c4f34543a7452e0dd903a7b5505347 SHA512 f5b5f549a95c14b953e2a38be17434f36296eaba7f1ec85906c97c55b25fde590aa98b38cc42f25168de33975f3453dafb6db85febdb9534b6641a66008ba60d MISC metadata.xml 247 BLAKE2B 10a43549bc6a16f6430a1334c484fff1eca65453d6b7d6e1f181ee8d23418f11836728c44dfa18c32799afccfce864dc32087dc03a57ec1f0eb606dfc1faca11 SHA512 3b083dff8420d8abee93c4ba49e65bcba726b855dab0a20b4162250a4ac76a8a2c7ea500bdeac99dca91ea04674c69e7c19c050599a3201d4ba2cf56e5fffd10 diff --git a/net-misc/cadaver/cadaver-0.24.ebuild b/net-misc/cadaver/cadaver-0.24.ebuild new file mode 100644 index 000000000000..b9220d4366d2 --- /dev/null +++ b/net-misc/cadaver/cadaver-0.24.ebuild @@ -0,0 +1,47 @@ +# Copyright 2003-2024 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 + "${FILESDIR}"/${PN}-0.24-autoconf-2.72.patch + "${FILESDIR}"/${PN}-0.24-link-cflags.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-autoconf-2.72.patch b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch new file mode 100644 index 000000000000..6051c719e36f --- /dev/null +++ b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch @@ -0,0 +1,59 @@ +https://github.com/notroj/cadaver/pull/42 + +From 2eab7a8225b6fc0c6fd4773794abe83561f2d733 Mon Sep 17 00:00:00 2001 +From: Sam James +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 +[...] +``` +--- 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 +- +-]) +- ++])]) +-- +2.44.0 + 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..d2e18eefade4 --- /dev/null +++ b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch @@ -0,0 +1,26 @@ +https://github.com/notroj/cadaver/pull/42 + +From e798c0144d3042cf6139d1ab85d84a8416cf5f00 Mon Sep 17 00:00:00 2001 +From: Sam James +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 + 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..9b6d1a2dceb7 --- /dev/null +++ b/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch @@ -0,0 +1,15 @@ +Trimmed from diffing upstream d0de5ee5276e83ac1b5ff6bde56084a565bff5fb +to 3c8ecfe9bc8a7fbee58425be69aea89ae3f718e9, which included some +extraneous bits. + +--- a/configure.ac ++++ b/configure.ac +@@ -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 -- cgit v1.2.3