diff options
| author | TBK <tbk@jjtc.eu> | 2019-02-11 00:33:56 +0100 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2019-02-15 12:22:55 +0200 |
| commit | 0ebad5b5786a4ed06a01da23652908033b18252b (patch) | |
| tree | 871ac9ca9ed0e048ca4450f6c8152d102e04f895 /community/rng-tools | |
| parent | 866da21e458d754b91b3ccfe0ace86c4ff04e2ce (diff) | |
community/rng-tools: upgrade to 6.6
Diffstat (limited to 'community/rng-tools')
| -rw-r--r-- | community/rng-tools/APKBUILD | 10 | ||||
| -rw-r--r-- | community/rng-tools/fix-textrels-on-PIC-x86.patch | 31 |
2 files changed, 22 insertions, 19 deletions
diff --git a/community/rng-tools/APKBUILD b/community/rng-tools/APKBUILD index 77c39b751b7..4266c28ea5b 100644 --- a/community/rng-tools/APKBUILD +++ b/community/rng-tools/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Dennis Przytarski <dennis@przytarski.com> # Maintainer: ScrumpyJack <scrumypjack@st.ilet.to> pkgname=rng-tools -pkgver=6.3.1 -pkgrel=1 +pkgver=6.6 +pkgrel=0 pkgdesc="A random number generator daemon" -url="https://sourceforge.net/projects/gkernel/" +url="https://github.com/nhorman/rng-tools" arch="all" license="GPL-2.0-or-later" makedepends="argp-standalone autoconf automake linux-headers libtool sysfsutils-dev" @@ -55,7 +55,7 @@ package() { install -m 755 -D "$srcdir"/rngd.initd "$pkgdir"/etc/init.d/rngd } -sha512sums="cb85674e6448e8152f92b4a82e944a9258dcc9ce68349404c0000c09378ac5f6fb298c50ed2d9a1b18d76c5f35b0a4884d5efd0f4dd434ec0952107e0738b937 rng-tools-6.3.1.tar.gz -5c8196c3e70c093215fc0720cd3f58f339f74293a7eb35d95b914591d783472119dcc34fb27ab6a4c3ce5359e050b4987d1e7ddf213a7445fc0b70d9fae5eae5 fix-textrels-on-PIC-x86.patch +sha512sums="00bbe7f817d8f228f357a79ca270c27c62c0e588a99cd76917ecb7e88dfb627028c66497a59c9918205f3551aaf631963c8fd6504cb4198ddf57f714204c21c4 rng-tools-6.6.tar.gz +7b02c94cf3fb278c5c265713040f1026170fc05b8572c9879a478311d4a9ce1fb0c2b9b9cdd8eda0a0016ee4464ef0ab6b577baf7e41baf8347d87b495949b7a fix-textrels-on-PIC-x86.patch 363b5aa431a0da37fc9eb8c93cffed0b75f43064530318fb41c774acd8aab8a1e109cf6c294b77fa6b8f97aa355b2849f56e83d8b06bcd9e0e9f3aa4f3ba49ac rngd.confd 86a6a7446eda64c075e468bc304008314b710629e06146582c5ce3fcc307a6b4baf5f8e8a47b72f1bab0bb608d76f953f2712cddd35809abcb02b8320c682535 rngd.initd" diff --git a/community/rng-tools/fix-textrels-on-PIC-x86.patch b/community/rng-tools/fix-textrels-on-PIC-x86.patch index 88d0a7f9055..09a0d87cda3 100644 --- a/community/rng-tools/fix-textrels-on-PIC-x86.patch +++ b/community/rng-tools/fix-textrels-on-PIC-x86.patch @@ -1,16 +1,16 @@ ---- rng-tools/rdrand_asm.S -+++ rng-tools/rdrand_asm.S -@@ -49,6 +49,7 @@ - ret - ENDPROC(x86_rdrand_nlong) +--- a/rdrand_asm.S ++++ b/rdrand_asm.S +@@ -83,6 +83,7 @@ + jmp 4b + ENDPROC(x86_rdseed_or_rdrand_bytes) +#define INIT_PIC() #define SETPTR(var,ptr) leaq var(%rip),ptr #define PTR0 %rdi #define PTR1 %rsi -@@ -84,7 +85,16 @@ - ret - ENDPROC(x86_rdrand_nlong) +@@ -172,7 +173,16 @@ + jmp 4b + ENDPROC(x86_rdseed_or_rdrand_bytes) +#if defined(__PIC__) +#undef __i686 /* gcc builtin define gets in our way */ @@ -25,15 +25,15 @@ #define PTR0 %eax #define PTR1 %edx #define PTR2 %ecx -@@ -101,6 +111,7 @@ - movl 8(%ebp), %eax - movl 12(%ebp), %edx +@@ -180,6 +190,7 @@ + #define NPTR2 1 /* %rcx = %r1 */ + #endif + INIT_PIC() - SETPTR(aes_round_keys, PTR2) - -@@ -166,6 +177,17 @@ + ENTRY(x86_aes_mangle) + #ifdef __i386__ +@@ -283,6 +294,17 @@ #endif ret ENDPROC(x86_aes_mangle) @@ -48,3 +48,6 @@ + ret +#endif + + + /* aeskeygenassist $imm,%xmm0,%xmm1 */ + #define AESKEYGENASSIST(imm) .byte 0x66,0x0f,0x3a,0xdf,0xc8,imm |