mirrors/aports
2
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2024-09-20 11:23:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

main/fakeroot: upgrade to 1.36

Browse source
This commit is contained in:
omni 2024-09-10 00:06:52 +00:00 committed by Natanael Copa
parent 517a588a97
commit 921a40e052
8 changed files with 22 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
main/fakeroot/APKBUILD
View file

@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=fakeroot
pkgver=1.35.1
pkgrel=1
pkgver=1.36
pkgrel=0
provider_priority=100
pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
arch="all"
@ -17,10 +17,8 @@ source="https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig
fakeroot-stdint.patch
xstatjunk.patch
fix-shell-in-fakeroot.patch
fakeroot-skip-ipc-sanity-check.patch
fix-format.patch
t-xattr.patch
gcc14.patch
"
prepare() {
@ -57,13 +55,11 @@ package() {
}
sha512sums="
fae7d619d65e0a554c40b2e98ae0f81c92c75f6cc2ac9b5060c312e2080ed4be7691ebe8328e2980efb3516e2d5ecf44f17dd56d7e7c61b543f3e888405307bf fakeroot_1.35.1.orig.tar.gz
7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209 fakeroot-no64.patch
ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch
70bf7609a5951326ac7372a252a15516f96a1ee6e458a659b16f0e4f1e2db6556482c71178d4b2f10e5ebdc0abfb7a3cc97c9878984e60cdf6e7d7281790e1fc xstatjunk.patch
8c98b14fd4ab65649be54d9f6acf231f23bc0c1d04340bee0d3d26825f038623ab1a8ce211207d78a67e2c338fe115065068408dc42efd72579e206c11a0d3e9 fakeroot_1.36.orig.tar.gz
7eb500a64093e4f888adf6d0d5dacf62c3240f6940ebd894469753fd88804b9a2e7ce3bcbb73b6cd0693f92c507d86d70a332320af9f9ffed4de790b4f9c9e84 fakeroot-no64.patch
dee95b7d65e8e5a961d335af6b1f37bb92416fb7eb68b180582e982bb725ad3a5cc9f2526a4a19eec40ea449325f2d21491401ab2f222028926b4bc2279c1430 fakeroot-stdint.patch
a13c8fd7d8a4c69e1044b2ec54af1df0df997c39a561f394b001bce4e83a1334315ae093d7aa73e47d4f32b0358532d51793d701a174b45d52172260a56c9d10 xstatjunk.patch
47593b3d86a66bab832c50a1d967cdc70e42bbd9ef4436f18140067ccefdd6418516e5157102c67e604f3623ed1b9f4fe1423fc5dad4dfe5356fc250c12818a7 fix-shell-in-fakeroot.patch
9a3faf924891deb36fab8f200489ad6154df262735b563dea46283afcdc83d12d32b00db33848f2a5c52d0b4422942863247577634e37b9d693f2b3a398a0f1d fakeroot-skip-ipc-sanity-check.patch
481fac0b2b7388fbf8c6140311da856df1b8facfe331d04f2bc6275c766b8a81c1e07971ffd131aaf8416b8cda1f52fa4ed6d5f6ba913f69efe119288c016d78 fix-format.patch
70d09c2acb3abccddbb99cd1cb372679d4da6c01d3bab6a1dcf258b1decc88834ae7a5f61f15867ead035819e250f8b40fddcc83eb9ce82138fa18c756836b21 t-xattr.patch
b960e33dff0701d5b5df90db450133fae22ad3b8dbd9b3d861c7426aa6ef3a3f6a97d198cd4a0dbdff42fd175c445bb7d8300502e84ffa9ee50967d47309a907 gcc14.patch
3d5858080659e4430eb15353b5adb9cf668e56ea56789832a2498b507f9a6ca13161eb66e806d8ab0edfec36d5c93cc4374ffd2812ee400bbf093b99be723fae fix-format.patch
03edaee13bc7b9fa96b25e8539fd637d046631d7b37404a28adff72bfe0188df0def344b1696dcfaec87b1224b6ad1909263c3879a9ec7d62b833bb488ff29ac t-xattr.patch
"

2
main/fakeroot/fakeroot-no64.patch
View file

@ -1,6 +1,6 @@
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -81,12 +81,14 @@
@@ -86,12 +86,14 @@
#define SEND_STAT64(a,b,c) send_stat64(a,b,c)
#define SEND_GET_STAT(a,b) send_get_stat(a,b)
#define SEND_GET_STAT64(a,b) send_get_stat64(a,b)

59
main/fakeroot/fakeroot-skip-ipc-sanity-check.patch
View file

@ -1,59 +0,0 @@
This patch was original added in aports commit
439b449b68ebf3462a3f659804c41195e2d8d8ae. It
seems to be needed since this sanity checks
fails spuriously when cros compiling fakeroot.
diff -upr fakeroot-1.27.orig/configure.ac fakeroot-1.27/configure.ac
--- fakeroot-1.27.orig/configure.ac 2022-01-30 10:43:52.992260063 +0100
+++ fakeroot-1.27/configure.ac 2022-01-30 10:46:22.989526929 +0100
@@ -25,50 +25,6 @@ AC_CACHE_CHECK([which IPC method to use]
[ac_cv_use_ipc],
[ac_cv_use_ipc=sysv])
-if test $ac_cv_use_ipc = "sysv"; then
- AC_MSG_CHECKING([whether SysV IPC message queues are actually working on the host])
-
- AC_LANG_PUSH(C)
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <time.h>
-#include <unistd.h>
-
-int main() {
-
- srandom(time(NULL)+getpid()*33151);
- key_t msg_key = random();
- int msg_get = msgget(msg_key, IPC_CREAT|0600);
-
- if (msg_get==-1) {
- return 1;
- } else {
- msgctl(msg_get, IPC_RMID, NULL);
- return 0;
- }
-
-}]])],[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
- elif test $ac_cv_use_ipc = "tcp"; then
- AC_MSG_RESULT([No, using TCP])
- else
- AC_MSG_RESULT([Yes])
- fi
-
- AC_LANG_POP(C)
-fi
-
AC_ARG_WITH([dbformat],
AS_HELP_STRING([--with-dbformat@<:@=DBFORMAT@:>@],
[database format to use: either inode (default) or path]),

10
main/fakeroot/fakeroot-stdint.patch
View file

@ -1,6 +1,6 @@
--- fakeroot-1.18.2.orig/faked.c
+++ fakeroot-1.18.2/faked.c
@@ -514,11 +514,11 @@
--- a/faked.c
+++ b/faked.c
@@ -617,11 +617,11 @@ int save_database(const uint32_t remote)
#ifdef FAKEROOT_DB_PATH
if (find_path(i->buf.dev, i->buf.ino, roots, path))
@ -14,7 +14,7 @@
(uint64_t) i->buf.dev,(uint64_t) i->buf.ino,(uint64_t) i->buf.mode,
(uint64_t) i->buf.uid,(uint64_t) i->buf.gid,(uint64_t) i->buf.nlink,
(uint64_t) i->buf.rdev);
@@ -544,7 +544,7 @@
@@ -647,7 +647,7 @@ int load_database(const uint32_t remote)
while(1){
#ifdef FAKEROOT_DB_PATH
@ -23,7 +23,7 @@
&stmode, &stuid, &stgid, &stnlink, &strdev, &path);
if (r != 6)
break;
@@ -559,7 +559,7 @@
@@ -662,7 +662,7 @@ int load_database(const uint32_t remote)
stdev = path_st.st_dev;
stino = path_st.st_ino;
#else

8
main/fakeroot/fix-format.patch
View file

@ -4,9 +4,9 @@ to print them thereby relying on a specific representation
of these types.
diff -upr fakeroot-1.27.orig/faked.c fakeroot-1.27/faked.c
--- fakeroot-1.27.orig/faked.c 2022-01-17 21:37:21.000000000 +0100
+++ fakeroot-1.27/faked.c 2022-01-30 11:36:59.963019225 +0100
@@ -121,6 +121,7 @@
--- a/faked.c
+++ b/faked.c
@@ -123,6 +123,7 @@
#include <stdlib.h>
#include <string.h>
#include <signal.h>
@ -14,7 +14,7 @@ diff -upr fakeroot-1.27.orig/faked.c fakeroot-1.27/faked.c
#ifdef HAVE_STDINT_H
# include <stdint.h>
#endif
@@ -687,7 +688,7 @@ int load_database(const uint32_t remote)
@@ -689,7 +690,7 @@ int load_database(const uint32_t remote)
/* */
/*********************************/
void debug_stat(const struct fakestat *st){

26
main/fakeroot/gcc14.patch
View file

@ -1,26 +0,0 @@
diff --git a/communicate.c b/communicate.c
index 56eba7a..646836d 100644
--- a/communicate.c
+++ b/communicate.c
@@ -576,7 +576,7 @@ void send_get_fakem(struct fake_msg *buf)
&fm,
sizeof(fm)-sizeof(fm.mtype),0,0);
- ptr = &fm;
+ ptr = (uint8_t*)&fm;
for (k=0; k<16; k++) {
magic_candidate = *(uint32_t*)&ptr[k];
if (magic_candidate == FAKEROOT_MAGIC_LE || magic_candidate == FAKEROOT_MAGIC_BE) {
diff --git a/faked.c b/faked.c
index e0d060a..9e05c27 100644
--- a/faked.c
+++ b/faked.c
@@ -1090,7 +1090,7 @@ void get_msg()
do {
r=msgrcv(msg_get,&fm,sizeof(struct fake_msg_buf),0,0);
- ptr = &fm;
+ ptr = (uint8_t*)&fm;
for (k=0; k<16; k++) {
magic_candidate = *(uint32_t*)&ptr[k];
if (magic_candidate == FAKEROOT_MAGIC_LE || magic_candidate == FAKEROOT_MAGIC_BE) {

8
main/fakeroot/t-xattr.patch
View file

@ -1,14 +1,12 @@
runs when getcap is available, and setting a cap in fakeroot is forbidden so it fails
--
diff --git a/test/Makefile.am b/test/Makefile.am
index 497de99..b2723a3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -12,8 +12,7 @@ TESTS = \
t.option \
@@ -13,8 +13,7 @@ TESTS = \
t.perlstat \
t.tar \
t.touchinstall \
- t.truereturn \
- t.truereturn \
- t.xattr
+ t.truereturn

2
main/fakeroot/xstatjunk.patch
View file

@ -2,7 +2,7 @@ diff --git a/configure.ac b/configure.ac
index 9613183..e4a9bbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -385,7 +385,7 @@ for SEARCH in %stat f%stat l%stat f%statat %stat64 f%stat64 l%stat64 f%statat64
@@ -428,7 +428,7 @@ for SEARCH in %stat f%stat l%stat f%stat
FUNC=`echo $SEARCH|sed -e 's/.*%//'`
PRE=`echo $SEARCH|sed -e 's/%.*//'`
FOUND=