Bump version to 4.10.1

Currently, cargo-deb does not use the variant name option as systemd
service-name, causing the postgres variant with name 'chirpstack' to
install a 'chirpstack-postgres' systemd service. See also
https://github.com/kornelski/cargo-deb/issues/150.

This also fixes the RPM systemd service-name for the sqlite variant.

.github/workflows/main.yml

@@ -108,7 +108,7 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: |
-            chirpstack/${{ github.event.repository.name }}${{ matrix.database != 'postgres' && format('-{0}', matrix.database) }}
+            chirpstack/${{ github.event.repository.name }}${{ matrix.database != 'postgres' && format('-{0}', matrix.database) || '' }}
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}

api/grpc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chirpstack/chirpstack-api-grpc-web",
-  "version": "4.10.0-test.6",
+  "version": "4.10.1",
   "description": "Chirpstack gRPC-web API",
   "license": "MIT",
   "devDependencies": {

api/java/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "io.chirpstack"
-version = "4.10.0-test.6"
+version = "4.10.1"
 
 repositories {
     mavenCentral()

api/js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chirpstack/chirpstack-api",
-  "version": "4.10.0-test.6",
+  "version": "4.10.1",
   "description": "Chirpstack JS and TS API",
   "license": "MIT",
   "devDependencies": {

api/kotlin/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "io.chirpstack"
-version = "4.10.0-test.6"
+version = "4.10.1"
 
 repositories {
     mavenCentral()

api/php/composer.json

@@ -3,7 +3,7 @@
   "description": "Chirpstack PHP API",
   "license": "MIT",
   "type": "library",
-  "version": "4.10.0-test.6",
+  "version": "4.10.1",
   "require": {
     "php": ">=7.0.0",
     "grpc/grpc": "^v1.57.0",

api/python/src/setup.py

@@ -18,7 +18,7 @@ CLASSIFIERS = [
 
 setup(
     name='chirpstack-api',
-    version = "4.10.0-test.6",
+    version = "4.10.1",
     url='https://github.com/brocaar/chirpstack-api',
     author='Orne Brocaar',
     author_email='info@brocaar.com',

api/rust/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
   name = "chirpstack_api"
   description = "ChirpStack Protobuf / gRPC API definitions."
-  version = "4.10.0-test.6"
+  version = "4.10.1"
   authors = ["Orne Brocaar <info@brocaar.com>"]
   license = "MIT"
   homepage = "https://www.chirpstack.io"
@@ -24,7 +24,7 @@
     "codegen",
     "prost",
   ], default-features = false, optional = true }
-  tokio = { version = "1.40", features = ["macros"], optional = true }
+  tokio = { version = "1.41", features = ["macros"], optional = true }
   pbjson = { version = "0.7", optional = true }
   pbjson-types = { version = "0.7", optional = true }
   serde = { version = "1.0", optional = true }

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
   name = "backend"
-  version = "4.10.0-test.6"
+  version = "4.10.1"
   authors = ["Orne Brocaar <info@brocaar.com>"]
   edition = "2018"
   publish = false
@@ -19,7 +19,7 @@
     "rustls-tls",
   ], default-features = false }
   chrono = { version = "0.4", features = ["serde"] }
-  tokio = { version = "1.40", features = ["macros"] }
+  tokio = { version = "1.41", features = ["macros"] }
   chirpstack_api = { path = "../api/rust", default-features = false, features = [
     "json",
   ] }

chirpstack-integration/Cargo.toml

@@ -3,13 +3,13 @@
   description = "Library for building external ChirpStack integrations"
   homepage = "https://www.chirpstack.io/"
   license = "MIT"
-  version = "4.10.0-test.6"
+  version = "4.10.1"
   authors = ["Orne Brocaar <info@brocaar.com>"]
   edition = "2021"
   repository = "https://github.com/chirpstack/chirpstack"
 
 [dependencies]
-  chirpstack_api = { path = "../api/rust", version = "4.10.0-test.6" }
+  chirpstack_api = { path = "../api/rust", version = "4.10.1" }
   redis = { version = "0.27", features = [
     "cluster-async",
     "tokio-rustls-comp",
@@ -23,7 +23,7 @@
   ], default-features = true }
   async-trait = "0.1"
   serde = { version = "1.0", features = ["derive"] }
-  tokio = { version = "1.40", features = ["macros", "rt-multi-thread"] }
+  tokio = { version = "1.41", features = ["macros", "rt-multi-thread"] }
   lazy_static = "1.5"
   serde_json = "1.0"
   toml = "0.8"

chirpstack/Cargo.toml

@@ -3,7 +3,7 @@
   description = "ChirpStack is an open-source LoRaWAN(TM) Network Server"
   repository = "https://github.com/chirpstack/chirpstack"
   homepage = "https://www.chirpstack.io/"
-  version = "4.10.0-test.6"
+  version = "4.10.1"
   authors = ["Orne Brocaar <info@brocaar.com>"]
   edition = "2021"
   publish = false
@@ -20,7 +20,7 @@
   serde_urlencoded = "0.7"
   humantime-serde = "1.1"
   toml = "0.8"
-  handlebars = "6.1"
+  handlebars = "6.2"
 
   # Database
   email_address = "0.2"
@@ -35,7 +35,7 @@
     "async-connection-wrapper",
   ] }
   tokio-postgres = { version = "0.7", optional = true }
-  tokio-postgres-rustls = { version = "0.12", optional = true }
+  tokio-postgres-rustls = { version = "0.13", optional = true }
   bigdecimal = "0.4"
   redis = { version = "0.27", features = ["tls-rustls", "tokio-rustls-comp"] }
   deadpool-redis = { version = "0.18", features = ["cluster", "serde"] }
@@ -83,7 +83,7 @@
   tonic = "0.12"
   tonic-web = "0.12"
   tonic-reflection = "0.12"
-  tokio = { version = "1.40", features = ["macros", "rt-multi-thread"] }
+  tokio = { version = "1.41", features = ["macros", "rt-multi-thread"] }
   tokio-stream = "0.1"
   prost-types = "0.13"
   prost = "0.13"
@@ -116,7 +116,7 @@
     "ring",
   ] }
   rustls-native-certs = "0.8"
