[arch-commits] Commit in haveged/trunk (PKGBUILD haveged.service)

[Christian Hesse]

    Date: Wednesday, September 4, 2019 @ 11:59:27
  Author: eworm
Revision: 361609

upgpkg: haveged 1.9.6-2

get our security features back

Modified:
  haveged/trunk/PKGBUILD
  haveged/trunk/haveged.service

-----------------+
 PKGBUILD        |   21 ++++++++++++---------
 haveged.service |   10 +++++-----
 2 files changed, 17 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-04 11:12:54 UTC (rev 361608)
+++ PKGBUILD	2019-09-04 11:59:27 UTC (rev 361609)
@@ -5,20 +5,23 @@
 
 pkgname=haveged
 pkgver=1.9.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('x86_64')
 url='https://github.com/jirka-h/haveged'
 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")
+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"
         #"https://github.com/jirka-h/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz.asc"
-        #'haveged.service')
-sha256sums=('4d4c046755476d3734ffb78772c242c25913ff0eb7509c143671dae6ec9d1189')
-           # 'SKIP'
-           # '1e78d296ebb5f4d46108094997c51e3fccf475f54d637f20212a3aa3730ef847')
+        'haveged.service')
+sha256sums=('4d4c046755476d3734ffb78772c242c25913ff0eb7509c143671dae6ec9d1189'
+            #'SKIP'
+            '13e12065c5c4574465915db4b71659dc95fc3e41f96794fff165bfda50ac3f69')
 
+# service file changes sent upstream:
+# https://github.com/jirka-h/haveged/pull/21
+
 build() {
   cd $pkgname-$pkgver
 
@@ -39,6 +42,6 @@
 
   make DESTDIR="$pkgdir" install
 
-  #install -D -m0644 "${srcdir}"/haveged.service "$pkgdir"/usr/lib/systemd/system/haveged.service
-  install -D -m0644 init.d/service.fedora "$pkgdir"/usr/lib/systemd/system/haveged.service
+  install -D -m0644 "${srcdir}"/haveged.service "$pkgdir"/usr/lib/systemd/system/haveged.service
+  #install -D -m0644 init.d/service.fedora "$pkgdir"/usr/lib/systemd/system/haveged.service
 }

Modified: haveged.service
===================================================================
--- haveged.service	2019-09-04 11:12:54 UTC (rev 361608)
+++ haveged.service	2019-09-04 11:59:27 UTC (rev 361609)
@@ -1,15 +1,15 @@
 [Unit]
-Description=Entropy Harvesting Daemon
-Documentation=man:haveged(8)
+Description=Entropy Daemon based on the HAVEGE algorithm
+Documentation=man:haveged(8) http://www.issihosts.com/haveged/
 DefaultDependencies=no
 ConditionVirtualization=!container
-After=systemd-random-seed.service
-Before=sysinit.target shutdown.target
+Before=sysinit.target shutdown.target systemd-journald.service
 
 [Service]
 ExecStartPre=+/usr/bin/sysctl -w kernel.random.write_wakeup_threshold=1024
 ExecStart=/usr/bin/haveged --Foreground --verbose=1
-SuccessExitStatus=143
+Restart=always
+SuccessExitStatus=137 143
 DynamicUser=on
 AmbientCapabilities=CAP_SYS_ADMIN
 NoNewPrivileges=on