From 75eed2e18af4115a3a0470f516c1d0309cfe03c2 Mon Sep 17 00:00:00 2001
From: Balakrishnan Balasubramanian <git.user@balki.me>
Date: Sun, 8 Dec 2024 11:55:27 -0500
Subject: [PATCH] Update to latest git and my features updates

1. Fix Bug in initialization
2. Support bcrypt password instead of plain text
3. Use My fork for source
---
 .SRCINFO   |  6 +++---
 .gitignore |  5 ++++-
 PKGBUILD   | 14 +++++++-------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index fe4dd85..6dc085a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = librespeed-go
 	pkgdesc = Go backend for LibreSpeed
 	pkgver = 1.1.5
-	pkgrel = 3
+	pkgrel = 13
 	url = https://github.com/librespeed/speedtest-go
 	arch = i386
 	arch = x86_64
@@ -16,12 +16,12 @@ pkgbase = librespeed-go
 	conflicts = librespeed-rs
 	backup = etc/librespeed/settings.toml
 	backup = usr/share/librespeed/assets/index.html
-	source = https://github.com/librespeed/speedtest-go/archive/v1.1.5.zip
+	source = git+https://gitea.balki.me/balki/speedtest-go.git#commit=abc8ac0a7b933c8c4b58a105337f377deb7fd005
 	source = librespeed.ico
 	source = librespeed.service
 	source = librespeed.sysusers
 	source = librespeed.tmpfiles
-	b2sums = 7bb22236e9ae9a78793219124651877c0c20f9e99f218e4e275894aeed50225598ff559aa74c49a156f8818d92cc87766bf3de6af15df2c2ad26d404c05b35d9
+	b2sums = 673e24d4fc7dd13074bcf9e9805530a1a0665a2cd91840e8444e26cfb2cbc3e1f2bdc9235526e19c746e503abcd4ba445a0c90f086a2aa9c84330cde105d7218
 	b2sums = d561280edc2fe3f7228ce3366132bd22e345e7574f21d92e6f188f701642fe98ffab8c8b12e807ad72fea15a6016605d6febd08c3389395828c47767779540bc
 	b2sums = 6aa0ca421c7ee5ac2dd58df13c1a42a350186eb5a72bad7f83776b7a291b3032ae84e0789d0fafb8116f4371b73317b6bda476ea3f44f72337b236e7e2514761
 	b2sums = a7d3d6d4e7adb5b5d45e254fafad7c7180a54c1eec898657cbd8d457e218c746742067d7a024b81e2bf1fefb05a6ce3f7abebbdf233f70c99a34406edf047b6c
diff --git a/.gitignore b/.gitignore
index c4c4ffc..7d8f02b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-*.zip
+*.pkg.tar.zst
+src/
+pkg/
+speedtest-go/
diff --git a/PKGBUILD b/PKGBUILD
index 9fd04be..7f9252e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,8 @@
 
 pkgname="librespeed-go"
 pkgver=1.1.5
-pkgrel=3
+_commit=abc8ac0a7b933c8c4b58a105337f377deb7fd005
+pkgrel=13
 pkgdesc="Go backend for LibreSpeed"
 url="https://github.com/librespeed/speedtest-go"
 license=("LGPL3")
@@ -11,12 +12,12 @@ conflicts=("librespeed-rs")
 makedepends=("go>=1.16")
 optdepends=("mariadb: alternative database to bolt"
             "postgresql: alternative database to bolt")
-source=("https://github.com/librespeed/speedtest-go/archive/v$pkgver.zip"
+source=("git+https://gitea.balki.me/balki/speedtest-go.git#commit=${_commit}"
         "librespeed.ico"
         "librespeed.service"
         "librespeed.sysusers"
         "librespeed.tmpfiles")
-b2sums=('7bb22236e9ae9a78793219124651877c0c20f9e99f218e4e275894aeed50225598ff559aa74c49a156f8818d92cc87766bf3de6af15df2c2ad26d404c05b35d9'
+b2sums=('673e24d4fc7dd13074bcf9e9805530a1a0665a2cd91840e8444e26cfb2cbc3e1f2bdc9235526e19c746e503abcd4ba445a0c90f086a2aa9c84330cde105d7218'
         'd561280edc2fe3f7228ce3366132bd22e345e7574f21d92e6f188f701642fe98ffab8c8b12e807ad72fea15a6016605d6febd08c3389395828c47767779540bc'
         '6aa0ca421c7ee5ac2dd58df13c1a42a350186eb5a72bad7f83776b7a291b3032ae84e0789d0fafb8116f4371b73317b6bda476ea3f44f72337b236e7e2514761'
         'a7d3d6d4e7adb5b5d45e254fafad7c7180a54c1eec898657cbd8d457e218c746742067d7a024b81e2bf1fefb05a6ce3f7abebbdf233f70c99a34406edf047b6c'
@@ -24,7 +25,7 @@ b2sums=('7bb22236e9ae9a78793219124651877c0c20f9e99f218e4e275894aeed50225598ff559
 backup=("etc/librespeed/settings.toml" "usr/share/librespeed/assets/index.html")
 
 prepare(){
- cd "speedtest-go-$pkgver"
+ cd "speedtest-go"
  # use arch linux paths
  sed -i "settings.toml" \
      -e 's|^assets_path=.*|assets_path="/usr/share/librespeed/assets"|' \
@@ -35,12 +36,12 @@ prepare(){
 }
 
 build(){
- cd "speedtest-go-$pkgver"
+ cd "speedtest-go"
  go build -ldflags "-w -s" -trimpath -o "speedtest" "main.go"
 }
 
 package(){
- cd "speedtest-go-$pkgver"
+ cd "speedtest-go"
  # binary file
  install -D "speedtest" "$pkgdir/usr/bin/librespeed"
  # configuration
@@ -53,7 +54,6 @@ package(){
  install -m 644 "database/mysql/telemetry_mysql.sql" "$pkgdir/usr/share/librespeed"
  install -m 644 "database/postgresql/telemetry_postgresql.sql" "$pkgdir/usr/share/librespeed"
  # html pages
- install -D -m 644 "web/assets/example-singleServer-full.html" "web/assets/index.html"
  install -D -m 644 "$srcdir/librespeed.ico" "web/assets/favicon.ico"
  cp -r "web/assets" "$pkgdir/usr/share/librespeed"
  # systemd files