diff options
33 files changed, 335 insertions, 211 deletions
diff --git a/cgi-gallery-git/PKGBUILD b/cgi-gallery-git/PKGBUILD new file mode 100644 index 0000000..003f807 --- /dev/null +++ b/cgi-gallery-git/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: metamuffin <metamuffin@disroot.org> + +pkgname=cgi-gallery-git +pkgver=r11.be555e0 +pkgrel=2 +pkgdesc="CGI program for viewing pictures" +arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') +url="https://codeberg.org/hurrycurry/hurrycurry" +license=('AGPL3') +makedepends=('rustup') +depends=('ffmpeg' 'imagemagick' 'ttf-opensans') +source=("cgi-gallery::git+https://codeberg.org/metamuffin/cgi-gallery.git") +sha256sums=('SKIP') + +rust_chost() { + sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST" +} +pkgver() { + cd cgi-gallery + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} +prepare() { + cd cgi-gallery + cargo fetch --locked --target "$(rust_chost)" +} +build() { + cd cgi-gallery + cargo build --release --frozen --target "$(rust_chost)" +} +package() { + cd cgi-gallery + install -Dm755 target/"$(rust_chost)"/release/gallery "$pkgdir"/usr/lib/webapps/gallery.cgi + install -Dm644 COPYING "$pkgdir/usr/share/licenses/cgi-gallery/COPYING" +} diff --git a/deno-bin/PKGBUILD b/deno-bin/PKGBUILD index 919825a..6c5b4ad 100644 --- a/deno-bin/PKGBUILD +++ b/deno-bin/PKGBUILD @@ -1,12 +1,8 @@ # Maintainer: metamuffin <metamuffin@disroot.org> -deno_target() { - sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST" -} - pkgname=deno-bin -pkgver=2.3.3 -pkgrel=4 +pkgver=2.6.5 +pkgrel=1 pkgdesc="A secure runtime for JavaScript and TypeScript" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') url="https://deno.land" @@ -16,8 +12,8 @@ conflics=('deno') provides=('deno') source_aarch64=("$pkgname-$pkgver-aarch64.tar.gz::https://dl.deno.land/release/v$pkgver/deno-aarch64-unknown-linux-gnu.zip") source_x86_64=("$pkgname-$pkgver-x86_64.tar.gz::https://dl.deno.land/release/v$pkgver/deno-x86_64-unknown-linux-gnu.zip") -sha256sums_x86_64=('cb573ef18e06b6f17db31b7a410143abfebe0c8d1faa99cb934a7c1351c75701') -sha256sums_aarch64=('5d9dc69fbf324afe62f2c03c1241ae4629fecdb6032a1ded8a907ce480077f61') +sha256sums_x86_64=('e0f109b9ae6d828512bdbfc0524779ea42d7c117efd351860589c07506803436') +sha256sums_aarch64=('6613f3ccfc7e36d91b1a856d0a3d3a6d1286d09a9f0d775f99e50706e0ebc81d') package() { install -Dm755 deno "$pkgdir/usr/bin/deno" diff --git a/gnix-git/PKGBUILD b/gnix-git/PKGBUILD index c04a0da..a3a1e62 100644 --- a/gnix-git/PKGBUILD +++ b/gnix-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=gnix-git -pkgver=r165.06e736c +pkgver=r181.2b258df pkgrel=1 pkgdesc="a simple stupid http reverse proxy" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') diff --git a/gnix-git/gnix.service b/gnix-git/gnix.service index 95593f5..663dae5 100644 --- a/gnix-git/gnix.service +++ b/gnix-git/gnix.service @@ -4,10 +4,11 @@ After=network.target Wants=network-online.target [Service] -AmbientCapabilities=CAP_NET_BIND_SERVICE -CapabilityBoundingSet=CAP_NET_BIND_SERVICE -ExecStart=/usr/bin/gnix /etc/gnix.yaml -User=gnix +Type=simple +ExecStart=/usr/bin/gnix --control-socket /run/gnix --user gnix /etc/gnix.yaml +ExecReload=/usr/bin/gnix --control-socket /run/gnix --reload /etc/gnix.yaml +Restart=always + LockPersonality=yes MemoryDenyWriteExecute=yes NoNewPrivileges=yes @@ -23,12 +24,9 @@ ProtectKernelTunables=yes ProtectSystem=full RestrictAddressFamilies=~AF_PACKET AF_NETLINK RestrictNamespaces=yes -RestrictSUIDSGID=yes RestrictRealtime=yes -Restart=always SystemCallArchitectures=native SystemCallFilter=@system-service -Type=simple [Install] WantedBy=multi-user.target diff --git a/gnix/PKGBUILD b/gnix/PKGBUILD index b1fbaed..bd52606 100644 --- a/gnix/PKGBUILD +++ b/gnix/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=gnix -pkgver=2.4.1 -pkgrel=1 +pkgver=2.5.0 +pkgrel=2 pkgdesc="a simple stupid http reverse proxy" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') url="https://codeberg.org/metamuffin/gnix" @@ -13,8 +13,8 @@ source=("$pkgname-$pkgver.tar.gz::https://codeberg.org/metamuffin/gnix/archive/v "gnix.service" "config.yaml" "sysusers.conf") -sha256sums=('28afe0ec345b418de6686af30e4700dc26d47c54bd648a7cb8e9772f2504129b' - 'a80df54a4e44960decf43ad618dc1afef9cc498370460362e91646ac3f95358e' +sha256sums=('e2df1287c5b8b68d04584c5f7af2937f9caf4b8a25bb19d332d2e35a529c5b8a' + '658a194c65afee7b20f91a55673af0654aec7db5d108291fd299355ac0398642' '6f39c6a2e82f9e09eb7ffe5082bfdd795936c3665863f118fcfd4135bc8e70f1' '9e03be16b1b3dd4c0d0e5feb5c31221758b68a54bad5ba7232e8565d766ea620') diff --git a/gnix/gnix.service b/gnix/gnix.service index 95593f5..663dae5 100644 --- a/gnix/gnix.service +++ b/gnix/gnix.service @@ -4,10 +4,11 @@ After=network.target Wants=network-online.target [Service] -AmbientCapabilities=CAP_NET_BIND_SERVICE -CapabilityBoundingSet=CAP_NET_BIND_SERVICE -ExecStart=/usr/bin/gnix /etc/gnix.yaml -User=gnix +Type=simple +ExecStart=/usr/bin/gnix --control-socket /run/gnix --user gnix /etc/gnix.yaml +ExecReload=/usr/bin/gnix --control-socket /run/gnix --reload /etc/gnix.yaml +Restart=always + LockPersonality=yes MemoryDenyWriteExecute=yes NoNewPrivileges=yes @@ -23,12 +24,9 @@ ProtectKernelTunables=yes ProtectSystem=full RestrictAddressFamilies=~AF_PACKET AF_NETLINK RestrictNamespaces=yes -RestrictSUIDSGID=yes RestrictRealtime=yes -Restart=always SystemCallArchitectures=native SystemCallFilter=@system-service -Type=simple [Install] WantedBy=multi-user.target diff --git a/hurrycurry-book-git/PKGBUILD b/hurrycurry-book-git/PKGBUILD new file mode 100644 index 0000000..979592b --- /dev/null +++ b/hurrycurry-book-git/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: metamuffin <metamuffin@disroot.org> + +pkgname=hurrycurry-book-git +pkgver=r3174.4f6b116a +pkgrel=1 +pkgdesc="HTML export of hurrycurry recipe book" +arch=('any') +url="https://codeberg.org/hurrycurry/hurrycurry" +license=('AGPL3') +conflics=('hurrycurry-book') +provides=('hurrycurry-book') +makedepends=('rustup' 'deno' 'godot') +source=("git+https://codeberg.org/hurrycurry/hurrycurry.git") +sha256sums=("SKIP") + +rust_chost() { + sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST" +} + +pkgver() { + cd "hurrycurry" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} +prepare() { + cd "hurrycurry" + rustup default nightly + cargo fetch --locked +} +build() { + cd "hurrycurry" + make all_book +} +package() { + cd hurrycurry + install -Dm644 COPYING "$pkgdir/usr/share/licenses/hurrycurry-book/COPYING" + install -Dm664 -t "$pkgdir/usr/share/hurrycurry/website" target/book/book*.html + install -Dm664 -t "$pkgdir/usr/share/hurrycurry/website/tiles" target/book/tiles/*.png + install -Dm664 -t "$pkgdir/usr/share/hurrycurry/website/items" target/book/items/*.png +} diff --git a/hurrycurry-book/PKGBUILD b/hurrycurry-book/PKGBUILD new file mode 100644 index 0000000..2f90d68 --- /dev/null +++ b/hurrycurry-book/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: metamuffin <metamuffin@disroot.org> + +pkgname=hurrycurry-book +pkgver=3.0.1 +pkgrel=3 +pkgdesc="HTML export of hurrycurry recipe book" +arch=('any') +url="https://codeberg.org/hurrycurry/hurrycurry" +license=('AGPL3') +makedepends=('rustup' 'deno' 'godot') +source=("hurrycurry-$pkgver.tar.gz::https://codeberg.org/hurrycurry/hurrycurry/archive/v$pkgver.tar.gz") +sha256sums=('6381a8384c0fd2b36f7bb9d8d5269346428c07a7585eb93812200c71ba0899d7') + +rust_chost() { + sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST" +} + +prepare() { + cd "hurrycurry" + rustup default nightly + cargo fetch --locked +} +build() { + cd "hurrycurry" + make all_book +} +package() { + cd hurrycurry + install -Dm644 COPYING "$pkgdir/usr/share/licenses/hurrycurry-book/COPYING" + install -Dm664 -t "$pkgdir/usr/share/hurrycurry/website" target/book/book*.html + install -Dm664 -t "$pkgdir/usr/share/hurrycurry/website/tiles" target/book/tiles/*.png + install -Dm664 -t "$pkgdir/usr/share/hurrycurry/website/items" target/book/items/*.png +} diff --git a/hurrycurry-client-git/PKGBUILD b/hurrycurry-client-git/PKGBUILD index fda7724..93e135b 100644 --- a/hurrycurry-client-git/PKGBUILD +++ b/hurrycurry-client-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=hurrycurry-client-git -pkgver=r2526.10bd0b8a +pkgver=r3174.4f6b116a pkgrel=1 pkgdesc="A game about cooking (client)" arch=('any') @@ -24,7 +24,7 @@ pkgver() { } build() { cd "hurrycurry" - make client + make all_client git reset --hard sed -i "s/^const DISTRIBUTION := .*/const DISTRIBUTION := \"arch\"/" client/global.gd sed -i "s/^const VERSION := .*/const VERSION := \"$pkgver-$pkgrel\"/" client/global.gd diff --git a/hurrycurry-client-web-git/PKGBUILD b/hurrycurry-client-web-git/PKGBUILD index 8297ef3..bc3b7f6 100644 --- a/hurrycurry-client-web-git/PKGBUILD +++ b/hurrycurry-client-web-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=hurrycurry-client-web-git -pkgver=r2462.46897ebd +pkgver=r3174.4f6b116a pkgrel=1 pkgdesc="A game about cooking (web client)" arch=('any') @@ -19,7 +19,7 @@ pkgver() { } build() { cd "hurrycurry" - make client + make all_client mkdir -p target/release godot --headless --export-release wasm32-unknown-unknown ../target/release/client.html client/project.godot } diff --git a/hurrycurry-client-web/PKGBUILD b/hurrycurry-client-web/PKGBUILD index 8728574..cd40497 100644 --- a/hurrycurry-client-web/PKGBUILD +++ b/hurrycurry-client-web/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=hurrycurry-client-web -pkgver=2.3.5 +pkgver=3.0.1 pkgrel=1 pkgdesc="A game about cooking (web client)" arch=('any') @@ -9,11 +9,11 @@ url="https://codeberg.org/hurrycurry/hurrycurry" license=('AGPL3') makedepends=('godot' 'rustup') source=("hurrycurry-$pkgver.tar.gz::https://codeberg.org/hurrycurry/hurrycurry/archive/v$pkgver.tar.gz") -sha256sums=('d822c088806717055040d26d5c8e50508cf90a766b512b1acaabc7f42bc2d255') +sha256sums=('6381a8384c0fd2b36f7bb9d8d5269346428c07a7585eb93812200c71ba0899d7') build() { cd "hurrycurry" - make client + make all_client mkdir -p target/release godot --headless --export-release wasm32-unknown-unknown ../target/release/client.html client/project.godot } diff --git a/hurrycurry-client/PKGBUILD b/hurrycurry-client/PKGBUILD index 79aef9e..72cadb2 100644 --- a/hurrycurry-client/PKGBUILD +++ b/hurrycurry-client/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=hurrycurry-client -pkgver=2.3.5 +pkgver=3.0.1 pkgrel=1 pkgdesc="A game about cooking (client)" arch=('any') @@ -12,13 +12,16 @@ makedepends=('godot' 'ffmpeg') source=("hurrycurry-$pkgver.tar.gz::https://codeberg.org/hurrycurry/hurrycurry/archive/v$pkgver.tar.gz" "hurrycurry-client" "hurrycurry-client.desktop") -sha256sums=('d822c088806717055040d26d5c8e50508cf90a766b512b1acaabc7f42bc2d255' - '2853345b64837352f576397aac7659aa0306e03ca7de4cdd04bb64bab9c8706c' +sha256sums=('6381a8384c0fd2b36f7bb9d8d5269346428c07a7585eb93812200c71ba0899d7' + '5f695c7f4e2fc8ba6ced19f54bb244ab056bcff565adb56855a85fe2c3149fc5' '2607233a774b1f74f10deb0ef1c594e418554c4b5701d0e700016368e6d59718') build() { cd "hurrycurry" - make client + make all_client + git reset --hard + sed -i "s/^const DISTRIBUTION := .*/const DISTRIBUTION := \"arch\"/" client/global.gd + sed -i "s/^const VERSION := .*/const VERSION := \"$pkgver-$pkgrel\"/" client/global.gd mkdir -p target/release godot --headless --export-pack wasm32-unknown-unknown ../target/release/client.pck client/project.godot } diff --git a/hurrycurry-pixel-client-git/PKGBUILD b/hurrycurry-pixel-client-git/PKGBUILD deleted file mode 100644 index 4f7596c..0000000 --- a/hurrycurry-pixel-client-git/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: metamuffin <metamuffin@disroot.org> - -pkgname=hurrycurry-pixel-client-git -pkgver=r2076.acaed50d -pkgrel=1 -pkgdesc="A game about cooking (pixel client)" -arch=('i686' 'armv6h' 'armv7h') -url="https://codeberg.org/hurrycurry/hurrycurry" -license=('AGPL3') -depends=('sdl2') -makedepends=('rustup' 'sdl2' 'sdl2_image') -conflics=('hurrycurry-pixel-client') -provides=('hurrycurry-pixel-client') -source=("git+https://codeberg.org/hurrycurry/hurrycurry.git" - "hurrycurry-pixel-client.desktop") -sha256sums=("SKIP" - "SKIP") - -rust_chost() { - sed -e "s/-pc-linux/-unknown-linux/" -e "s/armv7l-/armv7-/" <<< "$CHOST" -} - -pkgver() { - cd "hurrycurry" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} -prepare() { - cd "hurrycurry" - rustup default nightly - cargo +nightly fetch --locked --target "$(rust_chost)" -} -build() { - cd "hurrycurry" - make pixel-client - cargo build --release --bin pixelcurry --target "$(rust_chost)" -} -package() { - install -Dm755 hurrycurry/target/$(rust_chost)/release/pixelcurry "$pkgdir/usr/bin/pixelcurry" - install -Dm644 hurrycurry-pixel-client.desktop "$pkgdir/usr/share/applications/hurrycurry-pixel-client.desktop" - install -Dm644 hurrycurry/COPYING "$pkgdir/usr/share/licenses/hurrycurry-pixel-client/COPYING" - install -Dm644 hurrycurry/pixel-client/icon.png "$pkgdir/usr/share/icons/hicolor/512x512/apps/pixelcurry.png" -} diff --git a/hurrycurry-pixel-client-git/hurrycurry-pixel-client.desktop b/hurrycurry-pixel-client-git/hurrycurry-pixel-client.desktop deleted file mode 100644 index 32389df..0000000 --- a/hurrycurry-pixel-client-git/hurrycurry-pixel-client.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Pixel Curry! -Icon=pixelcurry -GenericName[de]=Ein Spiel rund ums Kochen im Retro-stil -GenericName=A retro-style game about cooking -Exec=pixelcurry -Terminal=false -StartupNotify=false -Type=Application -Categories=Game; -Keywords=game;cooking; diff --git a/hurrycurry-server-git/PKGBUILD b/hurrycurry-server-git/PKGBUILD index 703ef70..da683d9 100644 --- a/hurrycurry-server-git/PKGBUILD +++ b/hurrycurry-server-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=hurrycurry-server-git -pkgver=r2526.10bd0b8a +pkgver=r3174.4f6b116a pkgrel=1 pkgdesc="A game about cooking (server)" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') @@ -38,13 +38,13 @@ prepare() { } build() { cd "hurrycurry" + export HURRYCURRY_DISTRIBUTION="arch" cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-server cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-replaytool cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-registry cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-discover - make -C data all - make -C test-client - make -C data recipes/default.svg + make all_data + make all_test_client } package() { install -Dm755 hurrycurry/target/"$(rust_chost)"/release/hurrycurry-server "$pkgdir/usr/bin/hurrycurry-server" @@ -61,8 +61,6 @@ package() { install -dm755 "$pkgdir/usr/share/hurrycurry/test-client/locale" install -Dm664 -t "$pkgdir/usr/share/hurrycurry/test-client/locale" hurrycurry/test-client/locale/* install -Dm644 hurrycurry/data/index.yaml "$pkgdir/usr/share/hurrycurry/data/index.yaml" - install -Dm664 -t "$pkgdir/usr/share/hurrycurry/data/recipes" hurrycurry/data/recipes/*.yaml - install -Dm664 -t "$pkgdir/usr/share/hurrycurry/data/maps" hurrycurry/data/maps/*.yaml - install -Dm664 hurrycurry/data/book.json "$pkgdir/usr/share/hurrycurry/data/book.json" - install -Dm664 -t "$pkgdir/usr/share/doc/hurrycurry/recipes" hurrycurry/data/recipes/*.svg + install -Dm644 -t "$pkgdir/usr/share/hurrycurry/data/recipes" hurrycurry/data/recipes/*.yaml + install -Dm644 -t "$pkgdir/usr/share/hurrycurry/data/maps" hurrycurry/data/maps/*.yaml } diff --git a/hurrycurry-server/PKGBUILD b/hurrycurry-server/PKGBUILD index 03a5a02..3a864d0 100644 --- a/hurrycurry-server/PKGBUILD +++ b/hurrycurry-server/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=hurrycurry-server -pkgver=2.3.5 +pkgver=3.0.1 pkgrel=1 pkgdesc="A game about cooking (server)" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') @@ -14,7 +14,7 @@ source=("hurrycurry-$pkgver.tar.gz::https://codeberg.org/hurrycurry/hurrycurry/a "hurrycurry.yaml" "tmpfiles.conf" "sysusers.conf") -sha256sums=('d822c088806717055040d26d5c8e50508cf90a766b512b1acaabc7f42bc2d255' +sha256sums=('6381a8384c0fd2b36f7bb9d8d5269346428c07a7585eb93812200c71ba0899d7' '2e10c8882ef4847586f03ac5feb469294c1b2304928f8df41db12a1d84569eb7' 'dec75b020f3a0bfc5c22f0fa013fe03d06feab608f9d4a42fb46d05dbed56844' 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' @@ -37,9 +37,8 @@ build() { cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-replaytool cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-registry cargo build --frozen --release --target "$(rust_chost)" --bin hurrycurry-discover - make -C data all - # make -C test-client # TODO currently broken - make -C data recipes/default.svg + make all_data + make all_testclient } package() { install -Dm755 hurrycurry/target/"$(rust_chost)"/release/hurrycurry-server "$pkgdir/usr/bin/hurrycurry-server" @@ -56,8 +55,6 @@ package() { install -dm755 "$pkgdir/usr/share/hurrycurry/test-client/locale" install -Dm664 -t "$pkgdir/usr/share/hurrycurry/test-client/locale" hurrycurry/test-client/locale/* install -Dm644 hurrycurry/data/index.yaml "$pkgdir/usr/share/hurrycurry/data/index.yaml" - install -Dm664 -t "$pkgdir/usr/share/hurrycurry/data/recipes" hurrycurry/data/recipes/*.yaml - install -Dm664 -t "$pkgdir/usr/share/hurrycurry/data/maps" hurrycurry/data/maps/*.yaml - install -Dm664 hurrycurry/data/book.json "$pkgdir/usr/share/hurrycurry/data/book.json" - install -Dm664 -t "$pkgdir/usr/share/doc/hurrycurry/recipes" hurrycurry/data/recipes/*.svg + install -Dm644 -t "$pkgdir/usr/share/hurrycurry/data/recipes" hurrycurry/data/recipes/*.yaml + install -Dm644 -t "$pkgdir/usr/share/hurrycurry/data/maps" hurrycurry/data/maps/*.yaml } diff --git a/hurrycurry-standalone-files-git/PKGBUILD b/hurrycurry-standalone-files-git/PKGBUILD index e9449e4..035479e 100644 --- a/hurrycurry-standalone-files-git/PKGBUILD +++ b/hurrycurry-standalone-files-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=hurrycurry-standalone-files-git -pkgver=r2462.46897ebd +pkgver=r3174.4f6b116a pkgrel=1 pkgdesc="A game about cooking (standalone files (git))" arch=('any') @@ -26,10 +26,11 @@ sha256sums=('SKIP' 'SKIP' 'SKIP') -_targets=( +_client_targets=( + "wasm32-unknown-unknown" "x86_64-unknown-linux-gnu" "aarch64-unknown-linux-gnu" - # "armv7-unknown-linux-gnueabi" + "armv7-unknown-linux-gnueabi" "i686-unknown-linux-gnu" "x86_64-pc-windows-gnu" "i686-pc-windows-gnu" @@ -37,11 +38,24 @@ _targets=( "armv7-linux-androideabi" "i686-linux-android" "x86_64-linux-android" + "all-linux-android" + "all-apple-darwin" +) +_server_targets=( + "x86_64-unknown-linux-gnu" + "aarch64-unknown-linux-gnu" + "i686-unknown-linux-gnu" + "x86_64-pc-windows-gnu" + "i686-pc-windows-gnu" ) _target_suf() { if echo "$t" | grep -q android; then echo -n ".apk" + elif echo "$t" | grep -q apple; then + echo -n ".zip" + elif echo "$t" | grep -q wasm; then + echo -n ".html" elif echo "$t" | grep -q windows; then echo -n ".exe" fi @@ -54,7 +68,7 @@ pkgver() { prepare() { cd "hurrycurry" rustup default nightly - for t in "${_targets[@]}"; do + for t in "${_server_targets[@]}"; do rustup target add --toolchain "$(cat rust-toolchain)" "$t" cargo fetch --locked --target "$t" done @@ -78,11 +92,10 @@ build() { git reset --hard - make client - make -C data all + make all local datafiles - datafiles=(data/recipes/*.yaml data/maps/*.yaml data/index.yaml data/book.json) + datafiles=(data/recipes/*.yaml data/maps/*.yaml data/index.yaml) tar --zstd -cvf ../out/data.tar.zst "${datafiles[@]}" zip ../out/data.zip "${datafiles[@]}" @@ -90,8 +103,7 @@ build() { sed -i "s/^const VERSION := .*/const VERSION := \"$pkgver-$pkgrel\"/" client/global.gd godot --headless --export-pack wasm32-unknown-unknown ../../out/client-any.pck client/project.godot - godot --headless --export-release wasm32-unknown-unknown ../../out/client-wasm32-unknown-unknown.html client/project.godot - for t in "${_targets[@]}"; do + for t in "${_client_targets[@]}"; do godot --headless --export-release "$t" "../../out/client-$t$(_target_suf "$t")" client/project.godot done @@ -99,12 +111,14 @@ build() { godot --headless --export-release "x86_64-pc-windows-gnu" "../../out/client-windows-installer-64.exe" client/project.godot godot --headless --export-release "i686-pc-windows-gnu" "../../out/client-windows-installer-32.exe" client/project.godot - for t in "${_targets[@]}"; do - if echo "$t" | grep -q android; then echo skip "$t"; continue; fi + for t in "${_server_targets[@]}"; do echo build "$t" cargo build --release --target "$t" --bin hurrycurry-server cargo build --release --target "$t" --bin hurrycurry-discover cargo build --release --target "$t" --bin hurrycurry-replaytool + cargo build --release --target "$t" --bin hurrycurry-tools + cargo build --release --target "$t" --bin hurrycurry-bot + cargo build --release --target "$t" --bin hurrycurry-editor done popd @@ -128,15 +142,17 @@ package() { install -Dvm644 "out/client-any.pck" "$out/client-any.pck" install -Dvm644 "out/data.tar.zst" "$out/data.tar.zst" install -Dvm644 "out/data.zip" "$out/data.zip" - for t in "${_targets[@]}"; do + for t in "${_client_targets[@]}"; do + install -Dvm644 "out/client-$t$(_target_suf "$t")" "$out/client-$t$(_target_suf "$t")" + done + for t in "${_server_targets[@]}"; do local suf suf=$(_target_suf "$t") - install -Dvm644 "out/client-$t$suf" "$out/client-$t$suf" - if echo "$t" | grep -q android; then continue; fi - install -Dvm644 "hurrycurry/target/$t/release/hurrycurry-server$suf" "$out/server-$t$suf" - install -Dvm644 "hurrycurry/target/$t/release/hurrycurry-discover$suf" "$out/discover-$t$suf" - install -Dvm644 "hurrycurry/target/$t/release/hurrycurry-replaytool$suf" "$out/replaytool-$t$suf" + for bin in server discover replaytool editor tools bot; do + install -Dvm644 "hurrycurry/target/$t/release/hurrycurry-$bin$suf" "$out/$bin-$t$suf" + done done install -Dvm644 "hurrycurry-windows-installer/hurrycurry-install-x86_64.exe" "$out/windows-installer-x86_64.exe" install -Dvm644 "hurrycurry-windows-installer/hurrycurry-install-i686.exe" "$out/windows-installer-i686.exe" + echo "<h1>Builds for Hurry Curry! $pkgver (untested pre-release)</h2>" > "$out/index.banner.html" } diff --git a/hurrycurry-standalone-files/PKGBUILD b/hurrycurry-standalone-files/PKGBUILD index 2ffa077..8574797 100644 --- a/hurrycurry-standalone-files/PKGBUILD +++ b/hurrycurry-standalone-files/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=hurrycurry-standalone-files -pkgver=2.3.5 -pkgrel=1 +pkgver=3.0.1 +pkgrel=2 pkgdesc="A game about cooking (standalone files)" arch=('any') url="https://codeberg.org/hurrycurry/hurrycurry" @@ -20,13 +20,13 @@ makedepends=( 'lib32-rust-libs' ) -_inst_version=2.3.4 +_inst_version=3.0.0 _website_version=2.3.4 source=("hurrycurry-$pkgver.tar.gz::https://codeberg.org/hurrycurry/hurrycurry/archive/v$pkgver.tar.gz" "hurrycurry-windows-installer-$_inst_version.tar.gz::https://codeberg.org/hurrycurry/windows-installer/archive/v$_inst_version.tar.gz" "hurrycurry-website-$_website_version.tar.gz::https://codeberg.org/hurrycurry/website/archive/v$_website_version.tar.gz") -sha256sums=('d822c088806717055040d26d5c8e50508cf90a766b512b1acaabc7f42bc2d255' - 'd071e15ca639ea481ccd96e3585a46acc8fb5f71a8d73124a7d98ff22eb40043' +sha256sums=('6381a8384c0fd2b36f7bb9d8d5269346428c07a7585eb93812200c71ba0899d7' + '40ea8f7b6d2176bd705f2e06c52177f0725f441ccbf5af98711e5e7a2452563f' '5c63e7db9ff2fbb2f7f82ef04b63412913beb276e75b755a4c91967a390c2fea') _targets=( @@ -77,11 +77,10 @@ build() { git reset --hard - make client - make -C data all + make all local datafiles - datafiles=(data/recipes/*.yaml data/maps/*.yaml data/index.yaml data/book.json) + datafiles=(data/recipes/*.yaml data/maps/*.yaml data/index.yaml) tar --zstd -cvf ../out/data.tar.zst "${datafiles[@]}" zip ../out/data.zip "${datafiles[@]}" @@ -105,11 +104,9 @@ build() { cargo build --release --target "$t" --bin hurrycurry-discover cargo build --release --target "$t" --bin hurrycurry-replaytool done - popd - pushd windows-installer - ln -svfT ../hurrycurry main + pushd windows-installer ln -svfT ../website website make \ NSIFLAGS="-DVERSION=$pkgver-$pkgrel" \ @@ -120,7 +117,6 @@ build() { SERVER_32=../hurrycurry/target/i686-pc-windows-gnu/release/hurrycurry-server.exe \ DISCOVER_64=../hurrycurry/target/x86_64-pc-windows-gnu/release/hurrycurry-discover.exe \ DISCOVER_32=../hurrycurry/target/i686-pc-windows-gnu/release/hurrycurry-discover.exe - popd } package() { @@ -139,4 +135,5 @@ package() { done install -Dvm644 "windows-installer/hurrycurry-install-x86_64.exe" "$out/windows-installer-x86_64.exe" install -Dvm644 "windows-installer/hurrycurry-install-i686.exe" "$out/windows-installer-i686.exe" + echo "<h1>Builds for Hurry Curry! $pkgver</h2>" > "$out/index.banner.html" } diff --git a/hurrycurry-website-git/PKGBUILD b/hurrycurry-website-git/PKGBUILD index 4014d49..e6c5cc1 100644 --- a/hurrycurry-website-git/PKGBUILD +++ b/hurrycurry-website-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=hurrycurry-website-git -pkgver=r33.7430b9c +pkgver=r92.de9edcd pkgrel=1 pkgdesc="Hurrycurry website files" arch=('any') diff --git a/isdad-git/PKGBUILD b/isdad-git/PKGBUILD index 9d42f10..4258927 100644 --- a/isdad-git/PKGBUILD +++ b/isdad-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=isdad-git -pkgver=r52.eb16e80 +pkgver=r58.bed2359 pkgrel=1 pkgdesc="Task queue server for isda" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') diff --git a/isdaw-git/PKGBUILD b/isdaw-git/PKGBUILD index f96d40f..15a5ff3 100644 --- a/isdaw-git/PKGBUILD +++ b/isdaw-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=isdaw-git -pkgver=r52.eb16e80 +pkgver=r58.bed2359 pkgrel=1 pkgdesc="Worker scripts for isda" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') diff --git a/iwlwifi-no-lar-dkms/0001-iwlwifi-disable-lar.patch b/iwlwifi-no-lar-dkms/0001-iwlwifi-disable-lar.patch new file mode 100644 index 0000000..5baa5d3 --- /dev/null +++ b/iwlwifi-no-lar-dkms/0001-iwlwifi-disable-lar.patch @@ -0,0 +1,52 @@ +From 4c98bca83f2abc49eddcb7150cdcf72da0509352 Mon Sep 17 00:00:00 2001 +From: metamuffin <metamuffin@disroot.org> +Date: Tue, 16 Dec 2025 20:12:18 +0100 +Subject: [PATCH] iwlwifi: Disable LAR + +--- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 4 ---- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 13 +------------ + 2 files changed, 1 insertion(+), 16 deletions(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +index e021fc57d..f6f0162dc 100644 +--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +@@ -1419,10 +1419,6 @@ iwl_parse_mei_nvm_data(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg, + return NULL; + } + +- if (data->lar_enabled && +- fw_has_capa(&fw->ucode_capa, IWL_UCODE_TLV_CAPA_LAR_SUPPORT)) +- sbands_flags |= IWL_NVM_SBANDS_FLAGS_LAR; +- + iwl_init_sbands(trans, data, mei_nvm->channels, tx_chains, rx_chains, + sbands_flags, true, fw); + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +index 301d590fe..a499bbe4e 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +@@ -1443,18 +1443,7 @@ static inline bool iwl_mvm_is_dqa_mgmt_queue(struct iwl_mvm *mvm, u8 queue) + + static inline bool iwl_mvm_is_lar_supported(struct iwl_mvm *mvm) + { +- bool nvm_lar = mvm->nvm_data->lar_enabled; +- bool tlv_lar = fw_has_capa(&mvm->fw->ucode_capa, +- IWL_UCODE_TLV_CAPA_LAR_SUPPORT); +- +- /* +- * Enable LAR only if it is supported by the FW (TLV) && +- * enabled in the NVM +- */ +- if (mvm->trans->cfg->nvm_type == IWL_NVM_EXT) +- return nvm_lar && tlv_lar; +- else +- return tlv_lar; ++ return false; + } + + static inline bool iwl_mvm_is_wifi_mcc_supported(struct iwl_mvm *mvm) +-- +2.52.0 + diff --git a/iwlwifi-no-lar-dkms/PKGBUILD b/iwlwifi-no-lar-dkms/PKGBUILD new file mode 100644 index 0000000..216792e --- /dev/null +++ b/iwlwifi-no-lar-dkms/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: metamuffin <metamuffin@disroot.org> +# Build instructions derived from https://aur.archlinux.org/packages/iwlwifi-lar-disable-dkms + +pkgname=iwlwifi-no-lar-dkms +pkgver=6.17.9 +pkgrel=2 +pkgdesc="Linux iwlwifi driver without LAR support as DKMS module" +arch=('any') +url="https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi" +license=('GPL2') +depends=('dkms') +source=("https://www.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$pkgver.tar.xz" + "0001-iwlwifi-disable-lar.patch" + "dkms.conf") +md5sums=('512f1c964520792d9337f43b9177b181' + '350c63f17b45fe2565d47db68512893f' + '730652a6fd46eaa97c001c01ea14dc91') + +options=(!strip) + +prepare() { + cd "$srcdir/linux-$pkgver" + pushd drivers/net/wireless/intel/iwlwifi + sed -i 's|$(srctree)/||' {d,m}vm/Makefile + popd + patch -p1 -i "$srcdir/0001-iwlwifi-disable-lar.patch" +} + +package() { + install -Dm644 dkms.conf "$pkgdir/usr/src/$pkgname-$pkgver/dkms.conf" + cp -rT "linux-$pkgver/drivers/net/wireless/intel/iwlwifi" "$pkgdir/usr/src/$pkgname-$pkgver" + sed -e "s/@PKGNAME@/$pkgname/" \ + -e "s/@PKGVER@/$pkgver/" \ + -i "$pkgdir"/usr/src/$pkgname-$pkgver/dkms.conf +} + diff --git a/iwlwifi-no-lar-dkms/dkms.conf b/iwlwifi-no-lar-dkms/dkms.conf new file mode 100644 index 0000000..64ea483 --- /dev/null +++ b/iwlwifi-no-lar-dkms/dkms.conf @@ -0,0 +1,12 @@ +PACKAGE_NAME="@PKGNAME@" +PACKAGE_VERSION="@PKGVER@" +BUILT_MODULE_NAME[0]="iwlwifi" +BUILT_MODULE_NAME[1]="iwldvm" +BUILT_MODULE_NAME[2]="iwlmvm" +BUILT_MODULE_LOCATION[0]="" +BUILT_MODULE_LOCATION[1]="dvm/" +BUILT_MODULE_LOCATION[2]="mvm/" +DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless/intel/iwlwifi/" +DEST_MODULE_LOCATION[1]="/kernel/drivers/net/wireless/intel/iwlwifi/dvm/" +DEST_MODULE_LOCATION[2]="/kernel/drivers/net/wireless/intel/iwlwifi/mvm/" +AUTOINSTALL="yes" diff --git a/jellything-git/PKGBUILD b/jellything-git/PKGBUILD index 98f9b7e..7d33806 100644 --- a/jellything-git/PKGBUILD +++ b/jellything-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=jellything-git -pkgver=r841.e99bde7 +pkgver=r1079.3c541b7 pkgrel=1 pkgdesc="Jellything media streaming server" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') @@ -35,22 +35,23 @@ prepare() { cd "jellything" git submodule init git submodule update - cargo +nightly fetch --locked --target "$(rust_chost)" + cargo fetch --locked --target "$(rust_chost)" } build() { cd "jellything" - cargo +nightly build --frozen --release --target "$(rust_chost)" - cargo +nightly build --frozen --release --bin generate_completions - ./target/release/generate_completions completions + cargo build --frozen --release --target "$(rust_chost)" -p jellytool + cargo build --frozen --release --target "$(rust_chost)" -p jellything + cargo build --frozen -p jellytool --bin generate_completions + ./target/debug/generate_completions completions mdbook build doc } check() { cd "jellything" - cargo test --release + cargo test --lib --workspace --release } package() { - install -Dm755 jellything/target/$(rust_chost)/release/jellything "$pkgdir/usr/bin/jellything" - install -Dm755 jellything/target/$(rust_chost)/release/jellytool "$pkgdir/usr/bin/jellytool" + install -Dm755 jellything/target/"$(rust_chost)"/release/jellything "$pkgdir/usr/bin/jellything" + install -Dm755 jellything/target/"$(rust_chost)"/release/jellytool "$pkgdir/usr/bin/jellytool" install -Dm644 jellything/completions/jellytool.fish "$pkgdir/usr/share/fish/completions/jellytool.fish" install -Dm644 jellything/completions/jellytool.bash "$pkgdir/usr/share/bash-completion/completions/jellytool" install -Dm644 jellything/completions/_jellytool "$pkgdir/usr/share/zsh/site-functions/_jellytool" diff --git a/mediamtx/.SRCINFO b/mediamtx/.SRCINFO deleted file mode 100644 index 6030ee4..0000000 --- a/mediamtx/.SRCINFO +++ /dev/null @@ -1,18 +0,0 @@ -pkgbase = mediamtx - pkgdesc = Ready-to-use RTSP / RTMP / LL-HLS / WebRTC server and proxy that allows to read, publish and proxy video and audio streams - pkgver = 1.8.0 - pkgrel = 1 - url = https://github.com/bluenviron/mediamtx - arch = x86_64 - arch = aarch64 - license = MIT - makedepends = go - backup = etc/mediamtx/mediamtx.yml - source = mediamtx-1.8.0.tar.gz::https://github.com/bluenviron/mediamtx/archive/refs/tags/v1.8.0.tar.gz - source = mediamtx.service - source = mediamtx@.service - b2sums = ac4a8bd9ce55a927f4d6849eac536c22db7fee9283ec4b5deecfe05e6832a9ef6ab6e8bffffc3a93ed6dfa9346e184ddb339697b7b7c8e258a26d9bebdd476de - b2sums = 636b7c89aec0e54a471464d013fd13fd83bebb21c3ebef9c0259fdea21185e3317ced09ef1c821ed253a62c3825f00cced19e42cdd175d1ddaecdef9800eeb4f - b2sums = 280cab48cc4d513d20952c82aab7474b9eb474dcb37a2b9d559a7caa8cd5ab6527a293c77b8ab7c64f02564c42c91b7141756020adef8ddb54316e8fcea6d0bf - -pkgname = mediamtx diff --git a/mediamtx/PKGBUILD b/mediamtx/PKGBUILD index 9328b1c..eaa6bad 100644 --- a/mediamtx/PKGBUILD +++ b/mediamtx/PKGBUILD @@ -1,22 +1,22 @@ -# Maintainer: database64128 <free122448@hotmail.com> +# Maintainer: metamuffin <metamuffin@disroot.org> +# Adapted from AUR package by database64128 <free122448@hotmail.com> pkgname=mediamtx -pkgver=1.8.3 -pkgrel=1 +pkgver=1.16.1 +pkgrel=2 pkgdesc="Ready-to-use RTSP / RTMP / LL-HLS / WebRTC server and proxy that allows to read, publish and proxy video and audio streams" arch=('x86_64' 'aarch64') -url="https://github.com/bluenviron/$pkgname" +url="https://github.com/bluenviron/mediamtx" license=('MIT') makedepends=('go') -backup=("etc/$pkgname/mediamtx.yml") source=( - "$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz" - "$pkgname.service" - "$pkgname@.service" + "$pkgname-$pkgver.tar.gz::https://github.com/bluenviron/mediamtx/archive/refs/tags/v$pkgver.tar.gz" + "mediamtx.service" + "sysusers.conf" ) -b2sums=('b8060b459bc1d3da7c54deccfc6d66576312263b2a6b143a2556f7f670f0c0dbf070123564446a5f14ad2a772ade465c4e92ecdd105f4000836f02e1b1e6582c' - '636b7c89aec0e54a471464d013fd13fd83bebb21c3ebef9c0259fdea21185e3317ced09ef1c821ed253a62c3825f00cced19e42cdd175d1ddaecdef9800eeb4f' - '280cab48cc4d513d20952c82aab7474b9eb474dcb37a2b9d559a7caa8cd5ab6527a293c77b8ab7c64f02564c42c91b7141756020adef8ddb54316e8fcea6d0bf') +sha256sums=('e60658a4f2e3560233daf6013666df77c285e5c21367093f0f4ff95c03ac503d' + '3d5c60acf793a59bc5f8978609b54507ba576f3b070479b7249d9053af6deac9' + '9dec1b4c876a0d57790234a65c9efafe3b5dd29d66cf779be67a81bd8ba6c124') build() { cd "$pkgname-$pkgver" @@ -26,15 +26,13 @@ build() { export CGO_LDFLAGS="${LDFLAGS}" export GOFLAGS="-buildmode=pie -trimpath" go generate ./... - go build -ldflags="-s -w -linkmode=external -X github.com/bluenviron/mediamtx/internal/core.version=v$pkgver" + go build -ldflags="-s -w -linkmode=external" } package() { install -Dm644 $pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service - install -Dm644 $pkgname@.service "$pkgdir"/usr/lib/systemd/system/$pkgname@.service + install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" cd "$pkgname-$pkgver" - install -d "$pkgdir"/etc/$pkgname - install -Dm644 $pkgname.yml "$pkgdir"/etc/$pkgname/$pkgname.yml install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname } diff --git a/mediamtx/mediamtx.service b/mediamtx/mediamtx.service index c8ea8bf..a59767e 100644 --- a/mediamtx/mediamtx.service +++ b/mediamtx/mediamtx.service @@ -1,10 +1,11 @@ [Unit] -Description=MediaMTX +Description=MediaMTX live media router After=network-online.target Wants=network-online.target [Service] -ExecStart=/usr/bin/mediamtx /etc/mediamtx/mediamtx.yml +ExecStart=/usr/bin/mediamtx /etc/mediamtx.yaml +User=mediamtx [Install] WantedBy=multi-user.target diff --git a/mediamtx/mediamtx@.service b/mediamtx/mediamtx@.service deleted file mode 100644 index 055ce64..0000000 --- a/mediamtx/mediamtx@.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=MediaMTX -After=network-online.target -Wants=network-online.target - -[Service] -ExecStart=/usr/bin/mediamtx /etc/mediamtx/%i.yml - -[Install] -WantedBy=multi-user.target diff --git a/mediamtx/sysusers.conf b/mediamtx/sysusers.conf new file mode 100644 index 0000000..0942862 --- /dev/null +++ b/mediamtx/sysusers.conf @@ -0,0 +1 @@ +u mediamtx - "MediaMTX live media router" - - diff --git a/metamuffin-website-git/PKGBUILD b/metamuffin-website-git/PKGBUILD index fc84eda..491914d 100644 --- a/metamuffin-website-git/PKGBUILD +++ b/metamuffin-website-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=metamuffin-website-git -pkgver=r88.4456239 +pkgver=r91.cc3758a pkgrel=1 pkgdesc="metamuffin's personal webpage" arch=('any') diff --git a/statuspage-git/PKGBUILD b/statuspage-git/PKGBUILD index eba5aa4..ea71fbd 100644 --- a/statuspage-git/PKGBUILD +++ b/statuspage-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: metamuffin <metamuffin@disroot.org> pkgname=statuspage-git -pkgver=r21.e815f6c +pkgver=r26.0beb81c pkgrel=1 pkgdesc="service status page" arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') diff --git a/violet/PKGBUILD b/violet/PKGBUILD index 737a0bf..a07ec0f 100644 --- a/violet/PKGBUILD +++ b/violet/PKGBUILD @@ -1,18 +1,17 @@ -# Maintainer: Paul-Louis Ageneau <paul-louis at ageneau dot org> +# Maintainer: metamuffin <metamuffin@disroot.org> +# Adapted from AUR package by Paul-Louis Ageneau <paul-louis at ageneau dot org> pkgname=violet -pkgver=0.5.1 -pkgrel=1 +pkgver=0.5.4 +pkgrel=2 pkgdesc="Lightweight STUN/TURN server" arch=('x86_64' 'i686' 'armv7h' 'aarch64') url="https://github.com/paullouisageneau/$pkgname" -license=('GPL') # GPLv2 or any later version -makedepends=('git' 'cmake') +license=('GPL') +makedepends=('cmake') depends=('glibc' 'libjuice') -provides=() -conflicts=() -source=("git+https://github.com/paullouisageneau/$pkgname.git#tag=v$pkgver") -md5sums=('f27c5928da9490af0f3a8f59e27ced19') +source=("$pkgname-$pkgver.tar.gz::https://github.com/paullouisageneau/violet/archive/refs/tags/v0.5.4.tar.gz") +sha256sums=('79323f84e547f3742d062f09da2d9a4315466767f9d5e8f66363445dccd30992') prepare() { true @@ -31,12 +30,8 @@ build() { package() { cd "$pkgname" - install -m755 -d "$pkgdir"/usr/bin - install -m755 build/"$pkgname" "$pkgdir"/usr/bin - install -m755 -d "$pkgdir"/usr/lib/systemd/system - install -m644 "$pkgname".service "$pkgdir"/usr/lib/systemd/system - install -m755 -d "$pkgdir"/etc/violet - install -m644 example.conf "$pkgdir"/etc/violet/violet.conf + install -Dm755 build/violet "$pkgdir"/usr/bin/violet + install -Dm644 violet.service "$pkgdir"/usr/lib/systemd/system/violet.service install -m755 -d "$pkgdir"/usr/lib/sysusers.d - echo "u violet - \"Violet STUN/TURN server user\"" > "$pkgdir"/usr/lib/sysusers.d/violet.conf + echo "u violet - \"Violet STUN/TURN server\"" > "$pkgdir"/usr/lib/sysusers.d/violet.conf } |