Update to latest version

* cros-sftp deprecated
* symlink /usr/lib/openssh/sftp-server -> /usr/lib/ssh/sftp-server for
  cros-garcon

3 files changed, 4 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14bb6c5e7410..d11779292b22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cros-container-guest-tools-git
 	pkgdesc = Linux guest tools for the Crostini containers on ChromeOS
-	pkgver = r334.d0714026
+	pkgver = r394.bb2552b1
 	pkgrel = 1
 	url = https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools
 	install = cros-container-guest-tools.install
@@ -19,7 +19,6 @@ pkgbase = cros-container-guest-tools-git
 	depends = xorg-xsetroot
 	depends = mailcap
 	source = git+https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools
-	source = cros-sftp-conditions.conf
 	source = cros-garcon-conditions.conf
 	source = cros-locale.sh
 	source = cros-garcon.hook
@@ -28,7 +27,6 @@ pkgbase = cros-container-guest-tools-git
 	source = cros-resolved.conf
 	source = mimeapps.list
 	sha1sums = SKIP
-	sha1sums = 0827ce6d673949a995be2d69d4974ddd9bdf16f1
 	sha1sums = d326cd35dcf150f9f9c8c7d6336425ec08ad2433
 	sha1sums = 8586cf72dacdcca82022519467065f70fe4a3294
 	sha1sums = 9a68893cadf9190e99cadc4c781ba43e45104b1e
diff --git a/PKGBUILD b/PKGBUILD
index f88352df0f05..8cd07977e68c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=cros-container-guest-tools
 pkgname=${_pkgname}-git
-pkgver=r334.d0714026
+pkgver=r394.bb2552b1
 pkgrel=1
 pkgdesc="Linux guest tools for the Crostini containers on ChromeOS"
 arch=('any')
@@ -12,7 +12,6 @@ makedepends=('git')
 install=cros-container-guest-tools.install
 url="https://chromium.googlesource.com/chromiumos/containers/cros-container-guest-tools"
 source=("git+${url}"
-        'cros-sftp-conditions.conf'
         'cros-garcon-conditions.conf'
         'cros-locale.sh'
         'cros-garcon.hook'
@@ -21,7 +20,6 @@ source=("git+${url}"
         'cros-resolved.conf'
         'mimeapps.list')
 sha1sums=('SKIP'
-          '0827ce6d673949a995be2d69d4974ddd9bdf16f1'
           'd326cd35dcf150f9f9c8c7d6336425ec08ad2433'
           '8586cf72dacdcca82022519467065f70fe4a3294'
           '9a68893cadf9190e99cadc4c781ba43e45104b1e'
@@ -73,6 +71,8 @@ package() {
 	install -m644 -D ${srcdir}/cros-garcon-conditions.conf ${pkgdir}/usr/lib/systemd/user/cros-garcon.service.d/cros-garcon-conditions.conf
 	install -m644 -D ${srcdir}/cros-garcon.hook ${pkgdir}/usr/share/libalpm/hooks/cros-garcon.hook
 	ln -sf ../cros-garcon.service ${pkgdir}/usr/lib/systemd/user/default.target.wants/cros-garcon.service
+	mkdir -p ${pkgdir}/usr/lib/openssh/
+	ln -s /usr/lib/ssh/sftp-server ${pkgdir}/usr/lib/openssh/
 
 	### cros-gpu-alpha -> not applicable
 	### cros-gpu-buster -> not applicable
@@ -95,13 +95,6 @@ package() {
 	install -m644 -D ${srcdir}/${_pkgname}/cros-pulse-config/daemon.conf ${pkgdir}/etc/skel/.config/pulse/daemon.conf
 	install -m644 -D ${srcdir}/${_pkgname}/cros-pulse-config/default.pa ${pkgdir}/etc/skel/.config/pulse/default.pa
 
-	### cros-sftp
-
-	install -m644 -D ${srcdir}/${_pkgname}/cros-sftp/cros-sftp.service ${pkgdir}/usr/lib/systemd/system/cros-sftp.service
-	ln -sf ../cros-sftp.service ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants/cros-sftp.service
-	# add drop-in for cros-sftp to check if required ssh artifacts were bind-mounted before starting
-	install -m644 -D ${srcdir}/cros-sftp-conditions.conf ${pkgdir}/usr/lib/systemd/system/cros-sftp.service.d/cros-sftp-conditions.conf
-
 	### cros-sommelier
 
 	install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier/sommelierrc ${pkgdir}/etc/sommelierrc
diff --git a/cros-sftp-conditions.conf b/cros-sftp-conditions.conf
deleted file mode 100644
index e69d1519fe8c..000000000000
--- a/cros-sftp-conditions.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-After=network-online.target
-Wants=network-online.target
-ConditionPathExists=/dev/.ssh/ssh_host_key
-ConditionPathExists=/dev/.ssh/ssh_authorized_keys
-
-[Service]
-# Overrides debian-specific sshd behavior with Type=notify
-Type=simple