diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-12 14:54:11 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-12 14:58:35 +0000 |
| commit | 4465a8bf213d445c660b72762ccb97aa477fb5e6 (patch) | |
| tree | 51f747a368553624d8a91d60873bac491db2c52b | |
| parent | 52513c542b1af4e9916a161ff1780d0d12f925e1 (diff) | |
| download | aports-4465a8bf213d445c660b72762ccb97aa477fb5e6.tar.bz2 aports-4465a8bf213d445c660b72762ccb97aa477fb5e6.tar.xz | |
main/gitolite: use rm instead of unlink
busybox does not provide unlink
| -rw-r--r-- | main/gitolite/APKBUILD | 23 | ||||
| -rw-r--r-- | main/gitolite/unlink.patch | 11 |
2 files changed, 27 insertions, 7 deletions
diff --git a/main/gitolite/APKBUILD b/main/gitolite/APKBUILD index 1df5c68ed3..cd91f246b2 100644 --- a/main/gitolite/APKBUILD +++ b/main/gitolite/APKBUILD @@ -3,18 +3,24 @@ pkgname=gitolite pkgver=3.5.3 -pkgrel=0 +pkgrel=1 pkgdesc='Centralized git server, with very fine-grained access control and many powerful features' url='http://github.com/sitaramc/gitolite' arch='noarch' license='GPL2' depends='git perl' install=$pkgname.pre-install -source="https://github.com/sitaramc/$pkgname/tarball/v${pkgver}/$pkgname-$pkgver.tar.gz" +source="https://github.com/sitaramc/$pkgname/tarball/v${pkgver}/$pkgname-$pkgver.tar.gz + unlink.patch" prepare() { - cd "$srcdir"/sitaramc-gitolite-* - echo "v${pkgver}" > VERSION + cd "$srcdir"/sitaramc-gitolite-* + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + echo "v${pkgver}" > VERSION } package() { @@ -26,6 +32,9 @@ package() { ln -s /usr/lib/gitolite/gitolite "$pkgdir"/usr/bin/ || return 1 } -md5sums="5459b5c6ac74a97a18129798dcb851d6 gitolite-3.5.3.tar.gz" -sha256sums="fb754716f27dd2748563252b150018057e5ded50575dea2352779d2b55ef3572 gitolite-3.5.3.tar.gz" -sha512sums="cd54451b809078bc27d4791b5fcbfd685e198ce91bfee96b5176e0016b66c24c8b48b6b777bda0bbef92a261e5c8907139d0705bd68fb8b7eb31b23305e2b951 gitolite-3.5.3.tar.gz" +md5sums="5459b5c6ac74a97a18129798dcb851d6 gitolite-3.5.3.tar.gz +d726d7c6abbb04e9b0b0465c147a288b unlink.patch" +sha256sums="fb754716f27dd2748563252b150018057e5ded50575dea2352779d2b55ef3572 gitolite-3.5.3.tar.gz +2cbc426d8e071e4a0d828a984e615b16079d4c50bfa33334487c5d256c392bec unlink.patch" +sha512sums="cd54451b809078bc27d4791b5fcbfd685e198ce91bfee96b5176e0016b66c24c8b48b6b777bda0bbef92a261e5c8907139d0705bd68fb8b7eb31b23305e2b951 gitolite-3.5.3.tar.gz +38fd2a4c0fff9ae251f305b3e11466e57860d8998bf06fc13ab256e712fb8e5be6f8ddd9b214ee6a85f1c3b11b394ca1099404f772b36a999ccd84448c67a186 unlink.patch" diff --git a/main/gitolite/unlink.patch b/main/gitolite/unlink.patch new file mode 100644 index 0000000000..5bf4040ebf --- /dev/null +++ b/main/gitolite/unlink.patch @@ -0,0 +1,11 @@ +--- sitaramc-gitolite-b552f41.orig/src/triggers/post-compile/update-gitweb-access-list ++++ sitaramc-gitolite-b552f41/src/triggers/post-compile/update-gitweb-access-list +@@ -23,7 +23,7 @@ + # since mktemp does not honor umask, we just use it to generate a temp + # filename (note: 'mktemp -u' on some systems, this gets close enough) + tmpfile=`mktemp $plf.tmp_XXXXXXXX` +-unlink $tmpfile; ++rm "$tmpfile" 2>/dev/null; + + ( + gitolite list-phy-repos | gitolite access % gitweb R any | grep -v DENIED |