[debian-edu-commits] debian-edu/pkg-team/ 02/04: debian/patches: Include patches provided by Christian Schwarmborn (THANKS).
Mike Gabriel
sunweaver at debian.org
Thu Mar 1 16:17:15 UTC 2018
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository gosa.
commit 6d083ab6eaa721cd322ee492c05f29c5731fd8a1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Mar 1 16:54:34 2018 +0100
debian/patches: Include patches provided by Christian Schwarmborn (THANKS).
debian/patches/1032_fix_select_acl_role.patch
debian/patches/1033_fix_unable_to_delete_acl_asignment.patch
debian/patches/1034_remove_superfluous__get_post__call_from__save_object.patch
debian/patches/1035_acl_override_to_allow_delete_of_group_members.patch
debian/patches/1036_remove_double_groupList_setEditable_setting.patch
debian/patches/1037_fix_shadowexpire_checkbox_from_tmplate_setting.patch
debian/patches/1038_shadowexpire_in_one_line.patch
debian/patches/1039_fix_sambakickofftime_checkbox_and_sambakickofftime_date_from_tmplate_setting.patch
---
debian/patches/1032_fix_select_acl_role.patch | 14 +++++
.../1033_fix_unable_to_delete_acl_asignment.patch | 13 +++++
...rfluous__get_post__call_from__save_object.patch | 16 ++++++
...override_to_allow_delete_of_group_members.patch | 18 ++++++
...move_double_groupList_setEditable_setting.patch | 13 +++++
...hadowexpire_checkbox_from_tmplate_setting.patch | 15 +++++
debian/patches/1038_shadowexpire_in_one_line.patch | 18 ++++++
...ambakickofftime_date_from_tmplate_setting.patch | 64 ++++++++++++++++++++++
debian/patches/series | 8 +++
9 files changed, 179 insertions(+)
diff --git a/debian/patches/1032_fix_select_acl_role.patch b/debian/patches/1032_fix_select_acl_role.patch
new file mode 100644
index 0000000..9186a7d
--- /dev/null
+++ b/debian/patches/1032_fix_select_acl_role.patch
@@ -0,0 +1,14 @@
+Description: Use ACL from role definition: Select the correct role.
+Author: Christian Schwamborn <cs at imap.architektur.tu-darmstadt.de>
+
+--- gosa-2.7.4+reloaded2.a/gosa-core/include/class_acl.inc 2017-10-17 15:59:31.000000000 +0000
++++ gosa-2.7.4+reloaded2.b/gosa-core/include/class_acl.inc 2018-01-23 07:46:01.234550732 +0000
+@@ -423,7 +423,7 @@
+ if(isset($_POST['selected_role']) && $_POST['aclType'] == 'role'){
+ $this->aclContents = "";
+ $this->aclContents = base64_decode(get_post('selected_role'));
+- }else{
++ } elseif (isset($_POST['cancel_new_acl'])) {
+ if(is_string($this->aclContents))
+ $this->aclContents = array();
+ }
diff --git a/debian/patches/1033_fix_unable_to_delete_acl_asignment.patch b/debian/patches/1033_fix_unable_to_delete_acl_asignment.patch
new file mode 100644
index 0000000..6a9a450
--- /dev/null
+++ b/debian/patches/1033_fix_unable_to_delete_acl_asignment.patch
@@ -0,0 +1,13 @@
+Description: Fix removing ACLs from objects (e.g. groups)
+Author: Christian Schwamborn <cs at imap.architektur.tu-darmstadt.de>
+
+--- gosa-2.7.4+reloaded2.a/gosa-core/include/class_acl.inc 2017-10-17 15:59:31.000000000 +0000
++++ gosa-2.7.4+reloaded2.b/gosa-core/include/class_acl.inc 2018-01-23 07:48:34.985241374 +0000
+@@ -285,6 +285,7 @@
+ if(!$this->list){
+ $this->list = new sortableListing($this->gosaAclEntry,array(),TRUE);
+ $this->list->setDeleteable(true);
++ $this->list->setInstantDelete(true);
+ $this->list->setEditable(true);
+ $this->list->setColspecs(array('*'));
+ $this->list->setWidth("100%");
diff --git a/debian/patches/1034_remove_superfluous__get_post__call_from__save_object.patch b/debian/patches/1034_remove_superfluous__get_post__call_from__save_object.patch
new file mode 100644
index 0000000..27e8407
--- /dev/null
+++ b/debian/patches/1034_remove_superfluous__get_post__call_from__save_object.patch
@@ -0,0 +1,16 @@
+Description: class_sortableListing: Remove superfluous get_post() call from_ save_object()
+Author: Christian Schwamborn <cs at imap.architektur.tu-darmstadt.de>
+
+--- gosa-2.7.4+reloaded2.a/gosa-core/include/class_sortableListing.inc 2017-10-17 15:59:31.000000000 +0000
++++ gosa-2.7.4+reloaded2.b/gosa-core/include/class_sortableListing.inc 2018-01-23 07:50:54.616057235 +0000
+@@ -425,10 +425,8 @@
+ $this->action = "";
+ if (strpos($this->acl, 'd') !== false){
+ foreach ($_POST as $key => $value) {
+- $value = get_post($key);
+ if (preg_match('/^del_'.$this->id.'_([0-9]+)$/', $key, $matches)) {
+
+-
+ if(!isset($this->mapping[$matches[1]])) return;
+
+ $this->active_index= $this->mapping[$matches[1]];
diff --git a/debian/patches/1035_acl_override_to_allow_delete_of_group_members.patch b/debian/patches/1035_acl_override_to_allow_delete_of_group_members.patch
new file mode 100644
index 0000000..bb42ea3
--- /dev/null
+++ b/debian/patches/1035_acl_override_to_allow_delete_of_group_members.patch
@@ -0,0 +1,18 @@
+Description: Support member removal from groups, if someone has the right to edit the group.
+Author: Christian Schwamborn <cs at imap.architektur.tu-darmstadt.de>
+
+--- gosa-2.7.4+reloaded2.a/gosa-core/plugins/admin/groups/class_group.inc 2017-10-17 15:59:31.000000000 +0000
++++ gosa-2.7.4+reloaded2.b/gosa-core/plugins/admin/groups/class_group.inc 2018-01-23 07:54:13.150381395 +0000
+@@ -236,6 +236,12 @@
+
+ // Check if list is available, depends on multi- or sinlge- group editing.
+ if($this->$list){
++ // ensure we can delete group members if we have
++ // write permission to the memberUid attribute
++ $mu_acl = $this->getacl("memberUid");
++ if (preg_match("/w/",$mu_acl) && !preg_match("/d/",$mu_acl)) {
++ $this->$list->setAcl($mu_acl.'d');
++ }
+ $this->$list->save_object();
+ $action = $this->$list->getAction();
+ if($action['action'] == 'delete' && preg_match("/w/",$this->getacl("memberUid"))){
diff --git a/debian/patches/1036_remove_double_groupList_setEditable_setting.patch b/debian/patches/1036_remove_double_groupList_setEditable_setting.patch
new file mode 100644
index 0000000..3862bff
--- /dev/null
+++ b/debian/patches/1036_remove_double_groupList_setEditable_setting.patch
@@ -0,0 +1,13 @@
+Description: Remove duplicate setEditable() for POSIX group lists.
+Author: Christian Schwamborn <cs at imap.architektur.tu-darmstadt.de>
+
+--- gosa-2.7.4+reloaded2.a/gosa-core/plugins/personal/posix/class_posixAccount.inc 2018-01-23 07:58:31.308215370 +0000
++++ gosa-2.7.4+reloaded2.b/gosa-core/plugins/personal/posix/class_posixAccount.inc 2018-01-23 07:58:45.676095237 +0000
+@@ -254,7 +254,6 @@
+ $this->groupList->setEditable(false);
+ $this->groupList->setDeleteable(true);
+ $this->groupList->setInstantDelete(false);
+- $this->groupList->setEditable(false);
+ $this->groupList->setReorderable(false);
+ $this->groupList->setDefaultSortColumn(1);
+ $this->groupList->setHeight("150px");
diff --git a/debian/patches/1037_fix_shadowexpire_checkbox_from_tmplate_setting.patch b/debian/patches/1037_fix_shadowexpire_checkbox_from_tmplate_setting.patch
new file mode 100644
index 0000000..6951ada
--- /dev/null
+++ b/debian/patches/1037_fix_shadowexpire_checkbox_from_tmplate_setting.patch
@@ -0,0 +1,15 @@
+Description: Propagate shadow expiry from user templates to created user objects.
+Author: Christian Schwamborn <cs at imap.architektur.tu-darmstadt.de>
+
+--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
++++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
+@@ -1147,7 +1147,8 @@
+ }
+
+ /* Adjust shadow checkboxes */
+- foreach (array("shadowMin", "shadowMax", "shadowWarning", "shadowInactive") as $val){
++ foreach (array("shadowMin", "shadowMax", "shadowWarning", "shadowInactive",
++ "shadowExpire") as $val){
+ if ($this->$val != 0){
+ $oval= "activate_".$val;
+ $this->$oval= "1";
diff --git a/debian/patches/1038_shadowexpire_in_one_line.patch b/debian/patches/1038_shadowexpire_in_one_line.patch
new file mode 100644
index 0000000..b5ca410
--- /dev/null
+++ b/debian/patches/1038_shadowexpire_in_one_line.patch
@@ -0,0 +1,18 @@
+Description: Show shadow expiry (esp. the calendar icon) in one line on screen (html template adjustment).
+Author: Christian Schwamborn <cs at imap.architektur.tu-darmstadt.de>
+
+--- gosa-2.7.4+reloaded2.a/gosa-core/plugins/personal/posix/posix_shadow.tpl 2010-04-13 13:15:15.000000000 +0000
++++ gosa-2.7.4+reloaded2.b/gosa-core/plugins/personal/posix/posix_shadow.tpl 2018-02-12 13:36:07.283901219 +0000
+@@ -58,10 +58,10 @@
+
+ <table summary="{t}Password expiration settings{/t}" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+- <td>
++ <td style="vertical-align:middle">
+ {t}Password expires on{/t}
+ </td>
+- <td style='width:125px'>
++ <td style='width:200px'>
+
+ {render acl=$shadowExpireACL}
+ <input type="text" id="shadowExpire" name="shadowExpire" class="date" style='width:100px' value="{$shadowExpire}">
diff --git a/debian/patches/1039_fix_sambakickofftime_checkbox_and_sambakickofftime_date_from_tmplate_setting.patch b/debian/patches/1039_fix_sambakickofftime_checkbox_and_sambakickofftime_date_from_tmplate_setting.patch
new file mode 100644
index 0000000..9d3b32d
--- /dev/null
+++ b/debian/patches/1039_fix_sambakickofftime_checkbox_and_sambakickofftime_date_from_tmplate_setting.patch
@@ -0,0 +1,64 @@
+Description: Fix date calculations for sambaKickoffTime and propagation from template to created user object.
+Author: Christian Schwamborn <cs at imap.architektur.tu-darmstadt.de>
+
+--- gosa-2.7.4+reloaded2.a/samba/personal/samba/class_sambaAccount.inc 2017-10-17 15:59:31.000000000 +0000
++++ gosa-2.7.4+reloaded2.b/samba/personal/samba/class_sambaAccount.inc 2018-02-12 13:43:03.437594823 +0000
+@@ -144,9 +144,13 @@
+ $this->loadFlagsFromSource($this->attrs);
+
+ // Set kickOffTime to date
+- if(isset($this->attrs['sambaKickoffTime'][0])){
+- $this->sambaKickoffTime = date("d.m.Y", $this->sambaKickoffTime);
+- $this->flag_sambaKickoffTime = TRUE;
++ if (isset($this->attrs['sambaKickoffTime'][0])){
++ if ($this->sambaKickoffTime == 2147483647){
++ $this->sambaKickoffTime = "";
++ } elseif (!$this->sambaKickoffTime == ""){
++ $this->sambaKickoffTime = date("d.m.Y", $this->sambaKickoffTime);
++ $this->flag_sambaKickoffTime = TRUE;
++ }
+ }
+ }
+
+@@ -859,10 +863,10 @@
+ /* Call common method to give check the hook */
+ $message= plugin::check();
+
+- if($this->flag_sambaKickoffTime){
+- if(!preg_match("/^[0-3][0-9]\.[0-1][0-9]\.([0-9]){4}$/",$this->sambaKickoffTime)){
++ if ($this->flag_sambaKickoffTime){
++ if (!preg_match("/^[0-3][0-9]\.[0-1][0-9]\.([0-9]){4}$/",$this->sambaKickoffTime)){
+ $message[] = msgPool::invalid(_("Account expires after"));
+- }elseif(!strtotime($this->sambaKickoffTime) || strtotime($this->sambaKickoffTime) >= 2147483647){
++ } elseif (!strtotime($this->sambaKickoffTime) || strtotime($this->sambaKickoffTime) > 2147483647){
+ $message[] = msgPool::invalid(_("Account expires after"));
+ }
+ }
+@@ -1165,6 +1169,18 @@
+
+ // Load flags from source.
+ $this->loadFlagsFromSource($this->attrs);
++
++ /* Convert sambaKickoffTime for usage */
++ if ($this->sambaKickoffTime == 2147483647){
++ $this->sambaKickoffTime = "";
++ } else {
++ $this->sambaKickoffTime = date("d.m.Y", $this->sambaKickoffTime);
++ }
++
++ /* Adjust sambaKickoffTime checkbox */
++ if (!$this->sambaKickoffTime == ""){
++ $this->flag_sambaKickoffTime = TRUE;
++ }
+ }
+
+
+@@ -1262,7 +1278,7 @@
+ if(in_array_strict("sambaKickoffTime", $this->multi_boxes) && $this->flag_sambaKickoffTime){
+ if(!preg_match("/^[0-3][0-9]\.[0-1][0-9]\.([0-9]){4}$/",$this->sambaKickoffTime)){
+ $message[] = msgPool::invalid(_("Account expires after"));
+- }elseif(!strtotime($this->sambaKickoffTime) || strtotime($this->sambaKickoffTime) >= 2147483647){
++ } elseif (!strtotime($this->sambaKickoffTime) || strtotime($this->sambaKickoffTime) > 2147483647){
+ $message[] = msgPool::invalid(_("Account expires after"));
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 29952e9..85bf03d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,6 +36,14 @@
1029_better-whitespace-cleanup-in-genuid.patch
1030_column-header-titles-group-members.patch
1031_no-context-loose-continues.patch
+1032_fix_select_acl_role.patch
+1033_fix_unable_to_delete_acl_asignment.patch
+1034_remove_superfluous__get_post__call_from__save_object.patch
+1035_acl_override_to_allow_delete_of_group_members.patch
+1036_remove_double_groupList_setEditable_setting.patch
+1037_fix_shadowexpire_checkbox_from_tmplate_setting.patch
+1038_shadowexpire_in_one_line.patch
+1039_fix_sambakickofftime_checkbox_and_sambakickofftime_date_from_tmplate_setting.patch
0008_mcrypt2openssl_gosa-core.patch
0009_mcrypt2openssl_systems-no-gosasi.patch
0010_mcrypt2openssl_goto-no-gosasi.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git
More information about the debian-edu-commits
mailing list