Add libinfnoise and tools

2 files changed, 59 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a27b405c18b7..6c764ac36748 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,27 @@
 pkgbase = infnoise
-	pkgdesc = The world's easiest TRNG to get right
+	pkgdesc = Infinite Noise TRNG
 	pkgver = 0.3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/waywardgeek/infnoise
 	arch = x86_64
 	license = custom
 	depends = libftdi-compat
-	backup = etc/infnoise.conf
 	source = https://13-37.org/files/infnoise-0.3.0.tar.gz
 	source = https://13-37.org/files/infnoise-0.3.0.tar.gz.sig
 	source = https://github.com/13-37-org/infnoise/raw/0.3.0/LICENSE
 	validpgpkeys = 71AE099B262DC0B493E6EE71975DC25C4E730A3C
-	sha256sums = 7d10f0ea769da5b538983df2c1bf7188dc882bf12c4bf1c471f47ec17ba1ff71
-	sha256sums = SKIP
-	sha256sums = 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673
+	sha512sums = 1853655e5a90c844764f920230c194cd2b84f9ad97cb8c53262f6d078d8bc4874cd86e9cd48ddfc66fc556d3d089c36b16374d76d094fe0d004bb9f6984ec6b4
+	sha512sums = SKIP
+	sha512sums = 3e20c74803825a27f7d4208f711d5b5f48bbdcd9487b59e0922fcbfd3b17f3f37440ae3bc024e3183401e4918765e59de8a5896f5a8be8236e4b769c65443cbb
 
 pkgname = infnoise
+	pkgdesc = Infinite Noise TRNG driver
+	backup = etc/infnoise.conf
+
+pkgname = libinfnoise
+	pkgdesc = Infinite Noise TRNG library
+
+pkgname = infnoise-tools
+	pkgdesc = Infinite Noise TRNG tools
+	depends = glibc
 
diff --git a/PKGBUILD b/PKGBUILD
index c599b680ea76..15890ec733b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,60 @@
 # Maintainer: Aidan Dang <dang at aidan dot gg>
 
-pkgname=infnoise
+pkgbase=infnoise
+pkgname=(infnoise libinfnoise infnoise-tools)
 pkgver=0.3.0
-pkgrel=1
-pkgdesc="The world's easiest TRNG to get right"
+pkgrel=2
+pkgdesc="Infinite Noise TRNG"
 arch=('x86_64')
 url="https://github.com/waywardgeek/infnoise"
 license=('custom')
 depends=('libftdi-compat')
-backup=("etc/infnoise.conf")
-source=("https://13-37.org/files/$pkgname-$pkgver.tar.gz"
-        "https://13-37.org/files/$pkgname-$pkgver.tar.gz.sig"
-        "https://github.com/13-37-org/$pkgname/raw/$pkgver/LICENSE")
-sha256sums=('7d10f0ea769da5b538983df2c1bf7188dc882bf12c4bf1c471f47ec17ba1ff71'
+source=("https://13-37.org/files/${pkgbase}-${pkgver}.tar.gz"
+        "https://13-37.org/files/${pkgbase}-${pkgver}.tar.gz.sig"
+        "https://github.com/13-37-org/${pkgbase}/raw/${pkgver}/LICENSE")
+sha512sums=('1853655e5a90c844764f920230c194cd2b84f9ad97cb8c53262f6d078d8bc4874cd86e9cd48ddfc66fc556d3d089c36b16374d76d094fe0d004bb9f6984ec6b4'
             'SKIP'
-            '36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673')
+            '3e20c74803825a27f7d4208f711d5b5f48bbdcd9487b59e0922fcbfd3b17f3f37440ae3bc024e3183401e4918765e59de8a5896f5a8be8236e4b769c65443cbb')
 validpgpkeys=('71AE099B262DC0B493E6EE71975DC25C4E730A3C')
 
 build() {
   make -f Makefile.linux
+
+  # Build infnoise-tools
+  cd ${srcdir}/tools
+  make all
+}
+
+package_libinfnoise() {
+  pkgdesc="Infinite Noise TRNG library"
+
+  install -Dm644 "LICENSE"                            "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 "libinfnoise.h"                      "${pkgdir}/usr/include/libinfnoise.h"
+  install -Dm755 "libinfnoise.so"                     "${pkgdir}/usr/lib/libinfnoise.so"
 }
 
-package() {
-  install -Dm644 "LICENSE"                            "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm644 "init_scripts/75-infnoise.rules"     "$pkgdir/usr/lib/udev/rules.d/75-infnoise.rules"
-  install -Dm644 "init_scripts/infnoise.conf.systemd" "$pkgdir/etc/infnoise.conf"
-  install -Dm644 "init_scripts/infnoise.service.bin"  "$pkgdir/usr/lib/systemd/system/infnoise.service"
-  install -Dm755 "infnoise"                           "$pkgdir/usr/bin/infnoise"
-  install -Dm755 "libinfnoise.so"                     "$pkgdir/usr/lib/libinfnoise.so"
+package_infnoise() {
+  pkgdesc="Infinite Noise TRNG driver"
+  backup=("etc/infnoise.conf")
+
+  install -Dm644 "LICENSE"                            "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 "init_scripts/75-infnoise.rules"     "${pkgdir}/usr/lib/udev/rules.d/75-infnoise.rules"
+  install -Dm644 "init_scripts/infnoise.conf.systemd" "${pkgdir}/etc/infnoise.conf"
+  install -Dm644 "init_scripts/infnoise.service.bin"  "${pkgdir}/usr/lib/systemd/system/infnoise.service"
+  install -Dm755 "infnoise"                           "${pkgdir}/usr/bin/infnoise"
+}
+
+package_infnoise-tools() {
+  pkgdesc="Infinite Noise TRNG tools"
+  depends=('glibc')
+
+  install -Dm644 "LICENSE"                            "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm755 "tools/bin2hex"                      "${pkgdir}/usr/bin/infnoise-bin2hex"
+  install -Dm755 "tools/dice"                         "${pkgdir}/usr/bin/infnoise-dice"
+  install -Dm755 "tools/entcheck"                     "${pkgdir}/usr/bin/infnoise-entcheck"
+  install -Dm755 "tools/findlongest"                  "${pkgdir}/usr/bin/infnoise-findlongest"
+  install -Dm755 "tools/flipbits"                     "${pkgdir}/usr/bin/infnoise-flipbits"
+  install -Dm755 "tools/healthcheck"                  "${pkgdir}/usr/bin/infnoise-healthcheck"
+  install -Dm755 "tools/hex2bin"                      "${pkgdir}/usr/bin/infnoise-hex2bin"
+  install -Dm755 "tools/passgen"                      "${pkgdir}/usr/bin/infnoise-passgen"
 }