mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-13 00:28:25 +02:00
main/abuild: upgrade to 3.17.0_rc2
This commit is contained in:
Natanael Copa
parent
6acc0fdf9d
commit
e6a062fe7c
@ -1,66 +0,0 @@
|
||||
From 101096e40aca1015206bea033cd4570eb947c453 Mon Sep 17 00:00:00 2001
|
||||
From: Natanael Copa <ncopa@alpinelinux.org>
|
||||
Date: Wed, 15 Apr 2026 21:29:46 +0200
|
||||
Subject: [PATCH] Revert "Make -pyc packages mandatory"
|
||||
|
||||
Making -pyc mandatory creates problems for building python3 itself,
|
||||
which has pyc0 pyc1 and what-not.
|
||||
|
||||
>>> ERROR: python3-tests*: Found __pycache__ but package name doesn't end with -pyc
|
||||
|
||||
Revert for now.
|
||||
|
||||
This reverts commit e092af60c4f49a5d218b9a109bcfda5146c9a555.
|
||||
---
|
||||
abuild.in | 3 +--
|
||||
tests/abuild_test | 6 +++---
|
||||
2 files changed, 4 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/abuild.in b/abuild.in
|
||||
index 057eb69..5eff392 100644
|
||||
--- a/abuild.in
|
||||
+++ b/abuild.in
|
||||
@@ -855,8 +855,7 @@ postcheck() {
|
||||
# trying to calculate the python version.
|
||||
i="$(find "$dir"/usr/lib/python* \( -type d -a -name "__pycache__" \) 2>/dev/null || :)"
|
||||
if [ -n "$i" ] && [ "${name%-pyc}" = "$name" ]; then
|
||||
- error "Found __pycache__ but package name doesn't end with -pyc"
|
||||
- e=1
|
||||
+ warning "Found __pycache__ but package name doesn't end with -pyc"
|
||||
fi
|
||||
# look for /usr/share/nftables.avail
|
||||
if [ -e "$dir"/usr/share/nftables.avail ]; then
|
||||
diff --git a/tests/abuild_test b/tests/abuild_test
|
||||
index f59d086..af34588 100755
|
||||
--- a/tests/abuild_test
|
||||
+++ b/tests/abuild_test
|
||||
@@ -46,7 +46,7 @@ init_tests \
|
||||
abuild_cleanoldpkg \
|
||||
abuild_clean \
|
||||
abuild_path_with_spaces \
|
||||
- abuild_pyc_error \
|
||||
+ abuild_pyc_warn \
|
||||
abuild_pyc \
|
||||
abuild_setcap_binary \
|
||||
abuild_setcap_binary_with_option \
|
||||
@@ -1226,7 +1226,7 @@ abuild_path_with_spaces_body() {
|
||||
abuild -d
|
||||
}
|
||||
|
||||
-abuild_pyc_error_body() {
|
||||
+abuild_pyc_warn_body() {
|
||||
init_keys
|
||||
|
||||
mkdir -p pycachetest
|
||||
@@ -1248,7 +1248,7 @@ abuild_pyc_error_body() {
|
||||
}
|
||||
EOF
|
||||
|
||||
- atf_check -s exit:1 -e match:"ERROR.*pyc*" abuild rootpkg
|
||||
+ atf_check -e match:"WARNING.*pyc*" abuild rootpkg
|
||||
}
|
||||
|
||||
abuild_pyc_body() {
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From 25a4c47c31c7a328efc5e60d3dd54bb9af100027 Mon Sep 17 00:00:00 2001
|
||||
From: Natanael Copa <ncopa@alpinelinux.org>
|
||||
Date: Sat, 18 Apr 2026 08:35:47 +0200
|
||||
Subject: [PATCH] Revert "abuild: add nftrules postcheck"
|
||||
|
||||
The nftrules postcheck made it impossible for any package to create the
|
||||
/etc/nftables.d directory and broke the nftables package itself.
|
||||
|
||||
This reverts commit 7352ab6de59291a81cca6a92b34ae69f5b89beb2.
|
||||
---
|
||||
abuild.in | 16 ----------------
|
||||
1 file changed, 16 deletions(-)
|
||||
|
||||
diff --git a/abuild.in b/abuild.in
|
||||
index 5eff392..461cf12 100644
|
||||
--- a/abuild.in
|
||||
+++ b/abuild.in
|
||||
@@ -857,17 +857,6 @@ postcheck() {
|
||||
if [ -n "$i" ] && [ "${name%-pyc}" = "$name" ]; then
|
||||
warning "Found __pycache__ but package name doesn't end with -pyc"
|
||||
fi
|
||||
- # look for /usr/share/nftables.avail
|
||||
- if [ -e "$dir"/usr/share/nftables.avail ]; then
|
||||
- if ! is_nftrules_pkg "$name"; then
|
||||
- warning "Found /usr/share/nftables.avail but package doesn't end with -nftrules"
|
||||
- fi
|
||||
- fi
|
||||
- # error on automatic nftables rule activation
|
||||
- if [ -e "$dir"/etc/nftables.d ]; then
|
||||
- error "Packages must not put anything under /etc/nftables.d, use /usr/share/nftables.avail instead"
|
||||
- e=1
|
||||
- fi
|
||||
|
||||
# check that we don't have any files names with newline
|
||||
i=$(find "$dir" -name $'*\n*')
|
||||
@@ -1429,11 +1418,6 @@ is_openrc_pkg() {
|
||||
test "${1%-openrc}" != "$1"
|
||||
}
|
||||
|
||||
-# returns true if this is the -nftrules package
|
||||
-is_nftrules_pkg() {
|
||||
- test "${1%-nftrules}" != "$1"
|
||||
-}
|
||||
-
|
||||
# returns true if this is the -systemd package
|
||||
is_systemd_pkg() {
|
||||
test "${1%-systemd}" != "$1" || test "systemd" = "$1"
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=abuild
|
||||
pkgver=3.17.0_rc1
|
||||
pkgrel=2
|
||||
pkgver=3.17.0_rc2
|
||||
pkgrel=0
|
||||
pkgdesc="Script to build Alpine Packages"
|
||||
url="https://gitlab.alpinelinux.org/alpine/abuild/"
|
||||
arch="all"
|
||||
@ -35,8 +35,6 @@ options="suid"
|
||||
pkggroups="abuild"
|
||||
source="https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$pkgver/abuild-$pkgver.tar.gz
|
||||
replaces.patch
|
||||
0001-Revert-Make-pyc-packages-mandatory.patch
|
||||
0001-Revert-abuild-add-nftrules-postcheck.patch
|
||||
"
|
||||
builddir="$srcdir"/abuild-$pkgver
|
||||
|
||||
@ -121,8 +119,6 @@ _sudo() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
06ea96f26a77b98e0e9cb6f2fec501891cb1afb95dc2662a2726b0570b08bff9a8feaa54f175e77aa06779c8a92a248a7484c7d27d4516d3e10eedcfa10e8e87 abuild-3.17.0_rc1.tar.gz
|
||||
315ca7165934ec637fc651db8251935b80617db39d90de8a184cb370423e4ee46cae4634d6cc48e20d2c42a2011e058b7f88bd72484c09a24f98a0cee2942e51 abuild-3.17.0_rc2.tar.gz
|
||||
cfd35e2ff55c3d24ffe1ed6d5427bc3a9d33f83b340e001d84d57e9ed8de66a1fc6600d634f914a2a26a8b6545a5ba6255ca828b09c80d5d1ef8a893f374c8bb replaces.patch
|
||||
91c54160eff301d22ea29296a32c31320dda40571685e6a620f779149c12222210b685aa8c693cebe3553eedef0a6bbdba041793a0226b04160d80f03a02b584 0001-Revert-Make-pyc-packages-mandatory.patch
|
||||
f94c03f4534c6db17264e191612ec38e4a75c005f06000b9330eb08cf261d258eaa0923afca0eaaf420a321506bc13c19a90f86262286efdc4cbfb31714c340e 0001-Revert-abuild-add-nftrules-postcheck.patch
|
||||
"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user