Skip to content

Commit 2d70000

Browse files
authored
binproxy: fix post install errors
1 parent 3a0163b commit 2d70000

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

packages/binproxy/PKGBUILD

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,38 @@
33

44
pkgname=binproxy
55
pkgver=8.d02fce9
6-
pkgrel=14
7-
groups=('blackarch' 'blackarch-proxy' 'blackarch-networking')
6+
pkgrel=15
87
pkgdesc='A proxy for arbitrary TCP connections.'
98
arch=('any')
10-
license=('custom:unknown')
9+
groups=('blackarch' 'blackarch-proxy' 'blackarch-networking')
10+
url='https://github.com/nccgroup/BinProxy/'
11+
license=('AGPL-3.0-or-later')
1112
depends=('ruby' 'ruby-bundler')
1213
makedepends=('git' 'libxslt')
13-
url='https://github.com/nccgroup/BinProxy/'
14-
source=("$pkgname::git+https://github.com/nccgroup/BinProxy.git")
14+
source=("$pkgname::git+https://github.com/nccgroup/BinProxy.git"
15+
"fix-binproxy-caller.patch")
1516
install="$pkgname.install"
16-
sha512sums=('SKIP')
17+
sha512sums=('SKIP'
18+
'c9179a09fa6dab7cb2b484d406312980bd7d9a506a6c58ae68720fcc9659ce8427e19c511ff20373947e7382faf61300e5190ffbfbc6ad74d0317912645e0bc4')
1719

1820
pkgver() {
1921
cd $pkgname
2022

21-
echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
23+
( set -o pipefail
24+
git describe --long --tags --abbrev=7 2>/dev/null |
25+
sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
26+
printf "%s.%s" "$(git rev-list --count HEAD)" \
27+
"$(git rev-parse --short=7 HEAD)"
28+
)
2229
}
2330

2431
prepare() {
2532
cd $pkgname
2633

2734
sed -i 's|"bundler", "~> 1.3"|"bundler"|g' "$pkgname.gemspec"
35+
sed -i "s|'thin', '~>1.7.2'|'thin', '>= 1.8.2', '< 2.0.0'\ns.add_runtime_dependency 'observer'\ns.add_runtime_dependency 'base64'\ns.add_runtime_dependency 'ostruct'|g" "$pkgname.gemspec"
36+
patch -p1 < ../fix-binproxy-caller.patch
37+
grep -RIl --null 'File\.exists\?' lib bin | xargs -0 sed -i 's/File\.exists\?/File.exist/g'
2838
}
2939

3040
package() {

0 commit comments

Comments
 (0)