[yast-commit] [ci_new_pac] JFYI yast2-auth-server -> sle12
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-auth-server -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-auth-server/yast2-auth-server.changes 2014-02-12 17:59:23.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-auth-server/yast2-auth-server.changes 2014-02-14 13:34:13.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Feb 14 10:39:49 UTC 2014 - ckornacker@suse.com + +- adapt to ldap.conf SCR agent namechange +- restruct kerberos service invocation +- 3.1.4 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-auth-server - yast2-mail ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-auth-server (Old) and /mounts/work_src_done/SLE12/yast2-auth-server (BS:build ID:32775 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-auth-server", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-auth-server-3.1.3.tar.bz2 New: ---- yast2-auth-server-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-auth-server.spec ++++++ --- /var/tmp/diff_new_pack.EhC1In/_old 2014-02-14 14:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.EhC1In/_new 2014-02-14 14:02:54.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-auth-server -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-auth-server-3.1.3.tar.bz2 -> yast2-auth-server-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.3/package/yast2-auth-server.changes new/yast2-auth-server-3.1.4/package/yast2-auth-server.changes --- old/yast2-auth-server-3.1.3/package/yast2-auth-server.changes 2014-02-12 17:30:20.000000000 +0100 +++ new/yast2-auth-server-3.1.4/package/yast2-auth-server.changes 2014-02-14 13:30:14.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 14 10:39:49 UTC 2014 - ckornacker@suse.com + +- adapt to ldap.conf SCR agent namechange +- restruct kerberos service invocation +- 3.1.4 + +------------------------------------------------------------------- Wed Feb 12 10:13:07 UTC 2014 - ckornacker@suse.com - rename ldap-server.rnc autoyast profile to auth-server.rnc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.3/package/yast2-auth-server.spec new/yast2-auth-server-3.1.4/package/yast2-auth-server.spec --- old/yast2-auth-server-3.1.3/package/yast2-auth-server.spec 2014-02-12 17:30:20.000000000 +0100 +++ new/yast2-auth-server-3.1.4/package/yast2-auth-server.spec 2014-02-14 13:30:14.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-auth-server -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.3/src/modules/AuthServer.pm new/yast2-auth-server-3.1.4/src/modules/AuthServer.pm --- old/yast2-auth-server-3.1.3/src/modules/AuthServer.pm 2014-02-12 17:30:20.000000000 +0100 +++ new/yast2-auth-server-3.1.4/src/modules/AuthServer.pm 2014-02-14 13:30:14.000000000 +0100 @@ -366,7 +366,7 @@ } # Read base-dn from /etc/openldap/ldap.conf - my $base_list = SCR->Read(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".base" ); + my $base_list = SCR->Read(".ldap_conf.value.base" ); $ldapconf_base = $base_list->[0]; if (! $self->ReadKerberosDatabase()) @@ -1002,6 +1002,10 @@ return 1; } +## + # Write Kerberos configuration and start services + # @return true on success + # BEGIN { $TYPEINFO{WriteKerberosDatabase} = ["function", "boolean"]; } sub WriteKerberosDatabase { @@ -1077,37 +1081,27 @@ } } - if(Service->Status("krb5kdc") == 0 && $self->ReadKerberosEnabled()) + if(Service->Status("krb5kdc")) { Service->Adjust("krb5kdc", "enable"); Service->RunInitScript ("krb5kdc", "restart"); } - elsif($self->ReadKerberosEnabled()) + else { Service->Adjust("krb5kdc", "enable"); Service->RunInitScript ("krb5kdc", "start"); } - else - { - Service->Adjust("krb5kdc", "disable"); - Service->RunInitScript ("krb5kdc", "stop"); - } - if(Service->Status("kadmind") == 0 && $self->ReadKerberosEnabled()) + if(Service->Status("kadmind")) { Service->Adjust("kadmind", "enable"); Service->RunInitScript ("kadmind", "restart"); } - elsif($self->ReadKerberosEnabled()) + else { Service->Adjust("kadmind", "enable"); Service->RunInitScript ("kadmind", "start"); } - else - { - Service->Adjust("kadmind", "disable"); - Service->RunInitScript ("kadmind", "stop"); - } $ret = 1; } @@ -1636,19 +1630,15 @@ if ( $write_ldapconf ) { y2milestone("Updating /etc/openldap/ldap.conf"); - SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".host", - ["localhost"]); - SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".base", - [$ldapconf_base]); - SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".binddn", - [$dbDefaults{'rootdn'}]); + SCR->Write(".ldap_conf.value.host", ["localhost"]); + SCR->Write(".ldap_conf.value.base", [$ldapconf_base]); + SCR->Write(".ldap_conf.value.binddn", [$dbDefaults{'rootdn'}]); my $tls = $self->ReadTlsConfig(); if ( ref($tls) eq "HASH" && $tls->{'caCertFile'} ne "" ) { - SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".tls_cacert", - [$tls->{'caCertFile'}]); + SCR->Write(".ldap_conf.value.tls_cacert", [$tls->{'caCertFile'}]); } - SCR->Write(".etc.ldap_conf", "force" ); + SCR->Write(".ldap_conf", "force" ); } $self->CreateBaseObjects(); if ( $setupSyncreplMaster ) @@ -1681,7 +1671,10 @@ ); } Progress->NextStage(); - $self->WriteKerberosDatabase(); + if ( $self->ReadKerberosEnabled() ) + { + $self->WriteKerberosDatabase(); + } Progress->Finish(); SuSEFirewall->Write(); } else { @@ -1828,12 +1821,9 @@ Progress->NextStage(); if ( $write_ldapconf ) { - SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".host", - ["localhost"]); - SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".base", - [$ldapconf_base]); - SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".binddn", - [$dbDefaults{'rootdn'}]); + SCR->Write(".ldap_conf.value.host", ["localhost"]); + SCR->Write(".ldap_conf.value.base", [$ldapconf_base]); + SCR->Write(".ldap_conf.value.binddn", [$dbDefaults{'rootdn'}]); y2milestone("Updated /etc/openldap/ldap.conf"); } Progress->NextStage(); continue with "q"... Checked in at Fri Feb 14 14:03:06 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro