diff options
author | psykose <alice@ayaya.dev> | 2023-05-29 02:57:31 +0000 |
---|---|---|
committer | psykose <alice@ayaya.dev> | 2023-05-29 04:57:33 +0200 |
commit | 6467bd0461e3b40076135a7d87f509afab1dcb49 (patch) | |
tree | a1e4f0b031425831ccb48a169b3026e51ad725fe | |
parent | c7c1b9747753f109513aa906501d329c76c12188 (diff) | |
download | aports-6467bd0461e3b40076135a7d87f509afab1dcb49.zip |
*/*: fix files that had non-tab indents/\"alignment\"
61 files changed, 188 insertions, 179 deletions
diff --git a/community/dhcp-helper/APKBUILD b/community/dhcp-helper/APKBUILD index 9cd647e2821..b57f251ec63 100644 --- a/community/dhcp-helper/APKBUILD +++ b/community/dhcp-helper/APKBUILD @@ -22,7 +22,7 @@ package() { make PREFIX=/usr version="$pkgver-r$pkgrel" MANDIR=/usr/share/man DESTDIR="$pkgdir" install install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname + install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } sha512sums="2f81d729a261454aac8ae9b508d3f319155fc9bdb80b0822317f244ea20fa471ee214f1a1df284375612344751308998591c5e4ac742fd34d720db8e65306ba5 dhcp-helper-1.2.tar.gz diff --git a/community/dvd+rw-tools/APKBUILD b/community/dvd+rw-tools/APKBUILD index 50a2c44c194..aa9ced83bd0 100644 --- a/community/dvd+rw-tools/APKBUILD +++ b/community/dvd+rw-tools/APKBUILD @@ -19,11 +19,11 @@ build() { } package() { - install -m755 -d "$pkgdir/usr/bin" - install -m755 -d "$pkgdir/usr/share/man/man1" - install -m755 growisofs dvd+rw-booktype dvd+rw-format \ - dvd+rw-mediainfo dvd-ram-control "$pkgdir/usr/bin/" - install -m644 growisofs.1 $pkgdir/usr/share/man/man1/growisofs.1 + install -m755 -d "$pkgdir/usr/bin" + install -m755 -d "$pkgdir/usr/share/man/man1" + install -m755 growisofs dvd+rw-booktype dvd+rw-format \ + dvd+rw-mediainfo dvd-ram-control -t "$pkgdir/usr/bin/" + install -m644 growisofs.1 $pkgdir/usr/share/man/man1/growisofs.1 } sha512sums="938f9ec5597158af275c7bf63002696ba362f6f22a219108c6a1df28792f0485046a7af5ce57e41695aaaa0d69543bd66cbbeb4415df5c0e0a902a3f1d278a31 dvd+rw-tools-7.1.tar.gz diff --git a/community/efs-utils/APKBUILD b/community/efs-utils/APKBUILD index 7b457148f86..d87f870660c 100644 --- a/community/efs-utils/APKBUILD +++ b/community/efs-utils/APKBUILD @@ -12,11 +12,11 @@ options="!check" source="$pkgname-$pkgver.tar.gz::https://github.com/aws/$pkgname/archive/refs/tags/v$pkgver.tar.gz efs-utils_openrc.patch amazon-efs-mount-watchdog.initd -" + " subpackages=" - $pkgname-doc - $pkgname-openrc -" + $pkgname-doc + $pkgname-openrc + " package() { mkdir -p "$pkgdir"/var/log/amazon/efs diff --git a/community/gnome-taquin/APKBUILD b/community/gnome-taquin/APKBUILD index 66592a9a0ae..9c8543ffff5 100644 --- a/community/gnome-taquin/APKBUILD +++ b/community/gnome-taquin/APKBUILD @@ -10,7 +10,7 @@ license="GPL-3.0-or-later AND CC-BY-SA-3.0" makedepends="meson ninja itstool vala gtk+3.0-dev librsvg-dev gsound-dev" checkdepends="appstream-glib desktop-file-utils" source="https://download.gnome.org/sources/gnome-taquin/${pkgver%.*}/gnome-taquin-$pkgver.tar.xz - 99dea5e7863e112f33f16e59898c56a4f1a547b3.patch" + 99dea5e7863e112f33f16e59898c56a4f1a547b3.patch" subpackages="$pkgname-doc $pkgname-lang" build() { diff --git a/community/hermes/APKBUILD b/community/hermes/APKBUILD index 5e439cef951..1c1f2d729e1 100644 --- a/community/hermes/APKBUILD +++ b/community/hermes/APKBUILD @@ -21,17 +21,17 @@ source="https://hermes-project.com/files/hermes-$pkgver.tar.bz2 # - CVE-2020-1915 build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --enable-spf \ - --enable-openssl - make + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --enable-spf \ + --enable-openssl + make } package() { - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } sha512sums="9861177cee7d4936e2221f3ff9f60c030385d6c2ab1cbc320f4e03880220117c580a11188e011f9051c79691e1ab8399c03be8cbbc4f18519a1a9b966bf767b9 hermes-1.9.tar.bz2 diff --git a/community/kodi/APKBUILD b/community/kodi/APKBUILD index 07805bf0318..7efd99eaf9b 100644 --- a/community/kodi/APKBUILD +++ b/community/kodi/APKBUILD @@ -122,9 +122,9 @@ replaces="xbmc" options="ldpath-recursive !check" # No testsuite source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.tar.gz crossguid-$_crossguid.tar.gz::https://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid.tar.gz - libdvdcss-$_libdvdcss.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss.tar.gz - libdvdnav-$_libdvdnav.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav.tar.gz - libdvdread-$_libdvdread.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread.tar.gz + libdvdcss-$_libdvdcss.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss.tar.gz + libdvdnav-$_libdvdnav.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav.tar.gz + libdvdread-$_libdvdread.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread.tar.gz fix-musl-incompability.patch flatbuffers-gcc13.patch sse-build.patch diff --git a/community/lua-dbus_proxy/APKBUILD b/community/lua-dbus_proxy/APKBUILD index f666dac2625..537a31dabd7 100644 --- a/community/lua-dbus_proxy/APKBUILD +++ b/community/lua-dbus_proxy/APKBUILD @@ -23,14 +23,14 @@ build() { for _luaversion in ${_luaversions}; do msg "Building for Lua $_luaversion" "luarocks-$_luaversion" \ - CC="$CC" \ - CFLAGS="$CFLAGS -fPIC" \ - LUA_INCDIR="$(pkg-config --variable=includedir "lua$_luaversion")" \ - LUA_LIBDIR="$(pkg-config --variable=libdir "lua$_luaversion")" \ - LUA_VERSION="$_luaversion" \ - make --tree="./build-$_luaversion" \ + CC="$CC" \ + CFLAGS="$CFLAGS -fPIC" \ + LUA_INCDIR="$(pkg-config --variable=includedir "lua$_luaversion")" \ + LUA_LIBDIR="$(pkg-config --variable=libdir "lua$_luaversion")" \ + LUA_VERSION="$_luaversion" \ + make --tree="./build-$_luaversion" \ --deps-mode=none \ - "rockspec/$_rockname-$pkgver-"*".rockspec" + "rockspec/$_rockname-$pkgver-"*".rockspec" done } diff --git a/community/lua-resty-dns/APKBUILD b/community/lua-resty-dns/APKBUILD index 709c2233caa..b2802c7243f 100644 --- a/community/lua-resty-dns/APKBUILD +++ b/community/lua-resty-dns/APKBUILD @@ -39,7 +39,7 @@ _split() { } for _v in $_luaversions; do - eval "split_${_v/./_}() { _split $_v; }" + eval "split_${_v/./_}() { _split $_v; }" done sha512sums="c825b34428aa50d1640b76bac4c39e4f39de042b3f7beef3eb764a01f09e173e439e5e0560bc49daa01891ea0f2c44ef993fe9839939bc0d06025a8aa1b0c005 lua-resty-dns-0.18.tar.gz diff --git a/community/mdbtools/APKBUILD b/community/mdbtools/APKBUILD index 4f957345e20..0e0681be7b7 100644 --- a/community/mdbtools/APKBUILD +++ b/community/mdbtools/APKBUILD @@ -54,19 +54,19 @@ build() { check() { # taken from https://github.com/mdbtools/mdbtools/blob/master/test_script.sh ./src/util/mdb-json test/data/ASampleDatabase.accdb "Asset Items" - ./src/util/mdb-json test/data/nwind.mdb "Umsätze" - ./src/util/mdb-count test/data/ASampleDatabase.accdb "Asset Items" - ./src/util/mdb-count test/data/nwind.mdb "Umsätze" - ./src/util/mdb-prop test/data/ASampleDatabase.accdb "Asset Items" - ./src/util/mdb-prop test/data/nwind.mdb "Umsätze" - ./src/util/mdb-schema test/data/ASampleDatabase.accdb - ./src/util/mdb-schema test/data/nwind.mdb - ./src/util/mdb-schema test/data/nwind.mdb -T "Umsätze" postgres - ./src/util/mdb-tables test/data/ASampleDatabase.accdb - ./src/util/mdb-tables test/data/nwind.mdb - ./src/util/mdb-ver test/data/ASampleDatabase.accdb - ./src/util/mdb-ver test/data/nwind.mdb - ./src/util/mdb-queries test/data/ASampleDatabase.accdb qryCostsSummedByOwner + ./src/util/mdb-json test/data/nwind.mdb "Umsätze" + ./src/util/mdb-count test/data/ASampleDatabase.accdb "Asset Items" + ./src/util/mdb-count test/data/nwind.mdb "Umsätze" + ./src/util/mdb-prop test/data/ASampleDatabase.accdb "Asset Items" + ./src/util/mdb-prop test/data/nwind.mdb "Umsätze" + ./src/util/mdb-schema test/data/ASampleDatabase.accdb + ./src/util/mdb-schema test/data/nwind.mdb + ./src/util/mdb-schema test/data/nwind.mdb -T "Umsätze" postgres + ./src/util/mdb-tables test/data/ASampleDatabase.accdb + ./src/util/mdb-tables test/data/nwind.mdb + ./src/util/mdb-ver test/data/ASampleDatabase.accdb + ./src/util/mdb-ver test/data/nwind.mdb + ./src/util/mdb-queries test/data/ASampleDatabase.accdb qryCostsSummedByOwner } package() { diff --git a/community/omxplayer/APKBUILD b/community/omxplayer/APKBUILD index 8df9d72e782..b397ed181f9 100644 --- a/community/omxplayer/APKBUILD +++ b/community/omxplayer/APKBUILD @@ -25,13 +25,13 @@ source="omxplayer-$pkgver.tar.gz::https://github.com/popcornmix/omxplayer/archiv builddir="$srcdir"/$pkgname-$_commitid build() { - cat <<EOF > Makefile.include -INCLUDES:=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux -INCLUDES+=$(pkg-config --cflags freetype2 dbus-1) -LDFLAGS:=-L/opt/vc/lib -Wl,-rpath,/opt/vc/lib -LIBS:=$(pkg-config --libs freetype2 dbus-1) -STRIP:=echo -EOF + cat <<-EOF > Makefile.include + INCLUDES:=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux + INCLUDES+=$(pkg-config --cflags freetype2 dbus-1) + LDFLAGS:=-L/opt/vc/lib -Wl,-rpath,/opt/vc/lib + LIBS:=$(pkg-config --libs freetype2 dbus-1) + STRIP:=echo + EOF make omxplayer.bin } @@ -41,10 +41,10 @@ package() { cp COPYING $pkgdir/usr/share/doc/omxplayer cp README.md $pkgdir/usr/share/doc/omxplayer/README - install -m755 -D "$srcdir"/$pkgname.initd \ - "$pkgdir"/etc/init.d/$pkgname - install -m644 -D "$srcdir"/$pkgname.confd \ - "$pkgdir"/etc/conf.d/$pkgname + install -m755 -D "$srcdir"/$pkgname.initd \ + "$pkgdir"/etc/init.d/$pkgname + install -m644 -D "$srcdir"/$pkgname.confd \ + "$pkgdir"/etc/conf.d/$pkgname } sha512sums=" diff --git a/community/perl-date-simple/APKBUILD b/community/perl-date-simple/APKBUILD index 36d50e4422f..562ba5ffc48 100644 --- a/community/perl-date-simple/APKBUILD +++ b/community/perl-date-simple/APKBUILD @@ -30,8 +30,7 @@ build() { } check() { - cd "$builddir" - make test + make test } package() { diff --git a/community/perl-dbix-contextualfetch/APKBUILD b/community/perl-dbix-contextualfetch/APKBUILD index 7c3c343c2e9..3982546255d 100644 --- a/community/perl-dbix-contextualfetch/APKBUILD +++ b/community/perl-dbix-contextualfetch/APKBUILD @@ -24,7 +24,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-digest-perl-md5/APKBUILD b/community/perl-digest-perl-md5/APKBUILD index 684a3de911d..cb34f565fde 100644 --- a/community/perl-digest-perl-md5/APKBUILD +++ b/community/perl-digest-perl-md5/APKBUILD @@ -27,7 +27,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-dir-self/APKBUILD b/community/perl-dir-self/APKBUILD index de396aadd45..bb3bd0c4aaf 100644 --- a/community/perl-dir-self/APKBUILD +++ b/community/perl-dir-self/APKBUILD @@ -27,7 +27,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-extutils-depends/APKBUILD b/community/perl-extutils-depends/APKBUILD index 53276121f80..e9665cb6c24 100644 --- a/community/perl-extutils-depends/APKBUILD +++ b/community/perl-extutils-depends/APKBUILD @@ -27,7 +27,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-extutils-libbuilder/APKBUILD b/community/perl-extutils-libbuilder/APKBUILD index ca4fa2cc7f9..2d2fadb1b90 100644 --- a/community/perl-extutils-libbuilder/APKBUILD +++ b/community/perl-extutils-libbuilder/APKBUILD @@ -30,7 +30,7 @@ build() { } check() { - ./Build test + ./Build test } package() { diff --git a/community/perl-file-readbackwards/APKBUILD b/community/perl-file-readbackwards/APKBUILD index 7434dbbfdbf..e2cd11541df 100644 --- a/community/perl-file-readbackwards/APKBUILD +++ b/community/perl-file-readbackwards/APKBUILD @@ -27,7 +27,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-functional-utility/APKBUILD b/community/perl-functional-utility/APKBUILD index 2963950ffab..00d310f68b4 100644 --- a/community/perl-functional-utility/APKBUILD +++ b/community/perl-functional-utility/APKBUILD @@ -26,7 +26,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-iptables-chainmgr/APKBUILD b/community/perl-iptables-chainmgr/APKBUILD index b7322836999..396f4cd7035 100644 --- a/community/perl-iptables-chainmgr/APKBUILD +++ b/community/perl-iptables-chainmgr/APKBUILD @@ -26,7 +26,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-iptables-parse/APKBUILD b/community/perl-iptables-parse/APKBUILD index 7aac9c939a0..b6c19895a43 100644 --- a/community/perl-iptables-parse/APKBUILD +++ b/community/perl-iptables-parse/APKBUILD @@ -27,7 +27,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-lingua-en-numbers-ordinate/APKBUILD b/community/perl-lingua-en-numbers-ordinate/APKBUILD index d6fef7b9166..7af79faeed8 100644 --- a/community/perl-lingua-en-numbers-ordinate/APKBUILD +++ b/community/perl-lingua-en-numbers-ordinate/APKBUILD @@ -10,7 +10,6 @@ license="GPL" depends="perl" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Lingua-EN-Numbers-Ordinate-$pkgver.tar.gz" - builddir="$srcdir/Lingua-EN-Numbers-Ordinate-$pkgver" build() { @@ -19,7 +18,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-log-dispatch-config/APKBUILD b/community/perl-log-dispatch-config/APKBUILD index 366b5a4ed29..b8b9ffaf4cb 100644 --- a/community/perl-log-dispatch-config/APKBUILD +++ b/community/perl-log-dispatch-config/APKBUILD @@ -26,7 +26,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-mime-base32/APKBUILD b/community/perl-mime-base32/APKBUILD index 484ed7a6b60..a5dea2be6dd 100644 --- a/community/perl-mime-base32/APKBUILD +++ b/community/perl-mime-base32/APKBUILD @@ -29,8 +29,8 @@ build() { } package() { - make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums="48c2541d08976fba154816d4f803cc20d8d51f8a7e4084cd85e23f7559868611adcce133f7dd8728cb21bbec67c325a99e68e36149b4ae3bfae97a6e57f4b806 MIME-Base32-1.303.tar.gz" diff --git a/community/perl-module-runtime-conflicts/APKBUILD b/community/perl-module-runtime-conflicts/APKBUILD index 9e96ff6d87b..74f78b45a8e 100644 --- a/community/perl-module-runtime-conflicts/APKBUILD +++ b/community/perl-module-runtime-conflicts/APKBUILD @@ -24,7 +24,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-moox-types-mooselike/APKBUILD b/community/perl-moox-types-mooselike/APKBUILD index d07db1582a8..a2eccb56d7f 100644 --- a/community/perl-moox-types-mooselike/APKBUILD +++ b/community/perl-moox-types-mooselike/APKBUILD @@ -28,7 +28,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-net-iptrie/APKBUILD b/community/perl-net-iptrie/APKBUILD index 9d9f50f65c7..8dd0797743e 100644 --- a/community/perl-net-iptrie/APKBUILD +++ b/community/perl-net-iptrie/APKBUILD @@ -26,7 +26,7 @@ build() { } check() { - ./Build test + ./Build test } package() { diff --git a/community/perl-object-insideout/APKBUILD b/community/perl-object-insideout/APKBUILD index 6862c6f1c19..c997b1e073a 100644 --- a/community/perl-object-insideout/APKBUILD +++ b/community/perl-object-insideout/APKBUILD @@ -25,7 +25,7 @@ build() { } check() { - ./Build test + ./Build test } package() { diff --git a/community/perl-package-variant/APKBUILD b/community/perl-package-variant/APKBUILD index 8c2997fdc03..77da6a6ae3d 100644 --- a/community/perl-package-variant/APKBUILD +++ b/community/perl-package-variant/APKBUILD @@ -28,7 +28,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-proc-waitstat/APKBUILD b/community/perl-proc-waitstat/APKBUILD index b56f5aac449..d30e72421f2 100644 --- a/community/perl-proc-waitstat/APKBUILD +++ b/community/perl-proc-waitstat/APKBUILD @@ -25,7 +25,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-provide/APKBUILD b/community/perl-provide/APKBUILD index 7d27ae573d6..047e21c4f59 100644 --- a/community/perl-provide/APKBUILD +++ b/community/perl-provide/APKBUILD @@ -26,7 +26,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-readonly/APKBUILD b/community/perl-readonly/APKBUILD index f0f426a3e3f..a0bd03722f7 100644 --- a/community/perl-readonly/APKBUILD +++ b/community/perl-readonly/APKBUILD @@ -26,7 +26,7 @@ build() { } check() { - ./Build test + ./Build test } package() { diff --git a/community/perl-regexp-tr/APKBUILD b/community/perl-regexp-tr/APKBUILD index f9030b31bc3..95de22903e6 100644 --- a/community/perl-regexp-tr/APKBUILD +++ b/community/perl-regexp-tr/APKBUILD @@ -27,7 +27,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-spiffy/APKBUILD b/community/perl-spiffy/APKBUILD index 70a00c7f7cf..4ae72e60078 100644 --- a/community/perl-spiffy/APKBUILD +++ b/community/perl-spiffy/APKBUILD @@ -26,7 +26,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-spreadsheet-parseexcel/APKBUILD b/community/perl-spreadsheet-parseexcel/APKBUILD index 7f4aa3286fc..db92fcb4041 100644 --- a/community/perl-spreadsheet-parseexcel/APKBUILD +++ b/community/perl-spreadsheet-parseexcel/APKBUILD @@ -27,7 +27,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-strictures/APKBUILD b/community/perl-strictures/APKBUILD index 1dcc701ed9e..3e49cda8cd0 100644 --- a/community/perl-strictures/APKBUILD +++ b/community/perl-strictures/APKBUILD @@ -23,7 +23,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-test-base/APKBUILD b/community/perl-test-base/APKBUILD index 18f19ad1006..4af504b36ae 100644 --- a/community/perl-test-base/APKBUILD +++ b/community/perl-test-base/APKBUILD @@ -27,7 +27,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-test-mock-guard/APKBUILD b/community/perl-test-mock-guard/APKBUILD index 8f87a4ce567..5489238fdb7 100644 --- a/community/perl-test-mock-guard/APKBUILD +++ b/community/perl-test-mock-guard/APKBUILD @@ -26,7 +26,7 @@ build() { } check() { - ./Build test + ./Build test } package() { diff --git a/community/perl-test-postgresql/APKBUILD b/community/perl-test-postgresql/APKBUILD index 584c439613e..b86f3ec3289 100644 --- a/community/perl-test-postgresql/APKBUILD +++ b/community/perl-test-postgresql/APKBUILD @@ -32,7 +32,7 @@ build() { } check() { - ./Build test + ./Build test } package() { diff --git a/community/perl-test-resub/APKBUILD b/community/perl-test-resub/APKBUILD index adab89a0fdb..e49dd496c82 100644 --- a/community/perl-test-resub/APKBUILD +++ b/community/perl-test-resub/APKBUILD @@ -26,7 +26,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-text-roman/APKBUILD b/community/perl-text-roman/APKBUILD index 116b3513b76..51bca382e69 100644 --- a/community/perl-text-roman/APKBUILD +++ b/community/perl-text-roman/APKBUILD @@ -26,7 +26,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-tie-hash-method/APKBUILD b/community/perl-tie-hash-method/APKBUILD index 2fb7096d6b0..d2b8a85d3ec 100644 --- a/community/perl-tie-hash-method/APKBUILD +++ b/community/perl-tie-hash-method/APKBUILD @@ -26,7 +26,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-xml-treepp/APKBUILD b/community/perl-xml-treepp/APKBUILD index feccb23a97d..b9bce99a30f 100644 --- a/community/perl-xml-treepp/APKBUILD +++ b/community/perl-xml-treepp/APKBUILD @@ -12,7 +12,6 @@ license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl perl-libwww" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/K/KA/KAWASAKI/$_pkgreal-$pkgver.tar.gz" - builddir="$srcdir/$_pkgreal-$pkgver" prepare() { @@ -26,7 +25,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/perl-xml-twig/APKBUILD b/community/perl-xml-twig/APKBUILD index 7fe9f34454a..94d6bbf3eb3 100644 --- a/community/perl-xml-twig/APKBUILD +++ b/community/perl-xml-twig/APKBUILD @@ -25,7 +25,7 @@ build() { } check() { - make test + make test } package() { diff --git a/community/py3-defusedxml/APKBUILD b/community/py3-defusedxml/APKBUILD index e8dd9db5565..68a7575750a 100644 --- a/community/py3-defusedxml/APKBUILD +++ b/community/py3-defusedxml/APKBUILD @@ -18,15 +18,15 @@ replaces=py-defusedxml # Backwards compatibility provides=py-defusedxml=$pkgver-r$pkgrel # Backwards compatibility build() { - python3 setup.py build + python3 setup.py build } check() { - python3 setup.py test + python3 setup.py test } package() { - python3 setup.py install --skip-build --root="$pkgdir" + python3 setup.py install --skip-build --root="$pkgdir" } sha512sums="4f536794b814291520c7db27765014c57f415554cff569cddab596b33e1aa03799aae9448fdaf07417d1a9f4d8782aa827d1b68aac6881ffe5c2ca9b8a40d864 py3-defusedxml-0.7.1.tar.gz" diff --git a/community/qpage/APKBUILD b/community/qpage/APKBUILD index c5b10ee98c2..21d24419247 100644 --- a/community/qpage/APKBUILD +++ b/community/qpage/APKBUILD @@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::http://archive.debian.org/debian/pool/non-free/ build() { cp -f "$srcdir"/config.input "$builddir" ./configure --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc \ --localstatedir=/var make } diff --git a/community/wrk/APKBUILD b/community/wrk/APKBUILD index b3ef459c0e2..f6c8d1a7a43 100644 --- a/community/wrk/APKBUILD +++ b/community/wrk/APKBUILD @@ -27,7 +27,7 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname \ "$pkgdir"/usr/share/doc/$pkgname/scripts - install -m755 -D $pkgname "$pkgdir"/usr/bin/$pkgname + install -m755 -D $pkgname "$pkgdir"/usr/bin/$pkgname install -m644 -D README.md "$pkgdir"/usr/share/doc/$pkgname/ install -m644 -D LICENSE "$pkgdir"/usr/share/licenses/$pkgname/ install -m644 -D NOTICE "$pkgdir"/usr/share/doc/$pkgname/ diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD index 9c5c55a7293..8d570269116 100644 --- a/main/tiff/APKBUILD +++ b/main/tiff/APKBUILD @@ -23,11 +23,11 @@ makedepends=" checkdepends="diffutils" subpackages="$pkgname-doc $pkgname-dev $pkgname-tools libtiffxx" source="https://download.osgeo.org/libtiff/tiff-$pkgver.tar.xz - $pkgname-CVE-fiesta-1.patch::https://gitlab.com/libtiff/libtiff/-/commit/97d65859bc29ee334012e9c73022d8a8e55ed586.patch - $pkgname-CVE-fiesta-2.patch::https://gitlab.com/libtiff/libtiff/-/commit/9c22495e5eeeae9e00a1596720c969656bb8d678.patch - $pkgname-CVE-fiesta-3.patch::https://gitlab.com/libtiff/libtiff/-/commit/d63de61b1ec3385f6383ef9a1f453e4b8b11d536.patch - $pkgname-CVE-fiesta-4.patch::https://gitlab.com/libtiff/libtiff/-/commit/69818e2f2d246e6631ac2a2da692c3706b849c38.patch - $pkgname-CVE-fiesta-5.patch::https://gitlab.com/libtiff/libtiff/-/commit/82a7fbb1fa7228499ffeb3a57a1d106a9626d57c.patch + $pkgname-CVE-fiesta-1.patch::https://gitlab.com/libtiff/libtiff/-/commit/97d65859bc29ee334012e9c73022d8a8e55ed586.patch + $pkgname-CVE-fiesta-2.patch::https://gitlab.com/libtiff/libtiff/-/commit/9c22495e5eeeae9e00a1596720c969656bb8d678.patch + $pkgname-CVE-fiesta-3.patch::https://gitlab.com/libtiff/libtiff/-/commit/d63de61b1ec3385f6383ef9a1f453e4b8b11d536.patch + $pkgname-CVE-fiesta-4.patch::https://gitlab.com/libtiff/libtiff/-/commit/69818e2f2d246e6631ac2a2da692c3706b849c38.patch + $pkgname-CVE-fiesta-5.patch::https://gitlab.com/libtiff/libtiff/-/commit/82a7fbb1fa7228499ffeb3a57a1d106a9626d57c.patch " # secfixes: diff --git a/testing/bazel6/APKBUILD b/testing/bazel6/APKBUILD index f6b5a9712f7..4dd7c843a8b 100644 --- a/testing/bazel6/APKBUILD +++ b/testing/bazel6/APKBUILD @@ -15,7 +15,7 @@ provides="bazel=$pkgver-r$pkgrel" subpackages="$pkgname-bash-completion" source=" https://github.com/bazelbuild/bazel/releases/download/$pkgver/bazel-$pkgver-dist.zip - 0001-Do-not-use-prebuilt-binaries.patch + 0001-Do-not-use-prebuilt-binaries.patch 0002-Prefer-local_jdk-instead-of-remote_jdk11.patch 0003-Make-generate_bash_completion-compatible-with-busybo.patch 0004-Use-nojdk-bazel-for-generating-the-bash-completion.patch diff --git a/testing/flannel/APKBUILD b/testing/flannel/APKBUILD index 6f3dd74881b..ed37231a1d6 100644 --- a/testing/flannel/APKBUILD +++ b/testing/flannel/APKBUILD @@ -8,7 +8,7 @@ pkgdesc="An etcd backed network fabric for containers" url="https://github.com/flannel-io/flannel" arch="x86_64" license="Apache-2.0" -options="net" +options="net chmod-clean" makedepends="go linux-headers" subpackages="$pkgname-openrc $pkgname-contrib-cni:contrib_cni:noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/flannel-io/flannel/archive/refs/tags/v$pkgver.tar.gz @@ -56,12 +56,6 @@ contrib_cni() { "$subpkgdir"/etc/kube-flannel/kube-flannel-legacy.tml } -cleanup_srcdir() { - export GOPATH="$srcdir" - go clean -modcache - default_cleanup_srcdir -} - sha512sums=" 29a2f5ffb53cf7dcdf87c30aea7365ee9405761ac2481c2428cbadc13dadea4afa833723f4e9b292e4e192d00cbefd7c15d8a3a16363c6d98832bcdf8cfe9600 flannel-0.21.5.tar.gz d84258a164adcec0f1cef7fcafcf0cadb3bf3959b393b905c4897274adeff476279ce96ec42e9aa9d574c6bd7d37649d92c7c52563975f85d303cade990a3942 flanneld.logrotated diff --git a/testing/fusee-nano/APKBUILD b/testing/fusee-nano/APKBUILD index 242c8a4366d..ee2fbe74409 100644 --- a/testing/fusee-nano/APKBUILD +++ b/testing/fusee-nano/APKBUILD @@ -2,35 +2,43 @@ # Maintainer: TBK <alpine@jjtc.eu> pkgname=fusee-nano pkgver=0.4 -pkgrel=1 -pkgdesc="A minimalist re-implementation of the Fusée Gelée exploit, designed to run on embedded Linux devices." +pkgrel=2 +pkgdesc="Minimalist re-implementation of the Fusée Gelée exploit, designed to run on embedded Linux devices." url="https://github.com/DavidBuchanan314/fusee-nano" arch="all" license="MIT" options="!check" # No test suite makedepends="linux-headers" subpackages="$pkgname-udev::noarch" -source="$pkgname-$pkgver.tar.gz::https://github.com/DavidBuchanan314/fusee-nano/archive/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/DavidBuchanan314/fusee-nano/archive/$pkgver.tar.gz + broken-makefile.patch + " build() { - make + make CC="${CC:-cc}" } package() { - mkdir -p "$pkgdir"/usr/share/$pkgname/ - cp -r files/* "$pkgdir"/usr/share/$pkgname/ - install -Dm 755 fusee-nano "$pkgdir"/usr/bin/fusee-nano + mkdir -p "$pkgdir"/usr/share/$pkgname/ + cp -r files/* "$pkgdir"/usr/share/$pkgname/ + install -Dm 755 fusee-nano "$pkgdir"/usr/bin/fusee-nano - # Remove openwrt file - rm "$pkgdir"/usr/share/$pkgname/20-tegra_rcm + # Remove openwrt file + rm "$pkgdir"/usr/share/$pkgname/20-tegra_rcm + + mkdir -p "$pkgdir"/lib/udev/rules.d/ + mv "$pkgdir"/usr/share/fusee-nano/*.rules \ + "$pkgdir"/lib/udev/rules.d/ } udev() { - pkgdesc="udev rule for $pkgname" - install_if="$pkgname=$pkgver-r$pkgrel eudev" - mkdir -p "$subpkgdir"/lib/udev/rules.d/ - mv "$pkgdir"/usr/share/$pkgname/*.rules \ - "$subpkgdir"/lib/udev/rules.d/ + pkgdesc="udev rule for $pkgname" + install_if="$pkgname=$pkgver-r$pkgrel eudev" + + amove lib/udev/rules.d } -sha512sums="18fe586a111a9bc8dd9c6ff57002ac731843c83151bfe2d63dd8890305862a7a93a9737256405dbc1c76f5a3fab94475fa786135c55d712e26600d04e0c26450 fusee-nano-0.4.tar.gz" +sha512sums=" +18fe586a111a9bc8dd9c6ff57002ac731843c83151bfe2d63dd8890305862a7a93a9737256405dbc1c76f5a3fab94475fa786135c55d712e26600d04e0c26450 fusee-nano-0.4.tar.gz +c7f8c09625d357105015b620f012802513c6617e140d168f5e74a4c7c287578b78ca13f633cd6019a5f6494f85cece8c87260d8240035988ffc24afc53b7dcb4 broken-makefile.patch +" diff --git a/testing/fusee-nano/broken-makefile.patch b/testing/fusee-nano/broken-makefile.patch new file mode 100644 index 00000000000..82fc107b076 --- /dev/null +++ b/testing/fusee-nano/broken-makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index eae7a71..0b88a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ all: $(TARGET) + $(CC) -c -o $@ $< $(CFLAGS) + + $(TARGET): $(OBJ) +- $(CC) -o $@ $^ $(CFLAGS) ++ $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) + + clean: + rm $(TARGET) $(OBJ) diff --git a/testing/iodine/APKBUILD b/testing/iodine/APKBUILD index 63c3a32d054..226abae0422 100644 --- a/testing/iodine/APKBUILD +++ b/testing/iodine/APKBUILD @@ -14,12 +14,10 @@ source="http://code.kryo.se/iodine/$pkgname-$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" CFLAGS="$CFLAGS -D__GLIBC__=1" make } package() { - cd "$builddir" make DESTDIR="$pkgdir" prefix="/usr" install } diff --git a/testing/kubectl-krew/APKBUILD b/testing/kubectl-krew/APKBUILD index 4f701bfbe6c..95eee574c58 100644 --- a/testing/kubectl-krew/APKBUILD +++ b/testing/kubectl-krew/APKBUILD @@ -16,19 +16,19 @@ export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" build() { - GOLDFLAGS=" - -X sigs.k8s.io/krew/internal/version.gitCommit=AlpineLinux - -X sigs.k8s.io/krew/internal/version.gitTag=v$pkgver - " - go build -tags netgo -ldflags "$GOLDFLAGS" -o bin/$pkgname ./cmd/krew/main.go + GOLDFLAGS=" + -X sigs.k8s.io/krew/internal/version.gitCommit=AlpineLinux + -X sigs.k8s.io/krew/internal/version.gitTag=v$pkgver + " + go build -tags netgo -ldflags "$GOLDFLAGS" -o bin/$pkgname ./cmd/krew/main.go } check() { - KREW_BINARY="$builddir/bin/$pkgname" go test ./... + KREW_BINARY="$builddir/bin/$pkgname" go test ./... } package() { - install -Dm755 bin/$pkgname "$pkgdir"/usr/bin/$pkgname + install -Dm755 bin/$pkgname "$pkgdir"/usr/bin/$pkgname } sha512sums=" diff --git a/testing/libspnav/APKBUILD b/testing/libspnav/APKBUILD index cfaf5668251..77a48f528a7 100644 --- a/testing/libspnav/APKBUILD +++ b/testing/libspnav/APKBUILD @@ -15,8 +15,8 @@ source="https://github.com/FreeSpacenav/libspnav/releases/download/v$pkgver/libs " prepare() { - default_prepare - sed -i "s/@PKGVERSION@/$pkgver/" "$builddir"/configure + default_prepare + sed -i "s/@PKGVERSION@/$pkgver/" "$builddir"/configure } build() { diff --git a/testing/lxappearance/APKBUILD b/testing/lxappearance/APKBUILD index 19534dfbbb3..9a77229d5d4 100644 --- a/testing/lxappearance/APKBUILD +++ b/testing/lxappearance/APKBUILD @@ -1,12 +1,11 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Maintainer: - pkgname=lxappearance pkgver=0.6.3 -pkgrel=2 +pkgrel=3 pkgdesc='Feature-rich GTK+ theme switcher' arch='all' -license='GPL2' +license='GPL-2.0-or-later' url='https://lxde.org/' makedepends='gtk+2.0-dev intltool dbus-glib-dev' subpackages="$pkgname-doc $pkgname-dev $pkgname-lang" @@ -14,20 +13,19 @@ source="https://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz" builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-dbus \ - || return 1 - make || return 1 + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-dbus \ + make } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install } -sha512sums="035cc952a33ac25408a4158cb4e745b17af3f29b5ceedfbe6b37235d16c801658403e862cd35ad7c8ca20fe6186fab1dce74a6e8d3b2eec12a30d532fc21662c lxappearance-0.6.3.tar.xz" +sha512sums=" +035cc952a33ac25408a4158cb4e745b17af3f29b5ceedfbe6b37235d16c801658403e862cd35ad7c8ca20fe6186fab1dce74a6e8d3b2eec12a30d532fc21662c lxappearance-0.6.3.tar.xz +" diff --git a/testing/ovn/APKBUILD b/testing/ovn/APKBUILD index 56503c75bf7..f5130b25338 100644 --- a/testing/ovn/APKBUILD +++ b/testing/ovn/APKBUILD @@ -43,21 +43,22 @@ build() { # Taking the same configure options from openvswitch APKBUILD cd "$srcdir"/openvswitch-$ovs_pkgver ./boot.sh - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --enable-ndebug \ - --enable-libcap-ng \ - PYTHON=/usr/bin/python3 + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --enable-ndebug \ + --enable-libcap-ng make # now building OVN cd "$builddir" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var \ + --localstatedir=/var \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --enable-shared \ @@ -66,16 +67,16 @@ build() { make } +check() { + make check +} + package() { # parallel install issue make -j1 DESTDIR="$pkgdir" install } -check() { - make check -} - sha512sums=" b47ad17ada4bbaadd4a7baf194512f327c9838aa779a811c4ba1859e6ebcf380e56cb3bf4786d32ef1cdef4fe285351996dccf740b74982f195c6b19feb75ccb ovn-22.03.0.tar.gz 5d1fb0fb5eb070c8712759131f4c86915ab7b9075a1f5d136bea7b66efdcf55fd9aef79768f6431582aba9baddec4514200e2998abc3a37e01e5f0e186170b86 openvswitch-2.17.1-498cedc.tar.gz diff --git a/testing/pimd-dense/APKBUILD b/testing/pimd-dense/APKBUILD index 245e4d85a25..056db1faa7f 100644 --- a/testing/pimd-dense/APKBUILD +++ b/testing/pimd-dense/APKBUILD @@ -38,8 +38,8 @@ package() { "$pkgdir"/usr/share/licenses/"$pkgname"/COPYING install -Dm644 doc/LICENSE.mrouted \ "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE.mrouted - install -Dm644 doc/LICENSE.pimd \ - "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE.pimd + install -Dm644 doc/LICENSE.pimd \ + "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE.pimd } sha512sums=" diff --git a/testing/py3-luhn/APKBUILD b/testing/py3-luhn/APKBUILD index 2ddf7210c1a..55a48f07541 100644 --- a/testing/py3-luhn/APKBUILD +++ b/testing/py3-luhn/APKBUILD @@ -27,7 +27,7 @@ check() { } package() { - python3 setup.py install --skip-build --root="$pkgdir" + python3 setup.py install --skip-build --root="$pkgdir" } sha512sums="43732155358352fa25ca4c25e59a40efd98250e4296f75cdd1d2050a79a1ac26110f024a585159a626784dbfd4b6def3c85b2594c6ecf4e8b74a9cd165870c78 luhn-0.2.0.tar.gz" diff --git a/testing/py3-moviepy/APKBUILD b/testing/py3-moviepy/APKBUILD index 8c01a192187..b54a1f3b326 100644 --- a/testing/py3-moviepy/APKBUILD +++ b/testing/py3-moviepy/APKBUILD @@ -10,7 +10,7 @@ depends="py3-requests py3-proglog py3-imageio py3-imageio-ffmpeg py3-decorator p makedepends="py3-setuptools" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/Zulko/moviepy/archive/v$pkgver.tar.gz - decorators.patch" + decorators.patch" builddir="$srcdir/moviepy-$pkgver" options="!check" # No tests, require network connection diff --git a/testing/py3-netmiko/APKBUILD b/testing/py3-netmiko/APKBUILD index 43faacb18bc..295e500e592 100644 --- a/testing/py3-netmiko/APKBUILD +++ b/testing/py3-netmiko/APKBUILD @@ -17,14 +17,14 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/ktbyers/netmiko/archive/refs builddir="$srcdir"/$_pkgname-$pkgver build() { - gpep517 build-wheel \ - --wheel-dir dist \ - --output-fd 3 3>&1 >&2 + gpep517 build-wheel \ + --wheel-dir dist \ + --output-fd 3 3>&1 >&2 } package() { - python3 -m installer -d "$pkgdir" \ - dist/*.whl + python3 -m installer -d "$pkgdir" \ + dist/*.whl } sha512sums=" diff --git a/testing/sems/APKBUILD b/testing/sems/APKBUILD index 437049b2b19..03dc6976da2 100644 --- a/testing/sems/APKBUILD +++ b/testing/sems/APKBUILD @@ -136,9 +136,9 @@ gsm() { } ilbc() { - pkgdesc="iLBC support for SEMS" - depends="sems" - _mv_sub usr/lib/sems/plug-in/ilbc.so + pkgdesc="iLBC support for SEMS" + depends="sems" + _mv_sub usr/lib/sems/plug-in/ilbc.so } mp3() { @@ -148,9 +148,9 @@ mp3() { } opus() { - pkgdesc=" OPUS codec for SEMS" - depends="sems" - _mv_sub usr/lib/sems/plug-in/opus.so + pkgdesc=" OPUS codec for SEMS" + depends="sems" + _mv_sub usr/lib/sems/plug-in/opus.so } webconference() { |