summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2017-08-14 14:09:06 +0200
committerLars Wendler <polynomial-c@gentoo.org>2017-08-14 15:35:44 +0200
commita900f982977d8baeb285abb510a080d7c035b374 (patch)
treeec61d762e0a7e5009348640f84e501090718ca3f /sys-apps/rng-tools/files
parentsys-apps/rng-tools: Bump to version 6 (diff)
downloadgentoo-a900f982977d8baeb285abb510a080d7c035b374.tar.gz
gentoo-a900f982977d8baeb285abb510a080d7c035b374.tar.bz2
gentoo-a900f982977d8baeb285abb510a080d7c035b374.zip
sys-apps/rng-tools: Removed old.
Package-Manager: Portage-2.3.7, Repoman-2.3.3
Diffstat (limited to 'sys-apps/rng-tools/files')
-rw-r--r--sys-apps/rng-tools/files/fix-textrels-on-PIC-x86.patch71
-rw-r--r--sys-apps/rng-tools/files/rngd-initd-4.128
2 files changed, 0 insertions, 99 deletions
diff --git a/sys-apps/rng-tools/files/fix-textrels-on-PIC-x86.patch b/sys-apps/rng-tools/files/fix-textrels-on-PIC-x86.patch
deleted file mode 100644
index 5ff34da861b4..000000000000
--- a/sys-apps/rng-tools/files/fix-textrels-on-PIC-x86.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
-Subject: [PATCH] Fix assemby textrels on rdrand_asm.S on PIC x86
-
-This patch fixes the assembly in rdrand_asm.S so it won't generate textrels on PIC systems.
-The main fixes are in the use of leal in SETPTR for such systems, the rest is the usual PIC
-support stuff.
-
-This should fix Gentoo bug #469962
-
-This patch is released under the GPLv2 or a higher version license as is the original file
-as long as reference to the author and the tester are included in the final code.
-
-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=469962
-Upstream-status: Not sent yet
-Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
-Reported-by: cilly <cilly@cilly.mine.nu>
-Tested-by: Anthony Basile <blueness@gentoo.org>
-
---- rng-tools/rdrand_asm.S
-+++ rng-tools/rdrand_asm.S
-@@ -49,6 +49,7 @@
- ret
- ENDPROC(x86_rdrand_nlong)
-
-+#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)
-
-+#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
-@@ -101,6 +111,7 @@
- movl 8(%ebp), %eax
- movl 12(%ebp), %edx
- #endif
-+ INIT_PIC()
-
- SETPTR(aes_round_keys, PTR2)
-
-@@ -166,6 +177,17 @@
- #endif
- ret
- ENDPROC(x86_aes_mangle)
-+
-+#if defined(__i386__) && defined(__PIC__)
-+ .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
-+.globl __i686.get_pc_thunk.bx
-+ .hidden __i686.get_pc_thunk.bx
-+ .type __i686.get_pc_thunk.bx,@function
-+__i686.get_pc_thunk.bx:
-+ movl (%esp), %ebx
-+ ret
-+#endif
-+
- /*
- * AES round keys for an arbitrary key:
- * 00102030405060708090A0B0C0D0E0F0
diff --git a/sys-apps/rng-tools/files/rngd-initd-4.1 b/sys-apps/rng-tools/files/rngd-initd-4.1
deleted file mode 100644
index 20f581b50b4e..000000000000
--- a/sys-apps/rng-tools/files/rngd-initd-4.1
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need localmount
- after urandom
- provide entropy
-}
-
-# Do NOT add /dev/tpm to this.
-DEFAULT_DEVICE="/dev/hw_random* /dev/hwrandom* /dev/i810_rng /dev/hwrng*"
-
-find_device() {
- local d
- # The echo is to cause globbing
- for d in $(echo ${DEFAULT_DEVICE}) ; do
- [ -e "${d}" ] && echo "${d}"
- done
-}
-
-RNG_DEVICE="${DEVICE:-$(find_device)}"
-
-command=/usr/sbin/rngd
-pidfile="/var/run/${SVCNAME}.pid"
-command_args="--pid-file ${pidfile} --background --random-step ${STEP:-64} ${NO_TPM:+--no-tpm=1} ${NO_DRNG:+--no-drng=1} --fill-watermark ${WATERMARK} ${RNG_DEVICE:+--rng-device ${RNG_DEVICE}}"
-start_stop_daemon_args="--wait 1000"
-retry="SIGKILL/5000"