From 9c417bacd51da6d8b57fa9f37425161d30d4b95b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Nov 2020 20:40:51 +0000 Subject: gentoo resync : 28.11.2020 --- .../files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch | 21 -------- ...bm-1.13-fix-build-with-enable-gdbm-export.patch | 57 ---------------------- sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch | 11 ----- 3 files changed, 89 deletions(-) delete mode 100644 sys-libs/gdbm/files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch delete mode 100644 sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch delete mode 100644 sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch (limited to 'sys-libs/gdbm/files') diff --git a/sys-libs/gdbm/files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch b/sys-libs/gdbm/files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch deleted file mode 100644 index f3b96e9be2c7..000000000000 --- a/sys-libs/gdbm/files/gdbm-1.13-fix-a-typo-in-gdbm.h.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 1e0b3f4556f88013a2268bb2ef0c8d4bfaa40f90 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Fri, 14 Apr 2017 07:48:35 +0000 -Subject: Fix a typo - ---- -diff --git a/src/gdbm.h.in b/src/gdbm.h.in -index e9b7b1b..de0d2b9 100644 ---- a/src/gdbm.h.in -+++ b/src/gdbm.h.in -@@ -224,7 +224,7 @@ extern int gdbm_copy_meta (GDBM_FILE dst, GDBM_FILE src); - # define _GDBM_MAX_ERRNO GDBM_DIR_OVERFLOW - - /* This one was never used and will be removed in the future */ --# define GDBM_UNKNOWN_UPDATE GDBM_ERR_UNKNOWN_ERROR -+# define GDBM_UNKNOWN_UPDATE GDBM_UNKNOWN_ERROR - - typedef int gdbm_error; - extern gdbm_error gdbm_errno; --- -cgit v0.9.0.3 diff --git a/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch b/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch deleted file mode 100644 index eb229f7261cb..000000000000 --- a/sys-libs/gdbm/files/gdbm-1.13-fix-build-with-enable-gdbm-export.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 272713d611c55effeaf1d2b45fbb2c69d70e4c74 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Sat, 23 Dec 2017 21:27:20 +0000 -Subject: Fix build with --enable-gdbm-export - -* THANKS: Add Jakub Bogusz -* export/export.c: Define GDBM_EXPORT_18 prior to -including gdbmexp.c -* src/gdbmexp.c [GDBM_EXPORT_18]: Define GDBM_SET_ERRNO and -GDBM_ASSERT_CONSISTENCY. ---- -diff --git a/THANKS b/THANKS -index 70cb40f..feb1f87 100644 ---- a/THANKS -+++ b/THANKS -@@ -5,6 +5,7 @@ suggesting various improvements or submitting actual code. Here is a list - of these people. Help us keep it complete and exempt of errors. - - Bill Jones -+Jakub Bogusz - Matthew Burgess - Tanaka Akira --Thomas Klausner -\ No newline at end of file -+Thomas Klausner -diff --git a/export/export.c b/export/export.c -index 39e05d1..ede4858 100644 ---- a/export/export.c -+++ b/export/export.c -@@ -24,6 +24,7 @@ - #include - - /* Pull in gdbm_export() */ -+#define GDBM_EXPORT_18 - #include "gdbmexp.c" - - void -diff --git a/src/gdbmexp.c b/src/gdbmexp.c -index 457f638..dc46c50 100644 ---- a/src/gdbmexp.c -+++ b/src/gdbmexp.c -@@ -21,8 +21,13 @@ - # include "autoconf.h" - # include - -+#ifdef GDBM_EXPORT_18 -+# define GDBM_SET_ERRNO(dbf, ec, fatal) gdbm_errno = ec -+# define GDBM_ASSERT_CONSISTENCY(dbf, val) -+#else - # include "gdbmdefs.h" - # include "gdbm.h" -+#endif - - int - gdbm_export_to_file (GDBM_FILE dbf, FILE *fp) --- -cgit v0.9.0.3 diff --git a/sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch b/sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch deleted file mode 100644 index 434aed59952b..000000000000 --- a/sys-libs/gdbm/files/gdbm-1.17-fix-gdbmsync.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /src/gdbmsync.c.orig 2018-08-05 14:37:18.000116786 +0200 -+++ /src/gdbmsync.c 2018-08-05 14:37:39.666117321 +0200 -@@ -28,7 +28,7 @@ - gdbm_sync (GDBM_FILE dbf) - { - /* Return immediately if the database needs recovery */ -- GDBM_ASSERT_CONSISTENCY (dbf, ); -+ GDBM_ASSERT_CONSISTENCY (dbf, GDBM_NEED_RECOVERY); - - /* Initialize the gdbm_errno variable. */ - gdbm_set_errno (dbf, GDBM_NO_ERROR, FALSE);} -- cgit v1.2.3