...
 
Commits (3)
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=abuild
pkgver=3.3.1
pkgrel=3
pkgrel=4
pkgdesc="Script to build APK packages"
url="https://code.foxkit.us/adelie/abuild"
arch="all"
......@@ -21,6 +21,8 @@ pkggroups="abuild"
source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz
keyhole.patch
auto-dev-symbols.patch
bang.patch
modernise.patch
"
builddir="$srcdir/$pkgname-$pkgver+adelie"
......@@ -58,4 +60,6 @@ _rootbld() {
sha512sums="c358f84d198527eeeac1a1aacc101174e18f9f34f692b12a4e4deb6b32d5f3ebdc703c90de6a6f81f195a81eebb90a11f9bfea13ef5db531d9b5d5ae6ecd6a66 abuild-3.3.1+adelie.tar.xz
757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch
2aa43539fc465f5abdc7c3d994363b80d1f7494c2d659093e5a2c45056e07617506ad8ea98f0e7d4ebe2596802b76605cd7c9f3ffc5a30c488c30bb36248e3d2 auto-dev-symbols.patch"
2aa43539fc465f5abdc7c3d994363b80d1f7494c2d659093e5a2c45056e07617506ad8ea98f0e7d4ebe2596802b76605cd7c9f3ffc5a30c488c30bb36248e3d2 auto-dev-symbols.patch
0fccb03673f2f72a7bd2d2afd1c79141eeb73b3119e83fff966fb8a2851c0484912be70a7b384be1dc384c344cf27427e2fc2426c2f9bf56aa5625f32436524d bang.patch
b5b200da56c4319d332a7c5ddf38879fba0a4af723e1c6492f80a101afc8711d978dd7e1e5c31c80ed7fee15dcb19e7c449c92761b509a8063e417869885edc5 modernise.patch"
diff --git a/abuild.in b/abuild.in
index acee26f..6e06f29 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
# abuild - build apk packages (light version of makepkg)
# Copyright (c) 2008-2015 Natanael Copa <ncopa@alpinelinux.org>
From 9221c1d06e9185b734d58c155764ed24fcfc48ed Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 14 Jan 2020 04:46:41 -0600
Subject: [PATCH 1/2] newapkbuild: Drastically modernise output APKBUILD file
---
newapkbuild.in | 44 +++++++++++++++++++++++++++++++-------------
1 file changed, 31 insertions(+), 13 deletions(-)
diff --git a/newapkbuild.in b/newapkbuild.in
index 85f838f..dbcef14 100644
--- a/newapkbuild.in
+++ b/newapkbuild.in
@@ -68,13 +68,9 @@ build_cmake() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \\
-DCMAKE_CXX_FLAGS="\$CXXFLAGS" \\
-DCMAKE_C_FLAGS="\$CFLAGS" \\
- \${CMAKE_CROSSOPTS}
+ \${CMAKE_CROSSOPTS} \\
+ .
make
-}
-
-check() {
- cd "\$builddir"
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
__EOF__
}
@@ -115,6 +111,12 @@ check_make() {
__EOF__
}
+check_cmake() {
+ cat >>APKBUILD<<__EOF__
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+__EOF__
+}
+
check_python() {
cat >>APKBUILD<<__EOF__
python3 setup.py test
@@ -193,7 +195,7 @@ newaport() {
python) makedepends="python3-dev";;
cmake) makedepends="cmake";;
meson) makedepends="meson";;
- *) makedepends="\$depends_dev";;
+ *) makedepends="";;
esac
# Replace pkgver in $source
@@ -226,9 +228,15 @@ url="$url"
arch="all"
license="$license"
depends="$depends"
-depends_dev=""
makedepends="$makedepends"
+__EOF__
+ if [ -n "$install" ]; then
+ cat >>APKBUILD<<__EOF__
install="$install"
+__EOF__
+ fi
+
+ cat >>APKBUILD<<__EOF__
subpackages="\$pkgname-dev \$pkgname-doc"
source="$source"
__EOF__
@@ -241,7 +249,12 @@ __EOF__
builddir=$(echo ${i#*/} | sed "s/$pv/\$pkgver/g")
fi
done
- printf 'builddir="$srcdir/%s"\n\n' "$builddir" >> APKBUILD
+ if [ -n "$sdir" ] && [ "$sdir" = "src/$pkgname-$pv" ]; then
+ # No builddir needed.
+ :
+ else
+ printf 'builddir="$srcdir/%s"\n\n' "$builddir" >> APKBUILD
+ fi
# Subpackage -dev is usually required only for C/C++. Since depends_dev
# confuses a lot people, remove it if there's no .h or .hpp file.
@@ -271,7 +284,6 @@ __EOF__
# Create build() function
cat >>APKBUILD<<__EOF__
build() {
- cd "\$builddir"
__EOF__
case "$buildtype" in
@@ -287,6 +299,8 @@ __EOF__
build_perl;;
python)
build_python;;
+ *)
+ printf '# Add build instructions here.' >> APKBUILD
esac
cat >>APKBUILD<<__EOF__
@@ -297,14 +311,17 @@ __EOF__
# Create check() function
cat >>APKBUILD<<__EOF__
check() {
- cd "\$builddir"
__EOF__
case "$buildtype" in
- make|cmake|autotools|perl)
+ make|autotools|perl)
check_make;;
+ cmake)
+ check_cmake;;
python)
check_python;;
+ *)
+ printf '# Add test instructions here.' >> APKBUILD
esac
cat >>APKBUILD<<__EOF__
@@ -315,7 +332,6 @@ __EOF__
# Create package() function
cat >>APKBUILD<<__EOF__
package() {
- cd "\$builddir"
__EOF__
case "$buildtype" in
@@ -329,6 +345,8 @@ __EOF__
package_perl;;
python)
package_python;;
+ *)
+ printf '# Add packaging instructions here.' >> APKBUILD
esac
if [ -n "$cpinitd" ]; then
--
2.24.1
From 59cb9822c0ac347d58f1c37627a58fe14dce965d Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 14 Jan 2020 04:47:36 -0600
Subject: [PATCH 2/2] newapkbuild: Newline after source
---
newapkbuild.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/newapkbuild.in b/newapkbuild.in
index dbcef14..9c4ffbf 100644
--- a/newapkbuild.in
+++ b/newapkbuild.in
@@ -251,7 +251,7 @@ __EOF__
done
if [ -n "$sdir" ] && [ "$sdir" = "src/$pkgname-$pv" ]; then
# No builddir needed.
- :
+ printf '\n' >> APKBUILD
else
printf 'builddir="$srcdir/%s"\n\n' "$builddir" >> APKBUILD
fi
--
2.24.1
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=fortune-mod
pkgver=2.10.0
pkgver=2.12.0
pkgrel=0
pkgdesc="Display random messages or quotations"
url="https://www.shlomifish.org/humour/fortunes/"
......@@ -11,7 +11,7 @@ license="BSD-4-Clause"
depends=""
checkdepends="perl-file-find-object perl-io-all perl-test-differences
perl-test-runvalgrind valgrind"
makedepends="cmake recode-dev"
makedepends="cmake recode-dev rinutils"
subpackages="$pkgname-doc"
source="https://github.com/shlomif/fortune-mod/archive/$pkgname-$pkgver.tar.gz"
builddir="$srcdir/fortune-mod-fortune-mod-$pkgver/$pkgname"
......@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
sha512sums="f5776d3afc52859b8959b0a51fc0dd57665b7d35b046958e6a08f29f9ad7915957ec4fec6b38d08a797a05163cc20a47e62a4e3d65034084e2003b8a69cc90e1 fortune-mod-2.10.0.tar.gz"
sha512sums="e3feca02b33bcae3c7113432af5d200d7c8701338c1d778c5dd893e4541969146185393c952f19f1b2f17077c4f171cdacbd9b6ba3cb0581117b8aa569cc652f fortune-mod-2.12.0.tar.gz"
......@@ -2,7 +2,7 @@
# Contributor: Luis Ressel <aranea@aixah.de>
# Maintainer:
pkgname=libnftnl
pkgver=1.1.4
pkgver=1.1.5
pkgrel=0
pkgdesc="Netfilter library providing interface to the nf_tables subsystem"
url="https://netfilter.org/projects/libnftnl"
......@@ -11,7 +11,9 @@ license="GPL-2.0+"
depends=""
makedepends="libmnl-dev"
subpackages="$pkgname-dev"
source="https://netfilter.org/projects/libnftnl/files/$pkgname-$pkgver.tar.bz2"
source="https://netfilter.org/projects/libnftnl/files/$pkgname-$pkgver.tar.bz2
nft-flowtable-test.patch
"
build() {
./configure \
......@@ -32,4 +34,5 @@ package() {
make DESTDIR="$pkgdir" install
}
sha512sums="6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6 libnftnl-1.1.4.tar.bz2"
sha512sums="a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7 libnftnl-1.1.5.tar.bz2
0978037a5dec71a96f5713dbc5a4dc8dc30b7b37d79ec7dd6ec8b201740303785c3625c21a2388f8fd5d9d446f8706ac14d0bf5909a48ed3ef3e7417173dd2c8 nft-flowtable-test.patch"
From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Mon, 2 Dec 2019 18:29:56 +0100
Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE
Marshalling code around that attribute has been dropped by commit
d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is
lost during the test.
Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a
later point, leave the test code in place but just comment it out.
Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
tests/nft-flowtable-test.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c
index 3edb00d..8ab8d4c 100644
--- a/tests/nft-flowtable-test.c
+++ b/tests/nft-flowtable-test.c
@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl
if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) !=
nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE))
print_err("Flowtable use mismatches");
+#if 0
if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) !=
nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE))
print_err("Flowtable size mismatches");
+#endif
if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) !=
nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS))
print_err("Flowtable flags mismatches");
--
2.24.1