mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
eeba2a67ca
This reverts commit 52167feff8.
Fakeroot 1.30.1 broke building on certain hosts (32-bit archs).
As of 2023-01-10, this was apparently fixed in source code,
however, the version is still 1.30.1 (patch release),
so the old binaries are removed from the repository and replaced,
but the source provided by the repository remains the same.
Furthermore, there are some complicated issues blocking
the "testing" release from being bumped to a 1.30.x version.
Considering all of this, it would likely be better for this package
to follow the "testing" release instead of the "unstable" release,
which is still 1.29-1, so revert to that.
Link: https://bugs.debian.org/1023286
Link: https://tracker.debian.org/news/1407613/accepted-fakeroot-1301-11-source-into-unstable/
Link: https://qa.debian.org/excuses.php?package=fakeroot
Link: https://bugs.debian.org/1027803
Signed-off-by: Michael Pratt <mcpratt@pm.me>
57 lines
2.4 KiB
Diff
57 lines
2.4 KiB
Diff
--- a/communicate.c
|
|
+++ b/communicate.c
|
|
@@ -441,6 +441,10 @@ void semaphore_down(){
|
|
|
|
#else /* FAKEROOT_FAKENET */
|
|
|
|
+#ifndef SOL_TCP
|
|
+# define SOL_TCP 6 /* this should probably be done with getprotoent */
|
|
+#endif
|
|
+
|
|
static struct sockaddr *get_addr(void)
|
|
{
|
|
static struct sockaddr_in addr = { 0, 0, { 0 } };
|
|
--- a/libfakeroot_inode64.c
|
|
+++ b/libfakeroot_inode64.c
|
|
@@ -25,7 +25,7 @@
|
|
#include "config.h"
|
|
#include "communicate.h"
|
|
|
|
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
|
|
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T
|
|
|
|
#include <stdio.h>
|
|
#include <spawn.h>
|
|
--- a/wrapfunc.inp
|
|
+++ b/wrapfunc.inp
|
|
@@ -48,9 +48,11 @@ getattrlist$UNIX2003;int;(const char *pa
|
|
#endif
|
|
#endif
|
|
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
|
|
+#if !__DARWIN_ONLY_64_BIT_INO_T
|
|
lstat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf)
|
|
stat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf)
|
|
fstat$INODE64;int;(int fd, struct stat *buf);(fd, buf)
|
|
+#endif
|
|
posix_spawn;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp)
|
|
posix_spawnp;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp)
|
|
#endif
|
|
@@ -229,7 +231,7 @@ facl;int;(int fd, int cmd, int cnt, void
|
|
#ifdef HAVE_FTS_READ
|
|
fts_read;FTSENT *;(FTS *ftsp);(ftsp)
|
|
#ifdef __APPLE__
|
|
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
|
|
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T
|
|
fts_read$INODE64;FTSENT *;(FTS *ftsp);(ftsp)
|
|
#endif
|
|
#endif /* ifdef __APPLE__ */
|
|
@@ -237,7 +239,7 @@ fts_read$INODE64;FTSENT *;(FTS *ftsp);(f
|
|
#ifdef HAVE_FTS_CHILDREN
|
|
fts_children;FTSENT *;(FTS *ftsp, int options);(ftsp, options)
|
|
#ifdef __APPLE__
|
|
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
|
|
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T
|
|
fts_children$INODE64;FTSENT *;(FTS *ftsp, int options);(ftsp, options)
|
|
#endif
|
|
#endif /* ifdef __APPLE__ */
|