From ec10db27a5f1bad80bdc4af82e01a4c322ff124b Mon Sep 17 00:00:00 2001
From: "Alexander \"Arav\" Andreev" <me@arav.top>
Date: Wed, 17 Aug 2022 21:49:57 +0400
Subject: [PATCH] A version increased to 1.1.1. And a version now is being
 passed from ldflags in a Makefile.

---
 Makefile                 | 2 +-
 README.md                | 4 ++--
 build/archlinux/PKGBUILD | 2 +-
 cmd/justcaptchad/main.go | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 3ca83b0..9f02ce9 100755
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ SYSDDIR_=${shell pkg-config systemd --variable=systemdsystemunitdir}
 SYSDDIR=${SYSDDIR_:/%=%}
 DESTDIR=/
 
-LDFLAGS=-ldflags "-s -w" -tags osusergo,netgo
+LDFLAGS=-ldflags "-s -w -X main.version=1.1.1" -tags osusergo,netgo
 
 all: ${TARGET}
 
diff --git a/README.md b/README.md
index 5519842..5f41d96 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-justcaptcha ver. 1.1
-====================
+justcaptcha ver. 1.1.1
+======================
 
 A simple CAPTCHA service implementation.
 
diff --git a/build/archlinux/PKGBUILD b/build/archlinux/PKGBUILD
index a76d094..6ee325d 100644
--- a/build/archlinux/PKGBUILD
+++ b/build/archlinux/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Alexander "Arav" Andreev <me@arav.top>
 pkgname=justcaptcha-git
-pkgver=1.1
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="Just a CAPTCHA service"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
diff --git a/cmd/justcaptchad/main.go b/cmd/justcaptchad/main.go
index fbb8f0a..a59d3b1 100644
--- a/cmd/justcaptchad/main.go
+++ b/cmd/justcaptchad/main.go
@@ -15,6 +15,8 @@ import (
 	"time"
 )
 
+var version string
+
 var listenAddress *string = flag.String("listen", "/var/run/justcaptcha/c.sock", "listen address (ip:port|unix_path)")
 var captchaExpiry *time.Duration = flag.Duration("expiry", 5*time.Minute, "CAPTCHA expiry in format XX{s,m,h}, e.g. 5m, 300s")
 var showVersion *bool = flag.Bool("v", false, "show version")
@@ -24,7 +26,7 @@ func main() {
 	log.SetFlags(0)
 
 	if *showVersion {
-		fmt.Println("justcaptchad ver. 1.0\nCopyright (c) 2022 Alexander \"Arav\" Andreev <me@arav.top>")
+		fmt.Println("justcaptchad ver.", version, "\nCopyright (c) 2022 Alexander \"Arav\" Andreev <me@arav.top>")
 		return
 	}