aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2024-04-21 10:41:12 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2024-04-21 10:41:12 +0200
commit05cfd758937e7f34d9748890719580a73b97035a (patch)
tree3a1c09f53b44f8c3ff48c9e2459bb6d9bea02225
parent26a12f172e552d8d502365717a57f32460081ffb (diff)
main/abuild: revert fhs check of /var/run
We have a significant number of packages that put something under /var/run. Revert the strict check and lets reconsider this after 3.20.
-rw-r--r--main/abuild/0001-abuild-skip-var-run-in-fhs-check.patch29
-rw-r--r--main/abuild/APKBUILD4
2 files changed, 32 insertions, 1 deletions
diff --git a/main/abuild/0001-abuild-skip-var-run-in-fhs-check.patch b/main/abuild/0001-abuild-skip-var-run-in-fhs-check.patch
new file mode 100644
index 00000000000..31a2ea3ba7d
--- /dev/null
+++ b/main/abuild/0001-abuild-skip-var-run-in-fhs-check.patch
@@ -0,0 +1,29 @@
+From 68d6aa65f43557de008abc7ec97856906bf5e657 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Sun, 21 Apr 2024 10:35:19 +0200
+Subject: [PATCH] abuild: skip /var/run in fhs check
+
+We have many package containing directories under /var/run. Allow those
+for now.
+
+Partially reverts commit 08d2d81587d9 (abuild: extend fhs check)
+---
+ abuild.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/abuild.in b/abuild.in
+index f873620..0f70a4b 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -782,7 +782,7 @@ postcheck() {
+ msg "Running postcheck for $name"
+ # checking for FHS compat
+ if ! options_has "!fhs"; then
+- for i in srv usr/local opt var/run tmp var/tmp var/lock var/empty home sys proc mnt dev; do
++ for i in srv usr/local opt tmp var/tmp var/lock var/empty home sys proc mnt dev; do
+ for j in "$dir"/"$i"/* "$dir"/"$i"/.[!.]* "$dir"/"$i"/..?*; do
+ if [ -L "$j" ] || [ -e "$j" ]; then
+ error "Packages must not put anything under /$i"
+--
+2.44.0
+
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index c59d1781daa..2aab2588e86 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=3.13.0
_ver=${pkgver%_git*}
-pkgrel=2
+pkgrel=3
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -38,6 +38,7 @@ pkggroups="abuild"
source="https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$pkgver/abuild-$pkgver.tar.gz
0001-abuild-pass-APORTS_BOOTSTRAP-to-bubblewrap.patch
0001-abuild-allow-packages-to-install-under-run.patch
+ 0001-abuild-skip-var-run-in-fhs-check.patch
"
builddir="$srcdir"/abuild-$pkgver
@@ -125,4 +126,5 @@ sha512sums="
9aa46693984bd65a1a940d4547239e0a10170e82f186ab231b0d3a26b09a75cf258fae0e16f936e79cf52353dce9fc8a18881e84042b7961f390aba3f34d88da abuild-3.13.0.tar.gz
2d7cf76202bd50e97fa3ed517c82dd94cbddd27b43d51e41e97c4281092565046aa55cab0869b20753c6bc1d592194528700a779426b67177b9ee7632c943742 0001-abuild-pass-APORTS_BOOTSTRAP-to-bubblewrap.patch
f7a4240972d33be36931527f4764cb8852989f724406cc079567e71875e7ca7b4c897755770a26f9901ebe9faf166d0e8eb88cb028cbf012f55ddd6efad47e6e 0001-abuild-allow-packages-to-install-under-run.patch
+b94819e61a0a5a7a835bbf7d879371ff1f1573e93c40bb9f7a05b8a54fafbf8fe9234ddaefc2f0dc280d918639fe4193422fa8a56225c622d65466049efe9824 0001-abuild-skip-var-run-in-fhs-check.patch
"