From 3c3f552ff26449ab7878048fa5fa6efd2c4c648c0226f5d1e8421126e7282c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= Date: Mon, 25 Oct 2021 22:49:48 +0000 Subject: [PATCH 1/2] update to 2.5.9 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=293 --- openldap-2.5.8.tgz | 3 --- openldap-2.5.8.tgz.asc | 16 ---------------- openldap-2.5.9.tgz | 3 +++ openldap-2.5.9.tgz.asc | 16 ++++++++++++++++ openldap2.changes | 8 ++++++++ openldap2.spec | 2 +- 6 files changed, 28 insertions(+), 20 deletions(-) delete mode 100644 openldap-2.5.8.tgz delete mode 100644 openldap-2.5.8.tgz.asc create mode 100644 openldap-2.5.9.tgz create mode 100644 openldap-2.5.9.tgz.asc diff --git a/openldap-2.5.8.tgz b/openldap-2.5.8.tgz deleted file mode 100644 index d6418b3..0000000 --- a/openldap-2.5.8.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:366ea1c3b24202de4481978b632128c0cfe4148d4ae13cabf93a1f38c56472dc -size 6437833 diff --git a/openldap-2.5.8.tgz.asc b/openldap-2.5.8.tgz.asc deleted file mode 100644 index 814910e..0000000 --- a/openldap-2.5.8.tgz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEPOJptTmLyLeFZF6Yf2fV/Rzhy84FAmFkcEoACgkQf2fV/Rzh -y8642w/+LW2cDia/IhFIw2xErl3YMm0lZU/FocJhwhDHr4dVZ4PmNLoO6Wx0rhlP -kFX37le0yRhuOatxpytOTYjWqEXsBX31PrzdZs7JjOZ+V+6SEBgEz6+znRQQGyAP -M1Ovja0ic67wk2F9qpKiuyXhzg9Ng1HFwrnx7wWOZUNWhg8jBZUUECNDVHwtjhu+ -U32cuLPTFBRceLkHikQhVMmY0L/iu0WHuuEiPv8pDYP6E5GcN39oCPN+HigW1b3e -VJ6Gk7eXYS9i94po1S+TTOt7mc7U9xAWXuvBAur/a+A6ll7oq5DrZkX/pZIBIzvX -N6IP/k6o5jTZTVE8OVp6Hk1sd61xZGIquq6olTQyb0Wk6sRRqraxuzq897OuSNma -8XmtX86Gb5BkWYtub71C2u44fc9w7zMmIz5XBbGdyRB4aH7pe2n9ibZ2+sCXClq9 -uSGR8iJ74+7+qn12Lr5wvlHa/p0cVI5armGk4rqQIk9UnBAt1Qn0I2nQai9OJMwj -AgoayK6+YHXIJ0rqi5j5p7Vfx3B+P+bbxL9vEgd5oUXWe0sC5tCyId0GZNjDUMoT -ykCf4sDmkb/DcV+Rap8g4wBpuDaYcBHc3hrRjoNPjs7FuRvdH5jIpuEmtfaflKvs -7lWu8f7UfhhkrwoC+l47c3XaOoMx7Xh+2dK2MbrT2tmT/Y8nqP4= -=NKlB ------END PGP SIGNATURE----- diff --git a/openldap-2.5.9.tgz b/openldap-2.5.9.tgz new file mode 100644 index 0000000..0ed1fbf --- /dev/null +++ b/openldap-2.5.9.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c08e12f4ca5803d5d9f9948c70ad3491282cda3c17ec8b655dcbcb2364e6fb9e +size 6438837 diff --git a/openldap-2.5.9.tgz.asc b/openldap-2.5.9.tgz.asc new file mode 100644 index 0000000..b5dec23 --- /dev/null +++ b/openldap-2.5.9.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEPOJptTmLyLeFZF6Yf2fV/Rzhy84FAmF3FnYACgkQf2fV/Rzh +y87PeQ//YJhrhdYgpv8ZiRro3Iw/SCUHIEXPvnxIMXFatkILEiNs0p/JZ2vOvqTY +SE8RWczX1kR1JN0ssPy5hiNBi0ju9J6sxxp3iRvO7azLxyksnjEKdRs1Vp7mpHSx +aPwdPMYWbv+EdqOfe6cdoPUMb3UPZxVD4FHv/HxpTcreqGGxKo9F++spWHZnsIk0 +DdY1XoJWTvzs38g2cm09QvQAUspkBpOAmeuGmUWbCfhZfp7GbQKBTjEH7RZ6oe7r +mpSVFmpanIt47rSUvZeWU04pcTeKwvbH9F+j7MQYUVXICznpyiXAdOFoEQH18G+K +BlW2SdXqD7OANSrNxp/pWAo9/S3HuRhgiMGLHBDVpjxd+prJJN1KDKfXLqiu4JRe +iQVCfVxO4DuHxtJX/ovcHcW006qRrxFYAPtc08cxvurRjGFiVdEAKOGoJwexeM+Z +oC/QLNNVBDDQ/FdAm8sytcZQsYqunxrVMJBu8z19RkNYq3MDaWJX3oRHDXdIoy9f +pTd9oWAH32/Oab+82DCgtIPHrUzKuv5tReilcoKE1vkjzuYsdO1NIkVXvIL31yFF +w/K+fwPqXnU1TaKAXrfRmoWX3UgbNxup+IdoYj0lM5hpyV8SIXRiD/ajlSGWlk0M +GDXazt5VY0sgK4Xnk7pnhrfp5nkiUp1WsW/D4wqnFoLE9mAxpbI= +=gSf0 +-----END PGP SIGNATURE----- diff --git a/openldap2.changes b/openldap2.changes index c349767..6a3064e 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 25 22:03:53 UTC 2021 - Michael Ströder + +- update to 2.5.9 + +OpenLDAP 2.5.9 Release (2021/10/25) + Fixed slapo-accesslog to initialize minCSN on import of 2.4 databases (ITS#9720) + ------------------------------------------------------------------- Mon Oct 11 18:46:13 UTC 2021 - Michael Ströder diff --git a/openldap2.spec b/openldap2.spec index 828cfae..2c30de8 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -17,7 +17,7 @@ %define run_test_suite 0 -%define version_main 2.5.8 +%define version_main 2.5.9 %define slapdrundir %{_rundir}/slapd Name: openldap2 From 67bef5017a2b85a4387a053e7c889c1b4e52bc42e9783462d8654ccead8aaa7b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 30 Mar 2022 10:18:15 +0000 Subject: [PATCH 2/2] Accepting request 965156 from home:coolo:branches:network:ldap - Add _multibuild support to integrate the build of libldapcpp-devel to drop the outdated copy OBS-URL: https://build.opensuse.org/request/show/965156 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=294 --- _multibuild | 3 +++ openldap2.changes | 6 +++++ openldap2.spec | 62 ++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..630968e --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + contrib + diff --git a/openldap2.changes b/openldap2.changes index 6a3064e..b5750cc 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 26 14:08:57 UTC 2022 - Stephan Kulow + +- Add _multibuild support to integrate the build of libldapcpp-devel + to drop the outdated copy + ------------------------------------------------------------------- Mon Oct 25 22:03:53 UTC 2021 - Michael Ströder diff --git a/openldap2.spec b/openldap2.spec index 2c30de8..4277be1 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -1,7 +1,7 @@ # -# spec file for package openldap2 +# spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,14 @@ %define run_test_suite 0 %define version_main 2.5.9 %define slapdrundir %{_rundir}/slapd +%define flavor @BUILD_FLAVOR@%{nil} +%if "%flavor" == "contrib" +%define name_suffix -%{flavor}-src +%else +%define name_suffix %{nil} +%endif -Name: openldap2 +Name: openldap2%{name_suffix} Summary: An open source implementation of the Lightweight Directory Access Protocol License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Servers @@ -64,6 +70,10 @@ BuildRequires: unixODBC-devel # avoid cycle with krb5 BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(systemd) +%if "%flavor" == "contrib" +BuildRequires: gcc-c++ +BuildRequires: openldap2-devel +%endif %if %{suse_version} < 1500 %{?systemd_requires} %endif @@ -203,6 +213,26 @@ Recommends: libldap-data >= %{version_main} %description -n libldap-2_5-0 This package contains the OpenLDAP client libraries. +%package -n libldapcpp-devel +Summary: C++ wrapper around openLDAP API +Group: Development/Libraries/C and C++ +Requires: libldapcpp0 = %{version} +Requires: openldap2-devel + +%description -n libldapcpp-devel +This package contains files needed for development with the LDAP C++ +library. + +%package -n libldapcpp0 +Summary: C++ wrapper around openLDAP API +Group: Development/Libraries/C and C++ +Provides: ldapcpplib = %{version} +Obsoletes: ldapcpplib <= 0.0.5 + +%description -n libldapcpp0 +This package provides a C++ library for accessing LDAP (Version 3) +Servers + %prep # Unpack and patch OpenLDAP 2.5 %setup -q -a 9 -n openldap-%{version_main} @@ -213,6 +243,11 @@ This package contains the OpenLDAP client libraries. cp %{SOURCE5} . %build +%if "%flavor" == "contrib" +cd contrib/ldapc++ +%configure --disable-static +make %{?_smp_mflags} +%else %global _lto_cflags %{_lto_cflags} -ffat-lto-objects export CFLAGS="%{optflags} -Wno-format-extra-args -fno-strict-aliasing -DNDEBUG -DSLAP_CONFIG_DELETE -DSLAP_SCHEMA_EXPOSE -DLDAP_COLLECTIVE_ATTRIBUTES -DLDAP_USE_NON_BLOCKING_TLS" export STRIP="" @@ -259,6 +294,7 @@ make -C contrib/slapd-modules/smbk5pwd %{?_smp_mflags} "sysconfdir=%{_sysconfdir # Create ldap user %sysusers_generate_pre %{SOURCE19} ldap +%endif %check %if %run_test_suite @@ -286,6 +322,10 @@ make SLAPD_DEBUG=0 test %endif %install +%if "%flavor" == "contrib" +cd contrib/ldapc++ +%make_install +%else mkdir -p %{buildroot}%{_libdir}/openldap mkdir -p %{buildroot}/usr/lib/openldap mkdir -p %{buildroot}%{_sbindir} @@ -365,6 +405,7 @@ rm -f %{buildroot}%{_libdir}/*.la # Provide a libldap_r for backwards-compatibility with OpenLDAP < 2.5. ln -fs libldap.so "%{buildroot}%{_libdir}/libldap_r.so" +%endif %pre -f ldap.pre %service_add_pre slapd.service @@ -384,6 +425,19 @@ ln -fs libldap.so "%{buildroot}%{_libdir}/libldap_r.so" %postun %service_del_postun slapd.service +%if "%flavor" == "contrib" +%files -n libldapcpp-devel +%doc contrib/ldapc++/README +%_includedir/*.h +%_libdir/libldapcpp.la +%_libdir/libldapcpp.so + +%files -n libldapcpp0 +%_libdir/libldapcpp.so.0 +%_libdir/libldapcpp.so.0.0.0 + +%else + %files %defattr(-,root,root) %config %{_sysconfdir}/openldap/schema/*.schema @@ -551,4 +605,6 @@ ln -fs libldap.so "%{buildroot}%{_libdir}/libldap_r.so" %_libdir/liblber.a %_libdir/libldap*.a +%endif # !flavor:contrib + %changelog