matter/desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: move patches to local directory

Browse Source
This commit is contained in:
ngn 2024-08-11 21:51:44 +03:00
parent 0e77bf7146
commit 98437412df
5 changed files with 2119 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/fakechroot/100.patch Normal file
View File

@ -0,0 +1,30 @@
From 58db62c4e754df555386c73b5e8f6f6849f1dbb3 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 1 Oct 2021 12:17:26 +0200
Subject: [PATCH] rel2abs: Only call getcwd_real for relative paths
---
src/rel2abs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/rel2abs.c b/src/rel2abs.c
index f8c27af9..899953a2 100644
--- a/src/rel2abs.c
+++ b/src/rel2abs.c
@@ -46,13 +46,13 @@ LOCAL char * rel2abs(const char * name, char * resolved)
goto end;
}
- getcwd_real(cwd, FAKECHROOT_PATH_MAX - 1);
- narrow_chroot_path(cwd);
-
if (*name == '/') {
strlcpy(resolved, name, FAKECHROOT_PATH_MAX);
}
else {
+ getcwd_real(cwd, FAKECHROOT_PATH_MAX - 1);
+ narrow_chroot_path(cwd);
+
snprintf(resolved, FAKECHROOT_PATH_MAX, "%s/%s", cwd, name);
}

1882
src/fakechroot/104.patch Normal file
View File

File diff suppressed because it is too large Load Diff

22
src/fakechroot/80.patch Normal file
View File

