upgpkg: 4.23-1

2 files changed, 16 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f8d6d4deaa31..6c00638b2010 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributer: nightuser <nightuser.android at gmail.com>
 
 pkgname=lxd
-pkgver=4.22
+pkgver=4.23
 pkgrel=1
 pkgdesc="Daemon based on liblxc offering a REST API to manage containers"
 arch=('x86_64')
@@ -30,19 +30,16 @@ source=("https://linuxcontainers.org/downloads/${pkgname}/${pkgname}-${pkgver}.t
         "lxd.service"
         "lxd.sysusers")
 validpgpkeys=('602F567663E593BCBD14F338C638974D64792D67')
-sha256sums=('0977e4b8ae854278194b15f3dc6472d217b9619a024d03f60e95393352212385'
+sha256sums=('6cfcc7f4c462ae09776ffc24918211844bebcafcbfe4cd98f4b2cfa83e082fc5'
             'SKIP'
-            '3a14638f8d0f9082c7214502421350e3b028db1e7f22e8c3fd35a2b1d9153ef4'
+            'b89a725223ef72b25eab25184084d069af312f8c23612c57fdb75427a510232e'
             '102d1d54186e0fc606a58f030231d76df6bd662b16dfd8f946e1f48e2b473b54'
             'd0184d9c4bb485e3aad0d4ac25ea7e85ac0f7ed6ddc96333e74fcd393a5b5ec4')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  # create directory for build output
   mkdir bin
-
-  # verify modules
   go mod verify
 }
 
@@ -52,9 +49,9 @@ build() {
   export GOFLAGS="-buildmode=pie -trimpath"
   export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
 
-	go build -v -tags "netgo" -o bin/ ./lxd-p2c/...
-	CGO_LDFLAGS="$CGO_LDFLAGS -static" go build -v -tags "agent" -o bin/ ./lxd-agent/...
-  for tool in fuidshift lxc lxc-to-lxd lxd lxd-benchmark; do
+  go build -v -tags "netgo" -o bin/ ./lxd-migrate/...
+  CGO_LDFLAGS="$CGO_LDFLAGS -static" go build -v -tags "agent" -o bin/ ./lxd-agent/...
+  for tool in fuidshift lxc lxc-to-lxd lxd lxd-benchmark lxd-user; do
     go build -v -tags "libsqlite3" -o bin/ ./$tool/...
   done
 }
@@ -62,26 +59,27 @@ build() {
 package() {
   cd "$pkgname-$pkgver"
 
-  for tool in fuidshift lxc lxc-to-lxd lxd lxd-agent lxd-benchmark lxd-p2c; do
-    install -p -Dm755 "bin/$tool" "${pkgdir}/usr/bin/$tool"
+  for tool in fuidshift lxc lxc-to-lxd lxd lxd-agent lxd-benchmark lxd-migrate lxd-user; do
+    install -v -p -Dm755 "bin/$tool" "${pkgdir}/usr/bin/$tool"
   done
 
   # Package license
-  install -Dm644 "COPYING"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
+  install -v -Dm644 "COPYING"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
 
   # systemd files
-  install -Dm644 "${srcdir}/"lxd.{service,socket} -t "${pkgdir}/usr/lib/systemd/system"
-  install -Dm644 "${srcdir}/$pkgname.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
+  install -v -Dm644 "${srcdir}/"lxd.{service,socket} -t "${pkgdir}/usr/lib/systemd/system"
+  install -v -Dm644 "${srcdir}/$pkgname.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
 
   # logs
-  install -dm700 "${pkgdir}/var/log/lxd"
+  install -v -dm700 "${pkgdir}/var/log/lxd"
 
   # documentation
-  install -d "${pkgdir}/usr/share/doc/lxd"
+  install -d "${pkgdir}/usr/share/doc/lxd/html"
+  rm -rf doc/html
   install -p -Dm644 "doc/"* "${pkgdir}/usr/share/doc/lxd/"
 
   # Bash completions
-  install -p -Dm644 "scripts/bash/lxd-client" "${pkgdir}/usr/share/bash-completion/completions/lxd"
+  install -v -p -Dm644 "scripts/bash/lxd-client" "${pkgdir}/usr/share/bash-completion/completions/lxd"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/lxd.socket b/lxd.socket
index ecf305f2ceee..4ec3cede3a37 100644
--- a/lxd.socket
+++ b/lxd.socket
@@ -1,5 +1,6 @@
 [Unit]
 Description=LXD - unix socket
+Documentation=man:lxd(1)
 
 [Socket]
 ListenStream=/var/lib/lxd/unix.socket