diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-11-19 09:22:04 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-11-20 17:15:14 +0100 |
| commit | 743dd2d40c179f538a2fc6e03751e052d883be93 (patch) | |
| tree | 4738fd9a4591eefee442ea82d487d0019efe4dfe /main | |
| parent | 20069c90e338cf99cabb374eead30a853f1b0aa2 (diff) | |
| download | aports-743dd2d40c179f538a2fc6e03751e052d883be93.tar.bz2 aports-743dd2d40c179f538a2fc6e03751e052d883be93.tar.xz | |
main/rng-tools: upgrade to 6.8
Diffstat (limited to 'main')
| -rw-r--r-- | main/rng-tools/APKBUILD | 14 | ||||
| -rw-r--r-- | main/rng-tools/fix-textrels-on-PIC-x86.patch | 17 |
2 files changed, 4 insertions, 27 deletions
diff --git a/main/rng-tools/APKBUILD b/main/rng-tools/APKBUILD index 8884792810..e1d5ace99e 100644 --- a/main/rng-tools/APKBUILD +++ b/main/rng-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dennis Przytarski <dennis@przytarski.com> # Maintainer: ScrumpyJack <scrumypjack@st.ilet.to> pkgname=rng-tools -pkgver=6.7 +pkgver=6.8 pkgrel=0 pkgdesc="A random number generator daemon" url="https://github.com/nhorman/rng-tools" @@ -9,15 +9,13 @@ arch="all" license="GPL-2.0-or-later" makedepends="argp-standalone autoconf automake linux-headers libtool sysfsutils-dev" subpackages="$pkgname-doc $pkgname-openrc" -source="$pkgname-$pkgver.tar.gz::https://github.com/nhorman/$pkgname/archive/v$pkgver.tar.gz +source="rng-tools-$pkgver.tar.gz::https://github.com/nhorman/rng-tools/archive/v$pkgver.tar.gz fix-textrels-on-PIC-x86.patch rngd.confd rngd.initd " -builddir="$srcdir/$pkgname-$pkgver" # power DARN support requires libgcrypt -_flags="" case "$CARCH" in ppc64le) makedepends="$makedepends libgcrypt-dev";; *) _flags="--without-libgcrypt";; @@ -29,8 +27,6 @@ prepare() { } build() { - cd "$builddir" - export LIBS="-largp" # NOTE: nistbeacon depends on libxml2 and libcurl, so it would @@ -48,15 +44,13 @@ build() { } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install install -m 644 -D "$srcdir"/rngd.confd "$pkgdir"/etc/conf.d/rngd install -m 755 -D "$srcdir"/rngd.initd "$pkgdir"/etc/init.d/rngd } -sha512sums="2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d rng-tools-6.7.tar.gz -7b02c94cf3fb278c5c265713040f1026170fc05b8572c9879a478311d4a9ce1fb0c2b9b9cdd8eda0a0016ee4464ef0ab6b577baf7e41baf8347d87b495949b7a fix-textrels-on-PIC-x86.patch +sha512sums="8fa47c2f0f8ebe6ac13025fa2c74505528b503c4e126c5d02b939797d6d4a8c9fc2b345353e48e497e32c1620a0821431e70752a9eb8ecb71960f16713696b62 rng-tools-6.8.tar.gz +241b56146ec8e55572711b7aa36fa2afbe7a9527d25f03098f35f4c52a9049933d9bc2a82b0e2e0dbc836409d7f650f3a88ef546d6c5a687f7be8fbe4a013b7e fix-textrels-on-PIC-x86.patch 363b5aa431a0da37fc9eb8c93cffed0b75f43064530318fb41c774acd8aab8a1e109cf6c294b77fa6b8f97aa355b2849f56e83d8b06bcd9e0e9f3aa4f3ba49ac rngd.confd 86a6a7446eda64c075e468bc304008314b710629e06146582c5ce3fcc307a6b4baf5f8e8a47b72f1bab0bb608d76f953f2712cddd35809abcb02b8320c682535 rngd.initd" diff --git a/main/rng-tools/fix-textrels-on-PIC-x86.patch b/main/rng-tools/fix-textrels-on-PIC-x86.patch index 09a0d87cda..ee6fe108b9 100644 --- a/main/rng-tools/fix-textrels-on-PIC-x86.patch +++ b/main/rng-tools/fix-textrels-on-PIC-x86.patch @@ -8,23 +8,6 @@ #define SETPTR(var,ptr) leaq var(%rip),ptr #define PTR0 %rdi #define PTR1 %rsi -@@ -172,7 +173,16 @@ - jmp 4b - ENDPROC(x86_rdseed_or_rdrand_bytes) - -+#if defined(__PIC__) -+#undef __i686 /* gcc builtin define gets in our way */ -+#define INIT_PIC() \ -+ call __i686.get_pc_thunk.bx ; \ -+ addl $_GLOBAL_OFFSET_TABLE_, %ebx -+#define SETPTR(var,ptr) leal (var)@GOTOFF(%ebx),ptr -+#else -+#define INIT_PIC() - #define SETPTR(var,ptr) movl $(var),ptr -+#endif - #define PTR0 %eax - #define PTR1 %edx - #define PTR2 %ecx @@ -180,6 +190,7 @@ #define NPTR2 1 /* %rcx = %r1 */ |