-  rustls-pemfile = "2.1"
+  rustls-pemfile = "2.2"
   pem = "3.0"
   x509-parser = "0.16"
   rsa = "0.9"
@@ -142,14 +142,14 @@
 
   # Misc
   lazy_static = "1.5"
-  uuid = { version = "1.10", features = ["v4", "serde"] }
+  uuid = { version = "1.11", features = ["v4", "serde"] }
   chrono = "0.4"
   async-trait = "0.1"
   aes = "0.8"
   rand = "0.8"
   base64 = "0.22"
   async-recursion = "1.1"
-  regex = "1.10"
+  regex = "1.11"
   petgraph = "0.6"
   prometheus-client = "0.22"
   pin-project = "1.1"
@@ -160,7 +160,7 @@
 # Development and testing
 [dev-dependencies]
   httpmock = "0.7.0"
-  bytes = "1.7"
+  bytes = "1.8"
   dotenv = "0.15"
 
 [features]
@@ -235,19 +235,14 @@
       "/etc/chirpstack/region_us915_7.toml",
     ]
     suggests = "postgresql, mosquitto, redis"
+    conflicts = "chirpstack-sqlite"
     maintainer-scripts = "debian/"
     systemd-units = { enable = true }
 
-  [package.metadata.deb.variants.postgres]
-    name = "chirpstack"
-    suggests = "postgresql, mosquitto, redis"
-    conflicts = "chirpstack-sqlite"
-
-  [package.metadata.deb.variants.sqlite]
-    default-features = false
-    features = ["sqlite"]
-    suggests = "mosquitto, redis"
-    conflicts = "chirpstack"
+    [package.metadata.deb.variants.sqlite]
+      name = "chirpstack-sqlite"
+      suggests = "mosquitto, redis"
+      conflicts = "chirpstack"
 
   [package.metadata.generate-rpm]
     auto-req = "no"
