Unity

Merge lp:~azzar1/unity/fix-lp-1305440 into lp:unity

  1. fix-lp-1305440
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3859
Proposed branch: lp:~azzar1/unity/fix-lp-1305440
Merge into: lp:unity
Prerequisite: lp:~3v1n0/unity/handle-gtk3.12-deprecations
Diff against target: 69 lines (+8/-3)
7 files modified
CMakeLists.txt (+1/-0)
data/CMakeLists.txt (+1/-0)
data/pam/CMakeLists.txt (+1/-0)
data/pam/unity (+2/-0)
debian/rules (+1/-1)
debian/unity.install (+1/-0)
lockscreen/UserAuthenticatorPam.cpp (+1/-2)
To merge this branch: bzr merge lp:~azzar1/unity/fix-lp-1305440
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+223746@code.launchpad.net

This proposal supersedes a proposal from 2014-05-27.

Commit message

Allow a distinct pam config file for greeter and for lock-screen.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote : Posted in a previous version of this proposal

Fine enough!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3811
http://jenkins.qa.ubuntu.com/job/unity-ci/933/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/20/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/933/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote : Posted in a previous version of this proposal

Please fix the packaging (see the Jenkins build failures)

review: Needs Fixing
Revision history for this message
Andrea Azzarone (azzar1) wrote : Posted in a previous version of this proposal

I cannot see the failure anymore!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3812
http://jenkins.qa.ubuntu.com/job/unity-ci/970/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/57/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/970/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote : Posted in a previous version of this proposal

The only errors I see here are related to jenkins failure due to deprecated gtk functions, that is fixed in lp:~3v1n0/unity/handle-gtk3.12-deprecations

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3813
http://jenkins.qa.ubuntu.com/job/unity-ci/976/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/63/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/976/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3814
http://jenkins.qa.ubuntu.com/job/unity-ci/977/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/64/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/977/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3815
http://jenkins.qa.ubuntu.com/job/unity-ci/978/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/65/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/978/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3816
http://jenkins.qa.ubuntu.com/job/unity-ci/979/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/66/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/979/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3817
http://jenkins.qa.ubuntu.com/job/unity-ci/980/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/67/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/980/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3818
http://jenkins.qa.ubuntu.com/job/unity-ci/981/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/68/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/981/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3819
http://jenkins.qa.ubuntu.com/job/unity-ci/982/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/69/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/982/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3819
http://jenkins.qa.ubuntu.com/job/unity-ci/987/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/74/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/987/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

Need to add -DCMAKE_SYSCONFDIR=/etc to cmake_base_options in debian/rules.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3820
http://jenkins.qa.ubuntu.com/job/unity-ci/1036/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/123

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1036/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Done!

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Yay!

I guess there's not need to add dependency on libpam-gnome-keyring as ubuntu-desktop depends on it already.

review: Approve
Revision history for this message
Stephen M. Webb (bregma) wrote :

Scheduled for the next landing.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-06-18 13:07:37 +0000
3+++ CMakeLists.txt 2014-07-29 15:32:00 +0000
4@@ -259,6 +259,7 @@
5 add_subdirectory(unity-shared)
6 add_subdirectory(dash)
7 add_subdirectory(launcher)
8+add_subdirectory(data)
9 if (ENABLE_X_SUPPORT)
10 add_subdirectory(hud)
11 add_subdirectory(lockscreen)
12
13=== added directory 'data'
14=== added file 'data/CMakeLists.txt'
15--- data/CMakeLists.txt 1970-01-01 00:00:00 +0000
16+++ data/CMakeLists.txt 2014-07-29 15:32:00 +0000
17@@ -0,0 +1,1 @@
18+add_subdirectory(pam)
19\ No newline at end of file
20
21=== added directory 'data/pam'
22=== added file 'data/pam/CMakeLists.txt'
23--- data/pam/CMakeLists.txt 1970-01-01 00:00:00 +0000
24+++ data/pam/CMakeLists.txt 2014-07-29 15:32:00 +0000
25@@ -0,0 +1,1 @@
26+install(FILES unity DESTINATION ${CMAKE_SYSCONFDIR}/pam.d)
27\ No newline at end of file
28
29=== added file 'data/pam/unity'
30--- data/pam/unity 1970-01-01 00:00:00 +0000
31+++ data/pam/unity 2014-07-29 15:32:00 +0000
32@@ -0,0 +1,2 @@
33+@include common-auth
34+auth optional pam_gnome_keyring.so
35
36=== modified file 'debian/rules'
37--- debian/rules 2014-05-12 18:04:20 +0000
38+++ debian/rules 2014-07-29 15:32:00 +0000
39@@ -23,7 +23,7 @@
40
41 SCOPES_RECOMMENDS := $(shell perl debian/scopes-recommends-generator /usr/share/unity/client-scopes.json)
42
43-cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
44+cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCMAKE_SYSCONFDIR=/etc -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
45 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
46 cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
47 endif
48
49=== modified file 'debian/unity.install'
50--- debian/unity.install 2011-09-15 16:42:23 +0000
51+++ debian/unity.install 2014-07-29 15:32:00 +0000
52@@ -1,3 +1,4 @@
53+etc/pam.d
54 usr/bin
55 usr/lib/compiz
56 usr/share/man/*/unity.1
57
58=== modified file 'lockscreen/UserAuthenticatorPam.cpp'
59--- lockscreen/UserAuthenticatorPam.cpp 2014-03-24 00:16:06 +0000
60+++ lockscreen/UserAuthenticatorPam.cpp 2014-07-29 15:32:00 +0000
61@@ -70,8 +70,7 @@
62 conversation.conv = ConversationFunction;
63 conversation.appdata_ptr = static_cast<void*>(this);
64
65- // FIXME (andy) We should install our own unityshell pam file.
66- return pam_start("lightdm", username_.c_str(),
67+ return pam_start("unity", username_.c_str(),
68 &conversation, &pam_handle_) == PAM_SUCCESS;
69 }
70