diff --git a/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch b/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch index efb4009953e..781c7728b04 100644 --- a/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch +++ b/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch @@ -27,7 +27,7 @@ diff --git a/configure.ac b/configure.ac index 73415d2..ddde5c9 100644 --- a/configure.ac +++ b/configure.ac -@@ -26,50 +26,6 @@ AC_CACHE_CHECK([which IPC method to use], +@@ -26,53 +26,6 @@ AC_CACHE_CHECK([which IPC method to use] [ac_cv_use_ipc], [ac_cv_use_ipc=sysv]) @@ -59,13 +59,16 @@ index 73415d2..ddde5c9 100644 -}]])],[ac_cv_use_ipc=sysv],[ac_cv_use_ipc=tcp],[ac_cv_use_ipc=cross]) - - if test $ac_cv_use_ipc = cross; then -- if test "$host_os" = linux-gnu; then -- ac_cv_use_ipc=sysv -- AC_MSG_RESULT([cross, guessing yes]) -- else -- (set -o posix; set) -- AC_MSG_ERROR([cross compiling, unknown result for $host_os]) -- fi +- case "$host_os" in +- (linux-gnu*|linux-musl*) +- ac_cv_use_ipc=sysv +- AC_MSG_RESULT([cross, guessing yes]) +- ;; +- (*) +- (set -o posix; set) +- AC_MSG_ERROR([cross compiling, unknown result for $host_os]) +- ;; +- esac - elif test $ac_cv_use_ipc = "tcp"; then - AC_MSG_RESULT([No, using TCP]) - else diff --git a/srcpkgs/fakeroot/patches/do-not-redefine-id_t.patch b/srcpkgs/fakeroot/patches/do-not-redefine-id_t.patch deleted file mode 100644 index 43f911ac1bf..00000000000 --- a/srcpkgs/fakeroot/patches/do-not-redefine-id_t.patch +++ /dev/null @@ -1,23 +0,0 @@ -musl defines id_t as unsigned but doesn't use the _ID_T to detect its -definition. This causes the type to be redefined as an int by fakeroot -which causes a compilation error. - --- -Taken from Alpine Linux ports. - ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -133,13 +133,6 @@ - #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER) - #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER) - #define INT_SEND_GET_STAT(a,b) SEND_GET_STAT(a,b) -- --/* 10.10 uses id_t in getpriority/setpriority calls, so pretend -- id_t is used everywhere, just happens to be int on some OSes */ --#ifndef _ID_T --#define _ID_T --typedef int id_t; --#endif - #endif - - #include diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template index 038300b5ac8..fe7d48664ec 100644 --- a/srcpkgs/fakeroot/template +++ b/srcpkgs/fakeroot/template @@ -1,6 +1,6 @@ # Template file for 'fakeroot' pkgname=fakeroot -version=1.29 +version=1.37.1.1 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,8 +11,8 @@ short_desc="Gives a fake root environment" maintainer="Piraty " license="GPL-3.0-or-later" homepage="https://salsa.debian.org/clint/fakeroot" -distfiles="${DEBIAN_SITE}/main/f/fakeroot/${pkgname}_${version}.orig.tar.gz" -checksum=8fbbafb780c9173e3ace4a04afbc1d900f337f3216883939f5c7db3431be7c20 +distfiles="https://salsa.debian.org/clint/fakeroot/-/archive/upstream/${version}/fakeroot-upstream-${version}.tar.gz" +checksum=caeef85642445245e4e994ce3633d21718a0baf16d5398e280b3149cbfcfae35 lib32disabled=yes