[dev] Add missing dependency information to krb5 and libxml2 and upgrade libyaml (#581)

This commit is contained in:
Joe Schmitt 2021-02-01 10:30:35 -08:00 коммит произвёл GitHub
Родитель 47beffb7f4
Коммит 20715917f2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
9 изменённых файлов: 110 добавлений и 75 удалений

Просмотреть файл

@ -1,20 +1,20 @@
Summary: The Kerberos newtork authentication system
Name: krb5
Version: 1.17
Release: 3%{?dist}
Release: 4%{?dist}
License: MIT
URL: https://web.mit.edu/kerberos/
Group: System Environment/Security
Vendor: Microsoft Corporation
Distribution: Mariner
Group: System Environment/Security
URL: https://web.mit.edu/kerberos/
Source0: https://web.mit.edu/kerberos/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
Requires: openssl
Requires: e2fsprogs-libs
BuildRequires: openssl-devel
BuildRequires: e2fsprogs-devel
BuildRequires: openssl-devel
Requires: e2fsprogs-libs
Requires: openssl
Provides: pkgconfig(mit-krb5)
Provides: pkgconfig(mit-krb5-gssapi)
%description
Kerberos V5 is a trusted-third-party network authentication system,
which can improve your network's security by eliminating the insecure
@ -22,14 +22,17 @@ practice of clear text passwords.
%package devel
Summary: Libraries and header files for krb5
Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: e2fsprogs-devel
%description devel
Static libraries and header files for the support library for krb5
%package lang
Summary: Additional language files for krb5
Group: System Environment/Security
Requires: %{name} = %{version}-%{release}
Summary: Additional language files for krb5
Group: System Environment/Security
Requires: %{name} = %{version}-%{release}
%description lang
These are the additional language files of krb5.
@ -46,30 +49,30 @@ autoconf &&
--prefix=%{_prefix} \
--bindir=%{_bindir} \
--libdir=%{_libdir} \
--sysconfdir=/etc \
--localstatedir=/var/lib \
--with-system-et \
--with-system-ss \
--with-system-verto=no \
--enable-dns-for-realm \
--enable-pkinit \
--enable-shared \
--without-tcl
--sysconfdir=%{_sysconfdir} \
--localstatedir=%{_sharedstatedir} \
--with-system-et \
--with-system-ss \
--with-system-verto=no \
--enable-dns-for-realm \
--enable-pkinit \
--enable-shared \
--without-tcl
make %{?_smp_mflags}
%install
cd src
[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
make install DESTDIR=%{buildroot}
find %{buildroot}/%{_libdir} -name '*.la' -delete
find %{buildroot} -type f -name "*.la" -delete -print
for LIBRARY in gssapi_krb5 gssrpc k5crypto kadm5clnt kadm5srv \
kdb5 krad krb5 krb5support verto ; do
chmod -v 755 %{buildroot}/%{_libdir}/lib$LIBRARY.so
done
ln -v -sf %{buildroot}/%{_libdir}/libkrb5.so.3.3 /usr/lib/libkrb5.so
ln -v -sf %{buildroot}/%{_libdir}/libk5crypto.so.3.1 /usr/lib/libk5crypto.so
ln -v -sf %{buildroot}/%{_libdir}/libkrb5support.so.0.1 /usr/lib/libkrb5support.so
ln -v -sf %{buildroot}/%{_libdir}/libkrb5.so.3.3 %{_lib}/libkrb5.so
ln -v -sf %{buildroot}/%{_libdir}/libk5crypto.so.3.1 %{_lib}/libk5crypto.so
ln -v -sf %{buildroot}/%{_libdir}/libkrb5support.so.0.1 %{_lib}/libkrb5support.so
mv -v %{buildroot}/%{_bindir}/ksu /bin
chmod -v 755 /bin/ksu
@ -81,7 +84,7 @@ unset LIBRARY
%check
# krb5 tests require hostname resolve
echo "127.0.0.1 $HOSTNAME" >> /etc/hosts
echo "127.0.0.1 $HOSTNAME" >> %{_sysconfdir}/hosts
cd src
make check
@ -91,6 +94,7 @@ make check
%clean
rm -rf %{buildroot}/*
%files
%defattr(-,root,root)
%license doc/copyright.rst
@ -118,36 +122,53 @@ rm -rf %{buildroot}/*
%{_datarootdir}/locale/*
%changelog
* Fri Jul 31 12:53:00 PST 2020 Leandro Pereira <leperei@microsoft.com> - 1.17-3
* Fri Jan 29 2021 Joe Schmitt <joschmit@microsoft.com> - 1.17-4
- Add missing requires on e2fsprogs-devel in devel subpackage.
* Fri Jul 31 2020 Leandro Pereira <leperei@microsoft.com> - 1.17-3
- Don't stomp on CPPFLAGS
* Sat May 09 00:21:22 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.17-2
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 1.17-2
- Added %%license line automatically
* Tue Mar 17 2020 Henry Beberman <henry.beberman@microsoft.com> 1.17-1
- Update to 1.17. Fix Source0 URL. License verified.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.16.1-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Fri Sep 14 2018 Ankit Jain <ankitja@vmware.com> 1.16.1-1
- Update to version 1.16.1
* Wed Dec 13 2017 Xiaolin Li <xiaolinl@vmware.com> 1.16-1
- Update to version 1.16 to address CVE-2017-15088
* Thu Sep 28 2017 Xiaolin Li <xiaolinl@vmware.com> 1.15.2-1
- Update to version 1.15.2
* Mon Jul 10 2017 Alexey Makhalov <amakhalov@vmware.com> 1.15.1-2
- Fix make check: add /etc/hosts entry, disable parallel check
* Mon Apr 03 2017 Divya Thaluru <dthaluru@vmware.com> 1.15.1-1
- Updated to version 1.51.1
* Wed Nov 23 2016 Alexey Makhalov <amakhalov@vmware.com> 1.14-6
- Added -lang and -devel subpackages
* Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 1.14-5
- Use e2fsprogs-libs as runtime deps
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.14-4
- GA - Bump release of all rpms
* Mon Mar 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.14-3
- Add patch to never unload gssapi mechanisms
* Fri Mar 18 2016 Anish Swaminathan <anishs@vmware.com> 1.14-2
- Add patch for skipping unnecessary mech calls in gss_inquire_cred
* Thu Jan 21 2016 Anish Swaminathan <anishs@vmware.com> 1.14-1
- Upgrade version
* Tue Oct 07 2014 Divya Thaluru <dthaluru@vmware.com> 1.12.2-1
- Initial build. First version

Просмотреть файл

@ -3,7 +3,7 @@
Summary: Libxml2
Name: libxml2
Version: 2.9.10
Release: 4%{?dist}
Release: 5%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
@ -37,6 +37,7 @@ Summary: Python 3 bindings for libxml2.
Group: Development/Libraries
Requires: %{name} = %{version}
Requires: python3
Provides: %{name}-python3 = %{version}-%{release}
%description -n python3-libxml2
Python3 libxml2.
@ -107,6 +108,9 @@ rm -rf %{buildroot}/*
%{_libdir}/cmake/libxml2/libxml2-config.cmake
%changelog
* Fri Jan 29 2021 Joe Schmitt <joschmit@microsoft.com> - 2.9.10-5
- Provide libxml2-python3.
* Tue Dec 01 2020 Joe Schmitt <joschmit@microsoft.com> - 2.9.10-4
- Provide libxml-tools and libxml2-tools.

Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"yaml-0.2.1.tar.gz": "78281145641a080fb32d6e7a87b9c0664d611dcb4d542e90baf731f51cbb59cd"
"yaml-0.2.5.tar.gz": "c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4"
}
}

Просмотреть файл

@ -1,23 +1,22 @@
Summary: Implementation of a YAML 1.1 parser and emitter
Name: libyaml
Version: 0.2.1
Release: 3%{?dist}
License: MIT
Group: Development/Libraries
URL: http://pyyaml.org/wiki/LibYAML
Summary: Implementation of a YAML 1.1 parser and emitter
Name: libyaml
Version: 0.2.5
Release: 1%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Source0: http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz
%define sha1 yaml=125a3113681f06320dcdfde48bab47cba9031263
Group: Development/Libraries
URL: https://pyyaml.org/wiki/LibYAML
Source0: https://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz
%description
LibYAML is a C library implementation of a YAML 1.1 parser and emitter.
It includes a Python language binding.
%package devel
Summary: Header files, libraries and development documentation for %{name}.
Group: Development/Libraries
Requires: %{name}
Summary: Header files, libraries and development documentation for %{name}.
Group: Development/Libraries
Requires: %{name}
%description devel
This package contains the header files, static libraries and development
@ -25,15 +24,14 @@ documentation for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.
%prep
%setup -n yaml-%{version}
%setup -q -n yaml-%{version}
%build
%configure --disable-static
%{__make} %{?_smp_mflags} AM_CFLAGS=""
make %{?_smp_mflags} AM_CFLAGS=""
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
make install DESTDIR=%{buildroot}
%check
make %{?_smp_mflags} check
@ -42,12 +40,13 @@ make %{?_smp_mflags} check
%postun -p /sbin/ldconfig
%clean
%{__rm} -rf %{buildroot}
rm -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%license LICENSE
%doc LICENSE README
%license License
%doc ReadMe.md
%{_libdir}/libyaml-0.so.*
%files devel
@ -58,20 +57,31 @@ make %{?_smp_mflags} check
%exclude %{_libdir}/*.la
%changelog
* Sat May 09 00:20:44 PST 2020 Nick Samson <nisamson@microsoft.com> - 0.2.1-3
* Fri Jan 29 2021 Joe Schmitt <joschmit@microsoft.com> - 0.2.5-1
- Upgrade to v0.2.5.
- Update license and readme file names.
- Update Source0 to use https.
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 0.2.1-3
- Added %%license line automatically
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 0.2.1-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Wed Sep 05 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 0.2.1-1
- Update to version 0.2.1
* Fri Apr 14 2017 Kumar Kaushik <kaushikk@vmware.com> 0.1.7-1
- Updating version to 0.1.7
* Mon Oct 03 2016 Chang Lee <changlee@vmware.com> 0.1.6-4
- Modified check
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.1.6-3
- GA - Bump release of all rpms
* Fri Aug 14 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.1.6-2
- Fix cve-2014-9130.
* Mon Apr 6 2015 Divya Thaluru <dthaluru@vmware.com> 0.1.6-1
- Initial package for Photon.

Просмотреть файл

@ -2896,8 +2896,8 @@
"type": "other",
"other": {
"name": "libyaml",
"version": "0.2.1",
"downloadUrl": "http://pyyaml.org/download/libyaml/yaml-0.2.1.tar.gz"
"version": "0.2.5",
"downloadUrl": "https://pyyaml.org/download/libyaml/yaml-0.2.5.tar.gz"
}
}
},

Просмотреть файл

@ -196,13 +196,13 @@ tdnf-cli-libs-2.1.0-4.cm1.aarch64.rpm
tdnf-devel-2.1.0-4.cm1.aarch64.rpm
tdnf-plugin-repogpgcheck-2.1.0-4.cm1.aarch64.rpm
createrepo_c-0.11.1-6.cm1.aarch64.rpm
libxml2-2.9.10-4.cm1.aarch64.rpm
libxml2-devel-2.9.10-4.cm1.aarch64.rpm
libxml2-2.9.10-5.cm1.aarch64.rpm
libxml2-devel-2.9.10-5.cm1.aarch64.rpm
glib-2.58.0-10.cm1.aarch64.rpm
libltdl-2.4.6-6.cm1.aarch64.rpm
libltdl-devel-2.4.6-6.cm1.aarch64.rpm
pcre-libs-8.42-4.cm1.aarch64.rpm
krb5-1.17-3.cm1.aarch64.rpm
krb5-1.17-4.cm1.aarch64.rpm
lua-5.3.5-11.cm1.aarch64.rpm
lua-libs-5.3.5-11.cm1.aarch64.rpm
mariner-rpm-macros-1.0-12.cm1.noarch.rpm

Просмотреть файл

@ -196,13 +196,13 @@ tdnf-cli-libs-2.1.0-4.cm1.x86_64.rpm
tdnf-devel-2.1.0-4.cm1.x86_64.rpm
tdnf-plugin-repogpgcheck-2.1.0-4.cm1.x86_64.rpm
createrepo_c-0.11.1-6.cm1.x86_64.rpm
libxml2-2.9.10-4.cm1.x86_64.rpm
libxml2-devel-2.9.10-4.cm1.x86_64.rpm
libxml2-2.9.10-5.cm1.x86_64.rpm
libxml2-devel-2.9.10-5.cm1.x86_64.rpm
glib-2.58.0-10.cm1.x86_64.rpm
libltdl-2.4.6-6.cm1.x86_64.rpm
libltdl-devel-2.4.6-6.cm1.x86_64.rpm
pcre-libs-8.42-4.cm1.x86_64.rpm
krb5-1.17-3.cm1.x86_64.rpm
krb5-1.17-4.cm1.x86_64.rpm
lua-5.3.5-11.cm1.x86_64.rpm
lua-libs-5.3.5-11.cm1.x86_64.rpm
mariner-rpm-macros-1.0-12.cm1.noarch.rpm

Просмотреть файл

@ -155,10 +155,10 @@ kernel-headers-5.4.51-12.cm1.noarch.rpm
kmod-25-5.cm1.aarch64.rpm
kmod-debuginfo-25-5.cm1.aarch64.rpm
kmod-devel-25-5.cm1.aarch64.rpm
krb5-1.17-3.cm1.aarch64.rpm
krb5-debuginfo-1.17-3.cm1.aarch64.rpm
krb5-devel-1.17-3.cm1.aarch64.rpm
krb5-lang-1.17-3.cm1.aarch64.rpm
krb5-1.17-4.cm1.aarch64.rpm
krb5-debuginfo-1.17-4.cm1.aarch64.rpm
krb5-devel-1.17-4.cm1.aarch64.rpm
krb5-lang-1.17-4.cm1.aarch64.rpm
libaio-0.3.112-2.cm1.aarch64.rpm
libaio-debuginfo-0.3.112-2.cm1.aarch64.rpm
libaio-devel-0.3.112-2.cm1.aarch64.rpm
@ -227,10 +227,10 @@ libtasn1-debuginfo-4.14-2.cm1.aarch64.rpm
libtasn1-devel-4.14-2.cm1.aarch64.rpm
libtool-2.4.6-6.cm1.aarch64.rpm
libtool-debuginfo-2.4.6-6.cm1.aarch64.rpm
libxml2-2.9.10-4.cm1.aarch64.rpm
libxml2-debuginfo-2.9.10-4.cm1.aarch64.rpm
libxml2-devel-2.9.10-4.cm1.aarch64.rpm
libxml2-python-2.9.10-4.cm1.aarch64.rpm
libxml2-2.9.10-5.cm1.aarch64.rpm
libxml2-debuginfo-2.9.10-5.cm1.aarch64.rpm
libxml2-devel-2.9.10-5.cm1.aarch64.rpm
libxml2-python-2.9.10-5.cm1.aarch64.rpm
libxslt-1.1.34-3.cm1.aarch64.rpm
libxslt-debuginfo-1.1.34-3.cm1.aarch64.rpm
libxslt-devel-1.1.34-3.cm1.aarch64.rpm
@ -531,7 +531,7 @@ python3-debuginfo-3.7.7-7.cm1.aarch64.rpm
python3-devel-3.7.7-7.cm1.aarch64.rpm
python3-gpg-1.13.1-5.cm1.aarch64.rpm
python3-libs-3.7.7-7.cm1.aarch64.rpm
python3-libxml2-2.9.10-4.cm1.aarch64.rpm
python3-libxml2-2.9.10-5.cm1.aarch64.rpm
python3-pip-3.7.7-7.cm1.noarch.rpm
python3-pwquality-1.4.2-4.cm1.aarch64.rpm
python3-rpm-4.14.2-13.cm1.aarch64.rpm

Просмотреть файл

@ -155,10 +155,10 @@ kernel-headers-5.4.51-12.cm1.noarch.rpm
kmod-25-5.cm1.x86_64.rpm
kmod-debuginfo-25-5.cm1.x86_64.rpm
kmod-devel-25-5.cm1.x86_64.rpm
krb5-1.17-3.cm1.x86_64.rpm
krb5-debuginfo-1.17-3.cm1.x86_64.rpm
krb5-devel-1.17-3.cm1.x86_64.rpm
krb5-lang-1.17-3.cm1.x86_64.rpm
krb5-1.17-4.cm1.x86_64.rpm
krb5-debuginfo-1.17-4.cm1.x86_64.rpm
krb5-devel-1.17-4.cm1.x86_64.rpm
krb5-lang-1.17-4.cm1.x86_64.rpm
libaio-0.3.112-2.cm1.x86_64.rpm
libaio-debuginfo-0.3.112-2.cm1.x86_64.rpm
libaio-devel-0.3.112-2.cm1.x86_64.rpm
@ -227,10 +227,10 @@ libtasn1-debuginfo-4.14-2.cm1.x86_64.rpm
libtasn1-devel-4.14-2.cm1.x86_64.rpm
libtool-2.4.6-6.cm1.x86_64.rpm
libtool-debuginfo-2.4.6-6.cm1.x86_64.rpm
libxml2-2.9.10-4.cm1.x86_64.rpm
libxml2-debuginfo-2.9.10-4.cm1.x86_64.rpm
libxml2-devel-2.9.10-4.cm1.x86_64.rpm
libxml2-python-2.9.10-4.cm1.x86_64.rpm
libxml2-2.9.10-5.cm1.x86_64.rpm
libxml2-debuginfo-2.9.10-5.cm1.x86_64.rpm
libxml2-devel-2.9.10-5.cm1.x86_64.rpm
libxml2-python-2.9.10-5.cm1.x86_64.rpm
libxslt-1.1.34-3.cm1.x86_64.rpm
libxslt-debuginfo-1.1.34-3.cm1.x86_64.rpm
libxslt-devel-1.1.34-3.cm1.x86_64.rpm
@ -531,7 +531,7 @@ python3-debuginfo-3.7.7-7.cm1.x86_64.rpm
python3-devel-3.7.7-7.cm1.x86_64.rpm
python3-gpg-1.13.1-5.cm1.x86_64.rpm
python3-libs-3.7.7-7.cm1.x86_64.rpm
python3-libxml2-2.9.10-4.cm1.x86_64.rpm
python3-libxml2-2.9.10-5.cm1.x86_64.rpm
python3-pip-3.7.7-7.cm1.noarch.rpm
python3-pwquality-1.4.2-4.cm1.x86_64.rpm
python3-rpm-4.14.2-13.cm1.x86_64.rpm