From f376862faa42b7f0173a654f77cce72cc3198d88 Mon Sep 17 00:00:00 2001 From: Andy Postnikov Date: Sat, 16 Feb 2019 11:32:29 +0200 Subject: community/rng-tools: upgrade to 6.7 --- .../901468598270db9c9f19f63f9812a94f5a44a487.patch | 25 ---------------------- community/rng-tools/APKBUILD | 11 +++++----- 2 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 community/rng-tools/901468598270db9c9f19f63f9812a94f5a44a487.patch (limited to 'community/rng-tools') diff --git a/community/rng-tools/901468598270db9c9f19f63f9812a94f5a44a487.patch b/community/rng-tools/901468598270db9c9f19f63f9812a94f5a44a487.patch deleted file mode 100644 index d2ebdeee03..0000000000 --- a/community/rng-tools/901468598270db9c9f19f63f9812a94f5a44a487.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 901468598270db9c9f19f63f9812a94f5a44a487 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Tue, 20 Nov 2018 11:31:29 -0500 -Subject: [PATCH] Fix build break on ppc - -didn't update the rng options properly for rng_darn.c - -Signed-off-by: Neil Horman ---- - rngd_darn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rngd_darn.c b/rngd_darn.c -index 45c81c7..abd34b0 100644 ---- a/rngd_darn.c -+++ b/rngd_darn.c -@@ -126,7 +126,7 @@ static int refill_rand(struct rng *ent_src) - - if (darn_buf_avail) - return 0; -- if (ent_src->options[DARN_USE_AES].int_val) { -+ if (ent_src->rng_options[DARN_OPT_AES].int_val) { - if (rand_bytes_served >= rekey_thresh) { - message(LOG_DAEMON|LOG_DEBUG, "rekeying DARN rng\n"); - gcry_cipher_close(gcry_cipher_hd); diff --git a/community/rng-tools/APKBUILD b/community/rng-tools/APKBUILD index 9e35884a9e..8884792810 100644 --- a/community/rng-tools/APKBUILD +++ b/community/rng-tools/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Dennis Przytarski # Maintainer: ScrumpyJack pkgname=rng-tools -pkgver=6.6 -pkgrel=1 +pkgver=6.7 +pkgrel=0 pkgdesc="A random number generator daemon" url="https://github.com/nhorman/rng-tools" arch="all" @@ -13,7 +13,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/nhorman/$pkgname/archive/v$p fix-textrels-on-PIC-x86.patch rngd.confd rngd.initd - 901468598270db9c9f19f63f9812a94f5a44a487.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -43,6 +42,7 @@ build() { --sysconfdir=/etc \ --disable-silent-rules \ --without-nistbeacon \ + --without-pkcs11 \ $_flags make } @@ -56,8 +56,7 @@ package() { install -m 755 -D "$srcdir"/rngd.initd "$pkgdir"/etc/init.d/rngd } -sha512sums="00bbe7f817d8f228f357a79ca270c27c62c0e588a99cd76917ecb7e88dfb627028c66497a59c9918205f3551aaf631963c8fd6504cb4198ddf57f714204c21c4 rng-tools-6.6.tar.gz +sha512sums="2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d rng-tools-6.7.tar.gz 7b02c94cf3fb278c5c265713040f1026170fc05b8572c9879a478311d4a9ce1fb0c2b9b9cdd8eda0a0016ee4464ef0ab6b577baf7e41baf8347d87b495949b7a fix-textrels-on-PIC-x86.patch 363b5aa431a0da37fc9eb8c93cffed0b75f43064530318fb41c774acd8aab8a1e109cf6c294b77fa6b8f97aa355b2849f56e83d8b06bcd9e0e9f3aa4f3ba49ac rngd.confd -86a6a7446eda64c075e468bc304008314b710629e06146582c5ce3fcc307a6b4baf5f8e8a47b72f1bab0bb608d76f953f2712cddd35809abcb02b8320c682535 rngd.initd -d7dc269f6c3013d0e1219c8b451ffbe7a16518164cd8a7db87d6d5100365cd31f6d67f0a40ac14e822d922407888041066d1c279b1fd82d7dd3f901b1c3a7cb1 901468598270db9c9f19f63f9812a94f5a44a487.patch" +86a6a7446eda64c075e468bc304008314b710629e06146582c5ce3fcc307a6b4baf5f8e8a47b72f1bab0bb608d76f953f2712cddd35809abcb02b8320c682535 rngd.initd" -- cgit v1.2.3