| 1 |
commit: e088d78ac0870dd02e9ca01794014bda9e371e8f |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 6 15:13:04 2022 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 6 15:13:04 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/commit/?id=e088d78a |
| 7 |
|
| 8 |
Sync with azanella's branch release/2.34/master-bz23960 |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
9999/0207-dirent-Deprecate-getdirentries.patch | 28 +++++++++++++------------ |
| 13 |
9999/0208-Build-fix-no-double-__THROW.patch | 29 -------------------------- |
| 14 |
2 files changed, 15 insertions(+), 42 deletions(-) |
| 15 |
|
| 16 |
diff --git a/9999/0207-dirent-Deprecate-getdirentries.patch b/9999/0207-dirent-Deprecate-getdirentries.patch |
| 17 |
index 7b00018..f01ab67 100644 |
| 18 |
--- a/9999/0207-dirent-Deprecate-getdirentries.patch |
| 19 |
+++ b/9999/0207-dirent-Deprecate-getdirentries.patch |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-From 8180167096d51c9767888a695e60a542b64813f0 Mon Sep 17 00:00:00 2001 |
| 22 |
+From 7b990b41ea23c0464c60e6a9f0707adfb46ae587 Mon Sep 17 00:00:00 2001 |
| 23 |
From: Adhemerval Zanella <adhemerval.zanella@××××××.org> |
| 24 |
Date: Fri, 17 Apr 2020 09:59:51 -0300 |
| 25 |
Subject: [PATCH 7/7] dirent: Deprecate getdirentries |
| 26 |
@@ -17,16 +17,16 @@ The interface has some issues: |
| 27 |
|
| 28 |
The idea is to eventually move the symbols to compat ones. |
| 29 |
--- |
| 30 |
- NEWS | 5 +++++ |
| 31 |
+ NEWS | 6 ++++++ |
| 32 |
dirent/dirent.h | 14 ++++++++++---- |
| 33 |
- sysdeps/unix/sysv/linux/Makefile | 3 +++ |
| 34 |
- 3 files changed, 18 insertions(+), 4 deletions(-) |
| 35 |
+ sysdeps/unix/sysv/linux/Makefile | 4 ++++ |
| 36 |
+ 3 files changed, 20 insertions(+), 4 deletions(-) |
| 37 |
|
| 38 |
diff --git a/NEWS b/NEWS |
| 39 |
-index d9b344027b..a18a1d7a8c 100644 |
| 40 |
+index d9b344027b..45e51ae810 100644 |
| 41 |
--- a/NEWS |
| 42 |
+++ b/NEWS |
| 43 |
-@@ -7,6 +7,11 @@ using `glibc' in the "product" field. |
| 44 |
+@@ -7,6 +7,12 @@ using `glibc' in the "product" field. |
| 45 |
|
| 46 |
Version 2.34.1 |
| 47 |
|
| 48 |
@@ -34,12 +34,13 @@ index d9b344027b..a18a1d7a8c 100644 |
| 49 |
+ |
| 50 |
+* The function getdirentries is now deprecated, applications should use |
| 51 |
+ either getdents64, readdir64 or readdir. |
| 52 |
++ |
| 53 |
+ |
| 54 |
The following bugs are resolved with this release: |
| 55 |
|
| 56 |
[12889] nptl: Fix race between pthread_kill and thread exit |
| 57 |
diff --git a/dirent/dirent.h b/dirent/dirent.h |
| 58 |
-index 1d1fab7e55..8ad5fbf430 100644 |
| 59 |
+index 1d1fab7e55..eed030b379 100644 |
| 60 |
--- a/dirent/dirent.h |
| 61 |
+++ b/dirent/dirent.h |
| 62 |
@@ -348,29 +348,35 @@ extern int alphasort64 (const struct dirent64 **__e1, |
| 63 |
@@ -64,7 +65,7 @@ index 1d1fab7e55..8ad5fbf430 100644 |
| 64 |
__off64_t *__restrict __basep), |
| 65 |
- getdirentries64) __nonnull ((2, 4)); |
| 66 |
+ getdirentries64) |
| 67 |
-+ __THROW __nonnull ((2, 4)) |
| 68 |
++ __nonnull ((2, 4)) |
| 69 |
+ __attribute_deprecated_msg__ ("Use getdents64 instead"); |
| 70 |
# else |
| 71 |
# define getdirentries getdirentries64 |
| 72 |
@@ -83,19 +84,20 @@ index 1d1fab7e55..8ad5fbf430 100644 |
| 73 |
#endif /* Use misc. */ |
| 74 |
|
| 75 |
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile |
| 76 |
-index 76ad06361c..65ec7529f6 100644 |
| 77 |
+index 76ad06361c..2bfb6e254b 100644 |
| 78 |
--- a/sysdeps/unix/sysv/linux/Makefile |
| 79 |
+++ b/sysdeps/unix/sysv/linux/Makefile |
| 80 |
-@@ -313,6 +313,9 @@ tests += tst-getdents64 |
| 81 |
- # The tested readdir64 symbol was replaced in glibc 2.2. |
| 82 |
+@@ -314,6 +314,10 @@ tests += tst-getdents64 |
| 83 |
ifeq ($(have-GLIBC_2.1.3)$(build-shared),yesyes) |
| 84 |
tests += tst-readdir64-compat |
| 85 |
+ endif |
| 86 |
+ |
| 87 |
+# Avoid the warning for the weak_alias for _DIRENT_MATCHES_DIRENT64 |
| 88 |
-+CFLAGS-getdirentries64.c = -Wno-deprecated-declarations |
| 89 |
- endif |
| 90 |
++CFLAGS-getdirentries64.o = -Wno-deprecated-declarations |
| 91 |
++CFLAGS-getdirentries64.os = -Wno-deprecated-declarations |
| 92 |
endif # $(subdir) == dirent |
| 93 |
|
| 94 |
+ ifeq ($(subdir),nis) |
| 95 |
-- |
| 96 |
2.32.0 |
| 97 |
|
| 98 |
|
| 99 |
diff --git a/9999/0208-Build-fix-no-double-__THROW.patch b/9999/0208-Build-fix-no-double-__THROW.patch |
| 100 |
deleted file mode 100644 |
| 101 |
index 56c3afa..0000000 |
| 102 |
--- a/9999/0208-Build-fix-no-double-__THROW.patch |
| 103 |
+++ /dev/null |
| 104 |
@@ -1,29 +0,0 @@ |
| 105 |
-From fc24fb7c47dbe4e279a3853ee6eff6565348ca47 Mon Sep 17 00:00:00 2001 |
| 106 |
-From: Mike Gilbert <floppym@g.o> |
| 107 |
-Date: Wed, 5 Jan 2022 22:11:49 +0100 |
| 108 |
-Subject: [PATCH] Build fix (no double __THROW) |
| 109 |
-MIME-Version: 1.0 |
| 110 |
-Content-Type: text/plain; charset=UTF-8 |
| 111 |
-Content-Transfer-Encoding: 8bit |
| 112 |
- |
| 113 |
-Signed-off-by: Andreas K. Hüttel <dilfridge@g.o> |
| 114 |
---- |
| 115 |
- dirent/dirent.h | 2 +- |
| 116 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 117 |
- |
| 118 |
-diff --git a/dirent/dirent.h b/dirent/dirent.h |
| 119 |
-index 8ad5fbf430..eed030b379 100644 |
| 120 |
---- a/dirent/dirent.h |
| 121 |
-+++ b/dirent/dirent.h |
| 122 |
-@@ -363,7 +363,7 @@ extern __ssize_t __REDIRECT_NTH (getdirentries, |
| 123 |
- size_t __nbytes, |
| 124 |
- __off64_t *__restrict __basep), |
| 125 |
- getdirentries64) |
| 126 |
-- __THROW __nonnull ((2, 4)) |
| 127 |
-+ __nonnull ((2, 4)) |
| 128 |
- __attribute_deprecated_msg__ ("Use getdents64 instead"); |
| 129 |
- # else |
| 130 |
- # define getdirentries getdirentries64 |
| 131 |
--- |
| 132 |
-2.32.0 |
| 133 |
- |
Archives