From 1b96358c5fa0d88747a4fb6ca1772814b425b3a4 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Sun, 22 Nov 2020 12:43:01 -0500 Subject: [PATCH] Update some packages, add command to ppa --- ppa | 4 + src/aurutils/PKGBUILD | 29 +++--- src/biboumi/PKGBUILD | 24 ++--- src/ccextractor/PKGBUILD | 11 +-- src/chocolate-doom-git/PKGBUILD | 140 ++++++----------------------- src/comskip/PKGBUILD | 25 +++--- src/comskip/comskip-version.patch | 8 -- src/crispy-doom/PKGBUILD | 18 ++-- src/ffmpegfs/PKGBUILD | 5 +- src/luaunbound/PKGBUILD | 18 ++-- src/luaunbound/use_cc.patch | 12 --- src/ocserv/PKGBUILD | 12 +-- src/php-pear/PKGBUILD | 9 +- src/python-configshell-fb/PKGBUILD | 4 +- src/python-rtslib-fb/PKGBUILD | 8 +- src/qemu-user-static/PKGBUILD | 108 +++++++++++----------- src/rusty-keys-git/PKGBUILD | 2 +- src/sonarr/PKGBUILD | 4 +- src/targetcli-fb/PKGBUILD | 5 +- 19 files changed, 172 insertions(+), 274 deletions(-) delete mode 100644 src/comskip/comskip-version.patch delete mode 100644 src/luaunbound/use_cc.patch diff --git a/ppa b/ppa index 6fea6ec..7cb508c 100755 --- a/ppa +++ b/ppa @@ -191,6 +191,10 @@ grep_deps() { grep "$1" src/*/PKGBUILD } +git_add_changes() { + git add -f $(git status | grep -E '^.+(modified|deleted):' | sed 's/.* //' | tr '\n' ' ') +} + if [ "$#" -gt 0 ]; then [ -d "$src_dir" ] || mkdir -p "$src_dir" [ -d "$pkg_dir" ] || mkdir -p "$pkg_dir" diff --git a/src/aurutils/PKGBUILD b/src/aurutils/PKGBUILD index d61093f..93ad4b7 100644 --- a/src/aurutils/PKGBUILD +++ b/src/aurutils/PKGBUILD @@ -1,22 +1,29 @@ -# Maintainer: Alad Wenter -# Co-Maintainer: Cedric Girard +# Maintainer: Alad Wenter pkgname=aurutils -pkgver=2.3.1 +pkgver=3.1.2 pkgrel=1 pkgdesc='helper tools for the arch user repository' url='https://github.com/AladW/aurutils' arch=('any') license=('custom:ISC') -source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") - #"$pkgname-$pkgver.tar.gz.asc::$url/releases/download/$pkgver/$pkgver.tar.gz.asc") -install=$pkgname.install -depends=('git' 'jq' 'expac' 'diffstat' 'pacutils' 'parallel' 'wget') +source=("$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" + "$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz.signify" + 'aurutils.pub') +changelog=aurutils.changelog +sha256sums=('86a80ae8327aeeb4932c7709767b2be5fae19281a5bcc78b2b10197e97c32afb' + 'SKIP' + 'a2c32b0dba4da40b83ff31cce48a00faed5ed2f663c060a865d31caeb1e4ed39') +depends=('git' 'jq' 'pacutils' 'curl') +makedepends=('signify') optdepends=('bash-completion: bash completion' + 'zsh: zsh completion' 'devtools: aur-chroot' - 'vifm: build file interaction' - 'xdelta3: generate delta files') -sha256sums=('c657f2d0878bedeb0f11d2b72f3028d271db0f14d8f23c18b641e3c59134150e') -validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A') # Alad Wenter + 'vifm: default pager') + +prepare() { + signify -V -p aurutils.pub -m "$pkgname-$pkgver".tar.gz \ + -x "$pkgname-$pkgver".tar.gz.signify +} build() { cd "$pkgname-$pkgver" diff --git a/src/biboumi/PKGBUILD b/src/biboumi/PKGBUILD index ca31528..ae1c8e4 100644 --- a/src/biboumi/PKGBUILD +++ b/src/biboumi/PKGBUILD @@ -1,19 +1,19 @@ # Maintainer: Emmanuel Gil Peyrot pkgname=biboumi -pkgver=8.5 -pkgrel=2 +pkgver=9.0 +pkgrel=1 pkgdesc="XMPP gateway to IRC" -arch=('i686' 'x86_64' 'armv7h' 'aarch64') +arch=('x86_64' 'armv7h' 'aarch64') url="https://biboumi.louiz.org/" license=('ZLIB') depends=('expat' 'libidn' 'udns' 'botan' 'sqlite' 'postgresql-libs') -makedepends=('cmake' 'pandoc' 'catch2' 'git') +makedepends=('cmake' 'ninja' 'python-sphinx' 'python-sphinx_rtd_theme') backup=("etc/$pkgname/$pkgname.cfg") source=("https://git.louiz.org/biboumi/snapshot/$pkgname-$pkgver.tar.xz" 'biboumi.tmpfiles' 'biboumi.sysusers') -md5sums=('d27e81bc3d74bcc9e33fd8c1a6c4ecaf' +md5sums=('f0a201312454f529bb2a476856264e52' '3fd509b5cd76cd6c98ddb392957de03b' '07c92af3248861ce94d361e98cfb7f5c') @@ -25,21 +25,25 @@ prepare() { -DCMAKE_INSTALL_PREFIX=/usr \ -DSERVICE_USER=biboumi \ -DSERVICE_GROUP=jabber \ - -Wno-dev + -Wno-dev \ + -G Ninja } build() { - cd build - make biboumi + ninja -C build + ninja -C build doc } package() { cd build - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install + + install -dm755 "$pkgdir"/usr/share/doc/$pkgname/ + cp -r html "$pkgdir"/usr/share/doc/$pkgname/ cd ../$pkgname-$pkgver install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - install -Dm644 doc/biboumi.1.rst "$pkgdir"/usr/share/doc/$pkgname/$pkgname.rst + install -Dm644 doc/*.rst "$pkgdir"/usr/share/doc/$pkgname/ install -Dm644 conf/biboumi.cfg "$pkgdir"/etc/$pkgname/$pkgname.cfg cd .. diff --git a/src/ccextractor/PKGBUILD b/src/ccextractor/PKGBUILD index f1ef3a2..08acb43 100644 --- a/src/ccextractor/PKGBUILD +++ b/src/ccextractor/PKGBUILD @@ -3,17 +3,14 @@ # Contributor: Nathan Owe # Contributor: Chris Allison -# Current source for PKGBUILD can be found at -# https://github.com/cacack/pkgbuilds/tree/master/ccextractor - pkgname=ccextractor pkgver=0.88 -pkgrel=1 +pkgrel=2 pkgdesc="A fast closed captions extractor for MPEG files." arch=('i686' 'x86_64') -url="http://www.ccextractor.org" +url="https://www.ccextractor.org" license=('GPL') -depends=('gcc-libs' 'tesseract') +depends=('gcc-libs' 'tesseract' 'leptonica' 'ffmpeg') source=( https://github.com/CCExtractor/ccextractor/archive/v$pkgver.tar.gz ) @@ -21,7 +18,7 @@ sha512sums=('bb9442905f3c5d095b9b34eb318dc445a0ba484c22c4f061071cc2a1159ec9304b8 build() { cd "$srcdir/$pkgname-$pkgver/linux" - ./build + ./build_hardsubx } package() { diff --git a/src/chocolate-doom-git/PKGBUILD b/src/chocolate-doom-git/PKGBUILD index e2027c6..e08710a 100644 --- a/src/chocolate-doom-git/PKGBUILD +++ b/src/chocolate-doom-git/PKGBUILD @@ -1,140 +1,54 @@ # Maintainer: Mike Swanson -pkgname=(chocolate-{doom,heretic,hexen,strife,common}-git) -_pkgname=${pkgname[0]/-git/} +pkgname=chocolate-doom-git pkgdesc="Historically-accurate Doom, Heretic, Hexen, and Strife ports." -pkgver=3.0.0.r809.b9d4c04c -pkgrel=1 +pkgver=3.0.0.r822.ee9fc21f +pkgrel=2 arch=('i686' 'x86_64') url="http://www.chocolate-doom.org/" license=('GPL2') +install=chocolate-doom.install depends=('libpng' 'libsamplerate' 'sdl2_mixer' 'sdl2_net') makedepends=('git' 'python') +optdepends=('freedm: Free deathmatch game' + 'freedoom1: Free Ultimate Doom-compatible game' + 'freedoom2: Free Doom II-compatible game') +conflicts=(chocolate-common + chocolate-doom + chocolate-heretic + chocolate-hexen + chocolate-strife) +replaces=(chocolate-common-git + chocolate-heretic-git + chocolate-hexen-git + chocolate-strife-git) source=(git+https://github.com/chocolate-doom/chocolate-doom.git) sha512sums=('SKIP') pkgver() { - cd "${_pkgname}" + cd "${pkgname/-git//}" local version="$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')" printf %s "${version##chocolate.doom.}" } build() { - cd "${_pkgname}" + cd "${pkgname/-git//}" ./autogen.sh --prefix=/usr make } -package_chocolate-common-git() { - pkgdesc="Files shared in common with Chocolate Doom-based games." - conflicts=(chocolate-common) - install=chocolate-doom.install +package() { + cd "${pkgname/-git//}" - cd "${_pkgname}" make DESTDIR="${pkgdir}" install install -dm 755 "${pkgdir}"/usr/share/games/doom - cd "${pkgdir}"/usr/bin - mv chocolate-doom-setup chocolate-setup - rm -f chocolate-{doom,heretic,hexen,strife}{,-setup} - - cd "${pkgdir}"/usr/share - rm -rf bash-completion doc man/man5 - rm -rf applications/chocolate-{doom,heretic,hexen,strife}.desktop \ - applications/screensavers - rm -rf metainfo - cd man/man6 - rm -f chocolate-{doom,heretic,hexen,strife}{,-setup}.6 -} - -package_chocolate-doom-git() { - pkgdesc="Doom port accurately reproducing the original DOS EXEs." - depends=(${depends[@]} 'chocolate-common-git') - optdepends=('freedm: Free deathmatch game' - 'freedoom1: Free Ultimate Doom-compatible game (not vanilla compatible, but useful for mods)' - 'freedoom2: Free Doom II/Final Doom-compatible game (not vanilla compatible, but useful for mods)') - conflicts=(chocolate-doom) - - cd "${_pkgname}" - make DESTDIR="${pkgdir}" install - - cd "${pkgdir}"/usr/bin - rm -f chocolate-{heretic,hexen,strife,server} chocolate*setup - ln -s chocolate{,-doom}-setup - - cd "${pkgdir}"/usr/share - rm -rf doc/chocolate-{heretic,hexen,strife} - rm -rf applications/chocolate-{setup,heretic,hexen,strife}.desktop icons - rm -f metainfo/chocolate-{heretic,hexen,strife}.appdata.xml \ - bash-completion/completions/chocolate-{heretic,hexen,strife} - rm -f man/man?/chocolate-{heretic,hexen,strife,setup,server}* \ - man/man5/{heretic,hexen,strife}.cfg* -} - -package_chocolate-heretic-git() { - pkgdesc="Heretic port accurately reproducing the original DOS EXEs." - depends=(${depends[@]} 'chocolate-common-git') - optdepends=('blasphemer: Free Heretic-compatible game') - conflicts=(chocolate-heretic) - - cd "${_pkgname}" - make DESTDIR="${pkgdir}" install - - cd "${pkgdir}"/usr/bin - rm -f chocolate-{doom,hexen,strife,server} chocolate*setup - ln -s chocolate{,-heretic}-setup - - cd "${pkgdir}"/usr/share - rm -rf doc/chocolate-{doom,hexen,strife} - rm -rf applications/chocolate-{setup,doom,hexen,strife}.desktop \ - applications/screensavers icons - rm -f metainfo/chocolate-{doom,hexen,strife}.appdata.xml \ - bash-completion/completions/chocolate-{doom,hexen,strife} - rm -f man/man?/chocolate-{doom,hexen,strife,setup,server}* \ - man/man5/{default,hexen,strife}.cfg* -} - -package_chocolate-hexen-git() { - pkgdesc="Hexen port accurately reproducing the original DOS EXEs." - depends=(${depends[@]} 'chocolate-common-git') - conflicts=(chocolate-hexen) - - cd "${_pkgname}" - make DESTDIR="${pkgdir}" install - - cd "${pkgdir}"/usr/bin - rm -f chocolate-{doom,heretic,strife,server} chocolate*setup - ln -s chocolate{,-hexen}-setup - - cd "${pkgdir}"/usr/share - rm -rf doc/chocolate-{doom,heretic,strife} - rm -rf applications/chocolate-{setup,doom,heretic,strife}.desktop \ - applications/screensavers icons - rm -f metainfo/chocolate-{doom,heretic,strife}.appdata.xml \ - bash-completion/completions/chocolate-{doom,heretic,strife} - rm -f man/man?/chocolate-{doom,heretic,strife,setup,server}* \ - man/man5/{default,heretic,strife}.cfg* -} - -package_chocolate-strife-git() { - pkgdesc="Strife port accurately reproducing the original DOS EXEs." - depends=(${depends[@]} 'chocolate-common-git') - conflicts=(chocolate-strife) - - cd "${_pkgname}" - make DESTDIR="${pkgdir}" install - - cd "${pkgdir}"/usr/bin - rm -f chocolate-{doom,heretic,hexen,server} chocolate*setup - ln -s chocolate{,-strife}-setup - - cd "${pkgdir}"/usr/share - rm -rf doc/chocolate-{doom,heretic,hexen} - rm -rf applications/chocolate-{setup,doom,heretic,hexen}.desktop \ - applications/screensavers icons - rm -f metainfo/chocolate-{doom,heretic,hexen}.appdata.xml \ - bash-completion/completions/chocolate-{doom,heretic,hexen} - rm -f man/man?/chocolate-{doom,heretic,hexen,setup,server}* \ - man/man5/{default,heretic,hexen}.cfg* + # dedup all the *setup programs, make desktop file work + rm "${pkgdir}"/usr/bin/chocolate-{heretic,hexen,strife}-setup + mv "${pkgdir}"/usr/bin/chocolate-doom-setup "${pkgdir}"/usr/bin/chocolate-setup + ln -s chocolate-setup "${pkgdir}"/usr/bin/chocolate-doom-setup + ln -s chocolate-setup "${pkgdir}"/usr/bin/chocolate-heretic-setup + ln -s chocolate-setup "${pkgdir}"/usr/bin/chocolate-hexen-setup + ln -s chocolate-setup "${pkgdir}"/usr/bin/chocolate-strife-setup } diff --git a/src/comskip/PKGBUILD b/src/comskip/PKGBUILD index 4775660..b4e100f 100644 --- a/src/comskip/PKGBUILD +++ b/src/comskip/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Nick Burrett pkgname=comskip -pkgver=0.82.002 -pkgrel=1 +pkgver=0.82.009 +pkgrel=2 epoch=1 pkgdesc='Comskip is a free MPEG commercial break detector'. _gitname='comskip' @@ -10,20 +10,17 @@ arch=('x86_64' 'i686') license=('GPL3') makedepends=('git') depends=('ffmpeg' 'argtable') -source=("${_gitname}::git+https://github.com/erikkaashoek/Comskip#commit=0bf473cb5be4b754f01f95fb3cffd120f5f1985a" - "comskip-version.patch") -sha256sums=('SKIP' - '7bf06bef3c4d26b6aad1bd0714b2b365bbd0c76bb491bf8ec42d8752ff442cd0') +source=("https://github.com/erikkaashoek/Comskip/archive/0.82.009.tar.gz" + "compilation.patch") +sha256sums=('eae287eff75f018d71a92623ffa67529f8dc75fd6165d07f1b299cdf10c2981a' + "5ea83b9e7189b9f320e3890891c0273daa5325b35298a3b921a904e9a357b798") prepare() { - cd "${srcdir}/${_gitname}" - # Fixes version reported by binary. - patch -Np1 -i $srcdir/comskip-version.patch + patch -p1 -i ${srcdir}/compilation.patch } - build() { - cd "${srcdir}/${_gitname}" + cd "${srcdir}/Comskip-${pkgver}" ./autogen.sh ./configure --prefix=/usr make clean @@ -32,9 +29,9 @@ build() { package() { mkdir -p "$pkgdir/usr/bin" - install -m755 "${srcdir}/${_gitname}/comskip" "$pkgdir/usr/bin/comskip" - if [ -e "${srcdir}/${_gitname}/comskip-gui" ]; then - install -m755 "${srcdir}/${_gitname}/comskip-gui" "$pkgdir/usr/bin/comskip-gui" + install -m755 "${srcdir}/Comskip-${pkgver}/comskip" "$pkgdir/usr/bin/comskip" + if [ -e "${srcdir}/Comskip-${pkgver}/comskip-gui" ]; then + install -m755 "${srcdir}/Comskip-${pkgver}/comskip-gui" "$pkgdir/usr/bin/comskip-gui" fi } diff --git a/src/comskip/comskip-version.patch b/src/comskip/comskip-version.patch deleted file mode 100644 index cbd97b0..0000000 --- a/src/comskip/comskip-version.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- comskip/configure.ac.orig 2017-05-12 16:57:36.255651925 +0100 -+++ comskip/configure.ac 2017-05-12 16:57:43.845506928 +0100 -@@ -1,4 +1,4 @@ --AC_INIT([Comskip], [0.81.089], [https://github.com/erikkaashoek/Comskip/issues]) -+AC_INIT([Comskip], [0.82.002], [https://github.com/erikkaashoek/Comskip/issues]) - AM_INIT_AUTOMAKE([-Wall -Werror foreign]) - - : ${CFLAGS=""} diff --git a/src/crispy-doom/PKGBUILD b/src/crispy-doom/PKGBUILD index 5e36304..9257b10 100644 --- a/src/crispy-doom/PKGBUILD +++ b/src/crispy-doom/PKGBUILD @@ -2,8 +2,8 @@ pkgname=crispy-doom pkgdesc="Vanilla-compatible enhanced Doom engine" -pkgver=5.8.0 -pkgrel=3 +pkgver=5.9.2 +pkgrel=2 arch=('i686' 'x86_64') url="http://fabiangreffrath.github.io/crispy-doom" license=('GPL2') @@ -14,17 +14,9 @@ optdepends=('freedm: Free deathmatch game' 'freedoom2: Free Doom II-compatible game') install=crispy-doom.install source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz - 0001-fix-sky-in-NRFTL-MAP04-08-if-loaded-from-command-lin.patch - 0002-allow-HUD-texts-being-printed-up-to-the-right-screen.patch - 0003-NERVE.wad-Support-for-Vanilla-DOOM-2-586.patch - 0004-un-name-the-color-translation-enum.patch - 0005-restrict-game-choice-to-Doom-and-Heretic.patch) -b2sums=('f4495363216fe251566ffda6ff4dff0952661050ebb1221e536ab5a13f792b69ae4eb159f2a89b32843cc796cead43455216ddec8cc2047d44e565f0aaab302b' - 'b78423efa9402936adf40ac276e86f86742d29b5cafddbbe88937da65fdea9ff1412033a54e367c30886cbc4a433f194309bcabe9028ca9c5afc4573ecd70435' - 'b3c572f5b433e14e2316e5dd3f2be01fc14974c0ef7b81915664f3a99f8a14af5c14363b9a91820ff08f75466e55ebd82ccd37be2c38f89a0e101acd2cff0ca8' - '0d4c1c39992b3a672830c63a80243e6344fe9c6159c97ae76e647ce563ba2a3ee6e8755f3f54e736693877e2e7ca53fe8bcde5bc09c637fb63a7d6b16020fc6b' - 'ddc440848fb6e09d6abe54d4025ec5a1c0f8f81f3d7d00d042c900fbc0d452fbec9fa472c66078679cfb2212623a7faf4ce26a7c8fc51ed293e8f84e6a02010e' - 'cd8d58c38bc2f720b29f54fb61f6222a88f8f15e5b38e887bcdda6303a6b16337468302f32f1e9c1f6248eb09d2f3b5261a10e69000b905fb1d7eef1a6589762') + 0001-prevent-crashes-with-simultaneous-use-of-record-and-.patch) +b2sums=('63d9a89d6099485c79ff4cad69975de790b32a4ece4bded172ebf771a2bf1b4dcd21ab58383ca3c5eea32a4eff72e65ec0e3a283c85f1bc62be680de04f88e52' + 'b1e77adf37f22f1ef47b614e27e6158ac7c19bf5b7adfa97a434b04f514a1e5cb7f1f77024a373392c836c5456c87b5bb6f7240566389574392a2e5f05d63d5d') prepare() { cd "$pkgname-$pkgname-$pkgver" diff --git a/src/ffmpegfs/PKGBUILD b/src/ffmpegfs/PKGBUILD index 02fa288..74e804d 100644 --- a/src/ffmpegfs/PKGBUILD +++ b/src/ffmpegfs/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Willem Mulder <14mRh4X0r@gmail.com> pkgname=ffmpegfs -pkgver=1.99 +pkgver=2.0 pkgrel=1 pkgdesc="FUSE-based transcoding filesystem with video support from many formats to MP4, WebM, OGG, MP3, OPUS, MOV, ProRes or WAV." arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') # Not arch-specific, should work on all @@ -9,6 +9,7 @@ license=('GPL3' 'FDL1.3') makedepends=('asciidoc' 'w3m' 'xxd') depends=('fuse' 'ffmpeg' 'sqlite' 'libbluray' 'libdvdread') source=("https://github.com/nschlia/ffmpegfs/releases/download/v$pkgver/ffmpegfs-$pkgver.tar.gz") +sha384sums=('e97a4e030e426c4b5a2bff030ac0b8a45f1d6dade0dcfe456a06ee3d3b9c3f2568ffc2c83131ce6f8c884f1012a5a5e4') build() { cd "$pkgname-$pkgver" @@ -22,5 +23,3 @@ package() { install -Dm644 README.md "$pkgdir/usr/share/doc/ffmpegfs/README.md" } - -sha384sums=('cb6d3cccf9a209d6b2642a8c31053321955dbb9d40360e728dcf00ec33f254f1831b4ddc4c3b3b6925e2cb2adb5b2b29') diff --git a/src/luaunbound/PKGBUILD b/src/luaunbound/PKGBUILD index 8af45ab..9169c14 100644 --- a/src/luaunbound/PKGBUILD +++ b/src/luaunbound/PKGBUILD @@ -1,8 +1,7 @@ # Maintainer: fordprefect # Contributor: jhass pkgname=luaunbound -pkgver=0.2_1 -_pkgver=0.2-1 +pkgver=0.5 epoch=1 pkgrel=1 pkgdesc="drop-in replacement for Prosodys internal DNS library with a binding to libunbound" @@ -13,23 +12,22 @@ depends=("unbound") makedepends=("mercurial" "unbound" "lua" "libxslt" "ccache") optdepends=("luajit: jit for lua") install=luaunbound.install -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LuaDist2/luaunbound/archive/${_pkgver}.tar.gz" "use_cc.patch") -sha512sums=('SKIP' - '6b11dfe9f5de743f101463fb3fb2144fe3aff75e7e19036f67d0e0b8adc8c36db73cf73d0aba483d651f8f5b2773093adc27e788354b165314c777e8de45bf28') +source=("https://code.zash.se/dl/luaunbound/luaunbound-${pkgver}.tar.gz") +sha512sums=('8bd76a5e17d21b704953f5e2963b9ac0b4d3c6b32fd3dec8313ccea708a7606c6f6cdf088be6395e51bcaf4b2ca589e402dfb8bafdca53b6eda6088c0d6592b5') prepare() { - cd "$srcdir/$pkgname-$_pkgver" - patch -p1 < "$srcdir/use_cc.patch" + cd "$srcdir/$pkgname-$pkgver" + # use CC + sed -i 's/(LD)/(CC)/g' GNUmakefile } build() { - cd "$srcdir/$pkgname-$_pkgver" + cd "$srcdir/$pkgname-$pkgver" make all } package() { - cd "$srcdir/$pkgname-$_pkgver" - install -Dm644 use_unbound.lua "$pkgdir/etc/prosody/use_unbound.lua" + cd "$srcdir/$pkgname-$pkgver" install -Dm755 lunbound.so "$pkgdir/usr/lib/prosody/util/lunbound.so" install -Dm644 README.markdown "$pkgdir/usr/share/doc/luaunbound/README" install -Dm444 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/src/luaunbound/use_cc.patch b/src/luaunbound/use_cc.patch deleted file mode 100644 index 85ffab9..0000000 --- a/src/luaunbound/use_cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r f270a1cf86ce Makefile ---- a/Makefile Sun Jan 10 19:49:52 2016 +0100 -+++ b/Makefile Mon Jun 20 15:34:28 2016 +0200 -@@ -33,7 +33,7 @@ - xsltproc root-anchors.xsl root-anchors.xml > $@ - - %.so: %.o -- $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) - - install: - install -d $(DESTDIR)$(LUA_LIBDIR)/ diff --git a/src/ocserv/PKGBUILD b/src/ocserv/PKGBUILD index 8ce5f57..347a01a 100644 --- a/src/ocserv/PKGBUILD +++ b/src/ocserv/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Brian Bidulock pkgname=ocserv -pkgver=0.12.4 +pkgver=1.1.1 pkgrel=1 pkgdesc="OpenConnect VPN Server" arch=('i686' 'x86_64') @@ -9,22 +9,22 @@ license=('GPL2') depends=('autogen' 'libpcl' 'http-parser' 'libnl' 'libsystemd' 'protobuf-c' 'talloc' 'libseccomp' 'freeradius-client' 'libev' 'oath-toolkit' 'libwrap' 'geoip') makedepends=('freeradius' 'gperf' 'tcp-wrappers') backup=('etc/ocserv.config' 'etc/ocserv-passwd') -source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/ocserv/ocserv/repository/archive.tar.gz?ref=ocserv_${pkgver//./_}") -sha256sums=('12b4f83ff16eff066c28d657ffbaacfef727984c817f63d12d506f7dcf9e24a3') +source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/ocserv/ocserv/repository/archive.tar.gz?ref=${pkgver}") +sha256sums=('2042f1f777c81d6fad76222fa26684497a1e2ec2deb7bb2228ef012a2c6436f5') prepare() { - cd ${pkgname}-${pkgname}_* + cd ${pkgname}-${pkgver}-* autoreconf -fi } build() { - cd ${pkgname}-${pkgname}_* + cd ${pkgname}-${pkgver}-* ./configure --prefix=/usr --sbindir=/usr/bin make } package() { - cd ${pkgname}-${pkgname}_* + cd ${pkgname}-${pkgver}-* make DESTDIR="$pkgdir" install install -Dm0644 doc/sample.config "$pkgdir/etc/ocserv.config" install -Dm0600 doc/sample.passwd "$pkgdir/etc/ocserv-passwd" diff --git a/src/php-pear/PKGBUILD b/src/php-pear/PKGBUILD index 6ac2a25..65c838f 100644 --- a/src/php-pear/PKGBUILD +++ b/src/php-pear/PKGBUILD @@ -9,11 +9,12 @@ pkgdesc='PHP Extension and Application Repository' url='https://pear.php.net/package/pearweb_phars/' depends=('php') license=('PHP') -source=("install-pear-nozlib-${pkgver}.phar::https://github.com/pear/pearweb_phars/raw/v${pkgver}/install-pear-nozlib.phar") -# "install-pear-nozlib-${pkgver}.phar.sig::https://github.com/pear/pearweb_phars/raw/v${pkgver}/install-pear-nozlib.sig") +source=("install-pear-nozlib-${pkgver}.phar::https://github.com/pear/pearweb_phars/raw/v${pkgver}/install-pear-nozlib.phar" + "install-pear-nozlib-${pkgver}.phar.sig::https://github.com/pear/pearweb_phars/raw/v${pkgver}/install-pear-nozlib.sig") backup=('etc/php/pear.conf') -sha256sums=('4cb4704e956b78b24332ab22fd0cb4c99d5574445a858a7d64731f00a90a28ba') -#validpgpkeys=('10F68CF73F8AA426F617752972A321BAC245F175') +sha256sums=('4cb4704e956b78b24332ab22fd0cb4c99d5574445a858a7d64731f00a90a28ba' + 'SKIP') +validpgpkeys=('10F68CF73F8AA426F617752972A321BAC245F175') package() { PHP_PEAR_SYSCONF_DIR=/etc/php \ diff --git a/src/python-configshell-fb/PKGBUILD b/src/python-configshell-fb/PKGBUILD index 308c25d..218c63d 100644 --- a/src/python-configshell-fb/PKGBUILD +++ b/src/python-configshell-fb/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Johannes Dewender arch at JonnyJD dot net pkgname=('python-configshell-fb' 'python2-configshell-fb') _pkgname=configshell-fb -pkgver=1.1.fb25 +pkgver=1.1.28 pkgrel=1 pkgdesc="python framework for building simple CLI applications (free branch)" arch=('any') @@ -10,7 +10,7 @@ license=('Apache') options=() makedepends=('python-setuptools' 'python2-setuptools') source=(https://github.com/open-iscsi/configshell-fb/archive/v${pkgver}.tar.gz) -sha512sums=('7f0af5014600d148326b4692a84fcc388d3ea175a79566a5e3b1ede89d9dbc90be5f4b1481e69dd5654e88578b3732441a822e4d89cd0504d0ad3221d3a2f027') +sha512sums=('4cdc3ee72fc7c4bffcf2f508eef16cc8578d1358ceeb70050a619f5e93e0e189de7216ac0baa77af98fb1b7569940a22a0e3cd977cd460bb91252b4ab176d0f4') package_python-configshell-fb() { depends=('python-pyparsing' 'python-urwid') diff --git a/src/python-rtslib-fb/PKGBUILD b/src/python-rtslib-fb/PKGBUILD index 83de79b..bcd6922 100644 --- a/src/python-rtslib-fb/PKGBUILD +++ b/src/python-rtslib-fb/PKGBUILD @@ -1,18 +1,18 @@ # Contributor: Johannes Dewender arch at JonnyJD dot net pkgname='python-rtslib-fb' _pkgname=rtslib-fb -pkgver=2.1.fb69 -pkgrel=2 +pkgver=2.1.74 +pkgrel=1 pkgdesc="free branch version of the LIO target API" arch=('any') -url="https://github.com/agrover/rtslib-fb" +url="https://github.com/open-iscsi/rtslib-fb" license=('Apache') makedepends=('python-setuptools' 'python-pyudev') backup=() options=() install= source=(https://github.com/open-iscsi/rtslib-fb/archive/v${pkgver}.tar.gz target.service) -sha512sums=('552e660eb8aa26ac44f1ac089143a39e10106c1859db863c63ad5469e8ab0b0cdd0fba8f6fc30633cfd321ec0d72f6063ea0e8944aaa228de118400380b5418b' +sha512sums=('181b57f699dd4e6bc050585e1abffe75a7eaf5ae8325220d61d37f932912f2cec878c4643172c584f0d4c231441d25ff0e09aa1f48c2305061b75acdce051c86' '3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5') prepare() { diff --git a/src/qemu-user-static/PKGBUILD b/src/qemu-user-static/PKGBUILD index 4c500a2..219bdae 100644 --- a/src/qemu-user-static/PKGBUILD +++ b/src/qemu-user-static/PKGBUILD @@ -1,19 +1,18 @@ -# Maintainer: Stefan Agner +# Maintainer: crab2313 +# Contributor: Stefan Agner pkgname=qemu-user-static pkgdesc="Statically linked binaries of Qemu with user emulation. Useful for containers/chroot environment with binfmt." -pkgver=4.0.0 +pkgver=5.1.0 pkgrel=1 arch=(x86_64) license=(GPL2 LGPL2.1) url="http://wiki.qemu.org/" depends=() -makedepends=(python2 glib2-static pcre-static) +makedepends=(python glib2-static pcre-static) source=(https://download.qemu.org/qemu-$pkgver.tar.xz{,.sig}) -sha512sums=( - '952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13' - 'SKIP' -) +sha512sums=('e213edb71d93d5167ddce7546220ecb7b52a7778586a4f476f65bd1e510c9cfc6d1876238a7b501d9cc3fd31cc2ae4b7fb9e753bc3f12cc17cd16dfce2a96ba3' + 'SKIP') validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584') case $CARCH in @@ -21,56 +20,61 @@ case $CARCH in x86_64) _corearch=x86_64 ;; esac +# If non empty, always run the configure script +: "${FORCE_CONFIGURE:=1}" + prepare() { - mkdir build-user-static + mkdir -p build-user-static cd qemu-${pkgver} - sed -i 's/vte-2\.90/vte-2.91/g' configure + #sed -i 's/vte-2\.90/vte-2.91/g' configure +} + +_configure() { + ../qemu-${pkgver}/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/qemu \ + --enable-linux-user \ + --disable-debug-info \ + --disable-bsd-user \ + --disable-werror \ + --disable-system \ + --disable-tools \ + --disable-docs \ + --disable-gtk \ + --disable-gnutls \ + --disable-nettle \ + --disable-gcrypt \ + --disable-glusterfs \ + --disable-libnfs \ + --disable-libiscsi \ + --disable-vnc \ + --disable-kvm \ + --disable-libssh \ + --disable-libxml2 \ + --disable-vde \ + --disable-sdl \ + --disable-opengl \ + --disable-xen \ + --disable-fdt \ + --disable-vhost-net \ + --disable-vhost-crypto \ + --disable-vhost-user \ + --disable-vhost-vsock \ + --disable-vhost-scsi \ + --disable-tpm \ + --disable-qom-cast-debug \ + --disable-capstone \ + --disable-zstd \ + --disable-linux-io-uring \ + --static } build() ( cd build-user-static - - ../qemu-${pkgver}/configure \ - --python=/bin/python2 \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/qemu \ - --enable-linux-user \ - --disable-debug-info \ - --disable-bsd-user \ - --disable-werror \ - --disable-system \ - --disable-tools \ - --disable-docs \ - --disable-gtk \ - --disable-gnutls \ - --disable-nettle \ - --disable-gcrypt \ - --disable-glusterfs \ - --disable-libnfs \ - --disable-libiscsi \ - --disable-vnc \ - --disable-kvm \ - --disable-libssh2 \ - --disable-libxml2 \ - --disable-vde \ - --disable-sdl \ - --disable-opengl \ - --disable-xen \ - --disable-kvm \ - --disable-fdt \ - --disable-vhost-net \ - --disable-vhost-crypto \ - --disable-vhost-user \ - --disable-vhost-vsock \ - --disable-vhost-scsi \ - --disable-tpm \ - --disable-qom-cast-debug \ - --disable-capstone \ - --static - + [[ ! $FORCE_CONFIGURE && -e ../qemu-${pkgver}/config.log ]] || _configure make ARFLAGS="rc" ) @@ -82,10 +86,10 @@ package() { # remove conflicting /var/run directory cd "$pkgdir" - rm -r var + rm -rf var # Remove BIOS files etc... - rm -r usr/share + rm -rf usr/share # Rename static qemu binaries cd "${pkgdir}/usr/bin/" diff --git a/src/rusty-keys-git/PKGBUILD b/src/rusty-keys-git/PKGBUILD index c935171..348ecf0 100644 --- a/src/rusty-keys-git/PKGBUILD +++ b/src/rusty-keys-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: moparisthebest pkgname=rusty-keys-git -pkgver=0.0.2.r19.gd3aeede +pkgver=0.0.2.r18.g0ffc169 pkgrel=1 pkgdesc="uinput level keyboard mapper for linux" url="https://code.moparisthebest.com/moparisthebest/rusty-keys" diff --git a/src/sonarr/PKGBUILD b/src/sonarr/PKGBUILD index 5176a17..e7a3fdd 100644 --- a/src/sonarr/PKGBUILD +++ b/src/sonarr/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Daniel Egeberg # Contributor: Justin Dray pkgname="sonarr" -pkgver="2.0.0.5322" +pkgver="2.0.0.5344" pkgrel=1 pkgdesc="PVR for newsgroup users" arch=(any) @@ -20,7 +20,7 @@ source=("https://update.sonarr.tv/v2/master/mono/NzbDrone.master.${pkgver}.mono. "sonarr.service" "sonarr.sysusers") noextract=() -sha512sums=('b9167938c9f7cafcb29fc78da941db9efaa86c8390df6e4d15828e9434cc344f8794ae524cb41393ade68a61c8a5d07e61ff11a974a88347789ae2f24a90e27b' +sha512sums=('3b68bc44115143ddb570c1a786204bdf59583c4d0dae8e36369e4bd9a4cb6e163e2c0b4c725a30680743d53ffa9aa917b26a51eaf424dc020a2091224372286a' '84efa2eebd9afe6b74203aefdc3fdbd4088ecfad17dbe929396f1ffc639743b615a9b75566a0b45d6b7925bd5675368015047c6d65c1421ffe8712728f350695' '591c76551f511198afa71b98bd5c1e3a800af4c24f8be3065148a0dccce85dcb2cdbad03e55efb66441f900df3b97043ea6bd1574cc0653808b8ab0e54abd999' '35af6024f61003c83e1b35bc5658bd8dbce65cadb6f06e6415de20f4c25ab4c4f107224c27668810f99c4a00bfd24175176c35a4b660243935aef872a39ebce7') diff --git a/src/targetcli-fb/PKGBUILD b/src/targetcli-fb/PKGBUILD index 25c34cc..1149931 100644 --- a/src/targetcli-fb/PKGBUILD +++ b/src/targetcli-fb/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: Johannes Dewender arch at JonnyJD dot net pkgname=targetcli-fb -pkgver=2.1.fb49 +pkgver=2.1.53 pkgrel=1 pkgdesc="free branch of the targetcli LIO administration shell (iSCSI + Co)" arch=('any') @@ -16,11 +16,12 @@ backup=() options=() install= source=(https://github.com/open-iscsi/targetcli-fb/archive/v${pkgver}.tar.gz) -sha512sums=('05fb6f638f808bf09089bdd110592b3ed3be49fc70cc1a71680de7bff40dc88425e69e9a99fdfcab712646cf131f78071edae46f214fdfee4b7090f47933c93a') +sha512sums=('acefa7f8df8ee901cae8f04cbeb264d6024100e2d8b8343024bc52842af88a23d1bf5dd880ff2c77046bd8da8493630b4e357103617c02d1a90947e42c3a7c92') build() { cd "$srcdir/$pkgname-$pkgver" + sed -i "s|/lib/systemd/system|lib/systemd/system|" setup.py python setup.py build gzip --stdout targetcli.8 > "targetcli.8.gz" }