Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at 2012-11-17 07:26:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openldap2 (Old) and /work/SRC/openSUSE:Factory/.openldap2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openldap2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/openldap2/openldap2-client.changes 2012-10-26 17:47:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openldap2.new/openldap2-client.changes 2012-11-17 07:26:28.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Nov 16 09:52:42 UTC 2012 - [email protected] + +- Fixed initscript to avoid endless loop when no configuration + is present in /etc/openldap/slapd.d/ (bnc#767464) +- cleaned up SLES10 buildrequires and dependencies +- removed support for building on SLES9, didn't work anyway anymore +- Don't buildrequire krb5-mini on Distributions where it does not + exist + +------------------------------------------------------------------- openldap2.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.lsFRQf/_old 2012-11-17 07:26:29.000000000 +0100 +++ /var/tmp/diff_new_pack.lsFRQf/_new 2012-11-17 07:26:29.000000000 +0100 @@ -26,7 +26,7 @@ BuildRequires: groff BuildRequires: libopenssl-devel BuildRequires: libtool -%if %sles_version == 9 || %sles_version == 10 +%if %sles_version == 10 BuildRequires: -libopenssl-devel BuildRequires: -pwdutils BuildRequires: openssl-devel @@ -39,7 +39,7 @@ BuildRequires: openslp-devel BuildRequires: tcpd-devel BuildRequires: unixODBC-devel -%if %sles_version == 9 || %sles_version == 10 +%if %sles_version == 10 BuildRequires: -db-devel BuildRequires: libdb-4_5-devel %endif @@ -47,8 +47,10 @@ Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep %else +%if 0%{?suse_version} >= 1140 # avoid cycle with krb5 BuildRequires: krb5-mini +%endif Conflicts: openldap-client Requires: libldap-2_4-2 = %{version} %endif @@ -135,15 +137,13 @@ %endif # Conflicts: openldap-devel -%if %suse_version >= 1110 -Requires: cyrus-sasl-devel -Requires: libldap-2_4-2 = %{version} -Requires: libopenssl-devel +%if %sles_version == 10 +Requires: openssl-devel %else +Requires: libopenssl-devel +%endif Requires: cyrus-sasl-devel Requires: libldap-2_4-2 = %{version} -Requires: openssl-devel -%endif %description -n openldap2-devel This package provides the OpenLDAP libraries, header files, and ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.lsFRQf/_old 2012-11-17 07:26:29.000000000 +0100 +++ /var/tmp/diff_new_pack.lsFRQf/_new 2012-11-17 07:26:29.000000000 +0100 @@ -26,7 +26,7 @@ BuildRequires: groff BuildRequires: libopenssl-devel BuildRequires: libtool -%if %sles_version == 9 || %sles_version == 10 +%if %sles_version == 10 BuildRequires: -libopenssl-devel BuildRequires: -pwdutils BuildRequires: openssl-devel @@ -39,7 +39,7 @@ BuildRequires: openslp-devel BuildRequires: tcpd-devel BuildRequires: unixODBC-devel -%if %sles_version == 9 || %sles_version == 10 +%if %sles_version == 10 BuildRequires: -db-devel BuildRequires: libdb-4_5-devel %endif @@ -47,8 +47,10 @@ Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep %else +%if 0%{?suse_version} >= 1140 # avoid cycle with krb5 BuildRequires: krb5-mini +%endif Conflicts: openldap-client Requires: libldap-2_4-2 = %{version} %endif @@ -135,15 +137,13 @@ %endif # Conflicts: openldap-devel -%if %suse_version >= 1110 -Requires: cyrus-sasl-devel -Requires: libldap-2_4-2 = %{version} -Requires: libopenssl-devel +%if %sles_version == 10 +Requires: openssl-devel %else +Requires: libopenssl-devel +%endif Requires: cyrus-sasl-devel Requires: libldap-2_4-2 = %{version} -Requires: openssl-devel -%endif %description -n openldap2-devel This package provides the OpenLDAP libraries, header files, and ++++++ openldap-rc.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rc.ldap new/rc.ldap --- old/rc.ldap 2011-01-05 15:48:54.000000000 +0100 +++ new/rc.ldap 2012-11-16 10:21:31.000000000 +0100 @@ -109,7 +109,7 @@ depth=0; function chown_database_dirs_bconfig() { - ldapdir=$(grep -i olcdbdirectory `find $1 -name "olcDatabase*"` | awk '{print $2}') + ldapdir=$(find $1 -type f -name "olcDatabase*" | xargs grep -i olcdbdirectory | awk '{print $2}') for dir in $ldapdir; do [ -d "$dir" ] && [ -n "$OPENLDAP_USER" ] && \ chown -R $OPENLDAP_USER $dir 2>/dev/null -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
