mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-08-07 00:06:58 +02:00
b07b8c8b43
Bump to the next stable branch with the May 2025 update. Add a patch to compensate for gnulib-tool being further split up into independent shell and python implementations by using a non-hidden version of the main.py file. Add a patch for the python implementation of gnulib-tool in order to ignore the required version of autoconf in configure.ac being lower than the required version of autoconf for gnulib if the version that is being run exceeds the required version for both, and adjust existing autoconf version shell script patch to new filename. Backport a patch for a change in function naming convention for forward compatibility with tool releases after this stable branch. Added: - 020-python-version.patch - 021-python-main.patch - 500-acl-function-name.patch Manually Adjusted: - 010-autoconf-version.patch - 160-flag-reallocarray.patch Existing patches are automatically refreshed. Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16522 Signed-off-by: Robert Marko <robimarko@gmail.com>
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
--- a/lib/fcntl.c
|
|
+++ b/lib/fcntl.c
|
|
@@ -198,6 +198,8 @@ static int klibc_fcntl (int fd, int acti
|
|
FD_CLOEXEC is portable, but other flags may be present); otherwise
|
|
return -1 and set errno. */
|
|
|
|
+#if (GNULIB_defined_fcntl || GNULIB_defined_rpl_fcntl)
|
|
+
|
|
int
|
|
fcntl (int fd, int action, /* arg */...)
|
|
#undef fcntl
|
|
@@ -443,6 +445,8 @@ fcntl (int fd, int action, /* arg */...)
|
|
return result;
|
|
}
|
|
|
|
+#endif /* (GNULIB_defined_fcntl || GNULIB_defined_rpl_fcntl) */
|
|
+
|
|
static int
|
|
rpl_fcntl_DUPFD (int fd, int target)
|
|
{
|
|
--- a/lib/stdlib.in.h
|
|
+++ b/lib/stdlib.in.h
|
|
@@ -1508,10 +1508,16 @@ _GL_FUNCDECL_RPL (reallocarray, void *,
|
|
(void *ptr, size_t nmemb, size_t size));
|
|
_GL_CXXALIAS_RPL (reallocarray, void *,
|
|
(void *ptr, size_t nmemb, size_t size));
|
|
+# if !GNULIB_defined_rpl_reallocarray
|
|
+# define GNULIB_defined_rpl_reallocarray 1
|
|
+# endif
|
|
# else
|
|
# if ! @HAVE_REALLOCARRAY@
|
|
_GL_FUNCDECL_SYS (reallocarray, void *,
|
|
(void *ptr, size_t nmemb, size_t size));
|
|
+# if !GNULIB_defined_reallocarray
|
|
+# define GNULIB_defined_reallocarray 1
|
|
+# endif
|
|
# endif
|
|
_GL_CXXALIAS_SYS (reallocarray, void *,
|
|
(void *ptr, size_t nmemb, size_t size));
|
|
--- a/lib/reallocarray.c
|
|
+++ b/lib/reallocarray.c
|
|
@@ -23,6 +23,8 @@
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
|
|
+#if (GNULIB_defined_reallocarray || GNULIB_defined_rpl_reallocarray)
|
|
+
|
|
void *
|
|
reallocarray (void *ptr, size_t nmemb, size_t size)
|
|
{
|
|
@@ -36,3 +38,5 @@ reallocarray (void *ptr, size_t nmemb, s
|
|
/* Rely on the semantics of GNU realloc. */
|
|
return realloc (ptr, nbytes);
|
|
}
|
|
+
|
|
+#endif /* (GNULIB_defined_reallocarray || GNULIB_defined_rpl_reallocarray) */
|