Let openldap depend on cyrus-sasl (#4767)
* Let openldap depend on cyrus-sasl * Let openldap depend on cyrus-sasl-bootstrap instead of cyrus-sasl in order to avoid a circular dependency. * Add changelog
This commit is contained in:
Sriram Nambakam
GitHub
Родитель
bf891f5633
Коммит
ae58625333
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
|
@ -2524,6 +2524,7 @@
|
|||
"cronie",
|
||||
"curl",
|
||||
"cyrus-sasl",
|
||||
"cyrus-sasl-bootstrap",
|
||||
"dbus",
|
||||
"dbus-glib",
|
||||
"dejagnu",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"cyrus-sasl-2.1.28.tar.gz": "7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,286 @@
|
|||
%define _soversion 3
|
||||
%global _plugindir2 %{_libdir}/sasl2
|
||||
%global _base_name cyrus-sasl
|
||||
|
||||
Summary: Cyrus Simple Authentication Service Layer (SASL) library
|
||||
Name: %{_base_name}-bootstrap
|
||||
Version: 2.1.28
|
||||
Release: 2%{?dist}
|
||||
License: BSD with advertising
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: System Environment/Security
|
||||
URL: https://www.cyrusimap.org/sasl/
|
||||
Source0: https://github.com/cyrusimap/%{_base_name}/releases/download/%{_base_name}-%{version}/%{_base_name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: krb5-devel >= 1.12
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: systemd
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
Requires: krb5 >= 1.12
|
||||
Requires: openssl
|
||||
Requires: pam
|
||||
Requires: systemd
|
||||
Requires: libdb
|
||||
|
||||
%description
|
||||
The Cyrus SASL package contains a Simple Authentication and Security
|
||||
Layer, a method for adding authentication support to
|
||||
connection-based protocols. To use SASL, a protocol includes a command
|
||||
for identifying and authenticating a user to a server and for
|
||||
optionally negotiating protection of subsequent protocol interactions.
|
||||
If its use is negotiated, a security layer is inserted between the
|
||||
protocol and the connection.
|
||||
|
||||
%package devel
|
||||
Summary: Files needed for developing applications with Cyrus SASL
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
Requires: pkg-config
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains files needed for developing and
|
||||
compiling applications which use the Cyrus SASL library.
|
||||
|
||||
%package lib
|
||||
Summary: Shared libraries needed by applications which use Cyrus SASL
|
||||
|
||||
%description lib
|
||||
The %{name}-lib package contains shared libraries which are needed by
|
||||
applications which use the Cyrus SASL library.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{_base_name}-%{version} -p1
|
||||
|
||||
%build
|
||||
|
||||
autoreconf -fi
|
||||
%configure \
|
||||
CFLAGS="%{optflags} -fPIC" \
|
||||
CXXFLAGS="%{optflags}" \
|
||||
--disable-macos-framework \
|
||||
--disable-otp \
|
||||
--disable-sample \
|
||||
--disable-srp \
|
||||
--disable-static \
|
||||
--enable-anon \
|
||||
--enable-digest \
|
||||
--enable-fast-install \
|
||||
--enable-gss_mutexes \
|
||||
--enable-krb4 \
|
||||
--enable-login \
|
||||
--enable-ntlm \
|
||||
--enable-plain \
|
||||
--enable-shared \
|
||||
--with-plugindir=%{_plugindir2} \
|
||||
--with-saslauthd=/run/saslauthd \
|
||||
--without-authdaemond \
|
||||
--without-sqlite
|
||||
|
||||
make
|
||||
|
||||
%install
|
||||
[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
|
||||
make DESTDIR=%{buildroot} install
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
install -D -m644 COPYING %{buildroot}%{_datadir}/licenses/%{name}/LICENSE
|
||||
%{_fixperms} %{buildroot}/*
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
|
||||
cat << EOF >> %{buildroot}/%{_sysconfdir}/sysconfig/saslauthd
|
||||
# Directory in which to place saslauthd's listening socket, pid file, and so
|
||||
# on. This directory must already exist.
|
||||
SOCKETDIR=/run/saslauthd
|
||||
|
||||
# Mechanism to use when checking passwords. Run "saslauthd -v" to get a list
|
||||
# of which mechanism your installation was compiled with the ablity to use.
|
||||
MECH=pam
|
||||
|
||||
# Additional flags to pass to saslauthd on the command line. See saslauthd(8)
|
||||
# for the list of accepted flags.
|
||||
FLAGS=
|
||||
EOF
|
||||
|
||||
mkdir -p %{buildroot}/lib/systemd/system
|
||||
cat << EOF >> %{buildroot}/lib/systemd/system/saslauthd.service
|
||||
[Unit]
|
||||
Description=SASL authentication daemon.
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
PIDFile=/run/saslauthd/saslauthd.pid
|
||||
EnvironmentFile=%{_sysconfdir}/sysconfig/saslauthd
|
||||
ExecStart=%{_sbindir}/saslauthd -m \$SOCKETDIR -a \$MECH \$FLAGS
|
||||
RuntimeDirectory=saslauthd
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
|
||||
install -vdm755 %{buildroot}%{_libdir}/systemd/system-preset
|
||||
echo "disable saslauthd.service" > %{buildroot}%{_libdir}/systemd/system-preset/50-saslauthd.preset
|
||||
|
||||
%check
|
||||
make %{?_smp_mflags} check
|
||||
|
||||
%post
|
||||
%{_sbindir}/ldconfig
|
||||
%systemd_post saslauthd.service
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%systemd_postun_with_restart saslauthd.service
|
||||
|
||||
%preun
|
||||
%systemd_preun saslauthd.service
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license COPYING
|
||||
%{_sysconfdir}/sysconfig/saslauthd
|
||||
/lib/systemd/system/saslauthd.service
|
||||
%{_libdir}/systemd/system-preset/50-saslauthd.preset
|
||||
%{_sbindir}/*
|
||||
%{_datadir}/licenses/%{name}/LICENSE
|
||||
%{_mandir}/man8/*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/*
|
||||
%{_libdir}/libsasl2.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%files lib
|
||||
%license COPYING
|
||||
%doc AUTHORS doc/html/*.html
|
||||
%{_libdir}/libsasl2.so.%{_soversion}*
|
||||
%dir %{_plugindir2}/
|
||||
%{_plugindir2}/libanonymous.so
|
||||
%{_plugindir2}/libanonymous.so.%{_soversion}*
|
||||
%{_plugindir2}/libsasldb.so
|
||||
%{_plugindir2}/libsasldb.so.%{_soversion}*
|
||||
%{_sbindir}/saslpasswd2
|
||||
%{_sbindir}/sasldblistusers2
|
||||
|
||||
%exclude %{_plugindir2}/libgs2.so
|
||||
%exclude %{_plugindir2}/libgs2.so.%{_soversion}*
|
||||
|
||||
%exclude %{_plugindir2}/libgssapiv2.so
|
||||
%exclude %{_plugindir2}/libgssapiv2.so.%{_soversion}*
|
||||
|
||||
%exclude %{_plugindir2}/libcrammd5.so
|
||||
%exclude %{_plugindir2}/libcrammd5.so.%{_soversion}*
|
||||
%exclude %{_plugindir2}/libdigestmd5.so
|
||||
%exclude %{_plugindir2}/libdigestmd5.so.%{_soversion}*
|
||||
|
||||
%exclude %{_plugindir2}/libntlm.so
|
||||
%exclude %{_plugindir2}/libntlm.so.%{_soversion}*
|
||||
|
||||
%exclude %{_plugindir2}/liblogin.so
|
||||
%exclude %{_plugindir2}/liblogin.so.%{_soversion}*
|
||||
%exclude %{_plugindir2}/libplain.so
|
||||
%exclude %{_plugindir2}/libplain.so.%{_soversion}*
|
||||
|
||||
%exclude %{_plugindir2}/libscram.so
|
||||
%exclude %{_plugindir2}/libscram.so.%{_soversion}*
|
||||
|
||||
%exclude %{_plugindir2}/libsql.so
|
||||
%exclude %{_plugindir2}/libsql.so.%{_soversion}*
|
||||
|
||||
%changelog
|
||||
* Fri Feb 03 2023 Sriram Nambakam <snambakam@microsoft.com> - 2.1.28-2
|
||||
- Create cyrus-sasl-bootstrap spec to help resolve circular dependencies
|
||||
|
||||
* Wed Mar 09 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.1.28-1
|
||||
- Updating to version 2.1.28 to address CVE-2022-24407.
|
||||
|
||||
* Tue Nov 30 2021 Mateusz Malisz <mamalisz@microsoft.com> - 2.1.27-10
|
||||
- Add libdb as an explicit dependency.
|
||||
|
||||
* Tue Sep 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.1.27-9
|
||||
- Introduced following subpackages using Fedora 32 (license: MIT) specs as guidance:
|
||||
- cyrus-sasl-gs2,
|
||||
- cyrus-sasl-ldap,
|
||||
- cyrus-sasl-lib,
|
||||
- cyrus-sasl-md5,
|
||||
- cyrus-sasl-ntlm,
|
||||
- cyrus-sasl-plain,
|
||||
- cyrus-sasl-scram,
|
||||
- cyrus-sasl-sql.
|
||||
- Moving common libs into the "*-devel" and "*-libs" subpackages.
|
||||
- Moving MD5 plug-in libs into the "*-md5" subpackage.
|
||||
- Removed SRP libs as they were unused.
|
||||
|
||||
* Fri Apr 02 2021 Thomas Crain <thcrain@microsoft.com> - 2.1.27-8
|
||||
- Merge the following releases from 1.0 to dev branch
|
||||
- thcrain@microsoft.com, 2.1.27-5: Add nopatch for CVE-2020-8032, Lint spec
|
||||
|
||||
* Tue Jan 12 2021 Ruying Chen <v-ruyche@microsoft.com> - 2.1.27-7
|
||||
- Provide cyrus-sasl-plain.
|
||||
|
||||
* Thu Dec 10 2020 Joe Schmitt <joschmit@microsoft.com> - 2.1.27-6
|
||||
- Provide cyrus-sasl-gssapi and isa version.
|
||||
|
||||
* Tue Nov 03 2020 Joe Schmitt <joschmit@microsoft.com> - 2.1.27-5
|
||||
- Provide cyrus-sasl-devel.
|
||||
|
||||
* Thu May 28 2020 Andrew Phelps <anphel@microsoft.com> 2.1.27-4
|
||||
- Add patch to fix CVE-2019-19906
|
||||
|
||||
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 2.1.27-3
|
||||
- Added %%license line automatically
|
||||
|
||||
* Tue Apr 28 2020 Emre Girgin <mrgirgin@microsoft.com> 2.1.27-2
|
||||
- Renaming Linux-PAM to pam
|
||||
|
||||
* Wed Mar 25 2020 Nicolas Ontiveros <niontive@microsoft.com> 2.1.27-1
|
||||
- Update version to 2.1.27. License verified. URL and Source0 updated.
|
||||
|
||||
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.1.26-15
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
|
||||
* Tue Nov 21 2017 Anish Swaminathan <anishs@vmware.com> 2.1.26-14
|
||||
- Update patch for memory leak fix
|
||||
|
||||
* Tue Oct 10 2017 Anish Swaminathan <anishs@vmware.com> 2.1.26-13
|
||||
- Add patch for memory leak fix
|
||||
|
||||
* Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com> 2.1.26-12
|
||||
- Disabled saslauthd service by default
|
||||
|
||||
* Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 2.1.26-11
|
||||
- BuildRequires Linux-PAM-devel
|
||||
|
||||
* Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 2.1.26-10
|
||||
- Required krb5-devel.
|
||||
|
||||
* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 2.1.26-9
|
||||
- Modified %check
|
||||
|
||||
* Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 2.1.26-8
|
||||
- Fixed logic to restart the active services after upgrade
|
||||
|
||||
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.26-7
|
||||
- GA - Bump release of all rpms
|
||||
|
||||
* Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com> 2.1.26-6
|
||||
- Fixing spec file to handle rpm upgrade scenario correctly
|
||||
|
||||
* Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com> 2.1.26-5
|
||||
- Add systemd to Requires and BuildRequires.
|
||||
|
||||
* Wed Nov 11 2015 Xiaolin Li <xiaolinl@vmware.com> 2.1.26-4
|
||||
- Add saslauthd service to systemd.
|
||||
|
||||
* Tue Sep 01 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.1.26-3
|
||||
- Enable CRAM.
|
||||
|
||||
* Thu Jul 16 2015 Divya Thaluru <dthaluru@vmware.com> 2.1.26-2
|
||||
- Disabling parallel threads in make
|
||||
|
||||
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.1.26-1
|
||||
- Initial build. First version
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
Summary: Cyrus Simple Authentication Service Layer (SASL) library
|
||||
Name: cyrus-sasl
|
||||
Version: 2.1.28
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: BSD with advertising
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -30,6 +30,8 @@ Requires: pam
|
|||
Requires: systemd
|
||||
Requires: libdb
|
||||
|
||||
Obsoletes: %{name}-bootstrap
|
||||
|
||||
%description
|
||||
The Cyrus SASL package contains a Simple Authentication and Security
|
||||
Layer, a method for adding authentication support to
|
||||
|
|
@ -45,6 +47,7 @@ Summary: Files needed for developing applications with Cyrus SASL
|
|||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
Requires: pkg-config
|
||||
Obsoletes: %{name}-bootstrap-devel
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains files needed for developing and
|
||||
|
|
@ -89,6 +92,7 @@ applications which use the Cyrus SASL library.
|
|||
Summary: CRAM-MD5 and DIGEST-MD5 authentication support for Cyrus SASL
|
||||
|
||||
Requires: %{name}-lib = %{version}-%{release}
|
||||
Obsoletes: %{name}-bootstrap-lib
|
||||
|
||||
%description md5
|
||||
The %{name}-md5 package contains the Cyrus SASL plugins which support
|
||||
|
|
@ -306,6 +310,9 @@ make %{?_smp_mflags} check
|
|||
%{_plugindir2}/libsql.so.%{_soversion}*
|
||||
|
||||
%changelog
|
||||
* Mon Feb 13 2023 Sriram Nambakam <snambakam@microsoft.com> - 2.1.28-2
|
||||
- Indicate this package obsoletes cyrus-sasl-bootstrap
|
||||
|
||||
* Wed Mar 09 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.1.28-1
|
||||
- Updating to version 2.1.28 to address CVE-2022-24407.
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Summary: OpenLDAP (Lightweight Directory Access Protocol)
|
||||
Name: openldap
|
||||
Version: 2.4.57
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
License: OpenLDAP
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
|
|
@ -15,6 +15,7 @@ Patch1: openldap-2.4.44-consolidated-2.patch
|
|||
Patch2: CVE-2015-3276.patch
|
||||
Patch3: CVE-2021-27212.patch
|
||||
Patch4: CVE-2022-29155.patch
|
||||
BuildRequires: cyrus-sasl-bootstrap-devel >= 2.1
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: groff
|
||||
BuildRequires: openssl-devel >= 1.0.1
|
||||
|
|
@ -44,8 +45,7 @@ export CPPFLAGS="${CPPFLAGS} -D_REENTRANT -DLDAP_CONNECTIONLESS -D_GNU_SOURCE -D
|
|||
--enable-dynamic \
|
||||
--disable-debug \
|
||||
--disable-slapd \
|
||||
--with-tls=openssl \
|
||||
--without-cyrus-sasl
|
||||
--with-tls=openssl
|
||||
%make_build depend
|
||||
%make_build
|
||||
|
||||
|
|
@ -72,6 +72,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
|||
%{_sysconfdir}/openldap/*
|
||||
|
||||
%changelog
|
||||
* Fri Feb 10 2023 Sriram Nambakam <snambakam@microsoft.com> - 2.4.57-8
|
||||
- Let openldap depend on cyrus-sasl.
|
||||
|
||||
* Wed Jun 01 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 2.4.57-7
|
||||
- Fix CVE-2022-29155
|
||||
|
||||
|
|
@ -153,4 +156,4 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
|||
- Patches for CVE-2015-1545 and CVE-2015-1546.
|
||||
|
||||
* Wed Oct 08 2014 Divya Thaluru <dthaluru@vmware.com> 2.4.40-1
|
||||
- Initial build. First version
|
||||
- Initial build. First version
|
||||
|
|
|
|||
|
|
@ -2332,6 +2332,16 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
"other": {
|
||||
"name": "cyrus-sasl-bootstrap",
|
||||
"version": "2.1.28",
|
||||
"downloadUrl": "https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
|
|
|
|||
|
|
@ -37,6 +37,10 @@ version_release_matching_groups = [
|
|||
frozenset([
|
||||
"SPECS/jflex/jflex.spec",
|
||||
"SPECS/jflex/jflex-bootstrap.spec"
|
||||
]),
|
||||
frozenset([
|
||||
"SPECS/cyrus-sasl/cyrus-sasl.spec",
|
||||
"SPECS/cyrus-sasl-bootstrap/cyrus-sasl-bootstrap.spec"
|
||||
])
|
||||
]
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче