upgpkg: rockpass 0.7.0-1

upstream release

4 files changed, 12 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec27e2a62470..03b796ef37f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rockpass
 	pkgdesc = A small and ultrasecure Lesspass database server written in Rust
-	pkgver = 0.6.0
+	pkgver = 0.7.0
 	pkgrel = 1
 	url = https://github.com/ogarcia/rockpass
 	arch = arm
@@ -12,12 +12,10 @@ pkgbase = rockpass
 	license = GPL3
 	makedepends = rust
 	depends = sqlite
-	backup = etc/rockpass.conf
-	source = rockpass-0.6.0.tar.gz::https://github.com/ogarcia/rockpass/archive/0.6.0.tar.gz
-	source = rockpass.conf
+	backup = etc/rockpass.toml
+	source = https://gitlab.com/ogarcia/rockpass/-/archive/0.7.0/rockpass-0.7.0.tar.bz2
 	source = rockpass.service
-	b2sums = 92b2cb27a49786ca8d3994ea9e878f53533c75073bc8cc0de456a6f7475c2afa6c80d4a0d03f57ff69443492b2b18f86f658b6705f19ab1b3b6a9b81b9d65f60
-	b2sums = fb14ea017d62647acd111e0c834ff1357a55e6b0c4692f0e372f969024f004af806cae99b5311a2d1c7975e88e0049c6ebb92fa6f0532df0b06d893d564daf80
-	b2sums = 754c712cc81cf4c63f6aae586386a21c50fa30e8730de62d3e73e0cdf000dd7bf1abcf54371036e22568f390b6a0b559d1064dae244f1e4b2cf9bd3def90c149
+	b2sums = 70eb2ac2f937c7094e7a458eee917bbe04b5f10fa46cd279d968b2519f9a82533923ba4776746d973872f8446d8d4beb6849c0ea7f7498f66008111cd8e1ec19
+	b2sums = 0fa53a8afb3e842cfce314cbc580c3e2a89441f8b1155307df164ca50028e88d30212a29d847c40026105fb4a735e19863ed07fca8aeb86f51d3a8f096d8860a
 
 pkgname = rockpass
diff --git a/PKGBUILD b/PKGBUILD
index c591d832d3d0..559f35983de9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: "Amhairghin" Oscar Garcia Amor (https://ogarcia.me)
 
 pkgname=rockpass
-pkgver=0.6.0
+pkgver=0.7.0
 pkgrel=1
 pkgdesc='A small and ultrasecure Lesspass database server written in Rust'
 arch=('arm' 'armv6h' 'armv7h' 'aarch64' 'i686' 'x86_64')
@@ -9,13 +9,11 @@ url='https://github.com/ogarcia/rockpass'
 license=('GPL3')
 depends=('sqlite')
 makedepends=('rust')
-backup=("etc/${pkgname}.conf")
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ogarcia/${pkgname}/archive/${pkgver}.tar.gz"
-        "${pkgname}.conf"
+backup=("etc/${pkgname}.toml")
+source=("https://gitlab.com/ogarcia/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         "${pkgname}.service")
-b2sums=('92b2cb27a49786ca8d3994ea9e878f53533c75073bc8cc0de456a6f7475c2afa6c80d4a0d03f57ff69443492b2b18f86f658b6705f19ab1b3b6a9b81b9d65f60'
-        'fb14ea017d62647acd111e0c834ff1357a55e6b0c4692f0e372f969024f004af806cae99b5311a2d1c7975e88e0049c6ebb92fa6f0532df0b06d893d564daf80'
-        '754c712cc81cf4c63f6aae586386a21c50fa30e8730de62d3e73e0cdf000dd7bf1abcf54371036e22568f390b6a0b559d1064dae244f1e4b2cf9bd3def90c149')
+b2sums=('70eb2ac2f937c7094e7a458eee917bbe04b5f10fa46cd279d968b2519f9a82533923ba4776746d973872f8446d8d4beb6849c0ea7f7498f66008111cd8e1ec19'
+        '0fa53a8afb3e842cfce314cbc580c3e2a89441f8b1155307df164ca50028e88d30212a29d847c40026105fb4a735e19863ed07fca8aeb86f51d3a8f096d8860a')
 
 build() {
   cd "${pkgbase}-${pkgver}"
@@ -27,7 +25,8 @@ package() {
   install -Dm755 "${srcdir}/${pkgbase}-${pkgver}/target/release/${pkgname}" \
     "${pkgdir}/usr/bin/${pkgname}"
   # conf
-  install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/etc/${pkgname}.conf"
+  install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/${pkgname}.toml.example" \
+    "${pkgdir}/etc/${pkgname}.toml"
   # service
   install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 }
diff --git a/rockpass.conf b/rockpass.conf
deleted file mode 100644
index b70f68313378..000000000000
--- a/rockpass.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# SQLite database path (must be writable for lesspassgo user)
-ROCKET_DATABASES='{rockpass = { url = "/var/lib/rockpass/rockpass.sqlite" }}'
-
-# Listen host (default: "0.0.0.0")
-#ROCKET_ADDRESS=127.0.0.1
-
-# Listen port (default: 8000)
-#ROCKET_PORT=8000
-
-# Disable the possibility of create new accounts (default: true)
-#ROCKET_REGISTRATION_ENABLED=false
-
-# Set the life time of access token in seconds (default: 3600, 1 hour)
-#ROCKET_ACCESS_TOKEN_LIFETIME=3600
-
-# Set the life time of refresh token in seconds (default: 2592000, 30 days)
-#ROCKET_REFRESH_TOKEN_LIFETIME=2592000
-
-# Log level (default: critical)
-#ROCKET_LOG_LEVEL=normal
diff --git a/rockpass.service b/rockpass.service
index 22454d8ab4d6..1526a6039c7a 100644
--- a/rockpass.service
+++ b/rockpass.service
@@ -8,7 +8,6 @@ After=network-online.target
 Type=simple
 DynamicUser=yes
 StateDirectory=rockpass
-EnvironmentFile=/etc/rockpass.conf
 ExecStart=/usr/bin/rockpass
 
 [Install]