[debian-edu-commits] debian-edu/pkg-team/ 10/17: debian/patches: Rebase / update 1016_allow-same-user-ids-as-adduser.patch and 1026_fix-deprecated-constructor-format.patch.
Mike Gabriel
sunweaver at debian.org
Thu Mar 1 12:59:50 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 c9f6be95ceae1c4b30858b708fe2effeba3545d8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Mar 1 13:43:11 2018 +0100
debian/patches: Rebase / update 1016_allow-same-user-ids-as-adduser.patch and 1026_fix-deprecated-constructor-format.patch.
---
.../1016_allow-same-user-ids-as-adduser.patch | 15 -
.../1026_fix-deprecated-constructor-format.patch | 409 ---------------------
2 files changed, 424 deletions(-)
diff --git a/debian/patches/1016_allow-same-user-ids-as-adduser.patch b/debian/patches/1016_allow-same-user-ids-as-adduser.patch
index 1401129..1ee2852 100644
--- a/debian/patches/1016_allow-same-user-ids-as-adduser.patch
+++ b/debian/patches/1016_allow-same-user-ids-as-adduser.patch
@@ -51,18 +51,3 @@ Abstract:
}
if (!tests::is_url($this->labeledURI)){
$message[]= msgPool::invalid(_("Homepage"), "", "", "http://www.your-domain.com/yourname");
---- a/fai/admin/fai/class_faiTemplateEntry.inc
-+++ b/fai/admin/fai/class_faiTemplateEntry.inc
-@@ -254,11 +254,7 @@
- if($this->group == ""){
- $message[] = msgPool::required(_("Group"));
- }elseif (!tests::is_uid($this->group)){
-- if (strict_uid_mode()){
-- $message[]= msgPool::invalid(_("Group"), $this->group, "/[a-z0-9_-]/");
-- } else {
-- $message[]= msgPool::invalid(_("Group"), $this->group, "/[a-z0-9_-]/i");
-- }
-+ $message[]= msgPool::invalid(_("Group"), $this->group, "/".get_uid_regexp()."/");
- }
-
- return ($message);
diff --git a/debian/patches/1026_fix-deprecated-constructor-format.patch b/debian/patches/1026_fix-deprecated-constructor-format.patch
index ac33ab8..8c92c8c 100644
--- a/debian/patches/1026_fix-deprecated-constructor-format.patch
+++ b/debian/patches/1026_fix-deprecated-constructor-format.patch
@@ -300,390 +300,6 @@ Abstract:
$this->DisplayName = _("DNS service");
---- a/fai/admin/fai/class_askClassName.inc
-+++ b/fai/admin/fai/class_askClassName.inc
-@@ -13,11 +13,11 @@
- var $ClassAlreadyExists = false;
- var $parent;
-
-- function askClassName (&$config,$dn,$ui,$objectClass)
-+ function __construct(&$config,$dn,$ui,$objectClass)
- {
- $this->ui = $ui;
- $this->objectClass = $objectClass;
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
- }
-
- function execute()
---- a/fai/admin/fai/class_debconfTemplate.inc
-+++ b/fai/admin/fai/class_debconfTemplate.inc
-@@ -8,7 +8,7 @@
- var $template= array();
-
-
-- function debconf($language= "")
-+ function __construct($language= "")
- {
- $this->set_language($language);
- }
---- a/fai/admin/fai/class_faiDiskEntry.inc
-+++ b/fai/admin/fai/class_faiDiskEntry.inc
-@@ -26,9 +26,9 @@
-
- var $lvmDevices = array();
-
-- function faiDiskEntry (&$config, $dn= NULL,$parent,$disk,$type)
-+ function __construct(&$config, $dn= NULL,$parent,$disk,$type)
- {
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
-
- // Set default attributes
- $this->parent = $parent;
---- a/fai/admin/fai/class_faiHookEntry.inc
-+++ b/fai/admin/fai/class_faiHookEntry.inc
-@@ -27,9 +27,9 @@
- var $write_protect = FALSE;
-
-
-- function faiHookEntry (&$config, $dn= NULL,$object=false)
-+ function __construct(&$config, $dn= NULL,$object=false)
- {
-- plugin::plugin ($config, NULL);
-+ plugin::__construct ($config, NULL);
- if($dn != "new"){
- $this->orig_cn= $object['cn'];
- $this->dn=$object['dn'];
---- a/fai/admin/fai/class_faiHook.inc
-+++ b/fai/admin/fai/class_faiHook.inc
-@@ -33,10 +33,10 @@
- var $FAIstate = "";
- var $ui;
-
-- function faiHook (&$config, $dn= NULL)
-+ function __construct(&$config, $dn= NULL)
- {
- /* Load Attributes */
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
-
- /* If "dn==new" we try to create a new entry
- * Else we must read all objects from ldap which belong to this entry.
---- a/fai/admin/fai/class_faiPackageConfiguration.inc
-+++ b/fai/admin/fai/class_faiPackageConfiguration.inc
-@@ -20,9 +20,9 @@
- @param String The release name (e.g. edge)
- @param Array The current package configuration.
- */
-- function faiPackageConfiguration (&$config, $dn= NULL,$obj,$release,$pkg_config)
-+ function __construct(&$config, $dn= NULL,$obj,$release,$pkg_config)
- {
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
- $this->obj = $obj;
- $this->release = $release;
- $this->pkg_config = $pkg_config;
---- a/fai/admin/fai/class_faiPackage.inc
-+++ b/fai/admin/fai/class_faiPackage.inc
-@@ -55,10 +55,10 @@
- "pending", "dpkgc" );
-
-
-- function faiPackage (&$config, $dn= NULL)
-+ function __construct(&$config, $dn= NULL)
- {
- /* Load Attributes */
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
-
- /* If "dn==new" we try to create a new entry
- * Else we must read all objects from ldap which belong to this entry.
---- a/fai/admin/fai/class_faiPartitionTableEntry.inc
-+++ b/fai/admin/fai/class_faiPartitionTableEntry.inc
-@@ -16,9 +16,9 @@
- var $old_cn = "";
- var $parent = null;
-
-- function faiPartitionTableEntry (&$config, $dn= NULL,&$parent,$disk=false)
-+ function __construct(&$config, $dn= NULL,&$parent,$disk=false)
- {
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
- $this->UsedAttrs = array("cn","description","FAIpartitionType","FAIpartitionNr","FAIfsType","FAImountPoint","FAIpartitionSize",
- "FAImountOptions","FAIfsOptions","FAIpartitionFlags");
-
---- a/fai/admin/fai/class_faiPartitionTable.inc
-+++ b/fai/admin/fai/class_faiPartitionTable.inc
-@@ -25,10 +25,10 @@
-
- var $view_logged = FALSE;
-
-- function faiPartitionTable (&$config, $dn= NULL)
-+ function __construct(&$config, $dn= NULL)
- {
- /* Load Attributes */
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
-
- /* If "dn==new" we try to create a new entry
- * Else we must read all objects from ldap which belong to this entry.
---- a/fai/admin/fai/class_faiProfile.inc
-+++ b/fai/admin/fai/class_faiProfile.inc
-@@ -25,10 +25,10 @@
-
- var $classSelect;
-
-- function faiProfile(&$config, $dn= NULL)
-+ function __construct(&$config, $dn= NULL)
- {
- /* Load Attributes */
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
- $ldap=$this->config->get_ldap_link();
-
- $this->ui = get_userinfo();
---- a/fai/admin/fai/class_faiScriptEntry.inc
-+++ b/fai/admin/fai/class_faiScriptEntry.inc
-@@ -23,9 +23,9 @@
- var $enc_after_edit = "";
- var $write_protect = FALSE;
-
-- function faiScriptEntry (&$config, $dn= NULL,$object=false)
-+ function __construct(&$config, $dn= NULL,$object=false)
- {
-- plugin::plugin ($config, NULL);
-+ plugin::__construct ($config, NULL);
- if($dn != "new"){
- $this->orig_cn= $object['cn'];
- $this->dn=$object['dn'];
---- a/fai/admin/fai/class_faiScript.inc
-+++ b/fai/admin/fai/class_faiScript.inc
-@@ -37,10 +37,10 @@
- var $view_logged = FALSE;
- var $ui;
-
-- function faiScript (&$config, $dn= NULL)
-+ function __construct(&$config, $dn= NULL)
- {
- /* Load Attributes */
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
-
- /* If "dn==new" we try to create a new entry
- * Else we must read all objects from ldap which belong to this entry.
---- a/fai/admin/fai/class_faiSummaryTab.inc
-+++ b/fai/admin/fai/class_faiSummaryTab.inc
-@@ -33,9 +33,9 @@
- var $parent = NULL;
- var $ui = NULL;
-
-- function faiSummaryTab(&$config,$dn)//,$parent)
-+ function __construct(&$config,$dn)//,$parent)
- {
-- plugin::plugin($config,$dn);//,$parent);
-+ plugin::__construct($config,$dn);//,$parent);
-
- $this->ui = get_userinfo();
-
---- a/fai/admin/fai/class_faiTemplateEdit.inc
-+++ b/fai/admin/fai/class_faiTemplateEdit.inc
-@@ -13,9 +13,9 @@
- var $write_protect = FALSE;
- var $mb_extension = TRUE;
-
-- function faiTemplateEdit (&$config, $dn, $value)
-+ function __construct(&$config, $dn, $value)
- {
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
- if(!function_exists("mb_detect_encoding")){
- $this->mb_extension = FALSE;
- }else{
---- a/fai/admin/fai/class_faiTemplateEntry.inc
-+++ b/fai/admin/fai/class_faiTemplateEntry.inc
-@@ -23,9 +23,9 @@
- var $parent = NULL;
- var $FAIstate = "";
-
-- function faiTemplateEntry (&$config, $dn= NULL,$object=false)
-+ function __construct(&$config, $dn= NULL,$object=false)
- {
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
-
- if((isset($object['cn'])) && (!empty($object['cn']))){
- $this->orig_cn= $object['cn'];
---- a/fai/admin/fai/class_faiTemplate.inc
-+++ b/fai/admin/fai/class_faiTemplate.inc
-@@ -34,10 +34,10 @@
- var $ui;
- var $view_logged = FALSE;
-
-- function faiTemplate (&$config, $dn= NULL)
-+ function __construct(&$config, $dn= NULL)
- {
- /* Load Attributes */
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
-
- /* If "dn==new" we try to create a new entry
- * Else we must read all objects from ldap which belong to this entry.
---- a/fai/admin/fai/class_faiVariableEntry.inc
-+++ b/fai/admin/fai/class_faiVariableEntry.inc
-@@ -16,9 +16,9 @@
- var $parent = NULL;
- var $FAIstate = "";
-
-- function faiVariableEntry (&$config, $dn= NULL,$object=false)
-+ function __construct(&$config, $dn= NULL,$object=false)
- {
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
- if((isset($object['cn'])) && (!empty($object['cn']))){
- $this->orig_cn= $object['cn'];
- $this->dn=$object['dn'];
---- a/fai/admin/fai/class_faiVariable.inc
-+++ b/fai/admin/fai/class_faiVariable.inc
-@@ -33,10 +33,10 @@
- var $ui ;
- var $view_logged = FALSE;
-
-- function faiVariable (&$config, $dn= NULL)
-+ function __construct(&$config, $dn= NULL)
- {
- /* Load Attributes */
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
-
- if($dn != "new"){
- $this->dn =$dn;
---- a/fai/admin/fai/tabsHook.inc
-+++ b/fai/admin/fai/tabsHook.inc
-@@ -5,9 +5,9 @@
- var $base= "";
- var $parent ="";
-
-- function tabsHook($config, $data, $dn,$category)
-+ function __construct($config, $data, $dn,$category)
- {
-- tabs::tabs($config, $data, $dn,$category);
-+ tabs::__construct($config, $data, $dn,$category);
- /* Add references/acls/snapshots */
- # $this->addSpecialTabs();
- }
---- a/fai/admin/fai/tabsPackage.inc
-+++ b/fai/admin/fai/tabsPackage.inc
-@@ -5,9 +5,9 @@
- var $base= "";
- var $parent ="";
-
-- function tabsPackage($config, $data, $dn,$category)
-+ function __construct($config, $data, $dn,$category)
- {
-- tabs::tabs($config, $data, $dn,$category);
-+ tabs::__construct($config, $data, $dn,$category);
-
- /* Add references/acls/snapshots */
- # $this->addSpecialTabs();
---- a/fai/admin/fai/tabsPartition.inc
-+++ b/fai/admin/fai/tabsPartition.inc
-@@ -5,9 +5,9 @@
- var $base= "";
- var $parent ="";
-
-- function tabsPartition($config, $data, $dn,$category)
-+ function __construct($config, $data, $dn,$category)
- {
-- tabs::tabs($config, $data, $dn,$category);
-+ tabs::__construct($config, $data, $dn,$category);
-
- /* Add references/acls/snapshots */
- # $this->addSpecialTabs();
---- a/fai/admin/fai/tabsProfile.inc
-+++ b/fai/admin/fai/tabsProfile.inc
-@@ -5,9 +5,9 @@
- var $base= "";
- var $parent ="";
-
-- function tabsProfile($config, $data, $dn,$category)
-+ function __construct($config, $data, $dn,$category)
- {
-- tabs::tabs($config, $data, $dn,$category);
-+ tabs::__construct($config, $data, $dn,$category);
-
- /* Add references/acls/snapshots */
- # $this->addSpecialTabs();
---- a/fai/admin/fai/tabsScript.inc
-+++ b/fai/admin/fai/tabsScript.inc
-@@ -5,9 +5,9 @@
- var $base= "";
- var $parent ="";
-
-- function tabsScript($config, $data, $dn,$category)
-+ function __construct($config, $data, $dn,$category)
- {
-- tabs::tabs($config, $data, $dn,$category);
-+ tabs::__construct($config, $data, $dn,$category);
-
- /* Add references/acls/snapshots */
- # $this->addSpecialTabs();
---- a/fai/admin/fai/tabsTemplate.inc
-+++ b/fai/admin/fai/tabsTemplate.inc
-@@ -5,9 +5,9 @@
- var $base= "";
- var $parent ="";
-
-- function tabsTemplate($config, $data, $dn,$category)
-+ function __construct($config, $data, $dn,$category)
- {
-- tabs::tabs($config, $data, $dn, $category);
-+ tabs::__construct($config, $data, $dn, $category);
-
- /* Add references/acls/snapshots */
- # $this->addSpecialTabs();
---- a/fai/admin/fai/tabsVariable.inc
-+++ b/fai/admin/fai/tabsVariable.inc
-@@ -5,9 +5,9 @@
- var $base= "";
- var $parent ="";
-
-- function tabsVariable($config, $data, $dn,$category)
-+ function __construct($config, $data, $dn,$category)
- {
-- tabs::tabs($config, $data, $dn, $category);
-+ tabs::__construct($config, $data, $dn, $category);
-
- /* Add references/acls/snapshots */
- # $this->addSpecialTabs();
---- a/fai/admin/systems/services/repository/class_servRepository.inc
-+++ b/fai/admin/systems/services/repository/class_servRepository.inc
-@@ -20,9 +20,9 @@
-
- var $repositoryMangement = NULL;
-
-- function servrepository (&$config, $dn= NULL, $parent= NULL)
-+ function __construct(&$config, $dn= NULL, $parent= NULL)
- {
-- plugin::plugin ($config, $dn,$parent);
-+ plugin::__construct ($config, $dn,$parent);
-
- $this->DisplayName = _("Repository service");
-
---- a/fai/admin/systems/services/repository/class_servRepositorySetup.inc
-+++ b/fai/admin/systems/services/repository/class_servRepositorySetup.inc
-@@ -17,9 +17,9 @@
- var $cn = "";
- var $parent = "";
-
-- function servRepositorySetup (&$config, $dn= NULL,$data = false)
-+ function __construct(&$config, $dn= NULL,$data = false)
- {
-- plugin::plugin ($config, $dn);
-+ plugin::__construct ($config, $dn);
-
- if(isset($this->attrs['cn'][0])){
- $this->cn=$this->attrs['cn'][0];
--- a/gofax/admin/systems/services/gofax/class_goFaxServer.inc
+++ b/gofax/admin/systems/services/gofax/class_goFaxServer.inc
@@ -24,9 +24,9 @@
@@ -2267,31 +1883,6 @@ Abstract:
// Get attributes from parent object
if(isset($this->attrs['uid'])){
---- a/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc
-+++ b/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc
-@@ -52,9 +52,9 @@
- @param String The object dn we are currently editing.
- @param Object The parent object.
- */
-- public function goKrbServer(&$config,$dn,$parent)
-+ public function __construct(&$config,$dn,$parent)
- {
-- goService::goService($config,$dn);
-+ goService::__construct($config,$dn);
- $this->DisplayName = _("Kerberos service");
- $this->parent = $parent;
-
---- a/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc
-+++ b/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc
-@@ -57,7 +57,7 @@
- var $attrs = array();
- var $is_account = FALSE;
-
-- function passwordMethodheimdal(&$config,$dn = "new")
-+ function __construct(&$config,$dn = "new")
- {
- $this->config= $config;
- $this->parent_dn = $dn;
--- a/kolab/admin/systems/services/kolab/class_servKolab.inc
+++ b/kolab/admin/systems/services/kolab/class_servKolab.inc
@@ -37,14 +37,14 @@
--
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