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.

Cargo.lock

@@ -611,7 +611,7 @@ dependencies = [
 
 [[package]]
 name = "backend"
-version = "4.10.0"
+version = "4.10.1"
 dependencies = [
  "aes-kw",
  "anyhow",
@@ -813,7 +813,7 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chirpstack"
-version = "4.10.0"
+version = "4.10.1"
 dependencies = [
  "aes",
  "anyhow",
@@ -907,7 +907,7 @@ dependencies = [
 
 [[package]]
 name = "chirpstack_api"
-version = "4.10.0"
+version = "4.10.1"
 dependencies = [
  "hex",
  "pbjson",
@@ -924,7 +924,7 @@ dependencies = [
 
 [[package]]
 name = "chirpstack_integration"
-version = "4.10.0"
+version = "4.10.1"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2522,7 +2522,7 @@ dependencies = [
 
 [[package]]
 name = "lrwn"
-version = "4.10.0"
+version = "4.10.1"
 dependencies = [
  "aes",
  "anyhow",
@@ -2536,7 +2536,7 @@ dependencies = [
 
 [[package]]
 name = "lrwn_filters"
-version = "4.10.0"
+version = "4.10.1"
 dependencies = [
  "hex",
  "lrwn",

api/grpc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chirpstack/chirpstack-api-grpc-web",
-  "version": "4.10.0",
+  "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"
+version = "4.10.1"
 
 repositories {
     mavenCentral()

api/js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chirpstack/chirpstack-api",
-  "version": "4.10.0",
+  "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"
+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",
+  "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",
+    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"
+  version = "4.10.1"
   authors = ["Orne Brocaar <info@brocaar.com>"]
   license = "MIT"
   homepage = "https://www.chirpstack.io"

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
   name = "backend"
-  version = "4.10.0"
+  version = "4.10.1"
   authors = ["Orne Brocaar <info@brocaar.com>"]
   edition = "2018"
   publish = false

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"
+  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" }
+  chirpstack_api = { path = "../api/rust", version = "4.10.1" }
   redis = { version = "0.27", features = [
     "cluster-async",
     "tokio-rustls-comp",

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"
+  version = "4.10.1"
   authors = ["Orne Brocaar <info@brocaar.com>"]
   edition = "2021"
   publish = false
@@ -235,17 +235,12 @@
       "/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"]
+      name = "chirpstack-sqlite"
       suggests = "mosquitto, redis"
       conflicts = "chirpstack"
 
@@ -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"
+      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"
+  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"
+  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",
+  "version": "4.10.1",
   "private": true,
   "type": "module",
   "scripts": {