@ -0,0 +1,22 @@
From e291eb96db42f20a55f917aae660d416d624acaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Fri, 4 Dec 2020 09:30:42 -0500
Subject: [PATCH] Fix typo in AC_PATH_PROG for ldconfig
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index f8cdb323..d391494d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ AC_PATH_PROG([ENV], [env], [/usr/bin/env], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/l
AC_PATH_PROG([FAKEROOT], [fakeroot], [/usr/bin/fakeroot], [/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
AC_PATH_PROG([INSSERV], [insserv], [/sbin/insserv], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH])
AC_PATH_PROG([ISCHROOT], [ischroot], [/usr/bin/ischroot], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
-AC_PATH_PROG([LDCONFIG], [ldconfig], [/sbin/chroot], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH])
+AC_PATH_PROG([LDCONFIG], [ldconfig], [/sbin/ldconfig], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH])
AC_PATH_PROG([LDD], [ldd], [/usr/bin/ldd], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
AC_PATH_PROG([LS], [ls], [/bin/ls], [/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
AC_PATH_PROG([MKFIFO], [mkfifo], [/usr/bin/mkfifo], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])

178
src/fakechroot/93.patch Normal file
View File

@ -0,0 +1,178 @@
From e6ce10f50726ac926b9e90710117e8be6c8c8074 Mon Sep 17 00:00:00 2001
From: Christopher Yeleighton <ne01026@shark.2a.pl>
Date: Thu, 29 Apr 2021 15:06:53 +0200
Subject: [PATCH 1/7] build action
---
.github/workflows/c-cpp.yml | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 .github/workflows/c-cpp.yml
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
new file mode 100644
index 00000000..e3233268
--- /dev/null
+++ b/.github/workflows/c-cpp.yml
@@ -0,0 +1,23 @@
+name: C/C++ CI
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: configure
+ run: ./configure
+ - name: make
+ run: make
+ - name: make check
+ run: make check
+ - name: make distcheck
+ run: make distcheck
From aedcacc4c3703d34d829a3d77cf8382d445b6429 Mon Sep 17 00:00:00 2001
From: Christopher Yeleighton <ne01026@shark.2a.pl>
Date: Thu, 29 Apr 2021 15:08:54 +0200
Subject: [PATCH 2/7] autogen.sh
---
.github/workflows/c-cpp.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index e3233268..ac02906d 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -14,7 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: configure
- run: ./configure
+ run: |
+ for t in autogen.sh configure
+ do sh "$t"
+ done
- name: make
run: make
- name: make check
From 1cb53cfadf5f1dff1d46d27716e35b53c89cdb9d Mon Sep 17 00:00:00 2001
From: Christopher Yeleighton <ne01026@shark.2a.pl>
Date: Thu, 29 Apr 2021 15:23:25 +0200
Subject: [PATCH 3/7] upload test log
---
.github/workflows/c-cpp.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index ac02906d..0d46b938 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -24,3 +24,9 @@ jobs:
run: make check
- name: make distcheck
run: make distcheck
+ continue-on-error: true
+ - name: upload test log
+ uses: actions/upload-artifact@v2.2.3
+ with:
+ name: test-log
+ path: test/test-suite.log
From bca711379020d17a26a3c2c313a11aa28c6d9653 Mon Sep 17 00:00:00 2001
From: Christopher Yeleighton <ne01026@shark.2a.pl>
Date: Fri, 30 Apr 2021 09:16:01 +0200
Subject: [PATCH 4/7] path: fakechroot-2.20.2/_build/sub/
---
.github/workflows/c-cpp.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 0d46b938..cc65f078 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -29,4 +29,4 @@ jobs:
uses: actions/upload-artifact@v2.2.3
with:
name: test-log
- path: test/test-suite.log
+ path: fakechroot-2.20.2/_build/sub/test/test-suite.log
From 953fed82a2fff84c7f7ebed09eee1cddeb8578a3 Mon Sep 17 00:00:00 2001
From: Christopher Yeleighton <ne01026@shark.2a.pl>
Date: Fri, 30 Apr 2021 09:18:08 +0200
Subject: [PATCH 5/7] branches: [ fix-dist-check ]
---
.github/workflows/c-cpp.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index cc65f078..38ec05a1 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -2,7 +2,7 @@ name: C/C++ CI
on:
push:
- branches: [ master ]
+ branches: [ fix-dist-check ]
pull_request:
branches: [ master ]
From e1a5c99000d932df43125fd444d82691948680fd Mon Sep 17 00:00:00 2001
From: Christopher Yeleighton <ne01026@shark.2a.pl>
Date: Fri, 30 Apr 2021 10:19:10 +0200
Subject: [PATCH 6/7] cd "../.."
---
test/bin/fakechroot | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/bin/fakechroot b/test/bin/fakechroot
index 315cb100..4904d33e 100755
--- a/test/bin/fakechroot
+++ b/test/bin/fakechroot
@@ -1,7 +1,7 @@
#!/bin/sh
pwd=`dirname $0`
-abs_top_srcdir=${abs_top_srcdir:-`cd "$pwd/../.." 2>/dev/null && pwd -P`}
+abs_top_srcdir=${abs_top_srcdir:-`cd "../.." 2>/dev/null && pwd -P`}
PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
export PATH
From a854440ba208892435f00461024a0a0cfb7168c1 Mon Sep 17 00:00:00 2001
From: Christopher Yeleighton <ne01026@shark.2a.pl>
Date: Fri, 30 Apr 2021 10:22:10 +0200
Subject: [PATCH 7/7] cd ".."
---
test/bin/fakechroot | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/bin/fakechroot b/test/bin/fakechroot
index 4904d33e..122c991c 100755
--- a/test/bin/fakechroot
+++ b/test/bin/fakechroot
@@ -1,7 +1,7 @@
#!/bin/sh
pwd=`dirname $0`
-abs_top_srcdir=${abs_top_srcdir:-`cd "../.." 2>/dev/null && pwd -P`}
+abs_top_srcdir=${abs_top_srcdir:-`cd ".." 2>/dev/null && pwd -P`}
PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
export PATH

14
src/fakechroot/pkg.sh
View File

@ -3,21 +3,21 @@ DESC="A tool for creating fake chroot enviroments"
VERSION="2.20.1"
FILES=(
"https://github.com/dex4er/fakechroot/archive/$VERSION.tar.gz"
"https://github.com/dex4er/fakechroot/pull/80.patch"
"https://github.com/dex4er/fakechroot/pull/100.patch"
"https://github.com/dex4er/fakechroot/pull/104.patch"
"https://github.com/dex4er/fakechroot/pull/93.patch"
"80.patch"
"93.patch"
"100.patch"
"104.patch"
"statx.patch"
)
HASHES=(
"69612efa06636e79a56898512222b0fc"
"7715c50ff332ee727afb834cd0f4b13f727d8152cff86ee0b8bebb286431b820f2a4e30a16655cf1e9f23c38cc31993a8563ca3aa08f10fa779894f282d20d51"
"655f3c589d0c1958df0573b5d86e5541d0a31743d50e35347099679d41574f00ac5c6f13e74629073ebc1bbe138b6ac513abd47590d780adebe1d04c8c8c5194"
"45d0970289e4c4a2f74d92fa5e157bdd8941763ee631288a7a948afd43f751414fa6bc4c99db165a0ef90c5daeede2a297c20e73b7b0305a574e99ffce647870"
"6a176a6a123efe5ff554b22dc0492a819f71581bdc38bc14a45ff61f163b8f2c6536bd1d559e2554bb08d4b7a59b87889bc99315995bfc8e2da1b28cf92c8def"
"655f3c589d0c1958df0573b5d86e5541d0a31743d50e35347099679d41574f00ac5c6f13e74629073ebc1bbe138b6ac513abd47590d780adebe1d04c8c8c5194"
"6545570c70c42e4753561687ea9eafb301aa6c7ad1f669212629232bd70275a90cc19129d0824a729884b1055e5155920bbd5b521b54fd450031bb25258d2970"
"9da94ccffd8992e27a7de9b7e37d655b301036120b808dda23942a32228e8ad4"
)
DEPENDS=("perl")
DEPENDS=("perl" "bash")
PACKAGE() {
tar xf $VERSION.tar.gz