[arch-commits] Commit in deepin-daemon/trunk (PKGBUILD fix-lockservice.patch)

[Felix Yan]

    Date: Wednesday, March 7, 2018 @ 07:27:53
  Author: felixonmars
Revision: 303484

upgpkg: deepin-daemon 3.2.10-2

fix installation path

Modified:
  deepin-daemon/trunk/PKGBUILD
Deleted:
  deepin-daemon/trunk/fix-lockservice.patch

-----------------------+
 PKGBUILD              |   13 +++++---
 fix-lockservice.patch |   73 ------------------------------------------------
 2 files changed, 8 insertions(+), 78 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-07 07:26:06 UTC (rev 303483)
+++ PKGBUILD	2018-03-07 07:27:53 UTC (rev 303484)
@@ -5,7 +5,7 @@
 
 pkgname=deepin-daemon
 pkgver=3.2.10
-pkgrel=1
+pkgrel=2
 pkgdesc='Daemon handling the DDE session settings'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-daemon"
@@ -33,6 +33,9 @@
             '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
 
 prepare() {
+  cd dde-daemon-$pkgver
+  patch -p1 -i ../dde-daemon_3.2.3.patch
+
   export GOPATH="$srcdir/build:/usr/share/gocode"
 
   # https://github.com/niemeyer/gopkg/issues/50
@@ -45,10 +48,7 @@
          gopkg.in/yaml.v2 github.com/axgle/mahonia github.com/msteinert/pam github.com/nfnt/resize \
          golang.org/x/text/encoding/charmap github.com/cryptix/wav
 
-  sed -i 's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#' dde-daemon-$pkgver/accounts/user.go
-
-  cd dde-daemon-$pkgver
-  patch -p1 -i ../dde-daemon_3.2.3.patch
+  sed -i 's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#' accounts/user.go
 }
 
 build() {
@@ -61,5 +61,8 @@
   cd dde-daemon-$pkgver
   make DESTDIR="$pkgdir" install
 
+  mv "$pkgdir"{,/usr}/lib/systemd
+  rmdir "$pkgdir"/lib
+
   install -Dm644 ../deepin-daemon.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf"
 }

Deleted: fix-lockservice.patch
===================================================================
--- fix-lockservice.patch	2018-03-07 07:26:06 UTC (rev 303483)
+++ fix-lockservice.patch	2018-03-07 07:27:53 UTC (rev 303484)
@@ -1,73 +0,0 @@
-From b5c7466e498c341d33410dca3d4d84f83ad53ec9 Mon Sep 17 00:00:00 2001
-From: jouyouyun <jouyouwen717 at gmail.com>
-Date: Tue, 27 Feb 2018 15:13:07 +0800
-Subject: [PATCH] fix(lockservice): fix event crash after the frequent unlocking
-
-Change-Id: Ib045d91eb1c3c89bcc2bf6c8716aebc14fbcd271
----
-
-diff --git a/bin/dde-lockservice/manager.go b/bin/dde-lockservice/manager.go
-index dfa4167..ba60787 100644
---- a/bin/dde-lockservice/manager.go
-+++ b/bin/dde-lockservice/manager.go
-@@ -164,6 +164,7 @@
- 	id := getId(pid, username)
- 	_, ok := m.authUserTable[id]
- 	if ok {
-+		log.Println("In authenticating:", id)
- 		m.authLocker.Unlock()
- 		return nil
- 	}
-@@ -216,6 +217,12 @@
- 		// 	// TODO: read data from input
- 		// 	return "", nil
- 		case pam.PromptEchoOff, pam.PromptEchoOn:
-+			if password != "" {
-+				tmp := password
-+				password = ""
-+				return tmp, nil
-+			}
-+
- 			if msg != "" {
- 				if style == pam.PromptEchoOff {
- 					log.Println("Echo off:", msg)
-@@ -224,12 +231,6 @@
- 					log.Println("Echo on:", msg)
- 					m.sendEvent(PromptQuestion, pid, username, msg)
- 				}
--			}
--
--			if password != "" {
--				tmp := password
--				password = ""
--				return tmp, nil
- 			}
- 
- 			id := getId(pid, username)
-@@ -241,7 +242,17 @@
- 			}
- 			log.Println("Join select:", id)
- 			select {
--			case tmp := <-v:
-+			case tmp, ok := <-v:
-+				if !ok {
-+					log.Println("Invalid select channel")
-+					return "", nil
-+				}
-+
-+				m.authLocker.Lock()
-+				delete(m.authUserTable, id)
-+				m.authLocker.Unlock()
-+				close(v)
-+				v = nil
- 				return tmp, nil
- 			}
- 		case pam.ErrorMsg:
-@@ -273,6 +284,7 @@
- 	if ok {
- 		if v != nil {
- 			close(v)
-+			v = nil
- 		}
- 		delete(m.authUserTable, id)
- 	}