@@ -271,12 +266,16 @@ chmod 640 /etc/chirpstack/*.toml
       { source = "rpm/chirpstack.service", dest = "/lib/systemd/system/chirpstack.service" },
     ]
 
-  [package.metadata.generate-rpm.variants.postgres]
-    name = "chirpstack"
-  [package.metadata.generate-rpm.variants.postgres.conflicts]
-    chirpstack-sqlite = "*"
+    [package.metadata.generate-rpm.conflicts]
+      chirpstack-sqlite = "*"
 
-  [package.metadata.generate-rpm.variants.sqlite]
-    name = "chirpstack-sqlite"
-  [package.metadata.generate-rpm.variants.sqlite.conflicts]
-    chirpstack = "*"
+    [package.metadata.generate-rpm.variants.sqlite]
+      name = "chirpstack-sqlite"
+      assets = [
+        { source = "target/release/chirpstack", dest = "/usr/bin/chirpstack", mode = "755" },
+        { source = "configuration/*", dest = "/etc/chirpstack" },
+        { source = "rpm/chirpstack.service", dest = "/lib/systemd/system/chirpstack-sqlite.service" },
+      ]
+
+      [package.metadata.generate-rpm.variants.sqlite.conflicts]
+        chirpstack = "*"

chirpstack/Makefile

@@ -2,6 +2,11 @@
 
 PKG_VERSION := $(shell cargo metadata --no-deps --format-version 1 | jq -r '.packages[0].version')
 DATABASE ?= postgres
+ifeq ($(DATABASE),postgres)
+	VARIANT_FLAGS ?=
+else
+	VARIANT_FLAGS ?= --variant="$(DATABASE)"
+endif
 
 debug-amd64:
 	cross build --target x86_64-unknown-linux-musl --no-default-features --features="$(DATABASE)"
@@ -17,13 +22,13 @@ dist:
 	cross build --target x86_64-unknown-linux-musl --release --no-default-features --features="$(DATABASE)"
 	cross build --target armv7-unknown-linux-musleabihf --release --no-default-features --features="$(DATABASE)"
 
-	cargo deb --target x86_64-unknown-linux-musl --no-build --no-strip --variant="$(DATABASE)"
-	cargo deb --target armv7-unknown-linux-musleabihf --no-build --no-strip --variant="$(DATABASE)"
-	cargo deb --target aarch64-unknown-linux-musl --no-build --no-strip --variant="$(DATABASE)"
+	cargo deb --target x86_64-unknown-linux-musl --no-build --no-strip $(VARIANT_FLAGS)
+	cargo deb --target armv7-unknown-linux-musleabihf --no-build --no-strip $(VARIANT_FLAGS)
+	cargo deb --target aarch64-unknown-linux-musl --no-build --no-strip $(VARIANT_FLAGS)
 
-	cargo generate-rpm --target x86_64-unknown-linux-musl --target-dir ../target --variant="$(DATABASE)"
-	cargo generate-rpm --target armv7-unknown-linux-musleabihf --target-dir ../target --variant="$(DATABASE)"
-	cargo generate-rpm --target aarch64-unknown-linux-musl --target-dir ../target --variant="$(DATABASE)"
+	cargo generate-rpm --target x86_64-unknown-linux-musl --target-dir ../target $(VARIANT_FLAGS)
+	cargo generate-rpm --target armv7-unknown-linux-musleabihf --target-dir ../target $(VARIANT_FLAGS)
+	cargo generate-rpm --target aarch64-unknown-linux-musl --target-dir ../target $(VARIANT_FLAGS)
 
 	mkdir -p ../dist
 

lrwn-filters/Cargo.toml

@@ -3,7 +3,7 @@
   description = "Library for filtering LoRaWAN payloads on DevAddr and JoinEUIs prefixes"
   homepage = "https://www.chirpstack.io/"
   license = "MIT"
-  version = "4.10.0-test.6"
+  version = "4.10.1"
   authors = ["Orne Brocaar <info@brocaar.com>"]
   edition = "2021"
   repository = "https://github.com/chirpstack/chirpstack"

lrwn/Cargo.toml

@@ -3,7 +3,7 @@
   description = "Library for encoding / decoding LoRaWAN frames."
   homepage = "https://www.chirpstack.io"
   license = "MIT"
-  version = "4.10.0-test.6"
+  version = "4.10.1"
   authors = ["Orne Brocaar <info@brocaar.com>"]
   edition = "2018"
   repository = "https://github.com/chirpstack/chirpstack"

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chirpstack-ui",
-  "version": "4.10.0-test.6",
+  "version": "4.10.1",
   "private": true,
   "type": "module",
   "scripts": {