diff options
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/rng-tools/Manifest | 1 | ||||
-rw-r--r-- | sys-apps/rng-tools/files/fix-textrels-on-PIC-x86.patch | 71 | ||||
-rw-r--r-- | sys-apps/rng-tools/files/rngd-initd-4.1 | 28 | ||||
-rw-r--r-- | sys-apps/rng-tools/rng-tools-4-r7.ebuild | 35 | ||||
-rw-r--r-- | sys-apps/rng-tools/rng-tools-5-r1.ebuild | 39 | ||||
-rw-r--r-- | sys-apps/rng-tools/rng-tools-5.ebuild | 37 |
6 files changed, 0 insertions, 211 deletions
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index 108daf63caa7..cb68eb34d0c4 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -1,3 +1,2 @@ -DIST rng-tools-4.tar.gz 110943 SHA256 b71bdfd4222c05e8316001556be90e1606f2a1bac3efde60153bd84e873cc195 SHA512 328627a9ede924026c7a7c391b04be05f098d713d35f7f38d939d52b794853b4f6db3ae125568710ab5a59640236b343f3e9fc0f735806b020cc675c02f80b08 WHIRLPOOL da58bc7d3b7d9cdf6d83d258717f22ba3552482a690311fa2c820e4ce125a5e6c6e498e0b63461ed6c9dc16dff77b2cb47377933845fb9397efa205183346e5b DIST rng-tools-5.tar.gz 122182 SHA256 60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50 WHIRLPOOL 073dbeb9d27189db44658a9f25657b93a320b125fbfc8230f7ce7849b8e7c1f7802b4c3a53de3417525b02739194fab8a6e5eb03d5db317a23deb275d72fbb21 DIST rng-tools-6.tar.gz 26024 SHA256 6d9c3f72824d1ea15dd2a80bfcf71f6a73c8843c6344f7f774a97a4ca7641b4c SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4 WHIRLPOOL 4e53c626288219a7cb9c94cf29d22878df5ad3298ca5ebedea46978e519d9b5b0ad94f765e217563105258f4b02b72b0033e551a7d37939ced9ca5d92f0a1048 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" diff --git a/sys-apps/rng-tools/rng-tools-4-r7.ebuild b/sys-apps/rng-tools/rng-tools-4-r7.ebuild deleted file mode 100644 index 5c0f35ceac02..000000000000 --- a/sys-apps/rng-tools/rng-tools-4-r7.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils autotools systemd toolchain-funcs - -DESCRIPTION="Daemon to use hardware random number generators" -HOMEPAGE="http://gkernel.sourceforge.net/" -SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc x86" -IUSE="selinux" - -RDEPEND="selinux? ( sec-policy/selinux-rngd )" -DEPEND="" - -src_prepare() { - echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am - epatch "${FILESDIR}"/test-for-argp.patch - epatch "${FILESDIR}"/fix-textrels-on-PIC-x86.patch - eautoreconf - - sed -i '/^AR /d' Makefile.in - tc-export AR -} - -src_install() { - default - newinitd "${FILESDIR}"/rngd-initd-4.1 rngd - newconfd "${FILESDIR}"/rngd-confd-4.1 rngd - systemd_dounit "${FILESDIR}"/rngd.service -} diff --git a/sys-apps/rng-tools/rng-tools-5-r1.ebuild b/sys-apps/rng-tools/rng-tools-5-r1.ebuild deleted file mode 100644 index ba4a83144515..000000000000 --- a/sys-apps/rng-tools/rng-tools-5-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils autotools systemd toolchain-funcs - -DESCRIPTION="Daemon to use hardware random number generators" -HOMEPAGE="http://gkernel.sourceforge.net/" -SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ppc ~x86" -IUSE="selinux" - -DEPEND="dev-libs/libgcrypt:0 - dev-libs/libgpg-error" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-rngd )" - -src_prepare() { - echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am - epatch "${FILESDIR}"/test-for-argp.patch - epatch "${FILESDIR}"/${P}-fix-textrels-on-PIC-x86.patch #469962 - epatch "${FILESDIR}"/${P}-man-fill-watermark.patch #555094 - epatch "${FILESDIR}"/${P}-man-rng-device.patch #555106 - eautoreconf - - sed -i '/^AR /d' Makefile.in || die - tc-export AR -} - -src_install() { - default - newinitd "${FILESDIR}"/rngd-initd-4.1 rngd - newconfd "${FILESDIR}"/rngd-confd-4.1 rngd - systemd_dounit "${FILESDIR}"/rngd.service -} diff --git a/sys-apps/rng-tools/rng-tools-5.ebuild b/sys-apps/rng-tools/rng-tools-5.ebuild deleted file mode 100644 index 0bda55df9f7d..000000000000 --- a/sys-apps/rng-tools/rng-tools-5.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils autotools systemd toolchain-funcs - -DESCRIPTION="Daemon to use hardware random number generators" -HOMEPAGE="http://gkernel.sourceforge.net/" -SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc x86" -IUSE="selinux" - -DEPEND="dev-libs/libgcrypt:0 - dev-libs/libgpg-error" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-rngd )" - -src_prepare() { - echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am - epatch "${FILESDIR}"/test-for-argp.patch\ - "${FILESDIR}"/${P}-fix-textrels-on-PIC-x86.patch - eautoreconf - - sed -i '/^AR /d' Makefile.in || die - tc-export AR -} - -src_install() { - default - newinitd "${FILESDIR}"/rngd-initd-4.1 rngd - newconfd "${FILESDIR}"/rngd-confd-4.1 rngd - systemd_dounit "${FILESDIR}"/rngd.service -} |