commit: 08ae79ffcc0617f4c802ef57fbe64a6d5f462721 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Oct 20 10:55:19 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Oct 20 10:59:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ae79ff
dev-db/recutils: fix USE=curl build Closes: https://bugs.gentoo.org/941132 Signed-off-by: Sam James <sam <AT> gentoo.org> ...fix-rec_db_set-crash-with-empty-databases.patch | 4 +-- .../files/1.9/0002-C99-compatibility-fix.patch | 8 +++--- .../1.9/0003-Fix-bison-and-flex-build-rules.patch | 9 +++---- ...-do-not-assume-the-output-buffer-is-NULL-.patch | 8 +++--- ...005-torture-add-missing-includes-for-free.patch | 10 +++----- ...configure.ac-add-options-for-dependencies.patch | 10 +++----- .../files/1.9/0007-configure.ac-modernise.patch | 10 +++----- ...c-call-PKG_PROG_PKG_CONFIG-unconditionall.patch | 10 +++----- .../1.9/0009-Port-to-newer-mdbutils-0.9.0.patch | 10 +++----- ...-configure.ac-use-pkg-config-to-find-curl.patch | 30 +++++++++++++++------- 10 files changed, 55 insertions(+), 54 deletions(-) diff --git a/dev-db/recutils/files/1.9/0001-db-fix-rec_db_set-crash-with-empty-databases.patch b/dev-db/recutils/files/1.9/0001-db-fix-rec_db_set-crash-with-empty-databases.patch index ba39ee61fdc9..a75dd3b46ea7 100644 --- a/dev-db/recutils/files/1.9/0001-db-fix-rec_db_set-crash-with-empty-databases.patch +++ b/dev-db/recutils/files/1.9/0001-db-fix-rec_db_set-crash-with-empty-databases.patch @@ -1,5 +1,5 @@ From 9f08064fef75ce02df9b6133d240c0fa84df458e Mon Sep 17 00:00:00 2001 -Message-ID: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> +Message-ID: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> From: "Jose E. Marchesi" <[email protected]> Date: Mon, 25 Apr 2022 09:32:09 +0200 Subject: [PATCH 01/10] db: fix rec_db_set crash with empty databases @@ -66,5 +66,5 @@ index f44ee59..d73d530 100755 recset \ '-n 0 -f foo -a bar' \ -- -2.46.2 +2.51.1 diff --git a/dev-db/recutils/files/1.9/0002-C99-compatibility-fix.patch b/dev-db/recutils/files/1.9/0002-C99-compatibility-fix.patch index e63211b14310..7bb5f18ed3db 100644 --- a/dev-db/recutils/files/1.9/0002-C99-compatibility-fix.patch +++ b/dev-db/recutils/files/1.9/0002-C99-compatibility-fix.patch @@ -1,7 +1,7 @@ From e154822aeec19cb790f8618ee740875c048859e4 Mon Sep 17 00:00:00 2001 -Message-ID: <e154822aeec19cb790f8618ee740875c048859e4.1728191717.git....@gentoo.org> -In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> -References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> +Message-ID: <e154822aeec19cb790f8618ee740875c048859e4.1760957586.git....@gentoo.org> +In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> +References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> From: Florian Weimer <[email protected]> Date: Thu, 15 Dec 2022 14:55:10 +0100 Subject: [PATCH 02/10] C99 compatibility fix @@ -72,5 +72,5 @@ index 6c31edd..f011bc4 100644 void sexerror (rec_sex_parser_t context, const char *err) { -- -2.46.2 +2.51.1 diff --git a/dev-db/recutils/files/1.9/0003-Fix-bison-and-flex-build-rules.patch b/dev-db/recutils/files/1.9/0003-Fix-bison-and-flex-build-rules.patch index 65dd25d3801d..e28476423bdd 100644 --- a/dev-db/recutils/files/1.9/0003-Fix-bison-and-flex-build-rules.patch +++ b/dev-db/recutils/files/1.9/0003-Fix-bison-and-flex-build-rules.patch @@ -1,7 +1,7 @@ From c09d1b1fa83be41f6d0568c50cc287ae718de498 Mon Sep 17 00:00:00 2001 -Message-ID: <c09d1b1fa83be41f6d0568c50cc287ae718de498.1728191717.git....@gentoo.org> -In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> -References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> +Message-ID: <c09d1b1fa83be41f6d0568c50cc287ae718de498.1760957586.git....@gentoo.org> +In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> +References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> From: "Jose E. Marchesi" <[email protected]> Date: Mon, 5 Jun 2023 23:44:03 +0200 Subject: [PATCH 03/10] Fix bison and flex build rules. @@ -12,7 +12,6 @@ Subject: [PATCH 03/10] Fix bison and flex build rules. * src/Makefile.am: Fix bison and flex rules. * src/rec-sex-ast.h: Include stddef.h for size_t. * src/rec-sex-lex.l: Use header-file option and fix includes. - * .gitignore: Ignore /src/rec-sex-lex.h. --- ChangeLog | 8 +++++ configure.ac | 2 +- @@ -194,5 +193,5 @@ index 2d4a891..8eee8dd 100644 %{ -- -2.46.2 +2.51.1 diff --git a/dev-db/recutils/files/1.9/0004-rec-crypt.c-do-not-assume-the-output-buffer-is-NULL-.patch b/dev-db/recutils/files/1.9/0004-rec-crypt.c-do-not-assume-the-output-buffer-is-NULL-.patch index b566d9224ba2..6f55528fd3ab 100644 --- a/dev-db/recutils/files/1.9/0004-rec-crypt.c-do-not-assume-the-output-buffer-is-NULL-.patch +++ b/dev-db/recutils/files/1.9/0004-rec-crypt.c-do-not-assume-the-output-buffer-is-NULL-.patch @@ -1,7 +1,7 @@ From 2160498461d6a9298cc7e6707bf3cad94d66d14f Mon Sep 17 00:00:00 2001 -Message-ID: <2160498461d6a9298cc7e6707bf3cad94d66d14f.1728191717.git....@gentoo.org> -In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> -References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> +Message-ID: <2160498461d6a9298cc7e6707bf3cad94d66d14f.1760957586.git....@gentoo.org> +In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> +References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> From: Craig Mason-Jones <[email protected]> Date: Sun, 3 Sep 2023 12:04:37 +0200 Subject: [PATCH 04/10] rec-crypt.c: do not assume the output buffer is NULL @@ -106,5 +106,5 @@ index b868cef..6ce2a59 100755 test_tool recsel-sort ok \ -- -2.46.2 +2.51.1 diff --git a/dev-db/recutils/files/1.9/0005-torture-add-missing-includes-for-free.patch b/dev-db/recutils/files/1.9/0005-torture-add-missing-includes-for-free.patch index aa085cac4af5..b644852c9d24 100644 --- a/dev-db/recutils/files/1.9/0005-torture-add-missing-includes-for-free.patch +++ b/dev-db/recutils/files/1.9/0005-torture-add-missing-includes-for-free.patch @@ -1,9 +1,7 @@ -https://lists.gnu.org/archive/html/bug-recutils/2024-10/msg00002.html - From fb9fafca61f07be0dded5a5ca6f74dd6cc0bec2c Mon Sep 17 00:00:00 2001 -Message-ID: <fb9fafca61f07be0dded5a5ca6f74dd6cc0bec2c.1728191717.git....@gentoo.org> -In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> -References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> +Message-ID: <fb9fafca61f07be0dded5a5ca6f74dd6cc0bec2c.1760957586.git....@gentoo.org> +In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> +References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> From: Sam James <[email protected]> Date: Sun, 6 Oct 2024 05:01:27 +0100 Subject: [PATCH 05/10] torture: add missing includes for free() @@ -86,5 +84,5 @@ index efbeb54..3a5b7b0 100644 #include <rec.h> -- -2.46.2 +2.51.1 diff --git a/dev-db/recutils/files/1.9/0006-configure.ac-add-options-for-dependencies.patch b/dev-db/recutils/files/1.9/0006-configure.ac-add-options-for-dependencies.patch index ead6cd696b12..5421cbc07b3d 100644 --- a/dev-db/recutils/files/1.9/0006-configure.ac-add-options-for-dependencies.patch +++ b/dev-db/recutils/files/1.9/0006-configure.ac-add-options-for-dependencies.patch @@ -1,9 +1,7 @@ -https://lists.gnu.org/archive/html/bug-recutils/2024-10/msg00002.html - From 42e038b1024c4e225b8309bab2438137f2c0a088 Mon Sep 17 00:00:00 2001 -Message-ID: <42e038b1024c4e225b8309bab2438137f2c0a088.1728191717.git....@gentoo.org> -In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> -References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> +Message-ID: <42e038b1024c4e225b8309bab2438137f2c0a088.1760957586.git....@gentoo.org> +In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> +References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> From: Sam James <[email protected]> Date: Sun, 6 Oct 2024 05:04:15 +0100 Subject: [PATCH 06/10] configure.ac: add options for dependencies @@ -186,5 +184,5 @@ index 24495b4..d6ffb01 100644 echo "warning: not building the recutils bash builtins." fi -- -2.46.2 +2.51.1 diff --git a/dev-db/recutils/files/1.9/0007-configure.ac-modernise.patch b/dev-db/recutils/files/1.9/0007-configure.ac-modernise.patch index 8393ea1bab5b..398bf8d7b7b2 100644 --- a/dev-db/recutils/files/1.9/0007-configure.ac-modernise.patch +++ b/dev-db/recutils/files/1.9/0007-configure.ac-modernise.patch @@ -1,9 +1,7 @@ -https://lists.gnu.org/archive/html/bug-recutils/2024-10/msg00002.html - From f2df87685e11e59429d5866f6cd21f357308abb2 Mon Sep 17 00:00:00 2001 -Message-ID: <f2df87685e11e59429d5866f6cd21f357308abb2.1728191717.git....@gentoo.org> -In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> -References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> +Message-ID: <f2df87685e11e59429d5866f6cd21f357308abb2.1760957586.git....@gentoo.org> +In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> +References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> From: Sam James <[email protected]> Date: Sun, 6 Oct 2024 05:20:51 +0100 Subject: [PATCH 07/10] configure.ac: modernise @@ -98,5 +96,5 @@ index d6ffb01..a190f5e 100644 dnl End of configure.ac -- -2.46.2 +2.51.1 diff --git a/dev-db/recutils/files/1.9/0008-configure.ac-call-PKG_PROG_PKG_CONFIG-unconditionall.patch b/dev-db/recutils/files/1.9/0008-configure.ac-call-PKG_PROG_PKG_CONFIG-unconditionall.patch index aeb53c6b6808..c03c96f46319 100644 --- a/dev-db/recutils/files/1.9/0008-configure.ac-call-PKG_PROG_PKG_CONFIG-unconditionall.patch +++ b/dev-db/recutils/files/1.9/0008-configure.ac-call-PKG_PROG_PKG_CONFIG-unconditionall.patch @@ -1,9 +1,7 @@ -https://lists.gnu.org/archive/html/bug-recutils/2024-10/msg00002.html - From 00e5dcacbec2f59466402c56d729ade31d845d6a Mon Sep 17 00:00:00 2001 -Message-ID: <00e5dcacbec2f59466402c56d729ade31d845d6a.1728191717.git....@gentoo.org> -In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> -References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> +Message-ID: <00e5dcacbec2f59466402c56d729ade31d845d6a.1760957586.git....@gentoo.org> +In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> +References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> From: Sam James <[email protected]> Date: Sun, 6 Oct 2024 05:32:19 +0100 Subject: [PATCH 08/10] configure.ac: call PKG_PROG_PKG_CONFIG unconditionally @@ -32,5 +30,5 @@ index a190f5e..e0caa02 100644 have_check=no PKG_CHECK_MODULES([CHECK], [check], -- -2.46.2 +2.51.1 diff --git a/dev-db/recutils/files/1.9/0009-Port-to-newer-mdbutils-0.9.0.patch b/dev-db/recutils/files/1.9/0009-Port-to-newer-mdbutils-0.9.0.patch index 7016ad19d508..e8f3df34ce0f 100644 --- a/dev-db/recutils/files/1.9/0009-Port-to-newer-mdbutils-0.9.0.patch +++ b/dev-db/recutils/files/1.9/0009-Port-to-newer-mdbutils-0.9.0.patch @@ -1,9 +1,7 @@ -https://lists.gnu.org/archive/html/bug-recutils/2024-10/msg00002.html - From 35c6919708e73d1dd3eba67813a7ab3f6f62477b Mon Sep 17 00:00:00 2001 -Message-ID: <35c6919708e73d1dd3eba67813a7ab3f6f62477b.1728191717.git....@gentoo.org> -In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> -References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> +Message-ID: <35c6919708e73d1dd3eba67813a7ab3f6f62477b.1760957586.git....@gentoo.org> +In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> +References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> From: Sam James <[email protected]> Date: Sun, 6 Oct 2024 05:48:41 +0100 Subject: [PATCH 09/10] Port to newer mdbutils (>=0.9.0) @@ -60,5 +58,5 @@ index 1e25397..5ee0369 100644 mdb = mdb_open (mdb2rec_mdb_file, MDB_NOFLAGS); if (!mdb) -- -2.46.2 +2.51.1 diff --git a/dev-db/recutils/files/1.9/0010-configure.ac-use-pkg-config-to-find-curl.patch b/dev-db/recutils/files/1.9/0010-configure.ac-use-pkg-config-to-find-curl.patch index 432b605daada..9fa9718781cf 100644 --- a/dev-db/recutils/files/1.9/0010-configure.ac-use-pkg-config-to-find-curl.patch +++ b/dev-db/recutils/files/1.9/0010-configure.ac-use-pkg-config-to-find-curl.patch @@ -1,9 +1,7 @@ -https://lists.gnu.org/archive/html/bug-recutils/2024-10/msg00002.html - -From 64708d4525603869e4ad22d468cb0d56e2f851c3 Mon Sep 17 00:00:00 2001 -Message-ID: <64708d4525603869e4ad22d468cb0d56e2f851c3.1728191717.git....@gentoo.org> -In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> -References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1728191717.git....@gentoo.org> +From 02f00350683769ece96a367ad8b987d3179d4b5d Mon Sep 17 00:00:00 2001 +Message-ID: <02f00350683769ece96a367ad8b987d3179d4b5d.1760957586.git....@gentoo.org> +In-Reply-To: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> +References: <9f08064fef75ce02df9b6133d240c0fa84df458e.1760957586.git....@gentoo.org> From: Sam James <[email protected]> Date: Sun, 6 Oct 2024 05:53:52 +0100 Subject: [PATCH 10/10] configure.ac: use pkg-config to find curl @@ -15,8 +13,9 @@ for curl too. * configure.ac: Find curl via pkg-config. --- - configure.ac | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) + configure.ac | 6 +----- + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 7e47b9d..44bad76 100644 @@ -38,6 +37,19 @@ index 7e47b9d..44bad76 100644 AC_ARG_ENABLE([uuid], AS_HELP_STRING([--enable-uuid], +diff --git a/src/Makefile.am b/src/Makefile.am +index f1e8fa7..07041f0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -159,7 +159,7 @@ endif + + if REMOTE_DESCRIPTORS + AM_CPPFLAGS += -DREMOTE_DESCRIPTORS +- librec_la_LIBADD += $(CURLLIBS) ++ librec_la_LIBADD += $(CURL_LIBS) + endif + + if UUID_TYPE -- -2.46.2 +2.51.1
