diff options
| author | Łukasz Jendrysik <scadu@yandex.com> | 2017-03-18 17:15:09 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-03-21 13:18:37 +0100 |
| commit | ebada60098b1cfc0d1f7a21bdd3e7ed27af2f873 (patch) | |
| tree | 0ac7585cc08c8672cba53da85325c78df1145b7c /main/cjdns | |
| parent | 71370d3655e87b7c511fcfe2701d9243b330819e (diff) | |
| download | aports-ebada60098b1cfc0d1f7a21bdd3e7ed27af2f873.tar.bz2 aports-ebada60098b1cfc0d1f7a21bdd3e7ed27af2f873.tar.xz | |
main/cjdns: uprade to 19.1
Diffstat (limited to 'main/cjdns')
| -rw-r--r-- | main/cjdns/APKBUILD | 22 | ||||
| -rw-r--r-- | main/cjdns/musl-compat.patch | 17 | ||||
| -rw-r--r-- | main/cjdns/musl.patch | 17 |
3 files changed, 28 insertions, 28 deletions
diff --git a/main/cjdns/APKBUILD b/main/cjdns/APKBUILD index 69d4695d65..35470177ca 100644 --- a/main/cjdns/APKBUILD +++ b/main/cjdns/APKBUILD @@ -2,27 +2,31 @@ # Maintainer: Łukasz Jendrysik <scadu@yandex.com> pkgname=cjdns -pkgver=18 -pkgrel=1 +pkgver=19.1 +pkgrel=0 pkgdesc="A routing engine designed for security, scalability, speed and ease of use" url="https://github.com/cjdelisle/cjdns" arch="all !x86" license="GPL3" -depends= makedepends="bash 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-compat.patch" + musl.patch" builddir="$srcdir/$pkgname-$pkgname-v$pkgver" build() { cd "$builddir" - export CJDNS_RELEASE_VERSION="${pkgver}" + export CJDNS_RELEASE_VERSION="${pkgver}" bash 'do' || return 1 } +check() { + cd "$builddir" + ./cjdroute --help >/dev/null +} + package() { cd "$builddir" install -Dm755 cjdroute "$pkgdir/usr/sbin/cjdroute" @@ -42,9 +46,5 @@ package() { doc/tunnel.md } -md5sums="9f6600d9ed0d87d4e17fbc9155ff0368 cjdns-18.tar.gz -1c0890e06965f6de50cea48e5f7d2462 musl-compat.patch" -sha256sums="57e5fe05b9775daf16f23c16c24035a4e380a3c9461faa2e1bc9de0bc6b147ab cjdns-18.tar.gz -257058401034f818f8968dc2ccc863453bc30ab188b5e41f2e935db817ead58b musl-compat.patch" -sha512sums="3b7ed50c81ed51f8deea3999aa0b820f78de53da3d3937c13f572e35bb7c2a6f963d3779c2f0b7b4afc64e6a45ae98c4a6958a0c31d43d4309a47ae3ccbb709b cjdns-18.tar.gz -18e8a2cc25978f24dfa527d81d71fa416628a91d6947174ba74089cd8b257e9f0b8b13399c97bcb0516a77310e62bd788bfb78076ac357f410dd89c22464735d musl-compat.patch" +sha512sums="9c29bf1d136237bd60e125718bdd2c6d7f5a651d51af50aea3173eed1626a402dac5a2a72f9fb129fc9af24c3b67472a1dfe7b2b6a09bb28d01a120fc667b206 cjdns-19.1.tar.gz +76bdfd6aa8feda1ba52cf579e8df87f5afd9db497a31654e7d0c76fbbc4635d89f1652a17bcc8650ec4d392e1736f892de53705eaf93a8e6061b145ef1033226 musl.patch" diff --git a/main/cjdns/musl-compat.patch b/main/cjdns/musl-compat.patch deleted file mode 100644 index e645f0ed2f..0000000000 --- a/main/cjdns/musl-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/util/Seccomp.c b/util/Seccomp.c -index e8a0ed7..7e724c4 100644 ---- a/util/Seccomp.c -+++ b/util/Seccomp.c -@@ -337,6 +337,12 @@ static struct sock_fprog* mkFilter(struct Allocator* alloc, struct Except* eh) - #ifdef __NR_getsockname - IFEQ(__NR_getsockname, success), - #endif -+ -+ // musl free() calls madvise() -+ #ifdef __NR_madvise -+ IFEQ(__NR_madvise, success), -+ #endif -+ - RET(SECCOMP_RET_TRAP), - - LABEL(socket), diff --git a/main/cjdns/musl.patch b/main/cjdns/musl.patch new file mode 100644 index 0000000000..53001c9d39 --- /dev/null +++ b/main/cjdns/musl.patch @@ -0,0 +1,17 @@ +--- 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; |