Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at 2015-10-24 10:23:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openldap2 (Old) and /work/SRC/openSUSE:Factory/.openldap2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openldap2" Changes: -------- --- /work/SRC/openSUSE:Factory/openldap2/openldap2-client.changes 2015-10-12 10:01:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openldap2.new/openldap2-client.changes 2015-10-24 10:23:27.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Oct 9 09:19:35 UTC 2015 - [email protected] + +- Remove OpenLDAP 2.3 code and patches from build source. + Compatibility libraries for OpenLDAP 2.3 are built in package: + compat-libldap-2_3-0 + Removed source files: + openldap-2.3.37-liblber-length-decoding.dif + openldap-2.3.37-libldap-ntlm.diff + openldap-2.3.37-libldap-ssl.dif + openldap-2.3.37-libldap-sasl-max-buff-size.dif + openldap-2.3.37-libldap-tls_chkhost-its6239.dif + openldap-2.3.37-libldap-gethostbyname_r.dif + openldap-2.3.37-libldap-suid.diff + openldap-2.3.37.dif + openldap-2.3.37-libldap-ld_defconn-ldap_free_connection.dif + openldap-2.3.37-libldap-ldapi_url.dif + openldap-2.3.37.tgz + openldap-2.3.37-libldap-utf8-ADcanonical.dif + README.update + check-build.sh + +------------------------------------------------------------------- openldap2.changes: same change Old: ---- README.update check-build.sh openldap-2.3.37-liblber-length-decoding.dif openldap-2.3.37-libldap-gethostbyname_r.dif openldap-2.3.37-libldap-ld_defconn-ldap_free_connection.dif openldap-2.3.37-libldap-ldapi_url.dif openldap-2.3.37-libldap-ntlm.diff openldap-2.3.37-libldap-sasl-max-buff-size.dif openldap-2.3.37-libldap-ssl.dif openldap-2.3.37-libldap-suid.diff openldap-2.3.37-libldap-tls_chkhost-its6239.dif openldap-2.3.37-libldap-utf8-ADcanonical.dif openldap-2.3.37.dif openldap-2.3.37.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.cvTuww/_old 2015-10-24 10:23:29.000000000 +0200 +++ /var/tmp/diff_new_pack.cvTuww/_new 2015-10-24 10:23:29.000000000 +0200 @@ -35,11 +35,9 @@ Source2: addonschema.tar.gz Source3: DB_CONFIG Source4: sasl-slapd.conf -Source5: README.update -Source6: README.dynamic-overlays -Source7: schema2ldif -Source8: baselibs.conf -Source100: openldap-2.3.37.tgz +Source5: README.dynamic-overlays +Source6: schema2ldif +Source7: baselibs.conf Patch1: 0001-build-adjustments.dif Patch2: 0002-slapd.conf.dif Patch3: 0003-LDAPI-socket-location.dif @@ -48,17 +46,6 @@ Patch6: 0006-No-Build-date-and-time-in-binaries.dif Patch7: 0007-Recover-on-DB-version-change.dif Patch8: 0008-In-monitor-backend-do-not-return-Connection0-entries.patch -Patch100: openldap-2.3.37.dif -Patch101: openldap-2.3.37-libldap-suid.diff -Patch102: openldap-2.3.37-libldap-ldapi_url.dif -Patch103: openldap-2.3.37-libldap-ntlm.diff -Patch104: openldap-2.3.37-libldap-gethostbyname_r.dif -Patch105: openldap-2.3.37-libldap-sasl-max-buff-size.dif -Patch106: openldap-2.3.37-libldap-utf8-ADcanonical.dif -Patch107: openldap-2.3.37-liblber-length-decoding.dif -Patch108: openldap-2.3.37-libldap-ld_defconn-ldap_free_connection.dif -Patch109: openldap-2.3.37-libldap-tls_chkhost-its6239.dif -Patch110: openldap-2.3.37-libldap-ssl.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cyrus-sasl-devel BuildRequires: groff @@ -95,7 +82,6 @@ %package -n openldap2-back-perl Summary: OpenLDAP Perl Back-End -License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Servers Requires: openldap2 = %{version_main} Requires: perl = %{perl_version} @@ -106,7 +92,6 @@ %package -n openldap2-back-meta Summary: OpenLDAP Meta Back-End -License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Servers Requires: openldap2 = %{version_main} Provides: openldap2:/usr/share/man/man5/slapd-meta.5.gz @@ -119,7 +104,6 @@ %package -n openldap2-back-sql Summary: OpenLDAP SQL Back-End -License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Servers Requires: openldap2 = %{version_main} @@ -130,7 +114,6 @@ %package -n openldap2-doc Summary: OpenLDAP Documentation -License: OLDAP-2.8 Group: Documentation/Other Provides: openldap2:/usr/share/doc/packages/openldap2/drafts/README %if 0%{?suse_version} > 1110 @@ -140,18 +123,6 @@ %description -n openldap2-doc The OpenLDAP Admin Guide plus a set of OpenLDAP related IETF internet drafts -%package -n compat-libldap-2_3-0 -Summary: OpenLDAP Client Libraries -License: BSD-3-Clause and OLDAP-2.8 and OLDAP-2.8 -Group: Productivity/Networking/LDAP/Clients -Version: 2.3.37 -Release: 0 - -%description -n compat-libldap-2_3-0 -This package contains the OpenLDAP client libraries. - - - Authors: -------- The OpenLDAP Project <[email protected]> @@ -163,7 +134,6 @@ %package -n openldap2-devel Summary: Libraries, Header Files and Documentation for OpenLDAP -License: OLDAP-2.8 Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 @@ -179,7 +149,6 @@ %package -n openldap2-devel-static Summary: Static libraries for the OpenLDAP libraries -License: OLDAP-2.8 Group: Development/Libraries/C and C++ Requires: cyrus-sasl-devel Requires: libopenssl-devel @@ -191,7 +160,6 @@ %package -n libldap-2_4-2 Summary: OpenLDAP Client Libraries -License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Clients %description -n libldap-2_4-2 @@ -200,7 +168,7 @@ %endif %prep -%setup -q -n openldap-%{version_main} -a1 -a2 -b100 +%setup -q -n openldap-%{version_main} -a1 -a2 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -210,19 +178,6 @@ %patch7 -p1 %patch8 -p1 cp %{SOURCE5} . -cp %{SOURCE6} . -cd ../openldap-2.3.37 -%patch100 -%patch101 -%patch102 -%patch103 -%patch104 -%patch105 -%patch106 -%patch107 -%patch108 -%patch109 -p1 -%patch110 %build %{?suse_update_config:%{suse_update_config -f build}} @@ -264,29 +219,6 @@ --with-yielding-select make depend make %{?_smp_mflags} -%if "%{name}" == "openldap2" -#%if %suse_version < 1130 -# build a static slapcat binary from the OpenLDAP 2.3 release -# to be able to update existing databases -cd ../openldap-2.3.37 -%{?suse_update_config:%{suse_update_config -f build}} -# update config.sub for recent architectures -cp -a ../openldap-%{version_main}/build/config.sub build/config.sub -libtoolize --force -#aclocal -I build -autoreconf -export CFLAGS="$RPM_OPT_FLAGS -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS" -%configure --localstatedir=%{_rundir}/slapd --libexecdir=/usr/lib/openldap \ - --enable-aci \ - --enable-hdb --enable-bdb --enable-ldbm --enable-crypt \ - --enable-ipv6=no \ - --enable-ldap --enable-monitor --enable-meta --enable-rewrite \ - --enable-dynamic=no --enable-shared=yes -make depend -make -C libraries %{?_smp_mflags} - -#%endif -%endif %check %if %run_test_suite @@ -327,7 +259,7 @@ chmod a+x $RPM_BUILD_ROOT/%{_libdir}/liblber.so* chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so* chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap.so* -install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/sbin/schema2ldif +install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/sbin/schema2ldif %if "%{name}" == "openldap2" %define DOCDIR %{_defaultdocdir}/%{name} mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates @@ -351,7 +283,6 @@ README \ CHANGES \ %{SOURCE5} \ - %{SOURCE6} \ $RPM_BUILD_ROOT/%{DOCDIR} install -m 644 servers/slapd/slapd.ldif \ $RPM_BUILD_ROOT/%{DOCDIR}/slapd.ldif.default @@ -367,14 +298,6 @@ %else ln -s /sbin/service %{buildroot}%{_sbindir}/rcslapd %endif -%if %suse_version < 1130 -# install 2.3 slapcat -install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin/openldap-2.3-slapcat -%endif -echo "install sle-10 compat libraries (for SLE11)" -pushd ../openldap-2.3.37/libraries -make DESTDIR=$RPM_BUILD_ROOT install -popd %endif rm -f $RPM_BUILD_ROOT/usr/lib/openldap/modules/*.a rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-dnssrv.5 @@ -449,15 +372,6 @@ %doc %{DOCDIR}/CHANGES %doc %{DOCDIR}/slapd.ldif.default EOF -%if %suse_version < 1130 -cat >>openldap2.filelist <<EOF -/usr/sbin/openldap-2.3-slapcat -EOF -%endif -cat > compat-libldap.filelist <<EOF -%{_libdir}/liblber*2.3.so.* -%{_libdir}/libldap*2.3.so.* -EOF # # cat > openldap2-client.filelist <<EOF @@ -534,18 +448,6 @@ %pre /usr/sbin/groupadd -g 70 -o -r ldap || : /usr/sbin/useradd -r -o -g ldap -u 76 -s /bin/bash -c "User for OpenLDAP" -d /var/lib/ldap ldap || : -# try to figure out if a db update is needed -if [ ${1:-0} -gt 1 ] && [ -f /usr/lib/openldap/slapd ] && - /usr/bin/strings /usr/lib/openldap/slapd | \ - grep "slapd 2.3" 2>&1 > /dev/null; -then - # create a backup of the schema shipped with 2.3 - # at least core.schema changed between 2.3 and 2.4 - TEMPDIR=`mktemp -d /etc/openldap/schema.backup.XXXXXX` - echo "Schema backup created in $TEMPDIR" - cp -p --remove-destination /etc/openldap/schema/* $TEMPDIR - echo $TEMPDIR > /etc/openldap/UPDATE_NEEDED ; -fi if /usr/bin/chkconfig ldap 2>&1 | grep -q on; then touch /var/run/enable_slapd_service fi @@ -569,10 +471,6 @@ %postun %service_del_postun slapd.service -%post -n compat-libldap-2_3-0 -p /sbin/ldconfig - -%postun -n compat-libldap-2_3-0 -p /sbin/ldconfig - %files -f openldap2.filelist %defattr(-,root,root) @@ -588,9 +486,6 @@ %files -n openldap2-doc -f openldap2-doc.filelist %defattr(-,root,root) -%files -n compat-libldap-2_3-0 -f compat-libldap.filelist -%defattr(-,root,root) - %else %post -n libldap-2_4-2 -p /sbin/ldconfig ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.cvTuww/_old 2015-10-24 10:23:29.000000000 +0200 +++ /var/tmp/diff_new_pack.cvTuww/_new 2015-10-24 10:23:29.000000000 +0200 @@ -35,11 +35,9 @@ Source2: addonschema.tar.gz Source3: DB_CONFIG Source4: sasl-slapd.conf -Source5: README.update -Source6: README.dynamic-overlays -Source7: schema2ldif -Source8: baselibs.conf -Source100: openldap-2.3.37.tgz +Source5: README.dynamic-overlays +Source6: schema2ldif +Source7: baselibs.conf Patch1: 0001-build-adjustments.dif Patch2: 0002-slapd.conf.dif Patch3: 0003-LDAPI-socket-location.dif @@ -48,17 +46,6 @@ Patch6: 0006-No-Build-date-and-time-in-binaries.dif Patch7: 0007-Recover-on-DB-version-change.dif Patch8: 0008-In-monitor-backend-do-not-return-Connection0-entries.patch -Patch100: openldap-2.3.37.dif -Patch101: openldap-2.3.37-libldap-suid.diff -Patch102: openldap-2.3.37-libldap-ldapi_url.dif -Patch103: openldap-2.3.37-libldap-ntlm.diff -Patch104: openldap-2.3.37-libldap-gethostbyname_r.dif -Patch105: openldap-2.3.37-libldap-sasl-max-buff-size.dif -Patch106: openldap-2.3.37-libldap-utf8-ADcanonical.dif -Patch107: openldap-2.3.37-liblber-length-decoding.dif -Patch108: openldap-2.3.37-libldap-ld_defconn-ldap_free_connection.dif -Patch109: openldap-2.3.37-libldap-tls_chkhost-its6239.dif -Patch110: openldap-2.3.37-libldap-ssl.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cyrus-sasl-devel BuildRequires: groff @@ -95,7 +82,6 @@ %package -n openldap2-back-perl Summary: OpenLDAP Perl Back-End -License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Servers Requires: openldap2 = %{version_main} Requires: perl = %{perl_version} @@ -106,7 +92,6 @@ %package -n openldap2-back-meta Summary: OpenLDAP Meta Back-End -License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Servers Requires: openldap2 = %{version_main} Provides: openldap2:/usr/share/man/man5/slapd-meta.5.gz @@ -119,7 +104,6 @@ %package -n openldap2-back-sql Summary: OpenLDAP SQL Back-End -License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Servers Requires: openldap2 = %{version_main} @@ -130,7 +114,6 @@ %package -n openldap2-doc Summary: OpenLDAP Documentation -License: OLDAP-2.8 Group: Documentation/Other Provides: openldap2:/usr/share/doc/packages/openldap2/drafts/README %if 0%{?suse_version} > 1110 @@ -140,18 +123,6 @@ %description -n openldap2-doc The OpenLDAP Admin Guide plus a set of OpenLDAP related IETF internet drafts -%package -n compat-libldap-2_3-0 -Summary: OpenLDAP Client Libraries -License: BSD-3-Clause and OLDAP-2.8 and OLDAP-2.8 -Group: Productivity/Networking/LDAP/Clients -Version: 2.3.37 -Release: 0 - -%description -n compat-libldap-2_3-0 -This package contains the OpenLDAP client libraries. - - - Authors: -------- The OpenLDAP Project <[email protected]> @@ -163,7 +134,6 @@ %package -n openldap2-devel Summary: Libraries, Header Files and Documentation for OpenLDAP -License: OLDAP-2.8 Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 @@ -179,7 +149,6 @@ %package -n openldap2-devel-static Summary: Static libraries for the OpenLDAP libraries -License: OLDAP-2.8 Group: Development/Libraries/C and C++ Requires: cyrus-sasl-devel Requires: libopenssl-devel @@ -191,7 +160,6 @@ %package -n libldap-2_4-2 Summary: OpenLDAP Client Libraries -License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Clients %description -n libldap-2_4-2 @@ -200,7 +168,7 @@ %endif %prep -%setup -q -n openldap-%{version_main} -a1 -a2 -b100 +%setup -q -n openldap-%{version_main} -a1 -a2 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -210,19 +178,6 @@ %patch7 -p1 %patch8 -p1 cp %{SOURCE5} . -cp %{SOURCE6} . -cd ../openldap-2.3.37 -%patch100 -%patch101 -%patch102 -%patch103 -%patch104 -%patch105 -%patch106 -%patch107 -%patch108 -%patch109 -p1 -%patch110 %build %{?suse_update_config:%{suse_update_config -f build}} @@ -265,27 +220,6 @@ make depend make %{?_smp_mflags} %if "%{name}" == "openldap2" -#%if %suse_version < 1130 -# build a static slapcat binary from the OpenLDAP 2.3 release -# to be able to update existing databases -cd ../openldap-2.3.37 -%{?suse_update_config:%{suse_update_config -f build}} -# update config.sub for recent architectures -cp -a ../openldap-%{version_main}/build/config.sub build/config.sub -libtoolize --force -#aclocal -I build -autoreconf -export CFLAGS="$RPM_OPT_FLAGS -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS" -%configure --localstatedir=%{_rundir}/slapd --libexecdir=/usr/lib/openldap \ - --enable-aci \ - --enable-hdb --enable-bdb --enable-ldbm --enable-crypt \ - --enable-ipv6=no \ - --enable-ldap --enable-monitor --enable-meta --enable-rewrite \ - --enable-dynamic=no --enable-shared=yes -make depend -make -C libraries %{?_smp_mflags} - -#%endif %endif %check @@ -327,7 +261,7 @@ chmod a+x $RPM_BUILD_ROOT/%{_libdir}/liblber.so* chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so* chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap.so* -install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/sbin/schema2ldif +install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/sbin/schema2ldif %if "%{name}" == "openldap2" %define DOCDIR %{_defaultdocdir}/%{name} mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates @@ -351,7 +285,6 @@ README \ CHANGES \ %{SOURCE5} \ - %{SOURCE6} \ $RPM_BUILD_ROOT/%{DOCDIR} install -m 644 servers/slapd/slapd.ldif \ $RPM_BUILD_ROOT/%{DOCDIR}/slapd.ldif.default @@ -367,14 +300,6 @@ %else ln -s /sbin/service %{buildroot}%{_sbindir}/rcslapd %endif -%if %suse_version < 1130 -# install 2.3 slapcat -install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin/openldap-2.3-slapcat -%endif -echo "install sle-10 compat libraries (for SLE11)" -pushd ../openldap-2.3.37/libraries -make DESTDIR=$RPM_BUILD_ROOT install -popd %endif rm -f $RPM_BUILD_ROOT/usr/lib/openldap/modules/*.a rm -f $RPM_BUILD_ROOT/usr/share/man/man5/slapd-dnssrv.5 @@ -454,10 +379,6 @@ /usr/sbin/openldap-2.3-slapcat EOF %endif -cat > compat-libldap.filelist <<EOF -%{_libdir}/liblber*2.3.so.* -%{_libdir}/libldap*2.3.so.* -EOF # # cat > openldap2-client.filelist <<EOF @@ -524,7 +445,7 @@ %else cat openldap2.filelist openldap2-back-perl.filelist \ openldap2-back-meta.filelist openldap2-back-sql.filelist \ - openldap2-doc.filelist compat-libldap.filelist | + openldap2-doc.filelist %endif grep -v "%dir " |sed -e "s|^.* ||" |grep "^/" |while read name ; do rm -rf $RPM_BUILD_ROOT$name @@ -569,10 +490,6 @@ %postun %service_del_postun slapd.service -%post -n compat-libldap-2_3-0 -p /sbin/ldconfig - -%postun -n compat-libldap-2_3-0 -p /sbin/ldconfig - %files -f openldap2.filelist %defattr(-,root,root) @@ -588,9 +505,6 @@ %files -n openldap2-doc -f openldap2-doc.filelist %defattr(-,root,root) -%files -n compat-libldap-2_3-0 -f compat-libldap.filelist -%defattr(-,root,root) - %else %post -n libldap-2_4-2 -p /sbin/ldconfig
