diff options
| author | Łukasz Jendrysik <scadu@yandex.com> | 2017-06-24 14:37:39 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-06-27 06:52:38 +0000 |
| commit | bb190289864112b9ab24365c4d7fc6d0aa40bfe5 (patch) | |
| tree | a4d4b14d93c8c3fbfa33630fc9ed7b6478f36974 | |
| parent | a65c721117b29e1f6021d5bf60a53d6bc3b42bc5 (diff) | |
| download | aports-bb190289864112b9ab24365c4d7fc6d0aa40bfe5.tar.bz2 aports-bb190289864112b9ab24365c4d7fc6d0aa40bfe5.tar.xz | |
main/cjdns: update to 20
Also get rid of bash in makedepends
| -rw-r--r-- | main/cjdns/APKBUILD | 14 | ||||
| -rw-r--r-- | main/cjdns/musl.patch | 17 |
2 files changed, 6 insertions, 25 deletions
diff --git a/main/cjdns/APKBUILD b/main/cjdns/APKBUILD index fa195e7c30..28c54d544b 100644 --- a/main/cjdns/APKBUILD +++ b/main/cjdns/APKBUILD @@ -2,24 +2,23 @@ # Maintainer: Łukasz Jendrysik <scadu@yandex.com> pkgname=cjdns -pkgver=19.1 -pkgrel=1 +pkgver=20 +pkgrel=0 pkgdesc="A routing engine designed for security, scalability, speed and ease of use" url="https://github.com/cjdelisle/cjdns" arch="all !x86 !s390x" license="GPL3" -makedepends="bash nodejs python2 linux-headers libseccomp-dev" +makedepends="nodejs python2 linux-headers libseccomp-dev" install="$pkgname.post-install" subpackages="$pkgname-doc" -source="${pkgname}-${pkgver}.tar.gz::https://github.com/cjdelisle/${pkgname}/archive/cjdns-v${pkgver}.tar.gz - musl.patch" +source="${pkgname}-${pkgver}.tar.gz::https://github.com/cjdelisle/${pkgname}/archive/cjdns-v${pkgver}.tar.gz" builddir="$srcdir/$pkgname-$pkgname-v$pkgver" build() { cd "$builddir" export CJDNS_RELEASE_VERSION="${pkgver}" - bash 'do' || return 1 + sh 'do' } check() { @@ -46,5 +45,4 @@ package() { doc/tunnel.md } -sha512sums="9c29bf1d136237bd60e125718bdd2c6d7f5a651d51af50aea3173eed1626a402dac5a2a72f9fb129fc9af24c3b67472a1dfe7b2b6a09bb28d01a120fc667b206 cjdns-19.1.tar.gz -76bdfd6aa8feda1ba52cf579e8df87f5afd9db497a31654e7d0c76fbbc4635d89f1652a17bcc8650ec4d392e1736f892de53705eaf93a8e6061b145ef1033226 musl.patch" +sha512sums="7da6537ed417d33ebd9ffa27a9e08758c48ea99930a85497853f0ee43cc87501434ab76bee0e69dc935b3338959d86bcb4bef527f1b93887b0a3662b4ab55879 cjdns-20.tar.gz" diff --git a/main/cjdns/musl.patch b/main/cjdns/musl.patch deleted file mode 100644 index 53001c9d39..0000000000 --- a/main/cjdns/musl.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/crypto/random/seed/GetEntropyRandomSeed.c 2017-03-18 16:58:52.044846562 +0100 -+++ b/crypto/random/seed/GetEntropyRandomSeed.c 2017-03-18 16:13:30.859893443 +0100 -@@ -21,10 +21,10 @@ - #include <errno.h> - #include <sys/syscall.h> - --#define GetEntropyRandomSeed_GLIBC_HAS_IT \ -- (defined(__GNU_LIBRARY__) && defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 25)) -- --#if !defined(__OPENBSD__) && !GetEntropyRandomSeed_GLIBC_HAS_IT -+#if !defined(__OPENBSD__) && \ -+ (!defined(__GNU_LIBRARY__) || !defined(__GLIBC__) || \ -+ !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || \ -+ (__GLIBC__ == 2 && __GLIBC_MINOR__ < 25)) - static int getentropy(void *buf, size_t buflen) - { - int ret; |