microsoft
/
CBL-Mariner
зеркало из https://github.com/microsoft/CBL-Mariner.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update glib, libsepol, python-sphinx, python-sqlalchemy, python-virtualenv (#659) 

* save changes

* update glib, libsepol

* update toolchain manifests and cgmanifest

* resolve linting and source url for libsepol

* fix comments

* update python-sphinx

* fix libsepol changelog

Co-authored-by: Henry Li <lihl@microsoft.com>
This commit is contained in:
Henry Li 2021-02-24 13:02:31 -08:00 коммит произвёл GitHub
Родитель e67e18e01a
Коммит e6e4018f45
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 96 добавлений и 61 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
SPECS/glib/glib.spec
Просмотреть файл

@ -1,7 +1,7 @@
Summary: Low-level libraries useful for providing data structure handling for C.
Name: glib
Version: 2.58.0
Release: 10%{?dist}
Release: 11%{?dist}
License: LGPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
@ -94,9 +94,9 @@ make DESTDIR=%{buildroot} install
%{_libdir}/glib-*/*
%{_includedir}/*
%{_datadir}/*
%exclude %{_bindir}/glib-compile-schemas
%exclude %{_bindir}/gsettings
%exclude %{_datadir}/glib-2.0/schemas/*
%{_bindir}/glib-compile-schemas
%{_bindir}/gsettings
%{_datadir}/glib-2.0/schemas/*
%files schemas
%defattr(-, root, root)
@ -105,6 +105,9 @@ make DESTDIR=%{buildroot} install
%{_datadir}/glib-2.0/schemas/*
%changelog
* Tue Feb 23 2021 Henry Li <lihl@microsoft.com> - 2.58.0-11
- Fix file section for glib-devel.
* Tue Jan 12 2021 Ruying Chen <v-ruyche@microsoft.com> - 2.58.0-10
- Build static library and provide glib2-static.

2
SPECS/libsepol/libsepol.signatures.json
Просмотреть файл

@ -1,6 +1,6 @@
{
"Signatures": {
"CUnit-2.1-2-src.tar.bz2": "1f705f30b36fe1dadb5494989d1d663241603f456b468c81f606a1bdbc168bea",
"libsepol-2.9.tar.gz": "a34b12b038d121e3e459b1cbaca3c9202e983137819c16baf63658390e3f1d5d"
"libsepol-3.1.tar.gz": "ae6778d01443fdd38cd30eeee846494e19f4d407b09872580372f4aa4bf8a3cc"
}
}

49
SPECS/libsepol/libsepol.spec
Просмотреть файл

@ -1,14 +1,14 @@
Summary: SELinux binary policy manipulation library
Name: libsepol
Version: 2.9
Release: 7%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.selinuxproject.org
Source0: https://github.com/SELinuxProject/selinux/releases/download/20190315/%{name}-%{version}.tar.gz
Source1: https://sourceforge.net/projects/cunit/files/CUnit-2.1-2-src.tar.bz2
Summary: SELinux binary policy manipulation library
Name: libsepol
Version: 3.1
Release: 1%{?dist}
License: LGPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
Group: System Environment/Libraries
URL: http://www.selinuxproject.org
Source0: https://github.com/SELinuxProject/selinux/releases/download/20200710/%{name}-%{version}.tar.gz
Source1: https://sourceforge.net/projects/cunit/files/CUnit-2.1-2-src.tar.bz2
%description
Security-enhanced Linux is a feature of the Linux® kernel and a number
@ -27,18 +27,18 @@ as by programs like load_policy that need to perform specific transformations
on binary policies such as customizing policy boolean settings.
%package devel
Summary: Header files and libraries used to build policy manipulation tools
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Provides: pkgconfig(libsepol) = %{version}-%{release}
Provides: %{name}-static = %{version}-%{release}
Summary: Header files and libraries used to build policy manipulation tools
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Provides: pkgconfig(libsepol) = %{version}-%{release}
Provides: %{name}-static = %{version}-%{release}
%description devel
The libsepol-devel package contains the libraries and header files
needed for developing applications that manipulate binary policies.
%prep
%setup -qn %{name}-%{version}
%setup -q
sed -i 's/int rc;/int rc = SEPOL_OK;/' ./cil/src/cil_binary.c
tar xf %{SOURCE1} --no-same-owner
@ -53,7 +53,7 @@ mkdir -p %{buildroot}%{_includedir}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_mandir}/man3
mkdir -p %{buildroot}%{_mandir}/man8
make DESTDIR="%{buildroot}" LIBDIR="%{_libdir}" SHLIBDIR="%{_libdir}" install
make DESTDIR=%{buildroot} LIBDIR="%{_libdir}" SHLIBDIR="%{_libdir}" install
rm -f %{buildroot}%{_bindir}/genpolbools
rm -f %{buildroot}%{_bindir}/genpolusers
rm -f %{buildroot}%{_bindir}/chkcon
@ -62,7 +62,7 @@ rm -rf %{buildroot}%{_mandir}/ru/man8
%check
pushd CUnit-2.1-2/
./configure --prefix=/usr
./configure --prefix=%{_prefix}
make
make install
popd
@ -70,6 +70,7 @@ popd
%clean
rm -rf %{buildroot}
%post
/sbin/ldconfig
[ -x /sbin/telinit ] && [ -p /dev/initctl ] && /sbin/telinit U
@ -95,30 +96,44 @@ exit 0
%{_libdir}/libsepol.so.1
%changelog
* Tue Feb 23 2021 Henry Li <lihl@microsoft.com> - 3.1-1
- Upgrade libsepol to version 3.1
* Fri Feb 05 2021 Joe Schmitt <joschmit@microsoft.com> - 2.9-7
- Replace incorrect %%{_lib} usage with %%{_libdir}
* Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 2.9-6
- Add explicit provide for libsepol-static
* Tue Jun 09 2020 Nicolas Ontiveros <niontive@microsoft.com> 2.9-5
- Remove unused "systemd-bootstrap" from requires.
* Fri May 29 2020 Nicolas Ontiveros <niontive@microsoft.com> 2.9-4
- Use "systemd-bootstrap" to break circular dependencies.
* Sat May 09 00:21:36 PST 2020 Nick Samson <nisamson@microsoft.com> 2.9-3
- Added %%license line automatically
* Tue Mar 24 2020 Henry Beberman <henry.beberman@microsoft.com> 2.9-2
- Add cflags to make to fix gcc9 compatibility.
* Tue Mar 17 2020 Henry Beberman <henry.beberman@microsoft.com> 2.9-1
- Update to 2.9. Fix Source0 URL. License verified.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.8-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Fri Aug 10 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 2.8-1
- Update to version 2.8 to get it to build with gcc 7.3
* Tue Apr 04 2017 Kumar Kaushik <kaushikk@vmware.com> 2.6-1
- Updating version to 2.6
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.5-2
- GA - Bump release of all rpms
* Fri Jan 22 2016 Xiaolin Li <xiaolinl@vmware.com> 2.5-1
- Updated to version 2.5
* Wed Feb 25 2015 Divya Thaluru <dthaluru@vmware.com> 2.4-1
- Initial build. First version

7
SPECS/python-sphinx/python-sphinx.spec
Просмотреть файл

@ -4,7 +4,7 @@
Summary: Python documentation generator
Name: python-sphinx
Version: 1.7.9
Release: 13%{?dist}
Release: 14%{?dist}
License: BSD
Vendor: Microsoft Corporation
Distribution: Mariner
@ -43,6 +43,8 @@ Requires: python-typing
Requires: python2
Requires: python2-libs
Requires: python2-sphinxcontrib-websupport
Provides: %{name}-locale = %{version}-%{release}
Provides: %{name}-doc = %{version}-%{release}
%endif
%description
@ -154,6 +156,9 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
%{python3_sitelib}/*
%changelog
* Mon Feb 15 2021 Henry Li <lihl@microsoft.com> - 1.7.9-14
- Provides python-sphinx-locale, python-sphinx-doc.
* Thu Feb 04 2021 Joe Schmitt <joschmit@microsoft.com> - 1.7.9-13
- Ship sphinx-build-3.7 symlink.

21
SPECS/python-sqlalchemy/python-sqlalchemy.spec
Просмотреть файл

@ -1,25 +1,24 @@
%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
Summary: The Python SQL Toolkit and Object Relational Mapper
Name: python-sqlalchemy
Version: 1.3.2
Release: 2%{?dist}
Url: https://www.sqlalchemy.org
Release: 3%{?dist}
License: MIT
Group: Development/Languages/Python
Vendor: Microsoft Corporation
Distribution: Mariner
Group: Development/Languages/Python
URL: https://www.sqlalchemy.org
Source0: https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-%{version}.tar.gz
BuildRequires: python-setuptools
BuildRequires: python2-devel
BuildRequires: python2-libs
BuildRequires: python-setuptools
Requires: python2
Requires: python2-libs
Provides: %{name}-doc = %{version}-%{release}
%description
SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that gives application developers the full power and flexibility of SQL. SQLAlchemy provides a full suite of well known enterprise-level persistence patterns, designed for efficient and high-performing database access, adapted into a simple and Pythonic domain language.
%prep
%setup -q -n SQLAlchemy-%{version}
@ -42,22 +41,32 @@ python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{python2_sitelib}/*
%changelog
* Mon Feb 15 2021 Henry Li <lihl@microsoft.com> - 1.3.2-3
- Provides python-sqlalchemy-doc
* Sat May 09 00:21:09 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.3.2-2
- Added %%license line automatically
* Thu Mar 19 2020 Paul Monson <paulmon@microsoft.com> 1.3.2-1
- Update to 1.3.2. Fix Source0 URL. License verified.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.2.11-3
- Initial CBL-Mariner import from Photon (license: Apache2).
* Thu Jan 10 2019 Alexey Makhalov <amakhalov@vmware.com> 1.2.11-2
- Added BuildRequires python2-devel
* Sun Sep 09 2018 Tapas Kundu <tkundu@vmware.com> 1.2.11-1
- Update to version 1.2.11
* Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.1.7-2
- Use python2 explicitly
* Thu Mar 30 2017 Siju Maliakkal <smaliakal@vmware.com> 1.1.7-1
- Updating package version to latest
* Fri Nov 18 2016 Alexey Makhalov <amakhalov@vmware.com> 1.0.15-2
- Remove noarch
* Tue Sep 6 2016 Xiaolin Li <xiaolinl@vmware.com> 1.0.15-1
- Initial packaging for Photon

31
SPECS/python-virtualenv/python-virtualenv.spec
Просмотреть файл

@ -1,25 +1,22 @@
%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
Summary: Virtual Python Environment builder
Name: python-virtualenv
Version: 16.0.0
Release: 5%{?dist}
Summary: Virtual Python Environment builder
Release: 6%{?dist}
License: MIT
Group: Development/Languages/Python
Url: https://pypi.python.org/pypi/virtualenv
Source0: https://files.pythonhosted.org/packages/33/bc/fa0b5347139cd9564f0d44ebd2b147ac97c36b2403943dbee8a25fd74012/virtualenv-%{version}.tar.gz
Vendor: Microsoft Corporation
Distribution: Mariner
Group: Development/Languages/Python
URL: https://pypi.python.org/pypi/virtualenv
Source0: https://files.pythonhosted.org/packages/33/bc/fa0b5347139cd9564f0d44ebd2b147ac97c36b2403943dbee8a25fd74012/virtualenv-%{version}.tar.gz
BuildRequires: pytest
BuildRequires: python-setuptools
BuildRequires: python2
BuildRequires: python2-libs
BuildRequires: python-setuptools
BuildRequires: pytest
Requires: python2
Requires: python2-libs
BuildRequires: python-setuptools
Provides: %{name}-doc = %{version}-%{release}
BuildArch: noarch
%description
@ -30,18 +27,17 @@ Summary: Virtual Python Environment builder
BuildRequires: python3
BuildRequires: python3-devel
BuildRequires: python3-libs
BuildRequires: python3-pytest
BuildRequires: python3-setuptools
BuildRequires: python3-xml
BuildRequires: python3-pytest
Requires: python3
Requires: python3-libs
BuildRequires: python3-setuptools
%description -n python3-virtualenv
Python 3 version.
%prep
%setup -n virtualenv-%{version}
%setup -q -n virtualenv-%{version}
rm -rf ../p3dir
cp -a . ../p3dir
@ -74,17 +70,24 @@ popd
%{python3_sitelib}/*
%changelog
* Mon Feb 15 2021 Henry Li <lihl@microsoft.com> - 16.0.0-6
- Provides python-virtualenv-doc
* Sat May 09 00:20:41 PST 2020 Nick Samson <nisamson@microsoft.com> - 16.0.0-5
- Added %%license line automatically
* Thu Apr 30 2020 Emre Girgin <mrgirgin@microsoft.com> 16.0.0-4
- Renaming python-pytest to pytest
* Thu Apr 23 2020 Pawel Winogrodzki <pawelwi@microsoft.com> - 16.0.0-3
- License verified.
- Fixed 'Source0' tag.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 16.0.0-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Sun Sep 09 2018 Tapas Kundu <tkundu@vmware.com> 16.0.0-1
- Update to version 16.0.0
* Fri Aug 25 2017 Vinay Kulkarni <kulkarniv@vmware.com> 15.1.0-1
- Initial version of python-virtualenv package for Photon.

4
cgmanifest.json
Просмотреть файл

@ -2676,8 +2676,8 @@
"type": "other",
"other": {
"name": "libsepol",
"version": "2.9",
"downloadUrl": "https://github.com/SELinuxProject/selinux/releases/download/20190315/libsepol-2.9.tar.gz"
"version": "3.1",
"downloadUrl": "https://github.com/SELinuxProject/selinux/releases/download/20200710/libsepol-3.1.tar.gz"
}
}
},

2
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
Просмотреть файл

@ -198,7 +198,7 @@ tdnf-plugin-repogpgcheck-2.1.0-4.cm1.aarch64.rpm
createrepo_c-0.11.1-6.cm1.aarch64.rpm
libxml2-2.9.10-6.cm1.aarch64.rpm
libxml2-devel-2.9.10-6.cm1.aarch64.rpm
glib-2.58.0-10.cm1.aarch64.rpm
glib-2.58.0-11.cm1.aarch64.rpm
libltdl-2.4.6-7.cm1.aarch64.rpm
libltdl-devel-2.4.6-7.cm1.aarch64.rpm
pcre-libs-8.42-4.cm1.aarch64.rpm

2
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
Просмотреть файл

@ -198,7 +198,7 @@ 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-6.cm1.x86_64.rpm
libxml2-devel-2.9.10-6.cm1.x86_64.rpm
glib-2.58.0-10.cm1.x86_64.rpm
glib-2.58.0-11.cm1.x86_64.rpm
libltdl-2.4.6-7.cm1.x86_64.rpm
libltdl-devel-2.4.6-7.cm1.x86_64.rpm
pcre-libs-8.42-4.cm1.x86_64.rpm

14
toolkit/resources/manifests/package/toolchain_aarch64.txt
Просмотреть файл

@ -109,7 +109,7 @@ gdbm-lang-1.18-4.cm1.aarch64.rpm
gettext-0.21-1.cm1.aarch64.rpm
gettext-debuginfo-0.21-1.cm1.aarch64.rpm
gfortran-9.1.0-11.cm1.aarch64.rpm
glib-2.58.0-10.cm1.aarch64.rpm
glib-2.58.0-11.cm1.aarch64.rpm
glibc-2.28-15.cm1.aarch64.rpm
glibc-devel-2.28-15.cm1.aarch64.rpm
glibc-i18n-2.28-15.cm1.aarch64.rpm
@ -117,9 +117,9 @@ glibc-iconv-2.28-15.cm1.aarch64.rpm
glibc-lang-2.28-15.cm1.aarch64.rpm
glibc-nscd-2.28-15.cm1.aarch64.rpm
glibc-tools-2.28-15.cm1.aarch64.rpm
glib-debuginfo-2.58.0-10.cm1.aarch64.rpm
glib-devel-2.58.0-10.cm1.aarch64.rpm
glib-schemas-2.58.0-10.cm1.aarch64.rpm
glib-debuginfo-2.58.0-11.cm1.aarch64.rpm
glib-devel-2.58.0-11.cm1.aarch64.rpm
glib-schemas-2.58.0-11.cm1.aarch64.rpm
gmock-1.8.1-5.cm1.aarch64.rpm
gmock-devel-1.8.1-5.cm1.aarch64.rpm
gmock-static-1.8.1-5.cm1.aarch64.rpm
@ -210,9 +210,9 @@ libselinux-devel-2.9-5.cm1.aarch64.rpm
libselinux-python-2.9-5.cm1.aarch64.rpm
libselinux-python3-2.9-5.cm1.aarch64.rpm
libselinux-utils-2.9-5.cm1.aarch64.rpm
libsepol-2.9-7.cm1.aarch64.rpm
libsepol-debuginfo-2.9-7.cm1.aarch64.rpm
libsepol-devel-2.9-7.cm1.aarch64.rpm
libsepol-3.1-1.cm1.aarch64.rpm
libsepol-debuginfo-3.1-1.cm1.aarch64.rpm
libsepol-devel-3.1-1.cm1.aarch64.rpm
libsolv-0.7.7-4.cm1.aarch64.rpm
libsolv-debuginfo-0.7.7-4.cm1.aarch64.rpm
libsolv-devel-0.7.7-4.cm1.aarch64.rpm

14
toolkit/resources/manifests/package/toolchain_x86_64.txt
Просмотреть файл

@ -109,7 +109,7 @@ gdbm-lang-1.18-4.cm1.x86_64.rpm
gettext-0.21-1.cm1.x86_64.rpm
gettext-debuginfo-0.21-1.cm1.x86_64.rpm
gfortran-9.1.0-11.cm1.x86_64.rpm
glib-2.58.0-10.cm1.x86_64.rpm
glib-2.58.0-11.cm1.x86_64.rpm
glibc-2.28-15.cm1.x86_64.rpm
glibc-devel-2.28-15.cm1.x86_64.rpm
glibc-i18n-2.28-15.cm1.x86_64.rpm
@ -117,9 +117,9 @@ glibc-iconv-2.28-15.cm1.x86_64.rpm
glibc-lang-2.28-15.cm1.x86_64.rpm
glibc-nscd-2.28-15.cm1.x86_64.rpm
glibc-tools-2.28-15.cm1.x86_64.rpm
glib-debuginfo-2.58.0-10.cm1.x86_64.rpm
glib-devel-2.58.0-10.cm1.x86_64.rpm
glib-schemas-2.58.0-10.cm1.x86_64.rpm
glib-debuginfo-2.58.0-11.cm1.x86_64.rpm
glib-devel-2.58.0-11.cm1.x86_64.rpm
glib-schemas-2.58.0-11.cm1.x86_64.rpm
gmock-1.8.1-5.cm1.x86_64.rpm
gmock-devel-1.8.1-5.cm1.x86_64.rpm
gmock-static-1.8.1-5.cm1.x86_64.rpm
@ -210,9 +210,9 @@ libselinux-devel-2.9-5.cm1.x86_64.rpm
libselinux-python-2.9-5.cm1.x86_64.rpm
libselinux-python3-2.9-5.cm1.x86_64.rpm
libselinux-utils-2.9-5.cm1.x86_64.rpm
libsepol-2.9-7.cm1.x86_64.rpm
libsepol-debuginfo-2.9-7.cm1.x86_64.rpm
libsepol-devel-2.9-7.cm1.x86_64.rpm
libsepol-3.1-1.cm1.x86_64.rpm
libsepol-debuginfo-3.1-1.cm1.x86_64.rpm
libsepol-devel-3.1-1.cm1.x86_64.rpm
libsolv-0.7.7-4.cm1.x86_64.rpm
libsolv-debuginfo-0.7.7-4.cm1.x86_64.rpm
libsolv-devel-0.7.7-4.cm1.x86_64.rpm