[arch-commits] Commit in haveged/trunk (2 files)

[Christian Hesse]

    Date: Friday, October 1, 2021 @ 06:11:17
  Author: eworm
Revision: 424963

upgpkg: haveged 1.9.15-1: new upstream release

Modified:
  haveged/trunk/PKGBUILD
Deleted:
  haveged/trunk/0001-Updated-systemd-service-files-to-not-start-haveged-s.patch

-----------------------------------------------------------------+
 0001-Updated-systemd-service-files-to-not-start-haveged-s.patch |   47 ----------
 PKGBUILD                                                        |   13 --
 2 files changed, 4 insertions(+), 56 deletions(-)

Deleted: 0001-Updated-systemd-service-files-to-not-start-haveged-s.patch
===================================================================
--- 0001-Updated-systemd-service-files-to-not-start-haveged-s.patch	2021-10-01 06:11:01 UTC (rev 424962)
+++ 0001-Updated-systemd-service-files-to-not-start-haveged-s.patch	2021-10-01 06:11:17 UTC (rev 424963)
@@ -1,47 +0,0 @@
-From cef1d425b5431847b8c9ab5b00c3e6b82a32b4f2 Mon Sep 17 00:00:00 2001
-From: Jirka Hladky <jhladky at redhat.com>
-Date: Mon, 30 Aug 2021 01:37:59 +0200
-Subject: [PATCH 1/1] Updated systemd service files to not start haveged
- service on kernel 5.6 and newer
----
- contrib/Fedora/haveged-switch-root.service | 1 +
- contrib/Fedora/haveged.service             | 1 +
- contrib/SUSE/haveged-switch-root.service   | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/contrib/Fedora/haveged-switch-root.service b/contrib/Fedora/haveged-switch-root.service
-index 8cc38cf..a3eb086 100644
---- a/contrib/Fedora/haveged-switch-root.service
-+++ b/contrib/Fedora/haveged-switch-root.service
-@@ -1,6 +1,7 @@
- [Unit]
- Description=Tell haveged about new root
- DefaultDependencies=no
-+ConditionKernelVersion=<5.6
- ConditionPathExists=/etc/initrd-release
- Before=initrd-switch-root.service
- JoinsNamespaceOf=haveged.service
-diff --git a/contrib/Fedora/haveged.service b/contrib/Fedora/haveged.service
-index abb9cfc..2bbb9a3 100644
---- a/contrib/Fedora/haveged.service
-+++ b/contrib/Fedora/haveged.service
-@@ -2,6 +2,7 @@
- Description=Entropy Daemon based on the HAVEGE algorithm
- Documentation=man:haveged(8) http://www.issihosts.com/haveged/
- DefaultDependencies=no
-+ConditionKernelVersion=<5.6
- After=systemd-tmpfiles-setup-dev.service
- Before=sysinit.target shutdown.target systemd-journald.service
- 
-diff --git a/contrib/SUSE/haveged-switch-root.service b/contrib/SUSE/haveged-switch-root.service
-index 9757da4..24b8649 100644
---- a/contrib/SUSE/haveged-switch-root.service
-+++ b/contrib/SUSE/haveged-switch-root.service
-@@ -1,6 +1,7 @@
- [Unit]
- Description=Tell haveged about new root
- DefaultDependencies=no
-+ConditionKernelVersion=<5.6
- ConditionPathExists=/etc/initrd-release
- Before=initrd-switch-root.service
- JoinsNamespaceOf=haveged.service

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-01 06:11:01 UTC (rev 424962)
+++ PKGBUILD	2021-10-01 06:11:17 UTC (rev 424963)
@@ -4,8 +4,8 @@
 # Contributor: pootzko <pootzko at gmail dot com>
 
 pkgname=haveged
-pkgver=1.9.14
-pkgrel=2
+pkgver=1.9.15
+pkgrel=1
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('x86_64')
 url='https://github.com/jirka-h/haveged'
@@ -12,18 +12,13 @@
 license=('GPL')
 depends=('glibc')
 validpgpkeys=('8F6B7293B03E5AC5762B65CE2E2F252B05CCA168') # Jirka Hladky <hladky.jiri at gmail.com>
-source=("$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/$pkgname/archive/v$pkgver.tar.gz"
-        '0001-Updated-systemd-service-files-to-not-start-haveged-s.patch')
-        #"https://github.com/jirka-h/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz.asc"
-sha256sums=('938cb494bcad7e4f24e61eb50fab4aa0acbc3240c80f3ad5c6cf7e6e922618c3'
-            'cc2122a7c954bcd2fb856799abf01730d9c58a5e70065a4f66ae838a6b3beac5')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/$pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('f882919ccead07ad6687a4784c0c501e617321e96dd0118403464969359cf6ad')
 
 prepare() {
   cd $pkgname-$pkgver
 
   sed -i 's/@SBIN_DIR@/\/usr\/bin/' contrib/Fedora/haveged.service
-
-  patch -Np1 < ../0001-Updated-systemd-service-files-to-not-start-haveged-s.patch
 }
 
 build() {