Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
647
Issues
647
List
Boards
Labels
Service Desk
Milestones
Merge Requests
207
Merge Requests
207
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
0ebad5b5
Commit
0ebad5b5
authored
Feb 11, 2019
by
TBK
Committed by
Andy Postnikov
Feb 15, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
community/rng-tools: upgrade to 6.6
parent
866da21e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
19 deletions
+22
-19
community/rng-tools/APKBUILD
community/rng-tools/APKBUILD
+5
-5
community/rng-tools/fix-textrels-on-PIC-x86.patch
community/rng-tools/fix-textrels-on-PIC-x86.patch
+17
-14
No files found.
community/rng-tools/APKBUILD
View file @
0ebad5b5
# 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"
community/rng-tools/fix-textrels-on-PIC-x86.patch
View file @
0ebad5b5
---
rng-tools
/rdrand_asm.S
+++
rng-tools
/rdrand_asm.S
@@ -
49,6 +49
,7 @@
ret
ENDPROC(x86_rd
rand_nlong
)
---
a
/rdrand_asm.S
+++
b
/rdrand_asm.S
@@ -
83,6 +83
,7 @@
jmp 4b
ENDPROC(x86_rd
seed_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_rd
rand_nlong
)
@@ -
172,7 +173
,16 @@
jmp 4b
ENDPROC(x86_rd
seed_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
@@ -1
01,6 +111
,7 @@
movl 8(%ebp), %eax
movl 12(%ebp), %edx
@@ -1
80,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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment