From: kruceter <kruceter@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] fakeroot: update to 1.30.1.
Date: Mon, 21 Nov 2022 02:16:36 +0100 [thread overview]
Message-ID: <20221121011636.KB3CfTu60ryBWqayGjvtuDBRPR0t_EMzBCK8haL3FSs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40644@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages fakeroot
https://github.com/void-linux/void-packages/pull/40644
fakeroot: update to 1.30.1.
This package was built with GCC 12 unless noted otherwise. No errors to report.
* [fakeroot.x86_64.txt](https://github.com/void-linux/void-packages/files/10049616/fakeroot.x86_64.txt)
* [fakeroot.x86_64-musl.txt](https://github.com/void-linux/void-packages/files/10049617/fakeroot.x86_64-musl.txt)
* [fakeroot.armv6l-musl-gcc10.2.txt](https://github.com/void-linux/void-packages/files/10049614/fakeroot.armv6l-musl-gcc10.2.txt)
Refer to #39960.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64
- armv6l-musl (crossbuild; GCC 10.2)
A patch file from https://github.com/void-linux/void-packages/pull/40644.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fakeroot-40644.patch --]
[-- Type: text/x-diff, Size: 5403 bytes --]
From 70cff0e7f208af72a5f9fb302fa5a79dc22675d3 Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 20 Nov 2022 15:07:51 +0300
Subject: [PATCH] fakeroot: update to 1.29.
---
.../cross-dont-run-sysv-ipc-test.patch | 16 +++++++++----
.../patches/do-not-redefine-id_t.patch | 23 +++++++++++++++++++
.../fakeroot/patches/fakeroot-stdint.patch | 17 ++++++++++++++
srcpkgs/fakeroot/template | 13 ++++++-----
4 files changed, 59 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/fakeroot/patches/do-not-redefine-id_t.patch
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 e8774f898ae3..efb4009953ea 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
-@@ -25,42 +25,6 @@ AC_CACHE_CHECK([which IPC method to use],
+@@ -26,50 +26,6 @@ AC_CACHE_CHECK([which IPC method to use],
[ac_cv_use_ipc],
[ac_cv_use_ipc=sysv])
@@ -35,7 +35,7 @@ index 73415d2..ddde5c9 100644
- AC_MSG_CHECKING([whether SysV IPC message queues are actually working on the host])
-
- AC_LANG_PUSH(C)
-- AC_TRY_RUN([
+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
@@ -56,9 +56,17 @@ index 73415d2..ddde5c9 100644
- return 0;
- }
-
--}], [ac_cv_use_ipc=sysv], [ac_cv_use_ipc=tcp])
+-}]])],[ac_cv_use_ipc=sysv],[ac_cv_use_ipc=tcp],[ac_cv_use_ipc=cross])
-
-- if test $ac_cv_use_ipc = "tcp"; then
+- 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
+- elif test $ac_cv_use_ipc = "tcp"; then
- AC_MSG_RESULT([No, using TCP])
- else
- AC_MSG_RESULT([Yes])
diff --git a/srcpkgs/fakeroot/patches/do-not-redefine-id_t.patch b/srcpkgs/fakeroot/patches/do-not-redefine-id_t.patch
new file mode 100644
index 000000000000..43f911ac1bf7
--- /dev/null
+++ b/srcpkgs/fakeroot/patches/do-not-redefine-id_t.patch
@@ -0,0 +1,23 @@
+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 <sys/types.h>
diff --git a/srcpkgs/fakeroot/patches/fakeroot-stdint.patch b/srcpkgs/fakeroot/patches/fakeroot-stdint.patch
index efe227d0386a..fe67bf3af667 100644
--- a/srcpkgs/fakeroot/patches/fakeroot-stdint.patch
+++ b/srcpkgs/fakeroot/patches/fakeroot-stdint.patch
@@ -1,5 +1,13 @@
--- a/faked.c
+++ b/faked.c
+@@ -121,6 +121,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <signal.h>
++#include <inttypes.h>
+ #ifdef HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
@@ -514,11 +514,11 @@
#ifdef FAKEROOT_DB_PATH
@@ -32,3 +40,12 @@
&stdev, &stino, &stmode, &stuid, &stgid, &stnlink, &strdev);
if (r != 7)
break;
+@@ -687,7 +688,7 @@ int load_database(const uint32_t remote)
+ /* */
+ /*********************************/
+ void debug_stat(const struct fakestat *st){
+- fprintf(stderr,"dev:ino=(%llx:%lli), mode=0%lo, own=(%li,%li), nlink=%li, rdev=%lli\n",
++ fprintf(stderr,"dev:ino=(%"PRIx64":%"PRIu64"), mode=0%lo, own=(%li,%li), nlink=%li, rdev=%"PRIu64"\n",
+ st->dev,
+ st->ino,
+ (long)st->mode,
diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template
index 46b0b07183e5..1e953f4be23b 100644
--- a/srcpkgs/fakeroot/template
+++ b/srcpkgs/fakeroot/template
@@ -1,7 +1,7 @@
# Template file for 'fakeroot'
pkgname=fakeroot
-version=1.25.3
-revision=2
+version=1.29
+revision=1
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="automake libtool"
@@ -12,7 +12,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
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=8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c
+checksum=8fbbafb780c9173e3ace4a04afbc1d900f337f3216883939f5c7db3431be7c20
lib32disabled=yes
@@ -29,8 +29,9 @@ post_patch() {
# disable failing tests
#
- # depends on chown which dosn't work in chroot
- vsed -i test/Makefile.am -e '/ t\.tar/d'
+ # depends on chown which doesn't work in chroot
+ vsed -i test/Makefile.am \
+ -e '/ t\.tar/d'
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
#mknod: Operation not permitted
vsed -i test/Makefile.am \
@@ -45,7 +46,7 @@ post_patch() {
}
pre_configure() {
- sh ./bootstrap
+ ./bootstrap
}
pre_check() {
next prev parent reply other threads:[~2022-11-21 1:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-20 12:14 [PR PATCH] " kruceter
2022-11-20 12:18 ` [PR PATCH] [Updated] " kruceter
2022-11-21 1:16 ` kruceter [this message]
2022-12-03 7:04 ` [PR PATCH] [Merged]: fakeroot: update to 1.29 sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221121011636.KB3CfTu60ryBWqayGjvtuDBRPR0t_EMzBCK8haL3FSs@z \
--to=kruceter@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).