Djam/calamares
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/calamares.git synced 2025-02-23 15:42:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update 0003-do-not-set-default-users-group-on-home patch to fix build

Browse source
This commit is contained in:
Andrey Bondrov 2015-11-28 03:19:42 +10:00
parent f97b5a3dc6
commit 139a9de917
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
0003-do-not-set-default-users-group-on-home.patch
View file

@ -12,14 +12,15 @@ might be able to access private data on home dirs of other users.
src/modules/users/CreateUserJob.cpp | 4 +---
src/modules/users/CreateUserJob.h | 2 --
src/modules/users/UsersPage.cpp | 3 +--
src/modules/users/UsersPage.h | 3 +--
src/modules/users/UsersViewStep.cpp | 10 +---------
src/modules/users/UsersViewStep.h | 1 -
src/modules/users/users.conf | 2 +-
6 files changed, 4 insertions(+), 18 deletions(-)
diff -urN calamares-1.1.4.2/src/modules/users/CreateUserJob.cpp calamares-1.1.4.2-patched/src/modules/users/CreateUserJob.cpp
--- calamares-1.1.4.2/src/modules/users/CreateUserJob.cpp 2015-11-28 01:58:05.524593939 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/CreateUserJob.cpp 2015-11-28 01:58:31.115595103 +1000
--- calamares-1.1.4.2/src/modules/users/CreateUserJob.cpp 2015-11-28 03:10:09.288790701 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/CreateUserJob.cpp 2015-11-28 03:11:11.054793512 +1000
@@ -33,13 +33,11 @@
CreateUserJob::CreateUserJob( const QString& userName,
const QString& fullName,
@ -45,7 +46,7 @@ diff -urN calamares-1.1.4.2/src/modules/users/CreateUserJob.cpp calamares-1.1.4.
return Calamares::JobResult::error( tr( "Cannot set home directory ownership for user %1." )
diff -urN calamares-1.1.4.2/src/modules/users/CreateUserJob.h calamares-1.1.4.2-patched/src/modules/users/CreateUserJob.h
--- calamares-1.1.4.2/src/modules/users/CreateUserJob.h 2015-08-06 19:58:32.000000000 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/CreateUserJob.h 2015-11-28 01:58:31.116595103 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/CreateUserJob.h 2015-11-28 03:11:11.054793512 +1000
@@ -30,7 +30,6 @@
CreateUserJob( const QString& userName,
const QString& fullName,
@ -64,7 +65,7 @@ diff -urN calamares-1.1.4.2/src/modules/users/CreateUserJob.h calamares-1.1.4.2-
diff -urN calamares-1.1.4.2/src/modules/users/users.conf calamares-1.1.4.2-patched/src/modules/users/users.conf
--- calamares-1.1.4.2/src/modules/users/users.conf 2015-08-19 20:52:13.000000000 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/users.conf 2015-11-28 01:58:31.116595103 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/users.conf 2015-11-28 03:11:11.054793512 +1000
@@ -1,6 +1,6 @@
---
-userGroup: users
@ -74,8 +75,8 @@ diff -urN calamares-1.1.4.2/src/modules/users/users.conf calamares-1.1.4.2-patch
- video
- network
diff -urN calamares-1.1.4.2/src/modules/users/UsersPage.cpp calamares-1.1.4.2-patched/src/modules/users/UsersPage.cpp
--- calamares-1.1.4.2/src/modules/users/UsersPage.cpp 2015-11-28 01:58:05.523593939 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/UsersPage.cpp 2015-11-28 01:58:31.116595103 +1000
--- calamares-1.1.4.2/src/modules/users/UsersPage.cpp 2015-11-28 03:10:09.287790701 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/UsersPage.cpp 2015-11-28 03:11:11.055793512 +1000
@@ -94,7 +94,7 @@
@ -93,9 +94,22 @@ diff -urN calamares-1.1.4.2/src/modules/users/UsersPage.cpp calamares-1.1.4.2-pa
defaultGroupsList );
list.append( Calamares::job_ptr( j ) );
diff -urN calamares-1.1.4.2/src/modules/users/UsersPage.h calamares-1.1.4.2-patched/src/modules/users/UsersPage.h
--- calamares-1.1.4.2/src/modules/users/UsersPage.h 2015-08-19 20:52:13.000000000 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/UsersPage.h 2015-11-28 03:11:46.435795122 +1000
@@ -40,8 +40,7 @@
bool isReady();
- QList< Calamares::job_ptr > createJobs( const QString& defaultUserGroup,
- const QStringList& defaultGroupsList );
+ QList< Calamares::job_ptr > createJobs( const QStringList& defaultGroupsList );
void onActivate();
diff -urN calamares-1.1.4.2/src/modules/users/UsersViewStep.cpp calamares-1.1.4.2-patched/src/modules/users/UsersViewStep.cpp
--- calamares-1.1.4.2/src/modules/users/UsersViewStep.cpp 2015-10-01 01:24:47.000000000 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/UsersViewStep.cpp 2015-11-28 01:58:31.117595103 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/UsersViewStep.cpp 2015-11-28 03:11:11.055793512 +1000
@@ -113,21 +113,13 @@
{
m_jobs.clear();
@ -121,7 +135,7 @@ diff -urN calamares-1.1.4.2/src/modules/users/UsersViewStep.cpp calamares-1.1.4.
{
diff -urN calamares-1.1.4.2/src/modules/users/UsersViewStep.h calamares-1.1.4.2-patched/src/modules/users/UsersViewStep.h
--- calamares-1.1.4.2/src/modules/users/UsersViewStep.h 2015-10-01 01:24:47.000000000 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/UsersViewStep.h 2015-11-28 01:58:31.117595103 +1000
+++ calamares-1.1.4.2-patched/src/modules/users/UsersViewStep.h 2015-11-28 03:11:11.055793512 +1000
@@ -63,7 +63,6 @@
UsersPage* m_widget;
QList< Calamares::job_ptr > m_jobs;