Date: Wednesday, March 7, 2018 @ 07:14:49
Author: felixonmars
Revision: 303477
archrelease: copy trunk to community-testing-x86_64
Added:
deepin-daemon/repos/community-testing-x86_64/
deepin-daemon/repos/community-testing-x86_64/PKGBUILD
(from rev 303476, deepin-daemon/trunk/PKGBUILD)
deepin-daemon/repos/community-testing-x86_64/deepin-daemon.install
(from rev 303476, deepin-daemon/trunk/deepin-daemon.install)
deepin-daemon/repos/community-testing-x86_64/deepin-daemon.sysusers
(from rev 303476, deepin-daemon/trunk/deepin-daemon.sysusers)
deepin-daemon/repos/community-testing-x86_64/fix-lockservice.patch
(from rev 303476, deepin-daemon/trunk/fix-lockservice.patch)
------------------------+
PKGBUILD | 65 +++++++++++++++++++++++++++++++++++++++++
deepin-daemon.install | 3 +
deepin-daemon.sysusers | 2 +
fix-lockservice.patch | 73 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 143 insertions(+)
Copied: deepin-daemon/repos/community-testing-x86_64/PKGBUILD (from rev 303476,
deepin-daemon/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2018-03-07 07:14:49 UTC (rev 303477)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-daemon
+pkgver=3.2.10
+pkgrel=1
+pkgdesc='Daemon handling the DDE session settings'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/dde-daemon";
+license=('GPL3')
+depends=('deepin-desktop-schemas' 'gvfs' 'libcanberra-pulse' 'poppler-glib'
+ 'rfkill' 'bluez' 'deepin-notifications' 'iso-codes' 'lsb-release'
+ 'mobile-broadband-provider-info' 'deepin-polkit-agent' 'udisks2'
'upower'
+ 'libxkbfile' 'accountsservice' 'deepin-desktop-base' 'bamf'
'pulseaudio'
+ 'gnome-keyring' 'noto-fonts')
+makedepends=('deepin-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib'
'deepin-api' 'sqlite'
+ 'deepin-gettext-tools' 'git' 'mercurial' 'python-gobject'
'networkmanager' 'go-pie')
+optdepends=('networkmanager: for network management support'
+ 'deepin-grub2-themes: theme for grub module'
+ 'iw: for miracast module'
+ 'proxychains-ng: for proxy configuration module')
+conflicts=('dde-daemon')
+replaces=('dde-daemon')
+groups=('deepin')
+install="${pkgname}.install"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-daemon/archive/$pkgver.tar.gz";
+
https://raw.githubusercontent.com/jouyouyun/tap-gesture-patches/master/patches/dde-daemon_3.2.3.patch
+ 'deepin-daemon.sysusers')
+sha512sums=('621b6318ea7976be216fb4d16088264deadc2e00c48f2d6913768c54c4cdf4a3a5b2c9e0e04e4ce33b589151d8f991a621b9ec85c3eea077c520672548df4fa4'
+
'29874d6b316bb678b6656827e696d65eef174a53bb8226ed4c2d3bc89e42d5edb466df3c2ac647a1f2eb05d6e2a199b8d07dcaa9302b9227a0692fde0d50bb52'
+
'808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
+
+prepare() {
+ export GOPATH="$srcdir/build:/usr/share/gocode"
+
+ # https://github.com/niemeyer/gopkg/issues/50
+ git config --global http.https://gopkg.in.followRedirects true
+
+ go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil
github.com/linuxdeepin/go-x11-client \
+ github.com/mattn/go-sqlite3 gopkg.in/alecthomas/kingpin.v2
github.com/disintegration/imaging \
+ github.com/BurntSushi/freetype-go/freetype
github.com/BurntSushi/freetype-go/freetype/truetype \
+ github.com/BurntSushi/graphics-go/graphics
github.com/fsnotify/fsnotify golang.org/x/sys/unix \
+ 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
+}
+
+build() {
+ cd dde-daemon-$pkgver
+ make -C network/nm_generator gen-nm-code
+ make
+}
+
+package() {
+ cd dde-daemon-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 ../deepin-daemon.sysusers
"$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf"
+}
Copied: deepin-daemon/repos/community-testing-x86_64/deepin-daemon.install
(from rev 303476, deepin-daemon/trunk/deepin-daemon.install)
===================================================================
--- community-testing-x86_64/deepin-daemon.install
(rev 0)
+++ community-testing-x86_64/deepin-daemon.install 2018-03-07 07:14:49 UTC
(rev 303477)
@@ -0,0 +1,3 @@
+post_remove() {
+ rm -f /var/cache/deepin/mark-setup-network-services
+}
Copied: deepin-daemon/repos/community-testing-x86_64/deepin-daemon.sysusers
(from rev 303476, deepin-daemon/trunk/deepin-daemon.sysusers)
===================================================================
--- community-testing-x86_64/deepin-daemon.sysusers
(rev 0)
+++ community-testing-x86_64/deepin-daemon.sysusers 2018-03-07 07:14:49 UTC
(rev 303477)
@@ -0,0 +1,2 @@
+u deepin-daemon - "Deepin Daemon"
+g deepin-daemon -
Copied: deepin-daemon/repos/community-testing-x86_64/fix-lockservice.patch
(from rev 303476, deepin-daemon/trunk/fix-lockservice.patch)
===================================================================
--- community-testing-x86_64/fix-lockservice.patch
(rev 0)
+++ community-testing-x86_64/fix-lockservice.patch 2018-03-07 07:14:49 UTC
(rev 303477)
@@ -0,0 +1,73 @@
+From b5c7466e498c341d33410dca3d4d84f83ad53ec9 Mon Sep 17 00:00:00 2001
+From: jouyouyun <jouyouwen...@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)
+ }
